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 |
|
seth
|
af59c41713
|
fix: typo in task.h
Signed-off-by: seth <getchoo@tuta.io>
|
2023-07-26 16:20:30 -04: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
|
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
|
c346d875a2
|
make FileResolvingTask accept empty modlist
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
|
2023-07-15 23:26:52 +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 |
|
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 |
|
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 |
|
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
|
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 |
|
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
|
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
|
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
|
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
|
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 |
|
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
|
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 |
|