aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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-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-19use range forTrial97
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
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-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>
2023-07-17simplify modrinth exportTrial97
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-07-17simplify flame exportTrial97
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com> s
2023-07-17Upgraded ExportToZipTaskTrial97
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-07-17fix: don't take modloaders by referenceSefa Eyeoglu
Co-authored-by: TheKodeToad <TheKodeToad@proton.me> Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2023-07-17Merge pull request #1286 from TayouVR/better-instance-group-separatorTayou
2023-07-17fix: check if any modloader is installedSefa Eyeoglu
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2023-07-17reveted back to add yearsTrial97
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-07-17Merge pull request #1357 from getchoo/quilt-beaconSefa Eyeoglu
feat: add toggle for quilt beacon
2023-07-16Merge pull request #1381 from getchoo/backporting-docsseth
chore(docs): add backporting info to CONTRIBUTING.md
2023-07-16chore(docs): add backporting info to CONTRIBUTING.mdseth
Signed-off-by: seth <getchoo@tuta.io>
2023-07-16Merge pull request #1276 from Scrumplex/print-build-platformseth
Print build platform on launch
2023-07-16Update launcher/MMCZip.hAlexandru Ionut Tripon
Co-authored-by: Tayou <31988415+TayouVR@users.noreply.github.com> Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
2023-07-16Update launcher/MMCZip.cppAlexandru Ionut Tripon
Co-authored-by: Tayou <31988415+TayouVR@users.noreply.github.com> Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
2023-07-16use shared pointerTrial97
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com> use shared pointer
2023-07-16Added progress bar to Prism instance exportTrial97
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-07-16formatTrial97
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-07-16Merge pull request #1373 from Scrumplex/backport-botSefa Eyeoglu
2023-07-16added path to flatpackTrial97
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-07-16made the date a objectTrial97
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-07-16Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher ↵Trial97
into catpacks
2023-07-16simplified code in cat packsTrial97
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>