Merge branch 'feature_yggdrasil' into develop

Conflicts:
	gui/MainWindow.cpp
	logic/OneSixInstance.h

Fix missing session id functionality for legacy and old onesix.

1 files changed, 7 insertions, 0 deletions

diff --git a/MultiMC.h b/MultiMC.h
index cd4a5f7d..dba923b1 100644
--- a/MultiMC.h
+++ b/MultiMC.h
@@ -13,6 +13,7 @@ class LWJGLVersionList;
 class HttpMetaCache;
 class SettingsObject;
 class InstanceList;
+class MojangAccountList;
 class IconList;
 class QNetworkAccessManager;
 class ForgeVersionList;
@@ -57,6 +58,11 @@ public:
 		return m_instances;
 	}
 
+	std::shared_ptr<MojangAccountList> accounts()
+	{
+		return m_accounts;
+	}
+
 	std::shared_ptr<IconList> icons();
 
 	Status status()
@@ -101,6 +107,7 @@ private:
 	std::shared_ptr<QTranslator> m_mmc_translator;
 	std::shared_ptr<SettingsObject> m_settings;
 	std::shared_ptr<InstanceList> m_instances;
+	std::shared_ptr<MojangAccountList> m_accounts;
 	std::shared_ptr<IconList> m_icons;
 	std::shared_ptr<QNetworkAccessManager> m_qnam;
 	std::shared_ptr<HttpMetaCache> m_metacache;