diff options
author | Ash <101582426+ashuntu@users.noreply.github.com> | 2023-07-28 21:22:35 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-07-28 21:22:35 +0000 |
commit | d133b40b254630f988c57c1111e4659023324edc (patch) | |
tree | 96217214a39945ef04e0d191d960481825ac65da /launcher/modplatform/flame/PackManifest.cpp | |
parent | 51d7a6289e1cf2df463ae8d7c0b08b4a61faea3c (diff) | |
parent | bdec11c501a6438706f62465d89f2344f7856342 (diff) | |
download | PrismLauncher-d133b40b254630f988c57c1111e4659023324edc.tar.gz PrismLauncher-d133b40b254630f988c57c1111e4659023324edc.tar.bz2 PrismLauncher-d133b40b254630f988c57c1111e4659023324edc.zip |
Merge branch 'PrismLauncher:develop' into develop
Diffstat (limited to 'launcher/modplatform/flame/PackManifest.cpp')
-rw-r--r-- | launcher/modplatform/flame/PackManifest.cpp | 9 |
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"); |