aboutsummaryrefslogtreecommitdiff
path: root/launcher
AgeCommit message (Collapse)Author
2023-08-09Remove unnecessary #ifcomp500
Signed-off-by: comp500 <comp500@users.noreply.github.com>
2023-08-09Allow empty lines in log outputcomp500
Preserving empty lines in the game log ensures that crash reports and debugging information has necessary whitespace - the previous behaviour made crash reports hard to read. Signed-off-by: comp500 <comp500@users.noreply.github.com>
2023-08-07Fix actionsTheKodeToad
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2023-08-07Merge branch 'develop' into icon-indexingTayou
Signed-off-by: Tayou <31988415+TayouVR@users.noreply.github.com>
2023-08-06Merge remote-tracking branch 'upstream/staging' into curseforge-url-handleSefa Eyeoglu
2023-08-06fix: makeShared for QByteArraySefa Eyeoglu
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2023-08-06Merge pull request #1464 from Ryex/fix/windows-console-attachseth
[Windows] Fix attaching logs to console
2023-08-06chore: replace fabricmc icons with SVGSefa Eyeoglu
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2023-08-05Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher ↵Trial97
into pack_changelog
2023-08-05Merge branch 'staging' of https://github.com/PrismLauncher/PrismLauncher ↵Trial97
into icons
2023-08-04Merge pull request #1102 from Ryex/refactor/net-split-headers-to-proxy-classSefa Eyeoglu
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-02icon -> iconNameTheKodeToad
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2023-08-02Merge branch 'PrismLauncher:develop' into better-component-installationTheKodeToad
2023-08-02Use protected inheritance for BasePageProviderTheKodeToad
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2023-08-02Pressed -> Clicked (doh)TheKodeToad
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
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-02refactor(windows console): reduce code duplicationRachel Powers
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
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-08-01Fix: always false comparisonRachel Powers
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
2023-08-01Apply suggestions from code reviewRachel Powers
Co-authored-by: TheKodeToad <TheKodeToad@proton.me> Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
2023-07-31fix(FlameInstanceCreationTask): include Net::ApidownloadRachel Powers
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
2023-07-31Merge branch 'develop' into refactor/net-split-headers-to-proxy-classRachel Powers
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
2023-07-31Merge branch 'PrismLauncher:develop' into icon-indexingTheKodeToad
2023-07-30chore(rename): fix unfinshed renames from deshadow changesRachel Powers
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
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>