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
|
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 |
|
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 |
|
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 |
|
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 |
|
Sefa Eyeoglu
|
74fe2fb2a6
|
Merge remote-tracking branch 'upstream/staging' into curseforge-url-handle
|
2023-08-06 21:54:00 +02: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
|
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 |
|
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 |
|
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 |
|
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 |
|