aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2023-07-16Merge pull request #1246 from Trial97/exportSefa Eyeoglu
2023-07-16Merge pull request #1369 from Trial97/autoselectSefa Eyeoglu
2023-07-16feat(actions): add backport actionSefa Eyeoglu
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2023-07-16chore(nix): update lockfilegithub-actions[bot]
Flake lock file updates: • Updated input 'flake-parts': 'github:hercules-ci/flake-parts/267149c58a14d15f7f81b4d737308421de9d7152' (2023-07-01) → 'github:hercules-ci/flake-parts/8e8d955c22df93dbe24f19ea04f47a74adbdc5ec' (2023-07-04) • Updated input 'nixpkgs': 'github:nixos/nixpkgs/cd99c2b3c9f160cd004318e0697f90bbd5960825' (2023-07-01) → 'github:nixos/nixpkgs/46ed466081b9cad1125b11f11a2af5cc40b942c7' (2023-07-15) • Updated input 'pre-commit-hooks': 'github:cachix/pre-commit-hooks.nix/42587d3414d1747999a5f71e92a83cf6547b62da' (2023-07-03) → 'github:cachix/pre-commit-hooks.nix/5e28316db471d1ac234beb70031b635437421dd6' (2023-07-14)
2023-07-15Merge pull request #1368 from Trial97/crash_curse_importTayou
2023-07-15auto focus search line on resource downloadTrial97
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-07-15make FileResolvingTask accept empty modlistTrial97
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-07-15chore: better explain quilt loader beaconseth
Signed-off-by: seth <getchoo@tuta.io>
2023-07-15Update launcher/ui/dialogs/ExportToModListDialog.uiAlexandru Ionut Tripon
Co-authored-by: TheKodeToad <TheKodeToad@proton.me> Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
2023-07-15fixed settingsTrial97
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-07-15Update launcher/modplatform/import_ftb/PackInstallTask.cppAlexandru Ionut Tripon
Co-authored-by: TheKodeToad <TheKodeToad@proton.me> Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
2023-07-15Update launcher/modplatform/import_ftb/PackInstallTask.cppAlexandru Ionut Tripon
Co-authored-by: TheKodeToad <TheKodeToad@proton.me> Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
2023-07-14Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher ↵Trial97
into export Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-07-14renamesTrial97
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-07-14Added buttonsTrial97
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-07-14Made custom template enabled all timeTrial97
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-07-14escaped text for html exportTrial97
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-07-14Moved to separate functionsTrial97
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-07-14Added json and csv formatTrial97
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-07-14fix: html sintax for modlist exportTrial97
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-07-14Merge pull request #1351 from Trial97/ftb_importRachel Powers
fixed substatus on ftb_import
2023-07-14Merge pull request #1336 from Ryex/packaging/fix-duplicate-share-directoriesseth
packaging: fix duplicate share directories (use only lowercase)
2023-07-14Update launcher/Application.cppRachel Powers
Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net> Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
2023-07-14fixed warningTrial97
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-07-14insert headerTrial97
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-07-14formatTrial97
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-07-14fixed substatus on ftb_importTrial97
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-07-14formatTrial97
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-07-14Merge pull request #1306 from Ryex/ci/address-sanitiser_on_debug_buildsSefa Eyeoglu
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-13packaging: use PascalCase folder name insteadRachel Powers
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
2023-07-13send by referenceTrial97
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-07-13Added FTBAPP ImportTrial97
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-07-12feat: add toggle for quilt beaconseth
Signed-off-by: seth <getchoo@tuta.io>
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-10Remove direct launchTheKodeToad
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>