aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2023-08-27added catpacks testsTrial97
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-08-27Merge pull request #1560 from Trial97/curse_multiple_loaders2TheKodeToad
Add suport for flame multiple loaders
2023-08-27Merge pull request #1536 from Trial97/time3TheKodeToad
Allow showing playtime in hours
2023-08-27removed extra ifTrial97
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-08-27Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher ↵Trial97
into curse_multiple_loaders2 Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-08-27Added progress widget to some modpack providersTrial97
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-08-27Merge pull request #1532 from Trial97/curseforge-url-handleSefa Eyeoglu
2023-08-27Merge pull request #1570 from PrismLauncher/update_flake_lock_actionseth
chore(nix): update lockfile
2023-08-27chore(nix): update lockfilegithub-actions[bot]
Flake lock file updates: • Updated input 'nixpkgs': 'github:nixos/nixpkgs/ca3c9ac9f4cdd4bea19f592b32bb59b74ab7d783' (2023-08-19) → 'github:nixos/nixpkgs/c66ccfa00c643751da2fd9290e096ceaa30493fc' (2023-08-26)
2023-08-26Added back api loader filtering if just one is selectedTrial97
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-08-25minor dependency crash fixTrial97
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-08-25Merge pull request #1561 from Scrumplex/nix-miscsSefa Eyeoglu
2023-08-25added condition for empty loader typeTrial97
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-08-24removed aditional headerTrial97
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-08-24made the loaders check more genericTrial97
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-08-24Merge pull request #1562 from ↵Sefa Eyeoglu
PrismLauncher/renovate/determinatesystems-update-flake-lock-20.x chore(deps): update determinatesystems/update-flake-lock action to v20
2023-08-24chore(deps): update determinatesystems/update-flake-lock action to v20renovate[bot]
2023-08-23return 0 for anyTrial97
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-08-23updated getMappedModLoaderTrial97
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-08-23chore(nix): remove pre-commit tools from shellSefa Eyeoglu
use `pre-commit` CLI instead! Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2023-08-23fix(nix): reload direnv if parts changeSefa Eyeoglu
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2023-08-23chore: reformatSefa Eyeoglu
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2023-08-23chore(nix): update clang-format to clang-tools 16Sefa Eyeoglu
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2023-08-23reverted change for optionalTrial97
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-08-23Updated dependency resolutionTrial97
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-08-23Merge pull request #1559 from Scrumplex/nix-canonicalize-jarsSefa Eyeoglu
2023-08-23Merge pull request #1552 from Trial97/memory_quick_setupSefa Eyeoglu
2023-08-23Added loaders check on versions loadTrial97
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-08-23fix(nix): add canonicalize-jars-hookSefa Eyeoglu
See https://github.com/NixOS/nixpkgs/pull/250757 Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2023-08-23added loaders for flame versionTrial97
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-08-23moved modloaderTypes to ModPlatformTrial97
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-08-22Merge pull request #1548 from Trial97/version_labelTheKodeToad
Reset status label when deleting instance
2023-08-22Update launcher/ui/widgets/JavaSettingsWidget.cppAlexandru Ionut Tripon
Co-authored-by: Tayou <31988415+TayouVR@users.noreply.github.com> Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
2023-08-22Update launcher/ui/pages/instance/InstanceSettingsPage.cppAlexandru Ionut Tripon
Co-authored-by: Tayou <31988415+TayouVR@users.noreply.github.com> Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
2023-08-22Update launcher/ui/pages/global/JavaPage.cppAlexandru Ionut Tripon
Co-authored-by: Tayou <31988415+TayouVR@users.noreply.github.com> Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
2023-08-22Merge pull request #1556 from Trial97/metacacheTheKodeToad
Gracefully handle invalid cache metadata
2023-08-22Added warning to settings pageTrial97
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-08-21Merge pull request #1557 from Trial97/curse_crashSefa Eyeoglu
2023-08-21added check for valid query items in curse url installTrial97
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-08-21fixed httpmetacache loadTrial97
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-08-21fixed checkTrial97
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-08-21Merge pull request #1553 from TheKodeToad/list-fixesTheKodeToad
A few boring list-related fixes
2023-08-21List fixesTheKodeToad
Double-click to toggle profile components. Restore double-click to toggle resources. Fix clicking on checkbox to select account. Double-click to select account. Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2023-08-21fixed buildTrial97
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-08-21updated memory allocation on quick setupTrial97
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-08-21Merge pull request #1551 from dannydorazio/developSefa Eyeoglu
2023-08-21DCO Remediation Commit for Danny Dorazio <danny@dorazio.me>Danny Dorazio
I, Danny Dorazio <danny@dorazio.me>, hereby add my Signed-off-by to this commit: 8092c321a943ab64faab2c15ee5c44b83b56289d I, Danny Dorazio <danny@dorazio.me>, hereby add my Signed-off-by to this commit: 3638fc0a7db049e83e7e4ffab0d2100b9e2e7c58 I, Danny Dorazio <danny@dorazio.me>, hereby add my Signed-off-by to this commit: c50c3eaa94409fe418d87c7cbeaafcc5d135ee46 Signed-off-by: Danny Dorazio <danny@dorazio.me>
2023-08-21DCO Remediation Commit for Danny Dorazio <hello@dorazio.me>Danny Dorazio
I, Danny Dorazio <hello@dorazio.me>, hereby add my Signed-off-by to this commit: 8092c321a943ab64faab2c15ee5c44b83b56289d I, Danny Dorazio <hello@dorazio.me>, hereby add my Signed-off-by to this commit: 3638fc0a7db049e83e7e4ffab0d2100b9e2e7c58 Signed-off-by: Danny Dorazio <hello@dorazio.me>
2023-08-20Update “Welcome” message on account list pageDanny Dorazio
2023-08-20Replace instances of “Minecraft account”Danny Dorazio