aboutsummaryrefslogtreecommitdiff
path: root/launcher
AgeCommit message (Collapse)Author
2022-10-22DCO Remediation Commit for he3als <65787561+he3als@users.noreply.github.com>he3als
I, he3als <65787561+he3als@users.noreply.github.com>, hereby add my Signed-off-by to this commit: d87f743a2bd2fac761b94de77ed7255d7a983f03 I, he3als <65787561+he3als@users.noreply.github.com>, hereby add my Signed-off-by to this commit: 92dfd659f1a3e11accdbf0ebbdc7cb91f74d9a21 I, he3als <65787561+he3als@users.noreply.github.com>, hereby add my Signed-off-by to this commit: a6e65dfc7a7e8080297b59ecf322b788d1c9bad2 I, he3als <65787561+he3als@users.noreply.github.com>, hereby add my Signed-off-by to this commit: 99e1c13e80d12764f57a993661656d9ed7de27bb Signed-off-by: he3als <65787561+he3als@users.noreply.github.com>
2022-10-22fix: add flat_white to codehe3als
2022-10-22Add new flat white iconshe3als
2022-10-22Deduplicates java installs before passing it onAliceDTRH
Signed-off-by: AliceDTRH <57547425+AliceDTRH@users.noreply.github.com>
2022-10-22Merge branch 'PrismLauncher:develop' into develophe3als
2022-10-22ATLauncher: Fix pack installation always abortingJamie Mansfield
I made a mistake during when cherry picking a previous commit, this applies the change - and fixes installing ATLauncher packs.
2022-10-22Merge pull request #215 from forkiesassds/developflow
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-22fix: fix segfault when resolving Flame resourcesSefa Eyeoglu
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
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-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 #187 from leo78913/menu-iconsSefa Eyeoglu
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-21Fix typocircuit10
Signed-off-by: circuit10 <heath.mitchell27@gmail.com>
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-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-20check space requirements of project descriptionSebastian Rueth
if there isn't enough space for 2 lines of project description, only draw one Signed-off-by: Sebastian Rueth <sebastian.rueth@protonmail.com>
2022-10-19fix: properly center project descriptionsflow
In particular, this takes into account the space used by the title, so (hopefully) there won't be problems with custom themes with that. Signed-off-by: flow <flowlnlnln@gmail.com> Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net> Signed-off-by: Sebastian Rüth <sebastian.rueth@protonmail.com>
2022-10-19fix text clippingSebastian Rüth
Signed-off-by: Sebastian Rüth <sebastian.rueth@protonmail.com>
2022-10-19Merge pull request #31 from flowln/who_needs_webviewSefa Eyeoglu
2022-10-19Merge pull request #27 from flowln/ftb_install_improveSefa Eyeoglu
2022-10-19refactor: replace with new logoSefa Eyeoglu
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2022-10-19RenameSamisafool
Signed-off-by: Samisafool <thenerdiestguy@gmail.com>
2022-10-18Add fallback for multimc.cfgFayne Aldan
Signed-off-by: Fayne Aldan <FayneAldan@gmail.com>
2022-10-18fix: don't take item from a possibly empty listflow
The list gets destroyed when we take the last object, so things explode. :pensive: Signed-off-by: flow <flowlnlnln@gmail.com>
2022-10-18Merge pull request #55 from flowln/config_add_fallbackDioEgizio
2022-10-18Fix .QRC file for flat white iconshe3als
2022-10-18Add flat white iconshe3als
This is mainly for dark mode users, as I think that the regular colour of the flat icons do not look good with dark mode.
2022-10-18Streamline Button changes to improve source readability.Cleo John
2022-10-18fix: add fallback for polymc.cfgflow
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-10-18feat: allow specifying fallbacks to INI filesflow
Signed-off-by: flow <flowlnlnln@gmail.com>
2022-10-18Merge pull request #33 from DioEgizio/remove-useless-actionsSefa Eyeoglu
2022-10-18Merge pull request #28 from flowln/fix_copyDioEgizio
2022-10-18Merge pull request #29 from Scrumplex/feat-clear-metadataSefa Eyeoglu
2022-10-18Merge pull request #26 from Scrumplex/armhfDioEgizio
2022-10-18feat: remove redundant actions from instance toolbar and redundant "instance"sDioEgizio
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>