Commit Graph

5010 Commits

Author SHA1 Message Date
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
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
Trial97 be963764ea propagate side as enum instead of Qstring
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2025-06-02 13:26:42 +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
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
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
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
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
Yihe Li d3f337d6ef Delete shortcut when deleting instances
Signed-off-by: Yihe Li <winmikedows@hotmail.com>
2025-06-01 08:13:18 +08:00
Alexandru Ionut Tripon 0a89f5cfaa feat: move qr code glue in MSALoginDialog (#3676) 2025-05-31 21:40:01 +03:00
TheKodeToad 308cbcbf77 feat: propagate Sink error handling (#2631) 2025-05-31 18:32:19 +00:00
TheKodeToad 43dcafda60 Support for CurseForge recommended memory (#3711) 2025-05-31 17:22:06 +00:00
TheKodeToad 77057267d2 feat(skin manager): add elytra preview (#3761) 2025-05-30 19:01:58 +00:00
TheKodeToad 75779a841e Re-apply my suggestion
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2025-05-30 18:55:58 +00:00
timoreo a6c93d66d4 fix(skin manager): accept files with same name (#3755) 2025-05-26 21:47:49 +02:00
TheKodeToad 618e6bd96b Merge remote-tracking branch 'upstream/develop' into rework-settings
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2025-05-22 23:04:57 +01:00
Yihe Li 8425861fb1 Just disable world selection when there is no world
Signed-off-by: Yihe Li <winmikedows@hotmail.com>
2025-05-23 00:53:03 +08:00
Yihe Li a89caf7362 Apply suggestions from review
Signed-off-by: Yihe Li <winmikedows@hotmail.com>
2025-05-22 23:09:37 +08:00
Trial97 64ef14100d feat(skin manager): add elytra preview
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2025-05-18 21:13:13 +03:00
Yihe Li 3745bdb6f2 Special treatment of non-Quick Join worlds
Signed-off-by: Yihe Li <winmikedows@hotmail.com>
2025-05-19 01:46:23 +08:00
Yihe Li 46c9eb1d5f Remove button additions
Signed-off-by: Yihe Li <winmikedows@hotmail.com>
2025-05-19 01:34:18 +08:00
Yihe Li 4839595a11 Implement account override
Signed-off-by: Yihe Li <winmikedows@hotmail.com>
2025-05-19 01:29:30 +08:00
Yihe Li 3529d29584 Implement world and server selection
Signed-off-by: Yihe Li <winmikedows@hotmail.com>
2025-05-19 01:06:21 +08:00
Yihe Li 2e6981977b Add basic shortcut creation integration
Signed-off-by: Yihe Li <winmikedows@hotmail.com>
2025-05-19 00:04:15 +08:00
Yihe Li b296085ea0 Small adjustments
Signed-off-by: Yihe Li <winmikedows@hotmail.com>
2025-05-18 23:32:35 +08:00
Yihe Li ea8f105292 Add stubs and b asic integration with MainWindow
Signed-off-by: Yihe Li <winmikedows@hotmail.com>
2025-05-18 23:09:39 +08:00