aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2023-07-05Merge pull request #1284 from Ryex/fix/properly-track-failed-copies-and-clonesSefa Eyeoglu
2023-07-04Merge pull request #1304 from Scrumplex/chore-flake-update-1seth
flake.lock: Update
2023-07-03Merge pull request #1127 from Trial97/scale_catTayou
2023-07-03flake.lock: UpdateSefa Eyeoglu
Flake lock file updates: • Updated input 'flake-parts': 'github:hercules-ci/flake-parts/006c75898cf814ef9497252b022e91c946ba8e17' (2023-05-08) → 'github:hercules-ci/flake-parts/267149c58a14d15f7f81b4d737308421de9d7152' (2023-07-01) • Updated input 'flake-parts/nixpkgs-lib': 'github:NixOS/nixpkgs/da45bf6ec7bbcc5d1e14d3795c025199f28e0de0?dir=lib' (2023-04-30) → 'github:NixOS/nixpkgs/4bc72cae107788bf3f24f30db2e2f685c9298dc9?dir=lib' (2023-06-29) • Updated input 'nixpkgs': 'github:nixos/nixpkgs/aeb75dba965e790de427b73315d5addf91a54955' (2023-05-25) → 'github:nixos/nixpkgs/cd99c2b3c9f160cd004318e0697f90bbd5960825' (2023-07-01) • Updated input 'pre-commit-hooks': 'github:cachix/pre-commit-hooks.nix/61e567d6497bc9556f391faebe5e410e6623217f' (2023-05-23) → 'github:cachix/pre-commit-hooks.nix/42587d3414d1747999a5f71e92a83cf6547b62da' (2023-07-03) • Updated input 'pre-commit-hooks/flake-utils': 'github:numtide/flake-utils/5aed5285a952e0b949eb3ba02c12fa4fcfef535f' (2022-11-02) → 'github:numtide/flake-utils/a1720a10a6cfe8234c0e93907ffe81be440f4cef' (2023-05-31) • Added input 'pre-commit-hooks/flake-utils/systems': 'github:nix-systems/default/da67096a3b9bf56a91d16901293e51ba5b49a27e' (2023-04-09) Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2023-07-02Merge pull request #1232 from telans/screenshots-updateTheKodeToad
ScreenshotsPage fixes
2023-07-02Merge pull request #1298 from TurboWafflz/developSefa Eyeoglu
2023-07-02Fix compiling on OpenBSDFinian Wright
Signed-off-by: Finian Wright <turbowafflz@gmail.com>
2023-07-01Merge pull request #1292 from Trial97/export5seth
Removed logs from instance export
2023-06-30removed extra conditionTrial97
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-06-30Made sure the logs are ignored when collecting filesTrial97
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-06-30Removed logs from instance exportTrial97
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-06-28Renamed functionTrial97
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-06-28Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher ↵Trial97
into scale_cat
2023-06-28Merge pull request #1266 from TheKodeToad/smol-tweaksSefa Eyeoglu
2023-06-27Merge pull request #1280 from Trial97/shortcutseth
Fixed illegal characters in shortcuts name
2023-06-27Update launcher/FileSystem.cppRachel Powers
Co-authored-by: TheKodeToad <TheKodeToad@proton.me> Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
2023-06-27Merge pull request #1281 from Trial97/screenshotseth
Added more information to the screenshot upload warning
2023-06-27fix(filesystem): track failed copies and clonesRachel Powers
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
2023-06-27Added more information to the screenshot upload warningTrial97
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-06-27omit icon remove on macosTrial97
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-06-27Fixed illegal characters in shortcuts nameTrial97
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-06-26Merge pull request #1277 from Trial97/remove_mojangTheKodeToad
Removed unused files
2023-06-26Removed unused filesTrial97
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-06-26Merge pull request #1274 from TheKodeToad/java-signatureSefa Eyeoglu
2023-06-26Merge pull request #1275 from Scrumplex/git-blame-ignoreSefa Eyeoglu
2023-06-26chore: add Git Blame ignore fileSefa Eyeoglu
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2023-06-26fix: install logo to multimc theme in genicons.shSefa Eyeoglu
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2023-06-26Merge pull request #1065 from leo78913/gamescope-close-buttonSefa Eyeoglu
2023-06-26Generate special signature :sparkles: composed of multiple elements instead ↵TheKodeToad
of relying on timestamp for Java version cache invalidation Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2023-06-25Merge pull request #1272 from Trial97/fix_selectedseth
fix: Page container extra info set on logs page
2023-06-25fix: Page container extra info set on logs pageTrial97
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-06-25Merge pull request #1270 from TheKodeToad/fix-unchecked-valueTheKodeToad
Fix unsafe usage of std::optional::value in FlameAPI
2023-06-25Deduplicate launcher iconTheKodeToad
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2023-06-25Add fixme comment for no SSD detectionLeo
Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net> Signed-off-by: Leo <leo3758@riseup.net>
2023-06-25Fix markdown headerTheKodeToad
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2023-06-25Fix big mistake :iea:TheKodeToad
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2023-06-25Fix unsafe usage of std::optional::value in FlameAPITheKodeToad
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2023-06-25Replace accidental usages of QAbstractButton::pressedTheKodeToad
This signal is not usually what you want, and creates an inconsistent experience. Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2023-06-24Revert "feat(Mods): hide 'Provider' column when no mods have providers"TheKodeToad
With Ryex's change, this causes issues. Apparently you need to sign off reverts! That's just weird... Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2023-06-24Fix Open Global Settings, why notTheKodeToad
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2023-06-24Fix flat white launcher iconTheKodeToad
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2023-06-24A few tweaks, with inspiration from Zeke :3TheKodeToad
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2023-06-24Merge pull request #986 from Trial97/developTheKodeToad
Mod dependencies
2023-06-24Added translationTrial97
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-06-24Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher ↵Trial97
into develop
2023-06-24Merge pull request #1261 from telans/modrinthexport-urlSefa Eyeoglu
2023-06-23Merge pull request #1255 from Trial97/export4Rachel Powers
Added Thumbs.db to excluded files in MrPackExport
2023-06-24Merge pull request #1258 from leo78913/resources-pack-page-crash-fixseth
fix: fix crash when hiding columns on resource packs page
2023-06-23Merge pull request #1259 from PrismLauncher/update-devsRachel Powers
Update developers
2023-06-24modrinth: use encoded url when exporting packJames Beddek
Ensures that necessary url components such as spaces are encoded. Prevents an error when submitting the resulting file to modrinth. See https://discord.com/channels/734077874708938864/1120070731242410024 Fixes: #1226 Signed-off-by: James Beddek <telans@posteo.de>
generated by cgit (git 2.46.0) at 2025-02-03 23:00:34 +0000