aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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-27Ignore cache files entirely, also apply to modpack exportLostLuma
Signed-off-by: LostLuma <lilly@lostluma.net>
2023-07-26Merge pull request #1446 from getchoo/nix-fixesseth
disable darwin in flake + cleanup garnix.yaml + fix markdownlint warnings
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>
2023-07-26Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher ↵Trial97
into curse
2023-07-26Merge pull request #1438 from Scrumplex/update-docsSefa Eyeoglu
2023-07-26Address review commentsLostLuma
Signed-off-by: LostLuma <lilly@lostluma.net>
2023-07-26fix: fix typo in READMESefa Eyeoglu
Co-authored-by: Tayou <31988415+TayouVR@users.noreply.github.com> Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2023-07-26Merge pull request #1434 from getchoo/garnixSefa Eyeoglu
2023-07-26Merge pull request #1427 from tjw123hh/developTheKodeToad
Add some missing strings to translations
2023-07-26chore: update information for downstreamsSefa Eyeoglu
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2023-07-26Ignore cache files when exporting instancesLostLuma
Signed-off-by: LostLuma <lilly@lostluma.net>
2023-07-25chore(ci): remove nix jobseth
we're using garnix now Signed-off-by: seth <getchoo@tuta.io>
2023-07-25feat(ci): init garnix.yamlseth
Signed-off-by: seth <getchoo@tuta.io>
2023-07-25Revert permission changeTheKodeToad
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2023-07-25Merge branch 'develop' of https://github.com/tjw123hh/PrismLauncher into developtjw123hh
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-24Update org.prismlauncher.PrismLauncher.desktop.intjw123hh
Signed-off-by: tjw123hh <56749271+tjw123hh@users.noreply.github.com>
2023-07-24DCO Remediation Commit for tjw123hh <tjw123hh@outlook.com>tjw123hh
I, tjw123hh <tjw123hh@outlook.com>, hereby add my Signed-off-by to this commit: 6a01c277e8f98797e3325a2b249e59ee95f43c7e Signed-off-by: tjw123hh <tjw123hh@outlook.com>
2023-07-24Fix token "0" being replacedTheKodeToad
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2023-07-24Delete some incorrect tagstjw123hh
2023-07-23Merge pull request #1420 from PrismLauncher/update_flake_lock_actionSefa Eyeoglu
2023-07-22Merge pull request #1419 from pandaninjas/update-libnbtplusplusseth
Update libnbtplusplus submodule
2023-07-23chore(nix): update lockfilegithub-actions[bot]
Flake lock file updates: • Updated input 'libnbtplusplus': 'github:PrismLauncher/libnbtplusplus/2203af7eeb48c45398139b583615134efd8d407f' (2022-04-15) → 'github:PrismLauncher/libnbtplusplus/a5e8fd52b8bf4ab5d5bcc042b2a247867589985f' (2023-07-22) • Updated input 'nixpkgs': 'github:nixos/nixpkgs/46ed466081b9cad1125b11f11a2af5cc40b942c7' (2023-07-15) → 'github:nixos/nixpkgs/f465da166263bc0d4b39dfd4ca28b777c92d4b73' (2023-07-22) • Updated input 'pre-commit-hooks': 'github:cachix/pre-commit-hooks.nix/5e28316db471d1ac234beb70031b635437421dd6' (2023-07-14) → 'github:cachix/pre-commit-hooks.nix/eb433bff05b285258be76513add6f6c57b441775' (2023-07-18)
2023-07-22Update libnbtplusplus submodulePandaNinjas
Signed-off-by: PandaNinjas <admin@malwarefight.wip.la>
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-21Merge pull request #1253 from Trial97/catpacksSefa Eyeoglu
generated by cgit (git 2.46.0) at 2025-02-09 10:46:23 +0000