mc-in-work/PrismLauncher
1
0
Fork 0
mirror of https://github.com/PrismLauncher/PrismLauncher.git synced 2026-06-29 01:54:20 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 1
10415 commits 18 branches 53 tags 60 MiB
Commit graph

5081 commits

Author SHA1 Message Date
DioEgizio
dea4271b84 fix: replace gnome icons with oxygen ones in the multimc icon theme 
debian really wants this because of dfsg

Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
(cherry picked from commit 43d2010960)
 2026-02-13 07:33:05 +00:00
Alfred Wingate
9deac7bc4d fix(SkinManageDialog): add missing QMenu include 
launcher/ui/dialogs/skins/SkinManageDialog.cpp: In member function ‘void SkinManageDialog::show_context_menu(const QPoint&)’:
launcher/ui/dialogs/skins/SkinManageDialog.cpp:344:18: error: variable ‘QMenu myMenu’ has initializer but incomplete type
  344 |     QMenu myMenu(tr("Context menu"), this);
      |                  ^~

Include appears to have been dropped transitively in either
0ba2c09787 or 45df360e4c

Signed-off-by: Alfred Wingate <parona@protonmail.com>
(cherry picked from commit 67836213c5)
 2026-02-12 22:08:45 +00:00
DioEgizio
fe4e7bc51b fix(macos): fix margins on macos 
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
(cherry picked from commit b13f40df51)
 2026-02-12 20:59:01 +00:00
TheKodeToad
5105bf2957
Revert "[Backport release-10.x] refactor(console): attach console early (#4998)" 
This reverts commit b178c1e84d.
 2026-02-12 20:48:17 +00:00
Rachel Powers
b178c1e84d
[Backport release-10.x] refactor(console): attach console early (#4998) 
refactor(console): attach console early

also use RAII guard to free it instead of tracking it with a member variable


(cherry picked from commit ffd50e318a)

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2026-02-10 20:15:05 -07: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
Trial97
8e6979258a start core update task only if not running already 
This line crashes develop builds because the task is running already.

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit bc6a6e959b)
 2026-02-04 09:18:36 +00:00
Rachel Powers
757136f5b3 fix: windows filelink results needs to capture by refrence 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
(cherry picked from commit da019c8425)
 2026-02-03 03:03:04 +00:00
Octol1ttle
bc092d688f fix(ModrinthCheckUpdate): always increment loader index 
Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com>
(cherry picked from commit e7382fd43d)
 2026-02-01 07:58:34 +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
Alexandru Ionut Tripon
9cee254a88
[Backport release-10.x] remove followSymlinks calls (#4906) 2026-01-30 13:11:15 +02:00
Trial97
c3a0e26923 remove followSymlinks calls 
most probably they were used incorectly anyway

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit e5aa5e298f)
 2026-01-30 11:10:38 +00:00
Octol1ttle
11e2c77eff got clang-format'd 💀 
Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com>
(cherry picked from commit 158a7bbc34)
 2026-01-30 11:10:01 +00: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
Trial97
a942fd9db0 add more loaders to ovveride setting 
fixes #4624

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 6a41932e65)
 2026-01-30 09:31:48 +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
Seth Flynn
9a74635011 fix(MinecraftSettingsWidget): trim whitespace from path values 
Should help in mitigating common mistakes in copy/pasting

Signed-off-by: Seth Flynn <getchoo@tuta.io>
(cherry picked from commit cf63bccfd7)
 2026-01-28 06:49:05 +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
Trial97
20f8f7ec0e properly redraw viewport when scroll happens 
fixes #1504

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 7baaa05683)
 2026-01-27 11:56:17 +00:00
