9661 Commits

Author SHA1 Message Date
Tayou
9cdfeb5fcd
add options to change the cat scalling (#3380) 2025-06-06 14:23:39 +02:00
Tayou
a17ea196c1
chore: fix some codeql warnings (#3840) 2025-06-06 14:19:27 +02:00
Alexandru Ionut Tripon
2d90144cd9
More intuitive version changing for modpacks (#3841) 2025-06-06 08:12:52 +03:00
Alexandru Ionut Tripon
36572a63f0
fix: crash with global datapacks on export (#3843) 2025-06-06 08:12:40 +03:00
Trial97
37f8b2f563
fix: crash with global datapacks on export
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2025-06-05 17:50:47 +03:00
Alexandru Ionut Tripon
6eec17e846
Remove reliance on SIGNAL/SLOT macros (#3842) 2025-06-05 17:41:33 +03:00
Yihe Li
c57ba911cf
Remove unnecessary QObject::
Signed-off-by: Yihe Li <winmikedows@hotmail.com>
2025-06-05 21:41:06 +08:00
Yihe Li
4a9b3d2f5f
Remove usage of SIGNAL/SLOT macro
Signed-off-by: Yihe Li <winmikedows@hotmail.com>
2025-06-05 21:35:19 +08:00
Yihe Li
58a28f319a
More intuitive version changing for modpacks
Signed-off-by: Yihe Li <winmikedows@hotmail.com>
2025-06-05 20:20:34 +08:00
Trial97
7ea15c31a1
chore: fix some codeql warnings
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2025-06-05 09:45:25 +03:00
Alexandru Ionut Tripon
0136c2e82a
Fix crash and make loader override more consistent (#3827) 2025-06-04 22:20:13 +03:00
Alexandru Ionut Tripon
6d9eac6766
remove: unused files (#3740) 2025-06-03 08:42:09 +03:00
Tayou
df90d0cb0d
fix: warning with different signedness (#3826) 2025-06-02 17:28:13 +02:00
TheKodeToad
956f5ee180
Fix crash and make loader override more consistent with other option groups
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2025-06-02 14:59:56 +01:00
Trial97
93e9d2fd86
fix: warning with different signedness
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2025-06-02 16:43:36 +03:00
Alexandru Ionut Tripon
253b9756d4
improve blocked mods dialog (#3378) 2025-06-02 16:26:29 +03:00
Trial97
2fc89d7e11
improve blocked mods dialog
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2025-06-02 15:35:05 +03:00
Trial97
8c0ba43838
add options to change the cat scalling
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2025-06-02 15:15:17 +03:00
Alexandru Ionut Tripon
178965676e
Remove reference to deprecated Q_OS_OSX macro (#3824) 2025-06-02 12:45:24 +03:00
Alexandru Ionut Tripon
52fa074ff7
Make column visibility global (#3748) 2025-06-02 12:45:03 +03:00
TheKodeToad
d9b672ee8d
Data pack management (#1905) 2025-06-02 09:18:57 +00:00
Yihe Li
5ccdb0a477
Remove several warnings when building the project
Signed-off-by: Yihe Li <winmikedows@hotmail.com>
2025-06-02 17:00:13 +08:00
TheKodeToad
609a4f7160
Fix spelling of override
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2025-06-02 11:56:03 +03:00
Trial97
a29b189056
feat: make the visibility per resource
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2025-06-02 11:56:03 +03:00
Trial97
8c710fb8de
chore: migrate map settings to json string
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2025-06-02 11:56:03 +03:00
TheKodeToad
edb1020dce
Merge remote-tracking branch 'upstream/develop' into data-packs
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2025-06-02 09:52:05 +01:00
Trial97
89be378ef6
chore: add miggrate qbytearray settings to qstring
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2025-06-02 11:40:48 +03:00
Trial97
7e174f53af
chore: add migration for old QByteArray to base64
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2025-06-02 11:40:48 +03:00
Trial97
6177fa0148
feat: make resource header config global
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2025-06-02 11:40:48 +03:00
TheKodeToad
af0176b12a
Allow data packs on vanilla instances
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2025-06-02 09:39:45 +01:00
Alexandru Ionut Tripon
d667dfe223
feat: add setting to control the loaders for mod search (#3659) 2025-06-02 11:39:39 +03:00
Alexandru Ionut Tripon
a95def5588
Delete associated shortcuts when deleting instance (#3819) 2025-06-02 11:39:24 +03:00
Trial97
ca54971499
chore: ensure the setting is saved as string
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2025-06-02 09:45:49 +03:00
Trial97
492769aea6
feat: add setting to control the loaders for mod search
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2025-06-02 09:19:40 +03:00
Yihe Li
8965200384
Handle JSON parse error
Signed-off-by: Yihe Li <winmikedows@hotmail.com>
2025-06-02 14:19:31 +08:00
Alexandru Ionut Tripon
b4a998e992
chore(deps): try find system wide qrcodegencpp-cmake and use it (#3821) 2025-06-02 09:08:54 +03:00
Yihe Li
50fb2db718
Validate JSON parsing results
Signed-off-by: Yihe Li <winmikedows@hotmail.com>
2025-06-02 07:36:53 +08:00
TheKodeToad
142a73888d
Rework the settings user interface (#3534) 2025-06-01 22:46:40 +00:00
TheKodeToad
b54dd051fb
Fix close button on world datapacks dialog
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2025-06-01 19:24:21 +00:00
Yihe Li
0a1001ee84
Use QString instead of QByteArray
Signed-off-by: Yihe Li <winmikedows@hotmail.com>
2025-06-02 01:34:24 +08:00
Puqns67
49dc9a5d3f
chore(deps): try find system wide qrcodegencpp-cmake and use it
Signed-off-by: Puqns67 <me@puqns67.icu>
2025-06-02 00:58:42 +08:00
Yihe Li
caff4b884f
Use null QString instead of empty
Signed-off-by: Yihe Li <winmikedows@hotmail.com>
2025-06-01 18:32:38 +08:00
TheKodeToad
e665a257dc
Hopefully fix segfault with HintOverrideProxyStyle (#3820) 2025-06-01 09:47:56 +00:00
Yihe Li
d9884f0d03
Add notes in shortcut creation screen
Signed-off-by: Yihe Li <winmikedows@hotmail.com>
2025-06-01 16:33:43 +08:00
Yihe Li
4214571cff
Add # of shortcuts to deletion confirmation screen instead
Signed-off-by: Yihe Li <winmikedows@hotmail.com>
2025-06-01 16:18:35 +08:00
TheKodeToad
1c69f63357
Hopefully fix segfault with HintOverrideProxyStyle
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2025-06-01 09:15:21 +01:00
Yihe Li
d2ee023788
Switch to JSON-encoded store
Signed-off-by: Yihe Li <winmikedows@hotmail.com>
2025-06-01 16:13:40 +08:00
TheKodeToad
e4ed3b4546
Merge branch 'PrismLauncher:develop' into data-packs 2025-06-01 07:54:16 +00:00
Yihe Li
7c3a810d3d
Implement persistence by storing shortcut in settings
Signed-off-by: Yihe Li <winmikedows@hotmail.com>
2025-06-01 14:16:47 +08:00
Rachel Powers
9f1d19811b
chore(nix): update lockfile (#3818) 2025-05-31 18:56:31 -07:00