Trial97
|
c886111e18
|
format the code
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-07-06 09:09:54 +03:00 |
|
Trial97
|
0f311453e1
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feature/java-downloader
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-06-30 22:54:23 +03:00 |
|
Rachel Powers
|
8488d11c69
|
review suggestions + spelling
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
|
2024-06-29 20:34:10 -07:00 |
|
Trial97
|
492c78a570
|
format the code
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-06-29 20:34:10 -07:00 |
|
Rachel Powers
|
c4cc1cfe4f
|
Warn about known conflicting modloaders
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
|
2024-06-29 20:34:10 -07:00 |
|
Rachel Powers
|
4ed92a95c2
|
fix segfaults consistently set component problems
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
|
2024-06-29 20:34:09 -07:00 |
|
Rachel Powers
|
a85d6cb1f2
|
move resolution into update actions in task.
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
|
2024-06-29 20:34:09 -07:00 |
|
Trial97
|
474effe7c7
|
clang-format
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-06-29 20:34:09 -07:00 |
|
Rachel Powers
|
a94a081b9c
|
add better profile logging properly resolve important dependencies
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
|
2024-06-29 20:34:08 -07:00 |
|
Rachel Powers
|
ce280c2d04
|
fix misepellings
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
|
2024-06-29 20:34:08 -07:00 |
|
Rachel Powers
|
a791e22853
|
fix(instance components): resolve instance componants when changing minecraft version
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
|
2024-06-29 20:34:08 -07:00 |
|
Trial97
|
06add2b0a8
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into update_filters
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-06-28 20:55:16 +03:00 |
|
Trial97
|
cf220356b1
|
fixed panic with recursive eventloop
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-06-28 20:51:28 +03:00 |
|
Trial97
|
0a95b57c0a
|
moved QEventLoops inside functions
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-06-28 20:51:28 +03:00 |
|
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
|
72dd3dfba5
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into metadata2
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-06-28 20:30:05 +03:00 |
|
Trial97
|
09d258670a
|
create mod meta information when importing curseforge pack
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-06-28 19:26:11 +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 |
|