summaryrefslogtreecommitdiffstats
path: root/logic/InstanceList.cpp
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2015-02-04 21:10:10 +0100
committerPetr Mrázek <peterix@gmail.com>2015-04-12 20:57:17 +0200
commit141e0a02a0a0c4bbc4cc2e900560db5048366104 (patch)
treed61b0ac7fedc656d2906f084b9a384b8047e8617 /logic/InstanceList.cpp
parent473971b6e7a79ed38fa68dffacd207fda874fdc0 (diff)
downloadMultiMC-141e0a02a0a0c4bbc4cc2e900560db5048366104.tar
MultiMC-141e0a02a0a0c4bbc4cc2e900560db5048366104.tar.gz
MultiMC-141e0a02a0a0c4bbc4cc2e900560db5048366104.tar.lz
MultiMC-141e0a02a0a0c4bbc4cc2e900560db5048366104.tar.xz
MultiMC-141e0a02a0a0c4bbc4cc2e900560db5048366104.zip
SCRATCH move things to the right places
Diffstat (limited to 'logic/InstanceList.cpp')
-rw-r--r--logic/InstanceList.cpp12
1 files changed, 7 insertions, 5 deletions
diff --git a/logic/InstanceList.cpp b/logic/InstanceList.cpp
index ef6594d9..10faf1ca 100644
--- a/logic/InstanceList.cpp
+++ b/logic/InstanceList.cpp
@@ -25,16 +25,18 @@
#include <QXmlStreamReader>
#include <QRegularExpression>
#include <pathutils.h>
+#include <QDebug>
#include "logic/InstanceList.h"
#include "logic/icons/IconList.h"
-#include "logic/minecraft/MinecraftVersionList.h"
#include "logic/BaseInstance.h"
-#include "logic/ftb/FTBPlugin.h"
+
+//FIXME: this really doesn't belong *here*
+#include "logic/minecraft/OneSixInstance.h"
+#include "logic/minecraft/LegacyInstance.h"
+#include "minecraft/MinecraftVersion.h"
#include "settings/INISettingsObject.h"
-#include "OneSixInstance.h"
-#include "LegacyInstance.h"
-#include <QDebug>
+#include "logic/ftb/FTBPlugin.h"
const static int GROUP_FILE_FORMAT_VERSION = 1;