Commit Graph

  • 79652799bd Made text smaller Trial97 2023-08-27 21:30:46 +03:00
  • 630145a1d0 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into welcome_background Trial97 2023-08-27 21:03:21 +03:00
  • 0680d2dceb Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into develop Trial97 2023-08-27 20:41:56 +03:00
  • 9110fbf282 Merge pull request #1560 from Trial97/curse_multiple_loaders2 TheKodeToad 2023-08-27 18:21:14 +01:00
  • e3b04d10cf Merge pull request #1536 from Trial97/time3 TheKodeToad 2023-08-27 18:14:04 +01:00
  • 8c607ae734 removed extra if Trial97 2023-08-27 20:02:12 +03:00
  • c5aac24a93 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into curse_multiple_loaders2 Trial97 2023-08-27 15:53:35 +03:00
  • 4036cecfc0 Added progress widget to some modpack providers Trial97 2023-08-27 15:04:42 +03:00
  • df14f88307 Merge pull request #1532 from Trial97/curseforge-url-handle Sefa Eyeoglu 2023-08-27 12:26:57 +02:00
  • 29736b3b1f Merge pull request #1570 from PrismLauncher/update_flake_lock_action seth 2023-08-27 01:47:58 -04:00
  • 9735e46a7e chore(nix): update lockfile github-actions[bot] 2023-08-27 00:17:22 +00:00
  • 479335dfe0 Rewrite optional mod dialog TheKodeToad 2023-08-27 00:49:21 +01:00
  • d1566f2610 Merge branch 'develop' into env-vars TheKodeToad 2023-08-26 23:12:02 +01:00
  • a2d44744fe do not update the metadata if mod is invalid Trial97 2023-08-26 23:36:46 +03:00
  • 288d0d1fd4 Added back api loader filtering if just one is selected Trial97 2023-08-26 22:26:01 +03:00
  • abfd1a4205 minor dependency crash fix Trial97 2023-08-25 18:35:25 +03:00
  • 094cee8ec6 Merge pull request #1561 from Scrumplex/nix-miscs Sefa Eyeoglu 2023-08-25 10:08:53 +02:00
  • c54fecf5d9 added condition for empty loader type Trial97 2023-08-25 09:05:04 +03:00
  • 172680abf8 removed aditional header Trial97 2023-08-24 13:42:36 +03:00
  • 5f3e9672cd made the loaders check more generic Trial97 2023-08-24 13:31:57 +03:00
  • f897b14e3e changed technic icon name retrival Trial97 2023-08-24 13:05:27 +03:00
  • bb4b89470d fixed icon importing Trial97 2023-08-24 12:46:23 +03:00
  • 2990c5d0c9 Added optional mods dialog Trial97 2023-08-24 12:44:11 +03:00
  • ea384d59fb use qt separtor for file path Trial97 2023-08-24 12:41:37 +03:00
  • 3e448904a3 Merge pull request #1562 from PrismLauncher/renovate/determinatesystems-update-flake-lock-20.x Sefa Eyeoglu 2023-08-24 08:11:30 +02:00
  • 783af2c06a chore(deps): update determinatesystems/update-flake-lock action to v20 renovate[bot] 2023-08-24 04:32:25 +00:00
  • 6c0492c0d1 return 0 for any Trial97 2023-08-23 21:09:32 +03:00
  • 1515607060 updated getMappedModLoader Trial97 2023-08-23 20:16:51 +03:00
  • 41bd008f5d chore(nix): remove pre-commit tools from shell Sefa Eyeoglu 2023-08-23 13:49:09 +02:00
  • d7b6450613 fix(nix): reload direnv if parts change Sefa Eyeoglu 2023-08-23 13:47:04 +02:00
  • 85c23b26de chore: reformat Sefa Eyeoglu 2023-08-23 13:46:23 +02:00
  • 095de5ed4b chore(nix): update clang-format to clang-tools 16 Sefa Eyeoglu 2023-08-23 13:46:04 +02:00
  • 6178e5a975 reverted change for optional Trial97 2023-08-23 13:36:31 +03:00
  • aa065f2b51 Updated dependency resolution Trial97 2023-08-23 13:28:23 +03:00
  • 59ec0135d7 Merge pull request #1559 from Scrumplex/nix-canonicalize-jars Sefa Eyeoglu 2023-08-23 12:23:26 +02:00
  • 2283498ccb Merge pull request #1552 from Trial97/memory_quick_setup Sefa Eyeoglu 2023-08-23 11:56:53 +02:00
  • e6ba2f4970 Added loaders check on versions load Trial97 2023-08-23 12:52:51 +03:00
  • b93cd88292 fix(nix): add canonicalize-jars-hook Sefa Eyeoglu 2023-08-23 11:52:31 +02:00
  • f8f9ffa118 added loaders for flame version Trial97 2023-08-23 11:33:45 +03:00
  • 4704c522e0 moved modloaderTypes to ModPlatform Trial97 2023-08-23 10:26:57 +03:00
  • f7951f6082 Merge pull request #1548 from Trial97/version_label TheKodeToad 2023-08-22 15:14:02 +01:00
  • eed7e996da Update launcher/ui/widgets/JavaSettingsWidget.cpp Alexandru Ionut Tripon 2023-08-22 16:17:05 +03:00
  • 06dbd381f8 Update launcher/ui/pages/instance/InstanceSettingsPage.cpp Alexandru Ionut Tripon 2023-08-22 16:16:57 +03:00
  • 3574d89e0f Update launcher/ui/pages/global/JavaPage.cpp Alexandru Ionut Tripon 2023-08-22 16:16:50 +03:00
  • 0e96111116 Merge pull request #1556 from Trial97/metacache TheKodeToad 2023-08-22 14:09:44 +01:00
  • 09aca7a0b5 Added warning to settings page Trial97 2023-08-22 10:52:35 +03:00
  • b1783d8fb1 Merge pull request #1557 from Trial97/curse_crash Sefa Eyeoglu 2023-08-21 23:04:45 +02:00
  • c3d03f0c33 added check for valid query items in curse url install Trial97 2023-08-21 22:20:33 +03:00
  • 7acfe36a62 fixed httpmetacache load Trial97 2023-08-21 21:30:44 +03:00
  • bf810053b7 updated instance copy Trial97 2023-08-21 17:21:11 +03:00
  • 45dad27a6d fixed check Trial97 2023-08-21 17:46:50 +03:00
  • fff378b643 Merge pull request #1553 from TheKodeToad/list-fixes TheKodeToad 2023-08-21 15:33:16 +01:00
  • d7dadabfbf List fixes TheKodeToad 2023-08-21 13:55:28 +01:00
  • 1eb75b6852 fixed build Trial97 2023-08-21 15:34:45 +03:00
  • 492bf373c6 updated memory allocation on quick setup Trial97 2023-08-21 15:00:11 +03:00
  • 02264f67f3 Fixed codeql Trial97 2023-08-21 14:15:51 +03:00
  • fcb436f1f4 Merge pull request #1551 from dannydorazio/develop Sefa Eyeoglu 2023-08-21 08:29:25 +02:00
  • e2e0a7af45 DCO Remediation Commit for Danny Dorazio <danny@dorazio.me> Danny Dorazio 2023-08-21 01:24:23 -04:00
  • c50c3eaa94 DCO Remediation Commit for Danny Dorazio <hello@dorazio.me> Danny Dorazio 2023-08-21 01:21:48 -04:00
  • 3638fc0a7d Update “Welcome” message on account list page Danny Dorazio 2023-08-20 23:00:50 -04:00
  • 8092c321a9 Replace instances of “Minecraft account” Danny Dorazio 2023-08-20 23:00:25 -04:00
  • 8e5be6f420 added suport for atlauncher browser download Trial97 2023-08-21 00:09:46 +03:00
  • 19316e22b4 fixed status label after instance remove Trial97 2023-08-20 22:46:44 +03:00
  • 5c95448f1f Merge pull request #1485 from getchoo/nix-darwin Sefa Eyeoglu 2023-08-20 21:20:09 +02:00
  • 254444470f renamed enum type Trial97 2023-08-20 16:40:58 +03:00
  • 0aaea9bf5d Merge pull request #1547 from Scrumplex/revert-quilt-beacon TheKodeToad 2023-08-20 12:43:49 +01:00
  • 5b4dcae7d9 Revert "feat: add toggle for quilt beacon" Sefa Eyeoglu 2023-08-20 13:17:17 +02:00
  • 963627fe98 Revert "chore: better explain quilt loader beacon" Sefa Eyeoglu 2023-08-20 13:16:02 +02:00
  • 232bb568da Merge pull request #1544 from PrismLauncher/update_flake_lock_action Sefa Eyeoglu 2023-08-20 12:01:37 +02:00
  • d3c7850f53 chore(nix): update lockfile github-actions[bot] 2023-08-20 00:16:56 +00:00
  • ebbc8838a8 Merge pull request #1541 from Trial97/neoforge_search TheKodeToad 2023-08-19 23:10:56 +01:00
  • d25e89a4c1 refactor packwiz file write Trial97 2023-08-20 00:48:46 +03:00
  • f99b04bd16 Merge pull request #1320 from TheKodeToad/better-launch TheKodeToad 2023-08-19 11:08:02 +01:00
  • acf586ef82 chore: add fixme about UI code in Minecraftinstance Sefa Eyeoglu 2023-08-19 10:21:46 +02:00
  • 0138cd65cb feat:neoforge can download forge mods Trial97 2023-08-19 09:00:59 +03:00
  • ab6301d5a1 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into develop Trial97 2023-08-19 00:38:40 +03:00
  • 3098aecf97 Merge pull request #1498 from Scrumplex/neoforge Sefa Eyeoglu 2023-08-18 22:56:55 +02:00
  • 05094b7382 more fixes Trial97 2023-08-18 22:24:30 +03:00
  • 58efd3e9e2 fixed code scaning Trial97 2023-08-18 21:43:57 +03:00
  • 4c52b18bdd replaced removeFirst with mid Trial97 2023-08-18 20:19:51 +03:00
  • 44ff247f5f feat:refactored modpack ux Trial97 2023-08-18 20:03:02 +03:00
  • fecc1e087a Add Trial97 to contribuitors list Trial97 2023-08-18 13:35:50 +03:00
  • d3acac16e6 added -Wno-gnu-zero-variadic-macro-arguments and fixed more warnings Trial97 2023-08-18 13:10:13 +03:00
  • 28ffa8bf44 Update launcher/ui/pages/global/MinecraftPage.ui Alexandru Ionut Tripon 2023-08-18 12:57:08 +03:00
  • eb4efa5a9c Merge pull request #1535 from Scrumplex/fix-skin-browse-btn TheKodeToad 2023-08-18 10:47:42 +01:00
  • 6d1c67663d feat:added option to show playtime in hours Trial97 2023-08-18 12:24:28 +03:00
  • f4ebeedc21 fix: fix browse button size in skin upload dialog Sefa Eyeoglu 2023-08-18 09:01:57 +02:00
  • 907c2fd19c added missing header Trial97 2023-08-18 09:16:17 +03:00
  • be2888d6fb chore: reformat Sefa Eyeoglu 2023-08-17 22:23:50 +02:00
  • 7ab391904a Flame support for neoforge Trial97 2023-08-15 14:13:29 +03:00
  • aac734d174 fix: add theoretical support for NeoForge in FTB modpacks Sefa Eyeoglu 2023-08-17 22:20:43 +02:00
  • ffd8ed550f Reformat TheKodeToad 2023-08-17 10:16:52 +01:00
  • c5bac475e8 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into develop Trial97 2023-08-17 17:29:57 +03:00
  • e88418ab7f Merge pull request #1392 from Scrumplex/feat-native-override Sefa Eyeoglu 2023-08-17 16:09:16 +02:00
  • 42b06674bb Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into import_zip Trial97 2023-08-17 15:29:11 +03:00
  • bc0934a19c Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into curseforge-url-handle Trial97 2023-08-17 15:25:32 +03:00
  • 044ce4df32 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into update_file Trial97 2023-08-17 15:24:14 +03:00
  • 758999fa64 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into welcome_background Trial97 2023-08-17 15:23:22 +03:00
  • 71fd02e50e Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into netjob_retry Trial97 2023-08-17 15:22:45 +03:00
  • 4a1d85f999 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into develop Trial97 2023-08-17 14:23:37 +03:00