Evan Goode
|
491cb1e5a2
|
Merge remote-tracking branch 'prismlauncher/release-9.x' into develop
|
2025-01-12 12:46:48 -06:00 |
|
Luna
|
41e90afbab
|
Revert "Merge in Changes from Prism 9.2"
This reverts commit b4b9051793.
|
2025-01-11 14:19:46 -06:00 |
|
Luna
|
b4b9051793
|
Merge in Changes from Prism 9.2
|
2025-01-11 13:58:12 -06:00 |
|
Luna
|
2921db3e19
|
Add Pseurae to in-launcher Contributors list, revert readme changes
|
2024-10-29 19:44:51 -05:00 |
|
Luna
|
1b95061bcf
|
Adjust branding to that of ShatteredPrism
|
2024-10-29 03:29:24 -05:00 |
|
Evan Goode
|
da9c085a06
|
Clean up some lingering differences from upstream
|
2024-10-26 17:52:25 -04:00 |
|
Evan Goode
|
7f52d57454
|
Fix MSA login
|
2024-10-26 14:56:55 -04:00 |
|
Evan Goode
|
d40b6d8eb3
|
Error handling for Yggdrasil accounts
|
2024-10-26 13:40:09 -04:00 |
|
Evan Goode
|
c32aaf244d
|
It compiles, Yggdrasil login working except error handling
|
2024-10-26 00:17:24 -04:00 |
|
Evan Goode
|
7dbaa896a6
|
Merge tag '9.0' into develop
This is an intermediate/halfway commit, more refactoring is needed to
get this to build.
|
2024-10-25 15:34:57 -04:00 |
|
ZekeZ
|
3ac080806d
|
Merge pull request #2831 from Trial97/fix_login
split the auth loading screen
|
2024-10-21 00:14:36 +10:00 |
|
Rachel Powers
|
a108b5b420
|
fix: ensure all connections to the ProgressDialogs's Task the dialog made are dissconnected
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
|
2024-10-14 00:45:45 -07:00 |
|
timoreo
|
62f19a6ac9
|
Merge pull request #2863 from Trial97/fix_resource_search_equal
|
2024-10-01 11:41:11 +02:00 |
|
timoreo
|
c57e26cf57
|
Merge pull request #2874 from Trial97/modpack_equal
|
2024-10-01 11:40:42 +02:00 |
|
Trial97
|
946e791d39
|
sync modpack search field
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-10-01 08:53:27 +03:00 |
|
Trial97
|
5ea2dece54
|
fix search term not remaining the same between providers on resource download
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-10-01 08:52:07 +03:00 |
|
Trial97
|
0eefa52dbc
|
fix some transtaions warnings
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-10-01 08:51:06 +03:00 |
|
Trial97
|
b676a67b3c
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into fix_login
|
2024-10-01 08:49:03 +03:00 |
|
Trial97
|
580fc32518
|
split the auth loading screen
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-09-16 16:41:16 +03:00 |
|
Trial97
|
d2f0d1d8d5
|
Wrap FS::write in try catch
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-09-16 12:42:09 +03:00 |
|
Trial97
|
d38e7fa142
|
Add more null protection for skin management
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-09-16 12:41:33 +03:00 |
|
Trial97
|
92495494ca
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feature/java-downloader
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-08-23 08:16:59 +03:00 |
|
Trial97
|
002fc71b8d
|
allways load java list on autodetect
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-08-20 01:18:37 +03:00 |
|
Trial97
|
b5bbe93775
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feature/java-downloader
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-08-17 00:20:40 +03:00 |
|
Evan Goode
|
5e93cff2d0
|
clang-format
Signed-off-by: Evan Goode <mail@evangoo.de>
|
2024-08-11 22:06:38 -04:00 |
|
Trial97
|
63a380a039
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into clean_net
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-07-22 22:06:09 +03:00 |
|
Trial97
|
29a6db171f
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feature/java-downloader
|
2024-07-22 08:57:31 +03:00 |
|
Alexandru Ionut Tripon
|
69c55d90ce
|
Merge pull request #2558 from Trial97/update_filters
Resolve issue with multiple loaders during mod update
|
2024-07-19 15:46:15 +03:00 |
|
Trial97
|
c07260e836
|
remove duplicate code from net folder
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-07-07 02:49:27 +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 |
|
Alexandru Ionut Tripon
|
7ff173d72a
|
Merge pull request #2173 from Trial97/dependency_removal
Remove dependencies if review mods is rejected
|
2024-06-30 22:21:38 +03:00 |
|
Trial97
|
f1a4a1e8ee
|
increase 'or' font size for login dialog
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-06-29 08:41:35 +03: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
|
4f8b20437f
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into auth3
|
2024-06-28 20:49:37 +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
|
147741e616
|
increment clang-tools version
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-06-28 12:48:52 +03:00 |
|
Alexandru Ionut Tripon
|
68292aff6c
|
Merge pull request #2574 from ajerick/develop
fix non-persistent user icon selection in NewInstanceDialog.cpp
|
2024-06-27 08:38:46 +03:00 |
|
seth
|
3f3351f89e
|
Merge pull request #1892 from Trial97/change_version
Added mod reinstall dialog
|
2024-06-27 02:12:00 +00:00 |
|
Aiden J Erickson
|
37388e1d48
|
fix non-persistent user icon selection in NewInstanceDialog.cpp
Signed-off-by: Aiden J Erickson <aiden.j.erickson@gmail.com>
|
2024-06-26 20:54:04 -04:00 |
|
Trial97
|
2f88da9de2
|
add warnning when user closes the resource download dialog with selection
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-06-25 09:50:33 +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 |
|
Evan Goode
|
51da756e19
|
Merge remote-tracking branch 'prismlauncher/release-8.x' into develop
|
2024-06-23 11:34:11 -04:00 |
|
seth
|
92b9f1a3e3
|
Merge pull request #2515 from Trial97/size_for_skin
force aspect ratio for skin preview
|
2024-06-22 19:21:59 -04:00 |
|
Trial97
|
27ee8374e7
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into auth3
|
2024-06-22 22:54:38 +03:00 |
|
Tayou
|
178bd4a9c3
|
don't tr() file types on file save/open, etc. dialogs
Signed-off-by: Tayou <git@tayou.org>
|
2024-06-22 17:28:59 +02:00 |
|
Trial97
|
766ddc80e3
|
refactored hassing task
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-06-18 16:51:26 +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
|
c01f3107a4
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into change_version
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-06-16 00:18:11 +03:00 |
|
Trial97
|
98f8bc526d
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into filters
|
2024-06-15 10:21:53 +03:00 |
|