summaryrefslogtreecommitdiffstats
path: root/logic/BaseInstance.cpp
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2013-09-18 00:08:42 +0200
committerPetr Mrázek <peterix@gmail.com>2013-09-18 00:08:42 +0200
commit930b07afd4229e952d0cd47ca62cd94235499a0c (patch)
tree34cd74c3652da4b3ad0fd008faa2ab67adb4901f /logic/BaseInstance.cpp
parent5cd3420c46e0b54f1479ddf720a8c9131c460a5e (diff)
parentb979d0ce5da515793a02802a6421ef607a498323 (diff)
downloadMultiMC-930b07afd4229e952d0cd47ca62cd94235499a0c.tar
MultiMC-930b07afd4229e952d0cd47ca62cd94235499a0c.tar.gz
MultiMC-930b07afd4229e952d0cd47ca62cd94235499a0c.tar.lz
MultiMC-930b07afd4229e952d0cd47ca62cd94235499a0c.tar.xz
MultiMC-930b07afd4229e952d0cd47ca62cd94235499a0c.zip
Merge branch 'feature_library_model' into develop
Diffstat (limited to 'logic/BaseInstance.cpp')
-rw-r--r--logic/BaseInstance.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/logic/BaseInstance.cpp b/logic/BaseInstance.cpp
index e166449f..10bb4573 100644
--- a/logic/BaseInstance.cpp
+++ b/logic/BaseInstance.cpp
@@ -13,6 +13,7 @@
* limitations under the License.
*/
+#include "MultiMC.h"
#include "BaseInstance.h"
#include "BaseInstance_p.h"
@@ -131,9 +132,9 @@ InstanceList *BaseInstance::instList() const
return NULL;
}
-InstVersionList *BaseInstance::versionList() const
+BaseVersionList *BaseInstance::versionList() const
{
- return &MinecraftVersionList::getMainList();
+ return MMC->minecraftlist();
}
SettingsObject &BaseInstance::settings() const