aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2023-08-06Apply suggestions from code reviewRachel Powers
Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net> Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
2023-08-06Merge pull request #1493 from PrismLauncher/update_flake_lock_actionseth
chore(nix): update lockfile
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-06chore(nix): update lockfilegithub-actions[bot]
Flake lock file updates: • Updated input 'flake-parts': 'github:hercules-ci/flake-parts/8e8d955c22df93dbe24f19ea04f47a74adbdc5ec' (2023-07-04) → 'github:hercules-ci/flake-parts/59cf3f1447cfc75087e7273b04b31e689a8599fb' (2023-08-01) • Updated input 'flake-parts/nixpkgs-lib': 'github:NixOS/nixpkgs/4bc72cae107788bf3f24f30db2e2f685c9298dc9?dir=lib' (2023-06-29) → 'github:NixOS/nixpkgs/9e1960bc196baf6881340d53dccb203a951745a2?dir=lib' (2023-08-01) • Updated input 'nixpkgs': 'github:nixos/nixpkgs/d2b52322f35597c62abf56de91b0236746b2a03d' (2023-07-29) → 'github:nixos/nixpkgs/0d2fb29f5071a12d7983319c2c2576be6a130582' (2023-08-05) • Updated input 'pre-commit-hooks': 'github:cachix/pre-commit-hooks.nix/1e2443dd3f669eb65433b2fc26a3065e05a7dc9c' (2023-07-29) → 'github:cachix/pre-commit-hooks.nix/3139c4d1f7732cab89f06492bdd4677b877e3785' (2023-08-05)
2023-08-05Merge pull request #1456 from Trial97/iconsSefa Eyeoglu
2023-08-05Merge pull request #1370 from Trial97/pack_changelogSefa Eyeoglu
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-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-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 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-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-02Merge pull request #1474 from apix0n/developSefa Eyeoglu
2023-08-02fix: fix copyright yearApix
Signed-off-by: Apix <apix0n@outlook.com>
2023-08-01DCO Remediation Commit for Rachel Powers <508861+Ryex@users.noreply.github.com>Rachel Powers
I, Rachel Powers <508861+Ryex@users.noreply.github.com>, hereby add my Signed-off-by to this commit: b4ae6e9774c535bf02b06325e6763d2d7ee02f21 Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.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(compiler warnings): suppress omtimisation flag conflict warnings. leave ↵Rachel Powers
optimisation to Byild type defaults - enable ASan for RelWithDebInfo builds
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-31chore: update Nix docsSefa Eyeoglu
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2023-07-31Merge branch 'PrismLauncher:develop' into icon-indexingTheKodeToad
generated by cgit (git 2.46.0) at 2025-02-03 15:46:26 +0000