Commit graph

4999 commits

Author SHA1 Message Date
DioEgizio
66f7fb909d chore: simplify Launcher.in quite a bit
not necessary anymore with sharun

Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
(cherry picked from commit 015ee05311)
2025-12-31 12:25:38 +00:00
DioEgizio
317b8eea9b fix: improve a bit the FTB packs are also on cf notice
Co-authored-by: TheKodeToad <TheKodeToad@proton.me>
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
(cherry picked from commit 57c4b71c61)
2025-12-27 15:11:13 +01:00
DioEgizio
c968bafb0a chore: add new ftb packs are also on cf notice
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
(cherry picked from commit 31dd8cd9f8)
2025-12-27 15:11:13 +01:00
Alexandru Ionut Tripon
9b7c83ef23
[Backport release-10.x] feat: Use precompiled headers for 130-180% speedup (#4594) 2025-12-26 23:42:17 +02:00
Rachel Powers
1e07305803 feat: Use pre-compiled headers
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
(cherry picked from commit e53093c4b4)
2025-12-26 21:41:46 +00:00
Octol1ttle
2128e87d92 fix(APIPage.ui): resolve duplicate name
Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com>
(cherry picked from commit de092922d7)
2025-12-26 21:40:23 +00:00
Blake Batson
b2d7211254 Force disable xrandr if it is unavailable
lwjgl2 optionally requires the xrandr command line utility on linux, but
does not check if the executable actually exists before trying to use
it. We can force it to fall back to the xf86videomode implementation
by checking for the executable ourselves, and force disabling xrandr
with this boolean [1] if it does not exist.

Link: 2df01dd762/src/java/org/lwjgl/opengl/LinuxDisplay.java (L214) [1]
Signed-off-by: Blake Batson <bbatson101@gmail.com>
(cherry picked from commit e0c2fbbcde)
2025-12-26 10:10:51 +00:00
Trial97
75215b0d31 fix mod update remaining disabled on second open
fixes
https://discord.com/channels/1031648380885147709/1450161125172707390/1453013386144124929
basically when opening the edit window a second time the model doesn't
get any updates as the data is already loaded into the memory.

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 7f68f2fe3b)
2025-12-23 22:10:44 +00:00
Trial97
5520dc6aaf preserve original file extension when importing modpack icon
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 8e96beeda0)
2025-12-23 20:45:06 +00:00
Trial97
e90965adc1 match disabled mods on uninstall
fixes #4537
This ensures that when looking to uninstall a resource prism will
consider the disabled ones to.
Right now we have a guard in place to prevent resources using the same
name so this check will allways match with the correct resouce.

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 08c45684de)
2025-12-22 21:55:54 +00:00
Trial97
131dc0acf3 fix Pre-release filter
introduced here https://github.com/PrismLauncher/PrismLauncher/pull/3260
fixes #4415
reason: some snapshot have Pre-Release in our meta but when searching in
Modrinth this needs to be translated to -pre and the reverse needed to
be done for filtering after we fetched the version.
Now there are snapshots with -pre in name and that works with Modrinth
but when we translate it back we replace it with Pre-Release so the
easeiest patch is just to double the version(one with -pre one with
Pre-Release)

The correct one would be to complicate the code and identify the
versions that need the transition and only apply this for those.

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit b1408775b3)
2025-12-22 21:45:48 +00:00
Alexandru Ionut Tripon
31cf378171 Update launcher/minecraft/skins/SkinModel.cpp
Co-authored-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
(cherry picked from commit c723b3abe8)
2025-12-22 17:32:39 +00:00
Trial97
4173faba7a add copyright for modrinth code
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 4b96c5736c)
2025-12-22 17:32:39 +00:00
Trial97
0b3fb6c4ce fix legacy skin model
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit f7111b6ec1)
2025-12-22 17:32:39 +00:00
Seth Flynn
947a8faa0d fix(build): handle CMAKE_BUILD_TYPE with generator expressions
Since we've started using ninja's multi-config generator, evaluating
CMAKE_BUILD_TYPE at configure-time is no longer reliable. Thankfully,
CMake offers "generator expressions" that are evaluated during build
system generation, which allows us to continue using these conditional
flags without much headache

