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

• b1aa9e5846 refactor: introduce internal Launcher_ENABLE_UPDATER variable Sefa Eyeoglu 2023-07-27 09:37:56 +02:00
• 51bfda937d chore: don't include sparkle when not enabled seth 2023-07-27 00:59:01 -04:00
• 4a9ea832ff Ignore cache files entirely, also apply to modpack export LostLuma 2023-07-27 01:42:14 +02:00
• a8498b0dab chore: make INSTALL_BUNDLE a cached variable seth 2023-07-26 19:03:14 -04:00
• 48e5040196 feat: disable sparkle when update url is empty seth 2023-07-26 17:27:52 -04:00
• 928e18b66d Merge pull request #1446 from getchoo/nix-fixes seth 2023-07-26 17:10:07 -04:00
• 62aa7a52c4 fiexed conflicts Trial97 2023-07-27 00:07:38 +03:00
• 3c472fd7e0 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into prism_export2 Trial97 2023-07-27 00:05:59 +03:00
• b15f689ccf Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into refactor/NetActions Trial97 2023-07-27 00:03:42 +03:00
• d960effb99 Merge pull request #1447 from getchoo/typomoment Sefa Eyeoglu 2023-07-26 22:56:31 +02:00
• 1e82cb6a7c fix: add support for QByteArray inifile Trial97 2023-07-26 23:56:01 +03:00
• 31b62203a7 Update launcher/ui/MainWindow.cpp Alexandru Ionut Tripon 2023-07-26 23:44:35 +03:00
• af59c41713 fix: typo in task.h seth 2023-07-26 16:20:30 -04:00
• f7ffbcca6c chore(docs): correct markdownlint warnings seth 2023-07-26 14:45:30 -04:00
• 342a0d0091 fix(nix): disable x86_64-darwin seth 2023-07-26 14:47:47 -04:00
• 1974bb7e59 chore(ci): cleanup garnix.yaml seth 2023-07-26 14:34:11 -04:00
• 88be40c4bf Merge pull request #1444 from PrismLauncher/backport-1438-to-release-7.x Sefa Eyeoglu 2023-07-26 20:48:01 +02:00
• e6b4fc9182 removed quilt warning Trial97 2023-07-26 21:36:40 +03:00
• c778dcbc9c Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into curse Trial97 2023-07-26 21:33:15 +03:00
• d6095358ad fix: fix typo in README Sefa Eyeoglu 2023-07-26 14:48:53 +02:00
• f7f2049223 chore: update information for downstreams Sefa Eyeoglu 2023-07-26 14:38:32 +02:00
• a0944dab7a Merge pull request #1438 from Scrumplex/update-docs Sefa Eyeoglu 2023-07-26 20:30:04 +02:00
• 719d87de3b Update MainWindow.ui TheKodeToad 2023-07-26 17:21:12 +01:00
• 816acc9c76 Open catpak folder action TheKodeToad 2023-07-26 17:17:02 +01:00
• cc43485650 Merge pull request #1442 from PrismLauncher/backport-1434-to-release-7.x Sefa Eyeoglu 2023-07-26 16:23:21 +02:00
• b92d617df0 chore(ci): remove nix job seth 2023-07-25 19:22:48 -04:00
• 7b971a08a8 feat(ci): init garnix.yaml seth 2023-07-25 19:04:22 -04:00
• a9fefb2eeb Address review comments LostLuma 2023-07-26 15:22:22 +02:00
• 4ad448993c fix: fix typo in README Sefa Eyeoglu 2023-07-26 14:48:53 +02:00
• bcadffa0e3 Merge pull request #1434 from getchoo/garnix Sefa Eyeoglu 2023-07-26 14:47:14 +02:00
• 7cc3d34498 Merge pull request #1441 from PrismLauncher/backport-1427-to-release-7.x Sefa Eyeoglu 2023-07-26 14:46:53 +02:00
• d9df60368c Delete some incorrect notr="true" tags tjw123hh 2023-07-25 17:35:31 +08:00
• ba49afcc6a Update org.prismlauncher.PrismLauncher.desktop.in tjw123hh 2023-07-24 20:50:11 +08:00
• 685badb8cf DCO Remediation Commit for tjw123hh <tjw123hh@outlook.com> tjw123hh 2023-07-24 20:48:27 +08:00
• 29fde6a322 Delete some incorrect tags tjw123hh 2023-07-24 20:41:22 +08:00
• ce2d2c9f32 Merge pull request #1427 from tjw123hh/develop TheKodeToad 2023-07-26 13:41:54 +01:00
• e65d48bf36 Merge pull request #1440 from PrismLauncher/backport-1420-to-release-7.x Sefa Eyeoglu 2023-07-26 14:41:17 +02:00
• 38144b3661 Merge pull request #1439 from PrismLauncher/backport-1419-to-release-7.x Sefa Eyeoglu 2023-07-26 14:41:08 +02:00
• 3a0e30684e chore(nix): update lockfile github-actions[bot] 2023-07-23 00:21:25 +00:00
• 0fe184251d Update libnbtplusplus submodule PandaNinjas 2023-07-22 14:26:49 -04:00
• 6f652e1d2f chore: update information for downstreams Sefa Eyeoglu 2023-07-26 14:38:32 +02:00
• 55207a58a6 fix(packaging): only exclude *some* folders in win>=2h1h feature/msix seth 2023-07-26 00:44:28 -04:00
• 361583edfc Ignore cache files when exporting instances LostLuma 2023-07-26 03:08:38 +02:00
• fbf29274e8 chore(ci): remove nix job seth 2023-07-25 19:22:48 -04:00
• 3c35d647b8 feat(ci): init garnix.yaml seth 2023-07-25 19:04:22 -04:00
• b4159d30fc Revert permission change TheKodeToad 2023-07-25 15:17:20 +01:00
• f51a66dad5 Merge pull request #1432 from TheKodeToad/revert-revert-hide-provider-column 7.2 Tayou 2023-07-25 14:32:07 +02:00
• 071e86fe68 Revert "Revert "feat(Mods): hide 'Provider' column when no mods have providers"" TheKodeToad 2023-07-25 12:27:50 +01:00
• f843d0732b Merge branch 'develop' of https://github.com/tjw123hh/PrismLauncher into develop tjw123hh 2023-07-25 17:36:38 +08:00
• 280f041acb Delete some incorrect notr="true" tags tjw123hh 2023-07-25 17:35:31 +08:00
• d7a02ee456 Merge pull request #1428 from PrismLauncher/backport-1426-to-release-7.x Sefa Eyeoglu 2023-07-24 20:42:05 +02:00
• 648a69594f Fix token "0" being replaced TheKodeToad 2023-07-24 13:43:26 +01:00
• 4f00012268 Merge pull request #1426 from TheKodeToad/token-censor-fix Sefa Eyeoglu 2023-07-24 20:41:23 +02:00
• 4ab630b832 Update org.prismlauncher.PrismLauncher.desktop.in tjw123hh 2023-07-24 20:50:11 +08:00
• a32ca43288 DCO Remediation Commit for tjw123hh <tjw123hh@outlook.com> tjw123hh 2023-07-24 20:48:27 +08:00
• f505d43fc0 Fix token "0" being replaced TheKodeToad 2023-07-24 13:43:26 +01:00
• 6a01c277e8 Delete some incorrect tags tjw123hh 2023-07-24 20:41:22 +08:00
• 684c2ec47a Merge pull request #1420 from PrismLauncher/update_flake_lock_action Sefa Eyeoglu 2023-07-23 11:45:31 +02:00
• 273d75fd51 Merge pull request #1419 from pandaninjas/update-libnbtplusplus seth 2023-07-22 20:41:27 -04:00
• 6f6b0b9661 chore(nix): update lockfile github-actions[bot] 2023-07-23 00:21:25 +00:00
• 2253100ac6 Update libnbtplusplus submodule PandaNinjas 2023-07-22 14:26:49 -04:00
• b31644e228 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into refactor/NetActions Trial97 2023-07-22 18:16:03 +03:00
• 57430fd189 Merge branch 'develop' into better-launch TheKodeToad 2023-07-22 11:26:02 +01:00
• 6ffcfcd7e9 Merge pull request #1402 from Trial97/flame_import TheKodeToad 2023-07-22 11:14:12 +01:00
• 516ddb22ae More catpack changes :3 This is just embarrasing TheKodeToad 2023-07-21 17:58:48 +01:00
• 70fdfd1526 Merge pull request #1416 from PrismLauncher/bump-7.2 Sefa Eyeoglu 2023-07-21 23:01:04 +02:00
• 1e324e3e2f Bump to 7.2 TheKodeToad 2023-07-21 21:44:51 +01:00
• 8bbe307a31 chore: trigger build Sefa Eyeoglu 2023-07-21 21:54:44 +02:00
• 0b74b3833a Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into import Trial97 2023-07-21 19:30:06 +03:00
• ef21879df4 replaced require with ensure for jvmArgs Trial97 2023-07-21 19:30:00 +03:00
• ad92c30472 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into welcome_background Trial97 2023-07-21 19:12:16 +03:00
• bfafbdc51e Merge branch 'develop' into env-vars TheKodeToad 2023-07-21 14:30:24 +01:00
• 1a7c5693cc Remove redundant methods TheKodeToad 2023-07-21 13:01:01 +01:00
• f8b935ab37 Merge remote-tracking branch 'upstream/develop' into icon-indexing TheKodeToad 2023-07-21 12:48:05 +01:00
• 8705e88e91 Fix build on Windows TheKodeToad 2023-07-21 11:19:55 +01:00
• 0be4db30eb Merge branch 'PrismLauncher:develop' into better-component-installation TheKodeToad 2023-07-21 11:02:57 +01:00
• 821dd8400b Merge pull request #1253 from Trial97/catpacks Sefa Eyeoglu 2023-07-21 11:11:12 +02:00
• c37e1fb9f1 Merge branch 'develop' into skinfix TheKodeToad 2023-07-20 18:11:27 +01:00
• 5088d33fd2 Finish things :P TheKodeToad 2023-07-20 14:16:44 +01:00
• 39f7bea53e Revert accidental change in MainWindow TheKodeToad 2023-07-20 14:13:29 +01:00
• 842f08dcfc (UX) Add open folder button next to combo boxes TheKodeToad 2023-07-20 11:51:44 +01:00
• f8d9cd9a03 use range for Trial97 2023-07-19 23:08:16 +03:00
• 960093700a Better theme reset TheKodeToad 2023-07-19 20:57:08 +01:00
• 54d393632d Automatically create theme folders, and add an action to open them TheKodeToad 2023-07-19 16:29:52 +01:00
• c633c6d083 Colors->Widgets TheKodeToad 2023-07-19 14:17:17 +01:00
• 96ebdfc9a8 Sorting and invalid reset TheKodeToad 2023-07-19 14:12:39 +01:00
• f55120654a Merge branch 'PrismLauncher:develop' into icon-indexing TheKodeToad 2023-07-19 12:51:26 +01:00
• 44ca7c7d22 Licenses TheKodeToad 2023-07-19 12:29:51 +01:00
• 58c2059e10 Remove recursion It will add icon packs which aren't available - as QIcon's search paths are not recursed! TheKodeToad 2023-07-19 10:38:56 +01:00
• b7bccb9058 removed subdirectory flag Trial97 2023-07-19 12:27:02 +03:00
• f046bd7d50 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into catpacks Trial97 2023-07-19 12:26:12 +03:00
• 593f452986 Merge pull request #1399 from Scrumplex/offline-uuid TheKodeToad 2023-07-19 10:16:27 +01:00
• c946b2c4fb Merge pull request #1408 from PrismLauncher/backport-1372-to-release-7.x Sefa Eyeoglu 2023-07-19 08:36:56 +02:00
• 2dcfab0a19 chore(nix): update lockfile github-actions[bot] 2023-07-16 00:23:55 +00:00
• 97662f5c8e Multiple icon themes! TheKodeToad 2023-07-18 22:50:43 +01:00
• b0b9b89bce Merge pull request #1406 from PrismLauncher/backport-1397-to-release-7.x TheKodeToad 2023-07-18 22:46:05 +01:00
• 862f4fb061 Make Launch Offline not launch online in 1.6+ Josiah Glosson 2023-07-17 17:07:06 -05:00
• f8d88cc83d Merge pull request #1372 from PrismLauncher/update_flake_lock_action seth 2023-07-18 21:19:58 +00:00
• f393aa684e wait to load metadata Trial97 2023-07-18 23:59:43 +03:00
• 4c319c8f4f Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into flame_import Trial97 2023-07-18 23:49:52 +03:00