Commit Graph

4392 Commits

Author SHA1 Message Date
cullvox 1261908ef7 remove space for clang-format
Signed-off-by: cullvox <cullvox@outlook.com>
2023-09-09 19:55:55 -04:00
cullvox ef1dc2afac DCO Remediation Commit for cullvox <cullvox@outlook.com>
I, cullvox <cullvox@outlook.com>, hereby add my Signed-off-by to this commit: 05f4214cc5

Signed-off-by: cullvox <cullvox@outlook.com>
2023-09-09 19:50:59 -04:00
cullvox 05f4214cc5 fix clang-format failing 2023-09-09 19:50:13 -04:00
cullvox 04aa0155bf DCO Remediation Commit for cullvox <cullvox@outlook.com>
I, cullvox <cullvox@outlook.com>, hereby add my Signed-off-by to this commit: d2e662ddbb

Signed-off-by: cullvox <cullvox@outlook.com>
2023-09-09 19:45:30 -04:00
cullvox 093d09efe3 fix style, and use qWarning instead of throw.
Signed-off-by: cullvox <cullvox@outlook.com>
2023-09-09 19:03:33 -04:00
cullvox d2e662ddbb added support for components in resource pack descriptions.
Signed-off-by: Caden Miller <me@cadenmiller.dev>
2023-09-09 12:35:34 -04:00
Trial97 6ec1cf6e49 made skin upload more generic
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-09-08 19:50:46 +03:00
Trial97 8c8e4329d7 fix codeql
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-09-05 23:45:32 +03:00
Trial97 8bad255a91 added more import options
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-09-05 20:13:16 +03:00
Trial97 ab648e58ce Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into skin_selector 2023-09-05 00:18:45 +03:00
Trial97 c86b8b0f70 added skin manage dialog
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-09-05 00:18:36 +03:00
Sefa Eyeoglu d483b613b1 Merge pull request #1578 from TheKodeToad/antialiasing 2023-09-04 17:05:29 +02:00
Sefa Eyeoglu 546d49e183 Merge pull request #1530 from Trial97/metadata_delete 2023-09-04 17:02:52 +02:00
TheKodeToad 94c1cd6bcf CurseForge shader downloading
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2023-09-04 14:15:37 +01:00
TheKodeToad 347228a246 Legacy settings override default -> false
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2023-09-02 22:29:26 +01:00
TheKodeToad 1213a5ab46 Merge remote-tracking branch 'upstream/develop' into skinfix
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2023-09-02 22:27:57 +01:00
TheKodeToad 179abfa03e Resource provider column
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2023-09-01 22:05:44 +01:00
Trial97 9ad029e028 added skins directory
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-09-01 23:10:33 +03:00
Trial97 abbac5c26c Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into fail_concurrent_task
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-09-01 22:28:59 +03:00
Trial97 17f696bffc small tweaks to atl icons
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-09-01 22:25:15 +03:00
Trial97 e095780cc3 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into modrinth_pack
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-09-01 21:36:28 +03:00
Trial97 609eaa67ab refactored skin apis
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-09-01 21:23:51 +03:00
TheKodeToad ad16d61208 Resource metadata writing
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2023-09-01 17:42:05 +01:00
Trial97 30ff417074 fix: make cached instead of file for ftb pack import
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-09-01 16:25:49 +03:00
TheKodeToad 6aecbfc38f Fix crashes
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2023-09-01 12:50:20 +01:00
TheKodeToad ee48766996 More generalistaion for ResourceFolderModels
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2023-09-01 00:27:05 +01:00
Trial97 c2b03d0f71 Fully reload the instance list once the folder is changed
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-08-31 20:35:56 +03:00
TheKodeToad 93876e27f8 Generalise resource metadata
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2023-08-31 17:54:22 +01:00
TheKodeToad 25ce11d85d Merge pull request #1539 from Trial97/refactor_modpack_ux
Improvements to modpack UX
2023-08-31 14:58:54 +01:00
TheKodeToad befa3baa6a Merge branch 'develop' into feat/launcher-updater
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2023-08-30 11:47:33 +01:00
TheKodeToad f23a8e4b4b Enable antialiasing for mod and pack icons
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2023-08-29 23:34:19 +01:00
TheKodeToad 8c30cb3706 Fix CI
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2023-08-29 13:27:06 +01:00
TheKodeToad c1855c6ce3 Merge branch 'develop' into rename-groups
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2023-08-29 12:41:40 +01:00
TheKodeToad 0e67686295 Hide index folder in pack export dialog
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2023-08-28 17:25:07 +01:00
TheKodeToad e98bca4749 Fix cancelling pack save
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2023-08-28 17:09:40 +01:00
Trial97 211865a1e1 handle gracefully the upload abort
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-08-28 13:31:19 +03:00
Sefa Eyeoglu fbf6833124 Merge pull request #1519 from TheKodeToad/better-export-pack 2023-08-28 10:29:32 +02:00
Trial97 5d70f4dbca removed if
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-08-28 08:50:10 +03:00
Trial97 07d8598638 added catpacks tests
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-08-27 23:40:32 +03:00
Trial97 79652799bd Made text smaller
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-08-27 21:30:46 +03:00
Trial97 630145a1d0 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into welcome_background 2023-08-27 21:03:21 +03:00
Trial97 0680d2dceb Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into develop
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-08-27 20:41:56 +03:00
TheKodeToad 9110fbf282 Merge pull request #1560 from Trial97/curse_multiple_loaders2
Add suport for flame multiple loaders
2023-08-27 18:21:14 +01:00
TheKodeToad e3b04d10cf Merge pull request #1536 from Trial97/time3
Allow showing playtime in hours
2023-08-27 18:14:04 +01:00
Trial97 8c607ae734 removed extra if
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-08-27 20:02:12 +03:00
Trial97 c5aac24a93 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into curse_multiple_loaders2
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-08-27 15:53:35 +03:00
Trial97 4036cecfc0 Added progress widget to some modpack providers
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-08-27 15:04:42 +03:00
Sefa Eyeoglu df14f88307 Merge pull request #1532 from Trial97/curseforge-url-handle 2023-08-27 12:26:57 +02:00
TheKodeToad 479335dfe0 Rewrite optional mod dialog
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2023-08-27 00:50:33 +01:00
TheKodeToad d1566f2610 Merge branch 'develop' into env-vars
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2023-08-26 23:12:02 +01:00