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

2744 commits

Author SHA1 Message Date
Octol1ttle
3ecb1ca9ba fix(OtherLogsPage): remove CR when removing LF 
Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com>
(cherry picked from commit 3f11b185a8)
 2026-02-21 20:44:30 +00:00
Alexandru Ionut Tripon
156f7eabd4
[Backport release-10.x] OtherLogsPage: Fix some strings not being translatable (#5083) 2026-02-21 22:43:42 +02:00
Alexandru Ionut Tripon
f2de9af720
[Backport release-10.x] Skin renderer: Do not enable backface culling (#5081) 2026-02-21 22:42:56 +02:00
Octol1ttle
fe2bd2ddbd fix(OtherLogsPage): make UI strings translatable 
Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com>
(cherry picked from commit 668cbf4ee0)
 2026-02-21 20:42:37 +00:00
Octol1ttle
3cfe16a3d7 fix(SkinOpenGLWindow): do not enable backface culling 
Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com>
(cherry picked from commit 3422fa5c5a)
 2026-02-21 20:34:35 +00:00
Octol1ttle
dce9cab56b feat(NewsDialog): save and restore geometry 
Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com>
(cherry picked from commit d8a25f55e4)
 2026-02-21 20:32:17 +00: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
Alexandru Ionut Tripon
b7b4fc8aa4
[Backport release-10.x] Application.h cleanup (#5001) 2026-02-17 21:08:50 +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
Alexandru Ionut Tripon
9fc5e1c650
[Backport release-10.x] refactor: replace std::list with std::vector (#4845) 2026-02-17 21:01:12 +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
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
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
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
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
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
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
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
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
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
ea42d6f676 refactor: replace std::list with std::vector 
Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com>
(cherry picked from commit 19b9557c19)
 2026-01-22 21:04:12 +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
7a5500605a Use AccountList as model in ProfileSelectDialog 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
(cherry picked from commit 9be292b845)
 2026-01-17 00:08:14 +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
5ed7a5b56f Fix auto-join getting stuck disabled 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
(cherry picked from commit e856f60804)
 2026-01-11 22:22:02 +00:00
TheKodeToad
5923504aff Fix broken EnvironmentVariables and CustomCommands when tab is inactive 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
(cherry picked from commit 01228cc0b7)
 2026-01-11 13:19:27 +00:00
Trial97
6d60fc1cbe fix modrinth environments filter 
fixes #4630
reversed the conditions to check for side because somewhere the mod side
is no initilized(easier to check one line than search where it is not
initialized)

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit a97c15d0fb)
 2026-01-10 16:36:50 +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
Alexandru Ionut Tripon
0008542228
[Backport release-10.x] Disable tooltips if using gamescope / Steam Deck. (#4716) 2026-01-09 22:15:09 +02:00
Mark Deneen
bbc94272be Disable tooltips if using gamescope / Steam Deck. (#4096) 
* Disable tooltips if using gamescope / Steam Deck.

On a Steam Deck, Prism Launcher's window is scaled to fit the screen.
Whenever a tool tip is shown, it is often display outside of the window,
causing the compositor to scale the view to fit the new bounding box.

This effect is quite jarring, and I don't like it.  This patch adds a
small global event filter which swallows up the tool tip events.  It is
currently not configurable, although I suppose that could be an option.

Signed-off-by: Mark Deneen <mdeneen@gmail.com>

* Move tooltip filter addition from the Main Window to the Application.

Signed-off-by: Mark Deneen <mdeneen@gmail.com>

* Add license information to new files

Signed-off-by: Mark Deneen <mdeneen@gmail.com>

* Remove other authors, they should not have been added in the first place

Signed-off-by: Mark Deneen <mdeneen@gmail.com>

* Correct the years as well

Signed-off-by: Mark Deneen <mdeneen@gmail.com>

* Update launcher/ui/ToolTipFilter.cpp

Co-authored-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
Signed-off-by: Mark Deneen <mdeneen@gmail.com>

* Update launcher/ui/ToolTipFilter.h

Co-authored-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
Signed-off-by: Mark Deneen <mdeneen@gmail.com>

---------

Signed-off-by: Mark Deneen <mdeneen@gmail.com>
Co-authored-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
(cherry picked from commit 133842d6a8)
 2026-01-09 20:14:02 +00:00
Trial97
05f3280405 remove curseforge api key validation 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 7f952d9fdf)
 2026-01-09 20:13:20 +00:00
Octol1ttle
fd1d7f3c28 fix(CheckComboBox): check that mouse press is inside view rectangle 
Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com>
(cherry picked from commit 39e283169e)
 2026-01-07 10:26:32 +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
6ef89db08e Properly show shaderpacks in export 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
(cherry picked from commit d625a28112)
 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
DioEgizio
317b8eea9b fix: improve a bit the FTB packs are also on cf notice 
Co-authored-by: TheKodeToad <TheKodeToad@proton.me>
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
(cherry picked from commit 57c4b71c61)
 2025-12-27 15:11:13 +01:00
DioEgizio
c968bafb0a chore: add new ftb packs are also on cf notice 
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
(cherry picked from commit 31dd8cd9f8)
 2025-12-27 15:11:13 +01:00
Octol1ttle
2128e87d92 fix(APIPage.ui): resolve duplicate name 
Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com>
(cherry picked from commit de092922d7)
 2025-12-26 21:40:23 +00:00
Trial97
75215b0d31 fix mod update remaining disabled on second open 
fixes
https://discord.com/channels/1031648380885147709/1450161125172707390/1453013386144124929
basically when opening the edit window a second time the model doesn't
get any updates as the data is already loaded into the memory.

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 7f68f2fe3b)
 2025-12-23 22:10:44 +00:00
Trial97
3f9b6ae452 fix modrinth modpack allways download latest 
fixes #4547
introduced by #3828
made a mistake to use addonId instead ov fileId
this only applies to modrinth
on curseforge I could not reproduce this bug

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit d7745d97f2)
 2025-12-22 08:09:56 +00:00
Rachel Powers
8f314c982a fix(skin-preview): smoother chessboard background contrast 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
(cherry picked from commit 42b72d676c)
 2025-12-20 16:51:15 +00:00