mc-in-work/PrismLauncher
1
0
Fork 0
mirror of https://github.com/PrismLauncher/PrismLauncher.git synced 2026-07-01 10:56:57 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions
9913 commits 19 branches 53 tags 60 MiB
Commit graph

9913 commits

This branch
This branch
All branches
Author SHA1 Message Date
DarkBRogers
3dacc533ce Formatting for Mod.cpp 
Some small contributions guidelines
Signed-off-by: William Rogers u7941469@anu.edu.au

Signed-off-by: DarkBRogers <122955001+DarkBrogers@users.noreply.github.com>
Signed-off-by: Charlie <u7919347@anu.edu.au>
 2025-10-22 12:16:52 +11:00
Charlie
f1ac6832a3 fixed string sorted versions bug and snapshots breaking grouping 
currently there is no showing of snapshot but can be easily added by storing the removed snapshots and appending them on the end

Signed-off-by: Charlie <u7919347@anu.edu.au>
 2025-10-22 12:16:52 +11:00
Charlie
956843525b grouping of versions 
Currently breaks without properly sorted mod mcVersions as some mod have and no current workaround for snapshots

Signed-off-by: Charlie <u7919347@anu.edu.au>
 2025-10-22 12:16:52 +11:00
Charlie
b43226739f Gathering and filtering all released vanilla minecraft version for grouping major versions, made static so only called once to reduce computations 
Signed-off-by: Charlie <u7919347@anu.edu.au>
 2025-10-22 12:16:52 +11:00
Marco von Rosenberg
bd49dc4e7b fix: prioritize .ftbapp/version.json in FTB App import 
Newer versions of FTB App create a stub version.json in the instance
root with only a comment directing to .ftbapp/version.json. The old
logic would find this stub file first and fail to parse it, causing
modpacks to not be detected.

This fix checks .ftbapp/version.json first (newer location) before
falling back to the root version.json (older location).

Signed-off-by: Marco von Rosenberg <codingmarco@gmail.com>
Signed-off-by: Charlie <u7919347@anu.edu.au>
 2025-10-22 12:16:52 +11:00
