summaryrefslogtreecommitdiffstats
path: root/logic/minecraft/ProfileUtils.cpp
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2015-04-04 02:01:52 +0200
committerPetr Mrázek <peterix@gmail.com>2015-04-04 02:01:52 +0200
commitc7b39fe1165956d07055e7917b22d5604fb5f768 (patch)
treeb1a51bd74228bc1c708780031a4a685e1f2c0105 /logic/minecraft/ProfileUtils.cpp
parent865b20057120a61cfd26f5eea9aa68243efc3319 (diff)
downloadMultiMC-c7b39fe1165956d07055e7917b22d5604fb5f768.tar
MultiMC-c7b39fe1165956d07055e7917b22d5604fb5f768.tar.gz
MultiMC-c7b39fe1165956d07055e7917b22d5604fb5f768.tar.lz
MultiMC-c7b39fe1165956d07055e7917b22d5604fb5f768.tar.xz
MultiMC-c7b39fe1165956d07055e7917b22d5604fb5f768.zip
NOISSUE Remove special FTB logic from generic version patch code
Diffstat (limited to 'logic/minecraft/ProfileUtils.cpp')
-rw-r--r--logic/minecraft/ProfileUtils.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/logic/minecraft/ProfileUtils.cpp b/logic/minecraft/ProfileUtils.cpp
index bae34dbf..db05b0a6 100644
--- a/logic/minecraft/ProfileUtils.cpp
+++ b/logic/minecraft/ProfileUtils.cpp
@@ -98,7 +98,7 @@ bool readOverrideOrders(QString path, PatchOrder &order)
return true;
}
-VersionFilePtr parseJsonFile(const QFileInfo &fileInfo, const bool requireOrder, bool isFTB)
+VersionFilePtr parseJsonFile(const QFileInfo &fileInfo, const bool requireOrder)
{
QFile file(fileInfo.absoluteFilePath());
if (!file.open(QFile::ReadOnly))
@@ -115,7 +115,7 @@ VersionFilePtr parseJsonFile(const QFileInfo &fileInfo, const bool requireOrder,
.arg(fileInfo.fileName(), error.errorString())
.arg(error.offset));
}
- return VersionFile::fromJson(doc, file.fileName(), requireOrder, isFTB);
+ return VersionFile::fromJson(doc, file.fileName(), requireOrder);
}
VersionFilePtr parseBinaryJsonFile(const QFileInfo &fileInfo)
@@ -134,7 +134,7 @@ VersionFilePtr parseBinaryJsonFile(const QFileInfo &fileInfo)
throw JSONValidationError(
QObject::tr("Unable to process the version file %1.").arg(fileInfo.fileName()));
}
- return VersionFile::fromJson(doc, file.fileName(), false, false);
+ return VersionFile::fromJson(doc, file.fileName(), false);
}
void removeLwjglFromPatch(VersionFilePtr patch)