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

• ca4b58d5d7 Merge pull request #1405 from Trial97/update_file Alexandru Ionut Tripon 2023-10-10 16:17:08 +01:00
• 4eb8db16f1 Merge pull request #1543 from Trial97/packwiz Alexandru Ionut Tripon 2023-10-10 16:16:57 +01:00
• a7842ecc33 Merge pull request #1591 from Trial97/ftb_import_fix Alexandru Ionut Tripon 2023-10-10 16:16:40 +01:00
• 6150908025 Merge pull request #1658 from Trial97/neoforge_version Alexandru Ionut Tripon 2023-10-10 16:16:21 +01:00
• 5cb6d93136 fixed updater build Trial97 2023-10-09 22:25:45 +03:00
• 7e6a08548d Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feat/launcher-updater Trial97 2023-10-09 19:58:43 +03:00
• 11a0241b5c Merge pull request #1699 from GitMuslim/develop Sefa Eyeoglu 2023-10-09 17:25:11 +02:00
• 8eb8f167ab oops Muslim 2023-10-09 18:02:56 +03:00
• 5f5214e5dd add fullstop Muslim 2023-10-09 17:00:57 +03:00
• 04a7275280 Merge pull request #1695 from PrismLauncher/update_flake_lock_action Sefa Eyeoglu 2023-10-08 09:31:17 +02:00
• 05caa874bc chore(nix): update lockfile github-actions[bot] 2023-10-08 00:18:30 +00:00
• dc74ea7382 fixed wrong account selection Trial97 2023-10-06 19:27:26 +03:00
• 8d0a53273f Add no_color env variable Trial97 2023-10-06 18:42:54 +03:00
• bca5e8f395 Update launcher/minecraft/PackProfile.cpp Alexandru Ionut Tripon 2023-10-06 16:16:03 +03:00
• d49f81d132 Drop leftover mod loader settings TheKodeToad 2023-10-06 11:27:04 +01:00
• 82461b1113 rename for windows Trial97 2023-10-06 08:51:45 +03:00
• 4f1ee85424 check for minecraft java runtime Trial97 2023-10-06 00:21:37 +03:00
• b67c2c71d1 removed windows legacy builds Trial97 2023-10-05 22:44:49 +03:00
• a7bdfb5f6b Merge pull request #1682 from romangraef/addmorejavas Sefa Eyeoglu 2023-10-05 00:44:16 +02:00
• c6c17036e3 Add more Java installation dirs nea 2023-10-04 21:20:59 +02:00
• e913f61305 added a more strict condition for neoforge forge support Trial97 2023-10-04 19:29:37 +03:00
• c78d4e7bb6 added version test for snapshot Trial97 2023-10-04 19:16:21 +03:00
• 024c474658 Merge pull request #1678 from Trial97/release_order Tayou 2023-10-04 10:28:45 +02:00
• 03ad430699 Merge pull request #1537 from Trial97/warnings Sefa Eyeoglu 2023-10-04 09:40:38 +02:00
• ac38585a2a Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into release_order Trial97 2023-10-04 09:41:49 +03:00
• 3cba5adb5a updated dependency cycle Trial97 2023-10-04 09:41:40 +03:00
• d186c34385 Merge pull request #1676 from Trial97/release_order Sefa Eyeoglu 2023-10-04 07:43:21 +02:00
• 77979b4c95 revert back the release order Trial97 2023-10-03 17:23:26 +03:00
• 8069de29b2 fix folder attributes on windows copy Trial97 2023-10-02 18:03:00 +03:00
• 540fc7d2a8 Merge pull request #1670 from Trial97/seg_fault Tayou 2023-10-02 17:05:07 +02:00
• d612ab94a7 Merge pull request #1672 from Trial97/skin_refresh Sefa Eyeoglu 2023-10-02 16:06:12 +02:00
• bfa9613373 Merge pull request #1657 from Trial97/shader_txt Sefa Eyeoglu 2023-10-02 11:56:50 +02:00
• 93be8b0735 refresh default account when list changes Trial97 2023-10-02 09:13:02 +03:00
• 2cea7454ef fix: do not update mods if no mod loader is selected Trial97 2023-10-01 23:04:19 +03:00
• eab1180f68 Merge pull request #1090 from Ryex/feat/acknowledge_release_type Sefa Eyeoglu 2023-10-01 14:32:58 +02:00
• e3a147f56d Merge pull request #1656 from Trial97/remove_mojang2 Sefa Eyeoglu 2023-10-01 14:32:42 +02:00
• 898a719d3e Merge pull request #1668 from PrismLauncher/update_flake_lock_action Sefa Eyeoglu 2023-10-01 09:28:57 +02:00
• be8a9f6541 chore(nix): update lockfile github-actions[bot] 2023-10-01 00:19:50 +00:00
• 589ab24f7e Merge pull request #1666 from getchoo/driverlink Sefa Eyeoglu 2023-09-30 23:50:36 +02:00
• 317c7b5544 Update launcher/minecraft/auth/AccountList.cpp Alexandru Ionut Tripon 2023-10-01 00:32:17 +03:00
• 00bbbdc6e9 Update launcher/LaunchController.cpp Alexandru Ionut Tripon 2023-10-01 00:31:51 +03:00
• 84269f9596 refactor(nix): use addOpenGLRunpath.driverLink in wrapper seth 2023-09-30 12:50:26 -04:00
• 34294383eb added version type to dep update Trial97 2023-09-28 23:18:23 +03:00
• 4802f6950e Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feat/acknowledge_release_type Trial97 2023-09-28 23:06:18 +03:00
• 531b58093e Merge pull request #1263 from Trial97/develop Sefa Eyeoglu 2023-09-28 22:03:14 +02:00
• 2ff9ef0620 Merge pull request #1363 from Trial97/download_threads Sefa Eyeoglu 2023-09-28 22:02:57 +02:00
• 5b7c5607a9 removed flame consturctor Trial97 2023-09-28 22:53:40 +03:00
• 9acbf98f94 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feat/acknowledge_release_type Trial97 2023-09-28 22:50:12 +03:00
• bef701eba8 chaged folder again Trial97 2023-09-28 21:27:11 +03:00
• 742384909f updated portable update Trial97 2023-09-28 21:24:31 +03:00
• 606c12ffeb more fixing Trial97 2023-09-28 18:47:21 +03:00
• 498c9db1ce fixed appImageUpdate Trial97 2023-09-28 15:14:59 +03:00
• 59e565ef96 Merge pull request #1643 from bolli24/develop Sefa Eyeoglu 2023-09-27 17:34:32 +02:00
• f370f0d749 chore: cleanup a few more mentions of mojang accounts seth 2023-09-27 05:33:22 -04:00
• b8d9c3d779 format Trial97 2023-09-26 20:19:35 +03:00
• ebde563648 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feat/launcher-updater Trial97 2023-09-26 20:16:46 +03:00
• 4ee6a6711d Added version check for neoforge filter Trial97 2023-09-25 23:04:21 +03:00
• 86b47b3421 Do not display invalid shaders Trial97 2023-09-25 22:33:36 +03:00
• 7c636d4608 Removed mojang Trial97 2023-09-25 17:44:04 +03:00
• 0406e168e7 Merge pull request #1655 from 0xallie/minecraft-wiki-migration TheKodeToad 2023-09-25 15:26:37 +01:00
• 1684cff7ac Update links to Minecraft Wiki alexia 2023-09-25 15:46:22 +02:00
• ad9fb7349f Merge pull request #1647 from PrismLauncher/update_flake_lock_action Sefa Eyeoglu 2023-09-24 09:02:43 +02:00
• 14af7044be Update launcher/ui/dialogs/ModUpdateDialog.cpp bolli24 2023-09-24 03:01:47 +02:00
• fa65ac3ff7 chore(nix): update lockfile github-actions[bot] 2023-09-24 00:18:03 +00:00
• f3c089792a Skip folders when updating mods. bolli24 2023-09-22 21:10:27 +02:00
• 81a3ba18bc Update launcher/minecraft/mod/tasks/GetModDependenciesTask.cpp Alexandru Ionut Tripon 2023-09-20 18:45:23 +03:00
• 98bc102f5b Merge pull request #1618 from getchoo/cool-nix-stuff Sefa Eyeoglu 2023-09-20 07:47:22 +02:00
• 97da8892b9 chore(nix): add meta.mainProgram attribute seth 2023-09-19 13:45:52 -04:00
• 97ced1f459 fix(nix): include libusb1 as a runtime dependency seth 2023-09-19 13:45:12 -04:00
• a49851cb40 updated blocked mods with empty hash Trial97 2023-09-19 15:48:12 +03:00
• d72c3aba80 Merge pull request #1632 from PrismLauncher/update_flake_lock_action Sefa Eyeoglu 2023-09-17 09:30:30 +02:00
• 9afe80b0e0 chore(nix): update lockfile github-actions[bot] 2023-09-17 00:18:04 +00:00
• 00af385619 Merge pull request #1572 from Trial97/catpacks2 Sefa Eyeoglu 2023-09-16 18:22:13 +02:00
• bf6dc10f35 Merge pull request #1605 from TheKodeToad/flame-shaders Sefa Eyeoglu 2023-09-16 18:20:45 +02:00
• 4cb424470b Merge pull request #1619 from PrismLauncher/update_flake_lock_action seth 2023-09-10 15:57:03 -04:00
• 9445a555e4 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into packwiz Trial97 2023-09-10 16:24:59 +03:00
• 47d1f23568 added side for modrinth mods Trial97 2023-09-10 16:22:57 +03:00
• 82a0a5bca1 chore(nix): update lockfile github-actions[bot] 2023-09-10 00:17:57 +00:00
• 10192c540b feat(nix): add source filtering seth 2023-09-09 15:10:15 -04:00
• 6aa821df9c refactor(nix): match inputs value in flake seth 2023-09-09 14:34:38 -04:00
• 89e434bd5b refactor(nix): don't concat final attr in fixed point seth 2023-09-09 14:32:50 -04:00
• 78f8a31cd6 Merge pull request #1613 from PrismLauncher/renovate/actions-cache-3.x Sefa Eyeoglu 2023-09-08 23:28:03 +02:00
• e7d6be531f chore(deps): update actions/cache action to v3.3.2 renovate[bot] 2023-09-08 17:22:12 +00:00
• ba3a1b6280 Merge pull request #1606 from PrismLauncher/renovate/actions-checkout-4.x Sefa Eyeoglu 2023-09-04 17:11:45 +02:00
• d483b613b1 Merge pull request #1578 from TheKodeToad/antialiasing Sefa Eyeoglu 2023-09-04 17:05:29 +02:00
• cf599865f6 Merge pull request #1581 from getchoo/old-gcc Sefa Eyeoglu 2023-09-04 17:04:10 +02:00
• 546d49e183 Merge pull request #1530 from Trial97/metadata_delete Sefa Eyeoglu 2023-09-04 17:02:52 +02:00
• 7dd2530027 chore(deps): update actions/checkout action to v4 renovate[bot] 2023-09-04 15:02:01 +00:00
• e9ecdd05b9 Merge pull request #1574 from Scrumplex/refactor-flake Sefa Eyeoglu 2023-09-04 17:02:01 +02:00
• ad6f15f293 Merge pull request #1604 from PrismLauncher/renovate/cachix-install-nix-action-23.x Sefa Eyeoglu 2023-09-04 17:01:43 +02:00
• 94c1cd6bcf CurseForge shader downloading TheKodeToad 2023-09-04 14:13:44 +01:00
• e155844671 chore(deps): update cachix/install-nix-action action to v23 renovate[bot] 2023-09-04 10:22:11 +00:00
• 2918d61b16 refactor(nix): use pre-commit flake module Sefa Eyeoglu 2023-09-04 08:52:56 +02:00
• bbf4e3b04d refactor(nix): use fixed points over rec seth 2023-09-03 18:11:23 -04:00
• caf925cbad Merge pull request #1601 from PrismLauncher/update_flake_lock_action Sefa Eyeoglu 2023-09-03 09:42:31 +02:00
• 88f3e19f81 chore(nix): update lockfile github-actions[bot] 2023-09-03 00:17:45 +00:00
• 19b5a5e00b Remove final conflict - kept by mistake TheKodeToad 2023-09-02 22:38:14 +01:00
• 347228a246 Legacy settings override default -> false TheKodeToad 2023-09-02 22:29:26 +01:00
• 1213a5ab46 Merge remote-tracking branch 'upstream/develop' into skinfix TheKodeToad 2023-09-02 22:13:50 +01:00
• 17f696bffc small tweaks to atl icons Trial97 2023-09-01 22:25:15 +03:00