summaryrefslogtreecommitdiffstats
path: root/logic/OneSixVersionBuilder.cpp
diff options
context:
space:
mode:
authorJan Dalheimer <jan@dalheimer.de>2014-02-01 22:32:48 +0100
committerJan Dalheimer <jan@dalheimer.de>2014-02-01 22:32:48 +0100
commit790402bdce96a4ce67b32d228aa251fc4d184f5e (patch)
treeb5bcc32e0247f0f539bcc84e8fac8b0fdc3c9bb0 /logic/OneSixVersionBuilder.cpp
parent983a40698c47739fee3786cf54c917004523ea36 (diff)
downloadMultiMC-790402bdce96a4ce67b32d228aa251fc4d184f5e.tar
MultiMC-790402bdce96a4ce67b32d228aa251fc4d184f5e.tar.gz
MultiMC-790402bdce96a4ce67b32d228aa251fc4d184f5e.tar.lz
MultiMC-790402bdce96a4ce67b32d228aa251fc4d184f5e.tar.xz
MultiMC-790402bdce96a4ce67b32d228aa251fc4d184f5e.zip
Disable anything related to user.json for now. Will be re-enabled once we have a gui for it.
Diffstat (limited to 'logic/OneSixVersionBuilder.cpp')
-rw-r--r--logic/OneSixVersionBuilder.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/logic/OneSixVersionBuilder.cpp b/logic/OneSixVersionBuilder.cpp
index 9832d4a0..4d6fb05a 100644
--- a/logic/OneSixVersionBuilder.cpp
+++ b/logic/OneSixVersionBuilder.cpp
@@ -750,7 +750,7 @@ bool OneSixVersionBuilder::build(const bool excludeCustom)
}
else
{
- // version.json -> patches/*.json -> instance.json
+ // version.json -> patches/*.json -> user.json
// version.json
{
@@ -810,6 +810,7 @@ bool OneSixVersionBuilder::build(const bool excludeCustom)
}
}
+#if 0
// user.json
if (!excludeCustom)
{
@@ -838,6 +839,7 @@ bool OneSixVersionBuilder::build(const bool excludeCustom)
}
}
}
+#endif
}
// some final touches