aboutsummaryrefslogtreecommitdiff
path: root/launcher
AgeCommit message (Collapse)Author
2022-10-26Add a snapcraft.yml for building SnapsPiper McCorkle
The included snapcraft.yml can be used to build a Snap (the application format used by Canonical's modern package manager) out of Prism. If the project wants in the future, Prism can publish these Snaps to the Snap Store so the Prism Launcher can be installed through the Ubuntu Software app on vanilla Ubuntu. I haven't registered the Snap name, so it's currently free for anyone to reserve. I'd suggest that a Prism developer register the name prismlauncher at https://snapcraft.io/register-snap to ensure the name belongs to the project, even if there are no plans of setting up CI to publish snaps in the short term. I have also modified JavaUtils.cpp to be able to autodetect the Java versions included in the Snap, and added "*.snap" to the .gitignore so the compiled Snap isn't accidentally committed to the repository. Signed-off-by: Piper McCorkle <contact@piperswe.me>
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-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-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-22Deduplicates java installs before passing it onAliceDTRH
Signed-off-by: AliceDTRH <57547425+AliceDTRH@users.noreply.github.com>
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-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