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

Conflicts:
	CMakeLists.txt
	gui/MainWindow.h

1 files changed, 13 insertions, 0 deletions

diff --git a/logic/LegacyFTBInstance.h b/logic/LegacyFTBInstance.h
new file mode 100644
index 00000000..2ae72797
--- /dev/null
+++ b/logic/LegacyFTBInstance.h
@@ -0,0 +1,13 @@
+#pragma once
+
+#include "LegacyInstance.h"
+
+class LegacyFTBInstance : public LegacyInstance
+{
+	Q_OBJECT
+public:
+	explicit LegacyFTBInstance(const QString &rootDir, SettingsObject *settings,
+							   QObject *parent = 0);
+	virtual QString getStatusbarDescription();
+	virtual bool menuActionEnabled(QString action_name) const;
+};