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
eab1180f68
Merge pull request #1090 from Ryex/feat/acknowledge_release_type
2023-10-01 14:32:58 +02:00
e3a147f56d
Merge pull request #1656 from Trial97/remove_mojang2
2023-10-01 14:32:42 +02:00
317c7b5544
Update launcher/minecraft/auth/AccountList.cpp
...
Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net >
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com >
2023-10-01 00:32:17 +03:00
4802f6950e
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feat/acknowledge_release_type
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-09-28 23:06:18 +03:00
531b58093e
Merge pull request #1263 from Trial97/develop
2023-09-28 22:03:14 +02:00
2ff9ef0620
Merge pull request #1363 from Trial97/download_threads
2023-09-28 22:02:57 +02:00
9acbf98f94
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feat/acknowledge_release_type
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-09-28 22:50:12 +03:00
f370f0d749
chore: cleanup a few more mentions of mojang accounts
...
Signed-off-by: seth <getchoo@tuta.io >
2023-09-27 05:34:48 -04:00
7c636d4608
Removed mojang
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-09-25 17:44:04 +03:00
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
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
0e41ceffc4
removed missed header
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-09-16 19:18:58 +03:00
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
e96d0b6caf
DCO Remediation Commit for cullvox <cullvox@outlook.com>
...
I, cullvox <cullvox@outlook.com >, hereby add my Signed-off-by to this commit: ee7016fa542e3ca92bdd691bd2e168d9d43a02c2
Signed-off-by: cullvox <cullvox@outlook.com >
2023-09-13 14:31:04 -04:00
e1dda6c005
DCO Remediation Commit for cullvox <cullvox@outlook.com>
...
I, cullvox <cullvox@outlook.com >, hereby add my Signed-off-by to this commit: ddf0c28b1b0b6617b0308405b4d5eefd20ff48b2
Signed-off-by: cullvox <cullvox@outlook.com >
2023-09-12 21:50:33 -04:00
ddf0c28b1b
clang-format fixes
2023-09-12 21:45:29 -04:00
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
df88ccd419
clean up and add review suggestions, links open
...
Signed-off-by: cullvox <cullvox@outlook.com >
2023-09-11 15:49:01 -04:00
b16085f66c
attempt to fix clang-format and ubuntu build.
...
Signed-off-by: cullvox <cullvox@outlook.com >
2023-09-11 02:05:05 -04:00
fbe4043651
fix formatting and add more proper errors.
...
Signed-off-by: cullvox <cullvox@outlook.com >
2023-09-11 01:34:53 -04:00
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
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
1261908ef7
remove space for clang-format
...
Signed-off-by: cullvox <cullvox@outlook.com >
2023-09-09 19:55:55 -04:00
ef1dc2afac
DCO Remediation Commit for cullvox <cullvox@outlook.com>
...
I, cullvox <cullvox@outlook.com >, hereby add my Signed-off-by to this commit: 05f4214cc5d3a9005c0d259ca185303792aa2fa7
Signed-off-by: cullvox <cullvox@outlook.com >
2023-09-09 19:50:59 -04:00
05f4214cc5
fix clang-format failing
2023-09-09 19:50:13 -04:00
04aa0155bf
DCO Remediation Commit for cullvox <cullvox@outlook.com>
...
I, cullvox <cullvox@outlook.com >, hereby add my Signed-off-by to this commit: d2e662ddbb518b147de76ca3f613e046d2912db5
Signed-off-by: cullvox <cullvox@outlook.com >
2023-09-09 19:45:30 -04:00
093d09efe3
fix style, and use qWarning instead of throw.
...
Signed-off-by: cullvox <cullvox@outlook.com >
2023-09-09 19:03:33 -04:00
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
d483b613b1
Merge pull request #1578 from TheKodeToad/antialiasing
2023-09-04 17:05:29 +02:00
546d49e183
Merge pull request #1530 from Trial97/metadata_delete
2023-09-04 17:02:52 +02:00
f23a8e4b4b
Enable antialiasing for mod and pack icons
...
Signed-off-by: TheKodeToad <TheKodeToad@proton.me >
2023-08-29 23:34:19 +01:00
fbf6833124
Merge pull request #1519 from TheKodeToad/better-export-pack
2023-08-28 10:29:32 +02:00
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
9110fbf282
Merge pull request #1560 from Trial97/curse_multiple_loaders2
...
Add suport for flame multiple loaders
2023-08-27 18:21:14 +01:00
e3b04d10cf
Merge pull request #1536 from Trial97/time3
...
Allow showing playtime in hours
2023-08-27 18:14:04 +01:00
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
df14f88307
Merge pull request #1532 from Trial97/curseforge-url-handle
2023-08-27 12:26:57 +02:00
abfd1a4205
minor dependency crash fix
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-08-25 18:35:25 +03:00
6178e5a975
reverted change for optional
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-08-23 13:55:38 +03:00
e6ba2f4970
Added loaders check on versions load
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-08-23 12:52:51 +03:00
4704c522e0
moved modloaderTypes to ModPlatform
...
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com >
2023-08-23 10:26:57 +03:00
fff378b643
Merge pull request #1553 from TheKodeToad/list-fixes
...
A few boring list-related fixes
2023-08-21 15:33:16 +01:00
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
5b4dcae7d9
Revert "feat: add toggle for quilt beacon"
...
This reverts commit 89aaedc06c3eb7a035d8be593a7bbe417cb2f712.
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2023-08-20 13:23:11 +02:00
963627fe98
Revert "chore: better explain quilt loader beacon"
...
This reverts commit a2a09ffe01fe8eb6cd1f557b0feb98ed0271151e.
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net >
2023-08-20 13:23:08 +02:00
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
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
ab6301d5a1
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into develop
2023-08-19 00:38:40 +03:00
3098aecf97
Merge pull request #1498 from Scrumplex/neoforge
2023-08-18 22:56:55 +02:00
