aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-10-22Merge pull request #215 from forkiesassds/developflow
2022-10-22Merge pull request #230 from Scrumplex/add-pr-templateSefa Eyeoglu
2022-10-22Merge pull request #224 from jamierocks/atl-abort-close-optional-mods-dialogSefa Eyeoglu
2022-10-22Merge pull request #225 from Scrumplex/fix-segfault-fileresolverSefa Eyeoglu
2022-10-22Merge pull request #218 from getchoo/change-jars-pathflow
2022-10-22update macOS build process to work with new .appTobias Möritz
Signed-off-by: Tobias Möritz <tobias@moeritz.cc>
2022-10-22update macos plist contents (fixes #132)Tobias Möritz
Signed-off-by: Tobias Möritz <tobias@moeritz.cc>
2022-10-22chore: add PR templateSefa Eyeoglu
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2022-10-22fix: fix segfault when resolving Flame resourcesSefa Eyeoglu
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2022-10-22DCO Remediation Commit for a6b13487Jamie Mansfield
I, Jamie Mansfield <jmansfield@cadixdev.org>, hereby add my Signed-off-by to this commit: a6b13487f0e27c8bea1917720a0c5c1eb1eb206c Signed-off-by: Jamie Mansfield <jmansfield@cadixdev.org>
2022-10-22ATLauncher: Abort install if optional mods dialog is closedJamie Mansfield
This matches the behaviour of ATLauncher.
2022-10-22Change old style cast to C++ castBensuperpc
Change old style cast to C++ cast Signed-off-by: Bensuperpc <bensuperpc@gmail.com>
2022-10-22Merge pull request #185 from flowln/fix_blocked_mods_crashSefa Eyeoglu
2022-10-22Merge pull request #203 from Scrumplex/fix-dont-build-renove-branchesSefa Eyeoglu
Don't build renovate branches
2022-10-21semicolon failseth
i was off by one key :( Signed-off-by: seth <getchoo@tuta.io>
2022-10-21fix: use correct variable for jars pathseth
Signed-off-by: seth <getchoo@tuta.io>
2022-10-21fix: make jars path specific to prismseth
Signed-off-by: seth <getchoo@tuta.io>
2022-10-22CurseForge modpack page improvementsforkiesassds
Signed-off-by: forkiesassds <icanttellyou@memeware.net>
2022-10-21Merge pull request #147 from Minion3665/enhancement/update-nix-derivationflow
2022-10-21DCO Remediation Commit for Hibi <69405847+Hibiii@users.noreply.github.com>Hibi
I, Hibi <69405847+Hibiii@users.noreply.github.com>, hereby add my Signed-off-by to this commit: 1288b926153c86b7966727e60de4af8e7dcb4031 I, Hibi <69405847+Hibiii@users.noreply.github.com>, hereby add my Signed-off-by to this commit: 5b75869c0ba60e00147d723d5633c9f6a5d6304e Signed-off-by: Hibi <69405847+Hibiii@users.noreply.github.com>
2022-10-21Merge pull request #187 from leo78913/menu-iconsSefa Eyeoglu
2022-10-21Add --show to manual pageHibi
2022-10-21Add argument to show instance windowHibi
2022-10-21fix: remove max height logic for mod update changelogsflow
It's not worth it to keep this, it's just a heuristic that fails from time to time. Signed-off-by: flow <flowlnlnln@gmail.com>
2022-10-21material design iconsleo78913
Signed-off-by: leo78913 <leo3758@riseup.net>
2022-10-21the trashcan icons dont look like trash nowleo78913
Signed-off-by: leo78913 <leo3758@riseup.net>
2022-10-21Merge pull request #198 from ↵txtsd
PrismLauncher/renovate/hendrikmuhs-ccache-action-1.x
2022-10-21Merge pull request #197 from PrismLauncher/renovate/actions-cache-3.xtxtsd
2022-10-21fix: don't build renovate branchesSefa Eyeoglu
They will be built using the pull_requests event anyway. Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2022-10-21Merge pull request #201 from Scrumplex/add-netlify-sponsorSefa Eyeoglu
2022-10-21Merge pull request #202 from Heath123/patch-1Sefa Eyeoglu
2022-10-21Fix typocircuit10
Signed-off-by: circuit10 <heath.mitchell27@gmail.com>
2022-10-21chore: add Netlify as sponsorSefa Eyeoglu
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2022-10-21chore(deps): update hendrikmuhs/ccache-action action to v1.2.3renovate[bot]
2022-10-21chore(deps): update actions/cache action to v3.0.11renovate[bot]
2022-10-21Merge pull request #196 from PrismLauncher/renovate/configureDioEgizio
2022-10-21chore(deps): add renovate.jsonrenovate[bot]
2022-10-21Merge pull request #39 from Sebbl0508/mod_dialog_fontsizeSefa Eyeoglu
2022-10-20Merge branch 'PrismLauncher:develop' into menu-iconsleo78913
2022-10-20add icons to the instance menu and 4 new icons:leo78913
delete rename tag export Signed-off-by: leo78913 <leo3758@riseup.net>
2022-10-20fix: memory leak when finishing blocked mods jobflow
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-10-20fix: hide ProgressDialog when failing/succeeding tasksflow
WHY IS QT LIKE THAT AAAAAAAA Signed-off-by: flow <flowlnlnln@gmail.com>
2022-10-20Merge pull request #184 from Chrono-byte/developSefa Eyeoglu
2022-10-20Remove erroneous space Chrono-byte
Signed-off-by: Chrono-byte <me@disilla.org>
2022-10-20fix contributor notices in AboutDialog.cpp for license complianceChrono-byte
Signed-off-by: Chrono-byte <me@disilla.org>
2022-10-20fix: show a single line in ProjectItem's desc. when there's no more spaceflow
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-10-20Merge pull request #47 from TheOPtimal/developDioEgizio
2022-10-20Merge pull request #119 from Scrumplex/update-readme-sponsorsSefa Eyeoglu
2022-10-20fix: update READMESefa Eyeoglu
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2022-10-20Merge pull request #148 from ZombieNub/prismlauncher-renameSefa Eyeoglu
generated by cgit (git 2.46.0) at 2025-02-09 14:49:57 +0000