Trial97
|
c04031ff00
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into fix_retry_dialog
|
2024-06-23 23:40:12 +03: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
|
bbf52e3549
|
renamed dialog and button action
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-06-16 01:59:50 +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
|
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
|
cfdf4a9e1f
|
Merge branch 'develop' of github.com:Trial97/PrismLauncher into feature/java-downloader
|
2024-06-14 22:50:20 +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 |
|
Alexandru Ionut Tripon
|
93a0277479
|
Merge pull request #2450 from Trial97/remove_search
remove search button
|
2024-06-10 10:56:54 +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
|
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 |
|
Alexandru Ionut Tripon
|
95e7f36732
|
Merge pull request #2054 from Trial97/add_configurable_updater_interval
Made updater interval configurable
|
2024-06-10 09:22:54 +03:00 |
|
Trial97
|
e63f25c9e4
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into fix_retry_dialog
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-06-10 09:01:01 +03:00 |
|
Alexandru Ionut Tripon
|
dc39698c48
|
Merge pull request #1609 from Trial97/skin_selector
Skin management
|
2024-06-10 08:43:37 +03:00 |
|
Alexandru Ionut Tripon
|
154f4811c0
|
Merge pull request #2166 from Trial97/ftb2
Updated ftb app import instance detection
|
2024-06-10 00:45:22 +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 |
|
Alexandru Ionut Tripon
|
0e996270b7
|
Merge pull request #2055 from Trial97/show_minecraft_version_modrinth
Display minecraft version if not mentioned for modrinth/curse packs
|
2024-06-09 15:59:24 +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 |
|
Trial97
|
45463dcd75
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into import_zip
|
2024-06-04 11:04:02 +03:00 |
|
TheKodeToad
|
a70aeeea2b
|
Merge branch 'develop' into list-image-append-fix
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
|
2024-06-01 15:20:21 +01:00 |
|
Trial97
|
c9c39b8203
|
fix double borders
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-05-31 17:47:39 +03:00 |
|
Trial97
|
f7120a4f6f
|
Made Custom New Instance scrollable
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-05-31 16:46:46 +03:00 |
|
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
|
8704cd8402
|
remove duplicate proggress bar
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-05-30 11:49:09 +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
|
660772d4d7
|
swap buttons
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-05-29 01:06:11 +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
|
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
|
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 |
|