Signed-off-by: Seth Flynn <getchoo@tuta.io>
(cherry picked from commit 85849fea41)
2025-12-22 14:50:30 +00:00
Trial97
3f9b6ae452 fix modrinth modpack allways download latest
fixes #4547
introduced by #3828
made a mistake to use addonId instead ov fileId
this only applies to modrinth
on curseforge I could not reproduce this bug

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit d7745d97f2)
2025-12-22 08:09:56 +00:00
Trial97
a0797d00e3 fix accounts crash
fixes #4541
introduced in
3c46d8a412
The original commit introduced m_name but never used it.
When the endActivity would be called with a count of 0 this would crash
the laucnher.
How to reproduce: try to switch your skin in quick succession until you
get 429 too many requests as response to the login.
I will also presume this is not the only crash caused by this(hopefully
it is as it was not catched for four years)

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit f4b22dae90)
2025-12-21 04:33:25 +00:00
Rachel Powers
8f314c982a fix(skin-preview): smoother chessboard background contrast
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
(cherry picked from commit 42b72d676c)
2025-12-20 16:51:15 +00:00
Seth Flynn
df172c0923 revert: "fix(launcher): set correct bin path for self-contained appimages"
Refs: b1b4b5d
Signed-off-by: Seth Flynn <getchoo@tuta.io>
(cherry picked from commit e39e59acb6)
2025-12-20 17:48:36 +01:00
Seth Flynn
47be7ae502 revert: "fix(appimage): launch external processes with bundled linker"
Refs: c305ed4
Signed-off-by: Seth Flynn <getchoo@tuta.io>
(cherry picked from commit 1d8bf82ef8)
2025-12-20 17:48:36 +01:00
Tayou
3fbbebe93b fix skin preview leg rendering
Signed-off-by: Tayou <git@tayou.org>
(cherry picked from commit fcf201755c)
2025-12-20 12:00:17 +00:00
Alexandru Ionut Tripon
1274eb7e48
[Backport release-10.x] fix skin depth (#4530) 2025-12-19 20:28:34 +02:00
Trial97
49e9671c96 fix skin depth
The skin overlay was drawn together with the original skin making it
blend weirdly. By drawing the overlay after the skin this blends with
the body corectly.

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 624d506fac)
2025-12-19 18:27:02 +00:00
Trial97
819b4e49c8 fix elytra preview
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit e360a95c23)
2025-12-19 18:26:45 +00:00
Dylan Schooner
ab71c44ed6 Check specifically for GarbageAtEnd error
- Out parameter for garbage data\n- Rename parseUntilMalformed to parseUntilGarbage

Signed-off-by: Dylan Schooner <dschooner05@gmail.com>
(cherry picked from commit 51b47050f9)
2025-12-18 21:51:35 +00:00
Dylan Schooner
9fef9c7bd8 Use Json::parseUntilMalformed in McClient::parseResponse
Signed-off-by: Dylan Schooner <dschooner05@gmail.com>
(cherry picked from commit 9c7fe72f9c)
2025-12-18 21:51:35 +00:00
Dylan Schooner
811e3de29b Add Json::parseUntilMalformed helper
Signed-off-by: Dylan Schooner <dschooner05@gmail.com>
(cherry picked from commit e1eee6e3ca)
2025-12-18 21:51:35 +00:00
Dylan Schooner
1ebe081e03 Trim unexpected info from pack.mcmeta
Signed-off-by: Dylan Schooner <dschooner05@gmail.com>
(cherry picked from commit 43fce3ae46)
2025-12-18 21:51:35 +00:00
Alexandru Ionut Tripon
8fcfebb321 Update launcher/ui/dialogs/skins/SkinManageDialog.cpp
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
(cherry picked from commit 3c570f9e9c)
2025-12-18 11:21:10 +00:00
Trial97
01bb8c81cf Use static image when opengl context is not available
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 177e7b272b)
2025-12-18 11:21:10 +00:00
Tayou
474be07724 server player req: parse malformed json
ATM10 server seems to send a extra json object after the default response, that we need to cut off.
Signed-off-by: Tayou <git@tayou.org>
Co-authored-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 5ebd386797)
2025-12-16 14:35:33 +00:00
Seth Flynn
fc3c5cba30
Use multibyte encoding aware libarchive functions when dealing with filenames (#4457) 2025-12-15 08:09:25 -05:00
Rachel Powers
b40544dc55
fix: remove locale forcing as unnecessary
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
2025-12-14 22:43:22 -07:00
Rachel Powers
c33d104dc3
fix leak of cloned entry (#4487) 2025-12-13 18:52:49 -07:00
Rachel Powers
95d2789199
fix archive detection (#4486) 2025-12-13 16:02:50 -07:00
Alexandru Ionut Tripon
66c9fafbe8
Use old ProjectItem highlight on Windows styles (#4466) 2025-12-14 00:56:30 +02:00
Alexandru Ionut Tripon
ed63a355b0
fix partial java download (#4472) 2025-12-14 00:55:05 +02:00
Alexandru Ionut Tripon
aa3d78b3dc
Fix server columns text other than name being invisible (#4475) 2025-12-14 00:54:42 +02:00
TheKodeToad
caa69ee204
Allow http://localhost for meta (#4477) 2025-12-13 22:53:05 +00:00
Trial97
f05fd4da2b
fix leak of cloned entry
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2025-12-14 00:20:24 +02:00
Trial97
e775629e1f
fix archive detection
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2025-12-14 00:03:34 +02:00
TheKodeToad
d818f232e3
Allow http://localhost for meta
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2025-12-12 17:21:00 +00:00
Alexandru Ionut Tripon
9a505a07c0
Make page sidebar look less disjointed on breeze (#4465) 2025-12-12 14:51:36 +02:00
TheKodeToad
0d7244d56f
Remove unused code
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2025-12-12 12:18:56 +00:00
TheKodeToad
7baac92f56
Fix server columns being totally invisible
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2025-12-12 12:07:19 +00:00
Trial97
0f7320ff1d
fix partial java download
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2025-12-12 09:34:54 +02:00
Trial97
9cd199a49e
fix use-afrer-free crash caused by QtConcurrent
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2025-12-12 09:00:30 +02:00
TheKodeToad
81f34be053
Use old ProjectItem highlight on Windows styles
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2025-12-11 15:46:31 +00:00
TheKodeToad
2b949d5fdd
Make page container hug edges of dialog <3
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2025-12-11 14:07:02 +00:00
Trial97
808b09c403
improve archive detection
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2025-12-11 12:54:49 +02:00