Commit Graph

163 Commits

Author SHA1 Message Date
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 c8ff768d64 Merge pull request #1827 from Trial97/shader
fixed shader packs detection
2024-05-18 12:02:13 +03:00
TheKodeToad 252406ba3e Support neoforge.mods.toml
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2024-04-19 21:19:36 +01:00
Trial97 f6572c1244 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into shader 2024-03-27 18:55:34 +02:00
Trial97 a7d293b3f2 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into deps_improve
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-01-10 09:17:52 +02:00
lumiscosity 8cbdecc454 Update GetModDependenciesTask.cpp
Signed-off-by: lumiscosity <averyrudelphe@gmail.com>
2023-12-16 12:52:59 +01:00
Trial97 20e0cb43b9 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into concurrent 2023-11-23 23:58:47 +02:00
Trial97 3234bb5a8c Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into deps_improve 2023-11-23 17:05:37 +02:00
Trial97 2318a83881 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into shader 2023-11-23 16:33:57 +02:00
Sefa Eyeoglu a2aa303770 Merge pull request #1843 from Trial97/fix_not_found_dep 2023-11-23 11:02:16 +01:00
Trial97 c05c001ab2 Remove the dep if it fails for any reason
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-11-13 23:49:49 +02:00
Trial97 463608b289 fixed shader packs detection
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-11-10 19:37:11 +02:00
Trial97 a4978946d5 disabled lax deps
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-11-04 00:07:51 +02:00
Trial97 4081c51573 made dependency check more lax
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-11-02 23:52:12 +02:00
LocalSpook 0de4d8902e Remove top-level const qualifiers in function declarations
Signed-off-by: LocalSpook <56512186+LocalSpook@users.noreply.github.com>
2023-10-28 22:12:09 -07:00
Tayou 0fe3241df6 remove now unneeded Q_ASSERTs
Signed-off-by: Tayou <git@tayou.org>
2023-10-22 21:25:06 +02:00
Tayou 7d5206818b fix switch/case fallthrough
Signed-off-by: Tayou <git@tayou.org>
2023-10-22 21:25:00 +02:00
Trial97 30f73a0696 Merge branch 'fail_concurrent_task' of github.com:Trial97/PrismLauncher into concurrent
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-10-18 18:08:31 +03:00
Alexandru Ionut Tripon 4eb8db16f1 Merge pull request #1543 from Trial97/packwiz
refactor packwiz file write
2023-10-10 16:16:57 +01:00
Trial97 3cba5adb5a updated dependency cycle
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-10-04 09:41:40 +03:00
cullvox 87f34f07d7 Merge branch 'develop' into components-resource-pack-fix
Signed-off-by: cullvox <68567525+cadenmiller@users.noreply.github.com>
2023-10-01 11:58:44 -04:00
Sefa Eyeoglu 531b58093e Merge pull request #1263 from Trial97/develop 2023-09-28 22:03:14 +02:00
alexia 1684cff7ac Update links to Minecraft Wiki
Minecraft Wiki has officially moved from Fandom to their own wiki.
I updated some links I found in comments.

Signed-off-by: alexia <me@alexia.lol>
2023-09-25 15:49:12 +02:00
Alexandru Ionut Tripon 81a3ba18bc Update launcher/minecraft/mod/tasks/GetModDependenciesTask.cpp
Co-authored-by: TheKodeToad <TheKodeToad@proton.me>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
2023-09-20 18:45:23 +03:00
Trial97 0e41ceffc4 removed missed header
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-09-16 19:18:58 +03:00
Trial97 01e98a6ce8 simplify the raw json parsing
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>

Fixed Tests

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-09-16 19:12:09 +03:00
cullvox e96d0b6caf DCO Remediation Commit for cullvox <cullvox@outlook.com>
I, cullvox <cullvox@outlook.com>, hereby add my Signed-off-by to this commit: ee7016fa54

Signed-off-by: cullvox <cullvox@outlook.com>
2023-09-13 14:31:04 -04:00
cullvox e1dda6c005 DCO Remediation Commit for cullvox <cullvox@outlook.com>
I, cullvox <cullvox@outlook.com>, hereby add my Signed-off-by to this commit: ddf0c28b1b

Signed-off-by: cullvox <cullvox@outlook.com>
2023-09-12 21:50:33 -04:00
cullvox ddf0c28b1b clang-format fixes 2023-09-12 21:45:29 -04:00
cullvox a4e6530513 added tests, fixed issues with overriding/format
In the documentation it states that child values can override the parent
values. Originally this code did not support that but now it does. Also
added in testing inspired by the previous tests.

Signed-off-by: cullvox <cullvox@outlook.com>
2023-09-12 21:34:42 -04:00
cullvox df88ccd419 clean up and add review suggestions, links open
Signed-off-by: cullvox <cullvox@outlook.com>
2023-09-11 15:49:01 -04:00
cullvox b16085f66c attempt to fix clang-format and ubuntu build.
Signed-off-by: cullvox <cullvox@outlook.com>
2023-09-11 02:05:05 -04:00
cullvox fbe4043651 fix formatting and add more proper errors.
Signed-off-by: cullvox <cullvox@outlook.com>
2023-09-11 01:34:53 -04:00
cullvox 58bd6d929f added formatting with colors.
This is somewhat dirty implementation and I will clean it up soon.
Using the HTML rich text features of Qt, made it much easier to
understand what was needed.

Signed-off-by: cullvox <cullvox@outlook.com>
2023-09-10 23:37:26 -04:00
Trial97 9445a555e4 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into packwiz
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-09-10 16:24:59 +03:00
cullvox 7a7c3015f4 fix not properly reading json text.
The text now displays properly in the GUI of Prism.

Signed-off-by: cullvox <cullvox@outlook.com>
2023-09-09 20:25:49 -04:00
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 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 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
Trial97 abfd1a4205 minor dependency crash fix
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-08-25 18:35:25 +03:00
Trial97 6178e5a975 reverted change for optional
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-08-23 13:55:38 +03:00
Trial97 e6ba2f4970 Added loaders check on versions load
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-08-23 12:52:51 +03:00
Trial97 4704c522e0 moved modloaderTypes to ModPlatform
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-08-23 10:26:57 +03:00
Trial97 d25e89a4c1 refactor packwiz file write
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-08-20 00:48:46 +03:00
Trial97 4a1d85f999 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into develop 2023-08-17 14:23:37 +03:00