ONIMAI-SMP/ShatteredPrism
3
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases 1 Wiki Activity
9,212 Commits 4 Branches 5 Tags 40 MiB
f56dfbafb2
Commit Graph

9212 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Evan Goode
95af313f49 Merge tag '9.1' into evan-goode/merge-9.0 2024-10-26 17:54:34 -04:00
Evan Goode
da9c085a06 Clean up some lingering differences from upstream 2024-10-26 17:52:25 -04:00
Evan Goode
b496316241 Change a few occurrences of "prism" to "fjord" 2024-10-26 16:45:14 -04:00
Evan Goode
c15afbda4a Fix build? 2024-10-26 16:12:01 -04:00
Evan Goode
7f52d57454 Fix MSA login 2024-10-26 14:56:55 -04:00
Evan Goode
d40b6d8eb3 Error handling for Yggdrasil accounts 2024-10-26 13:40:09 -04:00
Evan Goode
c32aaf244d It compiles, Yggdrasil login working except error handling 2024-10-26 00:17:24 -04:00
Evan Goode
7dbaa896a6 Merge tag '9.0' into develop 
This is an intermediate/halfway commit, more refactoring is needed to
get this to build.
 2024-10-25 15:34:57 -04:00
TheKodeToad
07addf2449
Bump version to 9.1 2024-10-24 13:32:23 +01:00
TheKodeToad
eea119d9c9
Merge remote-tracking branch 'TheKodeToad/vc-redist-norestart' into 9.1-hotfix 2024-10-24 13:31:21 +01:00
TheKodeToad
78e24962f9
Fix /norestart 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2024-10-21 14:41:48 +01:00
Alexandru Ionut Tripon
e8c9722a53
Merge pull request #2939 from PrismLauncher/backport-2938-to-release-9.x 
[Backport release-9.x] fix sparkle signature
 2024-10-21 00:08:40 +03:00
Trial97
9a810dfa6e fix sparkle signature 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 0586d38e03)
 2024-10-20 21:07:55 +00:00
Alexandru Ionut Tripon
a8c3a49cb9
Merge pull request #2938 from Trial97/fix_sparkle 
fix sparkle signature
 2024-10-21 00:05:57 +03:00
Trial97
0586d38e03
fix sparkle signature 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-10-20 23:53:23 +03:00
ZekeZ
3ac080806d
Merge pull request #2831 from Trial97/fix_login 
split the auth loading screen
 2024-10-21 00:14:36 +10:00
seth
38e0e0cb73
Merge pull request #2935 from PrismLauncher/update_flake_lock_action 
chore(nix): update lockfile
 2024-10-20 02:11:26 -04:00
github-actions[bot]
0501c1e17a chore(nix): update lockfile 
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/5633bcff0c6162b9e4b5f1264264611e950c8ec7?narHash=sha256-9UTxR8eukdg%2BXZeHgxW5hQA9fIKHsKCdOIUycTryeVw%3D' (2024-10-09)
  → 'github:NixOS/nixpkgs/4c2fcb090b1f3e5b47eaa7bd33913b574a11e0a0?narHash=sha256-/uilDXvCIEs3C9l73JTACm4quuHUsIHcns1c%2BcHUJwA%3D' (2024-10-18)
 2024-10-20 00:25:22 +00:00
Alexandru Ionut Tripon
417bb3564d
Merge pull request #2933 from getchoo-contrib/flatpak/jdks 
Don't bundle JREs in Flatpak
 2024-10-19 22:33:05 +03:00
Alexandru Ionut Tripon
e43836a271
Merge pull request #2932 from getchoo-contrib/nix/enable-tests 
Enable checks in Nix package
 2024-10-19 22:32:59 +03:00
Alexandru Ionut Tripon
9a161a0335
Merge pull request #2930 from Trial97/fixes 
Fix tests segfault
 2024-10-19 22:32:51 +03:00
Trial97
2d234b127b
make sure that tests are only disabled fro cmark 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-10-19 22:07:31 +03:00
Rachel Powers
464c7c1d4d
Merge pull request #2929 from Trial97/https 
Replace http with https on skins
 2024-10-19 12:00:52 -07:00
Trial97
2030041fcc
Fix tests segfault 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-10-19 21:42:14 +03:00
seth
01721b593b
fix(flatpak): run tests for launcher 
Signed-off-by: seth <getchoo@tuta.io>
 2024-10-19 12:40:15 -04:00
seth
0bae14999f
chore(flatpak): don't bundle JREs 
After https://github.com/PrismLauncher/PrismLauncher/pull/2069, JREs can
be managed at runtime. This is great for the Flatpak, as previously
*all* JREs had to be installed and could not be updated independently of
the launcher's Flatpak. It also makes using unsupported Java versions
easier as the launcher can download any version in the sandbox

We don't need to include these anymore

Signed-off-by: seth <getchoo@tuta.io>
 2024-10-19 12:40:15 -04:00
