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

• 477b72ad33 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into prism_export2 Trial97 2023-07-18 23:48:02 +03:00
• 3728cbb62a Merge pull request #1397 from Gaming32/develop Sefa Eyeoglu 2023-07-18 22:47:55 +02:00
• 7c5d07e74d Merge pull request #1404 from PrismLauncher/backport-1385-to-release-7.x Sefa Eyeoglu 2023-07-18 22:46:25 +02:00
• 015f88bf83 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into import Trial97 2023-07-18 23:46:19 +03:00
• fe1ea7240e Merge pull request #1334 from TheKodeToad/litemod-dl TheKodeToad 2023-07-10 16:42:38 +01:00
• 6f1d594f1c Merge pull request #1128 from pandaninjas/fix-implicit-fallthrough Sefa Eyeoglu 2023-07-07 15:19:00 +02:00
• 7baaf83f1d Update Flatpak manifest Dallas Strouse 2023-07-17 00:29:24 -05:00
• 02082cda09 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into update_file Trial97 2023-07-18 23:40:11 +03:00
• 5eec0f5901 feat:managed packs can update from file Trial97 2023-07-18 23:40:03 +03:00
• bab7105820 Merge pull request #1403 from PrismLauncher/backport-1362-to-release-7.x Sefa Eyeoglu 2023-07-18 22:29:16 +02:00
• 1389b74a8a fixed warning Trial97 2023-07-14 13:32:18 +03:00
• 5aa3aabdf9 insert header Trial97 2023-07-14 13:31:28 +03:00
• 42d2c7446a format Trial97 2023-07-14 13:31:13 +03:00
• 3fbc25155b Merge pull request #1362 from Trial97/fix_warning Sefa Eyeoglu 2023-07-18 22:28:27 +02:00
• ecac05b2fc Merge pull request #1378 from Trial97/prism_export Sefa Eyeoglu 2023-07-18 22:26:56 +02:00
• 5b54475d3e Merge pull request #1385 from orowith2os/flatpak-updates seth 2023-07-18 20:12:39 +00:00
• 391497645f feat:made flame instace creation use metadata for recommended version Trial97 2023-07-18 22:33:39 +03:00
• f8fcb98c68 fix: generate predictable UUIDs for offline accounts Sefa Eyeoglu 2023-07-18 09:06:49 +02:00
• 2eff1de560 Update Flatpak manifest Dallas Strouse 2023-07-17 00:29:24 -05:00
• 1fbb41f5e2 Make Launch Offline not launch online in 1.6+ Josiah Glosson 2023-07-17 17:07:06 -05:00
• 71a7358287 Merge pull request #1395 from PrismLauncher/backport-1387-to-release-7.x TheKodeToad 2023-07-17 17:42:00 +01:00
• eaf125c31a fix: don't take modloaders by reference Sefa Eyeoglu 2023-07-17 14:33:01 +02:00
• f7e018d41a fix: check if any modloader is installed Sefa Eyeoglu 2023-07-17 10:09:01 +02:00
• 01afa8957f Merge pull request #1387 from Scrumplex/fix-quilt-beacon TheKodeToad 2023-07-17 17:40:42 +01:00
• 5162203c7d Merge branch 'prism_export' of github.com:Trial97/PrismLauncher into prism_export2 Trial97 2023-07-17 17:58:42 +03:00
• b0940d696b Added QFutureWatcher Trial97 2023-07-17 17:42:15 +03:00
• fe73d696cb replace emplace with insert Trial97 2023-07-17 16:57:52 +03:00
• 2ea4a78541 Upgraded ExportToZipTask Trial97 2023-07-17 16:24:43 +03:00
• f5891940e0 translate strings Trial97 2023-07-17 17:22:35 +03:00
• cd9310afed replace emplace with insert Trial97 2023-07-17 16:57:52 +03:00
• 64041a84a2 handle file removal in ExportToZipTask Trial97 2023-07-17 16:55:26 +03:00
• 78ee63af38 simplify modrinth export Trial97 2023-07-17 16:40:01 +03:00
• 455c495338 simplify flame export Trial97 2023-07-17 16:25:51 +03:00
• 0bf70d677e Upgraded ExportToZipTask Trial97 2023-07-17 16:24:43 +03:00
• 2be630904f fix: don't take modloaders by reference Sefa Eyeoglu 2023-07-17 14:33:01 +02:00
• 49cebc2da4 More consistent behaviour TheKodeToad 2023-07-17 12:49:12 +01:00
• 049abc9b1a Merge remote-tracking branch 'upstream/develop' into rename-groups TheKodeToad 2023-07-17 12:13:58 +01:00
• e8c44e700d Merge pull request #1286 from TayouVR/better-instance-group-separator Tayou 2023-07-17 11:55:31 +02:00
• 54a091ca59 fix: check if any modloader is installed Sefa Eyeoglu 2023-07-17 10:09:01 +02:00
• ec32618e11 reveted back to add years Trial97 2023-07-17 10:20:22 +03:00
• 7d6e07ea71 Merge pull request #1384 from PrismLauncher/backport-1357-to-release-7.x Sefa Eyeoglu 2023-07-17 06:43:57 +02:00
• cd011a097b chore: better explain quilt loader beacon seth 2023-07-13 20:57:38 -04:00
• 055bcc2721 feat: add toggle for quilt beacon seth 2023-07-12 21:10:48 -04:00
• aaf1726965 Merge pull request #1357 from getchoo/quilt-beacon Sefa Eyeoglu 2023-07-17 06:42:46 +02:00
• 6b970954d6 Merge pull request #1381 from getchoo/backporting-docs seth 2023-07-16 18:36:51 -04:00
• fb5aefffb2 Reduce bugginess TheKodeToad 2023-07-16 23:36:01 +01:00
• 20e2c70464 Rename groups and janky reference counting map TheKodeToad 2023-07-16 23:23:33 +01:00
• ed2f680202 chore(docs): add backporting info to CONTRIBUTING.md seth 2023-07-16 17:28:14 -04:00
• 4bc4b29d5b Merge pull request #1380 from PrismLauncher/backport-1276-to-release-7.x Sefa Eyeoglu 2023-07-16 23:20:05 +02:00
• 163c22ce4c TESTING: force an autoupdate seth 2023-07-16 17:08:42 -04:00
• 82a9e7d372 fix(actions): set all build platforms to official Sefa Eyeoglu 2023-06-26 11:58:47 +02:00
• cb81cadee3 fix: set default platform to "unknown" Sefa Eyeoglu 2023-06-26 11:55:48 +02:00
• 0d8283df97 feat: print build platform in application log Sefa Eyeoglu 2023-06-26 11:55:23 +02:00
• d4014534eb feat: print build platform in log Sefa Eyeoglu 2023-06-26 11:54:22 +02:00
• 3c5ec5d967 chore: remove obsolete macOS warning Sefa Eyeoglu 2023-06-26 11:53:14 +02:00
• 5e0df9b696 Merge pull request #1276 from Scrumplex/print-build-platform seth 2023-07-16 17:15:55 -04:00
• ec41252535 Update launcher/MMCZip.h Alexandru Ionut Tripon 2023-07-16 23:47:54 +03:00
• 4df9df03ab Update launcher/MMCZip.cpp Alexandru Ionut Tripon 2023-07-16 23:47:47 +03:00
• e3625cad91 Merge pull request #1369 from Trial97/autoselect Sefa Eyeoglu 2023-07-16 12:21:17 +02:00
• bb945c5165 Merge pull request #1368 from Trial97/crash_curse_import Tayou 2023-07-15 23:13:00 +02:00
• daa5fcce67 Merge pull request #1351 from Trial97/ftb_import Rachel Powers 2023-07-14 12:41:21 -07:00
• 2bcebe2989 Merge pull request #1336 from Ryex/packaging/fix-duplicate-share-directories seth 2023-07-14 14:19:44 -04:00
• 27f6debdaf Merge pull request #1306 from Ryex/ci/address-sanitiser_on_debug_builds Sefa Eyeoglu 2023-07-14 10:11:34 +02:00
• 7926170073 Merge pull request #1335 from Ryex/fix/gh-1322-old-zip-mods-in-wrong-place seth 2023-07-14 00:16:43 -04:00
• 79537f2948 Merge pull request #1352 from Trial97/crash_after_abort Rachel Powers 2023-07-13 21:11:47 -07:00
• 2b3021b7c2 Merge pull request #1345 from Trial97/time2 Tayou 2023-07-13 01:56:12 +02:00
• b11b86e026 Merge pull request #1350 from Trial97/fix_managed_pack_crash Rachel Powers 2023-07-12 09:55:31 -07:00
• a0ddd85b32 Merge pull request #1333 from Ryex/fix/null_instance_edit_crash Sefa Eyeoglu 2023-07-12 15:53:46 +02:00
• 6f86e8b66e Merge pull request #1331 from TheKodeToad/hungry-trash seth 2023-07-10 16:31:43 -04:00
• 6cd259becd Merge pull request #1337 from getchoo/fix-flake-workflow Rachel Powers 2023-07-09 14:11:33 -07:00
• d9de326f22 Merge pull request #1321 from TheKodeToad/mr-optional Rachel Powers 2023-07-09 14:03:47 -07:00
• 1d4cf0fd03 Merge pull request #1329 from Ryex/fix/progress_dialog_centering seth 2023-07-08 07:50:13 -04:00
• a65e4af365 Merge pull request #1302 from Ryex/fix/progress-dialog-segfault Rachel Powers 2023-07-07 21:25:14 -07:00
• 721ac015f3 Merge pull request #1325 from Scrumplex/validate-meta-url seth 2023-07-07 14:31:22 -04:00
• c5572a5e0b Merge pull request #1310 from getchoo/autoupdate-flake seth 2023-07-05 23:25:12 +00:00
• 81757717f7 Merge pull request #1284 from Ryex/fix/properly-track-failed-copies-and-clones Sefa Eyeoglu 2023-07-05 19:26:07 +02:00
• 1ab35357e9 Merge pull request #1304 from Scrumplex/chore-flake-update-1 seth 2023-07-04 22:43:00 +00:00
• 7025f75903 Merge pull request #1127 from Trial97/scale_cat Tayou 2023-07-03 15:46:56 +02:00
• 3cc68fcea4 Merge pull request #1232 from telans/screenshots-update TheKodeToad 2023-07-02 16:44:54 +01:00
• 34be098f12 Merge pull request #1298 from TurboWafflz/develop Sefa Eyeoglu 2023-07-02 09:52:59 +02:00
• fb5655085f Merge pull request #1292 from Trial97/export5 seth 2023-07-01 04:14:35 +00:00
• 316ef9b725 Merge pull request #1266 from TheKodeToad/smol-tweaks Sefa Eyeoglu 2023-06-28 08:47:53 +02:00
• 5fdbc9d75e Merge pull request #1280 from Trial97/shortcut seth 2023-06-27 20:01:48 +00:00
• 6464127d05 Merge pull request #1281 from Trial97/screenshot seth 2023-06-27 20:01:18 +00:00
• c349eff522 Merge pull request #1277 from Trial97/remove_mojang TheKodeToad 2023-06-26 23:09:27 +01:00
• 5fdf73a2ff Merge pull request #1274 from TheKodeToad/java-signature Sefa Eyeoglu 2023-06-26 11:19:53 +02:00
• 6963bfc6c9 Merge pull request #1275 from Scrumplex/git-blame-ignore Sefa Eyeoglu 2023-06-26 10:56:26 +02:00
• a25a5a7c9f Merge pull request #1065 from leo78913/gamescope-close-button Sefa Eyeoglu 2023-06-26 08:45:28 +02:00
• 20e9bf0e11 Merge pull request #1261 from telans/modrinthexport-url Sefa Eyeoglu 2023-06-24 10:51:14 +02:00
• 21ccf47ea7 Merge pull request #1255 from Trial97/export4 Rachel Powers 2023-06-23 21:40:55 -07:00
• 6856c2f922 Merge pull request #1259 from PrismLauncher/update-devs Rachel Powers 2023-06-23 21:38:16 -07:00
• e52fd9d4fe Merge pull request #1256 from Trial97/fix11 TheKodeToad 2023-06-23 19:53:44 +01:00
• 05056e1abf Merge pull request #1200 from Trial97/net_job_crash Rachel Powers 2023-06-23 09:13:52 -07:00
• 9df3c5d3c0 Merge pull request #1251 from getchoo/github-clarify seth 2023-06-22 17:13:00 -04:00
• 1a4ea3b1cd Merge pull request #1252 from getchoo/import-hehe seth 2023-06-22 17:12:35 -04:00
• 0a7a7d9bfd Merge pull request #1235 from ChrisLane/java-check-debug-msg-fix Tayou 2023-06-22 22:03:30 +02:00
• 8b017f9a5f Merge pull request #1243 from Trial97/export Sefa Eyeoglu 2023-06-22 08:09:31 +02:00
• b1fe4d1d93 Merge pull request #1228 from Trial97/curent_pack_crash TheKodeToad 2023-06-21 15:35:09 +01:00
• 80463f9761 Merge pull request #1231 from telans/modrinth-default-icon DioEgizio 2023-06-21 12:25:26 +02:00
• 567af5b22d Merge pull request #1233 from p2js/ui-consistency-fix TheKodeToad 2023-06-20 11:05:26 +01:00