Merge branch 'master' of https://github.com/Stiepen22/MultiMC5 into develop

Conflicts:
	AppSettings.cpp
	MultiMC.pro
	main.cpp

1 files changed, 9 insertions, 0 deletions

diff --git a/logic/MinecraftProcess.h b/logic/MinecraftProcess.h
index 516bf986..a1dfa23f 100644
--- a/logic/MinecraftProcess.h
+++ b/logic/MinecraftProcess.h
@@ -59,6 +59,10 @@ public:
 	
 	void setMinecraftArguments(QStringList args);
 	
+	void killMinecraft();
+	
+	inline void setLogin(QString user, QString sid) { username = user; sessionID = sid; }
+	
 signals:
 	/**
 	 * @brief emitted when mc has finished and the PostLaunchCommand was run
@@ -83,4 +87,9 @@ protected slots:
 	void finish(int, QProcess::ExitStatus status);
 	void on_stdErr();
 	void on_stdOut();
+private:
+	bool killed;
+	MessageLevel::Enum getLevel(const QString &message, MessageLevel::Enum defaultLevel);
+	QString sessionID;
+	QString username;
 };