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

9224 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Trial97
d31c947b36
fix crash when no resorce version is available 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-10-08 22:02:38 +03:00
seth
e2b346fc53
Merge pull request #2888 from PrismLauncher/renovate/actions-cache-4.x 
chore(deps): update actions/cache action to v4.1.0
 2024-10-08 13:15:05 -04:00
seth
7c45f88769
Merge pull request #2883 from PrismLauncher/renovate/cachix-install-nix-action-30.x 
chore(deps): update cachix/install-nix-action action to v30
 2024-10-08 13:14:47 -04:00
seth
acd4dceafa
Merge pull request #2890 from arnfaldur/patch-1 
Keep libGLU in Flatpak
 2024-10-08 13:14:18 -04:00
Trial97
df9f54454a
removed static functions 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-10-08 19:19:03 +03:00
Trial97
5bd5627a96
extended the modrinth search and applied the suggested change 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-10-08 15:06:50 +03:00
TheKodeToad
a200fca45c
Merge pull request #2869 from Edgars-Cirulis/patch-1 
chore: update Qt to 6.7.3
 2024-10-08 12:36:11 +01:00
Alexandru Ionut Tripon
dc1f56e108
Merge pull request #2865 from Ryex/nsis_vc_redist 
add vc_redist as a NSIS install section
 2024-10-08 14:09:22 +03:00
Trial97
6e5f616ced
move checkMcVersions to Filter struct 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-10-07 00:21:28 +03:00
Alexandru Ionut Tripon
1eee5c924b
Merge pull request #2891 from PrismLauncher/update_flake_lock_action 
chore(nix): update lockfile
 2024-10-06 23:21:16 +03:00
Alexandru Ionut Tripon
999dec18dd
Merge pull request #2893 from PrismLauncher/ftb-private-no-retry 
Disable retry for private pack fetch
 2024-10-06 23:20:14 +03:00
TheKodeToad
d5990cca43
Disable retry for private pack fetch 
This is already handled with a dialog asking whether you want it to be removed.

Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2024-10-06 13:51:36 +01:00
github-actions[bot]
03294f0000 chore(nix): update lockfile 
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/1925c603f17fc89f4c8f6bf6f631a802ad85d784?narHash=sha256-J%2BPeFKSDV%2BpHL7ukkfpVzCOO7mBSrrpJ3svwBFABbhI%3D' (2024-09-26)
  → 'github:NixOS/nixpkgs/bc947f541ae55e999ffdb4013441347d83b00feb?narHash=sha256-NOiTvBbRLIOe5F6RbHaAh6%2B%2BBNjsb149fGZd1T4%2BKBg%3D' (2024-10-04)
 2024-10-06 00:24:57 +00:00
arnfaldur
f7bd76c7d4
flatpak: don't cleanup libGLU 
The mod AAA Particles (found in the modpack Prominence II RPG) fails to start due to a missing `libGLU.so.1` file.
Removing this cleanup command fixes the issue and makes the modpack run without issue.

I reproduced the issue at the head of the develop branch, with and without the change. No other issue was detected by adding the library, and I could not find the initial justification for removing it.

Signed-off-by: arnfaldur <a.arnaldur+git@gmail.com>
 2024-10-05 17:58:53 +00:00
renovate[bot]
cc0c9d208d
chore(deps): update actions/cache action to v4.1.0 2024-10-04 22:22:10 +00:00
Trial97
859fac604b
add modrinth modpack filter 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-10-04 17:06:47 +03:00
Rachel Powers
a61c93bede
Update .github/workflows/build.yml 
Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net>
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2024-10-04 07:06:19 -07:00
Rachel Powers
023aa18e85
ci: NSCurl only needed on MSVC 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2024-10-03 23:14:29 -07:00
Rachel Powers
63172540fb
fix: nisi needs !include "x64.nsh" now. also, there were some broken varible 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2024-10-03 22:38:30 -07:00
Rachel Powers
bcb1d456d4
fix: version NSCurl plugin in workflow, detect and use arm64 vc_redist for arm64 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2024-10-03 21:56:19 -07:00
renovate[bot]
010678da53
chore(deps): update cachix/install-nix-action action to v30 2024-10-03 13:46:28 +00:00
Trial97
dfe3cd849d
add curseforge modpack filter 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-10-02 01:06:45 +03:00
Alexandru Ionut Tripon
44b4262f3c
Merge pull request #2862 from PrismLauncher/renovate/cachix-install-nix-action-29.x 
chore(deps): update cachix/install-nix-action action to v29
 2024-10-01 14:04:55 +03:00
Alexandru Ionut Tripon
2539aa42da
Merge pull request #2851 from PrismLauncher/update_flake_lock_action 
chore(nix): update lockfile
 2024-10-01 14:04:28 +03:00
timoreo
62f19a6ac9
Merge pull request #2863 from Trial97/fix_resource_search_equal 2024-10-01 11:41:11 +02:00
timoreo
c57e26cf57
Merge pull request #2874 from Trial97/modpack_equal 2024-10-01 11:40:42 +02:00
timoreo
1b58645c52
Merge pull request #2857 from Trial97/translation_warnings 2024-10-01 10:20:56 +02:00
Trial97
946e791d39
sync modpack search field 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-10-01 08:53:27 +03:00
Trial97
5ea2dece54
fix search term not remaining the same between providers on resource download 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-10-01 08:52:07 +03:00
Trial97
0eefa52dbc
fix some transtaions warnings 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-10-01 08:51:06 +03:00
Trial97
b676a67b3c
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into fix_login 2024-10-01 08:49:03 +03:00
Alexandru Ionut Tripon
fa92e6bd29
Merge pull request #2859 from Trial97/packwiz_prefix 
add prefix to non-standard packwiz fields
 2024-10-01 08:23:10 +03:00
renovate[bot]
79be2fc062
chore(deps): update cachix/install-nix-action action to v29 2024-10-01 00:32:42 +00:00
seth
974c89b9c3
Merge pull request #2843 from getchoo-contrib/ci/fix-nix 
Fix Nix CI
 2024-09-30 20:32:08 -04:00
seth
38fa2e0cd4
style: format with clang-format 
Signed-off-by: seth <getchoo@tuta.io>
 2024-09-30 16:32:55 -04:00
seth
988ef32019
fix(nix): don't write to files in formatting check 
Signed-off-by: seth <getchoo@tuta.io>
 2024-09-30 16:32:50 -04:00
seth
bf432b5514
chore(nix): use cachix for binary cache 
Signed-off-by: seth <getchoo@tuta.io>
 2024-09-30 16:25:58 -04:00
seth
68bf500f7e
chore: add nix reformat to .git-blame-ignore-revs 
Signed-off-by: seth <getchoo@tuta.io>
 2024-09-30 16:25:58 -04:00