mc-in-work/PrismLauncher
1
0
Fork 0
mirror of https://github.com/PrismLauncher/PrismLauncher.git synced 2026-06-29 01:54:20 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 1
10383 commits 18 branches 53 tags 60 MiB
Commit graph

10383 commits

This branch
This branch
All branches
Author SHA1 Message Date
DioEgizio
c806f61a02 hack: resolve dependencies for imageformats on mingw 
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
(cherry picked from commit a98ec194be)
 2026-01-18 21:56:41 +01:00
Tayou
24fab616a4
[Backport release-10.x] fix: improve we couldn't launch after 3 tries message (#4812) 2026-01-18 20:26:29 +01:00
DioEgizio
1aff2e64d5 fix: improve we couldn't launch after 3 tries message 
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
(cherry picked from commit d5da7c9bde)
 2026-01-18 19:25:46 +00:00
Alexandru Ionut Tripon
b27a559010
[Backport release-10.x] Take $GRADLE_USER_HOME into account when looking for JDKs (#4808) 2026-01-18 01:18:14 +02:00
SandaruKasa
40796e9f41 Take $GRADLE_USER_HOME into account when looking for JDKs 
Signed-off-by: SandaruKasa <sandarukasa@ya.ru>
(cherry picked from commit 267e8f1d33)
 2026-01-17 23:17:56 +00:00
Alexandru Ionut Tripon
6296ec7fce
[Backport release-10.x] fix ftb import for old packs (#4798) 2026-01-17 17:05:02 +02:00
Trial97
d1605ec02a fix ftb import for old packs 
fixes #4786

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 3496b7b3a0)
 2026-01-17 15:04:08 +00:00
Alexandru Ionut Tripon
6bd74bedac
[Backport release-10.x] Fix instance and settings window minimum size (#4774) 2026-01-14 23:25:05 +02:00
TheKodeToad
3006e68849 Fix new instance window being too large 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
(cherry picked from commit d283726494)
 2026-01-14 21:24:42 +00:00
TheKodeToad
84a2d7d10a Fix settings window being too large 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
(cherry picked from commit 40c6f79b5f)
 2026-01-14 21:24:42 +00:00
Alexandru Ionut Tripon
96269d408c
[Backport release-10.x] Allow opting out of pre-compiled headers (#4773) 2026-01-14 23:22:00 +02:00
TheKodeToad
22c6e1a331 Fix JavaWizardWidget compilation without PCH 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
(cherry picked from commit 90e3c59bd8)
 2026-01-14 21:21:36 +00:00
TheKodeToad
e2842bb5cd Allow toggling pre-compiled headers 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
(cherry picked from commit 3a16cf3081)
 2026-01-14 21:21:36 +00:00
Alexandru Ionut Tripon
5983919c2f
[Backport release-10.x] Fix for Prism failing to recognize some shader pack ZIP archives added manually by the user (#4766) 2026-01-14 13:52:40 +02:00
Alexandru Ionut Tripon
70f274ca9b
[Backport release-10.x] IconList: Make sure we always set new path (#4765) 2026-01-14 13:52:30 +02:00
Alexandru Ionut Tripon
3bf9b881fa
[Backport release-10.x] chore: make appimage use portals for file picking (#4764) 2026-01-14 13:52:21 +02:00
Alexandru Ionut Tripon
326f818d0a
[Backport release-10.x] accept libarchive warning result (#4763) 2026-01-14 13:52:13 +02:00
SwitchAxe
aadd88cbd8 Fixed formatting 
Signed-off-by: SwitchAxe <sofiacerasuoli@gmail.com>
(cherry picked from commit 809e766aec)
 2026-01-14 11:51:57 +00:00
SwitchAxe
0b7646740b Improved the check for the assets dir 
Signed-off-by: SwitchAxe <sofiacerasuoli@gmail.com>
(cherry picked from commit 7f0f90fcce)
 2026-01-14 11:51:57 +00:00
SwitchAxe
19ead6adbd Made the loop more efficient 
Signed-off-by: SwitchAxe <sofiacerasuoli@gmail.com>
(cherry picked from commit 8aba994312)
 2026-01-14 11:51:57 +00:00
Sofia
fb77027d84 Update launcher/minecraft/mod/tasks/LocalShaderPackParseTask.cpp 
Co-authored-by: Octol1ttle <l1ttleofficial@outlook.com>
Signed-off-by: Sofia <75943257+SwitchAxe@users.noreply.github.com>
(cherry picked from commit 6321db5942)
 2026-01-14 11:51:57 +00:00
SwitchAxe
2692cbcdc8 Fixed Indentation 
Signed-off-by: SwitchAxe <sofiacerasuoli@gmail.com>
(cherry picked from commit 6ac9de7a11)
 2026-01-14 11:51:57 +00:00
SwitchAxe
17941872f8 Added support for shader packs with a top-level parent directory 
Signed-off-by: SwitchAxe <sofiacerasuoli@gmail.com>
(cherry picked from commit 9a93696915)
 2026-01-14 11:51:57 +00:00
Octol1ttle
6e82d0a4eb fix(IconList): make sure we always set new path 
Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com>
(cherry picked from commit 6cbedbe184)
 2026-01-14 11:50:57 +00:00
DioEgizio
c9098f7556 chore: make appimage use portals for file picking 
much better than Qt's ugly default one

Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
(cherry picked from commit 1b15643fcd)
 2026-01-14 11:50:39 +00:00
Trial97
0d21749568 accept libarchive warning result 
this is the intended behavior to treat warnings as ok, because
teoretically the file was extracted, even if the time of the file can't
be set

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit a6d6ff9926)
 2026-01-14 11:50:12 +00:00
Alexandru Ionut Tripon
fe3c3e7449
[Backport release-10.x] Free up disk space on Flatpak builds so they don't crash (#4757) 2026-01-13 08:40:13 +02:00
Octol1ttle
c0fae914d8 hack: try to free up disk space on Flatpak builds so they don't crash 
Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com>
(cherry picked from commit eafce5d5f6)
 2026-01-13 06:15:08 +00:00
Alexandru Ionut Tripon
df9bed30af
[Backport release-10.x] auth: improve status messages (#4754) 2026-01-12 20:20:49 +02:00
Octol1ttle
1d1dd6262f auth: improve status messages 
Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com>
(cherry picked from commit 6cddc28e9b)
 2026-01-12 18:20:05 +00:00
Alexandru Ionut Tripon
aabd0a6d53
[Backport release-10.x] Update copyright year (#4743) 2026-01-12 00:23:39 +02:00
Alexandru Ionut Tripon
6486c3d1a8
[Backport release-10.x] Set current auth step description in correct method (#4742) 2026-01-12 00:23:28 +02:00
Alexandru Ionut Tripon
8936103378
[Backport release-10.x] Fix auto-join getting stuck disabled (#4741) 2026-01-12 00:23:05 +02:00
Trial97
a3b9281c09 Update copyright year 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 508a66aedd)
 2026-01-11 22:22:25 +00:00
Octol1ttle
c55f4b373e fix(AuthFlow): set current step description in correct method 
Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com>
(cherry picked from commit f0813b578e)
 2026-01-11 22:22:13 +00:00
TheKodeToad
5ed7a5b56f Fix auto-join getting stuck disabled 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
(cherry picked from commit e856f60804)
 2026-01-11 22:22:02 +00:00
Alexandru Ionut Tripon
702d4eb75c
[Backport release-10.x] Network: log server response on error (#4732) 2026-01-11 15:20:24 +02:00
Alexandru Ionut Tripon
7cc148ed60
[Backport release-10.x] Fix environment variables always being discarded and custom commands always being overriden (#4731) 2026-01-11 15:20:16 +02:00
Alexandru Ionut Tripon
4b91ae019e
[Backport release-10.x] Fix shaderpacks folder being hidden (#4730) 2026-01-11 15:19:57 +02:00
Octol1ttle
323a50efa2 change(NetRequest): log server response on error 
Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com>
(cherry picked from commit 7f3790bf73)
 2026-01-11 13:19:37 +00:00
TheKodeToad
5923504aff Fix broken EnvironmentVariables and CustomCommands when tab is inactive 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
(cherry picked from commit 01228cc0b7)
 2026-01-11 13:19:27 +00:00
TheKodeToad
60f598a0e7 Fix shaderpacks folder being hidden on Windows 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
(cherry picked from commit 3e7ef5ee17)
 2026-01-11 13:19:10 +00:00
Alexandru Ionut Tripon
810558a6f4
[Backport release-10.x] fix modrinth environments filter (#4725) 2026-01-10 18:37:31 +02:00
Trial97
6d60fc1cbe fix modrinth environments filter 
fixes #4630
reversed the conditions to check for side because somewhere the mod side
is no initilized(easier to check one line than search where it is not
initialized)

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit a97c15d0fb)
 2026-01-10 16:36:50 +00:00
github-actions[bot]
a80c215113
[Backport release-10.x] Bump to 10.0.2 (#4720) 
Bump to 10.0.2 (#4713)


(cherry picked from commit cbe77872fa)

Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
Co-authored-by: TheKodeToad <TheKodeToad@proton.me>
 2026-01-09 16:03:57 -07:00
Alexandru Ionut Tripon
1109ddce2a
[Backport release-10.x] format the code (#4719) 2026-01-09 23:38:05 +02:00
Trial97
b2e195a651 format the code 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 53acc60983)
 2026-01-09 21:36:46 +00:00
Alexandru Ionut Tripon
0008542228
[Backport release-10.x] Disable tooltips if using gamescope / Steam Deck. (#4716) 2026-01-09 22:15:09 +02:00
Alexandru Ionut Tripon
e6bfaf4717
[Backport release-10.x] remove curseforge api key validation (#4715) 2026-01-09 22:14:45 +02:00
github-actions[bot]
185d5cb4bb
[Backport release-10.x] fix jpg icons (#4714) 
fix jpg icons

fixes #4686 and fixes #4666
Forces jpg and jpeg to go through QPixmap first then to Icon.
The original behaivior used the QIcon internal engine to build the
QPixmap causing some inconsitencies.


(cherry picked from commit 3f53670cc2)

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
Co-authored-by: Trial97 <alexandru.tripon97@gmail.com>
 2026-01-09 22:14:27 +02:00