Merge remote-tracking branch 'origin/feature_commands' into integration_butchery

2014-03-09 23:46:46 +01:00
parent b2c803a378 f1dc456802
commit 7fd56a30bd
12 changed files with 185 additions and 73 deletions
--- a/logic/OneSixInstance.cpp
+++ b/logic/OneSixInstance.cpp
@@ -423,6 +423,11 @@ bool OneSixInstance::providesVersionFile() const
 	return false;
 }

+bool OneSixInstance::reload()
+{
+	return BaseInstance::reload() && reloadVersion();
+}
+
 QString OneSixInstance::loaderModsDir() const
 {
 	return PathCombine(minecraftRoot(), "mods");