Commit Graph

3280 Commits

Author SHA1 Message Date
TheKodeToad
e3f55f6865 Use proxy style to force ActivateItemOnSingleClick off
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2024-04-26 22:08:45 +01:00
Trial97
5ae98f4f90 Fixed windows bundled java path
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-04-24 15:49:05 +03:00
Trial97
10d1720da5 Removed duplicate local
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-04-23 19:08:14 +03:00
Trial97
73c3794c1b Changed env variable
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-04-23 19:03:19 +03:00
Trial97
dac7027846 Fixed windows appdata path
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-04-23 18:59:31 +03:00
Trial97
dbfd535b38 Fix bundled java detection on mac
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-04-23 08:52:17 +03:00
William Gray
9f4654ede9 Update JavaUtils.cpp
Signed-off-by: William Gray <ruwagray@gmail.com>
2024-04-21 03:35:27 -05:00
TheKodeToad
252406ba3e Support neoforge.mods.toml
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2024-04-19 21:19:36 +01:00
Alexandru Ionut Tripon
a8a234b666 Merge pull request #2294 from Trial97/import_crash
Fixed application close on open file dialog
2024-04-19 00:12:47 +03:00
Trial97
8121a6536b Fixed pack update
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-04-12 23:45:31 +03:00
Trial97
9f48694eb2 Fixed application close on open file dialog
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-04-09 08:28:09 +03:00
Trial97
9cc58fe62c Fixed crash on invalid curseforge link on import
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-04-07 21:25:08 +03:00
timoreo
5bc415d512 Merge pull request #2225 from TheKodeToad/zip-utf8 2024-04-06 14:43:35 +02:00
Alexandru Ionut Tripon
a88cc2133c Merge pull request #2277 from TheKodeToad/invalid-zip-files
Fix unicode characters being invalid in filenames
2024-04-06 15:41:51 +03:00
timoreo
9323dcb9dc Merge pull request #2247 from Trial97/names 2024-04-06 14:35:06 +02:00
TheKodeToad
9986fe4c45 Fix unicode characters being invalid in filenames
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2024-04-06 13:33:13 +01:00
TheKodeToad
8056a2fa46 Replace invalid characters when extracting ZIP
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2024-04-05 23:31:18 +01:00
Trial97
3ddcadcdd1 Moved getPathNameInLocal8bit inside FileSystem namespace
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-04-04 18:01:24 +03:00
Trial97
8ecab305ac Moved the creation of natives folder in ExtractNatives task
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-04-04 13:49:27 +03:00
Trial97
450b73328e Fixed crash on non-latin instance name
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-04-03 19:34:35 +03:00
Alexandru Ionut Tripon
2012b2c243 Merge pull request #1977 from Trial97/resource_clear
Force clear the resource selection
2024-03-28 14:49:03 +02:00
Alexandru Ionut Tripon
b3abc052b5 Merge pull request #1529 from Trial97/portabledatadir
Added UserData as another posible path for portable builds
2024-03-28 14:48:34 +02:00
Alexandru Ionut Tripon
6b967d3f76 Merge pull request #1822 from Trial97/new_cats
Add random and slideshow modes to Catpacks
2024-03-28 14:48:18 +02:00
timoreo
e4742fdb3d Merge pull request #2221 from Trial97/fix_curseforge3
Set Forge version correctly when exporting to CurseForge
2024-03-28 09:41:11 +01:00
Tayou
0f178270be Merge pull request #1786 from Trial97/deps_improve
Make dependency checking more lax
2024-03-27 20:42:26 +01:00
Tayou
0e5727315b Merge pull request #2243 from Trial97/quick-play2
Allow joining servers to work on 1.20 take 2
2024-03-27 18:20:22 +01:00
Alexandru Ionut Tripon
e212c019a0 Merge pull request #2209 from chouzz/add-totalPlayTime-ftb-import
Add totalTimePlayed for FTBApp import
2024-03-27 16:20:21 +02:00
Alexandru Ionut Tripon
5117b21262 Merge pull request #1769 from Trial97/error_codes
added more microsoft error codes
2024-03-27 16:19:31 +02:00
Sefa Eyeoglu
5d72ee1c4f Merge pull request #1837 from Trial97/import_ok 2024-03-27 10:50:58 +01:00
Trial97
765bdf67c9 Changed the trait name
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-03-27 00:56:12 +02:00
Trial97
23bdccc91d Merge branch 'develop' of github.com:Trial97/PrismLauncher into quick-play 2024-03-26 23:58:56 +02:00
Alexandru Ionut Tripon
93f19bda6e Update launcher/minecraft/auth/steps/XboxAuthorizationStep.cpp
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
2024-03-21 00:07:06 +02:00
TheKodeToad
d72bd70c05 Use UTF-8 for ZIP creation
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2024-03-19 20:34:55 +00:00
Trial97
05487152fe Fixed curesforge export
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-03-17 20:53:26 +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
chouzz
92113e233a Add totalTimePlayed for FTBApp import
Signed-off-by: chouzz <zhouhua852@gmail.com>
2024-03-09 19:36:40 +08: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
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
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