Commit Graph

631 Commits

Author SHA1 Message Date
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
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
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
Trial97
d5fb9f0935
force aspect ratio for skin preview
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-06-15 10:21:21 +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
3db4f4dc2b
fix build
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-06-14 13:00:59 +03:00
Trial97
f60d0135f7
made login link to open browser
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-06-14 12:47:44 +03:00
Trial97
c35461b314
remove aspect ratio
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-06-14 11:23:14 +03:00
Trial97
014721ca10
remove unused import
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-06-14 11:19:54 +03:00
Trial97
712fbc3a4b
reverse login layout
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-06-14 11:15:40 +03:00
Trial97
6e8dc6ccc0
add mouse interaction on microsoft link
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-06-13 19:20:32 +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
2b229d7326
increase qr code size
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-06-13 00:20:16 +03:00
Trial97
80ea67f7cf
finish login dialog
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-06-13 00:00:08 +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
df142550fe
update Add account question
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-06-12 11:55:56 +03:00
Trial97
c4a65dd861
update login flow
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-06-12 00:34:39 +03:00
快乐的老鼠宝宝
1c1e296960
fix(SkinManageDialog.cpp): typo
Signed-off-by: 快乐的老鼠宝宝 <laoshubaby@protonmail.com>
2024-06-10 17:15:38 +08: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
1e0db46728
add a more verbose error message in case user skin import fails
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-06-09 21:29:56 +03:00
Trial97
04b2ac2efa
update fail url skin messagebox
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-06-09 20:48:49 +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
ZekeZ
39b8451130
Merge pull request #2383 from Trial97/scroll_new_instance
Made Custom New Instance scrollable
2024-06-07 16:37:21 +10:00