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

245 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
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
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
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
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
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
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
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
Trial97
9a51cd55df
make universal resource type 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2025-07-18 16:17:22 +03:00
TheKodeToad
29d73a474f
Reduce usage of [[nodiscard]] attributes 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2025-07-07 20:56:29 +01:00
Tayou
f17e443b12
chore: fix some codeql warnings (#3838) 2025-06-06 15:20:07 +02:00
Yihe Li
c57ba911cf
Remove unnecessary QObject:: 
Signed-off-by: Yihe Li <winmikedows@hotmail.com>
 2025-06-05 21:41:06 +08:00
Trial97
4f5db2e49f
chore: fixe some codeql warnings 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2025-06-05 00:34:45 +03: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
c5fd5e6ac1
chore: make all the regexes static const 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2025-04-28 22:37:29 +03: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
TheKodeToad
9a57fddaaf
Refactor ResourcePack (#2616) 2025-03-24 20:12:41 +00: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
Kationor
b40a1973bf
Improve MANIFEST.MF parsing 
Previously, we would only properly parse LF-encoded manifests, and even
those only if they used the recommended casing.

This commit allows the parser to recognise CR and CRLF newlines, and
also makes the name comparison case insensitive to align with the
specification. (Though not completely: we still don't support multiline
values)

Signed-off-by: Kationor <n96211028@gmail.com>
 2024-11-24 19:30:59 +01:00
timoreo
736ecf266d
Merge pull request #3019 from Trial97/task_parent 
fixed double deletion for tasks
 2024-11-15 06:19:40 +01:00
Alexandru Ionut Tripon
7d03cb114d
Merge pull request #3031 from Trial97/lambda 
do not capture by default all values in lambdas
 2024-11-07 23:45:31 +02:00
Trial97
2b590f24ed
remove task parent from constuctor 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-11-01 00:11:45 +02:00
TheKodeToad
9ae16921bc
Remove BasicFolderLoadTask 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2024-10-30 21:10:43 +00:00
Trial97
0e80aae1b8
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into lambda 2024-10-30 19:35:25 +02:00
Trial97
82bffabb69
do not capture by default all values in lambdas 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-10-30 18:16:43 +02:00