Trial97
|
817ff1ecbd
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into change_version
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-05-31 10:20:48 +03:00 |
|
Alexandru Ionut Tripon
|
2145f9f0ac
|
Merge pull request #1847 from Trial97/move_export2
Improvements to modlist export
|
2024-05-31 09:58:32 +03:00 |
|
Trial97
|
2635d7c3be
|
replaced grid with vertical layout on all add modpack pages
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-05-31 09:07:51 +03:00 |
|
Trial97
|
eaccdca02d
|
added error message for import skin from user
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-05-30 16:21:08 +03:00 |
|
Trial97
|
8704cd8402
|
remove duplicate proggress bar
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-05-30 11:49:09 +03:00 |
|
Trial97
|
7fed5e9173
|
Capitalize the mod categories
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-05-30 08:51:36 +03:00 |
|
Trial97
|
5e36def18b
|
remove search button
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-05-30 00:36:02 +03:00 |
|
Trial97
|
469f051e30
|
remove search button
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-05-30 00:14:37 +03:00 |
|
Tayou
|
b8fe93efa3
|
fix & clean ResourcePage.ui
Qt is cursed.
Signed-off-by: Tayou <git@tayou.org>
|
2024-05-29 20:00:36 +02:00 |
|
Trial97
|
29444cfe0f
|
fix win combobox take#2
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-05-29 17:19:15 +03:00 |
|
Trial97
|
660772d4d7
|
swap buttons
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-05-29 01:06:11 +03:00 |
|
Trial97
|
b256d325f7
|
fix win combobox
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-05-29 01:03:17 +03:00 |
|
Alexandru Ionut Tripon
|
f332503088
|
Apply suggestions from code review
Co-authored-by: Tayou <git@tayou.org>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
|
2024-05-29 00:32:17 +03:00 |
|
Trial97
|
5012178a98
|
trigger search on filter change
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-05-28 14:48:03 +03:00 |
|
Trial97
|
3f7847ad34
|
made ResourcePage elements resizable
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-05-28 14:47:44 +03:00 |
|
Trial97
|
694ea65457
|
disable retry dialog for logo fetching
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-05-26 11:13:01 +03:00 |
|
Trial97
|
7a200a337f
|
update retry netjob dialog
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-05-26 11:04:41 +03:00 |
|
Trial97
|
eacd7758e9
|
fix pre-commit hook
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-05-22 22:49:28 +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
|
7a42fb284a
|
reverse java version
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-05-20 18:33:40 +03:00 |
|
Trial97
|
0e239dfb2a
|
fix crash on first display with java downloader off
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-05-20 18:24:19 +03:00 |
|
Trial97
|
abb628edb3
|
remove OverrideJava
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-05-20 18:23:43 +03:00 |
|
Trial97
|
d9e2badf71
|
Rename timeout option
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-05-19 08:54:19 +03:00 |
|
Trial97
|
6078a771c1
|
add config for transfer timeout
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-05-18 21:46:05 +03:00 |
|
Trial97
|
5bd28e2cc8
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into filters
|
2024-05-18 17:11:41 +03:00 |
|
Trial97
|
83fdfe8091
|
fix regression
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-05-18 16:52:29 +03:00 |
|
Trial97
|
4d21f71ccf
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into refresh_cats
|
2024-05-18 16:34:21 +03:00 |
|
Trial97
|
c9c67ef79e
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into change_version
|
2024-05-18 15:27:02 +03:00 |
|
Trial97
|
d77d1f3be3
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into coremods
|
2024-05-18 14:44:33 +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
|
6aaf3a3ed4
|
Merge branch 'skin_selector' of github.com:Trial97/PrismLauncher into skin_selector
|
2024-05-18 11:57:06 +03:00 |
|
Trial97
|
2ac6efaa4a
|
Fix reggresion
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-05-18 11:56:43 +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
|
318819afc6
|
Made recommended button default
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-05-18 11:36:46 +03:00 |
|
Alexandru Ionut Tripon
|
0f2736306e
|
Update launcher/ui/dialogs/skins/SkinManageDialog.ui
Co-authored-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
|
2024-05-18 10:36:15 +03:00 |
|
Trial97
|
639c6e7f80
|
Add cancel to Add account dialog
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-05-17 00:49:00 +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 |
|
Alexandru Ionut Tripon
|
898ee67a07
|
Update launcher/ui/dialogs/MSALoginDialog.cpp
Co-authored-by: Tayou <git@tayou.org>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
|
2024-05-16 00:41:07 +03:00 |
|
Trial97
|
abedc6a23c
|
Improve login UI
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-05-15 17:25:15 +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 |
|
Alexandru Ionut Tripon
|
c703babda9
|
Merge pull request #2379 from kthchew/fix/blocked-desc
Improve blocked mods dialog (permissions prompt, misc. fixes) on macOS
|
2024-05-09 08:17:03 +03:00 |
|
Alexandru Ionut Tripon
|
7bcb1777a1
|
Merge pull request #2341 from Trial97/image_size
Fix image width in project description
|
2024-05-09 08:15:35 +03:00 |
|
Alexandru Ionut Tripon
|
a4142573ac
|
Merge pull request #2311 from SolidStateDj/gen->ui
Rename object name "userInterfaceTab" from "generalTab"
|
2024-05-09 08:15:15 +03:00 |
|
Kenneth Chew
|
e7c95c9ccb
|
Fix bug where watched directories are not clickable on macOS
Signed-off-by: Kenneth Chew <79120643+kthchew@users.noreply.github.com>
|
2024-05-07 18:57:04 -04:00 |
|