Commit Graph

Select branches

Hide Pull Requests

develop

feature/msix

release-1.3.x

release-1.4.x

release-5.x

release-6.x

release-7.x

release-8.0

release-legacy

update_flake_lock_action

#1

#100

#1004

#1007

#1010

#1013

#1025

#1029

#1032

#1032

#1034

#1040

#105

#1054

#1058

#1063

#1064

#1065

#1067

#1073

#1075

#1079

#1079

#1080

#1081

#1083

#1086

#1087

#1088

#1090

#1093

#1097

#1099

#11

#110

#1100

#1101

#1102

#1103

#1107

#1108

#1109

#111

#1110

#1111

#1114

#1115

#1117

#1119

#112

#1120

#1125

#1126

#1127

#1128

#1131

#1133

#1135

#1140

#1145

#1149

#1149

#1151

#1159

#1160

#1160

#1162

#1164

#1164

#1166

#1174

#1179

#1179

#1181

#1184

#1187

#119

#1190

#1190

#1191

#1192

#1194

#1195

#1198

#120

#1200

#1210

#1214

#1218

#1224

#1227

#1228

#123

#1230

#1231

#1232

#1233

#1234

#1235

#1238

#1241

#1242

#1243

#1246

#1249

#1251

#1252

#1253

#1255

#1256

#1258

#1259

#1261

#1263

#1264

#1264

#1266

#1268

#1270

#1272

#1274

#1275

#1276

#1277

#1280

#1281

#1284

#1286

#1288

#1290

#1292

#1293

#1294

#1298

#13

#1302

#1304

#1305

#1306

#1310

#1320

#1321

#1324

#1325

#1329

#1331

#1332

#1333

#1334

#1335

#1336

#1337

#1338

#1339

#1341

#1345

#1347

#1347

#1350

#1351

#1352

#1355

#1357

#1359

#1362

#1363

#1364

#1365

#1365

#1368

#1369

#1370

#1372

#1373

#1374

#1375

#1376

#1377

#1378

#138

#1380

#1381

#1383

#1384

#1385

#1387

#1391

#1392

#1395

#1397

#1399

#14

#1402

#1403

#1404

#1405

#1406

#1407

#1408

#1409

#1409

#1413

#1413

#1414

#1414

#1416

#1418

#1419

#1420

#1426

#1427

#1428

#1432

#1434

#1437

#1438

#1439

#1440

#1441

#1442

#1444

#1445

#1446

#1447

#1448

#1449

#1452

#1453

#1456

#1459

#1461

#1462

#1464

#1466

#1466

#1467

#147

#1474

#1475

#1476

#148

#1483

#1485

#1486

#149

#1491

#1493

#1498

#15

#1505

#1508

#1512

#1513

#1515

#1516

#1517

#1518

#1519

#1520

#1522

#1523

#1524

#1525

#1525

#1526

#1526

#1529

#1529

#1530

#1532

#1535

#1536

#1537

#1539

#1541

#1543

#1544

#1547

#1548

#1549

#1551

#1552

#1553

#1554

#1554

#1555

#1555

#1556

#1557

#1558

#1558

#1559

#1560

#1561

#1562

#1563

#1570

#1572

#1573

#1574

#1575

#1578

#1581

#1588

#1588

#1589

#1589

#1591

#1592

#16

#1601

#1604

#1605

#1606

#1609

#1609

#1613

#1617

#1617

#1618

#1619

#1632

#1641

#1643

#1647

#1655

#1656

#1657

#1658

#1666

#1668

#1670

#1672

#1673

#1676

#1678

#1679

#1679

#1682

#1684

#1685

#1689

#1689

#1691

#1692

#1694

#1694

#1695

#1698

#1699

#1704

#1704

#1706

#1709

#1711

#1712

#1712

#1717

#1718

#1718

#1721

#1722

#1724

#1725

#1726

#1727

#1728

#1728

#173

#1732

#1732

#1733

#1737

#1738

#1738

#1739

#1742

#1743

#1744

#1746

#1746

#1747

#1748

#1751

#1751

#1752

#1752

#1753

#1758

#1759

