Commit graph

236 commits

Author SHA1 Message Date
Trial97
c38c90afc3
fix tweakers
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 9d4bde7f96)
2026-02-22 00:55:57 +02:00
Octol1ttle
eecad73cb9
refactor: FMLLibrariesTask -> LegacyFMLLibrariesTask
Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com>
2026-02-18 00:16:22 +05:00
Alexandru Ionut Tripon
70aee4a3fc
[Backport release-10.x] Allow -Duser.language to be overriden (#5019) 2026-02-17 21:09:30 +02:00
Octol1ttle
b88c2b109d
fix: don't manually check for instance overrides
Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com>
(cherry picked from commit 06d9079be1)
2026-02-17 21:04:49 +02:00
Octol1ttle
0baca3fbea
feat: print custom environment variables in log
Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com>
(cherry picked from commit ca5e1e0f1b)
2026-02-17 21:04:49 +02:00
Octol1ttle
766de43e33
refactor: use variables for string literals
Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com>
(cherry picked from commit 2842defe7f)
2026-02-17 21:04:47 +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
TheKodeToad
568b30d914 Allow -Duser.language to be overriden
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
(cherry picked from commit 6bbbfa06d1)
2026-02-13 07:06:06 +00: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
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
Blake Batson
b2d7211254 Force disable xrandr if it is unavailable
lwjgl2 optionally requires the xrandr command line utility on linux, but
does not check if the executable actually exists before trying to use
it. We can force it to fall back to the xf86videomode implementation
by checking for the executable ourselves, and force disabling xrandr
with this boolean [1] if it does not exist.

Link: 2df01dd762/src/java/org/lwjgl/opengl/LinuxDisplay.java (L214) [1]
Signed-off-by: Blake Batson <bbatson101@gmail.com>
(cherry picked from commit e0c2fbbcde)
2025-12-26 10:10:51 +00:00
TheKodeToad
4ae0b3d898
Replace QDir("libraries/").absolutePath() with metacache solution
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2025-12-05 11:56:56 +00:00
TheKodeToad
cbf2f14b3f
Add library_dir var
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2025-12-05 11:26:58 +00:00
TheKodeToad
069dacd464
Expand variables in JVM args
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2025-12-05 10:47:11 +00:00
TheKodeToad
d384970694
Merge remote-tracking branch 'upstream/develop' into unused-code
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2025-09-19 11:06:34 +01:00
TheKodeToad
49b238f384
Properly remove gameoptions
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2025-09-19 09:42:13 +01:00
TheKodeToad
d7eddd3773
Replace IPathMatcher stuff with Filter
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2025-08-04 15:03:22 +01:00
Alexandru Ionut Tripon
178965676e
Remove reference to deprecated Q_OS_OSX macro (#3824) 2025-06-02 12:45:24 +03:00
Alexandru Ionut Tripon
52fa074ff7
Make column visibility global (#3748) 2025-06-02 12:45:03 +03:00
Yihe Li
5ccdb0a477
Remove several warnings when building the project
Signed-off-by: Yihe Li <winmikedows@hotmail.com>
2025-06-02 17:00:13 +08:00
Trial97
a29b189056
feat: make the visibility per resource
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2025-06-02 11:56:03 +03:00
Trial97
8c710fb8de
chore: migrate map settings to json string
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2025-06-02 11:56:03 +03:00
TheKodeToad
edb1020dce
Merge remote-tracking branch 'upstream/develop' into data-packs
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2025-06-02 09:52:05 +01:00
Trial97
6177fa0148
feat: make resource header config global
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2025-06-02 11:40:48 +03:00
Trial97
ca54971499
chore: ensure the setting is saved as string
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2025-06-02 09:45:49 +03:00
Trial97
492769aea6
feat: add setting to control the loaders for mod search
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2025-06-02 09:19:40 +03:00
TheKodeToad
e4ed3b4546
Merge branch 'PrismLauncher:develop' into data-packs 2025-06-01 07:54:16 +00:00
TheKodeToad
75d4ef1828
Implement UI for setting recommended RAM
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2025-04-29 14:44:30 +01:00
TheKodeToad
fadbcf2d04
Merge remote-tracking branch 'upstream/develop' into data-packs
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2025-04-29 09:15:11 +01:00
Trial97
5c8481a118
chore: reformat
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2025-04-29 10:46:41 +03:00
Trial97
c5fd5e6ac1
chore: make all the regexes static const
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2025-04-28 22:37:29 +03:00
Rachel Powers
2031859731
Merge remote-tracking branch 'upstream/develop' into xml-logs 2025-04-28 04:11:53 -07:00
TheKodeToad
63e30352e6
Fix catastrophic regex mistake (#3669) 2025-04-28 11:07:01 +01:00
TheKodeToad
1e3c197222
Merge remote-tracking branch 'upstream/develop' into shallow-lazy-otherlogs
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2025-04-28 10:31:48 +01:00
TheKodeToad
20626e6606
Fix log sorting
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2025-04-28 10:28:57 +01:00
Rachel Powers
21570a03fb
feat(xml-logs): finish tests
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
2025-04-19 13:02:30 -07:00
TheKodeToad
92ba13cfdb
Fix catastrophic regex mistake
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2025-04-19 00:12:38 +01:00
Seth Flynn
3df98dd5e7
Remove support for Qt 5 (#2174) 2025-04-18 16:26:55 -04:00
TheKodeToad
d5db974008
Shallow search and lazy loading for Other Logs page
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2025-04-18 20:14:33 +01:00
TheKodeToad
0f847d6682
Fix mistakes
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2025-04-18 19:40:19 +01:00
Trial97
442aae88ce
chore: remove qt version checks from code
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2025-04-17 23:46:55 +03:00
TheKodeToad
ce76320b23
Remove unnecessary import
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2025-04-15 15:58:11 +01:00
TheKodeToad
be803b3279
Optimise guessLevel
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2025-04-15 15:39:27 +01:00
TheKodeToad
ea82d44aab
Allow absolute path for global data packs
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2025-03-26 00:30:00 +00:00
TheKodeToad
18ee1f897a
Global data packs
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2025-03-25 16:28:16 +00:00
Trial97
9e954548dd
add libMangoHud_shim.so to mangohub preloadlist
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2025-02-12 20:21:45 +02:00
seth
b7f2175718
Merge pull request #3179 from sshcrack/fix-inst-java
Fix $INST_JAVA not being set for auto download java
2025-01-16 20:03:26 -05:00
Alexandru Ionut Tripon
507faf9f00
Merge pull request #3150 from kthchew/fix/unneeded-hr-exceptions
Remove unnecessary hardened runtime exceptions on macOS
2024-12-14 19:30:11 +02:00