Instance settings moved to a page.

3 files changed, 6 insertions, 0 deletions

diff --git a/logic/BaseInstance.cpp b/logic/BaseInstance.cpp
index 59aada40..0088530f 100644
--- a/logic/BaseInstance.cpp
+++ b/logic/BaseInstance.cpp
@@ -58,6 +58,8 @@ BaseInstance::BaseInstance(BaseInstancePrivate *d_in, const QString &rootDir,
 
 	// Java Settings
 	settings().registerSetting("OverrideJava", false);
+	settings().registerSetting("OverrideJavaLocation", false);
+	settings().registerSetting("OverrideJavaArgs", false);
 	settings().registerOverride(globalSettings->getSetting("JavaPath"));
 	settings().registerOverride(globalSettings->getSetting("JvmArgs"));
 
diff --git a/logic/LegacyInstance.cpp b/logic/LegacyInstance.cpp
index 378c058b..5096d50d 100644
--- a/logic/LegacyInstance.cpp
+++ b/logic/LegacyInstance.cpp
@@ -32,6 +32,7 @@
 #include "gui/pages/ModFolderPage.h"
 #include "gui/pages/LegacyJarModPage.h"
 #include <gui/pages/TexturePackPage.h>
+#include <gui/pages/InstanceSettingsPage.h>
 
 LegacyInstance::LegacyInstance(const QString &rootDir, SettingsObject *settings,
 							   QObject *parent)
@@ -52,6 +53,7 @@ QList<BasePage *> LegacyInstance::getPages()
 	values.append(new ModFolderPage(loaderModList(), "mods", "plugin-blue", tr("Loader Mods")));
 	values.append(new ModFolderPage(coreModList(), "coremods", "plugin-green", tr("Core Mods")));
 	values.append(new TexturePackPage(this));
+	values.append(new InstanceSettingsPage(&settings()));
 	return values;
 }
 
diff --git a/logic/OneSixInstance.cpp b/logic/OneSixInstance.cpp
index 6de789df..1033c624 100644
--- a/logic/OneSixInstance.cpp
+++ b/logic/OneSixInstance.cpp
@@ -34,6 +34,7 @@
 #include <gui/pages/ModFolderPage.h>
 #include <gui/pages/ResourcePackPage.h>
 #include <gui/pages/TexturePackPage.h>
+#include <gui/pages/InstanceSettingsPage.h>
 
 OneSixInstance::OneSixInstance(const QString &rootDir, SettingsObject *settings,
 							   QObject *parent)
@@ -64,6 +65,7 @@ QList<BasePage *> OneSixInstance::getPages()
 	values.append(new ModFolderPage(coreModList(), "coremods", "plugin-green", tr("Core Mods")));
 	values.append(new ResourcePackPage(this));
 	values.append(new TexturePackPage(this));
+	values.append(new InstanceSettingsPage(&settings()));
 	return values;
 }