Mirrors/PrismLauncher
1
0
Fork 0
mirror of https://github.com/PrismLauncher/PrismLauncher.git synced 2025-06-10 20:35:43 +02:00
Code Issues Packages Projects Releases Wiki Activity
9,509 Commits 9 Branches 38 Tags
a6c93d66d407ea3cc595ba01d1b67e42b9f754d7
Commit Graph

414 Commits

Author SHA1 Message Date
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
Trial97
47d1f23568 added side for modrinth mods 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-09-10 16:22:57 +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
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
179abfa03e Resource provider column 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-09-01 22:05:44 +01: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
TheKodeToad
ad16d61208 Resource metadata writing 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-09-01 17:42:05 +01: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
TheKodeToad
93876e27f8 Generalise resource metadata 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-08-31 17:54:22 +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
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
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
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
d3acac16e6 added -Wno-gnu-zero-variadic-macro-arguments and fixed more warnings 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-18 13:10:13 +03:00
Trial97
4a1d85f999 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into develop 2023-08-17 14:23:37 +03:00
Trial97
bad44ea264 feat:added flame install mod metadata 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-17 00:14:49 +03:00
Trial97
f919d363b7 made safe for vegetarians 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-16 20:02:32 +03:00
Trial97
589d8b6923 feat:Added remove metadata button 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-16 19:53:39 +03:00
Trial97
c41c39b5d8 cleanup the mod name checking 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-15 23:55:09 +03:00
Trial97
f7f7bc6865 Removed update disabled warning 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-15 20:52:17 +03:00
Trial97
42a6c670c7 Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into fail_concurrent_task 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-15 12:52:59 +03:00
Trial97
cf27d2f9ab Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into download_threads 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-15 12:49:21 +03:00
Trial97
9546c77113 Some warnings 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-15 00:52:34 +03:00
Sefa Eyeoglu
215d7dbb74 chore: update license headers 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-08-14 18:17:05 +02:00
Sefa Eyeoglu
91ba4cf75e chore: reformat 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-08-14 18:16:53 +02:00
Sefa Eyeoglu
ea43d0f687 fix: fix more warnings 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-08-11 10:57:57 +02:00
Sefa Eyeoglu
ef6f9487f4 Merge remote-tracking branch 'upstream/staging' into chore/add-compiler-warnings 2023-08-10 20:38:32 +02:00