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

1186 commits

Author SHA1 Message Date
Trial97
02f23939f5 fix: parse world_gen_settings.dat for seed 
fixes #5064
Minecraft moved the world gen settins outside the level.dat file.
So now we need to check data/minecraft/world_gen_settings.dat for the
seed.
I did not bother with zip files(I did not even see the zip file in the
launcher so I will not bother with it)

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit e0139185c8)
 2026-02-22 22:18:19 +00:00
Trial97
c38c90afc3
fix tweakers 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 9d4bde7f96)
 2026-02-22 00:55:57 +02:00
Trial97
a8eddf566e fix crash with skin format 
fixes #4994
All the formats lower than Format_Indexed8 will have less information
and can't be used directly.
Also added the check for alphaChannel check just to be sure.

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit fe5aee2619)
 2026-02-18 13:08:55 +00:00
Alexandru Ionut Tripon
dfeb3463fe
[Backport release-10.x] Allow overriding URL for downloading legacy FML libs (#4879) 2026-02-17 21:55:20 +02:00
Trial97
92d305f345
add back missing step 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2026-02-17 21:37:55 +02:00
Octol1ttle
b17b76bd5c
feat: allow overriding URL for downloading legacy FML libs 
Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com>
 2026-02-18 00:16:24 +05:00
Octol1ttle
eecad73cb9
refactor: FMLLibrariesTask -> LegacyFMLLibrariesTask 
Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com>
 2026-02-18 00:16:22 +05:00
Alexandru Ionut Tripon
70aee4a3fc
[Backport release-10.x] Allow -Duser.language to be overriden (#5019) 2026-02-17 21:09:30 +02:00
Alexandru Ionut Tripon
b7b4fc8aa4
[Backport release-10.x] Application.h cleanup (#5001) 2026-02-17 21:08:50 +02:00
Octol1ttle
b88c2b109d
fix: don't manually check for instance overrides 
Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com>
(cherry picked from commit 06d9079be1)
 2026-02-17 21:04:49 +02:00
Octol1ttle
0baca3fbea
feat: print custom environment variables in log 
Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com>
(cherry picked from commit ca5e1e0f1b)
 2026-02-17 21:04:49 +02:00
Octol1ttle
766de43e33
refactor: use variables for string literals 
Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com>
(cherry picked from commit 2842defe7f)
 2026-02-17 21:04:47 +02:00
Alexandru Ionut Tripon
a9a15a20ef
[Backport release-10.x] Make Minecraft resource URL override consistent with other overrides (#4877) 2026-02-17 21:01:49 +02:00
Trial97
4fd270877b
Add QIcon to accountList.cpp 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2026-02-17 20:47:53 +02:00
Trial97
27ea967fc8
fix build 
also fixed some warninigs of unused vars and formated the code again

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit d05b996c8a)
 2026-02-17 20:38:25 +02:00
Octol1ttle
782cda92a9
refactor(instance creation): use RAII lock to suspend instance settings saving 
Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com>
(cherry picked from commit c24fd2f570)
 2026-02-17 20:23:08 +02:00
Octol1ttle
1b88f31ec8
CapeChange: use dummy sink 
Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com>
(cherry picked from commit 3937819305)
 2026-02-17 20:23:08 +02:00
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
Alexandru Ionut Tripon
7755e0def9
[Backport release-10.x] Allow moving accounts in list (#4794) 2026-02-17 20:13:52 +02:00
Alexandru Ionut Tripon
91edd44f2c
[Backport release-10.x] Add icons in settings account list (#4793) 2026-02-17 20:13:29 +02:00
TheKodeToad
568b30d914 Allow -Duser.language to be overriden 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
(cherry picked from commit 6bbbfa06d1)
 2026-02-13 07:06:06 +00:00
Rachel Powers
18f1513aac Reduce include chain further, forward declare settings and log model 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
(cherry picked from commit 45df360e4c)
 2026-02-11 16:02:57 +00:00
Rachel Powers
1da92c9f54 refactor(Application.h): reduce include chain 
Include only what's absolutely necessary to reduce headers pulled into a
translation unit. If you need access to
instance's from `APPLICATION` include `BaseInstance.h` separately

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
(cherry picked from commit 0ba2c09787)
 2026-02-11 16:02:57 +00:00
Rachel Powers
d7793caa90 feat: Auto handle Http 429 Too Many Requests with retry 
- Must be explicitly enabled for a request
- Uses Retry-After Header if present, falls back to exponential back off
  starting with 10 seconds
- if retry delay is greater than 1 minute or it retries more than 3
  times then fail with a "Rate Limited" reason
- Sets task status to inform user of retry.

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
(cherry picked from commit e8da9ee4fb)
 2026-02-06 18:42:57 +01:00
Octol1ttle
a33b4297ad improve wording 
Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com>
(cherry picked from commit ffd1e7bc33)
 2026-01-30 17:49:35 +02:00
Octol1ttle
af6e4445ad style: reorder includes 
Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com>
(cherry picked from commit 193840b237)
 2026-01-30 13:17:17 +02:00
Octol1ttle
19797c0f58 feat: abort launch when there are libraries missing 
Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com>
(cherry picked from commit d4817a5669)
 2026-01-30 13:16:59 +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
7e3d27743b change(MSAStep): log server errors 
Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com>
(cherry picked from commit 665aa4c546)
 2026-01-29 13:52:43 +01:00
Octol1ttle
df8d571c4c style: don't use keyword as variable name 
Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com>
(cherry picked from commit 1cdddd93ad)
 2026-01-27 12:04:58 +00:00
Octol1ttle
2c782afcc4 refactor: make Minecraft resource URL override consistent with other overrides 
Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com>
(cherry picked from commit 3f0af19ed3)
 2026-01-27 12:04:58 +00:00
Octol1ttle
070c800ce9 fix(PackProfile): don't reset dirty if component list saving failed 
Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com>
(cherry picked from commit c6072ff434)
 2026-01-27 11:58:21 +00:00
Octol1ttle
f7539c5869 fix(MSAStep): tighten isSchemeHandlerRegistered check 
Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com>
(cherry picked from commit 87b3a2ef99)
 2026-01-25 08:28:24 +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
Trial97
fb8193041a initilize world size 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 09f548f688)
 2026-01-21 10:45:16 +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
Octol1ttle
bb83820b0b Use real move instead of remove-then-insert 
Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com>

Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com>
(cherry picked from commit fa88edf8c3)
 2026-01-17 00:08:28 +00:00
Octol1ttle
ae4e35b211 feat: allow moving accounts in list 
Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com>

Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com>
(cherry picked from commit 40af45bb1c)
 2026-01-17 00:08:28 +00:00
TheKodeToad
38cd565283 Add icons to account list 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
(cherry picked from commit fc1e29111b)
 2026-01-17 00:08:14 +00: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
Octol1ttle
1d1dd6262f auth: improve status messages 
Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com>
(cherry picked from commit 6cddc28e9b)
 2026-01-12 18:20:05 +00:00
Octol1ttle
c55f4b373e fix(AuthFlow): set current step description in correct method 
Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com>
(cherry picked from commit f0813b578e)
 2026-01-11 22:22:13 +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