aboutsummaryrefslogtreecommitdiff
path: root/launcher
AgeCommit message (Collapse)Author
2023-07-14Merge pull request #1335 from Ryex/fix/gh-1322-old-zip-mods-in-wrong-placeseth
fix(flame install): don't assume .zip is a resource pack. default to mod
2023-07-13Update launcher/minecraft/mod/tasks/LocalResourceParse.cppRachel Powers
Co-authored-by: seth <getchoo@tuta.io> Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
2023-07-13Merge pull request #1352 from Trial97/crash_after_abortRachel Powers
Do not reset shared pointer if it's already empty
2023-07-13Merge pull request #1345 from Trial97/time2Tayou
feat:Added option to use system locale
2023-07-12renamed settingTrial97
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-07-12Merge pull request #1350 from Trial97/fix_managed_pack_crashRachel Powers
fixed crash if no version is loaded on managed page
2023-07-12the other placeTrial97
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-07-12small pointer checkTrial97
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-07-12Merge pull request #1333 from Ryex/fix/null_instance_edit_crashSefa Eyeoglu
2023-07-12fixed crash if no version is loadedTrial97
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-07-11added missing headerTrial97
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-07-11feat:Added option to use system localeTrial97
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-07-10Merge pull request #1331 from TheKodeToad/hungry-trashseth
Fix updating trashing resources
2023-07-10Update launcher/ui/MainWindow.cppRachel Powers
Co-authored-by: TheKodeToad <TheKodeToad@proton.me> Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
2023-07-10Shortcuts on macOS (#1081)Nathan
Co-authored-by: TheKodeToad <TheKodeToad@proton.me>
2023-07-10Merge pull request #1334 from TheKodeToad/litemod-dlTheKodeToad
LiteMod downloading
2023-07-10Merge pull request #1249 from Trial97/curseTheKodeToad
Curseforge modpack export
2023-07-10Merge pull request #1338 from Trial97/unlockVersionPageTheKodeToad
feat:unlocked versions page
2023-07-09Merge pull request #1241 from Trial97/settingsTheKodeToad
Allow editing of running instances
2023-07-09Merge pull request #1332 from TheKodeToad/widebar-painRachel Powers
Fix crash when editing instance and prevent similar crashes in future
2023-07-09Merge pull request #1321 from TheKodeToad/mr-optionalRachel Powers
Optional mods in mrpack export
2023-07-09removed redundant codeTrial97
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-07-09feat:unlocked versions pageTrial97
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-07-09Replace string manipulation in favour of QFileInfoTheKodeToad
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2023-07-08LiteMod downloadingTheKodeToad
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2023-07-08fix(flame install): don't assume .zip is a resource pack. default to modRachel Powers
let identifier move it if needed Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
2023-07-08fix(instance edit): don't allow editing if no selected instance or instance ↵Rachel Powers
doesn't support editing Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
2023-07-08Fix actionVisitItemPage insersion, and prevent widebar segfaultTheKodeToad
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2023-07-08Make trash hungryTheKodeToad
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2023-07-08fix(progress dialog): if there is a parent center on creationRachel Powers
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
2023-07-07Merge pull request #1302 from Ryex/fix/progress-dialog-segfaultRachel Powers
fix: segfault in progress dialog
2023-07-08Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher ↵Trial97
into settings Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-07-07Merge pull request #1120 from Trial97/visit_mod_pageTayou
2023-07-07fix: improve QUrl constructionSefa Eyeoglu
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2023-07-07Update ModFolderPage.cppTheKodeToad
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2023-07-07Made action text simplerTrial97
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-07-07fix: reset invalid meta url on launchSefa Eyeoglu
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2023-07-07fix(ui): validate meta override urlSefa Eyeoglu
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2023-07-07Merge pull request #1128 from pandaninjas/fix-implicit-fallthroughSefa Eyeoglu
2023-07-06Optional mods in mrpack exportTheKodeToad
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2023-07-06better url handlingTrial97
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-07-06Keep formatting consistentPandaNinjas
Signed-off-by: PandaNinjas <admin@malwarefight.wip.la>
2023-07-05Merge pull request #1284 from Ryex/fix/properly-track-failed-copies-and-clonesSefa Eyeoglu
2023-07-04Fix VersionProxyModel.cppPandaNinjas
Signed-off-by: PandaNinjas <admin@malwarefight.wip.la>
2023-07-04Merge branch 'develop' into fix-implicit-fallthroughPandaNinjas
Signed-off-by: PandaNinjas <admin@malwarefight.wip.la>
2023-07-04Replace break with return true;PandaNinjas
Signed-off-by: PandaNinjas <admin@malwarefight.wip.la>
2023-07-04Remove break and add fallthrough comment in WorldListPage.cppPandaNinjas
Signed-off-by: PandaNinjas <admin@malwarefight.wip.la>
2023-07-04escaped modlist inner htmlTrial97
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-07-03Merge pull request #1127 from Trial97/scale_catTayou
2023-07-03fixed templateTrial97
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>