Trial97
|
47d1f23568
|
added side for modrinth mods
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-09-10 16:22:57 +03:00 |
|
TheKodeToad
|
94c1cd6bcf
|
CurseForge shader downloading
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
|
2023-09-04 14:15:37 +01:00 |
|
fn2006
|
be1d2a6070
|
Merge remote-tracking branch 'upstream/develop' into develop
|
2023-09-04 00:45:11 +01:00 |
|
fn2006
|
b6904ba50a
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into develop
|
2023-09-04 00:39:20 +01:00 |
|
Trial97
|
17f696bffc
|
small tweaks to atl icons
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-09-01 22:25:15 +03:00 |
|
Trial97
|
e095780cc3
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into modrinth_pack
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-09-01 21:36:28 +03:00 |
|
Trial97
|
30ff417074
|
fix: make cached instead of file for ftb pack import
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-09-01 16:25:49 +03:00 |
|
TheKodeToad
|
25ce11d85d
|
Merge pull request #1539 from Trial97/refactor_modpack_ux
Improvements to modpack UX
|
2023-08-31 14:58:54 +01:00 |
|
TheKodeToad
|
befa3baa6a
|
Merge branch 'develop' into feat/launcher-updater
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
|
2023-08-30 11:47:33 +01:00 |
|
Sefa Eyeoglu
|
fbf6833124
|
Merge pull request #1519 from TheKodeToad/better-export-pack
|
2023-08-28 10:29:32 +02:00 |
|
Trial97
|
5d70f4dbca
|
removed if
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-08-28 08:50:10 +03:00 |
|
Trial97
|
0680d2dceb
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into develop
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-08-27 20:41:56 +03:00 |
|
Trial97
|
a2d44744fe
|
do not update the metadata if mod is invalid
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-08-26 23:36:46 +03:00 |
|
Trial97
|
288d0d1fd4
|
Added back api loader filtering if just one is selected
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-08-26 22:26:01 +03:00 |
|
Trial97
|
abfd1a4205
|
minor dependency crash fix
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-08-25 18:35:25 +03:00 |
|
Trial97
|
c54fecf5d9
|
added condition for empty loader type
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-08-25 09:05:04 +03:00 |
|
Trial97
|
172680abf8
|
removed aditional header
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-08-24 13:42:36 +03:00 |
|
Trial97
|
5f3e9672cd
|
made the loaders check more generic
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-08-24 13:31:57 +03:00 |
|
Trial97
|
bb4b89470d
|
fixed icon importing
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-08-24 12:46:23 +03:00 |
|
Trial97
|
2990c5d0c9
|
Added optional mods dialog
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-08-24 12:44:11 +03:00 |
|
Trial97
|
ea384d59fb
|
use qt separtor for file path
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-08-24 12:41:37 +03:00 |
|
Trial97
|
6c0492c0d1
|
return 0 for any
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-08-23 21:09:32 +03:00 |
|
Trial97
|
1515607060
|
updated getMappedModLoader
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-08-23 20:16:51 +03:00 |
|
Trial97
|
6178e5a975
|
reverted change for optional
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-08-23 13:55:38 +03:00 |
|
Trial97
|
aa065f2b51
|
Updated dependency resolution
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-08-23 13:28:23 +03:00 |
|
Trial97
|
e6ba2f4970
|
Added loaders check on versions load
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-08-23 12:52:51 +03:00 |
|
Trial97
|
f8f9ffa118
|
added loaders for flame version
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-08-23 11:33:45 +03:00 |
|
Trial97
|
4704c522e0
|
moved modloaderTypes to ModPlatform
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-08-23 10:26:57 +03:00 |
|
Trial97
|
02264f67f3
|
Fixed codeql
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-08-21 14:15:51 +03:00 |
|
Trial97
|
8e5be6f420
|
added suport for atlauncher browser download
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-08-21 00:09:46 +03:00 |
|
Trial97
|
254444470f
|
renamed enum type
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-08-20 16:40:58 +03:00 |
|
Trial97
|
d25e89a4c1
|
refactor packwiz file write
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-08-20 00:48:46 +03:00 |
|
Trial97
|
0138cd65cb
|
feat:neoforge can download forge mods
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-08-19 09:00:59 +03:00 |
|
Trial97
|
ab6301d5a1
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into develop
|
2023-08-19 00:38:40 +03:00 |
|
Sefa Eyeoglu
|
3098aecf97
|
Merge pull request #1498 from Scrumplex/neoforge
|
2023-08-18 22:56:55 +02:00 |
|
Trial97
|
58efd3e9e2
|
fixed code scaning
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-08-18 21:43:57 +03:00 |
|
Trial97
|
44ff247f5f
|
feat:refactored modpack ux
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-08-18 20:03:02 +03:00 |
|
Sefa Eyeoglu
|
be2888d6fb
|
chore: reformat
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
|
2023-08-17 22:23:50 +02:00 |
|
Trial97
|
7ab391904a
|
Flame support for neoforge
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-08-17 22:23:34 +02:00 |
|
Sefa Eyeoglu
|
aac734d174
|
fix: add theoretical support for NeoForge in FTB modpacks
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
|
2023-08-17 22:21:12 +02:00 |
|
Trial97
|
4a1d85f999
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into develop
|
2023-08-17 14:23:37 +03:00 |
|
Sefa Eyeoglu
|
85f36ebed7
|
Merge pull request #981 from Ryex/curseforge-url-handle
|
2023-08-17 09:24:35 +02:00 |
|
Trial97
|
5e2d1ffdfb
|
removed line
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-08-17 00:23:53 +03:00 |
|
Trial97
|
c22eec8f27
|
fixed crash on atlauncher pack install
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-08-15 17:03:51 +03:00 |
|
Trial97
|
1faf741004
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into feat/launcher-updater
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-08-15 13:29:42 +03:00 |
|
Trial97
|
cf27d2f9ab
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into download_threads
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-08-15 12:49:21 +03:00 |
|
Trial97
|
c94ee67077
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into curseforge-url-handle3
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-08-15 12:16:00 +03:00 |
|
Sefa Eyeoglu
|
62c14cea2a
|
fix: allow NeoForge in resource APIs
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
|
2023-08-15 11:06:14 +02:00 |
|
Sefa Eyeoglu
|
01c3750835
|
feat: support NeoForge mrpack modpacks
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
|
2023-08-15 11:06:14 +02:00 |
|
Sefa Eyeoglu
|
3a0aa353cc
|
feat: add NeoForge to ModLoaderType
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
|
2023-08-15 11:06:13 +02:00 |
|
Trial97
|
0ba88ff138
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into staging
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-08-15 00:33:24 +03:00 |
|
Sefa Eyeoglu
|
215d7dbb74
|
chore: update license headers
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
|
2023-08-14 18:17:05 +02:00 |
|
Sefa Eyeoglu
|
91ba4cf75e
|
chore: reformat
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
|
2023-08-14 18:16:53 +02:00 |
|
TheKodeToad
|
5056a51c18
|
Improvements and refinements to pack export
- Persist fields
- Toggle optional files
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
|
2023-08-12 21:20:51 +01:00 |
|
Trial97
|
71890707c0
|
format and apply the sugestion
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-08-12 13:08:39 +03:00 |
|
Alexandru Ionut Tripon
|
b3b2e9df35
|
Merge branch 'develop' into feat/acknowledge_release_type
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
|
2023-08-12 12:42:30 +03:00 |
|
Sefa Eyeoglu
|
019e5ca3e8
|
fix: use ApiDownload for CF URL handling
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
|
2023-08-12 11:11:58 +02:00 |
|
fn2006
|
abcbd4ab4e
|
fix build
|
2023-08-11 20:44:14 +01:00 |
|
Sefa Eyeoglu
|
ef6f9487f4
|
Merge remote-tracking branch 'upstream/staging' into chore/add-compiler-warnings
|
2023-08-10 20:38:32 +02:00 |
|
Trial97
|
b3da35be74
|
Fixed curseforge import
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-08-10 12:19:38 +03:00 |
|
fn2006
|
847430b113
|
Merge branch 'release-7.x' of https://github.com/PrismLauncher/PrismLauncher into develop
|
2023-08-10 10:09:08 +01:00 |
|
Sefa Eyeoglu
|
74fe2fb2a6
|
Merge remote-tracking branch 'upstream/staging' into curseforge-url-handle
|
2023-08-06 21:54:00 +02:00 |
|
Trial97
|
b2fdd83594
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into download_threads
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-08-05 19:09:10 +03:00 |
|
Trial97
|
939a2d67ed
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into develop12
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-08-05 18:21:09 +03:00 |
|
Sefa Eyeoglu
|
304e294ea7
|
Merge pull request #1102 from Ryex/refactor/net-split-headers-to-proxy-class
|
2023-08-04 20:31:43 +02:00 |
|
Sefa Eyeoglu
|
ae793f6cf1
|
Merge pull request #1459 from Scrumplex/format
|
2023-08-04 19:42:36 +02:00 |
|
Sefa Eyeoglu
|
1d638e018a
|
chore: update license headers
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
|
2023-08-04 19:41:47 +02:00 |
|
Sefa Eyeoglu
|
01e17806f6
|
Merge pull request #1391 from Trial97/prism_export2
|
2023-08-02 19:27:14 +02:00 |
|
Sefa Eyeoglu
|
1d468ac35a
|
chore: reformat
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
|
2023-08-02 18:35:35 +02:00 |
|
Sefa Eyeoglu
|
01d3eea379
|
Merge pull request #1359 from Trial97/import
|
2023-08-02 18:25:51 +02:00 |
|
Rachel Powers
|
5a9f780cf8
|
fix(FlameInstanceCreationTask): include Net::Apidownload
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
|
2023-07-31 22:36:13 -07:00 |
|
Rachel Powers
|
2d1197f59f
|
Merge branch 'develop' into refactor/net-split-headers-to-proxy-class
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
|
2023-07-31 22:26:20 -07:00 |
|
Rachel Powers
|
1e947ca893
|
fix(flame creation task): import ApiDownload
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
|
2023-07-30 15:42:15 -07:00 |
|
Rachel Powers
|
b9fe37aec1
|
Merge branch 'develop' into chore/add-compiler-warnings
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
|
2023-07-30 15:33:46 -07:00 |
|
Rachel Powers
|
7c1a465ec9
|
Merge branch 'develop' into feat/launcher-updater
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
|
2023-07-30 14:19:31 -07:00 |
|
Trial97
|
62aa7a52c4
|
fiexed conflicts
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-07-27 00:07:38 +03:00 |
|
Trial97
|
3c472fd7e0
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into prism_export2
|
2023-07-27 00:05:59 +03:00 |
|
seth
|
af59c41713
|
fix: typo in task.h
Signed-off-by: seth <getchoo@tuta.io>
|
2023-07-26 16:20:30 -04:00 |
|
Trial97
|
ef21879df4
|
replaced require with ensure for jvmArgs
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-07-21 19:30:00 +03:00 |
|
Trial97
|
f8d9cd9a03
|
use range for
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-07-19 23:08:16 +03:00 |
|
Trial97
|
f393aa684e
|
wait to load metadata
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-07-18 23:59:43 +03:00 |
|
Trial97
|
015f88bf83
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into import
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-07-18 23:46:19 +03:00 |
|
TheKodeToad
|
fe1ea7240e
|
Merge pull request #1334 from TheKodeToad/litemod-dl
LiteMod downloading
|
2023-07-18 22:43:35 +02:00 |
|
Sefa Eyeoglu
|
6f1d594f1c
|
Merge pull request #1128 from pandaninjas/fix-implicit-fallthrough
|
2023-07-18 22:43:35 +02:00 |
|
Trial97
|
391497645f
|
feat:made flame instace creation use metadata for recommended version
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-07-18 22:33:39 +03:00 |
|
Trial97
|
64041a84a2
|
handle file removal in ExportToZipTask
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-07-17 16:55:26 +03:00 |
|
Trial97
|
78ee63af38
|
simplify modrinth export
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-07-17 16:40:01 +03:00 |
|
Trial97
|
455c495338
|
simplify flame export
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
s
|
2023-07-17 16:27:08 +03:00 |
|
Tayou
|
bb945c5165
|
Merge pull request #1368 from Trial97/crash_curse_import
|
2023-07-16 20:43:16 +02:00 |
|
Rachel Powers
|
daa5fcce67
|
Merge pull request #1351 from Trial97/ftb_import
fixed substatus on ftb_import
|
2023-07-16 20:43:16 +02:00 |
|
seth
|
7926170073
|
Merge pull request #1335 from Ryex/fix/gh-1322-old-zip-mods-in-wrong-place
fix(flame install): don't assume .zip is a resource pack. default to mod
|
2023-07-16 20:43:15 +02:00 |
|
Rachel Powers
|
79537f2948
|
Merge pull request #1352 from Trial97/crash_after_abort
Do not reset shared pointer if it's already empty
|
2023-07-16 20:43:15 +02:00 |
|
Rachel Powers
|
d9de326f22
|
Merge pull request #1321 from TheKodeToad/mr-optional
Optional mods in mrpack export
|
2023-07-16 20:43:02 +02:00 |
|
Sefa Eyeoglu
|
20e9bf0e11
|
Merge pull request #1261 from telans/modrinthexport-url
|
2023-07-16 20:42:26 +02:00 |
|
TheKodeToad
|
e52fd9d4fe
|
Merge pull request #1256 from Trial97/fix11
Fixed hashers
|
2023-07-16 20:42:25 +02:00 |
|
Rachel Powers
|
05056e1abf
|
Merge pull request #1200 from Trial97/net_job_crash
Made ByteSynkArray to use shared_ptr
|
2023-07-16 20:42:25 +02:00 |
|
DioEgizio
|
80463f9761
|
Merge pull request #1231 from telans/modrinth-default-icon
Modrinth: use default icon for non-managed packs
|
2023-07-16 20:42:25 +02:00 |
|
clickdevin
|
949da6b50e
|
Fix bugs when updating curseforge modpacks
Signed-off-by: clickdevin <git@clickdevin.me>
(cherry picked from commit d4f2059b78)
|
2023-07-16 17:55:05 +00:00 |
|
Sefa Eyeoglu
|
fcdd9ea986
|
Merge pull request #1246 from Trial97/export
|
2023-07-16 12:24:42 +02:00 |
|
Trial97
|
c346d875a2
|
make FileResolvingTask accept empty modlist
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-07-15 23:26:52 +03:00 |
|