aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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
2023-08-20fixed status label after instance removeTrial97
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-08-20Merge pull request #1485 from getchoo/nix-darwinSefa Eyeoglu
2023-08-20Merge pull request #1547 from Scrumplex/revert-quilt-beaconTheKodeToad
Remove Quilt Beacon toggle
2023-08-20Revert "feat: add toggle for quilt beacon"Sefa Eyeoglu
This reverts commit 89aaedc06c3eb7a035d8be593a7bbe417cb2f712. Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2023-08-20Revert "chore: better explain quilt loader beacon"Sefa Eyeoglu
This reverts commit a2a09ffe01fe8eb6cd1f557b0feb98ed0271151e. Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2023-08-20Merge pull request #1544 from PrismLauncher/update_flake_lock_actionSefa Eyeoglu
2023-08-20chore(nix): update lockfilegithub-actions[bot]
Flake lock file updates: • Updated input 'nixpkgs': 'github:nixos/nixpkgs/f0451844bbdf545f696f029d1448de4906c7f753' (2023-08-12) → 'github:nixos/nixpkgs/ca3c9ac9f4cdd4bea19f592b32bb59b74ab7d783' (2023-08-19) • Updated input 'pre-commit-hooks': 'github:cachix/pre-commit-hooks.nix/c5ac3aa3324bd8aebe8622a3fc92eeb3975d317a' (2023-08-11) → 'github:cachix/pre-commit-hooks.nix/7e3517c03d46159fdbf8c0e5c97f82d5d4b0c8fa' (2023-08-17)
2023-08-19Merge pull request #1541 from Trial97/neoforge_searchTheKodeToad
feat:neoforge can download forge mods
2023-08-19Merge pull request #1320 from TheKodeToad/better-launchTheKodeToad
Combine launch buttons in instance window, persist profiler
2023-08-19chore: add fixme about UI code in MinecraftinstanceSefa Eyeoglu
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2023-08-19feat:neoforge can download forge modsTrial97
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-08-18Merge pull request #1498 from Scrumplex/neoforgeSefa Eyeoglu
2023-08-18more fixesTrial97
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-08-18fixed code scaningTrial97
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-08-18replaced removeFirst with midTrial97
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-08-18feat:refactored modpack uxTrial97
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-08-18Update launcher/ui/pages/global/MinecraftPage.uiAlexandru Ionut Tripon
Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net> Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
2023-08-18Merge pull request #1535 from Scrumplex/fix-skin-browse-btnTheKodeToad
Fix browse button size in Skin Upload dialog
2023-08-18feat:added option to show playtime in hoursTrial97
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-08-18fix: fix browse button size in skin upload dialogSefa Eyeoglu
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2023-08-17chore: reformatSefa Eyeoglu
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2023-08-17Flame support for neoforgeTrial97
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-08-17fix: add theoretical support for NeoForge in FTB modpacksSefa Eyeoglu
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2023-08-17ReformatTheKodeToad
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2023-08-17Merge pull request #1392 from Scrumplex/feat-native-overrideSefa Eyeoglu
2023-08-17Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher ↵Trial97
into curseforge-url-handle
2023-08-17I was forced TheKodeToad
/j Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net> Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2023-08-17Merge pull request #981 from Ryex/curseforge-url-handleSefa Eyeoglu
2023-08-17Merge branch 'curseforge-url-handle' of github.com:Trial97/PrismLauncher ↵Trial97
into curseforge-url-handle
2023-08-17removed lineTrial97
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-08-16Merge branch 'develop' into better-launchTheKodeToad
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2023-08-17feat:added flame install mod metadataTrial97
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-08-17removed lineTrial97
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-08-16Merge pull request #1524 from ↵Sefa Eyeoglu
PrismLauncher/renovate/korthout-backport-action-1.x
2023-08-16Merge pull request #1523 from Trial97/atlauncherSefa Eyeoglu
Fix crash when installing some ATLauncher packs
2023-08-15chore(deps): update korthout/backport-action action to v1.4.0renovate[bot]
2023-08-15fixed crash on atlauncher pack installTrial97
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-08-15Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher ↵Trial97
into curseforge-url-handle3 Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-08-15fix: allow NeoForge in resource APIsSefa Eyeoglu
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2023-08-15feat: support NeoForge mrpack modpacksSefa Eyeoglu
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2023-08-15feat: add NeoForge to UIsSefa Eyeoglu
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2023-08-15feat: add NeoForge to ModLoaderTypeSefa Eyeoglu
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2023-08-15Merge pull request #1513 from lumiscosity/fix/skin_transparency_bugSefa Eyeoglu