summaryrefslogtreecommitdiffstats
path: root/logic/ftb
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2015-02-09 01:51:14 +0100
committerPetr Mrázek <peterix@gmail.com>2015-04-12 20:57:18 +0200
commitdb877ba121ff87a4e029daf8555d85dfef45993a (patch)
tree7673f83c404b3883f0a4fcf6b492f0c4125c293c /logic/ftb
parent4730f54df7edf4775dfddf45f77c60edd86c32d9 (diff)
downloadMultiMC-db877ba121ff87a4e029daf8555d85dfef45993a.tar
MultiMC-db877ba121ff87a4e029daf8555d85dfef45993a.tar.gz
MultiMC-db877ba121ff87a4e029daf8555d85dfef45993a.tar.lz
MultiMC-db877ba121ff87a4e029daf8555d85dfef45993a.tar.xz
MultiMC-db877ba121ff87a4e029daf8555d85dfef45993a.zip
NOISSUE move everything.
Diffstat (limited to 'logic/ftb')
-rw-r--r--logic/ftb/FTBPlugin.cpp10
-rw-r--r--logic/ftb/FTBPlugin.h2
-rw-r--r--logic/ftb/FTBProfileStrategy.cpp8
-rw-r--r--logic/ftb/FTBVersion.h2
-rw-r--r--logic/ftb/LegacyFTBInstance.cpp2
-rw-r--r--logic/ftb/LegacyFTBInstance.h2
-rw-r--r--logic/ftb/OneSixFTBInstance.cpp14
-rw-r--r--logic/ftb/OneSixFTBInstance.h2
8 files changed, 21 insertions, 21 deletions
diff --git a/logic/ftb/FTBPlugin.cpp b/logic/ftb/FTBPlugin.cpp
index de04e485..88f6e793 100644
--- a/logic/ftb/FTBPlugin.cpp
+++ b/logic/ftb/FTBPlugin.cpp
@@ -2,11 +2,11 @@
#include "FTBVersion.h"
#include "LegacyFTBInstance.h"
#include "OneSixFTBInstance.h"
-#include <logic/BaseInstance.h>
-#include <logic/icons/IconList.h>
-#include <logic/InstanceList.h>
-#include <logic/minecraft/MinecraftVersionList.h>
-#include <logic/settings/INISettingsObject.h>
+#include <BaseInstance.h>
+#include <icons/IconList.h>
+#include <InstanceList.h>
+#include <minecraft/MinecraftVersionList.h>
+#include <settings/INISettingsObject.h>
#include <pathutils.h>
#include "QDebug"
#include <QXmlStreamReader>
diff --git a/logic/ftb/FTBPlugin.h b/logic/ftb/FTBPlugin.h
index 8a38e2bb..30913d19 100644
--- a/logic/ftb/FTBPlugin.h
+++ b/logic/ftb/FTBPlugin.h
@@ -1,6 +1,6 @@
#pragma once
-#include <logic/BaseInstance.h>
+#include <BaseInstance.h>
// Pseudo-plugin for FTB related things. Super derpy!
class FTBPlugin
diff --git a/logic/ftb/FTBProfileStrategy.cpp b/logic/ftb/FTBProfileStrategy.cpp
index 87be0ff9..cc20b247 100644
--- a/logic/ftb/FTBProfileStrategy.cpp
+++ b/logic/ftb/FTBProfileStrategy.cpp
@@ -1,7 +1,7 @@
-#include "logic/ftb/FTBProfileStrategy.h"
-#include "logic/minecraft/VersionBuildError.h"
-#include "logic/ftb/OneSixFTBInstance.h"
-#include "logic/minecraft/MinecraftVersionList.h"
+#include "ftb/FTBProfileStrategy.h"
+#include "minecraft/VersionBuildError.h"
+#include "ftb/OneSixFTBInstance.h"
+#include "minecraft/MinecraftVersionList.h"
#include <pathutils.h>
#include <QDir>
diff --git a/logic/ftb/FTBVersion.h b/logic/ftb/FTBVersion.h
index dbd9c29e..805319b4 100644
--- a/logic/ftb/FTBVersion.h
+++ b/logic/ftb/FTBVersion.h
@@ -1,5 +1,5 @@
#pragma once
-#include <logic/minecraft/MinecraftVersion.h>
+#include <minecraft/MinecraftVersion.h>
class FTBVersion : public BaseVersion
{
diff --git a/logic/ftb/LegacyFTBInstance.cpp b/logic/ftb/LegacyFTBInstance.cpp
index 43a9b42a..e7490679 100644
--- a/logic/ftb/LegacyFTBInstance.cpp
+++ b/logic/ftb/LegacyFTBInstance.cpp
@@ -1,5 +1,5 @@
#include "LegacyFTBInstance.h"
-#include <logic/settings/INISettingsObject.h>
+#include <settings/INISettingsObject.h>
#include <QDir>
LegacyFTBInstance::LegacyFTBInstance(SettingsObjectPtr globalSettings, SettingsObjectPtr settings, const QString &rootDir) :
diff --git a/logic/ftb/LegacyFTBInstance.h b/logic/ftb/LegacyFTBInstance.h
index 80c6c5ab..3bacf653 100644
--- a/logic/ftb/LegacyFTBInstance.h
+++ b/logic/ftb/LegacyFTBInstance.h
@@ -1,6 +1,6 @@
#pragma once
-#include "logic/minecraft/LegacyInstance.h"
+#include "minecraft/LegacyInstance.h"
class LegacyFTBInstance : public LegacyInstance
{
diff --git a/logic/ftb/OneSixFTBInstance.cpp b/logic/ftb/OneSixFTBInstance.cpp
index 4902be08..7374b78f 100644
--- a/logic/ftb/OneSixFTBInstance.cpp
+++ b/logic/ftb/OneSixFTBInstance.cpp
@@ -1,13 +1,13 @@
#include "OneSixFTBInstance.h"
#include "FTBProfileStrategy.h"
-#include "logic/minecraft/MinecraftProfile.h"
-#include "logic/minecraft/OneSixLibrary.h"
-#include "logic/minecraft/VersionBuilder.h"
-#include "logic/tasks/SequentialTask.h"
-#include "logic/forge/ForgeInstaller.h"
-#include "logic/forge/ForgeVersionList.h"
-#include <logic/settings/INISettingsObject.h>
+#include "minecraft/MinecraftProfile.h"
+#include "minecraft/OneSixLibrary.h"
+#include "minecraft/VersionBuilder.h"
+#include "tasks/SequentialTask.h"
+#include "forge/ForgeInstaller.h"
+#include "forge/ForgeVersionList.h"
+#include <settings/INISettingsObject.h>
#include "pathutils.h"
OneSixFTBInstance::OneSixFTBInstance(SettingsObjectPtr globalSettings, SettingsObjectPtr settings, const QString &rootDir) :
diff --git a/logic/ftb/OneSixFTBInstance.h b/logic/ftb/OneSixFTBInstance.h
index 7af7c770..dd652fd1 100644
--- a/logic/ftb/OneSixFTBInstance.h
+++ b/logic/ftb/OneSixFTBInstance.h
@@ -1,6 +1,6 @@
#pragma once
-#include "logic/minecraft/OneSixInstance.h"
+#include "minecraft/OneSixInstance.h"
class OneSixLibrary;