Merge branch 'inst_rewrite' of https://github.com/Forkk/MultiMC5

Conflicts:
	data/instancemodel.cpp

1 files changed, 10 insertions, 2 deletions

diff --git a/main.cpp b/main.cpp
index 6e840317..b78774a8 100644
--- a/main.cpp
+++ b/main.cpp
@@ -17,10 +17,13 @@
 #include "gui/mainwindow.h"
 #include <QApplication>
 
-#include "data/appsettings.h"
-
+#include "appsettings.h"
 #include "data/loginresponse.h"
 
+#include "data/plugin/pluginmanager.h"
+
+#include "pathutils.h"
+
 int main(int argc, char *argv[])
 {
 	QApplication app(argc, argv);
@@ -32,6 +35,11 @@ int main(int argc, char *argv[])
 	// Register meta types.
 	qRegisterMetaType<LoginResponse>("LoginResponse");
 	
+	
+	// Initialize plugins.
+	PluginManager::get().loadPlugins(PathCombine(qApp->applicationDirPath(), "plugins"));
+	PluginManager::get().initInstanceTypes();
+	
 	MainWindow mainWin;
 	mainWin.show();