summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2014-11-17 21:45:29 +0100
committerPetr Mrázek <peterix@gmail.com>2014-11-17 22:01:32 +0100
commit80d3f734c67b4907ffd4ee52cef04d27949d1170 (patch)
tree70eff114b5793afc30b299d15e139ec5321eb17b
parent9ad9826d0865b4598ebd2231a8c05001912e6376 (diff)
downloadMultiMC-80d3f734c67b4907ffd4ee52cef04d27949d1170.tar
MultiMC-80d3f734c67b4907ffd4ee52cef04d27949d1170.tar.gz
MultiMC-80d3f734c67b4907ffd4ee52cef04d27949d1170.tar.lz
MultiMC-80d3f734c67b4907ffd4ee52cef04d27949d1170.tar.xz
MultiMC-80d3f734c67b4907ffd4ee52cef04d27949d1170.zip
GH-619 Add libraries missing in copies of 1.7.10 FTB packs
-rw-r--r--logic/OneSixFTBInstance.cpp17
1 files changed, 17 insertions, 0 deletions
diff --git a/logic/OneSixFTBInstance.cpp b/logic/OneSixFTBInstance.cpp
index 2be74c3c..d1585155 100644
--- a/logic/OneSixFTBInstance.cpp
+++ b/logic/OneSixFTBInstance.cpp
@@ -40,6 +40,23 @@ void OneSixFTBInstance::copy(const QDir &newDir)
}
root.remove("libraries");
root.remove("id");
+
+ // HACK HACK HACK HACK
+ // A workaround for a problem in MultiMC, triggered by a historical problem in FTB,
+ // triggered by Mojang getting their library versions wrong in 1.7.10
+ if(intendedVersionId() == "1.7.10")
+ {
+ auto insert = [&outLibs, &libraryNames](QString name)
+ {
+ QJsonObject libObj;
+ libObj.insert("insert", QString("replace"));
+ libObj.insert("name", name);
+ libraryNames.push_back(name);
+ outLibs.prepend(libObj);
+ };
+ insert("com.google.guava:guava:16.0");
+ insert("org.apache.commons:commons-lang3:3.2.1");
+ }
root.insert("+libraries", outLibs);
root.insert("order", 1);
root.insert("fileId", QString("org.multimc.ftb.pack.json"));