Merge branch 'develop' into feature_badges

Conflicts:
	logic/OneSixInstance.cpp

40 files changed, 2677 insertions, 1752 deletions

diff --git a/.gitignore b/.gitignore
index 2ef0d673..d49ca85b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,6 +13,8 @@ MultiMC5.kdev4
 MultiMC.pro.user
 CMakeLists.txt.user
 CMakeLists.txt.user.*
+/.project
+/.settings
 
 # Build dirs
 build
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 54a4be19..d9279bcb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -257,6 +257,7 @@ SET(MULTIMC_SOURCES
 MultiMC.h
 MultiMC.cpp
 MultiMCVersion.h
+MMCError.h
 
 # Logging
 logger/QsDebugOutput.cpp
@@ -353,6 +354,10 @@ logic/ModList.cpp
 logic/InstanceLauncher.h
 logic/InstanceLauncher.cpp
 
+# JSON parsing helpers
+logic/MMCJson.h
+logic/MMCJson.cpp
+
 # network stuffs
 logic/net/NetAction.h
 logic/net/MD5EtagDownload.h
@@ -414,31 +419,38 @@ logic/LegacyInstance.cpp
 logic/LegacyInstance_p.h
 logic/LegacyUpdate.h
 logic/LegacyUpdate.cpp
+
 logic/LegacyForge.h
 logic/LegacyForge.cpp
 
 # OneSix instances
 logic/OneSixUpdate.h
 logic/OneSixUpdate.cpp
-logic/OneSixVersion.h
-logic/OneSixVersion.cpp
+logic/OneSixInstance.h
+logic/OneSixInstance.cpp
+logic/OneSixInstance_p.h
+
+# OneSix version json infrastructure
+logic/OneSixVersionBuilder.h
+logic/OneSixVersionBuilder.cpp
+logic/VersionFile.h
+logic/VersionFile.cpp
+logic/VersionFinal.h
+logic/VersionFinal.cpp
 logic/OneSixLibrary.h
 logic/OneSixLibrary.cpp
 logic/OneSixRule.h
 logic/OneSixRule.cpp
 logic/OpSys.h
 logic/OpSys.cpp
+
+# Mod installers
 logic/BaseInstaller.h
 logic/BaseInstaller.cpp
 logic/ForgeInstaller.h
 logic/ForgeInstaller.cpp
 logic/LiteLoaderInstaller.h
 logic/LiteLoaderInstaller.cpp
-logic/OneSixInstance.h
-logic/OneSixInstance.cpp
-logic/OneSixInstance_p.h
-logic/OneSixVersionBuilder.h
-logic/OneSixVersionBuilder.cpp
 
 # Nostalgia
 logic/NostalgiaInstance.h
@@ -758,24 +770,8 @@ INCLUDE(CPack)
 
 include_directories(${PROJECT_BINARY_DIR}/include)
 
-### translation stuff
-
-file (GLOB TRANSLATIONS_FILES translations/*.ts)
-
-option (UPDATE_TRANSLATIONS "Update source translation translations/*.ts files (WARNING: make clean will delete the source .ts files! Danger!)")
-IF(UPDATE_TRANSLATIONS)
-      qt5_create_translation(QM_FILES ${FILES_TO_TRANSLATE} ${TRANSLATIONS_FILES})
-ELSE()
-      qt5_add_translation(QM_FILES ${TRANSLATIONS_FILES})
-ENDIF()
-
-add_custom_target (translations DEPENDS ${QM_FILES})
-IF(APPLE AND UNIX) ## OSX
-      install(FILES ${QM_FILES} DESTINATION MultiMC.app/Contents/MacOS/translations)
-ELSE()
-      install(FILES ${QM_FILES} DESTINATION translations)
-ENDIF()
-
+# Translations
+add_subdirectory(translations)
 
 # Tests
 add_subdirectory(tests)
diff --git a/MMCError.h b/MMCError.h
new file mode 100644
index 00000000..1f72b7a4
--- /dev/null
+++ b/MMCError.h
@@ -0,0 +1,25 @@
+#pragma once
+#include <exception>
+#include <QString>
+#include <logger/QsLog.h>
+
+class MMCError : public std::exception
+{
+public:
+	MMCError(QString cause)
+	{
+		exceptionCause = cause;
+		QLOG_ERROR() << "Exception: " + cause;
+	};
+	virtual ~MMCError() noexcept {}
+	virtual const char *what() const noexcept
+	{
+		return exceptionCause.toLocal8Bit();
+	};
+	virtual QString cause() const
+	{
+		return exceptionCause;
+	}
+private:
+	QString exceptionCause;
+};
diff --git a/MultiMC.cpp b/MultiMC.cpp
index a0745a87..f6e4e995 100644
--- a/MultiMC.cpp
+++ b/MultiMC.cpp
@@ -1,4 +1,3 @@
-
 #include "MultiMC.h"
 #include <iostream>
 #include <QDir>
@@ -43,6 +42,11 @@
 #include "logger/QsLog.h"
 #include <logger/QsLogDest.h>
 
+#ifdef Q_OS_WIN32
+#include <windows.h>
+static const int APPDATA_BUFFER_SIZE = 1024;
+#endif
+
 using namespace Util::Commandline;
 
 MultiMC::MultiMC(int &argc, char **argv, bool root_override)
@@ -340,7 +344,16 @@ void MultiMC::initGlobalSettings()
 #ifdef Q_OS_LINUX
 	QString ftbDefault = QDir::home().absoluteFilePath(".ftblauncher");
 #elif defined(Q_OS_WIN32)
-	QString ftbDefault = PathCombine(QStandardPaths::writableLocation(QStandardPaths::DataLocation), "/ftblauncher");
+	wchar_t buf[APPDATA_BUFFER_SIZE];
+	QString ftbDefault;
+	if(!GetEnvironmentVariableW(L"APPDATA", buf, APPDATA_BUFFER_SIZE))
+	{
+		QLOG_FATAL() << "Your APPDATA folder is missing! If you are on windows, this means your system is broken. If you aren't on windows, how the **** are you running the windows build????";
+	}
+	else
+	{
+		ftbDefault = PathCombine(QString::fromWCharArray(buf), "ftblauncher");
+	}
 #elif defined(Q_OS_MAC)
 	QString ftbDefault =
 		PathCombine(QDir::homePath(), "Library/Application Support/ftblauncher");
@@ -457,6 +470,7 @@ void MultiMC::initHttpMetaCache()
 	m_metacache->addBase("versions", QDir("versions").absolutePath());
 	m_metacache->addBase("libraries", QDir("libraries").absolutePath());
 	m_metacache->addBase("minecraftforge", QDir("mods/minecraftforge").absolutePath());
+	m_metacache->addBase("liteloader", QDir("mods/liteloader").absolutePath());
 	m_metacache->addBase("skins", QDir("accounts/skins").absolutePath());
 	m_metacache->addBase("root", QDir(root()).absolutePath());
 	m_metacache->Load();
diff --git a/depends/settings/inisettingsobject.cpp b/depends/settings/inisettingsobject.cpp
index 5e52a56f..2cee8e3c 100644
--- a/depends/settings/inisettingsobject.cpp
+++ b/depends/settings/inisettingsobject.cpp
@@ -28,6 +28,11 @@ void INISettingsObject::setFilePath(const QString &filePath)
 	m_filePath = filePath;
 }
 
+bool INISettingsObject::reload()
+{
+	return m_ini.loadFile(m_filePath) && SettingsObject::reload();
+}
+
 void INISettingsObject::changeSetting(const Setting &setting, QVariant value)
 {
 	if (contains(setting.id()))
diff --git a/depends/settings/inisettingsobject.h b/depends/settings/inisettingsobject.h
index 8badc0c6..12370896 100644
--- a/depends/settings/inisettingsobject.h
+++ b/depends/settings/inisettingsobject.h
@@ -47,6 +47,8 @@ public:
 	 */
 	virtual void setFilePath(const QString &filePath);
 
+	bool reload() override;
+
 protected
 slots:
 	virtual void changeSetting(const Setting &setting, QVariant value);
diff --git a/depends/settings/settingsobject.cpp b/depends/settings/settingsobject.cpp
index 43fc989a..0e3030df 100644
--- a/depends/settings/settingsobject.cpp
+++ b/depends/settings/settingsobject.cpp
@@ -126,6 +126,15 @@ bool SettingsObject::contains(const QString &id)
 	return m_settings.contains(id);
 }
 
+bool SettingsObject::reload()
+{
+	for (auto setting : m_settings.values())
+	{
+		setting->set(setting->get());
+	}
+	return true;
+}
+
 void SettingsObject::connectSignals(const Setting &setting)
 {
 	connect(&setting, SIGNAL(settingChanged(const Setting &, QVariant)),
diff --git a/depends/settings/settingsobject.h b/depends/settings/settingsobject.h
index 27746f2d..b1b26b09 100644
--- a/depends/settings/settingsobject.h
+++ b/depends/settings/settingsobject.h
@@ -113,6 +113,12 @@ public:
 	 */
 	bool contains(const QString &id);
 
+	/*!
+	 * \brief Reloads the settings and emit signals for changed settings
+	 * \return True if reloading was successful
+	 */
+	virtual bool reload();
+
 signals:
 	/*!
 	 * \brief Signal emitted when one of this SettingsObject object's settings changes.
diff --git a/gui/dialogs/OneSixModEditDialog.cpp b/gui/dialogs/OneSixModEditDialog.cpp
index fe621a9a..78585a05 100644
--- a/gui/dialogs/OneSixModEditDialog.cpp
+++ b/gui/dialogs/OneSixModEditDialog.cpp
@@ -34,7 +34,7 @@
 #include "gui/dialogs/ProgressDialog.h"
 
 #include "logic/ModList.h"
-#include "logic/OneSixVersion.h"
+#include "logic/VersionFinal.h"
 #include "logic/EnabledItemFilter.h"
 #include "logic/lists/ForgeVersionList.h"
 #include "logic/lists/LiteLoaderVersionList.h"
@@ -42,8 +42,7 @@
 #include "logic/LiteLoaderInstaller.h"
 #include "logic/OneSixVersionBuilder.h"
 
-template<typename A, typename B>
-QMap<A, B> invert(const QMap<B, A> &in)
+template <typename A, typename B> QMap<A, B> invert(const QMap<B, A> &in)
 {
 	QMap<A, B> out;
 	for (auto it = in.begin(); it != in.end(); ++it)
@@ -96,7 +95,8 @@ OneSixModEditDialog::OneSixModEditDialog(OneSixInstance *inst, QWidget *parent)
 		m_resourcepacks->startWatching();
 	}
 
-	connect(m_inst, &OneSixInstance::versionReloaded, this, &OneSixModEditDialog::updateVersionControls);
+	connect(m_inst, &OneSixInstance::versionReloaded, this,
+			&OneSixModEditDialog::updateVersionControls);
 }
 
 OneSixModEditDialog::~OneSixModEditDialog()
@@ -110,7 +110,6 @@ void OneSixModEditDialog::updateVersionControls()
 {
 	ui->forgeBtn->setEnabled(true);
 	ui->liteloaderBtn->setEnabled(true);
-	ui->mainClassEdit->setText(m_version->mainClass);
 }
 
 void OneSixModEditDialog::disableVersionControls()
@@ -119,125 +118,86 @@ void OneSixModEditDialog::disableVersionControls()
 	ui->liteloaderBtn->setEnabled(false);
 	ui->reloadLibrariesBtn->setEnabled(false);
 	ui->removeLibraryBtn->setEnabled(false);
-	ui->mainClassEdit->setText("");
+}
+
+bool OneSixModEditDialog::reloadInstanceVersion()
+{
+	try
+	{
+		m_inst->reloadVersion();
+		return true;
+	}
+	catch (MMCError &e)
+	{
+		QMessageBox::critical(this, tr("Error"), e.cause());
+		return false;
+	}
+	catch (...)
+	{
+		QMessageBox::critical(
+			this, tr("Error"),
+			tr("Failed to load the version description file for reasons unknown."));
+		return false;
+	}
 }
 
 void OneSixModEditDialog::on_reloadLibrariesBtn_clicked()
 {
-	m_inst->reloadVersion(this);
+	reloadInstanceVersion();
 }
 
 void OneSixModEditDialog::on_removeLibraryBtn_clicked()
 {
 	if (ui->libraryTreeView->currentIndex().isValid())
 	{
+		// FIXME: use actual model, not reloading.
 		if (!m_version->remove(ui->libraryTreeView->currentIndex().row()))
 		{
 			QMessageBox::critical(this, tr("Error"), tr("Couldn't remove file"));
 		}
 		else
 		{
-			m_inst->reloadVersion(this);
+			reloadInstanceVersion();
 		}
 	}
 }
 
 void OneSixModEditDialog::on_resetLibraryOrderBtn_clicked()
 {
-	QDir(m_inst->instanceRoot()).remove("order.json");
-	m_inst->reloadVersion(this);
+	// FIXME: IMPLEMENT LOGIC IN MODEL. SEE LEGACY DIALOG FOR EXAMPLE(S).
 }
+
 void OneSixModEditDialog::on_moveLibraryUpBtn_clicked()
 {
-
-	QMap<QString, int> order = getExistingOrder();
-	if (order.size() < 2 || ui->libraryTreeView->selectionModel()->selectedIndexes().isEmpty())
-	{
-		return;
-	}
-	const int ourRow = ui->libraryTreeView->selectionModel()->selectedIndexes().first().row();
-	const QString ourId = m_version->versionFileId(ourRow);
-	const int ourOrder = order[ourId];
-	if (ourId.isNull() || ourId.startsWith("org.multimc."))
-	{
-		return;
-	}
-
-	QMap<int, QString> sortedOrder = invert(order);
-
-	QList<int> sortedOrders = sortedOrder.keys();
-	const int ourIndex = sortedOrders.indexOf(ourOrder);
-	if (ourIndex <= 0)
-	{
-		return;
-	}
-	const int ourNewOrder = sortedOrders.at(ourIndex - 1);
-	order[ourId] = ourNewOrder;
-	order[sortedOrder[sortedOrders[ourIndex - 1]]] = ourOrder;
-
-	if (!OneSixVersionBuilder::writeOverrideOrders(order, m_inst))
-	{
-		QMessageBox::critical(this, tr("Error"), tr("Couldn't save the new order"));
-	}
-	else
-	{
-		m_inst->reloadVersion(this);
-		ui->libraryTreeView->selectionModel()->select(m_version->index(ourRow - 1), QItemSelectionModel::SelectCurrent);
-	}
+	// FIXME: IMPLEMENT LOGIC IN MODEL. SEE LEGACY DIALOG FOR EXAMPLE(S).
 }
+
 void OneSixModEditDialog::on_moveLibraryDownBtn_clicked()
 {
-	QMap<QString, int> order = getExistingOrder();
-	if (order.size() < 2 || ui->libraryTreeView->selectionModel()->selectedIndexes().isEmpty())
-	{
-		return;
-	}
-	const int ourRow = ui->libraryTreeView->selectionModel()->selectedIndexes().first().row();
-	const QString ourId = m_version->versionFileId(ourRow);
-	const int ourOrder = order[ourId];
-	if (ourId.isNull() || ourId.startsWith("org.multimc."))
-	{
-		return;
-	}
-
-	QMap<int, QString> sortedOrder = invert(order);
-
-	QList<int> sortedOrders = sortedOrder.keys();
-	const int ourIndex = sortedOrders.indexOf(ourOrder);
-	if ((ourIndex + 1) >= sortedOrders.size())
-	{
-		return;
-	}
-	const int ourNewOrder = sortedOrders.at(ourIndex + 1);
-	order[ourId] = ourNewOrder;
-	order[sortedOrder[sortedOrders[ourIndex + 1]]] = ourOrder;
-
-	if (!OneSixVersionBuilder::writeOverrideOrders(order, m_inst))
-	{
-		QMessageBox::critical(this, tr("Error"), tr("Couldn't save the new order"));
-	}
-	else
-	{
-		m_inst->reloadVersion(this);
-		ui->libraryTreeView->selectionModel()->select(m_version->index(ourRow + 1), QItemSelectionModel::SelectCurrent);
-	}
+	// FIXME: IMPLEMENT LOGIC IN MODEL. SEE LEGACY DIALOG FOR EXAMPLE(S).
 }
 
 void OneSixModEditDialog::on_forgeBtn_clicked()
 {
+	// FIXME: use actual model, not reloading. Move logic to model.
+
+	// FIXME: model::isCustom();
 	if (QDir(m_inst->instanceRoot()).exists("custom.json"))
 	{
-		if (QMessageBox::question(this, tr("Revert?"), tr("This action will remove your custom.json. Continue?")) != QMessageBox::Yes)
+		if (QMessageBox::question(this, tr("Revert?"),
+								  tr("This action will remove your custom.json. Continue?")) !=
+			QMessageBox::Yes)
 		{
 			return;
 		}
+		// FIXME: model::revertToBase();
 		QDir(m_inst->instanceRoot()).remove("custom.json");
-		m_inst->reloadVersion(this);
+		reloadInstanceVersion();
 	}
 	VersionSelectDialog vselect(MMC->forgelist().get(), tr("Select Forge version"), this);
 	vselect.setFilter(1, m_inst->currentVersionId());
 	vselect.setEmptyString(tr("No Forge versions are currently available for Minecraft ") +
-							  m_inst->currentVersionId());
+						   m_inst->currentVersionId());
 	if (vselect.exec() && vselect.selectedVersion())
 	{
 		ForgeVersionPtr forgeVersion =
@@ -277,28 +237,32 @@ void OneSixModEditDialog::on_forgeBtn_clicked()
 			}
 		}
 	}
-	m_inst->reloadVersion(this);
+	reloadInstanceVersion();
 }
 
 void OneSixModEditDialog::on_liteloaderBtn_clicked()
 {
+	// FIXME: model...
 	if (QDir(m_inst->instanceRoot()).exists("custom.json"))
 	{
-		if (QMessageBox::question(this, tr("Revert?"), tr("This action will remove your custom.json. Continue?")) != QMessageBox::Yes)
+		if (QMessageBox::question(this, tr("Revert?"),
+								  tr("This action will remove your custom.json. Continue?")) !=
+			QMessageBox::Yes)
 		{
 			return;
 		}
 		QDir(m_inst->instanceRoot()).remove("custom.json");
-		m_inst->reloadVersion(this);
+		reloadInstanceVersion();
 	}
-	VersionSelectDialog vselect(MMC->liteloaderlist().get(), tr("Select LiteLoader version"), this);
+	VersionSelectDialog vselect(MMC->liteloaderlist().get(), tr("Select LiteLoader version"),
+								this);
 	vselect.setFilter(1, m_inst->currentVersionId());
 	vselect.setEmptyString(tr("No LiteLoader versions are currently available for Minecraft ") +
-							  m_inst->currentVersionId());
+						   m_inst->currentVersionId());
 	if (vselect.exec() && vselect.selectedVersion())
 	{
 		LiteLoaderVersionPtr liteloaderVersion =
-				std::dynamic_pointer_cast<LiteLoaderVersion>(vselect.selectedVersion());
+			std::dynamic_pointer_cast<LiteLoaderVersion>(vselect.selectedVersion());
 		if (!liteloaderVersion)
 			return;
 		LiteLoaderInstaller liteloader(liteloaderVersion);
@@ -310,7 +274,7 @@ void OneSixModEditDialog::on_liteloaderBtn_clicked()
 		}
 		else
 		{
-			m_inst->reloadVersion(this);
+			reloadInstanceVersion();
 		}
 	}
 }
@@ -347,35 +311,6 @@ bool OneSixModEditDialog::resourcePackListFilter(QKeyEvent *keyEvent)
 	return QDialog::eventFilter(ui->resPackTreeView, keyEvent);
 }
 
-QMap<QString, int> OneSixModEditDialog::getExistingOrder() const
-{
-
-	QMap<QString, int> order;
-	// default
-	{
-		for (OneSixVersion::VersionFile file : m_version->versionFiles)
-		{
-			if (file.id.startsWith("org.multimc."))
-			{
-				continue;
-			}
-			order.insert(file.id, file.order);
-		}
-	}
-	// overriden
-	{
-		QMap<QString, int> overridenOrder = OneSixVersionBuilder::readOverrideOrders(m_inst);
-		for (auto id : order.keys())
-		{
-			if (overridenOrder.contains(id))
-			{
-				order[id] = overridenOrder[id];
-			}
-		}
-	}
-	return order;
-}
-
 bool OneSixModEditDialog::eventFilter(QObject *obj, QEvent *ev)
 {
 	if (ev->type() != QEvent::KeyPress)
@@ -461,7 +396,8 @@ void OneSixModEditDialog::loaderCurrent(QModelIndex current, QModelIndex previou
 	ui->frame->updateWithMod(m);
 }
 
-void OneSixModEditDialog::versionCurrent(const QModelIndex &current, const QModelIndex &previous)
+void OneSixModEditDialog::versionCurrent(const QModelIndex &current,
+										 const QModelIndex &previous)
 {
 	if (!current.isValid())
 	{
diff --git a/gui/dialogs/OneSixModEditDialog.h b/gui/dialogs/OneSixModEditDialog.h
index f44b336b..e106c6fe 100644
--- a/gui/dialogs/OneSixModEditDialog.h
+++ b/gui/dialogs/OneSixModEditDialog.h
@@ -57,17 +57,17 @@ protected:
 	bool eventFilter(QObject *obj, QEvent *ev);
 	bool loaderListFilter(QKeyEvent *ev);
 	bool resourcePackListFilter(QKeyEvent *ev);
+	/// FIXME: this shouldn't be necessary!
+	bool reloadInstanceVersion();
 
 private:
 	Ui::OneSixModEditDialog *ui;
-	std::shared_ptr<OneSixVersion> m_version;
+	std::shared_ptr<VersionFinal> m_version;
 	std::shared_ptr<ModList> m_mods;
 	std::shared_ptr<ModList> m_resourcepacks;
 	EnabledItemFilter *main_model;
 	OneSixInstance *m_inst;
 
-	QMap<QString, int> getExistingOrder() const;
-
 public
 slots:
 	void loaderCurrent(QModelIndex current, QModelIndex previous);
diff --git a/gui/dialogs/OneSixModEditDialog.ui b/gui/dialogs/OneSixModEditDialog.ui
index eaf8f7fd..b606dcd2 100644
--- a/gui/dialogs/OneSixModEditDialog.ui
+++ b/gui/dialogs/OneSixModEditDialog.ui
@@ -48,24 +48,6 @@
            </attribute>
           </widget>
          </item>
-         <item>
-          <layout class="QHBoxLayout" name="horizontalLayout_7">
-           <item>
-            <widget class="QLabel" name="label">
-             <property name="text">
-              <string>Main Class:</string>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <widget class="QLineEdit" name="mainClassEdit">
-             <property name="enabled">
-              <bool>false</bool>
-             </property>
-            </widget>
-           </item>
-          </layout>
-         </item>
         </layout>
        </item>
        <item>
@@ -109,13 +91,6 @@
           </widget>
          </item>
          <item>
-          <widget class="QPushButton" name="resetLibraryOrderBtn">
-           <property name="text">
-            <string>Reset order</string>
-           </property>
-          </widget>
-         </item>
-         <item>
           <widget class="Line" name="line_2">
            <property name="orientation">
             <enum>Qt::Horizontal</enum>
@@ -124,6 +99,12 @@
          </item>
          <item>
           <widget class="QPushButton" name="moveLibraryUpBtn">
+           <property name="enabled">
+            <bool>false</bool>
+           </property>
+           <property name="toolTip">
+            <string>This isn't implemented yet.</string>
+           </property>
            <property name="text">
             <string>Move up</string>
            </property>
@@ -131,12 +112,31 @@
          </item>
          <item>
           <widget class="QPushButton" name="moveLibraryDownBtn">
+           <property name="enabled">
+            <bool>false</bool>
+           </property>
+           <property name="toolTip">
+            <string>This isn't implemented yet.</string>
+           </property>
            <property name="text">
             <string>Move down</string>
            </property>
           </widget>
          </item>
          <item>
+          <widget class="QPushButton" name="resetLibraryOrderBtn">
+           <property name="enabled">
+            <bool>false</bool>
+           </property>
+           <property name="toolTip">
+            <string>This isn't implemented yet.</string>
+           </property>
+           <property name="text">
+            <string>Reset order</string>
+           </property>
+          </widget>
+         </item>
+         <item>
           <spacer name="verticalSpacer_7">
            <property name="orientation">
             <enum>Qt::Vertical</enum>
diff --git a/logic/BaseInstaller.cpp b/logic/BaseInstaller.cpp
index 92aa0c92..669fd0ac 100644
--- a/logic/BaseInstaller.cpp
+++ b/logic/BaseInstaller.cpp
@@ -17,7 +17,7 @@
 
 #include <QFile>
 
-#include "OneSixVersion.h"
+#include "VersionFinal.h"
 #include "OneSixLibrary.h"
 #include "OneSixInstance.h"
 
diff --git a/logic/BaseInstance.cpp b/logic/BaseInstance.cpp
index 24af20cf..c7b29548 100644
--- a/logic/BaseInstance.cpp
+++ b/logic/BaseInstance.cpp
@@ -168,6 +168,11 @@ bool BaseInstance::canLaunch() const
 	return !flags().contains(VersionBrokenFlag);
 }
 
+bool BaseInstance::reload()
+{
+	return settings().reload();
+}
+
 QString BaseInstance::baseJar() const
 {
 	I_D(BaseInstance);
diff --git a/logic/BaseInstance.h b/logic/BaseInstance.h
index 443b0eaa..d38ae409 100644
--- a/logic/BaseInstance.h
+++ b/logic/BaseInstance.h
@@ -190,6 +190,8 @@ public:
 
 	bool canLaunch() const;
 
+	virtual bool reload();
+
 signals:
 	/*!
 	 * \brief Signal emitted when properties relevant to the instance view change
diff --git a/logic/ForgeInstaller.cpp b/logic/ForgeInstaller.cpp
index 3e18d17f..6f238c21 100644
--- a/logic/ForgeInstaller.cpp
+++ b/logic/ForgeInstaller.cpp
@@ -14,7 +14,7 @@
  */
 
 #include "ForgeInstaller.h"
-#include "OneSixVersion.h"
+#include "VersionFinal.h"
 #include "OneSixLibrary.h"
 #include "net/HttpMetaCache.h"
 #include <quazip.h>
@@ -33,7 +33,7 @@
 
 ForgeInstaller::ForgeInstaller(QString filename, QString universal_url)
 {
-	std::shared_ptr<OneSixVersion> newVersion;
+	std::shared_ptr<VersionFinal> newVersion;
 	m_universal_url = universal_url;
 
 	QuaZip zip(filename);
@@ -66,7 +66,7 @@ ForgeInstaller::ForgeInstaller(QString filename, QString universal_url)
 
 	// read the forge version info
 	{
-		newVersion = OneSixVersion::fromJson(versionInfoVal.toObject());
+		newVersion = VersionFinal::fromJson(versionInfoVal.toObject());
 		if (!newVersion)
 			return;
 	}
diff --git a/logic/ForgeInstaller.h b/logic/ForgeInstaller.h
index c5052092..df029f38 100644
--- a/