From a8e77f0ecc2f6e15896b1d6171fd66c73478d5e8 Mon Sep 17 00:00:00 2001 From: Petr Mrázek Date: Thu, 15 Nov 2018 00:36:47 +0100 Subject: NOISSUE remove some nonsense and dead code --- application/InstancePageProvider.h | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) (limited to 'application/InstancePageProvider.h') diff --git a/application/InstancePageProvider.h b/application/InstancePageProvider.h index ae279d94..e72ba797 100644 --- a/application/InstancePageProvider.h +++ b/application/InstancePageProvider.h @@ -7,7 +7,6 @@ #include "pages/instance/LogPage.h" #include "pages/instance/VersionPage.h" #include "pages/instance/ModFolderPage.h" -#include "pages/instance/NewModFolderPage.h" #include "pages/instance/ResourcePackPage.h" #include "pages/instance/TexturePackPage.h" #include "pages/instance/NotesPage.h" @@ -38,19 +37,9 @@ public: if(onesix) { values.append(new VersionPage(onesix.get())); - if(ENV.isFeatureEnabled("NewModsPage")) - { - auto modsPage = new NewModFolderPage(onesix.get(), onesix->modsModel(), "mods", "loadermods", tr("Mods"), "Mods-page"); - modsPage->setFilter("%1 (*.zip *.jar *.litemod)"); - values.append(modsPage); - } - else - { - auto modsPage = new ModFolderPage(onesix.get(), onesix->loaderModList(), "mods", "loadermods", tr("Loader mods"), "Loader-mods"); - modsPage->setFilter("%1 (*.zip *.jar *.litemod)"); - values.append(modsPage); - } - + auto modsPage = new ModFolderPage(onesix.get(), onesix->loaderModList(), "mods", "loadermods", tr("Loader mods"), "Loader-mods"); + modsPage->setFilter("%1 (*.zip *.jar *.litemod)"); + values.append(modsPage); values.append(new CoreModFolderPage(onesix.get(), onesix->coreModList(), "coremods", "coremods", tr("Core mods"), "Core-mods")); values.append(new ResourcePackPage(onesix.get())); values.append(new TexturePackPage(onesix.get())); -- cgit