Commit Graph

322 Commits

Author SHA1 Message Date
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
Trial97
ac13579b99
fix heap-use-after-free in modrinth creation task
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-10-14 11:10:54 +03:00
Alexandru Ionut Tripon
0b624a43d6
Merge pull request #2908 from Trial97/remove_client
remove client overrides instead of double deleting the normal ones
2024-10-12 00:49:57 +03:00
Trial97
97f4ead0fb
remove client overrides instead of double deleting the normal ones
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-10-12 00:19:54 +03:00
Trial97
df9f54454a
removed static functions
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-10-08 19:19:03 +03:00
Trial97
859fac604b
add modrinth modpack filter
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-10-04 17:06:47 +03:00
Trial97
dfe3cd849d
add curseforge modpack filter
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-10-02 01:06:45 +03:00
Trial97
0eefa52dbc
fix some transtaions warnings
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-10-01 08:51:06 +03:00
Trial97
1243328876
fix folder duplication for modrinth
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-09-20 16:53:36 +03:00
Trial97
e34ebc1a0d
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into metadata2 2024-09-13 21:14:48 +03:00
TheKodeToad
ff9fa6aa4f
Stop accepting malformed hashes object
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
2024-08-25 11:45:45 +01:00
Trial97
465c9498d4
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into metadata2
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-08-25 09:50:41 +03:00
Rachel Powers
5f874330d5
security(modrinth) reorder hash algo priority, prefer stronger hashes.
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
2024-08-24 20:24:35 -07:00
Trial97
2a86ceb5d6
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into metadata2 2024-08-23 08:34:15 +03:00
Trial97
38b5ee198a
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into validate_metadata 2024-08-18 22:39:46 +03:00
Trial97
fe23e76714
fix codeql
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-08-05 12:04:08 +03:00
Trial97
af65eb17cf
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into metadata2
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-08-05 11:54:58 +03:00
Trial97
d5c5f5d4fc
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into disablemods
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-07-24 11:47:45 +03: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
Trial97
91d03b34ac
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into validate_metadata 2024-07-21 02:24:30 +03:00
Trial97
06add2b0a8
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into update_filters
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-06-28 20:55:16 +03:00
Trial97
2af6902b42
validate metadata on launch
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-06-28 20:51:26 +03:00
Trial97
55f740453c
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into disablemods 2024-06-28 20:34:59 +03:00
Trial97
72dd3dfba5
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into metadata2
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-06-28 20:30:05 +03:00
Trial97
1021222c95
create mod meta information when importing modrinth pack
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-06-28 20:28:52 +03:00
Trial97
147741e616
increment clang-tools version
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-06-28 12:48:52 +03:00
Trial97
00b83efb9a
fix build
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-06-24 20:12:40 +03:00
Trial97
e57c2180da
Resolve issue with multiple loaders during update
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-06-24 03:06:10 +03:00
Trial97
766ddc80e3
refactored hassing task
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-06-18 16:51:26 +03:00
Trial97
98f8bc526d
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into filters 2024-06-15 10:21:53 +03:00
Alexandru Ionut Tripon
7d418a32e7
Merge pull request #2425 from Trial97/win_char
improve invalid path name
2024-06-10 12:11:21 +03:00
Trial97
6607c3bfa4
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into disablemods
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-06-10 09:04:09 +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
0e996270b7
Merge pull request #2055 from Trial97/show_minecraft_version_modrinth
Display minecraft version if not mentioned for modrinth/curse packs
2024-06-09 15:59:24 +03:00
Trial97
a7a1b28765
improve invalid path name
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-05-30 13:49:23 +03:00
Trial97
5a598db608
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into disablemods 2024-05-18 17:40:54 +03:00
Trial97
5bd28e2cc8
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into filters 2024-05-18 17:11:41 +03:00
Trial97
ba947993c2
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into import_zip 2024-05-18 12:47:01 +03:00
Trial97
3336f8107c
Removed AuthRequest and NetAction
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-05-14 00:21:45 +03:00
Trial97
30ce8ecb5f
Fixed imports
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-04-30 23:20:24 +03:00
Trial97
5400c24c73
Ensure valid file names for resource names
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-04-30 23:04:50 +03:00
Trial97
e068120375
Fix invalid characters filename download on windows
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-04-30 22:56:40 +03:00
Trial97
a5b059ebad
Fixed curseforge export
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-04-29 00:27:15 +03:00
Trial97
e07e182e95
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into filters 2024-04-24 23:51:43 +03: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
Trial97
8121a6536b
Fixed pack update
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-04-12 23:45:31 +03:00
Trial97
28cfd31269
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into disablemods
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
2024-03-29 10:30:42 +02:00
Trial97
3c12e27226
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into filters 2024-03-23 23:53:25 +02:00