aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2023-08-05Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher ↵Trial97
into develop12 Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
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-04Merge pull request #1483 from DioEgizio/update-qt652seth
[macOS,Windows] Update to Qt 6.5.2
2023-08-03chore: update to qt 6.5.2DioEgizio
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
2023-08-02Merge pull request #1452 from getchoo/sparkle-disableSefa Eyeoglu
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-02Make more options genericTheKodeToad
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2023-08-02Fix alignment propertiesTheKodeToad
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2023-08-02fix: format all languages using clang-formatSefa 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-02fix(nix): enable clang-formatSefa 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-02DCO Remediation Commit for ashuntu <101582426+ashuntu@users.noreply.github.com>ashuntu
I, ashuntu <101582426+ashuntu@users.noreply.github.com>, hereby add my Signed-off-by to this commit: 10678096e57eb5b344f0dd39ad178403640b722a I, ashuntu <101582426+ashuntu@users.noreply.github.com>, hereby add my Signed-off-by to this commit: 51d7a6289e1cf2df463ae8d7c0b08b4a61faea3c I, ashuntu <101582426+ashuntu@users.noreply.github.com>, hereby add my Signed-off-by to this commit: 1467072f3dcd6ea5d2e3375ad5d69f3ee6d58af2 Signed-off-by: ashuntu <101582426+ashuntu@users.noreply.github.com>
2023-08-02Merge pull request #1445 from Trial97/curseTheKodeToad
feat: removed flame quilt warning
2023-08-02Merge pull request #1474 from apix0n/developSefa Eyeoglu
2023-08-02fix: fix copyright yearApix
Signed-off-by: Apix <apix0n@outlook.com>
2023-07-30Merge pull request #1461 from PrismLauncher/update_flake_lock_actionseth
chore(nix): update lockfile
2023-07-30Merge pull request #1449 from Trial97/tehnicSefa Eyeoglu
Reintroduce parsing of INI files
2023-07-30chore(nix): update lockfilegithub-actions[bot]
Flake lock file updates: • Updated input 'nixpkgs': 'github:nixos/nixpkgs/f465da166263bc0d4b39dfd4ca28b777c92d4b73' (2023-07-22) → 'github:nixos/nixpkgs/d2b52322f35597c62abf56de91b0236746b2a03d' (2023-07-29) • Updated input 'pre-commit-hooks': 'github:cachix/pre-commit-hooks.nix/eb433bff05b285258be76513add6f6c57b441775' (2023-07-18) → 'github:cachix/pre-commit-hooks.nix/1e2443dd3f669eb65433b2fc26a3065e05a7dc9c' (2023-07-29)
2023-07-28Removed snapcraft.yaml in favor of dedicated repo: ↵ashuntu
https://github.com/ashuntu/prismlauncher-snap
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-26chore: make INSTALL_BUNDLE a cached variableseth
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-26Merge pull request #1446 from getchoo/nix-fixesseth
disable darwin in flake + cleanup garnix.yaml + fix markdownlint warnings
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-26Merge pull request #1447 from getchoo/typomomentSefa Eyeoglu
fix: typo in task.h
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-26chore(docs): correct markdownlint warningsseth
Signed-off-by: seth <getchoo@tuta.io>
2023-07-26fix(nix): disable x86_64-darwinseth
Signed-off-by: seth <getchoo@tuta.io>
2023-07-26chore(ci): cleanup garnix.yamlseth
Signed-off-by: seth <getchoo@tuta.io>
2023-07-26removed quilt warningTrial97
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
generated by cgit (git 2.46.0) at 2025-02-03 06:53:17 +0000