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

300 Commits

Author SHA1 Message Date
Alexandru Ionut Tripon
55b6490530
Merge pull request #1617 from cullvox/components-resource-pack-fix 
added functionality for components in resource pack descriptions.
 2024-06-09 16:03:19 +03:00
Trial97
ba947993c2
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into import_zip 2024-05-18 12:47:01 +03:00
Alexandru Ionut Tripon
c8ff768d64
Merge pull request #1827 from Trial97/shader 
fixed shader packs detection
 2024-05-18 12:02:13 +03:00
TheKodeToad
d2568333ed
Merge pull request #2048 from erikLundstedt/develop 
fix a minor spelling error in Mod.cpp
 2024-04-29 18:22:22 +01:00
Trial97
3a4f82ffd1
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into import_zip 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-04-24 00:21:39 +03:00
TheKodeToad
252406ba3e
Support neoforge.mods.toml 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2024-04-19 21:19:36 +01:00
Trial97
f6572c1244
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into shader 2024-03-27 18:55:34 +02:00
Trial97
031a9f4738
Replaced QFile::remove with FS::deletePath 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-02-10 11:03:51 +02:00
erik.lundstedt
30913fdb2b fix a minor spelling misstake in Mod.cpp 
closes https://github.com/PrismLauncher/PrismLauncher/issues/2047

Signed-off-by: erik.lundstedt <erik@lundstedt.it>
 2024-01-21 00:31:00 +01:00
Trial97
a7d293b3f2
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into deps_improve 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2024-01-10 09:17:52 +02:00
lumiscosity
8cbdecc454
Update GetModDependenciesTask.cpp 
Signed-off-by: lumiscosity <averyrudelphe@gmail.com>
 2023-12-16 12:52:59 +01:00
Trial97
463ff4c6ae
Removed assert permanantly 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-27 11:30:07 +02:00
Trial97
20e0cb43b9
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into concurrent 2023-11-23 23:58:47 +02:00
Trial97
3234bb5a8c
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into deps_improve 2023-11-23 17:05:37 +02:00
Trial97
2318a83881
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into shader 2023-11-23 16:33:57 +02:00
Sefa Eyeoglu
a2aa303770
Merge pull request #1843 from Trial97/fix_not_found_dep 2023-11-23 11:02:16 +01:00
Sefa Eyeoglu
a966289944
Merge pull request #1852 from Trial97/war_ning 2023-11-23 11:01:53 +01:00
Trial97
f18f7147b5
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into war_ning 2023-11-23 10:44:49 +02:00
Sefa Eyeoglu
b42434bcb6
Merge remote-tracking branch 'upstream/develop' into const-in-declarations 2023-11-23 09:06:23 +01:00
Trial97
890965746f
Added warning on mods update while running 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-15 11:07:46 +02:00
Trial97
361329d5d1
Made resource columns resizable 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-14 23:21:53 +02:00
Trial97
c05c001ab2
Remove the dep if it fails for any reason 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-13 23:49:49 +02:00
Trial97
463608b289
fixed shader packs detection 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-10 19:37:11 +02:00
TheKodeToad
baa988ec81
Merge pull request #1739 from Trial97/mod_icons 
fixed squished mod icons
 2023-11-06 20:49:05 +00:00
Trial97
a4978946d5
disabled lax deps 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-11-04 00:07:51 +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
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
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
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
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
Alexandru Ionut Tripon
4eb8db16f1
Merge pull request #1543 from Trial97/packwiz 
refactor packwiz file write
 2023-10-10 16:16:57 +01: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
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
86b47b3421
Do not display invalid shaders 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2023-09-25 22:33:36 +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