|
|
60234a550b
|
feat: auto install modpack & choise nickname
CodeQL Code Scanning / CodeQL (push) Has been cancelled
Build Application / Build Debug (push) Has been cancelled
Nix / Build (${{ matrix.system }}) (macos-13, x86_64-darwin) (push) Has been cancelled
Nix / Build (${{ matrix.system }}) (macos-14, aarch64-darwin) (push) Has been cancelled
Nix / Build (${{ matrix.system }}) (ubuntu-22.04, x86_64-linux) (push) Has been cancelled
Nix / Build (${{ matrix.system }}) (ubuntu-22.04-arm, aarch64-linux) (push) Has been cancelled
Update Flake Lockfile / update-flake (push) Has been cancelled
|
2025-04-15 11:13:45 +03:00 |
|
Evan Goode
|
48689d1b79
|
Merge remote-tracking branch 'upstream/release-9.x' into develop
|
2025-04-06 18:16:05 -05:00 |
|
Evan Goode
|
07dac3127a
|
Use api.feed-the-beast.com, not modpacks.ch
|
2025-02-25 22:25:17 -06: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
|
e177117a8f
|
Fix FTB import goof
|
2024-10-26 19:08:36 -04:00 |
|
Evan Goode
|
c32aaf244d
|
It compiles, Yggdrasil login working except error handling
|
2024-10-26 00:17:24 -04: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
|
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 |
|
Alexandru Ionut Tripon
|
78ceae9c17
|
Merge pull request #2887 from Trial97/filters_modpack
Add filters for modpack search
|
2024-10-12 00:07:14 +03:00 |
|
Trial97
|
df9f54454a
|
removed static functions
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-10-08 19:19:03 +03:00 |
|
TheKodeToad
|
d5990cca43
|
Disable retry for private pack fetch
This is already handled with a dialog asking whether you want it to be removed.
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
|
2024-10-06 13:51:36 +01: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
|
1b2e9b95e2
|
add prefix to non-standard packwiz fields
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-09-25 21:17:44 +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 |
|
Evan Goode
|
5e93cff2d0
|
clang-format
Signed-off-by: Evan Goode <mail@evangoo.de>
|
2024-08-11 22:06:38 -04: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 |
|
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 |
|
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
|
c07260e836
|
remove duplicate code from net folder
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-07-07 02:49:27 +03:00 |
|
Trial97
|
5d8d1c4b90
|
transform hashFile to lambda
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-07-04 16:47:27 +03:00 |
|
Trial97
|
1dd21a5e4a
|
fix crash with hash task
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-07-04 16:38:40 +03:00 |
|
Evan Goode
|
a7cf31fd95
|
Recognize neoforge as a modloader in FTB instances
Resolves https://github.com/unmojang/FjordLauncher/issues/17
|
2024-07-02 19:18:25 -04: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
|
0a95b57c0a
|
moved QEventLoops inside functions
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2024-06-28 20:51:28 +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
|
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
|
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 |
|
