Merge branch 'develop' into feature_badges

Conflicts:
	logic/OneSixInstance.cpp

1 files changed, 12 insertions, 6 deletions

diff --git a/logic/OneSixInstance.h b/logic/OneSixInstance.h
index 06fd9de3..7a049922 100644
--- a/logic/OneSixInstance.h
+++ b/logic/OneSixInstance.h
@@ -17,7 +17,7 @@
 
 #include "BaseInstance.h"
 
-#include "OneSixVersion.h"
+#include "VersionFinal.h"
 #include "ModList.h"
 
 class OneSixInstance : public BaseInstance
@@ -53,14 +53,18 @@ public:
 
 	virtual QDialog *createModEditDialog(QWidget *parent) override;
 
-	/// reload the full version json files. return true on success!
-	bool reloadVersion(QWidget *widgetParent = 0);
+	/**
+	 * reload the full version json files. return true on success!
+	 * 
+	 * throws various exceptions :3
+	 */
+	void reloadVersion();
 	/// clears all version information in preparation for an update
 	void clearVersion();
 	/// get the current full version info
-	std::shared_ptr<OneSixVersion> getFullVersion() const;
+	std::shared_ptr<VersionFinal> getFullVersion() const;
 	/// gets the current version info, but only for version.json
-	std::shared_ptr<OneSixVersion> getVanillaVersion() const;
+	std::shared_ptr<VersionFinal> getVanillaVersion() const;
 	/// is the current version original, or custom?
 	virtual bool versionIsCustom() override;
 
@@ -75,10 +79,12 @@ public:
 	virtual QStringList externalPatches() const;
 	virtual bool providesVersionFile() const;
 
+	bool reload() override;
+
 signals:
 	void versionReloaded();
 
 private:
 	QStringList processMinecraftArgs(AuthSessionPtr account);
-	QDir reconstructAssets(std::shared_ptr<OneSixVersion> version);
+	QDir reconstructAssets(std::shared_ptr<VersionFinal> version);
 };