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 |
|
Evan Goode
|
7dbaa896a6
|
Merge tag '9.0' into develop
This is an intermediate/halfway commit, more refactoring is needed to
get this to build.
|
2024-10-25 15:34:57 -04: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
|
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 |
|
Evan Goode
|
5e93cff2d0
|
clang-format
Signed-off-by: Evan Goode <mail@evangoo.de>
|
2024-08-11 22:06:38 -04: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 |
|
Alexandru Ionut Tripon
|
9d684dcb82
|
Merge pull request #2617 from Trial97/clean_net
remove duplicate code from net folder
|
2024-08-05 10:56:40 +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
|
63a380a039
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into clean_net
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-07-22 22:06:09 +03:00 |
|
Trial97
|
91d03b34ac
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into validate_metadata
|
2024-07-21 02:24:30 +03:00 |
|
Alexandru Ionut Tripon
|
0041d2a126
|
Merge pull request #2440 from Trial97/fix_retry_dialog
update retry netjob dialog
|
2024-07-19 15:47:12 +03:00 |
|
Trial97
|
c07260e836
|
remove duplicate code from net folder
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-07-07 02:49:27 +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
|
515baffb8e
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into fix_retry_dialog
|
2024-06-28 20:48:28 +03:00 |
|
Trial97
|
55f740453c
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into disablemods
|
2024-06-28 20:34:59 +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
|
147741e616
|
increment clang-tools version
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-06-28 12:48:52 +03:00 |
|
Trial97
|
73db320bff
|
fix missing curseforge logo
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-06-24 21:13:21 +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
|
c04031ff00
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into fix_retry_dialog
|
2024-06-23 23:40:12 +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 |
|
Trial97
|
8984cd5f66
|
improve invalid path name
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit a7a1b28765)
|
2024-06-10 09:11:36 +00: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
|
e63f25c9e4
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into fix_retry_dialog
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-06-10 09:01:01 +03:00 |
|
Trial97
|
6a99312df5
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into filters
|
2024-06-09 19:57:16 +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
|
e94243f99b
|
fix blocked mods api
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-05-30 09:56:55 +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
|
7caed93d2c
|
Fixed imports
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 30ce8ecb5f)
|
2024-05-09 05:16:33 +00:00 |
|
Trial97
|
c0706b30ee
|
Ensure valid file names for resource names
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 5400c24c73)
|
2024-05-09 05:16:33 +00:00 |
|
Trial97
|
a57a21af3b
|
Fix invalid characters filename download on windows
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit e068120375)
|
2024-05-09 05:16:33 +00: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
|
119ee7a5b4
|
Fixed curseforge export
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit a5b059ebad)
|
2024-04-29 16:30:17 +00:00 |
|
Trial97
|
a5b059ebad
|
Fixed curseforge export
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-04-29 00:27:15 +03:00 |
|