#1760

#1761

#1762

#1762

#1766

#1768

#1768

#1769

#1769

#1771

#1771

#1772

#1776

#1776

#1782

#1783

#1786

#1786

#1788

#1789

#1791

#1792

#1793

#1796

#1797

#1798

#1798

#1799

#1799

#1802

#184

#185

#187

#191

#196

#197

#198

#201

#202

#203

#206

#21

#211

#215

#218

#224

#225

#227

#228

#229

#23

#230

#231

#233

#234

#238

#24

#240

#242

#243

#249

#25

#26

#266

#267

#27

#274

#28

#281

#283

#285

#285

#29

#291

#294

#3

#30

#30

#301

#304

#305

#31

#312

#315

#318

#319

#32

#322

#325

#329

#33

#332

#333

#334

#337

#338

#340

#342

#346

#351

#352

#353

#354

#359

#36

#365

#366

#367

#368

#370

#372

#373

#373

#374

#377

#379

#381

#381

#382

#383

#389

#39

#391

#392

#396

#397

#399

#4

#40

#400

#405

#406

#407

#411

#412

#415

#417

#423

#428

#43

#430

#431

#433

#435

#436

#439

#443

#445

#448

#45

#454

#455

#456

#457

#458

#459

#461

#464

#465

#467

#47

#471

#474

#476

#48

#480

#481

#482

#483

#486

#487

#492

#493

#496

#498

#5

#506

#508

#511

#514

#52

#521

#524

#527

#528

#538

#54

#541

#543

#543

#546

#547

#55

#551

#556

#557

#56

#560

#561

#565

#568

#569

#571

#572

#575

#576

#577

#584

#585

#586

#587

#59

#593

#6

#60

#600

#601

#604

#605

#607

#608

#61

#612

#618

#619

#619

#625

#626

#627

#628

#630

#631

#636

#638

#642

#644

#647

#648

#649

#65

#651

#656

#665

#666

#667

#673

#675

#678

#68

#680

#681

#684

#685

#690

#696

#710

#713

#714

#715

#716

#720

#722

#724

#726

#729

#730

#731

#732

#735

#737

#74

#743

#744

#746

#75

#751

#753

#758

#765

#765

#766

#772

#777

#779

#781

#783

#784

#787

#788

#795

#798

#802

#803

#804

#810

#813

#815

#816

#819

#82

#823

#825

#826

#828

#831

#832

#833

#834

#839

#841

#846

#853

#857

#859

#86

#865

#87

#88

#881

#888

#889

#89

#894

#895

#896

#904

#907

#907

#911

#912

#915

#918

#919

#92

#927

#928

#929

#931

#934

#937

#939

#939

#940

#941

#945

#946

#950

#961

#965

#966

#967

#968

#970

#972

#974

#980

#980

#981

#982

#983

#986

#99

#994

#996

1.0.0

1.0.1

1.0.2

1.0.3

1.0.4

1.0.5

1.0.6

1.1.0

1.1.1

1.2.0

1.2.1

1.2.2

1.3.0

1.3.1

1.3.2

1.4.0

1.4.1

1.4.2

5.0

5.1

5.2

6.0

6.1

6.2

6.3

7.0

7.1

7.2

8.0

8.0-mod

Mono Color

