diff options
| author | Sky <git@bunnies.cc> | 2013-10-21 18:24:29 +0100 |
|---|---|---|
| committer | Sky <git@bunnies.cc> | 2013-10-21 18:24:29 +0100 |
| commit | aaf6fe894406ab8aa814de83692504493060e303 (patch) | |
| tree | a7ac3a60534322f70cbdc34111228885e0606691 /logic/BaseInstance.cpp | |
| parent | 6892c11e9f287dcfb1e698f8f46233a01fb7abb6 (diff) | |
| parent | 11813a0621dd7b500c2d7966a2671c0ab93be692 (diff) | |
| download | MultiMC-aaf6fe894406ab8aa814de83692504493060e303.tar MultiMC-aaf6fe894406ab8aa814de83692504493060e303.tar.gz MultiMC-aaf6fe894406ab8aa814de83692504493060e303.tar.lz MultiMC-aaf6fe894406ab8aa814de83692504493060e303.tar.xz MultiMC-aaf6fe894406ab8aa814de83692504493060e303.zip | |
Merge branch 'develop'
Diffstat (limited to 'logic/BaseInstance.cpp')
| -rw-r--r-- | logic/BaseInstance.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/logic/BaseInstance.cpp b/logic/BaseInstance.cpp index e166449f..6a6b195b 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 +std::shared_ptr<BaseVersionList> BaseInstance::versionList() const { - return &MinecraftVersionList::getMainList(); + return MMC->minecraftlist(); } SettingsObject &BaseInstance::settings() const |