aboutsummaryrefslogtreecommitdiff
path: root/launcher
AgeCommit message (Expand)Author
2023-08-05Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into...Trial97
2023-08-04Merge pull request #1459 from Scrumplex/formatSefa Eyeoglu
2023-08-04chore: update license headersSefa Eyeoglu
2023-08-02Merge branch 'develop' into sparkle-disableSefa Eyeoglu
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
2023-08-02chore: reformatSefa Eyeoglu
2023-08-02fix: add missing headersSefa Eyeoglu
2023-08-02fix: fix undisciplined multiple inheritanceSefa Eyeoglu
2023-08-02fix: remove irregular enum initializationSefa Eyeoglu
2023-08-02fix: simplify switch statementSefa Eyeoglu
2023-08-02fix: take JavaCheckResult by const referenceSefa Eyeoglu
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
2023-08-02Merge pull request #1294 from ashuntu/developSefa Eyeoglu
2023-08-02Merge pull request #1445 from Trial97/curseTheKodeToad
2023-08-02fix: fix copyright yearApix
2023-07-30Merge pull request #1449 from Trial97/tehnicSefa Eyeoglu
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
2023-07-27chore: don't include sparkle when not enabledseth
2023-07-27Ignore cache files entirely, also apply to modpack exportLostLuma
2023-07-26feat: disable sparkle when update url is emptyseth
2023-07-27fiexed conflictsTrial97
2023-07-27Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into...Trial97
2023-07-26fix: add support for QByteArray inifileTrial97
2023-07-26Update launcher/ui/MainWindow.cppAlexandru Ionut Tripon
2023-07-26fix: typo in task.hseth
2023-07-26removed quilt warningTrial97
2023-07-26Address review commentsLostLuma
2023-07-26Merge pull request #1427 from tjw123hh/developTheKodeToad
2023-07-26Ignore cache files when exporting instancesLostLuma
2023-07-25Delete some incorrect `notr="true"` tagstjw123hh
2023-07-24Merge pull request #1426 from TheKodeToad/token-censor-fixSefa Eyeoglu
2023-07-24Fix token "0" being replacedTheKodeToad
2023-07-24Delete some incorrect tagstjw123hh
2023-07-22Merge pull request #1402 from Trial97/flame_importTheKodeToad
2023-07-21Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into...Trial97
2023-07-21replaced require with ensure for jvmArgsTrial97
2023-07-19use range forTrial97
2023-07-19removed subdirectory flagTrial97
2023-07-19Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into...Trial97
2023-07-19Merge pull request #1399 from Scrumplex/offline-uuidTheKodeToad
2023-07-18wait to load metadataTrial97
2023-07-18Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into...Trial97
2023-07-18Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into...Trial97
2023-07-18Merge pull request #1397 from Gaming32/developSefa Eyeoglu