• 431cfbc60a Implement the news button Forkk 2014-01-02 14:37:56 -06:00
• f08c0e3141 Merge branch 'develop' of github.com:MultiMC/MultiMC5 into develop Sky 2014-01-02 19:49:12 +00:00
• 47d577b766 Don't show extra space in status bar, tweak "none selected" message Sky 2014-01-02 19:47:34 +00:00
• 17f1864a71 Merge branch 'develop' of github.com:MultiMC/MultiMC5 into feature_news Forkk 2014-01-02 13:38:20 -06:00
• 4495e20cd7 Add news checking system and news toolbar Forkk 2014-01-02 13:25:38 -06:00
• aa5f2c8120 Merge pull request #32 from 02JanDal/feature_ico_icons Sky 2014-01-02 10:16:25 -08:00
• c0b6fd0647 Make .ico files usable (the plugin is already included) Jan Dalheimer 2014-01-02 18:51:40 +01:00
• c85789e249 Merge pull request #31 from max96at/feature_osx_polish Petr Mrázek 2014-01-02 08:09:57 -08:00
• 092b15fc87 Removed incomplete osx java detection log message max96at 2014-01-02 17:07:47 +01:00
• cdebeff179 Improved java detection on OSX. Noah Mayr 2014-01-02 17:01:26 +01:00
• aed3ddda29 Merge pull request #30 from max96at/feature_osx_polish Petr Mrázek 2014-01-02 06:28:13 -08:00
• 1bdac97af5 Fixed buttons on osx by adding the accessible plugin. Noah Mayr 2014-01-02 15:22:57 +01:00
• 4af5bef66f Added .DS_Store to .gitignore. Noah Mayr 2014-01-02 14:15:44 +01:00
• eb4e7d3f67 Save/restore settings dialog (and instance specific settings) window geometry Sky 2014-01-02 02:20:34 +00:00
• 7f89da2043 More credits tweaking Sky 2014-01-01 22:35:59 +00:00
• 9fbe3a7ccd Tweak update result dialog size Sky 2014-01-01 20:23:06 +00:00
• 0e78d34d4c ThreadTask for all your ThreadNeeds Petr Mrázek 2014-01-01 19:21:58 +01:00
• cf7335186d Merge https://github.com/Drayshak/MultiMC5 into develop Petr Mrázek 2014-01-01 16:18:27 +01:00
• f0ffd379fa Fix issue with PostExitCmd not translating to PostExitCommand Petr Mrázek 2014-01-01 16:17:49 +01:00
• 821fb5e0ae Move assets migration to a task. Needs threading. Sky 2014-01-01 14:56:26 +00:00
• f2e8a8c904 Enable high-dpi QIcon logic Petr Mrázek 2014-01-01 15:42:43 +01:00
• cb0f7a06a1 Remove offending Settings constructor. Petr Mrázek 2014-01-01 15:30:26 +01:00
• 396e63500e Allow the use of synonyms in settings. Refactor settings. Petr Mrázek 2014-01-01 15:08:40 +01:00
• 6648c7ad90 Tweak credits in about dialog Sky 2013-12-31 17:45:27 +00:00
• c47933d95c Loads of changes and some refactorings Jan Dalheimer 2013-12-31 17:26:36 +01:00
• a6808b0399 Add the redistribution/fork text to the About dialog. Petr Mrázek 2013-12-31 15:44:09 +01:00
• 967be1f42a Clarify terms of redistribution and our wishes under the Apache license Sky 2013-12-31 11:22:53 +00:00
• 3a4ecb57d0 Enable high DPI support on OSX Petr Mrázek 2013-12-31 02:34:00 +01:00
• ad7711b87c Fix silly bug with icon not changing on the toolbar when the icon key changes. Petr Mrázek 2013-12-31 01:49:07 +01:00
• 952b63f68d Refactor icon lists heavily Petr Mrázek 2013-12-31 01:24:28 +01:00
• 8cfd0881ac Progress indicators Jan Dalheimer 2013-12-30 23:39:10 +01:00
• e6be883d14 Fixing more bugs Jan Dalheimer 2013-12-30 23:10:53 +01:00
• 1e1b2342f4 Loads of fixes Jan Dalheimer 2013-12-30 18:46:12 +01:00
• 4662fbd298 Make the MultiMC delegate fully usable. Dynamic row heights. Jan Dalheimer 2013-12-30 18:45:40 +01:00
• c44bcfab4b Merge pull request #29 from 02JanDal/java_browse_button Sky 2013-12-30 06:36:16 -08:00
• 8f6d808090 Clarify code style for contributions Sky 2013-12-30 14:24:18 +00:00
• 76892c284b Make the java browse button look like the other browse buttons Jan Dalheimer 2013-12-30 15:09:53 +01:00
• d62e175cca Merge pull request #28 from 02JanDal/feature_editor Sky 2013-12-30 06:04:32 -08:00
• 76438f6afe Fix spelling mistake Jan Dalheimer 2013-12-30 14:55:55 +01:00
• 5d0868a056 Notify the user of any errors Jan Dalheimer 2013-12-30 14:45:59 +01:00
• c01678a3fa Don't use stuff that's new in 5.2 if we don't compile with that Jan Dalheimer 2013-12-30 14:05:53 +01:00
• 5a7fc1e123 Use /usr/bin as default on linux Jan Dalheimer 2013-12-30 13:00:55 +01:00
• 3380bc7563 Launch an editor for the custom.json file. Also allow overriding of the system default editor Jan Dalheimer 2013-12-29 17:51:16 +01:00
• 654f444f55 Fix various LiteLoader related bugs. Petr Mrázek 2013-12-29 04:17:52 +01:00
• fbf1cc2848 Merge https://github.com/robotbrain/MultiMC5 into develop Petr Mrázek 2013-12-29 03:36:47 +01:00
• 8549e5317f Litemod version info. robotbrainify 2013-12-28 20:28:24 -05:00
• 997be947c9 Maybe break updater even more? Petr Mrázek 2013-12-29 01:13:57 +01:00
• 695ad1474e Merge branch 'feature_liteloader' of https://github.com/02JanDal/MultiMC5 into develop Petr Mrázek 2013-12-28 23:48:48 +01:00
• 5b54a4ca8c Don't hardcode stuff!!! Jan Dalheimer 2013-12-28 23:34:18 +01:00
• c816a26647 Set permissions for the updater binary after updating it. Petr Mrázek 2013-12-28 22:32:45 +01:00
• 55e62a81b6 LiteLoader support Jan Dalheimer 2013-12-28 14:22:36 +01:00
• 595e4b697e Change TestParseScript path back to what it was. Petr Mrázek 2013-12-28 04:55:38 +01:00
• 7652b3d64a Various updater fixes Petr Mrázek 2013-12-28 02:03:53 +01:00
• 30d4f5981d Rearrange logiv for OneSix version change Petr Mrázek 2013-12-27 12:50:24 +01:00
• 4bf1cac8d8 Handle the foo + foo.disabled jar mod corner case better. Petr Mrázek 2013-12-27 02:18:40 +01:00
• 0109220678 Take the spacing into account Jan Dalheimer 2013-12-27 00:03:24 +01:00
• f8d835cd22 Fix scrolling Jan Dalheimer 2013-12-26 22:40:26 +01:00
• 53db8edb85 Fixing several d&d bugs Jan Dalheimer 2013-12-26 22:02:25 +01:00
• acbbdf319a Remove a debug message Jan Dalheimer 2013-12-26 21:24:42 +01:00
• c71808446b Fix a bug Jan Dalheimer 2013-12-26 21:23:21 +01:00
• 525f508d94 Loads of stuff, amongst others d&d and many bug fixes Jan Dalheimer 2013-12-26 21:16:03 +01:00
• aa91d89aaa Do not merge disabled jar mods. Petr Mrázek 2013-12-26 05:19:11 +01:00
• acf25d8a33 Disable/enable mods with checkboxes. Needs testing. Petr Mrázek 2013-12-26 05:14:32 +01:00
• 449f55c3e6 Fix linux runner script. Petr Mrázek 2013-12-25 14:43:51 +01:00
• 0d7b411729 No more windows paths in tests. Petr Mrázek 2013-12-25 03:25:21 +01:00
• 8edd0100e8 Fix more updater derps. Petr Mrázek 2013-12-25 02:46:06 +01:00
• e3389a4eef Log even more error stuff for login. Petr Mrázek 2013-12-25 01:27:38 +01:00
• 5a2df0d41a Merge branch 'develop' of https://github.com/robotbrain/MultiMC5 into develop Petr Mrázek 2013-12-25 01:19:38 +01:00
• 2d144631e7 Merge branch 'feature_updater_update' of https://github.com/02JanDal/MultiMC5 into develop Petr Mrázek 2013-12-25 01:18:16 +01:00
• 8d0ca72abb Log SSL errors, give common solutions Petr Mrázek 2013-12-24 23:38:37 +01:00
• b1ec7841e0 Get the updater to display a no update found message. robotbrainify 2013-12-24 16:00:07 -05:00
• ccbf341dc8 Initial commit. Basics work. Next: Drag and Drop Jan Dalheimer 2013-12-24 11:47:30 +01:00
• 027aafc3c1 Tidy status messages a bit Sky 2013-12-23 15:46:01 +00:00
• 00822fa0f9 Treat the updater separately Jan Dalheimer 2013-12-23 10:34:43 +01:00
• 86284196de Merge branch 'develop' of github.com:MultiMC/MultiMC5 into develop Petr Mrázek 2013-12-23 00:44:41 +01:00
• f402001453 Use the central URL list for forge URLs Petr Mrázek 2013-12-23 00:43:29 +01:00
• 56aeaec7d6 Merge branch 'feature_forge_gradle' of https://github.com/02JanDal/MultiMC5 into develop Petr Mrázek 2013-12-23 00:16:47 +01:00
• 9e645f4a37 Support for the new forge gradle repo Jan Dalheimer 2013-12-23 00:12:03 +01:00
• 7bba7b6a68 Merge pull request #21 from Azenet/develop Petr Mrázek 2013-12-22 14:22:18 -08:00
• 3841260ef1 Fix Java checker leaving behind temporary jar files Petr Mrázek 2013-12-22 23:05:18 +01:00
• d507526320 Fixed updater not restarting MultiMC after update. ashka 2013-12-22 22:43:16 +01:00
• 42bc02dc8a BASH! Petr Mrázek 2013-12-22 20:53:35 +01:00
• 77ddf8b5d7 Show errors when logging in in the account dialog. Petr Mrázek 2013-12-22 19:47:58 +01:00
• 3051d0d328 Make pack200 use QFile by proxy, eliminating some unicode issues. Petr Mrázek 2013-12-22 18:49:52 +01:00
• 7a07ed7940 FTB fixage Petr Mrázek 2013-12-22 05:47:10 +01:00
• 245d441a6e Fail if we fail to find the right forge version Petr Mrázek 2013-12-22 05:15:26 +01:00
• 74b5b5f535 Make FTB instances behave better Petr Mrázek 2013-12-22 04:31:30 +01:00
• 82c87aa06f Initial FTB support. Allows "tracking" of FTB instances. Jan Dalheimer 2013-12-20 14:47:26 +01:00
• 34a3fedf7b Keep the last five logs Jan Dalheimer 2013-12-21 11:05:44 +01:00
• c077c91e90 Remove OSX hack that never worked anyway Petr Mrázek 2013-12-21 19:18:56 +01:00
• 01dbebdfc8 Fix issues with the updater Petr Mrázek 2013-12-21 14:25:16 +01:00
• 0f6ad12fd8 Prevent running as root on linux Petr Mrázek 2013-12-21 09:36:12 +01:00
• d6c71488b3 Some test madness Petr Mrázek 2013-12-17 02:09:58 +01:00
• 20e86801b3 Merge branch 'feature_runner_symlink' of https://github.com/02JanDal/MultiMC5 into develop Petr Mrázek 2013-12-17 00:42:21 +01:00
• fab8d6ae0b Merge branch 'feature_runner' of https://github.com/02JanDal/MultiMC5 into develop Petr Mrázek 2013-12-17 00:41:50 +01:00
• 911dfa8530 Merge branch 'updater_tests' of https://github.com/02JanDal/MultiMC5 into develop Petr Mrázek 2013-12-17 00:41:31 +01:00
• f8067a6034 Magical pixie dust for windows updater reliability Petr Mrázek 2013-12-17 00:37:56 +01:00
• be8dba9ee2 Remove obsolete auto login option. Petr Mrázek 2013-12-16 22:30:42 +01:00
• 47bf7fff27 Merge remote-tracking branch 'upstream/develop' into updater_tests Jan Dalheimer 2013-12-16 21:17:50 +01:00
• ae68adc3a5 Fix some failing tests and attempt to fix running tests on a headless computer Jan Dalheimer 2013-12-16 20:10:11 +01:00