9896 Commits

Author SHA1 Message Date
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
timoreo
57dff0797d
chore(deps): update cachix/install-nix-action digest to 7be5dee (#4136) 2025-09-15 15:00:44 +02:00
timoreo
b8ff2ce406
Fix minor annoyances (#4086) 2025-09-15 13:28:01 +02:00
timoreo
f665579c62
Simplify Rule class (#4040) 2025-09-15 10:14:15 +02:00
timoreo
529198702d
chore(nix): update lockfile (#4138) 2025-09-15 10:11:34 +02:00
github-actions[bot]
89d7ffdc68 chore(nix): update lockfile
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/d0fc30899600b9b3466ddb260fd83deb486c32f1?narHash=sha256-rw/PHa1cqiePdBxhF66V7R%2BWAP8WekQ0mCDG4CFqT8Y%3D' (2025-09-02)
  → 'github:NixOS/nixpkgs/c23193b943c6c689d70ee98ce3128239ed9e32d1?narHash=sha256-hLEO2TPj55KcUFUU1vgtHE9UEIOjRcH/4QbmfHNF820%3D' (2025-09-13)
2025-09-14 00:27:15 +00:00
renovate[bot]
7f4b157087
chore(deps): update cachix/install-nix-action digest to 7be5dee 2025-09-13 06:24:19 +00:00
timoreo
31852724b1
Fix resource update with loaders (#3108) 2025-09-12 11:14:02 +02:00
renovate[bot]
170071746f
chore(deps): update hendrikmuhs/ccache-action action to v1.2.19 2025-09-10 17:48:01 +00:00
timoreo
2ed5650c4f
catpacks+gif=❤️ (#3315) 2025-09-08 17:29:46 +02:00
timoreo
d877f07662
Properly refresh modpack search upon changing filters (#4043) 2025-09-08 17:19:34 +02:00
timoreo
d694e58667
chore(deps): update actions/setup-java action to v5 (#4082) 2025-09-08 17:08:25 +02:00
timoreo
b6dcef8e90
chore(nix): update lockfile (#4092) 2025-09-08 17:06:34 +02:00
timoreo
78700aa8fb
chore(deps): update actions/stale action to v10 (#4117) 2025-09-08 17:05:57 +02:00
timoreo
43e786e9e0
chore(deps): update cachix/install-nix-action digest to 56a7bb7 (#4122) 2025-09-08 17:05:33 +02:00
github-actions[bot]
d9e5afcaa0 chore(nix): update lockfile
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/fbcf476f790d8a217c3eab4e12033dc4a0f6d23c?narHash=sha256-wNO3%2BKs2jZJ4nTHMuks%2BcxAiVBGNuEBXsT29Bz6HASo%3D' (2025-08-14)
  → 'github:NixOS/nixpkgs/d0fc30899600b9b3466ddb260fd83deb486c32f1?narHash=sha256-rw/PHa1cqiePdBxhF66V7R%2BWAP8WekQ0mCDG4CFqT8Y%3D' (2025-09-02)
2025-09-07 00:27:45 +00:00
renovate[bot]
7e0b9511b4
chore(deps): update cachix/install-nix-action digest to 56a7bb7 2025-09-06 12:54:37 +00:00
renovate[bot]
e5653b36cc
chore(deps): update actions/stale action to v10 2025-09-04 04:47:44 +00:00