Merge branch 'feature_derpstances' of https://github.com/02JanDal/MultiMC5 into feature_derpstances

Conflicts:
	gui/dialogs/OneSixModEditDialog.cpp
	logic/OneSixUpdate.cpp

1 files changed, 8 insertions, 2 deletions

diff --git a/logic/ForgeInstaller.h b/logic/ForgeInstaller.h
index 0b9f9c77..c5052092 100644
--- a/logic/ForgeInstaller.h
+++ b/logic/ForgeInstaller.h
@@ -14,17 +14,22 @@
  */
 
 #pragma once
+
+#include "BaseInstaller.h"
+
 #include <QString>
 #include <memory>
 
 class OneSixVersion;
 
-class ForgeInstaller
+class ForgeInstaller : public BaseInstaller
 {
 public:
 	ForgeInstaller(QString filename, QString universal_url);
 
-	bool apply(std::shared_ptr<OneSixVersion> to);
+	bool add(OneSixInstance *to) override;
+
+	QString id() const override { return "net.minecraftforge"; }
 
 private:
 	// the version, read from the installer
@@ -32,5 +37,6 @@ private:
 	QString internalPath;
 	QString finalPath;
 	QString realVersionId;
+	QString m_forgeVersionString;
 	QString m_universal_url;
 };