ONIMAI-SMP/ShatteredPrism
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity
8,021 Commits 4 Branches 5 Tags 40 MiB
3f68b68691
Commit Graph

770 Commits

Author SHA1 Message Date
Trial97
a4978946d5
disabled lax deps 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-04 00:07:51 +02:00
Trial97
2b6d8b8a2d
updated tooltip messages 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-03 23:02:17 +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
Trial97
3cbc63bb9f
added size column 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-02 12:18:24 +02:00
Alexandru Ionut Tripon
60fd7f0ae6
Update launcher/minecraft/auth/steps/XboxAuthorizationStep.cpp 
Co-authored-by: Tayou <git@tayou.org>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
 2023-10-31 08:43:26 +02:00
Trial97
e42a2404a9
added more microsoft error codes 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-10-30 22:55:23 +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
69c2720872
Merge pull request #1691 from Trial97/no_color 
Add no_color env variable
 2023-10-28 18:02:53 +02:00
Tayou
df2a92d5f4
Merge pull request #1742 from TayouVR/fix-resourcepack-crash 
fix switch/case fallthrough in resource parse tasks
 2023-10-28 12:44:40 +02:00
LocalSpook
9d972ccc63 Localize account type in account list 
Signed-off-by: LocalSpook <56512186+LocalSpook@users.noreply.github.com>
 2023-10-26 13:32:33 -07:00
Sefa Eyeoglu
3719ea21b0
Merge pull request #1355 from TheKodeToad/env-vars 
Custom environment variables
 2023-10-26 22:10:26 +02:00
Trial97
12d567a9b8
made env vars behave like the rest of the settings 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-10-26 22:51:38 +03:00
Trial97
321bbf1fa8
fixed asan stuff 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-10-26 19:06:38 +03:00
Trial97
04acd27dab
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into concurrent 2023-10-26 13:45:47 +03:00
Trial97
8b8ea2d270
ensured that the variant is allways uppercase 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-10-26 13:37:25 +03:00
Trial97
44cdf3f697
Fixed skin variant 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-10-26 13:33:00 +03:00
Trial97
263dc5af67
Fixed remane and delete of selected skin 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-10-25 19:56:26 +03:00
Trial97
a5938a7de9
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into skin_selector 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-10-25 19:26:05 +03:00
LocalSpook
5be80df1ee Replace typedef with using 
Signed-off-by: LocalSpook <56512186+LocalSpook@users.noreply.github.com>
 2023-10-24 01:36:27 -07:00
Sefa Eyeoglu
b376888f43
Merge pull request #1515 from TheKodeToad/sysprops 2023-10-22 21:57:11 +02: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
Sefa Eyeoglu
db19362a97
feat: add launcher brand and version props 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-10-22 21:19:44 +02:00
Trial97
a748f49362
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into concurrent 2023-10-22 11:34:55 +03:00
Trial97
932cd9e262
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into skin_selector 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-10-22 11:32:05 +03:00
Trial97
d151e97e3a
Fixed some headers 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-10-21 22:40:37 +03:00
Trial97
35d62cc5f2
Updated dependencies 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-10-21 19:05:31 +03:00
Trial97
9aac8e389f
made release type visible 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-10-21 18:48:55 +03:00
Alexandru Ionut Tripon
2c4af7e793
Merge pull request #1290 from Trial97/refactor/NetActions 
Refactor ImgurUpload
 2023-10-21 12:32:16 +01:00
Trial97
5d926582c7
added Image column size hint 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-10-20 19:08:56 +03:00
Trial97
7b62d14683
fixed squished mod icons 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-10-20 17:15:12 +03:00
TheKodeToad
e9fd02baca
Fix code style 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-10-20 13:12:16 +01:00
TheKodeToad
cf33927f21
Merge remote-tracking branch 'upstream/develop' into sysprops 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-10-19 11:28:07 +01: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
Trial97
fea4c4eba8
Updated filters 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-10-18 09:00:45 +03:00
Trial97
b54376062e
Added mcVersion column 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-10-17 19:25:01 +03:00
Trial97
9001d9eb75
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into filters 2023-10-17 18:32:18 +03:00
Trial97
869f654a10
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into skin_selector 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-10-16 22:46:11 +03:00
TheKodeToad
cc990c4f94
Merge branch 'develop' into env-vars 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-10-15 21:57:20 +01:00
TheKodeToad
c4882e7162
Merge pull request #443 from TheKodeToad/skinfix 
Add legacy skin fix
 2023-10-15 21:46:29 +01:00
Trial97
ca9b593483
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into refactor/NetActions 2023-10-15 20:44:45 +03:00
Trial97
749975e8ef
made side and loaders visible to user 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-10-15 12:46:23 +03:00
Trial97
0b6373e4df
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into skin_selector 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-10-10 19:46:27 +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
Alexandru Ionut Tripon
6150908025
Merge pull request #1658 from Trial97/neoforge_version 
Added version check for neoforge filter
 2023-10-10 16:16:21 +01:00
