Commit Graph

1852 Commits

Author SHA1 Message Date
Trial97 98f8bc526d Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into filters 2024-06-15 10:21:53 +03:00
Alexandru Ionut Tripon 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
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
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
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 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
Alexandru Ionut Tripon 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
Alexandru Ionut Tripon 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
Alexandru Ionut Tripon 7e5db651fd Merge pull request #1823 from Trial97/refresh_cats
Added button to refresh themes and catpacks
2024-06-09 16:02:26 +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
coolguy1842 71b2c4b1fd fix formatting
Signed-off-by: coolguy1842 <kian.goslett@protonmail.com>
2024-06-06 16:32:49 +10:00
coolguy1842 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
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 83883cadf9 fix qt5 build
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-05-31 19:30:10 +03:00
Trial97 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
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
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 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 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 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