Alexandru Ionut Tripon
ca4a36531c
[Backport release-10.x] MinecraftSettingsWidget: Swap window width/height spinboxes (#4859) 2026-01-25 10:30:07 +02:00
Octol1ttle
884e3e49a6 "British roots ending with '-our' usually have '-or' in American English" thanks clion 
Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com>
(cherry picked from commit dd220e61be)
 2026-01-25 08:28:36 +00:00
Octol1ttle
1b9d0b95a8 fix(MinecraftSettingsWidget): swap width and height spinboxes to be in their expected positions 
Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com>
(cherry picked from commit b4f892cf42)
 2026-01-25 08:28:36 +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
Alexandru Ionut Tripon
43eeb14a7f
[Backport release-10.x] ModrinthCheckUpdate: Don't send a request that is doomed to fail (#4844) 2026-01-22 22:45:36 +02:00
Octol1ttle
168816d796
ModrinthCheckUpdate: don't send a request that is doomed to fail 
Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com>
(cherry picked from commit 29afecdbde)
 2026-01-22 22:43:07 +02:00
Octol1ttle
60a1a3ce88 rename Assert.h because it causes conflicts??? 
Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com>
(cherry picked from commit fa040fc959)
 2026-01-22 20:41:17 +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
d531abb684 code review 
Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com>
(cherry picked from commit 1cd78bf94a)
 2026-01-22 20:41:17 +00:00
Octol1ttle
20cf5d3a65 Introduce macro to assert and return the assertion condition 
Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com>
(cherry picked from commit 490df18fd5)
 2026-01-22 20:41:17 +00:00
Octol1ttle
f686d9b598 Add asserts to invalid Task states 
Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com>
(cherry picked from commit 9ac0314d7a)
 2026-01-22 20:41:17 +00:00
Octol1ttle
1ff7d25352 fix: add missing returns after emitSucceeded 
Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com>
(cherry picked from commit e27246c3f9)
 2026-01-22 20:40:11 +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
Seth Flynn
3b23752f73
build: add clang-format target 
Through the power of CMake itself, we can format our files

Signed-off-by: Seth Flynn <getchoo@tuta.io>
(cherry picked from commit 686ad72e03)
 2026-01-18 22:59:44 +02:00
DioEgizio
c806f61a02 hack: resolve dependencies for imageformats on mingw 
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
(cherry picked from commit a98ec194be)
 2026-01-18 21:56:41 +01:00
DioEgizio
1aff2e64d5 fix: improve we couldn't launch after 3 tries message 
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
(cherry picked from commit d5da7c9bde)
 2026-01-18 19:25:46 +00:00
SandaruKasa
40796e9f41 Take $GRADLE_USER_HOME into account when looking for JDKs 
Signed-off-by: SandaruKasa <sandarukasa@ya.ru>
(cherry picked from commit 267e8f1d33)
 2026-01-17 23:17:56 +00:00
Trial97
d1605ec02a fix ftb import for old packs 
fixes #4786

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 3496b7b3a0)
 2026-01-17 15:04:08 +00:00
TheKodeToad
3006e68849 Fix new instance window being too large 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
(cherry picked from commit d283726494)
 2026-01-14 21:24:42 +00:00
TheKodeToad
84a2d7d10a Fix settings window being too large 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
(cherry picked from commit 40c6f79b5f)
 2026-01-14 21:24:42 +00:00
TheKodeToad
22c6e1a331 Fix JavaWizardWidget compilation without PCH 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
(cherry picked from commit 90e3c59bd8)
 2026-01-14 21:21:36 +00:00
TheKodeToad
e2842bb5cd Allow toggling pre-compiled headers 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
(cherry picked from commit 3a16cf3081)
 2026-01-14 21:21:36 +00:00
Alexandru Ionut Tripon
5983919c2f
[Backport release-10.x] Fix for Prism failing to recognize some shader pack ZIP archives added manually by the user (#4766) 2026-01-14 13:52:40 +02:00
Alexandru Ionut Tripon
70f274ca9b
[Backport release-10.x] IconList: Make sure we always set new path (#4765) 2026-01-14 13:52:30 +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