Commit graph

10245 commits

Author SHA1 Message Date
Seth Flynn
dcb65e8a64 ci: actually sign windows builds in Release env
Signed-off-by: Seth Flynn <getchoo@tuta.io>
(cherry picked from commit 939093d648)
2026-01-05 18:34:58 +00:00
Alexandru Ionut Tripon
9ceee0a6e7
[Backport release-10.x] feat: use Qt 6.10.1 outside mac and use sharun for portable builds too (#4614) 2025-12-31 14:26:22 +02:00
DioEgizio
d33874f24e chore: bump to ubuntu 24.04
no reason to keep using 22.04 with sharun

Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
(cherry picked from commit 36ffd6b4ee)
2025-12-31 12:25:38 +00:00
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
928adcdb4e feat: Qt 6.10.1 outside macOS
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
(cherry picked from commit 20f9784881)
2025-12-31 12:25:38 +00:00
DioEgizio
a4db3bfb88 feat: use sharun for portable builds too
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
(cherry picked from commit 16635ca9fc)
2025-12-31 12:25:38 +00:00
Alexandru Ionut Tripon
73a68659f2
[Backport release-10.x] Include ARM Linux portable builds in releases (#4613) 2025-12-31 08:54:36 +02:00
Alexandru Ionut Tripon
35a99bb5e6
[Backport release-10.x] Remove some CI jobs (#4612) 2025-12-31 08:54:25 +02:00
Alexandru Ionut Tripon
5e628d9258
[Backport release-10.x] ci: use Release env for releases (#4611) 2025-12-31 08:54:10 +02:00
Alexandru Ionut Tripon
29f68ba1cf
[Backport release-10.x] Add qtimageformats to Nix wrapper (#4610) 2025-12-31 08:53:56 +02:00
Seth Flynn
6762a1f448 ci: fail releases on unmatched files
This previously let bugs slip in, like not uploading the Linux ARM
tarball

Signed-off-by: Seth Flynn <getchoo@tuta.io>
(cherry picked from commit c059e812a0)
2025-12-31 06:46:56 +00:00
Seth Flynn
c18128dd9f ci: upload portable linux arm tarball to releases
Signed-off-by: Seth Flynn <getchoo@tuta.io>
(cherry picked from commit d4230349e3)
2025-12-31 06:46:56 +00:00
Seth Flynn
52a42d63ba ci(flatpak): only build for x86_64
The flatpaks from CI aren't very usable in the first place, but also
take longer to complete than regular builds, as well as contribute to
our concurrent job limit. Dropping ARM builds shouldn't have much
impact, but this can obviously be reversed if people want it

Signed-off-by: Seth Flynn <getchoo@tuta.io>
(cherry picked from commit abe0c8e687)
2025-12-31 06:43:21 +00:00
Seth Flynn
a4e86f213f ci(nix): don't build for intel macs
These are being dropped by Nixpkgs itself soon in the near future, with
few users (on top of reduced usage of our flake/cache). We also already
have coverage for macOS builds through the aarch64-darwin target, so
this doesn't have a big impact on our end either

Obviously can be reverted if enough people want it

Signed-off-by: Seth Flynn <getchoo@tuta.io>
(cherry picked from commit 698e1dd7cf)
2025-12-31 06:43:21 +00:00
Seth Flynn
13427d77db ci: only sign windows artifacts in Release environment
`CI_HAS_ACCESS_TO_AZURE` is only set in our Release env

Signed-off-by: Seth Flynn <getchoo@tuta.io>
(cherry picked from commit 44e927a69e)
2025-12-31 06:36:51 +00:00
Seth Flynn
a26954dafa ci: use Release env for releases
This ensures we have access to Azure on CI runs for tags

Signed-off-by: Seth Flynn <getchoo@tuta.io>
(cherry picked from commit d1313cbd2d)
2025-12-31 06:36:50 +00:00
Seth Flynn
94d18c44f3 fix(nix): add qtimageformats to wrapper
Signed-off-by: Seth Flynn <getchoo@tuta.io>
(cherry picked from commit 99d00957b7)
2025-12-31 06:35:25 +00:00
Seth Flynn
66452b16f8
[Backport release-10.x] chore: use go-appimage soft fork until the pgp pr is merged (#4607) 2025-12-30 19:57:11 -05:00
DioEgizio
9c80e019cb chore: use go-appimage soft fork until the pgp pr is merged
revert this once it's merged!

Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
(cherry picked from commit a4b142681d)
2025-12-31 00:56:10 +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
Alexandru Ionut Tripon
5ee0286635
[Backport release-10.x] CMakeLists: fix ASan compile options (#4593) 2025-12-26 23:42:02 +02:00
Alexandru Ionut Tripon
10bee70c42
[Backport release-10.x] fix(APIPage.ui): resolve duplicate name (#4592) 2025-12-26 23:41:51 +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
8d8e9d0390 CMakeLists: fix ASan compile options
Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com>
(cherry picked from commit 1fdc33669b)
2025-12-26 21:40:40 +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
Alexandru Ionut Tripon
dbfae0599f
[Backport release-10.x] Force disable xrandr if it is unavailable (#4589) 2025-12-26 12:11:08 +02: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
Alexandru Ionut Tripon
0631359ec4
build(nix): use nixos-25.11 channel for nixpkgs (#4582) 2025-12-26 10:11:10 +02:00
Seth Flynn
e81ec9c39c
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>
(cherry picked from commit 5ee33814b6)
2025-12-25 14:49:42 +02:00
Alexandru Ionut Tripon
b30677ef10
[Backport release-10.x] fix mod update remaining disabled on second open (#4575) 2025-12-24 00:11:26 +02: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
Alexandru Ionut Tripon
bf0aa5f980
[Backport release-10.x] preserve original file extension when importing modpack icon (#4574) 2025-12-23 22:45:42 +02: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
Alexandru Ionut Tripon
6d59334777
[Backport release-10.x] match disabled mods on uninstall (#4567) 2025-12-22 23:56:08 +02: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
Alexandru Ionut Tripon
a524d93ada
[Backport release-10.x] build(mingw): use dwarf debug info (#4564) 2025-12-22 23:48:01 +02:00
Alexandru Ionut Tripon
7101f15a2c
[Backport release-10.x] fix Pre-release filter (#4566) 2025-12-22 23:46:04 +02: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
Seth Flynn
fd4436880a 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>
(cherry picked from commit d85ff94f03)
2025-12-22 18:12:28 +00:00
Alexandru Ionut Tripon
2582a90b90
[Backport release-10.x] fix legacy skin model (#4561) 2025-12-22 19:38:11 +02: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
302e10a7d9
[Backport release-10.x] fix(build): handle CMAKE_BUILD_TYPE with generator expressions (#4558) 2025-12-22 09:54:19 -05: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
Alexandru Ionut Tripon
ad83592834
[Backport release-10.x] fix modrinth modpack allways download latest (#4555) 2025-12-22 10:13:20 +02: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
timoreo
f1e382b035
[Backport release-10.x] fix accounts crash (#4546) 2025-12-21 05:34:09 +01:00