Trial97
8d0a53273f
Add no_color env variable 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-10-06 18:42:54 +03:00
Alexandru Ionut Tripon
bca5e8f395
Update launcher/minecraft/PackProfile.cpp 
Co-authored-by: TheKodeToad <TheKodeToad@proton.me>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
 2023-10-06 16:16:03 +03:00
Trial97
e913f61305
added a more strict condition for neoforge forge support 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-10-04 19:29:37 +03:00
Tayou
024c474658
Merge pull request #1678 from Trial97/release_order 
fixed quilt dependencies
 2023-10-04 10:28:45 +02:00
Sefa Eyeoglu
03ad430699
Merge pull request #1537 from Trial97/warnings 2023-10-04 09:40:38 +02:00
Trial97
ac38585a2a
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into release_order 2023-10-04 09:41:49 +03:00
Trial97
3cba5adb5a
updated dependency cycle 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-10-04 09:41:40 +03:00
Sefa Eyeoglu
bfa9613373
Merge pull request #1657 from Trial97/shader_txt 2023-10-02 11:56:50 +02: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
eab1180f68
Merge pull request #1090 from Ryex/feat/acknowledge_release_type 2023-10-01 14:32:58 +02:00
Sefa Eyeoglu
e3a147f56d
Merge pull request #1656 from Trial97/remove_mojang2 2023-10-01 14:32:42 +02:00
Alexandru Ionut Tripon
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
Trial97
2e4fcd6aa3
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into skin_selector 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-09-28 23:26:15 +03:00
Trial97
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
Sefa Eyeoglu
531b58093e
Merge pull request #1263 from Trial97/develop 2023-09-28 22:03:14 +02:00
Sefa Eyeoglu
2ff9ef0620
Merge pull request #1363 from Trial97/download_threads 2023-09-28 22:02:57 +02:00
Trial97
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
seth
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
Trial97
4ee6a6711d
Added version check for neoforge filter 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-09-25 23:04:21 +03:00
Trial97
86b47b3421
Do not display invalid shaders 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-09-25 22:33:36 +03:00
Trial97
7c636d4608
Removed mojang 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-09-25 17:44:04 +03: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
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
Trial97
6ec1cf6e49
made skin upload more generic 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-09-08 19:50:46 +03:00
Trial97
8c8e4329d7
fix codeql 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-09-05 23:45:32 +03:00
Trial97
8bad255a91
added more import options 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-09-05 20:13:16 +03:00
Trial97
ab648e58ce
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into skin_selector 2023-09-05 00:18:45 +03:00
Trial97
c86b8b0f70
added skin manage dialog 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-09-05 00:18:36 +03: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
347228a246
Legacy settings override default -> false 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-09-02 22:29:26 +01:00
TheKodeToad
1213a5ab46
Merge remote-tracking branch 'upstream/develop' into skinfix 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-09-02 22:27:57 +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
Trial97
609eaa67ab
refactored skin apis 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-09-01 21:23:51 +03: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
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
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
TheKodeToad
d1566f2610
Merge branch 'develop' into env-vars 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-08-26 23:12:02 +01: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
Trial97
d25e89a4c1
refactor packwiz file write 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-20 00:48:46 +03: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
Trial97
ab6301d5a1
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into develop 2023-08-19 00:38:40 +03:00
Sefa Eyeoglu
3098aecf97
Merge pull request #1498 from Scrumplex/neoforge 2023-08-18 22:56:55 +02: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
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
Trial97
c5bac475e8
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into develop 2023-08-17 17:29:57 +03:00
Sefa Eyeoglu
e88418ab7f
Merge pull request #1392 from Scrumplex/feat-native-override 2023-08-17 16:09:16 +02:00
Trial97
4a1d85f999
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into develop 2023-08-17 14:23:37 +03: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
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
6c362afc21
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into refactor/NetActions 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-08-15 12:41:46 +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
TheKodeToad
6d070e8607
"Format" 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-08-12 21:50:02 +01:00
TheKodeToad
983c943eef
Merge branch 'develop' into quick-play 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-08-12 21:48:41 +01:00
TheKodeToad
5056a51c18
Improvements and refinements to pack export 
- Persist fields
- Toggle optional files

Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-08-12 21:20:51 +01:00
Alexandru Ionut Tripon
b3b2e9df35
Merge branch 'develop' into feat/acknowledge_release_type 
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
 2023-08-12 12:42:30 +03:00
Sefa Eyeoglu
73adac2501
fix: use QColorConstants in Qt 5.14+ 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2023-08-11 15:57:12 +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
TheKodeToad
f6d8c9659c
Rework 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-08-11 00:39:05 +01:00
TheKodeToad
e2d77f21ba
More system properties because yes!! 🎉 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-08-11 00:02:48 +01:00