Merge branch 'develop' of github.com:MultiMC/MultiMC5 into feature_news

Conflicts:
	CMakeLists.txt
	gui/MainWindow.h

1 files changed, 20 insertions, 0 deletions

diff --git a/logic/OneSixFTBInstance.h b/logic/OneSixFTBInstance.h
new file mode 100644
index 00000000..7600090c
--- /dev/null
+++ b/logic/OneSixFTBInstance.h
@@ -0,0 +1,20 @@
+#pragma once
+
+#include "OneSixInstance.h"
+
+class OneSixLibrary;
+
+class OneSixFTBInstance : public OneSixInstance
+{
+	Q_OBJECT
+public:
+	explicit OneSixFTBInstance(const QString &rootDir, SettingsObject *settings,
+							QObject *parent = 0);
+	virtual QString getStatusbarDescription();
+	virtual bool menuActionEnabled(QString action_name) const;
+
+	virtual std::shared_ptr<Task> doUpdate(bool only_prepare) override;
+
+private:
+	std::shared_ptr<OneSixLibrary> m_forge;
+};