From c7b39fe1165956d07055e7917b22d5604fb5f768 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= Date: Sat, 4 Apr 2015 02:01:52 +0200 Subject: NOISSUE Remove special FTB logic from generic version patch code --- logic/minecraft/ProfileUtils.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'logic/minecraft/ProfileUtils.cpp') 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) -- cgit v1.2.3