Mirrors/PrismLauncher
1
0
Fork 0
mirror of https://github.com/PrismLauncher/PrismLauncher.git synced 2025-06-02 16:09:39 +02:00
Code Issues Packages Projects Releases Wiki Activity
8,794 Commits 10 Branches 38 Tags
Commit Graph

4113 Commits

Author SHA1 Message Date
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
Trial97
89230c4f8a
Moved the export modlist out of the sub-menu 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-04-20 18:01:25 +03:00
Trial97
d88fb266a5
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into move_export2 2024-04-20 17:42:58 +03: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
DylanJOrr
77aead6470 Rename object name "userInterfaceTab" from "generalTab" 
The "User Interface" tab was innacurately named "General" which I just
went in and fixed.

This also renamed the object for respective vertical spacers.

Signed-off-by: SolidStateDj <solidstatedj@proton.me>
 2024-04-16 16:01:34 -04: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
ColonelGerdauf
a877f9146d
Change of parameters 
To help deal with adjustments

Signed-off-by: ColonelGerdauf <ColonelGerdauf@users.noreply.github.com>
 2024-04-07 16:53:53 -04:00
ColonelGerdauf
f91f97e56d
Renaming and removing redundancies 
old's do not make sense here

Signed-off-by: ColonelGerdauf <ColonelGerdauf@users.noreply.github.com>
 2024-04-07 16:49:39 -04: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
Trial97
1c3c9d2457
Added the new ftb settings path 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-04-07 13:48:34 +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
TheKodeToad
186a6d0c52
Make filters vertical 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2024-04-01 17:00:10 +01:00
TheKodeToad
71904b52c1
Make option groups plural 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2024-04-01 15:31:18 +01:00
TheKodeToad
71998cb7d9
Rework filter widget 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2024-04-01 15:22:27 +01:00
Trial97
a0eba1ace6
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into filters 2024-03-31 21:15:49 +03:00
Trial97
28cfd31269
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into disablemods 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-03-29 10:30:42 +02:00
Trial97
1930689a27
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into dependency_removal 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-03-29 10:12:02 +02:00
Trial97
81874f22f7
Fixed tar extract 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-03-29 00:10:59 +02: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
Trial97
f6572c1244
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into shader 2024-03-27 18:55:34 +02: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
Trial97
3c12e27226
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into filters 2024-03-23 23:53:25 +02:00
Trial97
c0754b80a2
Add resize to last column 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-03-22 22:17:58 +02:00
Trial97
0b87e4c03b
Fiexed codeql warning 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-03-22 12:29:15 +02:00
Trial97
a7029a9e53
Fixed qMin 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-03-21 20:01:40 +02:00
Trial97
3046822272
Fixed buid 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-03-21 19:53:52 +02:00
Trial97
1a6dfd04d6
Made tar.gz parser 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-03-21 19:46:57 +02:00
Trial97
ab7fc2e46c
Fixed archive java download 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-03-21 00:42:04 +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
Trial97
1c809f0fb1
Added more logs for auto java install 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-03-20 17:39:10 +02:00
Trial97
703470e57d
Hopefully fix codeql 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-03-20 08:24:40 +02:00