diff options
| author | Petr Mrázek <peterix@gmail.com> | 2016-03-13 02:28:55 +0100 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2016-03-26 17:05:27 +0100 |
| commit | 576d808d7197b4b7ef798891dfd138e2e8aae54f (patch) | |
| tree | 1499c6ec2e2d0430bed906dd32ab1b75876d3e80 /logic/minecraft/forge/ForgeInstaller.cpp | |
| parent | f63d1bc99c93705bdadb8221430bda60c89cc062 (diff) | |
| download | MultiMC-576d808d7197b4b7ef798891dfd138e2e8aae54f.tar MultiMC-576d808d7197b4b7ef798891dfd138e2e8aae54f.tar.gz MultiMC-576d808d7197b4b7ef798891dfd138e2e8aae54f.tar.lz MultiMC-576d808d7197b4b7ef798891dfd138e2e8aae54f.tar.xz MultiMC-576d808d7197b4b7ef798891dfd138e2e8aae54f.zip | |
NOISSUE resolve library activeness during application to profile
Diffstat (limited to 'logic/minecraft/forge/ForgeInstaller.cpp')
| -rw-r--r-- | logic/minecraft/forge/ForgeInstaller.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/logic/minecraft/forge/ForgeInstaller.cpp b/logic/minecraft/forge/ForgeInstaller.cpp index a72160a2..c42a8e18 100644 --- a/logic/minecraft/forge/ForgeInstaller.cpp +++ b/logic/minecraft/forge/ForgeInstaller.cpp @@ -193,6 +193,8 @@ bool ForgeInstaller::add(OneSixInstance *to) QJsonObject libObj = OneSixVersionFormat::libraryToJson(lib.get()); + // FIXME: use upstream Minecraft version files instead, not the processed profile! + /* bool equals = false; // find an entry that matches this one for (auto tolib : to->getMinecraftProfile()->getVanillaLibraries()) @@ -209,6 +211,7 @@ bool ForgeInstaller::add(OneSixInstance *to) { continue; } + */ libraries.append(libObj); } obj.insert("libraries", libraries); @@ -225,7 +228,8 @@ bool ForgeInstaller::add(OneSixInstance *to) match = expression.match(args); } } - if (!args.isEmpty() && args != to->getMinecraftProfile()->getVanillaMinecraftArguments()) + // FIXME: use upstream Minecraft version files instead, not the processed profile! + if (!args.isEmpty() /* && args != to->getMinecraftProfile()->getVanillaMinecraftArguments() */) { obj.insert("minecraftArguments", args); } |