aboutsummaryrefslogtreecommitdiff
path: root/launcher
AgeCommit message (Collapse)Author
2022-10-29fix hardcoded svgfn2006
Signed-off-by: fn2006 <usernamefn2006alreadyused@protonmail.com>
2022-10-29chore: update creditsSefa Eyeoglu
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2022-10-29Merge pull request #173 from Scrumplex/fix-iconsSefa Eyeoglu
2022-10-28add a flat white version of the launch iconleo78913
Signed-off-by: leo78913 <leo3758@riseup.net>
2022-10-28Merge branch 'PrismLauncher:develop' into toolbar-iconsleo78913
2022-10-28Merge pull request #65 from he3als/developSefa Eyeoglu
2022-10-28Merge pull request #319 from Scrumplex/fix-avoid-mr-segfaultSefa Eyeoglu
2022-10-28fix: avoid segfault for unexpected API reponseSefa Eyeoglu
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2022-10-27chore: add comment about copy bugSefa Eyeoglu
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2022-10-25Merge pull request #206 from flowln/changelog_height_fixDioEgizio
2022-10-24Merge pull request #283 from flowln/fix_abort_on_autosearchSefa Eyeoglu
2022-10-24Merge pull request #211 from Hibiii/show-instace-argSefa Eyeoglu
2022-10-24fix: retry mod search job after aborting itflow
This way, we don't get stuck with an aborted job in our way! :o Signed-off-by: flow <flowlnlnln@gmail.com>
2022-10-24fix: update icon generate scriptSefa Eyeoglu
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2022-10-23add icons to the instance toolbarleo78913
Signed-off-by: leo78913 <leo3758@riseup.net>
2022-10-23Better dark theme selection contrastTrisave
Tweak background of the selection background in order to make text more readable Signed-off-by: Trisave <42098407+Protrikk@users.noreply.github.com>
2022-10-23Merge pull request #228 from bensuperpc/change_castflow
2022-10-23Replace tab with spaces in flat_white.qrche3als
Signed-off-by: he3als <65787561+he3als@users.noreply.github.com>
2022-10-23Fix new flat white iconshe3als
Signed-off-by: he3als <65787561+he3als@users.noreply.github.com>
2022-10-23Fix version labels widthjn64
Make labels fit to the contents, so Ibeam cursor doesn't appear over empty space. Should have been done with 90025ed. Signed-off-by: jn64 <23169302+jn64@users.noreply.github.com>
2022-10-22Merge pull request #234 from AliceDTRH/fix/dedupejavaflow
2022-10-22Use correct variable for WindowsAliceDTRH
Signed-off-by: AliceDTRH <57547425+AliceDTRH@users.noreply.github.com>
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>