Evan Goode
|
48689d1b79
|
Merge remote-tracking branch 'upstream/release-9.x' into develop
|
2025-04-06 18:16:05 -05:00 |
|
Evan Goode
|
491cb1e5a2
|
Merge remote-tracking branch 'prismlauncher/release-9.x' into develop
|
2025-01-12 12:46:48 -06:00 |
|
Luna
|
41e90afbab
|
Revert "Merge in Changes from Prism 9.2"
This reverts commit b4b9051793.
|
2025-01-11 14:19:46 -06:00 |
|
Luna
|
b4b9051793
|
Merge in Changes from Prism 9.2
|
2025-01-11 13:58:12 -06:00 |
|
Rachel Powers
|
09c9da268f
|
fix: prevent inf recursion when mod icon load fails; cut max pixmapcache to 1/4 previous value
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
|
2024-10-11 13:26:20 -07:00 |
|
Trial97
|
2c0b17d107
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into metadata2
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-07-24 11:40:23 +03:00 |
|
Alexandru Ionut Tripon
|
69c55d90ce
|
Merge pull request #2558 from Trial97/update_filters
Resolve issue with multiple loaders during mod update
|
2024-07-19 15:46:15 +03:00 |
|
Trial97
|
ddf1ea014c
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into fix_duplicate_mod
|
2024-06-28 20:39:37 +03:00 |
|
Trial97
|
09d258670a
|
create mod meta information when importing curseforge pack
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-06-28 19:26:11 +03:00 |
|
Trial97
|
00b83efb9a
|
fix build
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-06-24 20:12:40 +03:00 |
|
Trial97
|
d2510b851b
|
mark files as duplicate
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-06-14 22:45:15 +03:00 |
|
Trial97
|
2d51008304
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into fix_duplicate_mod
|
2024-06-14 21:05:11 +03:00 |
|
Trial97
|
6a99312df5
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into filters
|
2024-06-09 19:57:16 +03:00 |
|
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
|
5bd28e2cc8
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into filters
|
2024-05-18 17:11:41 +03:00 |
|
Trial97
|
e42dfbc391
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into fix_duplicate_mod
|
2024-05-18 17:02:10 +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 |
|
Trial97
|
e07e182e95
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into filters
|
2024-04-24 23:51:43 +03:00 |
|
TheKodeToad
|
252406ba3e
|
Support neoforge.mods.toml
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
|
2024-04-19 21:19:36 +01:00 |
|
Trial97
|
a0eba1ace6
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into filters
|
2024-03-31 21:15:49 +03:00 |
|
Trial97
|
f6572c1244
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into shader
|
2024-03-27 18:55:34 +02:00 |
|
Trial97
|
3c12e27226
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into filters
|
2024-03-23 23:53:25 +02: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
|
763eab6b96
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into filters
|
2023-12-13 14:48:31 +02:00 |
|
Trial97
|
20e0cb43b9
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into concurrent
|
2023-11-23 23:58:47 +02:00 |
|
Trial97
|
2db5677281
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into filters
|
2023-11-23 23:57:44 +02:00 |
|
Trial97
|
e0d776e551
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into fix_duplicate_mod
|
2023-11-23 23:29:10 +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 |
|
Trial97
|
2bfb5fc138
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into filters
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-11-17 22:26:17 +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 |
|
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 |
|
Trial97
|
60a7628dbb
|
delete duplicate mods
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-10-26 20:43:26 +03: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
|
35d62cc5f2
|
Updated dependencies
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-10-21 19:05:31 +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 |
|
Trial97
|
fea4c4eba8
|
Updated filters
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-10-18 09:00:45 +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 |
|
Trial97
|
3cba5adb5a
|
updated dependency cycle
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-10-04 09:41:40 +03: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 |
|
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 |
|