CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,926 Commits 10 Branches 30 Tags 34 MiB
ddf0c28b1b
Commit Graph

123 Commits

Author SHA1 Message Date
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
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
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
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
Rachel Powers
b9fe37aec1
Merge branch 'develop' into chore/add-compiler-warnings 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-07-30 15:33:46 -07:00
Trial97
1e82cb6a7c
fix: add support for QByteArray inifile 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-07-26 23:56:01 +03:00
seth
3099a70edc
Merge pull request #1335 from Ryex/fix/gh-1322-old-zip-mods-in-wrong-place 
fix(flame install): don't assume .zip is a resource pack. default to mod
 2023-07-14 00:16:43 -04:00
Rachel Powers
cde85947c7
Update launcher/minecraft/mod/tasks/LocalResourceParse.cpp 
Co-authored-by: seth <getchoo@tuta.io>
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-07-13 21:12:12 -07:00
Rachel Powers
520594e529
Merge branch 'develop' into chore/add-compiler-warnings 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-07-13 20:05:16 -07:00
Rachel Powers
e704072892
fix(flame install): don't assume .zip is a resource pack. default to mod 
let identifier move it if needed

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-07-08 13:38:00 -07:00
TheKodeToad
0c6362f28d Make trash hungry 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-07-08 18:51:28 +01:00
Rachel Powers
8d7dcdfc5b
chore: fix shadowed member and signed/unsigned mismatch 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>

chore: supress unused with [[maybe_unused]]

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>

chore: unshadow ^&^& static_cast implicit return

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>

chore: deshadow and mark unused in parse task

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>

chore: mark unused in folder models

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>

chore: deshadow and mark unused with instances

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>

chore: more deshadow and unused

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>

chore: remove uneeded simicolons

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>

chore: mark unused

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>

chore: prevent shadow

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-07-01 23:39:38 -07:00
Rachel Powers
2a5d291bd9
fix: toml without exceptions usage 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-07-01 17:03:11 -07:00
Trial97
8b576fd2bd
Added translation 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-24 15:59:55 +03:00
Trial97
69c709b05a
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into develop 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-23 20:01:17 +03:00
Trial97
3e3be9ae6f
Added fallback for quilt if the API or Kotilin is not present 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-20 13:28:57 +03:00
Trial97
b62e4c0cc7
Fixed build 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-19 21:32:19 +03:00
Trial97
f6f0fbbd9f
Fixed removeIf 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-19 21:23:48 +03:00
Trial97
c13a90540c
Added overide for Quilt/Fabric 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-19 21:20:35 +03:00
Trial97
6fd729e285
Fixed regresion regarding modrinth project_id in dependence array 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-19 17:42:16 +03:00
Trial97
8ad9692daa
Changed qWarning to qDebug for raw data 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-19 14:10:29 +03:00
Trial97
1bdde1f947
Small fixes 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-06-19 00:36:37 +03:00
Trial97
b4dff181f7
Fixed Ptr logic 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-05-28 18:22:55 +03:00
Trial97
94cd831e8d
Made sure the metadata is valid when checking mod deps 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-05-14 22:13:53 +03:00
Rachel Powers
74e7c13a17 feat: display license and issue tracker 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-05-05 13:46:38 -07:00
Rachel Powers
2fe3dc5960 fix: fix qchar conversion and codeql 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-05-05 11:13:36 -07:00
Rachel Powers
ed185f047f feat(resourcePackPage): icon column 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-05-04 23:46:00 -07:00
Rachel Powers
d384d991fa feat(texturepackPage): icon column 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-05-04 23:45:24 -07:00
Rachel Powers
ec157b766e feat(mod parsing): load extra mod details 
- (image, license, issuetracker)

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-05-04 23:42:42 -07:00
Trial97
107b470289
Updated required_by as dependency 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-05-04 23:54:46 +03:00
Trial97
f7b912fc9d
Fixed comments 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-05-04 22:25:05 +03:00
Trial97
9fbec3793f
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into develop 2023-05-04 20:29:33 +03:00
Rachel Powers
788fa40c2a refactor: Move ini to use QSettings && drop get/setList functions 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
 2023-04-29 19:55:24 -07:00
Trial97
ffaa47bf54
Small cleanup 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-04-21 18:42:06 +03:00
Trial97
c1490cd627
Refator task to work with multiple providers 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-04-21 18:42:06 +03:00