seth
522d105dbe
fix(nix): enable checks 
Signed-off-by: seth <getchoo@tuta.io>
 2024-10-19 12:32:36 -04:00
Trial97
7519c63f2e
Replace http with https on skins 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-10-19 01:11:27 +03:00
timoreo
f60d6e4d48
Merge pull request #2917 from Trial97/asan_log 
fix heap-use-after-free in modrinth creation task
 2024-10-18 12:09:24 +02:00
Alexandru Ionut Tripon
43eb27b695
Merge pull request #2916 from Ryex/fix/progress_dialog_use_after_free 
fix: ensure all connections to the ProgressDialogs's Task the dialog made are disconnected
 2024-10-15 08:59:12 +03:00
Trial97
ac13579b99
fix heap-use-after-free in modrinth creation task 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-10-14 11:10:54 +03:00
Rachel Powers
a108b5b420
fix: ensure all connections to the ProgressDialogs's Task the dialog made are dissconnected 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2024-10-14 00:45:45 -07:00
Alexandru Ionut Tripon
f239f4c17c
Merge pull request #2914 from PrismLauncher/update_flake_lock_action 
chore(nix): update lockfile
 2024-10-13 22:46:00 +03:00
Alexandru Ionut Tripon
5685bc3407
Merge pull request #2913 from archessmn/fix/custom-command-tab-order 
Fix tab order on custom command inputs
 2024-10-13 09:49:13 +03:00
Alexandru Ionut Tripon
bd01c47dc9
Merge pull request #2906 from TheKodeToad/no-recursive-remove-on-update 
Prevent directories from being removed on instance update
 2024-10-13 09:48:27 +03:00
github-actions[bot]
3c836ece71 chore(nix): update lockfile 
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/bc947f541ae55e999ffdb4013441347d83b00feb?narHash=sha256-NOiTvBbRLIOe5F6RbHaAh6%2B%2BBNjsb149fGZd1T4%2BKBg%3D' (2024-10-04)
  → 'github:NixOS/nixpkgs/5633bcff0c6162b9e4b5f1264264611e950c8ec7?narHash=sha256-9UTxR8eukdg%2BXZeHgxW5hQA9fIKHsKCdOIUycTryeVw%3D' (2024-10-09)
 2024-10-13 00:24:52 +00:00
Mia Moir
3a1c06de02
fix: Tab order on custom command inputs 
The tab order on the custom command UI in the instance settings is off, it goes 0 -> 2 -> 1, This re-orders the ui file to fix the order the inputs are in.

Signed-off-by: Mia Moir <63592337+archessmn@users.noreply.github.com>
 2024-10-12 23:47:58 +01:00
Alexandru Ionut Tripon
ef0cb88dd3
Merge pull request #2907 from Ryex/fix/icon_cache_stack_overflow 
Prevent infinite recursion when mod icon load fails
 2024-10-12 12:21:09 +03:00
Alexandru Ionut Tripon
0b624a43d6
Merge pull request #2908 from Trial97/remove_client 
remove client overrides instead of double deleting the normal ones
 2024-10-12 00:49:57 +03:00
Trial97
97f4ead0fb
remove client overrides instead of double deleting the normal ones 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-10-12 00:19:54 +03:00
Alexandru Ionut Tripon
78ceae9c17
Merge pull request #2887 from Trial97/filters_modpack 
Add filters for modpack search
 2024-10-12 00:07:14 +03:00
TheKodeToad
72cfad8fee
Continue deleting before failing 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2024-10-11 21:35:13 +01:00
Rachel Powers
09c9da268f
fix: prevent inf recursion when mod icon load fails; cut max pixmapcache to 1/4 previous value 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2024-10-11 13:26:20 -07:00
TheKodeToad
2bc6ae9756
Prevent directories from being removed on instance update 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2024-10-11 19:53:28 +01:00
Tayou
0c4c86c41f
Merge pull request #2900 from TheKodeToad/log-utf8 
Use UTF-8 to decode logs on Java 18 or newer
 2024-10-11 19:10:55 +02:00
TheKodeToad
98adcc60a3
Use UTF-8 to decode logs on Java 18 or newer 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2024-10-09 17:15:53 +01:00
TheKodeToad
909114bf2a
Change LaunchTask to only accept MinecraftInstance 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2024-10-09 15:07:09 +01:00
txtsd
2abbcdfa6f
Merge pull request #2896 from PrismLauncher/renovate/actions-cache-4.x 
chore(deps): update actions/cache action to v4.1.1
 2024-10-09 13:01:15 +05:30
renovate[bot]
093313e591
chore(deps): update actions/cache action to v4.1.1 2024-10-09 07:14:47 +00:00
Alexandru Ionut Tripon
c72cce6572
Merge pull request #2897 from Trial97/fix_crash 
fix crash when no resorce version is available
 2024-10-09 08:37:22 +03:00