Commit Graph

3289 Commits

Author SHA1 Message Date
Trial97
ef4e5eb3cf fixed java build option
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-03-18 19:15:36 +02:00
Trial97
1322277ae6 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feature/java-downloader 2024-03-17 20:57:53 +02:00
AtomHare
853e4a13ab fix: Compressing typo
Signed-off-by: AtomHare <29772841+AtomHare@users.noreply.github.com>
2024-03-16 12:44:55 +01:00
Trial97
9120848278 Made java downloader as a build option
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-03-06 19:33:14 +02:00
Alexandru Ionut Tripon
a0311780c1 Merge pull request #1866 from Trial97/supported_files
Added all supported files filter
2024-03-06 17:21:56 +02:00
Tayou
1627f3c63b Merge pull request #2178 from TheKodeToad/mrpack-fixes
(More) mrpack fixes
2024-03-03 16:30:40 +01:00
TheKodeToad
4101fbb634 Allow multiline description
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2024-03-01 01:05:03 +00:00
TheKodeToad
138df66355 Fix server side mods being marked as unsupported on client
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2024-03-01 00:03:20 +00:00
Trial97
24fd07861b format code
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-02-26 22:25:14 +02:00
Alexandru Ionut Tripon
da96172b0b Apply suggestions from code review
Co-authored-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
2024-02-26 22:00:40 +02:00
TheKodeToad
c0eb80947d Fix build on Windows and formatting
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2024-02-24 21:50:51 +00:00
TheKodeToad
fccf857d8e Fix a mistake
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2024-02-24 19:16:39 +00:00
TheKodeToad
bd0cd82826 Add upper-bound for randomisation
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2024-02-24 18:41:45 +00:00
TheKodeToad
df60f5cc96 Add error when staging folder could not be created
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2024-02-24 18:41:35 +00:00
TheKodeToad
9574ebe480 Delete staging on abort
Previously instances would get "stuck" in the folder

Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2024-02-24 18:41:35 +00:00
TheKodeToad
6a9f5540d3 Re-randomise key until it does not collide
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2024-02-24 13:38:19 +00:00
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
1cdb9bd5af Merge pull request #2141 from crpz1/welcome_label_consistency 2024-02-22 12:36:00 +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
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
99cbb5d0b2 Merge pull request #2110 from Trial97/fix_curseforge 2024-02-18 12:42:09 +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
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
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
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
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
e738b78044 Merge pull request #2112 from TheKodeToad/log-performance 2024-02-13 09:15:47 +01:00
TheKodeToad
8cf2a04f31 Fix formatting issues
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2024-02-12 15:24:56 +00:00
TheKodeToad
7f4c74ffbe Fix immediate free in Exception.h
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2024-02-11 22:16:03 +00:00
Trial97
fdaaee64d1 Fixed curseforge neoforge export for 1.20.1
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-02-11 21:49:28 +02:00
TheKodeToad
ff989b4305 Fix ResourceModel error display
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2024-02-11 15:43:36 +00:00
TheKodeToad
ded77e6183 Fix NetJob use-after-free
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2024-02-11 15:43:36 +00:00
Alexandru Ionut Tripon
29bf6cc68c Update launcher/modplatform/flame/FlameInstanceCreationTask.cpp
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
2024-02-10 23:15:26 +02:00
Trial97
830ce246e1 Fixed curseforge neoforge import for 1.20.1 versions
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-02-10 13:48:02 +02:00
Trial97
c0fb053ccc Added warning for x86 java
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-02-09 23:14:49 +02:00
Trial97
27d662e642 Added management for downloaded javas from prism
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-02-09 22:47:39 +02:00
Trial97
0a3303bcbd Added button to add extra java path to the Java Wizzard
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-02-09 21:07:12 +02:00
Trial97
379f1a70e9 Leave headers alone
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-02-08 22:37:57 +02:00
Trial97
b3fc07d444 Added extra java search paths
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-02-08 21:47:59 +02:00
Trial97
3d29da916d Made Java path configurable
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-02-08 20:15:19 +02:00
Trial97
ba990e075b Added JavaPath function
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-02-08 19:45:46 +02:00
TheKodeToad
7cac8ad2b4 Use QTextFragment for inserting log lines
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2024-02-06 20:42:18 +00:00