Commit Graph

10224 Commits

Author SHA1 Message Date
Blake Batson
e0c2fbbcde 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>
2025-12-25 14:09:50 -05:00
Alexandru Ionut Tripon
76d1cd1b4e fix mod update remaining disabled on second open (#4573) 2025-12-24 00:10:32 +02:00
Alexandru Ionut Tripon
072eaa32ec preserve original file extension when importing modpack icon (#4565) 2025-12-23 22:44:53 +02:00
Trial97
7f68f2fe3b 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>
2025-12-23 22:32:52 +02:00
Alexandru Ionut Tripon
c59db39e06 match disabled mods on uninstall (#4544) 2025-12-22 23:55:25 +02:00
Alexandru Ionut Tripon
d18a6909c1 fix Pre-release filter (#4563) 2025-12-22 23:45:37 +02:00
Trial97
8e96beeda0 preserve original file extension when importing modpack icon
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2025-12-22 22:50:43 +02:00
Alexandru Ionut Tripon
9504ed500a build(mingw): use dwarf debug info (#4554) 2025-12-22 20:12:16 +02:00
Trial97
b1408775b3 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>
2025-12-22 19:55:47 +02:00
Alexandru Ionut Tripon
8a84f5fc1d fix legacy skin model (#4511) 2025-12-22 19:32:25 +02:00
Alexandru Ionut Tripon
c723b3abe8 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>
2025-12-22 18:22:32 +02:00
Trial97
4b96c5736c add copyright for modrinth code
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2025-12-22 18:20:06 +02:00
timoreo
c7bf324e64 build(nix): use nixos-25.11 channel for nixpkgs (#4559) 2025-12-22 17:00:36 +01:00
Seth Flynn
5ee33814b6 build(nix): use nixos-25.11 channel for nixpkgs
This makes `clangd` work again, thanks to
https://github.com/NixOS/nixpkgs/pull/462747

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/c6245e83d836d0433170a16eb185cefe0572f8b8' (2025-12-18)
  → 'https://releases.nixos.org/nixos/25.11/nixos-25.11.2222.b3aad468604d/nixexprs.tar.xz?lastModified=1766201043&narHash=sha256-v9nbQe0BgwBx%2BKcxRf6i2kbS8EwKjBFRjAawA91B/OE%3D&rev=b3aad468604d3e488d627c0b43984eb60e75e782' (2025-12-20)

Signed-off-by: Seth Flynn <getchoo@tuta.io>
2025-12-22 10:27:11 -05:00
Seth Flynn
ea84621d2f Make blocked/stacked pr detection more flexible with capitalization (#4557) 2025-12-22 09:54:56 -05:00
Seth Flynn
d85ff94f03 build(mingw): use dwarf debug info
As it turns out, LLDB can load Windows crash dumps!

This allows us go back to the regular (better supported) DWARF debuginfo
format used by MinGW, as now we have a tool that can both parse those
symbols *and* Windows' crash dumps. The biggest advantage here is that
once again, MinGW crash dumps can be easily inspected on Linux

Signed-off-by: Seth Flynn <getchoo@tuta.io>
2025-12-22 09:53:42 -05:00
Seth Flynn
39c4e7c79b fix(build): handle CMAKE_BUILD_TYPE with generator expressions (#4553) 2025-12-22 09:50:19 -05:00
Rachel Powers
586364e3b6 Make blocked/stacked pr detection more flexible with capitalization
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
2025-12-22 02:51:58 -07:00
Seth Flynn
85849fea41 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>
2025-12-22 03:21:10 -05:00
Alexandru Ionut Tripon
ee21ad836f fix modrinth modpack allways download latest (#4549) 2025-12-22 10:09:42 +02:00
Trial97
d7745d97f2 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>
2025-12-21 22:45:57 +02:00
Alexandru Ionut Tripon
49b66d8a54 chore(nix): update lockfile (#4545) 2025-12-21 09:50:46 +02:00
timoreo
52240cc64c fix accounts crash (#4543) 2025-12-21 05:33:14 +01:00
github-actions[bot]
6732d7f99c chore(nix): update lockfile
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/2fbfb1d73d239d2402a8fe03963e37aab15abe8b?narHash=sha256-9VvC20PJPsleGMewwcWYKGzDIyjckEz8uWmT0vCDYK0%3D' (2025-12-11)
  → 'github:NixOS/nixpkgs/c6245e83d836d0433170a16eb185cefe0572f8b8?narHash=sha256-G/WVghka6c4bAzMhTwT2vjLccg/awmHkdKSd2JrycLc%3D' (2025-12-18)
2025-12-21 00:31:41 +00:00
Trial97
08c45684de 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>
2025-12-20 23:54:31 +02:00
Trial97
f4b22dae90 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>
2025-12-20 23:23:27 +02:00
Alexandru Ionut Tripon
d3f59a8a43 fix(skin-preview): smoother chessboard background contrast (#4534) 2025-12-20 18:51:04 +02:00
Tayou
5c6c92f286 fix skin preview leg rendering (#4538) 2025-12-20 13:00:06 +01:00
Tayou
fcf201755c fix skin preview leg rendering
Signed-off-by: Tayou <git@tayou.org>
2025-12-20 08:50:49 +01:00
Rachel Powers
42b72d676c fix(skin-preview): smoother chessboard background contrast
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
2025-12-19 16:53:31 -07:00
Alexandru Ionut Tripon
877b824c3b fix skin depth (#4524) 2025-12-19 20:26:51 +02:00
Alexandru Ionut Tripon
2f540ffc61 fix elytra preview (#4525) 2025-12-19 20:26:35 +02:00
Seth Flynn
53fbc39ad1 Use sharun to bundle AppImage (#4515) 2025-12-19 03:43:51 -05:00
Alexandru Ionut Tripon
d1df515bcc Updated App icon for macOS 26 (#4160) 2025-12-19 10:37:25 +02:00
Trial97
e360a95c23 fix elytra preview
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2025-12-19 01:14:19 +02:00
Trial97
624d506fac 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>
2025-12-19 00:01:39 +02:00
Alexandru Ionut Tripon
53e090f035 Trim unexpected info from pack.mcmeta (#4522) 2025-12-18 23:51:15 +02:00
Dylan Schooner
51b47050f9 Check specifically for GarbageAtEnd error
- Out parameter for garbage data\n- Rename parseUntilMalformed to parseUntilGarbage

Signed-off-by: Dylan Schooner <dschooner05@gmail.com>
2025-12-18 15:23:48 -05:00
Dylan Schooner
9c7fe72f9c Use Json::parseUntilMalformed in McClient::parseResponse
Signed-off-by: Dylan Schooner <dschooner05@gmail.com>
2025-12-18 14:14:29 -05:00
Dylan Schooner
e1eee6e3ca Add Json::parseUntilMalformed helper
Signed-off-by: Dylan Schooner <dschooner05@gmail.com>
2025-12-18 13:33:13 -05:00
Dylan Schooner
43fce3ae46 Trim unexpected info from pack.mcmeta
Signed-off-by: Dylan Schooner <dschooner05@gmail.com>
2025-12-18 12:34:41 -05:00
Alexandru Ionut Tripon
018ff600f6 Use static image when opengl context is not available (#4509) 2025-12-18 13:21:00 +02:00
Seth Flynn
5d5f22e672 ci(linux): verify appstream info for appimages
Signed-off-by: Seth Flynn <getchoo@tuta.io>
2025-12-17 23:53:47 -05:00
Seth Flynn
e39e59acb6 revert: "fix(launcher): set correct bin path for self-contained appimages"
Refs: b1b4b5d
Signed-off-by: Seth Flynn <getchoo@tuta.io>
2025-12-17 23:53:47 -05:00
Seth Flynn
1d8bf82ef8 revert: "fix(appimage): launch external processes with bundled linker"
Refs: c305ed4
Signed-off-by: Seth Flynn <getchoo@tuta.io>
2025-12-17 23:53:46 -05:00
Seth Flynn
06e99e2990 build(linux): use sharun for appimage bundling
This should fix issues with OpenGL, as well as help as avoid using some
annoying (and fragile) hacks to locate our actual binary/other resources

Signed-off-by: Seth Flynn <getchoo@tuta.io>
2025-12-17 23:53:42 -05:00
Trial97
f7111b6ec1 fix legacy skin model
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2025-12-17 00:03:19 +02:00
Alexandru Ionut Tripon
3c570f9e9c Update launcher/ui/dialogs/skins/SkinManageDialog.cpp
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
2025-12-16 20:56:41 +02:00
Alexandru Ionut Tripon
1dd8c9606f server player req: parse malformed json (#4512) 2025-12-16 16:35:20 +02:00
Tayou
5ebd386797 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>
2025-12-16 14:51:01 +01:00