summaryrefslogtreecommitdiffstats
path: root/logic/forge
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/forge
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/forge')
-rw-r--r--logic/forge/ForgeInstaller.cpp16
-rw-r--r--logic/forge/ForgeInstaller.h2
-rw-r--r--logic/forge/ForgeMirrors.cpp2
-rw-r--r--logic/forge/ForgeMirrors.h8
-rw-r--r--logic/forge/ForgeVersion.cpp2
-rw-r--r--logic/forge/ForgeVersion.h2
-rw-r--r--logic/forge/ForgeVersionList.cpp10
-rw-r--r--logic/forge/ForgeVersionList.h8
-rw-r--r--logic/forge/ForgeXzDownload.cpp2
-rw-r--r--logic/forge/ForgeXzDownload.h4
-rw-r--r--logic/forge/LegacyForge.h2
11 files changed, 29 insertions, 29 deletions
diff --git a/logic/forge/ForgeInstaller.cpp b/logic/forge/ForgeInstaller.cpp
index cbd96869..ee68069b 100644
--- a/logic/forge/ForgeInstaller.cpp
+++ b/logic/forge/ForgeInstaller.cpp
@@ -14,14 +14,14 @@
*/
#include "ForgeInstaller.h"
-#include "logic/minecraft/MinecraftProfile.h"
-#include "logic/minecraft/OneSixLibrary.h"
-#include "logic/net/HttpMetaCache.h"
-#include "logic/tasks/Task.h"
-#include "logic/minecraft/OneSixInstance.h"
-#include "logic/forge/ForgeVersionList.h"
-#include "logic/minecraft/VersionFilterData.h"
-#include "logic/Env.h"
+#include "minecraft/MinecraftProfile.h"
+#include "minecraft/OneSixLibrary.h"
+#include "net/HttpMetaCache.h"
+#include "tasks/Task.h"
+#include "minecraft/OneSixInstance.h"
+#include "forge/ForgeVersionList.h"
+#include "minecraft/VersionFilterData.h"
+#include "Env.h"
#include <quazip.h>
#include <quazipfile.h>
diff --git a/logic/forge/ForgeInstaller.h b/logic/forge/ForgeInstaller.h
index e85582fd..1b31d39f 100644
--- a/logic/forge/ForgeInstaller.h
+++ b/logic/forge/ForgeInstaller.h
@@ -15,7 +15,7 @@
#pragma once
-#include "logic/BaseInstaller.h"
+#include "BaseInstaller.h"
#include <QString>
#include <memory>
diff --git a/logic/forge/ForgeMirrors.cpp b/logic/forge/ForgeMirrors.cpp
index e922fcc3..0dea0826 100644
--- a/logic/forge/ForgeMirrors.cpp
+++ b/logic/forge/ForgeMirrors.cpp
@@ -1,4 +1,4 @@
-#include "logic/Env.h"
+#include "Env.h"
#include "ForgeMirrors.h"
#include <QDebug>
#include <algorithm>
diff --git a/logic/forge/ForgeMirrors.h b/logic/forge/ForgeMirrors.h
index 21d91a11..e7c90fa5 100644
--- a/logic/forge/ForgeMirrors.h
+++ b/logic/forge/ForgeMirrors.h
@@ -15,10 +15,10 @@
#pragma once
-#include "logic/net/NetAction.h"
-#include "logic/net/HttpMetaCache.h"
-#include "logic/net/NetJob.h"
-#include "logic/forge/ForgeXzDownload.h"
+#include "net/NetAction.h"
+#include "net/HttpMetaCache.h"
+#include "net/NetJob.h"
+#include "forge/ForgeXzDownload.h"
#include <QFile>
#include <QTemporaryFile>
typedef std::shared_ptr<class ForgeMirrors> ForgeMirrorsPtr;
diff --git a/logic/forge/ForgeVersion.cpp b/logic/forge/ForgeVersion.cpp
index f3e64204..b859a28c 100644
--- a/logic/forge/ForgeVersion.cpp
+++ b/logic/forge/ForgeVersion.cpp
@@ -1,5 +1,5 @@
#include "ForgeVersion.h"
-#include "logic/minecraft/VersionFilterData.h"
+#include "minecraft/VersionFilterData.h"
#include <QObject>
QString ForgeVersion::name()
diff --git a/logic/forge/ForgeVersion.h b/logic/forge/ForgeVersion.h
index e3c1aab9..e77d32f1 100644
--- a/logic/forge/ForgeVersion.h
+++ b/logic/forge/ForgeVersion.h
@@ -1,7 +1,7 @@
#pragma once
#include <QString>
#include <memory>
-#include "logic/BaseVersion.h"
+#include "BaseVersion.h"
struct ForgeVersion;
typedef std::shared_ptr<ForgeVersion> ForgeVersionPtr;
diff --git a/logic/forge/ForgeVersionList.cpp b/logic/forge/ForgeVersionList.cpp
index 260f84eb..56ffad11 100644
--- a/logic/forge/ForgeVersionList.cpp
+++ b/logic/forge/ForgeVersionList.cpp
@@ -13,11 +13,11 @@
* limitations under the License.
*/
-#include "logic/forge/ForgeVersionList.h"
-#include "logic/forge/ForgeVersion.h"
-#include "logic/net/NetJob.h"
-#include "logic/net/URLConstants.h"
-#include "logic/Env.h"
+#include "forge/ForgeVersionList.h"
+#include "forge/ForgeVersion.h"
+#include "net/NetJob.h"
+#include "net/URLConstants.h"
+#include "Env.h"
#include <QtNetwork>
#include <QtXml>
diff --git a/logic/forge/ForgeVersionList.h b/logic/forge/ForgeVersionList.h
index 6bc9e0a9..75e1dd78 100644
--- a/logic/forge/ForgeVersionList.h
+++ b/logic/forge/ForgeVersionList.h
@@ -20,10 +20,10 @@
#include <QUrl>
#include <QNetworkReply>
-#include "logic/BaseVersionList.h"
-#include "logic/tasks/Task.h"
-#include "logic/net/NetJob.h"
-#include "logic/forge/ForgeVersion.h"
+#include "BaseVersionList.h"
+#include "tasks/Task.h"
+#include "net/NetJob.h"
+#include "forge/ForgeVersion.h"
class ForgeVersionList : public BaseVersionList
{
diff --git a/logic/forge/ForgeXzDownload.cpp b/logic/forge/ForgeXzDownload.cpp
index 65b20959..712deb33 100644
--- a/logic/forge/ForgeXzDownload.cpp
+++ b/logic/forge/ForgeXzDownload.cpp
@@ -13,7 +13,7 @@
* limitations under the License.
*/
-#include "logic/Env.h"
+#include "Env.h"
#include "ForgeXzDownload.h"
#include <pathutils.h>
diff --git a/logic/forge/ForgeXzDownload.h b/logic/forge/ForgeXzDownload.h
index 49cedbdf..45722812 100644
--- a/logic/forge/ForgeXzDownload.h
+++ b/logic/forge/ForgeXzDownload.h
@@ -15,8 +15,8 @@
#pragma once
-#include "logic/net/NetAction.h"
-#include "logic/net/HttpMetaCache.h"
+#include "net/NetAction.h"
+#include "net/HttpMetaCache.h"
#include <QFile>
#include <QTemporaryFile>
#include "ForgeMirror.h"
diff --git a/logic/forge/LegacyForge.h b/logic/forge/LegacyForge.h
index 5bc43fbf..f51d5e85 100644
--- a/logic/forge/LegacyForge.h
+++ b/logic/forge/LegacyForge.h
@@ -15,7 +15,7 @@
#pragma once
-#include "logic/minecraft/Mod.h"
+#include "minecraft/Mod.h"
class MinecraftForge : public Mod
{