Commit Graph

4455 Commits

Author SHA1 Message Date
5685bc3407 Merge pull request #2913 from archessmn/fix/custom-command-tab-order
Fix tab order on custom command inputs
2024-10-13 09:49:13 +03:00
bd01c47dc9 Merge pull request #2906 from TheKodeToad/no-recursive-remove-on-update
Prevent directories from being removed on instance update
2024-10-13 09:48:27 +03:00
3a1c06de02 fix: Tab order on custom command inputs
The tab order on the custom command UI in the instance settings is off, it goes 0 -> 2 -> 1, This re-orders the ui file to fix the order the inputs are in.

Signed-off-by: Mia Moir <63592337+archessmn@users.noreply.github.com>
2024-10-12 23:47:58 +01:00
ef0cb88dd3 Merge pull request #2907 from Ryex/fix/icon_cache_stack_overflow
Prevent infinite recursion when mod icon load fails
2024-10-12 12:21:09 +03:00
0b624a43d6 Merge pull request #2908 from Trial97/remove_client
remove client overrides instead of double deleting the normal ones
2024-10-12 00:49:57 +03:00
97f4ead0fb remove client overrides instead of double deleting the normal ones
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-10-12 00:19:54 +03:00
78ceae9c17 Merge pull request #2887 from Trial97/filters_modpack
Add filters for modpack search
2024-10-12 00:07:14 +03:00
72cfad8fee Continue deleting before failing
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2024-10-11 21:35:13 +01:00
09c9da268f fix: prevent inf recursion when mod icon load fails; cut max pixmapcache to 1/4 previous value
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
2024-10-11 13:26:20 -07:00
2bc6ae9756 Prevent directories from being removed on instance update
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2024-10-11 19:53:28 +01:00
0c4c86c41f Merge pull request #2900 from TheKodeToad/log-utf8
Use UTF-8 to decode logs on Java 18 or newer
2024-10-11 19:10:55 +02:00
98adcc60a3 Use UTF-8 to decode logs on Java 18 or newer
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2024-10-09 17:15:53 +01:00
909114bf2a Change LaunchTask to only accept MinecraftInstance
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2024-10-09 15:07:09 +01:00
4b66320f63 Move x-prism-launcher to unnamed table for consistency
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2024-10-08 22:51:03 +01:00
a76f37760c Fix log spam when opening files from older versions
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2024-10-08 22:30:50 +01:00
d31c947b36 fix crash when no resorce version is available
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-10-08 22:02:38 +03:00
df9f54454a removed static functions
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-10-08 19:19:03 +03:00
538815e033 Merge remote-tracking branch 'upstream/develop' into resource-meta
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2024-10-08 17:16:10 +01:00
3fae659b30 Merge remote-tracking branch 'upstream/develop' into resource-meta
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2024-10-08 17:15:42 +01:00
5bd5627a96 extended the modrinth search and applied the suggested change
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-10-08 15:06:50 +03:00
6e5f616ced move checkMcVersions to Filter struct
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-10-07 00:21:28 +03:00
d5990cca43 Disable retry for private pack fetch
This is already handled with a dialog asking whether you want it to be removed.

Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2024-10-06 13:51:36 +01:00
859fac604b add modrinth modpack filter
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-10-04 17:06:47 +03:00
dfe3cd849d add curseforge modpack filter
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-10-02 01:06:45 +03:00
62f19a6ac9 Merge pull request #2863 from Trial97/fix_resource_search_equal 2024-10-01 11:41:11 +02:00
c57e26cf57 Merge pull request #2874 from Trial97/modpack_equal 2024-10-01 11:40:42 +02:00
946e791d39 sync modpack search field
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-10-01 08:53:27 +03:00
5ea2dece54 fix search term not remaining the same between providers on resource download
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-10-01 08:52:07 +03:00
0eefa52dbc fix some transtaions warnings
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-10-01 08:51:06 +03:00
b676a67b3c Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into fix_login 2024-10-01 08:49:03 +03:00
fa92e6bd29 Merge pull request #2859 from Trial97/packwiz_prefix
add prefix to non-standard packwiz fields
2024-10-01 08:23:10 +03:00
38fa2e0cd4 style: format with clang-format
Signed-off-by: seth <getchoo@tuta.io>
2024-09-30 16:32:55 -04:00
b9c19fd3f7 fix: don't annoy when java tmpdir jvmarg is set & /tmp is noexec
Signed-off-by: Mason Rocha <mrocha@turretllc.us>

Got annoyed, didn't want to see it anymore.

Java tmpdir noexec warning modified to include information about
possible remedies available
2024-09-27 16:42:59 -05:00
6475dc5786 Lots of J's for Java needed to be uppercased 2024-09-26 01:58:21 -04:00
1b2e9b95e2 add prefix to non-standard packwiz fields
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-09-25 21:17:44 +03:00
3e60713257 Merge pull request #2838 from Trial97/view_log
Always display Minecraft log tab
2024-09-24 20:00:54 -04:00
48904c0d66 Merge pull request #2806 from Trial97/technic_client
Add Technic client ID
2024-09-24 19:55:21 -04:00
f641f3acda Refactoring
Signed-off-by: QazCetelic <qaz.cetelic@protonmail.com>
2024-09-24 12:32:49 +02:00
b675406b1a Split set creation into a separate function for readability
Signed-off-by: QazCetelic <qaz.cetelic@protonmail.com>
2024-09-24 10:16:26 +02:00
a58e81d744 snake_case to camelCase
Signed-off-by: QazCetelic <qaz.cetelic@protonmail.com>
2024-09-24 09:58:47 +02:00
4a40b53e5f Merge pull request #2845 from Trial97/typo
fix updater typo
2024-09-22 19:09:40 +03:00
9567d763c1 fix java archive typo
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-09-21 22:17:44 +03:00
3e1cf6b2a7 fix updater typo
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-09-20 16:58:22 +03:00
1243328876 fix folder duplication for modrinth
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-09-20 16:53:36 +03:00
77463c6d33 display minecraft log before instance run
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-09-18 21:17:15 +03:00
dc67807894 Merge pull request #2825 from Trial97/skin_fix 2024-09-17 08:50:19 +02:00
926a6bc72a Merge pull request #2583 from Trial97/metadata2
Generate updater metadata for mods added/updated using modpack updater/installer
2024-09-17 08:45:09 +03:00
d06f0529a0 Merge pull request #2830 from Trial97/login_wizard_retry
Show login dialog again if account login fails
2024-09-17 08:44:41 +03:00
53c3d99bdd Merge pull request #2828 from Trial97/cmake_fields
Allow configuring more URLs through CMake
2024-09-17 08:44:24 +03:00
c57b1d4227 Merge pull request #2820 from Trial97/mac_java
Add extra step to macos java install
2024-09-17 08:44:09 +03:00