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

484 commits

Author SHA1 Message Date
Octol1ttle
e89ce1124a
refactor!!!: migrate from shared pointers 
Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com>
(cherry picked from commit 549405ab2f)
 2026-02-17 20:23:05 +02:00
Octol1ttle
8cfeb30c56 chore: remove double spaces from logs 
Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com>
(cherry picked from commit 584dc47da5)
 2026-01-30 11:10:01 +00:00
Octol1ttle
03de3bbe91 fix(ResourceFolderModel): don't read state from off-thread task 
Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com>
(cherry picked from commit 6cb07e203b)
 2026-01-22 20:41:17 +00:00
Octol1ttle
eacebcc153 fix: add missing returns after emitFailed/Aborted 
Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com>
(cherry picked from commit 507de0fcbd)
 2026-01-22 20:40:11 +00:00
Seth Flynn
da4bf6e8c2
style: re-format tree with editorconfig 
```
find $PWD \
  -type f \
  ! -path '*/.git/*' ! -path '*/flatpak/shared-modules/*' \
  ! -path '*/libraries/*' ! -path '*/testdata/*' ! -name '*.patch' \
  ! -name '*.svg' ! -name '*.scd' ! -path '*/program_info/LICENSE' \
  ! -path '*/COPYING.md' ! -path '*/cmake/*' ! -name '.gitmodules' \
  -exec eclint -fix {} \;
```

Signed-off-by: Seth Flynn <getchoo@tuta.io>
(cherry picked from commit fd91f87c21)
 2026-01-18 23:01:42 +02:00
SwitchAxe
aadd88cbd8 Fixed formatting 
Signed-off-by: SwitchAxe <sofiacerasuoli@gmail.com>
(cherry picked from commit 809e766aec)
 2026-01-14 11:51:57 +00:00
SwitchAxe
0b7646740b Improved the check for the assets dir 
Signed-off-by: SwitchAxe <sofiacerasuoli@gmail.com>
(cherry picked from commit 7f0f90fcce)
 2026-01-14 11:51:57 +00:00
SwitchAxe
19ead6adbd Made the loop more efficient 
Signed-off-by: SwitchAxe <sofiacerasuoli@gmail.com>
(cherry picked from commit 8aba994312)
 2026-01-14 11:51:57 +00:00
Sofia
fb77027d84 Update launcher/minecraft/mod/tasks/LocalShaderPackParseTask.cpp 
Co-authored-by: Octol1ttle <l1ttleofficial@outlook.com>
Signed-off-by: Sofia <75943257+SwitchAxe@users.noreply.github.com>
(cherry picked from commit 6321db5942)
 2026-01-14 11:51:57 +00:00
SwitchAxe
2692cbcdc8 Fixed Indentation 
Signed-off-by: SwitchAxe <sofiacerasuoli@gmail.com>
(cherry picked from commit 6ac9de7a11)
 2026-01-14 11:51:57 +00:00
SwitchAxe
17941872f8 Added support for shader packs with a top-level parent directory 
Signed-off-by: SwitchAxe <sofiacerasuoli@gmail.com>
(cherry picked from commit 9a93696915)
 2026-01-14 11:51:57 +00:00
TheKodeToad
60f598a0e7 Fix shaderpacks folder being hidden on Windows 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
(cherry picked from commit 3e7ef5ee17)
 2026-01-11 13:19:10 +00:00
Trial97
b2e195a651 format the code 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 53acc60983)
 2026-01-09 21:36:46 +00:00
TheKodeToad
f1a30bf251 Fix oversights and make requested changes 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
(cherry picked from commit 3a7366a998)
 2026-01-06 21:53:30 +00:00
TheKodeToad
7e4ea5a47e Avoid some errors (less noisy log) 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
(cherry picked from commit e4991d81d7)
 2026-01-06 21:53:30 +00:00
TheKodeToad
e3b3ef65ee Less destructive delete 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
(cherry picked from commit 398305eb66)
 2026-01-06 21:53:30 +00:00
TheKodeToad
993243b6a3 Don't use .index for shaderpacks 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
(cherry picked from commit 1cf48dfd85)
 2026-01-06 21:53:30 +00:00
Octol1ttle
6ee81b527d refactor: remove broken Qt includes 
Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com>
(cherry picked from commit 56392a20ed)
 2026-01-06 11:06:15 +00:00
Trial97
e90965adc1 match disabled mods on uninstall 
fixes #4537
This ensures that when looking to uninstall a resource prism will
consider the disabled ones to.
Right now we have a guard in place to prevent resources using the same
name so this check will allways match with the correct resouce.

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 08c45684de)
 2025-12-22 21:55:54 +00:00
Dylan Schooner
ab71c44ed6 Check specifically for GarbageAtEnd error 
- Out parameter for garbage data\n- Rename parseUntilMalformed to parseUntilGarbage

Signed-off-by: Dylan Schooner <dschooner05@gmail.com>
(cherry picked from commit 51b47050f9)
 2025-12-18 21:51:35 +00:00
Dylan Schooner
9fef9c7bd8 Use Json::parseUntilMalformed in McClient::parseResponse 
Signed-off-by: Dylan Schooner <dschooner05@gmail.com>
(cherry picked from commit 9c7fe72f9c)
 2025-12-18 21:51:35 +00:00
Dylan Schooner
811e3de29b Add Json::parseUntilMalformed helper 
Signed-off-by: Dylan Schooner <dschooner05@gmail.com>
(cherry picked from commit e1eee6e3ca)
 2025-12-18 21:51:35 +00:00
Dylan Schooner
1ebe081e03 Trim unexpected info from pack.mcmeta 
Signed-off-by: Dylan Schooner <dschooner05@gmail.com>
(cherry picked from commit 43fce3ae46)
 2025-12-18 21:51:35 +00:00
Rachel Powers
d1b6d7c402
chore: Re-simplify IndexVersionType and MessageLevel with c++20 
This sets our compiler requirements to gcc 11 and clang 13. If we
forgo the use of `using enum` we can drop to gcc 10 and clang 10 but
that means using `MessageLevel::Enum::Unknown` for direct enum access

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2025-12-11 09:59:33 -07:00
TheKodeToad
826da57944
Properly rename shader config on update/version change 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2025-12-08 22:43:29 +00:00
TheKodeToad
de5c7bac72
Simplify IndexedVersionType::VersionType -> IndexedVersionType 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2025-12-07 14:34:00 +00:00
Trial97
7962e223ab
fix merge conflicts 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2025-11-26 18:41:57 +02:00
Trial97
aa265a45ee
fix nix build 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2025-11-26 18:41:56 +02:00
Trial97
27259ff52d
Improve mod parsing 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2025-11-26 18:41:22 +02:00
Trial97
8cace06df9
move libarchive outside bundle libs 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2025-11-26 18:41:22 +02:00
Trial97
2a99bb534f
add missing copyrights 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2025-11-26 18:41:22 +02:00
Trial97
30ef158716
finish moving all code to libarchive 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2025-11-26 18:40:41 +02:00
Trial97
f38a0c8f98
move more zip parsings 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2025-11-26 18:40:40 +02:00
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