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

10415 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Alexandru Ionut Tripon
f5e56ea3e4
[Backport release-10.x] Trim whitespace from path values in settings (#4888) 2026-01-28 08:49:53 +02: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
Alexandru Ionut Tripon
7b214d0048
[Backport release-10.x] fix: remove flatpak submodule (#4880) 2026-01-27 18:32:44 +02:00
Octol1ttle
9c7f692c09 fix: remove flatpak submodule 
Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com>
(cherry picked from commit 5de150b8dd)
 2026-01-27 16:32:26 +00:00
Alexandru Ionut Tripon
eb8743e75b
[Backport release-10.x] Remove in-tree flatpak (#4876) 2026-01-27 14:05:16 +02:00
Seth Flynn
62d57878b8 build(flatpak): remove 
See https://github.com/PrismLauncher/flatpak

Signed-off-by: Seth Flynn <getchoo@tuta.io>
(cherry picked from commit 3833b1e292)
 2026-01-27 12:04:56 +00:00
Alexandru Ionut Tripon
2550753e1f
[Backport release-10.x] PackProfile: don't reset dirty if component list saving failed (#4875) 2026-01-27 13:59:03 +02: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
Alexandru Ionut Tripon
f56aab1c58
[Backport release-10.x] properly redraw viewport when scroll happens (#4874) 2026-01-27 13:56:32 +02: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
Alexandru Ionut Tripon
f85271e5ef
[Backport release-10.x] MSAStep: Tighten isSchemeHandlerRegistered check (#4858) 2026-01-25 10:29:57 +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
Alexandru Ionut Tripon
3a3bbb66a6
[Backport release-10.x] Add asserts to invalid Task states (#4843) 2026-01-22 22:45:23 +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
Alexandru Ionut Tripon
3e567fef3b
[Backport release-10.x] Add missing returns after task signal activation (#4842) 2026-01-22 22:41:00 +02: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
Alexandru Ionut Tripon
e7864d6e2b
[Backport release-10.x] initilize world size (#4834) 2026-01-21 12:47:38 +02: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
Alexandru Ionut Tripon
fa773da508
[Backport release-10.x] Reformat with editorconfig, add clang-format target (#4814) 2026-01-19 09:07:42 +02: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
Tayou
24fab616a4
[Backport release-10.x] fix: improve we couldn't launch after 3 tries message (#4812) 2026-01-18 20:26:29 +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
Alexandru Ionut Tripon
b27a559010
[Backport release-10.x] Take $GRADLE_USER_HOME into account when looking for JDKs (#4808) 2026-01-18 01:18:14 +02: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
Alexandru Ionut Tripon
6296ec7fce
[Backport release-10.x] fix ftb import for old packs (#4798) 2026-01-17 17:05:02 +02: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
Alexandru Ionut Tripon
6bd74bedac
[Backport release-10.x] Fix instance and settings window minimum size (#4774) 2026-01-14 23:25:05 +02: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
Alexandru Ionut Tripon
96269d408c
[Backport release-10.x] Allow opting out of pre-compiled headers (#4773) 2026-01-14 23:22:00 +02: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
Alexandru Ionut Tripon
3bf9b881fa
[Backport release-10.x] chore: make appimage use portals for file picking (#4764) 2026-01-14 13:52:21 +02:00
Alexandru Ionut Tripon
326f818d0a
[Backport release-10.x] accept libarchive warning result (#4763) 2026-01-14 13:52:13 +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