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
10400 commits 18 branches 53 tags 60 MiB
Commit graph

10400 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
Alexandru Ionut Tripon
3d805dff29
[Backport release-10.x] fix(skin-preview): smoother chessboard background contrast (#4542) 2025-12-20 18:53:03 +02: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
9389b9d582 ci(linux): verify appstream info for appimages 
Signed-off-by: Seth Flynn <getchoo@tuta.io>
(cherry picked from commit 5d5f22e672)
 2025-12-20 17:48:36 +01: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
Seth Flynn
e1941a5794 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>
(cherry picked from commit 06e99e2990)
 2025-12-20 17:48:36 +01:00
Tayou
f85d399928
[Backport release-10.x] fix skin preview leg rendering (#4540) 2025-12-20 13:00:38 +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
Alexandru Ionut Tripon
68010c6c49
[Backport release-10.x] fix elytra preview (#4529) 2025-12-19 20:28:20 +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
Alexandru Ionut Tripon
a74b1dd79d
[Backport release-10.x] Updated App icon for macOS 26 (#4526) 2025-12-19 10:38:18 +02:00
Richard Voigtmann
add5966c52 Add suggestion from code review 
Co-authored-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
Signed-off-by: Richard Voigtmann <71901885+ShadowPaint-SP@users.noreply.github.com>
(cherry picked from commit e7f801c4c4)
 2025-12-19 08:37:35 +00:00
Richard Voigtmann
c89150a26e xCode version check 
Signed-off-by: Richard Voigtmann <richard.v.voigtmann@gmail.com>
(cherry picked from commit e46b0335ab)
 2025-12-19 08:37:35 +00:00
Richard Voigtmann
c8c6304a15 removed unnecessary Option from actool command and failsafe attempt for older versions 
Signed-off-by: Richard Voigtmann <richard.v.voigtmann@gmail.com>
(cherry picked from commit e125f4767f)
 2025-12-19 08:37:35 +00:00
Richard Voigtmann
8bfb9b90c1 added mono to brew because macos 26 runner doesnt include it 
Signed-off-by: Richard Voigtmann <richard.v.voigtmann@gmail.com>
(cherry picked from commit 7f740e4ad6)
 2025-12-19 08:37:35 +00:00
Richard Voigtmann
da62b63f52 bumped macos runner version to 26 
Signed-off-by: Richard Voigtmann <richard.v.voigtmann@gmail.com>
(cherry picked from commit 7cb623e800)
 2025-12-19 08:37:35 +00:00
Richard Voigtmann
881bb22d45 implemented recommended changes -reverted .icns file instellation 
Signed-off-by: Richard Voigtmann <richard.v.voigtmann@gmail.com>
(cherry picked from commit d53b785a1c)
 2025-12-19 08:37:35 +00:00
Richard Voigtmann
0776291e55 replaced binary with in ci building of Icons 
Signed-off-by: Richard Voigtmann <richard.v.voigtmann@gmail.com>
(cherry picked from commit a7dd3aeaab)
 2025-12-19 08:37:35 +00:00
Richard Voigtmann
c2d324aff3 updated Assets.car to the icon suggestion from hw2007 
Signed-off-by: Richard Voigtmann <richard.v.voigtmann@gmail.com>
(cherry picked from commit b0594dbb06)
 2025-12-19 08:37:35 +00:00
Richard Voigtmann
af83cd92c0 Added macOS 26 Liquid Glass Icon Support. See: #4149 
Signed-off-by: Richard Voigtmann <richard.v.voigtmann@gmail.com>
(cherry picked from commit d0737eecc5)
 2025-12-19 08:37:35 +00:00
Alexandru Ionut Tripon
a639091a39
[Backport release-10.x] Trim unexpected info from pack.mcmeta (#4523) 2025-12-18 23:52:03 +02: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
79be92ca74
[Backport release-10.x] Use static image when opengl context is not available (#4519) 2025-12-18 13:21:26 +02: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
Alexandru Ionut Tripon
708222bb80
[Backport release-10.x] server player req: parse malformed json (#4513) 2025-12-16 16:35:45 +02: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
Alexandru Ionut Tripon
6b952403c9
[Backport release-10.x] fix: actually fix toml++ on fedora (#4507) 2025-12-16 10:29:03 +02:00
DioEgizio
7711a9aa81 fix: actually fix toml++ on fedora 
oops

Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
(cherry picked from commit 9aa1a4d11b)
 2025-12-16 08:27:37 +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
Alexandru Ionut Tripon
bf0d0a1d5b
change(Actions): cancel outdated builds (#4483) 2025-12-14 19:32:04 +02:00
Alexandru Ionut Tripon
fd338ce273
chore(nix): update lockfile (#4488) 2025-12-14 08:44:18 +02:00
Rachel Powers
c33d104dc3
fix leak of cloned entry (#4487) 2025-12-13 18:52:49 -07:00
github-actions[bot]
7e9324be20 chore(nix): update lockfile 
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/f61125a668a320878494449750330ca58b78c557?narHash=sha256-BmPWzogsG2GsXZtlT%2BMTcAWeDK5hkbGRZTeZNW42fwA%3D' (2025-12-05)
  → 'github:NixOS/nixpkgs/2fbfb1d73d239d2402a8fe03963e37aab15abe8b?narHash=sha256-9VvC20PJPsleGMewwcWYKGzDIyjckEz8uWmT0vCDYK0%3D' (2025-12-11)
 2025-12-14 00:31:50 +00:00
Rachel Powers
59313204b2
chore(deps): update korthout/backport-action action to v4 (#4485) 2025-12-13 16:06:14 -07:00
Rachel Powers
95d2789199
fix archive detection (#4486) 2025-12-13 16:02:50 -07:00
Alexandru Ionut Tripon
960c3a56b0
fix: bundle cmark in portable build (#4476) 2025-12-14 00:56:40 +02:00
Alexandru Ionut Tripon
66c9fafbe8
Use old ProjectItem highlight on Windows styles (#4466) 2025-12-14 00:56:30 +02:00