Commit Graph

451 Commits

Author SHA1 Message Date
Alexandru Ionut Tripon
f93e21fa2d deduplicate includes and reformat (#4228) 2025-11-16 18:12:52 +02:00
TheKodeToad
29bb9fe9f3 Revert some things caught in the crossfire
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2025-11-10 19:01:24 +00:00
TheKodeToad
6475ce6623 Remove some redundant default values
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2025-11-09 22:21:46 +00:00
TheKodeToad
e42c9d2a1d Remove ensure JSON helpers
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2025-11-09 21:35:11 +00:00
Edgars Cīrulis
91a02a1dc6 style: run-run clang-format on launcher/*
Signed-off-by: Edgars Cīrulis <e.cirulis@proton.me>
2025-10-14 04:05:56 +03:00
Gingeh
abc63e4432 fix: warn before double-click toggling resource while game is running
Closes #4119

Signed-off-by: Gingeh <39150378+Gingeh@users.noreply.github.com>
2025-10-07 16:17:43 +11:00
TheKodeToad
cd4f119e4b Replace getThemedIcon with APPLICATION->logo()
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2025-09-19 00:07:05 +01:00
Trial97
29cff14fd6 removed some duplicate code
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2025-09-15 18:25:07 +03:00
Trial97
8c9b504382 fix: datapack/resourcepack parsing
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2025-08-21 15:00:00 +03:00
Alexandru Ionut Tripon
078de50951 make universal resource type (#3541) 2025-07-22 13:31:05 +03:00
Alexandru Ionut Tripon
e043242a8e Reduce usage of [[nodiscard]] attributes (#3952) 2025-07-22 13:30:45 +03:00
Trial97
9a51cd55df make universal resource type
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2025-07-18 16:17:22 +03:00
timoreo
37a9271d5b propagate side as enum instead of Qstring (#3544) 2025-07-09 10:01:51 +02:00
TheKodeToad
29d73a474f Reduce usage of [[nodiscard]] attributes
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2025-07-07 20:56:29 +01:00
Yihe Li
836c558c6c Merge branch 'develop' into launcher-log-page 2025-06-06 21:36:03 +08:00
Tayou
f17e443b12 chore: fix some codeql warnings (#3838) 2025-06-06 15:20:07 +02:00
Tayou
a17ea196c1 chore: fix some codeql warnings (#3840) 2025-06-06 14:19:27 +02:00
Yihe Li
dea8de01e3 Merge branch 'develop' into launcher-log-page 2025-06-05 23:20:46 +08:00
Yihe Li
c57ba911cf Remove unnecessary QObject::
Signed-off-by: Yihe Li <winmikedows@hotmail.com>
2025-06-05 21:41:06 +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
Trial97
4f5db2e49f chore: fixe some codeql warnings
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2025-06-05 00:34:45 +03:00
Yihe Li
c58cc3396a Basic support for launcher log page
Signed-off-by: Yihe Li <winmikedows@hotmail.com>
2025-06-03 04:51:41 +08: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
52fa074ff7 Make column visibility global (#3748) 2025-06-02 12:45:03 +03: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
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
e4ed3b4546 Merge branch 'PrismLauncher:develop' into data-packs 2025-06-01 07:54:16 +00:00
TheKodeToad
fadbcf2d04 Merge remote-tracking branch 'upstream/develop' into data-packs
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2025-04-29 09:15:11 +01:00
Trial97
5c8481a118 chore: reformat
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2025-04-29 10:46:41 +03:00
Trial97
c5fd5e6ac1 chore: make all the regexes static const
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2025-04-28 22:37:29 +03:00
Seth Flynn
3df98dd5e7 Remove support for Qt 5 (#2174) 2025-04-18 16:26:55 -04:00
Trial97
5af06dec85 chore: add getOrRegisterSetting function
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2025-04-18 20:02:52 +03:00
Trial97
442aae88ce chore: remove qt version checks from code
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2025-04-17 23:46:55 +03:00
Alexandru Ionut Tripon
a6f00330a6 Improvements to modlist export (#3512) 2025-04-10 00:16:32 +03:00
TheKodeToad
221365f05b Make requested changes
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2025-03-26 10:12:13 +00:00
TheKodeToad
e22930fabf Fix build
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2025-03-26 01:08:05 +00:00
TheKodeToad
6ab4fef0c5 Merge remote-tracking branch 'upstream/develop' into data-packs
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2025-03-24 21:11:46 +00:00
Trial97
f7fd6f566f chore:fixed some codeql warnings
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2025-03-24 22:25:35 +02:00
TheKodeToad
9a57fddaaf Refactor ResourcePack (#2616) 2025-03-24 20:12:41 +00:00
hanlie
6bda537633 Improvements to modlist export
Added .replace("{mod_id}", modID)

Signed-off-by: hanlie <48323966+HanlieChina@users.noreply.github.com>
2025-03-19 12:35:22 +08:00
Alexandru Ionut Tripon
1a1bc14a73 Fix crash with invalid quilt mod info (#3496) 2025-03-15 00:00:46 +02:00
Alexandru Ionut Tripon
88bdb6541e Update launcher/minecraft/mod/tasks/LocalModParseTask.cpp
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
2025-03-12 00:14:53 +02:00
Trial97
0626e354a0 Fix crash with invalid quilt mod info
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2025-03-12 00:01:45 +02:00
Trial97
8f8c8394dc remove some QEventLoops
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2025-03-02 08:36:48 +02:00
Trial97
23ffc4d8b9 Refactor ResourcePack
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-12-19 10:42:42 +02:00
timoreo
c7b6977692 Merge pull request #3043 from Trial97/fix_flame_loader_match
fix the flame loaders match
2024-12-18 19:53:22 +01:00