timoreo
8b5e91920d
chore(deps): update korthout/backport-action action to v3.4.1 (#4191) 2025-10-02 22:02:20 +02:00
timoreo
c87c1b6988
chore(deps): update cachix/install-nix-action digest to 9280e7a (#4195) 2025-10-02 22:01:50 +02:00
renovate[bot]
acb4cee0ac
chore(deps): update cachix/install-nix-action digest to 9280e7a 2025-10-02 17:58:51 +00:00
renovate[bot]
fca874a641
chore(deps): update korthout/backport-action action to v3.4.1 2025-10-01 20:43:52 +00:00
timoreo
60f81d54b3
chore(nix): update lockfile (#4186) 2025-09-30 16:09:57 +02:00
github-actions[bot]
e34cd3ef88 chore(nix): update lockfile 
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/8eaee110344796db060382e15d3af0a9fc396e0e?narHash=sha256-iCGWf/LTy%2BaY0zFu8q12lK8KuZp7yvdhStehhyX1v8w%3D' (2025-09-19)
  → 'github:NixOS/nixpkgs/e643668fd71b949c53f8626614b21ff71a07379d?narHash=sha256-NY3kSorgqE5LMm1LqNwGne3ZLMF2/ILgLpFr1fS4X3o%3D' (2025-09-24)
 2025-09-28 00:28:36 +00:00
Seth Flynn
fcd3852621
Actions fixes for setup-dependencies/macOS and package/Windows (#4182) 2025-09-25 10:59:25 -04:00
Octol1ttle
158e001660
fix(ci/windows): remove erroneous default 
Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com>
 2025-09-25 18:51:57 +05:00
Octol1ttle
e9ffb40e2b
fix(ci/macOS): run vcpkg on non-debug builds too 
Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com>
 2025-09-25 18:50:27 +05:00
timoreo
e4fb28760b
chore(deps): update actions/cache action to v4.3.0 (#4179) 2025-09-25 09:41:46 +02:00
renovate[bot]
eb26d655b0
chore(deps): update actions/cache action to v4.3.0 2025-09-24 14:50:40 +00:00
Tayou
e1a7f6cac4
fix: modrinth modpacks icon importing (#4171) 2025-09-22 20:06:26 +02:00
Trial97
88399cf922
fix: modrinth modpacks icon importing 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2025-09-22 14:47:56 +03:00
timoreo
6aa728b12a
ci: macos-13 -> macos-15-intel (#4166) 2025-09-22 09:48:16 +02:00
Tayou
6f1ebfbb54
Avoid pull_request_target in Nix workflow, always use upstream Nix (#4167) 2025-09-22 08:59:14 +02:00
Alexandru Ionut Tripon
f7e58723e0
Fix typo in status message for asset files (#4161) 2025-09-22 00:02:00 +03:00
Alexandru Ionut Tripon
9c9e0d2945
FindJavaPaths: fix sdkman search, add asdf search (#4163) 2025-09-22 00:01:31 +03:00
Seth Flynn
761cae8d9c
chore(deps): update cachix/install-nix-action digest to a809471 (#4165) 2025-09-21 16:59:31 -04:00
Seth Flynn
37dabc7c9a
chore(nix): update lockfile (#4162) 2025-09-21 16:57:25 -04:00
Seth Flynn
7ba91ca488
ci(nix): always use upstream nix 
This ensures evaluation is consistent between out-of-tree and in-tree
runs

It also probably won't be possible to install upstream Nix with the
Determinate installer action soon so.....

Signed-off-by: Seth Flynn <getchoo@tuta.io>
 2025-09-21 16:28:07 -04:00
Seth Flynn
87174a0d5a
ci(get-merge-commit): drop 
No longer used after `pull_request_target` was NUKED

Signed-off-by: Seth Flynn <getchoo@tuta.io>
 2025-09-21 16:27:42 -04:00
Seth Flynn
90855a7cc0
ci(nix): pull_request_target -> pull_request 
Signed-off-by: Seth Flynn <getchoo@tuta.io>
 2025-09-21 16:25:09 -04:00
Seth Flynn
7e4a4cfd11
ci(nix): flakehub -> magic-nix-cache & gha cache 
This will help us avoid `pull_request_target`, etc.

Signed-off-by: Seth Flynn <getchoo@tuta.io>
 2025-09-21 16:23:15 -04:00
Seth Flynn
ffcd733d70
ci: macos-13 -> macos-15-intel 
https://github.blog/changelog/2025-09-19-github-actions-macos-13-runner-image-is-closing-down/

Signed-off-by: Seth Flynn <getchoo@tuta.io>
 2025-09-21 16:15:10 -04:00
renovate[bot]
d5c0ff32a7
chore(deps): update cachix/install-nix-action digest to a809471 2025-09-21 13:38:54 +00:00
Octol1ttle
b605685187
feat(FindJavaPaths): also use asdf to find Java 
Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com>
 2025-09-21 13:45:35 +05:00
Octol1ttle
542ad146ad
fix(FindJavaPaths): use SDKMAN_DIR env var to find sdkman installations 
Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com>
 2025-09-21 13:44:38 +05:00
github-actions[bot]
19dcc5b37a chore(nix): update lockfile 
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/c23193b943c6c689d70ee98ce3128239ed9e32d1?narHash=sha256-hLEO2TPj55KcUFUU1vgtHE9UEIOjRcH/4QbmfHNF820%3D' (2025-09-13)
  → 'github:NixOS/nixpkgs/8eaee110344796db060382e15d3af0a9fc396e0e?narHash=sha256-iCGWf/LTy%2BaY0zFu8q12lK8KuZp7yvdhStehhyX1v8w%3D' (2025-09-19)
 2025-09-21 00:27:56 +00:00
Kat Tschan
418b84a599
Fix typo in status message for asset files 
Signed-off-by: Kat Tschan <kat@kattschan.co.uk>
 2025-09-20 16:39:53 -04:00
Alexandru Ionut Tripon
28b755cf04
Remove unused code (#4158) 2025-09-19 13:37:49 +03:00
TheKodeToad
d384970694
Merge remote-tracking branch 'upstream/develop' into unused-code 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2025-09-19 11:06:34 +01:00
Alexandru Ionut Tripon
51a444624d
Replace getThemedIcon with QIcon::fromTheme/APPLICATION->logo() (#4156) 2025-09-19 12:20:50 +03:00
TheKodeToad
49b238f384
Properly remove gameoptions 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2025-09-19 09:42:13 +01:00
TheKodeToad
7789ba8608
Remove unused code 
GameOptions.{h,cpp}, GameOptionsPage.{h,cpp}, ThemeWizardPage.cpp

Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2025-09-19 09:04:29 +01:00
timoreo
7390bfcaff
Fix crash in Rule::apply (#4157) 2025-09-19 08:58:15 +02:00
TheKodeToad
5d46f79f19
Fix crash in Rule::apply 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2025-09-19 00:25:26 +01:00
TheKodeToad
cd4f119e4b
Replace getThemedIcon with APPLICATION->logo() 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2025-09-19 00:07:05 +01:00
timoreo
1724bdaeb9
Remove some unnecessary const_casting (#4150) 2025-09-18 16:17:55 +02:00
TheKodeToad
7c9c9432dd
Remove pointless const_cast in ProgressWidget 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2025-09-17 11:24:10 +01:00
TheKodeToad
24726ea621
Avoid const-cast in WorldList - subclass is unnecessary and result->formats() is correct 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2025-09-17 10:50:54 +01:00
TheKodeToad
5ef61aa445
Make BaseVersion const-correct in order to remove const-cast from Meta::Version 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2025-09-17 10:30:00 +01:00
Alexandru Ionut Tripon
b7b06c0e48
Remove some duplicate code (#3828) 2025-09-16 11:03:30 +03:00
Trial97
29cff14fd6
removed some duplicate code 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2025-09-15 18:25:07 +03:00
Trial97
ab3bfb0f74
make universal resource type 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2025-09-15 18:25:06 +03:00
timoreo
668ff45403
chore(deps): update hendrikmuhs/ccache-action action to v1.2.19 (#4132) 2025-09-15 15:01:17 +02:00