Trial97
|
06e1cab41f
|
force online in case the offline load failed
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-06-28 20:51:28 +03:00 |
|
Trial97
|
2af6902b42
|
validate metadata on launch
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-06-28 20:51:26 +03:00 |
|
Trial97
|
4f8b20437f
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into auth3
|
2024-06-28 20:49:37 +03:00 |
|
Trial97
|
4ad19cded5
|
format
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-06-28 20:45:54 +03:00 |
|
Trial97
|
0b79abcdcd
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feature/java-downloader
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-06-28 20:45:30 +03:00 |
|
Trial97
|
ddf1ea014c
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into fix_duplicate_mod
|
2024-06-28 20:39:37 +03:00 |
|
Trial97
|
55f740453c
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into disablemods
|
2024-06-28 20:34:59 +03:00 |
|
Trial97
|
147741e616
|
increment clang-tools version
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-06-28 12:48:52 +03:00 |
|
Trial97
|
9d7c36c2fc
|
made identty certain if the login ended
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-06-27 15:35:44 +03:00 |
|
seth
|
3f3351f89e
|
Merge pull request #1892 from Trial97/change_version
Added mod reinstall dialog
|
2024-06-27 02:12:00 +00:00 |
|
Trial97
|
7c38edc93d
|
Apply suggestion from code review
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-06-25 16:10:05 +03:00 |
|
Alexandru Ionut Tripon
|
555c4a7c59
|
Apply suggestions from code review
Co-authored-by: seth <getchoo@tuta.io>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
|
2024-06-25 15:33:11 +03:00 |
|
Alexandru Ionut Tripon
|
4e9e7212a6
|
Apply suggestions from code review
Co-authored-by: seth <getchoo@tuta.io>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
|
2024-06-25 15:22:30 +03:00 |
|
Alexandru Ionut Tripon
|
1fcad8d427
|
Merge pull request #1886 from Trial97/time4
Fixed playtime recording
|
2024-06-24 23:07:41 +03:00 |
|
Trial97
|
00b83efb9a
|
fix build
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-06-24 20:12:40 +03:00 |
|
Trial97
|
e57c2180da
|
Resolve issue with multiple loaders during update
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-06-24 03:06:10 +03:00 |
|
Trial97
|
2ac89c2378
|
add more states for account refresh fail
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-06-23 01:49:37 +03:00 |
|
Trial97
|
b0386a4c2f
|
added better error handling
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-06-23 00:47:48 +03:00 |
|
Trial97
|
24aa337a64
|
fixed offline accounts
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-06-23 00:27:49 +03:00 |
|
Trial97
|
27ee8374e7
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into auth3
|
2024-06-22 22:54:38 +03:00 |
|
Alexandru Ionut Tripon
|
8014283bf4
|
Merge pull request #2536 from Trial97/refactor_hash
Refactor hash task
|
2024-06-18 22:55:32 +03:00 |
|
Alexandru Ionut Tripon
|
5f3d3c3294
|
Merge pull request #2534 from DioEgizio/dataresourceupdate
fix: update datapack and resourcepack versions
|
2024-06-18 21:06:31 +03:00 |
|
DioEgizio
|
a63842c727
|
fix: add more datapack formats and clang-format it
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
|
2024-06-18 18:05:34 +02:00 |
|
Trial97
|
766ddc80e3
|
refactored hassing task
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-06-18 16:51:26 +03:00 |
|
DioEgizio
|
c07e791d7f
|
chore: clang-format ResourcePack.cpp
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
|
2024-06-18 10:17:48 +02:00 |
|
DioEgizio
|
6af52c97c2
|
fix: update datapack and resourcepack versions
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
|
2024-06-18 09:47:07 +02:00 |
|
Cart
|
c9827f8085
|
Spelling mistake
in m_column_names and translated it is Miecraft and not Minecraft
Signed-off-by: Cart <81428538+Cartrigger@users.noreply.github.com>
|
2024-06-17 23:12:07 -04:00 |
|
Trial97
|
2fb3e12492
|
fix auto java install
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-06-16 17:54:13 +03:00 |
|
Trial97
|
d0584684f2
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feature/java-downloader
|
2024-06-16 01:17:01 +03:00 |
|
Trial97
|
5fbbdb9707
|
fix merge issues
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-06-16 00:31:31 +03:00 |
|
Trial97
|
f1d1c9e22c
|
forget sort keys
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-06-15 11:06:20 +03:00 |
|
Trial97
|
a121bfbb15
|
add size back to texture view
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-06-15 10:43:21 +03:00 |
|
Trial97
|
98f8bc526d
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into filters
|
2024-06-15 10:21:53 +03:00 |
|
Trial97
|
8cdaf5d05f
|
fix tests
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-06-14 23:27:27 +03:00 |
|
Trial97
|
cfdf4a9e1f
|
Merge branch 'develop' of github.com:Trial97/PrismLauncher into feature/java-downloader
|
2024-06-14 22:50:20 +03:00 |
|
Trial97
|
1a84dc9bca
|
no need for extra exist check
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-06-14 22:47:42 +03:00 |
|
Trial97
|
b872f88617
|
do not double rename
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-06-14 22:46:39 +03:00 |
|
Trial97
|
d2510b851b
|
mark files as duplicate
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-06-14 22:45:15 +03:00 |
|
Trial97
|
2d51008304
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into fix_duplicate_mod
|
2024-06-14 21:05:11 +03:00 |
|
Alexandru Ionut Tripon
|
3c4eed13a3
|
Merge pull request #1829 from Trial97/demo
Fixed demo mode
|
2024-06-14 18:41:02 +03:00 |
|
Trial97
|
9d16557328
|
simplify constructor
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-06-14 16:40:27 +03:00 |
|
Trial97
|
863ebe421c
|
randomize server port
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-06-14 16:38:41 +03:00 |
|
Trial97
|
52490743b4
|
revert desktop file creation
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-06-14 14:16:23 +03:00 |
|
Trial97
|
164d31dcb1
|
fix win build take#2
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-06-14 13:09:22 +03:00 |
|
Trial97
|
3db4f4dc2b
|
fix build
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-06-14 13:00:59 +03:00 |
|
Trial97
|
8db0b5f421
|
Register mime-type on the fly
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-06-14 12:48:37 +03:00 |
|
Trial97
|
712fbc3a4b
|
reverse login layout
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-06-14 11:15:40 +03:00 |
|
Trial97
|
7fdc65eda8
|
add tooltip to url button
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-06-13 08:51:11 +03:00 |
|
Trial97
|
5f5296ef5e
|
update ui once again
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-06-12 19:34:19 +03:00 |
|
Trial97
|
bbbe7c879e
|
update callback
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-06-12 12:35:02 +03:00 |
|
Trial97
|
c4a65dd861
|
update login flow
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-06-12 00:34:39 +03:00 |
|
Alexandru Ionut Tripon
|
7d418a32e7
|
Merge pull request #2425 from Trial97/win_char
improve invalid path name
|
2024-06-10 12:11:21 +03:00 |
|
Trial97
|
2ffabbdc6d
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into filters
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-06-10 10:00:52 +03:00 |
|
Trial97
|
11ae169087
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feature/java-downloader
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-06-10 09:34:48 +03:00 |
|
Trial97
|
6607c3bfa4
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into disablemods
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-06-10 09:04:09 +03:00 |
|
Trial97
|
3f0fa54fe8
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into retry_auth
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-06-10 09:03:04 +03:00 |
|
Alexandru Ionut Tripon
|
dc39698c48
|
Merge pull request #1609 from Trial97/skin_selector
Skin management
|
2024-06-10 08:43:37 +03:00 |
|
Trial97
|
29d32f0d9a
|
Update size order for folders
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-06-10 00:18:21 +03:00 |
|
Trial97
|
242ddbb7e1
|
fix size column sorting
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-06-09 23:53:40 +03:00 |
|
Trial97
|
34e1a5e660
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into resource_size
|
2024-06-09 22:18:40 +03:00 |
|
Trial97
|
689b76885c
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into skin_selector
|
2024-06-09 20:13:09 +03:00 |
|
Trial97
|
6a99312df5
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into filters
|
2024-06-09 19:57:16 +03:00 |
|
Trial97
|
ca369ac2b0
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feature/java-downloader
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-06-09 19:52:37 +03:00 |
|
Alexandru Ionut Tripon
|
55b6490530
|
Merge pull request #1617 from cullvox/components-resource-pack-fix
added functionality for components in resource pack descriptions.
|
2024-06-09 16:03:19 +03:00 |
|
Trial97
|
45463dcd75
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into import_zip
|
2024-06-04 11:04:02 +03:00 |
|
Trial97
|
a7a1b28765
|
improve invalid path name
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-05-30 13:49:23 +03:00 |
|
Trial97
|
2b949a8059
|
improve login account checking
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-05-22 10:53:24 +03:00 |
|
Trial97
|
abb628edb3
|
remove OverrideJava
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-05-20 18:23:43 +03:00 |
|
Trial97
|
1b0e8260ac
|
fix zero launch time
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-05-19 15:36:39 +03:00 |
|
Trial97
|
76a656a017
|
retry auth step on fail
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-05-18 22:44:17 +03:00 |
|
Trial97
|
5a598db608
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into disablemods
|
2024-05-18 17:40:54 +03:00 |
|
Trial97
|
5bd28e2cc8
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into filters
|
2024-05-18 17:11:41 +03:00 |
|
Trial97
|
e42dfbc391
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into fix_duplicate_mod
|
2024-05-18 17:02:10 +03:00 |
|
Trial97
|
477d1408ad
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into resource_size
|
2024-05-18 16:53:14 +03:00 |
|
Trial97
|
31d0cad377
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into demo
|
2024-05-18 16:24:22 +03:00 |
|
Trial97
|
7a5348a179
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feature/java-downloader
|
2024-05-18 14:14:31 +03:00 |
|
Trial97
|
633489884d
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into skin_selector
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-05-18 13:27:31 +03:00 |
|
Trial97
|
ba947993c2
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into import_zip
|
2024-05-18 12:47:01 +03:00 |
|
Tayou
|
acd23ff163
|
Merge pull request #2402 from Trial97/refactor_auth
Improve Microsoft login
|
2024-05-18 11:07:16 +02:00 |
|
Alexandru Ionut Tripon
|
c8ff768d64
|
Merge pull request #1827 from Trial97/shader
fixed shader packs detection
|
2024-05-18 12:02:13 +03:00 |
|
Trial97
|
23134d4b72
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into skin_selector
|
2024-05-18 11:38:18 +03:00 |
|
Trial97
|
75a457ebfa
|
Add custom page to land after microsoft login
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-05-17 00:31:04 +03:00 |
|
Trial97
|
ce09f06bda
|
Fix CI3
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-05-16 22:16:42 +03:00 |
|
Trial97
|
09c0c11033
|
Add back device code flow
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-05-16 21:58:25 +03:00 |
|
Trial97
|
2a58fb0ac5
|
Remove cobrandid
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-05-16 17:31:25 +03:00 |
|
Trial97
|
abedc6a23c
|
Improve login UI
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-05-15 17:25:15 +03:00 |
|
Trial97
|
849c3faeb4
|
Fix CI
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-05-15 14:07:03 +03:00 |
|
Trial97
|
80d8e3ee06
|
Remove katabasis
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-05-15 12:53:06 +03:00 |
|
Trial97
|
e285a85fe8
|
Removed AccountTask
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-05-14 00:21:51 +03:00 |
|
Trial97
|
3336f8107c
|
Removed AuthRequest and NetAction
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-05-14 00:21:45 +03:00 |
|
TheKodeToad
|
d2568333ed
|
Merge pull request #2048 from erikLundstedt/develop
fix a minor spelling error in Mod.cpp
|
2024-04-29 18:22:22 +01:00 |
|
Trial97
|
e07e182e95
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into filters
|
2024-04-24 23:51:43 +03:00 |
|
Trial97
|
3a4f82ffd1
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into import_zip
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-04-24 00:21:39 +03:00 |
|
TheKodeToad
|
252406ba3e
|
Support neoforge.mods.toml
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
|
2024-04-19 21:19:36 +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 |
|
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 |
|
Tayou
|
0f178270be
|
Merge pull request #1786 from Trial97/deps_improve
Make dependency checking more lax
|
2024-03-27 20:42:26 +01:00 |
|