aboutsummaryrefslogtreecommitdiff
path: root/launcher/modplatform/flame/PackManifest.cpp
diff options
context:
space:
mode:
authorseth <getchoo@tuta.io>2023-07-14 00:16:43 -0400
committerGitHub <noreply@github.com>2023-07-14 00:16:43 -0400
commit3099a70edc4a8a928247efd032fdd43988cd1e0a (patch)
tree4d6baee58681459a2bab690d028bd6e1c0f50800 /launcher/modplatform/flame/PackManifest.cpp
parent5d10045cc823037709d33034663d177af6446f43 (diff)
parentcde85947c7dd4c2508938490789fef60cd464828 (diff)
downloadPrismLauncher-3099a70edc4a8a928247efd032fdd43988cd1e0a.tar.gz
PrismLauncher-3099a70edc4a8a928247efd032fdd43988cd1e0a.tar.bz2
PrismLauncher-3099a70edc4a8a928247efd032fdd43988cd1e0a.zip
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
Diffstat (limited to 'launcher/modplatform/flame/PackManifest.cpp')
-rw-r--r--launcher/modplatform/flame/PackManifest.cpp9
1 files changed, 2 insertions, 7 deletions
diff --git a/launcher/modplatform/flame/PackManifest.cpp b/launcher/modplatform/flame/PackManifest.cpp
index 22008297..ee4d0766 100644
--- a/launcher/modplatform/flame/PackManifest.cpp
+++ b/launcher/modplatform/flame/PackManifest.cpp
@@ -76,13 +76,8 @@ bool Flame::File::parseFromObject(const QJsonObject& obj, bool throw_on_blocked
// It is also optional
type = File::Type::SingleFile;
- if (fileName.endsWith(".zip")) {
- // this is probably a resource pack
- targetFolder = "resourcepacks";
- } else {
- // this is probably a mod, dunno what else could modpacks download
- targetFolder = "mods";
- }
+ targetFolder = "mods";
+
// get the hash
hash = QString();
auto hashes = Json::ensureArray(obj, "hashes");