Merge https://github.com/Forkk/MultiMC5

Conflicts:
	gui/mainwindow.ui

1 files changed, 11 insertions, 0 deletions

diff --git a/main.cpp b/main.cpp
index 0d429c8d..6e840317 100644
--- a/main.cpp
+++ b/main.cpp
@@ -1,3 +1,4 @@
+
 /* Copyright 2013 MultiMC Contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,10 +17,20 @@
 #include "gui/mainwindow.h"
 #include <QApplication>
 
+#include "data/appsettings.h"
+
+#include "data/loginresponse.h"
 
 int main(int argc, char *argv[])
 {
 	QApplication app(argc, argv);
+	app.setOrganizationName("Forkk");
+	app.setApplicationName("MultiMC 5");
+	
+	settings = new AppSettings(&app);
+	
+	// Register meta types.
+	qRegisterMetaType<LoginResponse>("LoginResponse");
 	
 	MainWindow mainWin;
 	mainWin.show();