aboutsummaryrefslogtreecommitdiff
path: root/launcher
AgeCommit message (Collapse)Author
2023-07-30Merge branch 'develop' into chore/add-compiler-warningsRachel Powers
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
2023-07-30fix(filelink exe): add console sourcesRachel Powers
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
2023-07-30fix(FileLink): drop FreeConsoleRachel Powers
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
2023-07-30fix(windows console): use new logic in FileLink exeRachel Powers
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
2023-07-30refactor(windows console): move to external fileRachel Powers
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
2023-07-30fix(windows console): properly bind windows consoleRachel Powers
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.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-28removed unneded if conditionTrial97
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-07-28added missing )Trial97
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-07-28Update launcher/ui/dialogs/NewInstanceDialog.cppAlexandru Ionut Tripon
Co-authored-by: TheKodeToad <TheKodeToad@proton.me> Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
2023-07-28removed commentTrial97
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-07-28keep the icon suffixTrial97
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-07-28refactor icon listTrial97
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-07-28added license headerTrial97
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-07-28formatTrial97
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
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-21Fix build on WindowsTheKodeToad
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2023-07-21Merge branch 'PrismLauncher:develop' into better-component-installationTheKodeToad
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
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