aboutsummaryrefslogtreecommitdiff
path: root/launcher/CMakeLists.txt
AgeCommit message (Collapse)Author
2023-10-01Merge pull request #1656 from Trial97/remove_mojang2Sefa Eyeoglu
2023-09-25Removed mojangTrial97
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-08-15Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher ↵Trial97
into download_threads Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-08-15Merge pull request #1407 from TheKodeToad/icon-indexingSefa Eyeoglu
2023-08-12Merge remote-tracking branch 'upstream/staging' into chore/add-compiler-warningsSefa Eyeoglu
2023-08-11Merge pull request #1230 from TheKodeToad/better-component-installationSefa Eyeoglu
Revamp loader installation UI
2023-08-10Merge remote-tracking branch 'upstream/staging' into chore/add-compiler-warningsSefa Eyeoglu
2023-08-07Merge branch 'develop' into icon-indexingTayou
Signed-off-by: Tayou <31988415+TayouVR@users.noreply.github.com>
2023-08-06Merge pull request #1464 from Ryex/fix/windows-console-attachseth
[Windows] Fix attaching logs to console
2023-08-05Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher ↵Trial97
into download_threads Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-08-04Merge pull request #1102 from Ryex/refactor/net-split-headers-to-proxy-classSefa Eyeoglu
2023-08-02Merge branch 'PrismLauncher:develop' into better-component-installationTheKodeToad
2023-08-02Merge branch 'develop' into sparkle-disableSefa Eyeoglu
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2023-08-02Merge pull request #1339 from TheKodeToad/remove-direct-launchSefa Eyeoglu
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-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-30refactor(windows console): move to external fileRachel Powers
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
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-26feat: disable sparkle when update url is emptyseth
Signed-off-by: seth <getchoo@tuta.io>
2023-07-21Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher ↵Trial97
into import
2023-07-21Merge remote-tracking branch 'upstream/develop' into icon-indexingTheKodeToad
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-18Multiple icon themes!TheKodeToad
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2023-07-18Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher ↵Trial97
into import Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-07-16Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher ↵Trial97
into catpacks
2023-07-14Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher ↵Trial97
into export Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-07-14fixed testsTrial97
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-07-13Merge branch 'develop' into chore/add-compiler-warningsRachel Powers
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
2023-07-13Added FTBAPP ImportTrial97
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-07-11Merge branch 'develop' into better-component-installationTheKodeToad
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2023-07-10Remove direct launchTheKodeToad
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2023-07-10Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher ↵Trial97
into catpacks Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-07-02Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher ↵Trial97
into catpacks
2023-07-02Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher ↵Trial97
into curse Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-07-01chore: remove WARNINGS_AS_ERRORSRachel Powers
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
2023-07-01Merge branch 'develop' into chore/add-compiler-warningsRachel Powers
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
2023-07-01Merge branch 'develop' into better-component-installationTheKodeToad
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2023-06-28Merge pull request #1266 from TheKodeToad/smol-tweaksSefa Eyeoglu
2023-06-27Simplify Upload and DownloadTrial97
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-06-26Removed unused filesTrial97
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-06-25fix: add `ApiUpload` to CMakeLists.txtRachel Powers
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
2023-06-25Merge remote-tracking branch 'upstream/develop' into ↵Rachel Powers
refactor/net-split-headers-to-proxy-class
2023-06-25refactor: override / mask static `make` functions for ApiDownloadRachel Powers
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
2023-06-25refactor: split out setting api headers for downloadsRachel Powers
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
2023-06-25Fix markdown headerTheKodeToad
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2023-06-25Added plantxt exportTrial97
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-06-25Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher ↵Trial97
into export