PrismLauncher

CactiChameleon9/PrismLauncher

Fork 0

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

7c24bcc834 Reorganize the version-related code. Petr Mrázek 2014-03-01 23:06:47 +0100
7dfd6aa051 Remove obsolete OneSixFTBInstanceForge Petr Mrázek 2014-03-01 18:18:51 +0100
00f4f533aa Fix to the way translations are handled. Also updated the german translation with the new strings. Jan Dalheimer 2014-02-25 18:46:50 +0100
3133bb3ea0 Fix missing includes in litaloader installer. Petr Mrázek 2014-02-25 02:15:14 +0100
acff155624 Merge branch 'feature_screenshots' into integration_json_and_tools Petr Mrázek 2014-02-25 01:52:58 +0100
9d4e840a6e Screenshots: Optimize image loading and memory use, fix list and button layout. Petr Mrázek 2014-02-25 01:21:46 +0100
cb5cfe7242 Reorganize all the screenshot files Petr Mrázek 2014-02-25 00:51:24 +0100
b1cddb4600 Fix memory leak in system robotbrain 2014-02-24 17:49:18 -0500
55e21737dd Deleting screenshots. Needs fixing. robotbrain 2014-02-24 17:40:05 -0500
da33fa4090 Imgur album creation Jan Dalheimer 2014-02-24 11:30:27 +0100
a8811a27f7 Working screenshot upload Jan Dalheimer 2014-02-24 10:34:51 +0100
226c1bdae5 Screenshot fixes, move some code around, fix some stuff Jan Dalheimer 2014-02-24 09:34:21 +0100
49dc9695f5 Merge branch 'fix_json_version' into integration_json_and_tools Petr Mrázek 2014-02-24 02:35:01 +0100
5e33da258c Close to finished. Need to fix the upload part. Viewing works (in grayscale) robotbrain 2014-02-23 19:45:59 -0500
f7c97efcf3 Merge branch 'feature_profiling' into integration_json_and_tools Petr Mrázek 2014-02-24 00:29:13 +0100
e3d2e5fd74 Merge branch 'fix_ftb' into integration_json_and_tools Petr Mrázek 2014-02-24 00:28:59 +0100
4a77524b05 Initial stuff. It doesnt work. robotbrain 2014-02-23 16:14:24 -0500
a354e8bfae Fix MCEdit on OSX Jan Dalheimer 2014-02-21 20:13:12 +0100
4883d15262 Copying of FTB instances working again Jan Dalheimer 2014-02-21 19:15:59 +0100
f54705e1c5 Don't assume forge for FTB instances. Fix FTB related stuff. Jan Dalheimer 2014-02-21 18:01:06 +0100
43881b9cdb Use FTB's libraries/ and versions/ folders for non-copied instances Jan Dalheimer 2014-02-20 17:06:32 +0100
7146724607 New, better, liteloader support Jan Dalheimer 2014-02-19 22:34:17 +0100
0b56b5efaf Instance flags. Currently used for marking instances as broken. Can later be used for badges. Jan Dalheimer 2014-02-17 20:31:50 +0100
4e8be668cb Different error message if it's a launcher version mismatch Jan Dalheimer 2014-02-17 17:46:43 +0100
8d0ff99089 Actually remove instances if they fail to load Jan Dalheimer 2014-02-17 17:36:29 +0100
549198031d Check if the json version is one we know how to handle Jan Dalheimer 2014-02-17 17:19:58 +0100
16d378687c Fix some external tool related string sin the settings dialog. Petr Mrázek 2014-02-16 14:53:03 +0100
dd2d8f48fa Nicer way of selecting tool folders and executables Petr Mrázek 2014-02-16 14:42:44 +0100
e4ecc31e07 Links to the tools Jan Dalheimer 2014-02-16 13:02:59 +0100
9c87bc6c4b Restructure Jan Dalheimer 2014-02-16 12:52:35 +0100
f26b7dedad Only show folders that really are worlds Jan Dalheimer 2014-02-16 12:08:39 +0100
f5273ae2b1 Merge remote-tracking branch 'origin/feature_profiling' into feature_profiling Jan Dalheimer 2014-02-16 12:06:14 +0100
1dc34269bd Fix path selections for tools (settings dialog) Petr Mrázek 2014-02-16 12:04:26 +0100
c608841f77 Attempt to find jvisualvm Jan Dalheimer 2014-02-16 12:00:38 +0100
2e64d0308c Use a combobox instead of a file dialog Jan Dalheimer 2014-02-16 11:56:02 +0100
c88c639b8e Fix for windows and update tool menu after closing settings dialog Jan Dalheimer 2014-02-16 11:49:55 +0100
616c372690 Fix more stuff. Detached tools, only MCEdit for now. Jan Dalheimer 2014-02-16 10:46:14 +0100
994972bf5d More fixes. Jan Dalheimer 2014-02-16 09:30:38 +0100
82b35b5445 Fix stuff. Make sure different ways of aborting profiling work. Jan Dalheimer 2014-02-16 08:54:52 +0100
7ceb2cacb1 Fix a few bugs in profilers. Petr Mrázek 2014-02-16 00:10:45 +0100
8219dbf612 Underp. Don't depend on OneSix. Nicer "menu" style choosing. Jan Dalheimer 2014-02-15 22:26:44 +0100
3b236483df Another attempt at fixing windows build Jan Dalheimer 2014-02-15 19:07:01 +0100
c0e58fbfb2 Try to be cross-platform Jan Dalheimer 2014-02-15 18:15:41 +0100
6f6d912d07 Underp and fix some stuff. Works nicer now. Jan Dalheimer 2014-02-15 15:20:12 +0100
efa8e26a3f Profiler support. Currently JProfiler and JVisualVM are implemented. Jan Dalheimer 2014-02-15 14:19:35 +0100
5cf599673d Merge https://github.com/p-schneider/MultiMC5 into develop Petr Mrázek 2014-02-14 21:00:48 +0100
65e30aa118 Merge https://github.com/robotbrain/MultiMC5 into develop Petr Mrázek 2014-02-14 20:59:23 +0100
a59dbdcb38 Merge https://github.com/max96at/MultiMC5 into develop Petr Mrázek 2014-02-14 20:58:09 +0100
725e6a36bb fixed the destination (href) of the link http://github.com/MultiMC/MultiMC5 in AboutDialog.ui (+German translation) p-schneider 2014-02-14 13:39:00 +0100
93ee6f9010 Fix FTB paths on Windows XP robotbrain 2014-02-13 16:00:51 -0500
5a0e7877b0 Fix groupview issues Petr Mrázek 2014-02-10 00:51:52 +0100
2f0275c194 Fix kitty. Meow. Petr Mrázek 2014-02-09 22:55:44 +0100
1f218bb8cd Fix template magic in group view. Petr Mrázek 2014-02-09 21:14:34 +0100
ba401922e1 Do not divide by zero when the last group is collapsed. Petr Mrázek 2014-02-09 21:04:00 +0100
1f6a484cb2 Merge branch 'integration_derpstances_groupview' into develop Petr Mrázek 2014-02-09 20:49:48 +0100
18f532b0d7 Visual and scroll behavior changes to groupview Petr Mrázek 2014-02-09 20:45:18 +0100
0d30a2655f Blacklist the FTB voxel pack. Petr Mrázek 2014-02-09 19:10:56 +0100
9022042360 Only load instance list twice. Petr Mrázek 2014-02-09 11:00:34 +0100
583786757a Fix crash bug related to messageboxes interrupting model resets in the instance list. Petr Mrázek 2014-02-08 23:52:15 +0100
af33b96684 Merge branch 'feature_groupview' into integration_derpstances_groupview Petr Mrázek 2014-02-08 22:18:32 +0100
aa41b891f0 Group View: Use painting code from the previous group headers, small optimizations Petr Mrázek 2014-02-08 21:46:29 +0100
53069205fa Allow overriding the order in which patches are applied Jan Dalheimer 2014-02-08 17:22:26 +0100
6d9819cccf Error if a patch file is for a different version of minecraft Jan Dalheimer 2014-02-08 12:47:14 +0100
f8df07c327 Small tweaks to make things better. Petr Mrázek 2014-02-06 09:32:44 +0100
573d4c8050 Paint the headers nicer. Petr Mrázek 2014-02-05 01:34:50 +0100
c84c51860d Fix crash bug related to data changes in new group view. Petr Mrázek 2014-02-04 21:18:02 +0100
6206a241ea A try at fixing the instance delegate. A bit. Maybe. Petr Mrázek 2014-02-04 02:01:11 +0100
7839c4ecc0 Pave. Petr Mrázek 2014-02-04 01:40:51 +0100
b82eb5873e Add 'depends/groupview/' from commit '946d49675cb4725c31ab49a51f3bcae302f89a19' Petr Mrázek 2014-02-04 00:53:05 +0100
a17caba2c9 Nuke. Petr Mrázek 2014-02-04 00:43:18 +0100
946d49675c Swap things around -- rename refactors, moving towards non-derpy design. Maybe. Petr Mrázek 2014-02-04 00:40:10 +0100
ac2f64f337 Reload version after removing custom.json Jan Dalheimer 2014-02-03 20:42:04 +0100
ddedd077b6 Oh my. Petr Mrázek 2014-02-02 18:30:52 +0100
2cd9b06476 Fix drag&drop pixmap rendering Petr Mrázek 2014-02-02 16:57:00 +0100
eb0ed082d8 Fix group mouse interaction issues Petr Mrázek 2014-02-02 14:27:43 +0100
cdd35910c3 Fix installing forge after liteloader and then removing liteloader. Also formatting. Jan Dalheimer 2014-02-02 14:17:44 +0100
ece826bdbc Add a MMC-depend field (soft/hard) for version checking Jan Dalheimer 2014-02-02 14:05:07 +0100
b2bf50a6d7 Small tweaks Petr Mrázek 2014-02-02 10:26:38 +0100
790402bdce Disable anything related to user.json for now. Will be re-enabled once we have a gui for it. Jan Dalheimer 2014-02-01 22:32:48 +0100
983a40698c Merge remote-tracking branch 'upstream/feature_derpstances' into feature_derpstances Jan Dalheimer 2014-02-01 19:58:13 +0100
866d7029af Fix some bugs that got uncovered while trying to get liteloader 1.7 to work Jan Dalheimer 2014-02-01 19:42:47 +0100
1936bd181f Merge branch 'feature_derpstances' of https://github.com/02JanDal/MultiMC5 into feature_derpstances Petr Mrázek 2014-02-01 19:37:16 +0100
8637cce433 Fix a bug Jan Dalheimer 2014-02-01 16:26:38 +0100
4a9e213238 Change the OneSix library view. It now shows a list of patches. Jan Dalheimer 2014-02-01 14:52:21 +0100
179451d591 More reformat. Petr Mrázek 2014-01-31 22:58:57 +0100
3fb7a0faf0 Reformat, Rename, Redo Petr Mrázek 2014-01-31 22:51:45 +0100
b4b6091372 Add 'empty text' to all the version selection dialogs. Petr Mrázek 2014-01-29 01:20:19 +0100
556d8f0ec1 custom.json overrides all. For user patching there now is instance.json Jan Dalheimer 2014-01-28 07:39:43 +0100
986141b503 Fix library ordering Jan Dalheimer 2014-01-27 22:23:07 +0100
176783c8ca Have the libraries tab show tweaker mods instead of libraries Jan Dalheimer 2014-01-27 20:17:29 +0100
f9ea3dbfde Split parsing/applying. Better error logging. Fix crash. Jan Dalheimer 2014-01-27 19:20:07 +0100
ffbc5bb62c Offline mode can be used even when online. Petr Mrázek 2014-01-27 03:00:49 +0100
966f9d1206 Merge branch 'develop' into feature_derpstances Jan Dalheimer 2014-01-24 22:00:34 +0100
0f7b38c76b Fix some stuff Jan Dalheimer 2014-01-24 18:17:26 +0100
7d5787025a Change naming from Derp -> OneSix until the new instance type supports legacy Jan Dalheimer 2014-01-24 18:12:02 +0100
156bc8f276 Forge works now too, and so does forge+liteloader Jan Dalheimer 2014-01-23 21:31:41 +0100
d7113de3bd Hotfix 0.2.1 for twitch. Petr Mrázek 2014-01-22 22:40:17 +0100
c39d26f445 Got liteloader working. Patching more or less works Jan Dalheimer 2014-01-22 22:15:50 +0100
2831ca94f8 Added more possible java paths on OSX. Noah Mayr 2014-01-22 18:28:56 +0100
0a592ab99b Work towards liteloader support. Fix creating new instance Jan Dalheimer 2014-01-22 15:20:48 +0100