4036 Commits

Author SHA1 Message Date
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
Trial97
5f8269f5e1
Small class rename
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-03-20 00:29:46 +02:00
Trial97
09c2c6793b
Improve UI
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-03-20 00:15:02 +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
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
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
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
41d52dc347
Remove dependencies if review mods is rejected
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-02-29 00:06:28 +02:00
Trial97
27e76d0dcb
Removed static path
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-02-27 17:11:19 +02: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
Trial97
344398f238
Updated ftb app import instance detection
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-02-26 21:20:14 +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