aboutsummaryrefslogtreecommitdiff
path: root/launcher
AgeCommit message (Collapse)Author
2023-08-11connect the abort signal in concurent taskTrial97
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-08-05Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher ↵Trial97
into pack_changelog
2023-08-04Merge pull request #1459 from Scrumplex/formatSefa Eyeoglu
2023-08-04chore: update license headersSefa Eyeoglu
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2023-08-02Merge branch 'develop' into sparkle-disableSefa Eyeoglu
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2023-08-02Merge pull request #1391 from Trial97/prism_export2Sefa Eyeoglu
2023-08-02Merge pull request #1476 from Scrumplex/fix-saving-metaurlSefa Eyeoglu
2023-08-02fix: don't reset meta url on launchSefa Eyeoglu
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2023-08-02chore: reformatSefa Eyeoglu
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2023-08-02fix: add missing headersSefa Eyeoglu
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2023-08-02fix: fix undisciplined multiple inheritanceSefa Eyeoglu
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2023-08-02fix: remove irregular enum initializationSefa Eyeoglu
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2023-08-02fix: simplify switch statementSefa Eyeoglu
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2023-08-02fix: take JavaCheckResult by const referenceSefa Eyeoglu
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2023-08-02Merge pull request #1339 from TheKodeToad/remove-direct-launchSefa Eyeoglu
2023-08-02Merge pull request #1359 from Trial97/importSefa Eyeoglu
2023-08-02Update launcher/ui/pages/modplatform/import_ftb/ImportFTBPage.hAlexandru Ionut Tripon
Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net> Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
2023-08-02Merge pull request #1294 from ashuntu/developSefa Eyeoglu
2023-08-02Merge pull request #1445 from Trial97/curseTheKodeToad
feat: removed flame quilt warning
2023-08-02fix: fix copyright yearApix
Signed-off-by: Apix <apix0n@outlook.com>
2023-07-30Merge pull request #1449 from Trial97/tehnicSefa Eyeoglu
Reintroduce parsing of INI files
2023-07-28Merge branch 'PrismLauncher:develop' into developAsh
2023-07-27Merge pull request #1437 from LostLuma/instance-export-ignore-caches-2Sefa Eyeoglu
2023-07-27refactor: introduce internal Launcher_ENABLE_UPDATER variableSefa Eyeoglu
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2023-07-27chore: don't include sparkle when not enabledseth
Signed-off-by: seth <getchoo@tuta.io>
2023-07-27Ignore cache files entirely, also apply to modpack exportLostLuma
Signed-off-by: LostLuma <lilly@lostluma.net>
2023-07-26feat: disable sparkle when update url is emptyseth
Signed-off-by: seth <getchoo@tuta.io>
2023-07-27fiexed conflictsTrial97
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-07-27Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher ↵Trial97
into prism_export2
2023-07-26fix: add support for QByteArray inifileTrial97
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-07-26Update launcher/ui/MainWindow.cppAlexandru Ionut Tripon
Co-authored-by: TheKodeToad <TheKodeToad@proton.me> Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
2023-07-26fix: typo in task.hseth
Signed-off-by: seth <getchoo@tuta.io>
2023-07-26removed quilt warningTrial97
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-07-26Address review commentsLostLuma
Signed-off-by: LostLuma <lilly@lostluma.net>
2023-07-26Merge pull request #1427 from tjw123hh/developTheKodeToad
Add some missing strings to translations
2023-07-26Ignore cache files when exporting instancesLostLuma
Signed-off-by: LostLuma <lilly@lostluma.net>
2023-07-25Delete some incorrect `notr="true"` tagstjw123hh
Signed-off-by: tjw123hh <tjw123hh@outlook.com>
2023-07-24Merge pull request #1426 from TheKodeToad/token-censor-fixSefa Eyeoglu
2023-07-24Fix token "0" being replacedTheKodeToad
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2023-07-24Delete some incorrect tagstjw123hh
2023-07-22Merge pull request #1402 from Trial97/flame_importTheKodeToad
feat:made flame instace creation use metadata for recommended version
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-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-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
generated by cgit (git 2.46.0) at 2025-02-03 13:10:46 +0000