diff --git a/CHANGELOG.md b/CHANGELOG.md
index f5f41fe75..35dbefe0b 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,7 @@
 # Refined Storage Changelog
 
 ### 1.5.6
+- Updated Forge to stable 2387 (raoulvdberge)
 - Removed Processing Pattern Encoder, that functionality is now available in the Pattern Grid (raoulvdberge)
 
 ### 1.5.5
diff --git a/build.gradle b/build.gradle
index 84a3cf42d..4e0311f19 100755
--- a/build.gradle
+++ b/build.gradle
@@ -28,10 +28,10 @@ sourceCompatibility = 1.8
 targetCompatibility = 1.8
 
 minecraft {
-    version = "1.12-14.21.0.2363"
+    version = "1.12-14.21.1.2387"
     runDir = "run"
     useDepAts = true
-    mappings = "snapshot_20170624"
+    mappings = "snapshot_20170629"
 }
 
 repositories {
@@ -47,9 +47,9 @@ repositories {
 }
 
 dependencies {
-    deobfCompile "mezz.jei:jei_1.12:4.7.0.67:api"
-    runtime "mezz.jei:jei_1.12:4.7.0.67"
-    deobfCompile "MCMultiPart2:MCMultiPart:2.2.1"
+    deobfCompile "mezz.jei:jei_1.12:4.7.0.68:api"
+    runtime "mezz.jei:jei_1.12:4.7.0.68"
+    deobfCompile "MCMultiPart2:MCMultiPart:2.2.2"
     // deobfCompile "li.cil.oc:OpenComputers:MC1.11.2-1.7.0.28:api"
 }
 
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/gui/config/ModGuiFactory.java b/src/main/java/com/raoulvdberge/refinedstorage/gui/config/ModGuiFactory.java
index d365d711b..029cdc6ee 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/gui/config/ModGuiFactory.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/gui/config/ModGuiFactory.java
@@ -22,20 +22,8 @@ public class ModGuiFactory implements IModGuiFactory {
         return new ModGuiConfig(parentScreen);
     }
 
-    @Override
-    @SuppressWarnings("deprecation")
-    public Class<? extends GuiScreen> mainConfigGuiClass() {
-        return ModGuiConfig.class;
-    }
-
     @Override
     public Set<RuntimeOptionCategoryElement> runtimeGuiCategories() {
         return null;
     }
-
-    @Override
-    @SuppressWarnings("deprecation")
-    public RuntimeOptionGuiHandler getHandlerFor(RuntimeOptionCategoryElement element) {
-        return null;
-    }
 }