aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-12-09Merge pull request #571 from Ryex/blocked-targetFolderSefa Eyeoglu
fix(blockedmods): Track and use targetFolder for blocked files
2022-12-08Merge pull request #568 from leo78913/flatpak-shortcutsflow
2022-12-08fix(blockedmods): Track and use targetFolder for blocked filesRachel Powers
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
2022-12-08fix: fix creating instance shortcuts in flatpakleo78913
Signed-off-by: leo78913 <leo3758@riseup.net>
2022-12-07Merge pull request #565 from DioEgizio/shortcut-menu-barflow
2022-12-07fix: add instance shortcut creation action to menubarDioEgizio
also moves deleteinstance to the same place as the instance toolbar Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
2022-12-07Merge pull request #511 from Scrumplex/fix-blocked-mods-usabilityflow
2022-12-06fix: remove rogue notrSefa Eyeoglu
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2022-12-06chore: reformat codeSefa Eyeoglu
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2022-12-06chore: add license headersSefa Eyeoglu
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2022-12-06refactor: replace Open All with Open MissingSefa Eyeoglu
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2022-12-06feat: implement lax filename match in BlockedModsDialogSefa Eyeoglu
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2022-12-06fix: improve resize behavior of BlockedModsDialogSefa Eyeoglu
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2022-12-06Merge pull request #556 from DioEgizio/modrinth-icon-largerflow
2022-12-06Merge pull request #557 from Scrumplex/fix-fswatcher-segfaultflow
Closes https://github.com/PrismLauncher/PrismLauncher/issues/555
2022-12-06Merge pull request #560 from edgarogh/fix-minutes-unitSefa Eyeoglu
Closes https://github.com/PrismLauncher/PrismLauncher/issues/553
2022-12-06chore: add license headersSefa Eyeoglu
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2022-12-06chore: reformat codeSefa Eyeoglu
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2022-12-06Fix minutes unitEdgar Onghena
Replaced "m" with "min" in `Time::prettifyDuration` Signed-off-by: Edgar Onghena <dev@edgar.bzh>
2022-12-05fix: don't allocate BlockedsModsDialogSefa Eyeoglu
Fixes temporary memory leak! Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2022-12-05dix: disable FS watcher after closing BlockedModsDialogSefa Eyeoglu
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2022-12-05fix: make modrinth icon largerDioEgizio
before it was considerably smaller than the other modpack platform icons which looked weird Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
2022-12-05Merge pull request #546 from DioEgizio/add-server-iconDioEgizio
feat: add a proper server icon
2022-12-04Merge pull request #547 from flowln/fix_copying_instanceSefa Eyeoglu
Fixes https://github.com/PrismLauncher/PrismLauncher/issues/545
2022-12-04feat: add server icon to simple colored icons tooDioEgizio
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com> Co-Authored-By: leo78913 <leo3758@riseup.net>
2022-12-04fix(Inst.Copy): create FS::copy object inside the secundary threadflow
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-12-04feat+fix: better flat iconDioEgizio
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
2022-12-04fix: oyxgen is lgpl3!DioEgizio
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
2022-12-04feat: add a proper server iconDioEgizio
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
2022-12-03Merge pull request #541 from ryanccn/warn-before-trash-instanceSefa Eyeoglu
Closes https://github.com/PrismLauncher/PrismLauncher/issues/192 closes https://github.com/PrismLauncher/PrismLauncher/issues/462
2022-12-03fix: warn before trashing instancesRyan Cao
Signed-off-by: Ryan Cao <70191398+ryanccn@users.noreply.github.com>
2022-12-02Merge pull request #506 from Protrikk/developSefa Eyeoglu
2022-12-02Remove blue-ish tint from remaining flat white iconsSefa Eyeoglu
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2022-12-02Merge branch 'upstream/develop' into developSefa Eyeoglu
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2022-12-02Merge pull request #423 from TheKodeToad/addagentflow
Fixes https://github.com/PrismLauncher/PrismLauncher/issues/414
2022-12-02Merge pull request #481 from ryanccn/import-resource-pack-dialog-uwuflow
2022-12-01fix: explicitly set scheme for local file in -I argumentflow
Otherwise isLocalFile() will return false for local files without the file:// thingy. Signed-off-by: flow <flowlnlnln@gmail.com>
2022-12-01Merge pull request #524 from DioEgizio/woaSefa Eyeoglu
add windows on arm builds
2022-12-01Merge pull request #538 from flowln/fix_some_cf_importsSefa Eyeoglu
A couple fixes for CF instance imports
2022-12-01fix(FileResolvingTask): Fail instead of crash when there's API errorsflow
Also remove non-used variable (rip). Signed-off-by: flow <flowlnlnln@gmail.com>
2022-12-01fix(Inst.Import): Show error reason in fail dialogflow
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-12-01fix(Inst.Import): don't search inside 'overrides/' for the manifestflow
It will never be there anyways, and saves a **bunch** of time when the overrides folder is big and we traverse all the tree when searching for the MMC 'instance.cfg' file. Signed-off-by: flow <flowlnlnln@gmail.com>
2022-11-30chore: drop Windows-MinGW-w64-LegacyDioEgizio
this brings back the number of builds as the same as before the pr this is one of the slowest builds + windows 7/8.1 users can just use Windows-MSVC-Legacy Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
2022-11-30Merge pull request #436 from Scrumplex/feat-change-maxmemSefa Eyeoglu
Closes https://github.com/PrismLauncher/PrismLauncher/issues/426
2022-11-30refactor+fix: refactor the windows part of the release workflow and add arm ↵DioEgizio
to it Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
2022-11-30Maybe fix ResourceFolderModel Clang64 test failureTheLastRar
Previously this test would fail sometimes without including ECMQueryQt Signed-off-by: TheLastRar <TheLastRar@users.noreply.github.com>
2022-11-30Remove unused QT_DATA_DIR/QT_MKSPECS_DIRTheLastRar
Signed-off-by: TheLastRar <TheLastRar@users.noreply.github.com>
2022-11-30Use ECMQueryQt Only with Qt5TheLastRar
Qt6 provides CMake variables for the paths we need Signed-off-by: TheLastRar <TheLastRar@users.noreply.github.com>
2022-11-30feat(actions) add arm64 buildDioEgizio
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
2022-11-29Merge pull request #238 from santiagocezar/new-iconsflow
generated by cgit (git 2.46.0) at 2025-02-03 18:24:38 +0000