01db80d19a
Fix version labels width
...
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-23 03:35:23 +08:00
8b28ed67ae
Merge pull request #234 from AliceDTRH/fix/dedupejava
2022-10-22 13:14:26 -03:00
f35a30d371
oops
...
Signed-off-by: Ryan Cao <70191398+ryanccn@users.noreply.github.com >
2022-10-22 23:47:53 +08:00
b2789fef0f
Use correct variable for Windows
...
Signed-off-by: AliceDTRH <57547425+AliceDTRH@users.noreply.github.com >
2022-10-22 17:19:34 +02:00
46fe7e77b3
DCO Remediation Commit for he3als <65787561+he3als@users.noreply.github.com>
...
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-22 16:14:50 +01:00
99e1c13e80
fix: add flat_white to code
2022-10-22 15:50:06 +01:00
a6e65dfc7a
Add new flat white icons
2022-10-22 15:40:39 +01:00
1471eddc7e
Deduplicates java installs before passing it on
...
Signed-off-by: AliceDTRH <57547425+AliceDTRH@users.noreply.github.com >
2022-10-22 16:40:31 +02:00
89fd84d916
Merge branch 'PrismLauncher:develop' into develop
2022-10-22 15:30:40 +01:00
0e17eee096
ATLauncher: Fix pack installation always aborting
...
I made a mistake during when cherry picking a previous commit, this
applies the change - and fixes installing ATLauncher packs.
2022-10-22 15:22:30 +01:00
81f1305270
Merge pull request #215 from forkiesassds/develop
2022-10-22 10:48:00 -03:00
24e4db676a
Merge pull request #224 from jamierocks/atl-abort-close-optional-mods-dialog
2022-10-22 15:31:53 +02:00
6e21a9829d
Merge pull request #225 from Scrumplex/fix-segfault-fileresolver
2022-10-22 15:31:46 +02:00
4e99e10cbd
Merge pull request #218 from getchoo/change-jars-path
2022-10-22 10:18:58 -03:00
a406aeb3ea
feat: register as zip/mrpack handler on macOS
...
Signed-off-by: Ryan Cao <70191398+ryanccn@users.noreply.github.com >
2022-10-22 20:51:46 +08:00
970e4b020e
fix: fix segfault when resolving Flame resources
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-10-22 14:11:51 +02:00
a6b13487f0
ATLauncher: Abort install if optional mods dialog is closed
...
This matches the behaviour of ATLauncher.
2022-10-22 12:35:34 +01:00
56ae4e5b6a
Change old style cast to C++ cast
...
Change old style cast to C++ cast
Signed-off-by: Bensuperpc <bensuperpc@gmail.com >
2022-10-22 13:04:48 +02:00
54c26b05fa
Merge pull request #185 from flowln/fix_blocked_mods_crash
2022-10-22 12:44:20 +02:00
4a2b25e841
fix: use correct variable for jars path
...
Signed-off-by: seth <getchoo@tuta.io >
2022-10-21 21:40:21 -04:00
ba4af1a890
fix: make jars path specific to prism
...
Signed-off-by: seth <getchoo@tuta.io >
2022-10-21 21:40:20 -04:00
9b17cde019
CurseForge modpack page improvements
...
Signed-off-by: forkiesassds <icanttellyou@memeware.net >
2022-10-22 01:20:08 +03:00
aefb8b353e
Merge pull request #187 from leo78913/menu-icons
2022-10-21 22:39:35 +02:00
1288b92615
Add argument to show instance window
2022-10-21 15:40:28 -03:00
7eecf454e8
fix: remove max height logic for mod update changelogs
...
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-21 14:07:43 -03:00
ccf7d1e0c4
material design icons
...
Signed-off-by: leo78913 <leo3758@riseup.net >
2022-10-21 14:04:04 -03:00
e4b5cd23e6
the trashcan icons dont look like trash now
...
Signed-off-by: leo78913 <leo3758@riseup.net >
2022-10-21 13:49:31 -03:00
ff2f40f5e1
Fix typo
...
Signed-off-by: circuit10 <heath.mitchell27@gmail.com >
2022-10-21 16:28:04 +01:00
12d8409e65
Merge pull request #39 from Sebbl0508/mod_dialog_fontsize
2022-10-21 15:25:28 +02:00
8db89b4cfb
Merge branch 'PrismLauncher:develop' into menu-icons
2022-10-20 17:54:43 -03:00
31dc92dafe
add icons to the instance menu and 4 new icons:
...
delete
rename
tag
export
Signed-off-by: leo78913 <leo3758@riseup.net >
2022-10-20 17:48:57 -03:00
01b90809e8
fix: memory leak when finishing blocked mods job
...
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-10-20 16:55:22 -03:00
0a7383a4e1
fix: hide ProgressDialog when failing/succeeding tasks
...
WHY IS QT LIKE THAT AAAAAAAA
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-10-20 16:54:39 -03:00
88341b923a
fix contributor notices in AboutDialog.cpp for license compliance
...
Signed-off-by: Chrono-byte <me@disilla.org >
2022-10-20 15:14:26 -04:00
5d27633821
fix: show a single line in ProjectItem's desc. when there's no more space
...
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-10-20 15:03:46 -03:00
b46c4a81e0
check space requirements of project description
...
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-20 08:02:05 +02:00
d6479e133d
fix: properly center project descriptions
...
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-19 20:12:50 +02:00
50bbf2aacc
fix text clipping
...
Signed-off-by: Sebastian Rüth <sebastian.rueth@protonmail.com >
2022-10-19 20:12:50 +02:00
4e08f28246
Merge pull request #31 from flowln/who_needs_webview
2022-10-19 14:28:29 +02:00
46c57e120f
Merge pull request #27 from flowln/ftb_install_improve
2022-10-19 13:51:35 +02:00
61fbc5a791
refactor: replace with new logo
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2022-10-19 13:08:23 +02:00
8201d1df02
Rename
...
Signed-off-by: Samisafool <thenerdiestguy@gmail.com >
2022-10-19 15:02:43 +05:30
888a87463e
Add fallback for multimc.cfg
...
Signed-off-by: Fayne Aldan <FayneAldan@gmail.com >
2022-10-18 14:40:34 -06:00
3a95a3b7c1
fix: don't take item from a possibly empty list
...
The list gets destroyed when we take the last object, so things explode.
😔
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-10-18 16:51:42 -03:00
fb4cf0b75d
Merge pull request #55 from flowln/config_add_fallback
2022-10-18 19:50:34 +02:00
92dfd659f1
Fix .QRC file for flat white icons
2022-10-18 17:54:26 +01:00
d87f743a2b
Add flat white icons
...
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-18 17:49:35 +01:00
83ceb26151
Streamline Button changes to improve source readability.
2022-10-18 17:28:23 +02:00
32cdfb871c
fix: add fallback for polymc.cfg
...
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-10-18 12:22:42 -03:00
801e7da5ee
feat: allow specifying fallbacks to INI files
...
Signed-off-by: flow <flowlnlnln@gmail.com >
2022-10-18 12:22:42 -03:00
