aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2023-07-24Fix token "0" being replacedTheKodeToad
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2023-07-24Delete some incorrect tagstjw123hh
2023-07-23Merge pull request #1420 from PrismLauncher/update_flake_lock_actionSefa Eyeoglu
2023-07-22Merge pull request #1419 from pandaninjas/update-libnbtplusplusseth
Update libnbtplusplus submodule
2023-07-23chore(nix): update lockfilegithub-actions[bot]
Flake lock file updates: • Updated input 'libnbtplusplus': 'github:PrismLauncher/libnbtplusplus/2203af7eeb48c45398139b583615134efd8d407f' (2022-04-15) → 'github:PrismLauncher/libnbtplusplus/a5e8fd52b8bf4ab5d5bcc042b2a247867589985f' (2023-07-22) • Updated input 'nixpkgs': 'github:nixos/nixpkgs/46ed466081b9cad1125b11f11a2af5cc40b942c7' (2023-07-15) → 'github:nixos/nixpkgs/f465da166263bc0d4b39dfd4ca28b777c92d4b73' (2023-07-22) • Updated input 'pre-commit-hooks': 'github:cachix/pre-commit-hooks.nix/5e28316db471d1ac234beb70031b635437421dd6' (2023-07-14) → 'github:cachix/pre-commit-hooks.nix/eb433bff05b285258be76513add6f6c57b441775' (2023-07-18)
2023-07-22Update libnbtplusplus submodulePandaNinjas
Signed-off-by: PandaNinjas <admin@malwarefight.wip.la>
2023-07-22Merge pull request #1402 from Trial97/flame_importTheKodeToad
feat:made flame instace creation use metadata for recommended version
2023-07-22More catpack changes :3TheKodeToad
This is just embarrasing Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2023-07-21Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher ↵Trial97
into import
2023-07-21replaced require with ensure for jvmArgsTrial97
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-07-21Remove redundant methodsTheKodeToad
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2023-07-21Merge remote-tracking branch 'upstream/develop' into icon-indexingTheKodeToad
2023-07-21Fix build on WindowsTheKodeToad
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2023-07-21Merge branch 'PrismLauncher:develop' into better-component-installationTheKodeToad
2023-07-21Merge pull request #1253 from Trial97/catpacksSefa Eyeoglu
2023-07-20Finish things :PTheKodeToad
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2023-07-20Revert accidental change in MainWindowTheKodeToad
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2023-07-20(UX) Add open folder button next to combo boxesTheKodeToad
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2023-07-19use range forTrial97
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-07-19Better theme resetTheKodeToad
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2023-07-19Automatically create theme folders, and add an action to open themTheKodeToad
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2023-07-19Colors->WidgetsTheKodeToad
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2023-07-19Sorting and invalid resetTheKodeToad
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2023-07-19Merge branch 'PrismLauncher:develop' into icon-indexingTheKodeToad
2023-07-19LicensesTheKodeToad
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2023-07-19Remove recursionTheKodeToad
It will add icon packs which aren't available - as QIcon's search paths are not recursed! Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2023-07-19removed subdirectory flagTrial97
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-07-19Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher ↵Trial97
into catpacks
2023-07-19Merge pull request #1399 from Scrumplex/offline-uuidTheKodeToad
fix: generate predictable UUIDs for offline accounts
2023-07-18Multiple icon themes!TheKodeToad
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2023-07-18Merge pull request #1372 from PrismLauncher/update_flake_lock_actionseth
chore(nix): update lockfile
2023-07-18wait to load metadataTrial97
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-07-18Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher ↵Trial97
into flame_import
2023-07-18Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher ↵Trial97
into prism_export2
2023-07-18Merge pull request #1397 from Gaming32/developSefa Eyeoglu
2023-07-18Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher ↵Trial97
into import Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-07-18Merge pull request #1362 from Trial97/fix_warningSefa Eyeoglu
2023-07-18Merge pull request #1378 from Trial97/prism_exportSefa Eyeoglu
Added progress bar to Prism instance export
2023-07-18Merge pull request #1385 from orowith2os/flatpak-updatesseth
Update Flatpak manifest
2023-07-18feat:made flame instace creation use metadata for recommended versionTrial97
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-07-18fix: generate predictable UUIDs for offline accountsSefa Eyeoglu
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2023-07-17Update Flatpak manifestDallas Strouse
Signed-off-by: Dallas Strouse <dastrouses@gmail.com>
2023-07-17Make Launch Offline not launch online in 1.6+Josiah Glosson
Signed-off-by: Josiah Glosson <soujournme@gmail.com>
2023-07-17Merge pull request #1387 from Scrumplex/fix-quilt-beaconTheKodeToad
Check if any modloader is installed
2023-07-17Merge branch 'prism_export' of github.com:Trial97/PrismLauncher into ↵Trial97
prism_export2 Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-07-17Added QFutureWatcherTrial97
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com> abort forgot Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-07-17replace emplace with insertTrial97
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-07-17Upgraded ExportToZipTaskTrial97
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-07-17replace emplace with insertTrial97
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-07-17handle file removal in ExportToZipTaskTrial97
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
generated by cgit (git 2.46.0) at 2025-02-09 18:09:19 +0000