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 |
|
seth
|
3f3351f89e
|
Merge pull request #1892 from Trial97/change_version
Added mod reinstall dialog
|
2024-06-27 02:12:00 +00:00 |
|
Alexandru Ionut Tripon
|
1fcad8d427
|
Merge pull request #1886 from Trial97/time4
Fixed playtime recording
|
2024-06-24 23:07:41 +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
|
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 |
|
Alexandru Ionut Tripon
|
3c4eed13a3
|
Merge pull request #1829 from Trial97/demo
Fixed demo mode
|
2024-06-14 18:41:02 +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
|
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 |
|
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 |
|
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
|
1b0e8260ac
|
fix zero launch time
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-05-19 15:36:39 +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
|
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
|
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 |
|