Trial97
|
455c495338
|
simplify flame export
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
s
|
2023-07-17 16:27:08 +03: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 |
|
Trial97
|
7befd63cce
|
fixed settings
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-07-15 00:28:58 +03:00 |
|
Alexandru Ionut Tripon
|
2c2c39b42c
|
Update launcher/modplatform/import_ftb/PackInstallTask.cpp
Co-authored-by: TheKodeToad <TheKodeToad@proton.me>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
|
2023-07-15 00:17:48 +03:00 |
|
Alexandru Ionut Tripon
|
0692cbe701
|
Update launcher/modplatform/import_ftb/PackInstallTask.cpp
Co-authored-by: TheKodeToad <TheKodeToad@proton.me>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
|
2023-07-15 00:17:32 +03:00 |
|
Trial97
|
ab10524cd7
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into export
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-07-14 23:45:40 +03:00 |
|
Trial97
|
1ccfba13eb
|
renames
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-07-14 23:41:51 +03:00 |
|
Trial97
|
1495bfb73e
|
Made custom template enabled all time
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-07-14 23:41:37 +03:00 |
|
Trial97
|
9b02c31f8d
|
escaped text for html export
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-07-14 23:35:18 +03:00 |
|
Trial97
|
50dae9d4f3
|
Moved to separate functions
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-07-14 23:34:28 +03:00 |
|
Trial97
|
9a3931dac6
|
Added json and csv format
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-07-14 23:34:21 +03:00 |
|
Trial97
|
515197fba2
|
fix: html sintax for modlist export
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-07-14 23:34:03 +03:00 |
|
Trial97
|
c8533c0b0d
|
fixed substatus on ftb_import
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-07-14 12:29:03 +03:00 |
|
Trial97
|
b0a018d823
|
format
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-07-14 12:28:23 +03:00 |
|
seth
|
3099a70edc
|
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-14 00:16:43 -04:00 |
|
Rachel Powers
|
520594e529
|
Merge branch 'develop' into chore/add-compiler-warnings
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
|
2023-07-13 20:05:16 -07:00 |
|
Trial97
|
bd6e8533ad
|
send by reference
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-07-13 19:58:08 +03:00 |
|
Trial97
|
843c2d67eb
|
Added FTBAPP Import
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-07-13 18:41:29 +03:00 |
|
Trial97
|
25f7cf23d3
|
the other place
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-07-12 19:55:11 +03:00 |
|
Trial97
|
9ee68b9268
|
small pointer check
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-07-12 18:12:31 +03:00 |
|
Rachel Powers
|
6d5a2ceefe
|
fix(flameapi): getFile use shared_ptr
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
|
2023-07-11 21:45:23 -07:00 |
|
Rachel Powers
|
9957aeb003
|
Merge branch 'develop' into curseforge-url-handle
|
2023-07-11 21:42:29 -07:00 |
|
TheKodeToad
|
9aedb5afff
|
Merge pull request #1334 from TheKodeToad/litemod-dl
LiteMod downloading
|
2023-07-10 16:42:38 +01:00 |
|
TheKodeToad
|
91c9082d19
|
Merge pull request #1249 from Trial97/curse
Curseforge modpack export
|
2023-07-10 14:20:29 +01:00 |
|
Rachel Powers
|
d43399c2b4
|
Merge pull request #1321 from TheKodeToad/mr-optional
Optional mods in mrpack export
|
2023-07-09 14:03:47 -07:00 |
|
TheKodeToad
|
6e2fcc9e11
|
Replace string manipulation in favour of QFileInfo
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
|
2023-07-09 12:08:15 +01:00 |
|
TheKodeToad
|
d53d58a5d4
|
LiteMod downloading
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
|
2023-07-08 22:16:43 +01:00 |
|
Rachel Powers
|
e704072892
|
fix(flame install): don't assume .zip is a resource pack. default to mod
let identifier move it if needed
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
|
2023-07-08 13:38:00 -07:00 |
|
Tayou
|
1131038fdb
|
Merge pull request #1120 from Trial97/visit_mod_page
|
2023-07-07 22:23:59 +02:00 |
|
TheKodeToad
|
8ae67b84db
|
Optional mods in mrpack export
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
|
2023-07-06 20:04:26 +01:00 |
|
PandaNinjas
|
4509fde410
|
Merge branch 'develop' into fix-implicit-fallthrough
Signed-off-by: PandaNinjas <admin@malwarefight.wip.la>
|
2023-07-04 16:41:34 -04:00 |
|
Trial97
|
908ac813e0
|
escaped modlist inner html
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-07-04 15:16:54 +03:00 |
|
Trial97
|
fa7cfc77d8
|
fixed template
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-07-03 16:08:20 +03:00 |
|
Trial97
|
5f63c781b4
|
resolved local vaiables names
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-07-02 18:50:29 +03:00 |
|
Trial97
|
aad5ca5474
|
fixed typos
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-07-02 16:45:15 +03:00 |
|
Trial97
|
6c4cf085e0
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into curse
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-07-02 12:50:45 +03:00 |
|
Rachel Powers
|
8d7dcdfc5b
|
chore: fix shadowed member and signed/unsigned mismatch
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
chore: supress unused with [[maybe_unused]]
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
chore: unshadow ^&^& static_cast implicit return
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
chore: deshadow and mark unused in parse task
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
chore: mark unused in folder models
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
chore: deshadow and mark unused with instances
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
chore: more deshadow and unused
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
chore: remove uneeded simicolons
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
chore: mark unused
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
chore: prevent shadow
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
|
2023-07-01 23:39:38 -07:00 |
|
Rachel Powers
|
98d6904e4a
|
chore: fix propagate mispelling
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
|
2023-07-01 17:03:12 -07:00 |
|
Rachel Powers
|
2a5d291bd9
|
fix: toml without exceptions usage
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
|
2023-07-01 17:03:11 -07:00 |
|
Rachel Powers
|
671d3c1c80
|
Merge branch 'develop' into chore/add-compiler-warnings
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
|
2023-07-01 17:03:11 -07:00 |
|
Rachel Powers
|
df4fd7df7f
|
Merge remote-tracking branch 'upstream/develop' into refactor/net-split-headers-to-proxy-class
|
2023-06-25 12:43:48 -07:00 |
|
Rachel Powers
|
c8ff812ab8
|
feat(net): ApiUpload ^& fix unfired finished signals
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
|
2023-06-25 12:02:46 -07:00 |
|
Rachel Powers
|
9c10965997
|
refactor: split out setting api headers for downloads
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
|
2023-06-25 11:09:25 -07:00 |
|
Trial97
|
87155e346c
|
Complicated a little task progress
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-06-25 19:44:18 +03:00 |
|
Trial97
|
52dd09bdf7
|
Merge branch 'curse' of github.com:Trial97/PrismLauncher into curse
|
2023-06-25 17:51:30 +03:00 |
|
Trial97
|
d344ffe370
|
Removed some setProgress calls
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-06-25 17:50:56 +03:00 |
|
TheKodeToad
|
8ade44c9a3
|
Simplify
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
|
2023-06-25 14:40:22 +01:00 |
|
Trial97
|
fa3a46498f
|
Removed dupliacte code
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-06-25 16:23:50 +03:00 |
|
Trial97
|
d1603f1945
|
Made it more similar to mrpack export
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-06-25 14:43:11 +03:00 |
|
Trial97
|
84c63f4f01
|
Added plantxt export
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-06-25 14:11:41 +03:00 |
|
TheKodeToad
|
514080653f
|
Fix unsafe usage of std::optional::value in FlameAPI
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
|
2023-06-25 11:56:28 +01:00 |
|
Trial97
|
ef0752972a
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into export
|
2023-06-25 12:26:54 +03:00 |
|
Trial97
|
fd5b155ee7
|
Added error message when exporting snapshots with curseforge
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-06-25 12:24:59 +03:00 |
|
Trial97
|
ce4a86fbcd
|
Made custom url function
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-06-25 10:41:29 +03:00 |
|
Trial97
|
932531c8ba
|
fixed authors
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-06-24 23:48:18 +03:00 |
|
Trial97
|
69c21454ec
|
removed projectID
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-06-24 22:15:18 +03:00 |
|
Trial97
|
f0e4e07c05
|
Updated url function
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-06-24 20:43:45 +03:00 |
|
Trial97
|
df932c6587
|
Updated authors string in modlist
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-06-24 20:22:18 +03:00 |
|
Trial97
|
81c1a95166
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into curse
|
2023-06-24 20:04:56 +03:00 |
|
Trial97
|
8b576fd2bd
|
Added translation
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-06-24 15:59:55 +03:00 |
|
Trial97
|
7fdd68d768
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into develop
|
2023-06-24 15:58:55 +03:00 |
|
Trial97
|
f825d7753a
|
Updated copyright headers
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-06-24 15:11:15 +03:00 |
|
Trial97
|
19cb6ad588
|
Updated Modrinth esport messages
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-06-24 15:04:18 +03:00 |
|
Trial97
|
4a84084d9d
|
Added condition for modlist
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-06-24 15:02:00 +03:00 |
|
Trial97
|
59e1e51903
|
Removed unused files
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-06-24 14:51:12 +03:00 |
|
Trial97
|
30ef5475c7
|
Made sure CurseForge string is corect
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-06-24 14:50:05 +03:00 |
|
Trial97
|
9804996db6
|
Added resource packs to export
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-06-24 14:37:02 +03:00 |
|
Trial97
|
b774817ada
|
Merge branch 'curse' of github.com:Trial97/PrismLauncher into curse
|
2023-06-24 13:24:54 +03:00 |
|
Trial97
|
8939096db6
|
Fixed windows build
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-06-24 13:24:40 +03:00 |
|
Alexandru Ionut Tripon
|
a325d814e2
|
Update launcher/modplatform/flame/FlamePackExportTask.cpp
Co-authored-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
|
2023-06-24 11:13:08 +03:00 |
|
Trial97
|
cd1e8dc8cc
|
Removed modlist checkbox
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-06-24 11:12:23 +03:00 |
|
James Beddek
|
20ba6e5fb5
|
modrinth: use encoded url when exporting pack
Ensures that necessary url components such as spaces are encoded.
Prevents an error when submitting the resulting file to modrinth.
See https://discord.com/channels/734077874708938864/1120070731242410024
Fixes: #1226
Signed-off-by: James Beddek <telans@posteo.de>
|
2023-06-24 15:42:58 +12:00 |
|
Trial97
|
cf94adb363
|
Added some warnings
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-06-24 01:05:49 +03:00 |
|
Trial97
|
823cd3862d
|
Fixed hash checking
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-06-23 22:41:01 +03:00 |
|
Trial97
|
28de461067
|
Fixed hashers
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-06-23 21:38:41 +03:00 |
|
Trial97
|
69c709b05a
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into develop
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-06-23 20:01:17 +03:00 |
|
Trial97
|
222a10891c
|
Fixed merge
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-06-23 19:41:55 +03:00 |
|
Trial97
|
cb2671a02c
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into curse
|
2023-06-23 19:35:47 +03:00 |
|
Trial97
|
0a56631831
|
Added curseforge search
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-06-23 19:35:41 +03:00 |
|
Trial97
|
85bbab0e92
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into net_job_crash
|
2023-06-23 14:38:30 +03:00 |
|
Trial97
|
67db141203
|
Renamed getResults to resultsReady
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-06-23 14:38:23 +03:00 |
|
Trial97
|
85495c794d
|
changed map tipe
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-06-22 21:12:02 +03:00 |
|
Trial97
|
049b02cee4
|
finished up the curesforge export
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-06-22 21:06:01 +03:00 |
|
Trial97
|
3c9c39cb89
|
Updated slug for url
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-06-22 20:04:23 +03:00 |
|
Trial97
|
377f27b16f
|
Updated slug for url
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-06-22 20:04:06 +03:00 |
|
Trial97
|
58321f3491
|
Added curseforge export
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-06-22 20:03:44 +03:00 |
|
Trial97
|
4e07f9574a
|
Use slug for url
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-06-22 18:11:25 +03:00 |
|
Trial97
|
da6f846a49
|
Use slug for url
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-06-22 18:11:03 +03:00 |
|
Trial97
|
9ad356d66f
|
Added ExportModsToStringTask
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-06-22 17:44:12 +03:00 |
|
Trial97
|
9d2516a199
|
Added ExportModsToStringTask
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-06-22 16:07:55 +03:00 |
|
DioEgizio
|
8aa02320e0
|
Merge pull request #1231 from telans/modrinth-default-icon
Modrinth: use default icon for non-managed packs
|
2023-06-21 12:25:26 +02:00 |
|
James Beddek
|
009623823d
|
Modrinth: use default icon for non-managed packs
Fixes: #317
Signed-off-by: James Beddek <telans@posteo.de>
|
2023-06-20 23:00:13 +12:00 |
|
Trial97
|
c13a90540c
|
Added overide for Quilt/Fabric
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-06-19 21:20:35 +03:00 |
|
Trial97
|
6fd729e285
|
Fixed regresion regarding modrinth project_id in dependence array
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-06-19 17:42:16 +03:00 |
|
Trial97
|
1bdde1f947
|
Small fixes
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-06-19 00:36:37 +03:00 |
|
Trial97
|
4e66f55d84
|
Removed extra headers
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-06-18 23:32:17 +03:00 |
|
Trial97
|
0161520b33
|
Fixed leaks
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-06-18 23:27:26 +03:00 |
|
Trial97
|
147366bc0a
|
Made ByteSynkArray to use shared_ptr
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-06-15 22:59:41 +03:00 |
|
Trial97
|
182e19eae3
|
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into develop
|
2023-06-15 10:35:26 +03:00 |
|