aboutsummaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
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
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
2023-08-02Merge pull request #1294 from ashuntu/developSefa Eyeoglu
2023-08-02DCO Remediation Commit for ashuntu <101582426+ashuntu@users.noreply.github.com>ashuntu
2023-08-02Merge pull request #1445 from Trial97/curseTheKodeToad
2023-08-02Merge pull request #1474 from apix0n/developSefa Eyeoglu
2023-08-02fix: fix copyright yearApix
2023-07-30Merge pull request #1461 from PrismLauncher/update_flake_lock_actionseth
2023-07-30Merge pull request #1449 from Trial97/tehnicSefa Eyeoglu
2023-07-30chore(nix): update lockfilegithub-actions[bot]
2023-07-28Removed snapcraft.yaml in favor of dedicated repo: https://github.com/ashuntu...ashuntu
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
2023-07-26Merge pull request #1446 from getchoo/nix-fixesseth
2023-07-27fiexed conflictsTrial97
2023-07-27Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into...Trial97
2023-07-26Merge pull request #1447 from getchoo/typomomentSefa Eyeoglu
2023-07-26fix: add support for QByteArray inifileTrial97
2023-07-26Update launcher/ui/MainWindow.cppAlexandru Ionut Tripon
2023-07-26fix: typo in task.hseth
2023-07-26chore(docs): correct markdownlint warningsseth
2023-07-26fix(nix): disable x86_64-darwinseth
2023-07-26chore(ci): cleanup garnix.yamlseth
2023-07-26removed quilt warningTrial97
2023-07-26Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into...Trial97
2023-07-26Merge pull request #1438 from Scrumplex/update-docsSefa Eyeoglu
2023-07-26Address review commentsLostLuma
2023-07-26fix: fix typo in READMESefa Eyeoglu
2023-07-26Merge pull request #1434 from getchoo/garnixSefa Eyeoglu
2023-07-26Merge pull request #1427 from tjw123hh/developTheKodeToad
2023-07-26chore: update information for downstreamsSefa Eyeoglu
2023-07-26Ignore cache files when exporting instancesLostLuma
2023-07-25chore(ci): remove nix jobseth
2023-07-25feat(ci): init garnix.yamlseth
2023-07-25Revert permission changeTheKodeToad
2023-07-25Merge branch 'develop' of https://github.com/tjw123hh/PrismLauncher into developtjw123hh
2023-07-25Delete some incorrect `notr="true"` tagstjw123hh
2023-07-24Merge pull request #1426 from TheKodeToad/token-censor-fixSefa Eyeoglu
2023-07-24Update org.prismlauncher.PrismLauncher.desktop.intjw123hh
2023-07-24DCO Remediation Commit for tjw123hh <tjw123hh@outlook.com>tjw123hh
2023-07-24Fix token "0" being replacedTheKodeToad
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
2023-07-23chore(nix): update lockfilegithub-actions[bot]