Trial97
726b0ffb3b
Reduced temporary instance folder name
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-02-22 19:40:24 +02:00
Sefa Eyeoglu
b7dc0b83b2
Merge pull request #2153 from PrismLauncher/backport-2141-to-release-8.x
2024-02-22 12:37:54 +01:00
crpz1
0113456dea
Use empty list label code for welcome screen
...
Signed-off-by: crpz1 <8588315+crpz1@users.noreply.github.com>
(cherry picked from commit 9aa81cf005
2024-02-22 11:36:13 +00:00
Sefa Eyeoglu
1cdb9bd5af
Merge pull request #2141 from crpz1/welcome_label_consistency
2024-02-22 12:36:00 +01:00
seth
02340f19a5
Merge pull request #2152 from PrismLauncher/getchoo-patch-1
...
ci: fix permissions for backport workflow
2024-02-22 06:15:57 -05:00
seth
f747ae949c
ci: fix permissions for backport workflow
...
Signed-off-by: seth <getchoo@tuta.io>
2024-02-22 06:13:27 -05:00
seth
4add24696b
Merge pull request #2151 from DioEgizio/updates-backport
...
fix: fix sparkle signing backport
2024-02-22 06:10:30 -05:00
DioEgizio
c6441d231b
fix: fix sparkle signing
...
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
2024-02-22 11:53:48 +01:00
Sefa Eyeoglu
bff8d7220d
Merge pull request #2150 from DioEgizio/fix-ghactions-macos
2024-02-22 11:02:09 +01:00
DioEgizio
4421746c0e
fix: fix sparkle signing
...
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
2024-02-22 10:00:21 +01:00
DioEgizio
01c4e6a65c
Merge pull request #2137 from DioEgizio/zink
2024-02-21 17:42:11 +01:00
crpz1
9aa81cf005
Use empty list label code for welcome screen
...
Signed-off-by: crpz1 <8588315+crpz1@users.noreply.github.com>
2024-02-20 00:21:37 +11:00
Trial97
1c96ae5807
Fixed java refresh button
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-02-18 22:32:54 +02:00
Trial97
889f604a41
Removed JavaExtraSearchPaths
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-02-18 21:38:31 +02:00
Trial97
a288779790
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feature/java-downloader
2024-02-18 16:49:35 +02:00
Trial97
038d3e4596
Fixed asan complains
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-02-18 16:49:10 +02:00
DioEgizio
438ccc41ef
Merge pull request #2136 from DioEgizio/updates-backport
2024-02-18 15:04:29 +01:00
Alexandru Ionut Tripon
80f863f6b6
Merge pull request #2135 from PrismLauncher/backport-2110-to-release-8.x
...
[Backport release-8.x] Fixed curseforge neoforge import for 1.20.1 versions
2024-02-18 15:02:54 +02:00
DioEgizio
44327980db
feat: add "use zink" button
...
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
2024-02-18 13:30:55 +01:00
Trial97
b4f3a969b3
Updated strings that are displayed to user
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-02-18 14:30:38 +02:00
DioEgizio
d8e34e6c39
Merge pull request #2130 from DioEgizio/updates
2024-02-18 12:58:09 +01:00
Sefa Eyeoglu
c4cb36b9d5
Merge pull request #1951 from guihkx/sync-flatpak
2024-02-18 12:58:09 +01:00
Trial97
72c4a52119
Fixed curseforge neoforge export for 1.20.1
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit fdaaee64d1
2024-02-18 11:42:43 +00:00
Alexandru Ionut Tripon
8eba326f62
Update launcher/modplatform/flame/FlameInstanceCreationTask.cpp
...
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
(cherry picked from commit 29bf6cc68c
2024-02-18 11:42:43 +00:00
Trial97
69d675dc76
Fixed curseforge neoforge import for 1.20.1 versions
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 830ce246e1
2024-02-18 11:42:43 +00:00
DioEgizio
99cbb5d0b2
Merge pull request #2110 from Trial97/fix_curseforge
2024-02-18 12:42:09 +01:00
DioEgizio
dbdd96edc3
Merge pull request #2130 from DioEgizio/updates
2024-02-18 12:41:49 +01:00
Trial97
4aafa98852
Improved the message boxes for java wizzard
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-02-18 12:58:34 +02:00
Trial97
2f489d1aec
Added auto java options to the java wizzard page
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-02-18 11:34:54 +02:00
Sefa Eyeoglu
976f5f10cf
Merge pull request #2132 from PrismLauncher/update_flake_lock_action
...
chore(nix): update lockfile
2024-02-18 09:38:24 +01:00
Trial97
4c76f7afe0
Made auto java checkbox dependent
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-02-18 09:46:44 +02:00
Trial97
a7dad96a70
Added refresh button on managed java list
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-02-18 09:32:31 +02:00
github-actions[bot]
54bfbe562e
chore(nix): update lockfile
...
Flake lock file updates:
• Updated input 'nixpkgs':
'github:nixos/nixpkgs/442d407992384ed9c0e6d352de75b69079904e4e' (2024-02-09)
→ 'github:nixos/nixpkgs/6e2f00c83911461438301db0dba5281197fe4b3a' (2024-02-17)
• Updated input 'pre-commit-hooks':
'github:cachix/pre-commit-hooks.nix/0db2e67ee49910adfa13010e7f012149660af7f0' (2024-02-07)
→ 'github:cachix/pre-commit-hooks.nix/5df5a70ad7575f6601d91f0efec95dd9bc619431' (2024-02-15)
2024-02-18 00:18:59 +00:00
Trial97
5232b3cd89
Added some logs and fixed natives extraction
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-02-17 12:17:00 +02:00
Trial97
ea2adf909d
Added progeess dialog to autodownload java
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-02-17 11:14:32 +02:00
Sefa Eyeoglu
e9991e99c0
Merge pull request #2129 from PrismLauncher/backport-2126-to-release-8.x
...
[Backport release-8.x] Use absolute path to load MangoHUD library
2024-02-17 09:22:51 +01:00
Echo J
6da36140eb
Use absolute path to load MangoHUD library
...
This should finally fix the Arch Linux Java symbol issue with MangoHUD
enabled: https://bugs.archlinux.org/task/77183
Signed-off-by: Echo J <tcg96nougat@gmail.com>
(cherry picked from commit 01180c20e1
2024-02-17 00:57:29 +00:00
seth
599a08d309
Merge pull request #2126 from TheComputerGuy96/mr/mangohud-fix
...
Use absolute path to load MangoHUD library
2024-02-16 19:57:12 -05:00
Trial97
2941307581
Added basic java auto-detect and auto-download
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-02-16 23:42:39 +02:00
DioEgizio
25b69b4c0d
fix: fix sparkle hash
...
:/ oops
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
2024-02-16 17:29:49 +01:00
DioEgizio
94b48e9702
fix: remove cmark_static
...
cmark 0.31 removed CMARK_STATIC/CMARK_SHARED and replaced it with the native cmake BUILD_SHARED_LIBS
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
2024-02-16 17:06:28 +01:00
DioEgizio
5d36067c74
chore: update libraries
...
updated qt to 6.6.2
updated some submodules
updated sparkle framework to the latest version
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
2024-02-16 16:21:53 +01:00
Echo J
01180c20e1
Use absolute path to load MangoHUD library
...
This should finally fix the Arch Linux Java symbol issue with MangoHUD
enabled: https://bugs.archlinux.org/task/77183
Signed-off-by: Echo J <tcg96nougat@gmail.com>
2024-02-14 10:11:49 +02:00
Sefa Eyeoglu
816c900edc
Merge pull request #2122 from PrismLauncher/backport-2112-to-release-8.x
2024-02-13 09:16:10 +01:00
TheKodeToad
4ebce79353
Use QTextFragment for inserting log lines
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
(cherry picked from commit 7cac8ad2b4
2024-02-13 08:16:01 +00:00
Sefa Eyeoglu
e738b78044
Merge pull request #2112 from TheKodeToad/log-performance
2024-02-13 09:15:47 +01:00
Sefa Eyeoglu
256ed2a038
Merge pull request #2121 from PrismLauncher/backport-2116-to-release-8.x
2024-02-13 09:15:05 +01:00
TheKodeToad
3f30e4c691
Fix formatting issues
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
(cherry picked from commit 8cf2a04f31
2024-02-13 08:14:52 +00:00
TheKodeToad
ad9dbb4a68
Fix immediate free in Exception.h
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
(cherry picked from commit 7f4c74ffbe
2024-02-13 08:14:52 +00:00
TheKodeToad
fb04b6fa85
Fix ResourceModel error display
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
(cherry picked from commit ff989b4305
2024-02-13 08:14:52 +00:00
