Commit Graph

1868 Commits

Author SHA1 Message Date
147741e616 increment clang-tools version
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-06-28 12:48:52 +03:00
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
3f3351f89e Merge pull request #1892 from Trial97/change_version
Added mod reinstall dialog
2024-06-27 02:12:00 +00:00
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
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
92b9f1a3e3 Merge pull request #2515 from Trial97/size_for_skin
force aspect ratio for skin preview
2024-06-22 19:21:59 -04:00
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
766ddc80e3 refactored hassing task
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-06-18 16:51:26 +03:00
5fbbdb9707 fix merge issues
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-06-16 00:31:31 +03:00
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
98f8bc526d Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into filters 2024-06-15 10:21:53 +03:00
d5fb9f0935 force aspect ratio for skin preview
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-06-15 10:21:21 +03:00
3c4eed13a3 Merge pull request #1829 from Trial97/demo
Fixed demo mode
2024-06-14 18:41:02 +03:00
1c1e296960 fix(SkinManageDialog.cpp): typo
Signed-off-by: 快乐的老鼠宝宝 <laoshubaby@protonmail.com>
2024-06-10 17:15:38 +08:00
93a0277479 Merge pull request #2450 from Trial97/remove_search
remove search button
2024-06-10 10:56:54 +03:00
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
95e7f36732 Merge pull request #2054 from Trial97/add_configurable_updater_interval
Made updater interval configurable
2024-06-10 09:22:54 +03:00
dc39698c48 Merge pull request #1609 from Trial97/skin_selector
Skin management
2024-06-10 08:43:37 +03:00
154f4811c0 Merge pull request #2166 from Trial97/ftb2
Updated ftb app import instance detection
2024-06-10 00:45:22 +03:00
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
04b2ac2efa update fail url skin messagebox
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-06-09 20:48:49 +03:00
689b76885c Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into skin_selector 2024-06-09 20:13:09 +03:00
6a99312df5 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into filters 2024-06-09 19:57:16 +03:00
9560f9ed98 Merge pull request #2474 from coolguy1842/develop
simple fix for resizing too small causing an index out of range crash
2024-06-09 16:10:57 +03:00
55b6490530 Merge pull request #1617 from cullvox/components-resource-pack-fix
added functionality for components in resource pack descriptions.
2024-06-09 16:03:19 +03:00
7e5db651fd Merge pull request #1823 from Trial97/refresh_cats
Added button to refresh themes and catpacks
2024-06-09 16:02:26 +03:00
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
39b8451130 Merge pull request #2383 from Trial97/scroll_new_instance
Made Custom New Instance scrollable
2024-06-07 16:37:21 +10:00
71b2c4b1fd fix formatting
Signed-off-by: coolguy1842 <kian.goslett@protonmail.com>
2024-06-06 16:32:49 +10:00
448ded2387 simple fix for resizing too small causing an index out of range crash
Signed-off-by: coolguy1842 <coolguy1842.deport391@passfwd.com>
2024-06-06 16:18:47 +10:00
45463dcd75 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into import_zip 2024-06-04 11:04:02 +03:00
a70aeeea2b Merge branch 'develop' into list-image-append-fix
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2024-06-01 15:20:21 +01:00
83883cadf9 fix qt5 build
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-05-31 19:30:10 +03:00
f350918186 force initial size for the Add Instance dialog
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-05-31 19:03:40 +03:00
c9c39b8203 fix double borders
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-05-31 17:47:39 +03:00
f7120a4f6f Made Custom New Instance scrollable
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-05-31 16:46:46 +03:00
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
2145f9f0ac Merge pull request #1847 from Trial97/move_export2
Improvements to modlist export
2024-05-31 09:58:32 +03:00
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
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
8704cd8402 remove duplicate proggress bar
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-05-30 11:49:09 +03:00
7fed5e9173 Capitalize the mod categories
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-05-30 08:51:36 +03:00
5e36def18b remove search button
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-05-30 00:36:02 +03:00
469f051e30 remove search button
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-05-30 00:14:37 +03:00
b8fe93efa3 fix & clean ResourcePage.ui
Qt is cursed.

Signed-off-by: Tayou <git@tayou.org>
2024-05-29 20:00:36 +02:00
29444cfe0f fix win combobox take#2
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-05-29 17:19:15 +03:00
660772d4d7 swap buttons
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-05-29 01:06:11 +03:00
b256d325f7 fix win combobox
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-05-29 01:03:17 +03:00
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
5012178a98 trigger search on filter change
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-05-28 14:48:03 +03:00