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
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
f23a8e4b4b
Enable antialiasing for mod and pack icons
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2023-08-29 23:34:19 +01:00
Sefa Eyeoglu
fbf6833124
Merge pull request #1519 from TheKodeToad/better-export-pack
2023-08-28 10:29:32 +02: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
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
Sefa Eyeoglu
df14f88307
Merge pull request #1532 from Trial97/curseforge-url-handle
2023-08-27 12:26:57 +02: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
TheKodeToad
fff378b643
Merge pull request #1553 from TheKodeToad/list-fixes
...
A few boring list-related fixes
2023-08-21 15:33:16 +01:00
TheKodeToad
d7dadabfbf
List fixes
...
Double-click to toggle profile components.
Restore double-click to toggle resources.
Fix clicking on checkbox to select account.
Double-click to select account.
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2023-08-21 14:44:46 +01:00
Sefa Eyeoglu
5b4dcae7d9
Revert "feat: add toggle for quilt beacon"
...
This reverts commit 89aaedc06c
.
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2023-08-20 13:23:11 +02:00
Sefa Eyeoglu
963627fe98
Revert "chore: better explain quilt loader beacon"
...
This reverts commit a2a09ffe01
.
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2023-08-20 13:23:08 +02:00
TheKodeToad
f99b04bd16
Merge pull request #1320 from TheKodeToad/better-launch
...
Combine launch buttons in instance window, persist profiler
2023-08-19 11:08:02 +01:00
Sefa Eyeoglu
acf586ef82
chore: add fixme about UI code in Minecraftinstance
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2023-08-19 10:21:46 +02:00
Sefa Eyeoglu
3098aecf97
Merge pull request #1498 from Scrumplex/neoforge
2023-08-18 22:56:55 +02:00
Trial97
6d1c67663d
feat:added option to show playtime in hours
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2023-08-18 12:24:28 +03:00
Sefa Eyeoglu
e88418ab7f
Merge pull request #1392 from Scrumplex/feat-native-override
2023-08-17 16:09:16 +02:00
TheKodeToad
6da2e7d3f6
I was forced
...
/j
Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net>
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2023-08-17 10:12:38 +01:00
TheKodeToad
3e2733d840
Merge branch 'develop' into better-launch
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2023-08-16 22:23:38 +01: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
Sefa Eyeoglu
3a0aa353cc
feat: add NeoForge to ModLoaderType
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2023-08-15 11:06:13 +02:00
Sefa Eyeoglu
8f5bb982cd
Merge pull request #1513 from lumiscosity/fix/skin_transparency_bug
2023-08-15 10:54:07 +02:00
Sefa Eyeoglu
c2d6a137ab
fix: only add native library overrides if files exist
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2023-08-15 10:52:08 +02:00
Sefa Eyeoglu
4c446ccd50
fix: remove meta OpenAL workaround
...
LWJGL 2 doesn't have a separate zip for OpenAL. So there is no reason
for this code.
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2023-08-15 10:51:48 +02:00
Sefa Eyeoglu
83aa0062c7
feat: add custom native library path settings
...
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2023-08-15 10:51:21 +02:00
Sefa Eyeoglu
ff67fd10c3
feat: implement override for GLFW/OpenAL with split natives
...
Fixes PrismLauncher/PrismLauncher#513
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2023-08-15 10:50:38 +02: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
779f70057b
Merge commit 'ce2ca1381519a2e261d7f76dffa874d559d979c2' into staging
2023-08-14 18:16:13 +02:00