Merge branch 'develop' into feature_badges

Conflicts:
	logic/OneSixInstance.cpp

1 files changed, 2 insertions, 2 deletions

diff --git a/logic/ForgeInstaller.h b/logic/ForgeInstaller.h
index c5052092..df029f38 100644
--- a/logic/ForgeInstaller.h
+++ b/logic/ForgeInstaller.h
@@ -20,7 +20,7 @@
 #include <QString>
 #include <memory>
 
-class OneSixVersion;
+class VersionFinal;
 
 class ForgeInstaller : public BaseInstaller
 {
@@ -33,7 +33,7 @@ public:
 
 private:
 	// the version, read from the installer
-	std::shared_ptr<OneSixVersion> m_forge_version;
+	std::shared_ptr<VersionFinal> m_forge_version;
 	QString internalPath;
 	QString finalPath;
 	QString realVersionId;