diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8f4741149..8a7c399ec 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,7 @@
 - Fixed fluids not caring about NBT tags (raoulvdberge)
 - Fixed fluids that have less than 1 bucket stored render only partly in Fluid Grid (raoulvdberge)
 - Fixed Fluid Interface voiding bucket when shift clicking to out slot (raoulvdberge)
+- Updated to Forge 2077 (raoulvdberge)
 
 ### 0.9.4
 - Little fixes in German translation (ThexXTURBOXx)
diff --git a/build.gradle b/build.gradle
index 7125d7b40..35c0c780f 100755
--- a/build.gradle
+++ b/build.gradle
@@ -28,10 +28,10 @@ sourceCompatibility = 1.8
 targetCompatibility = 1.8
 
 minecraft {
-    version = "1.10.2-12.18.1.2065"
+    version = "1.10.2-12.18.1.2077"
     runDir = "run"
     useDepAts = true
-    mappings = "snapshot_20160518"
+    mappings = "snapshot_20160910"
 }
 
 repositories {
@@ -53,7 +53,7 @@ repositories {
 dependencies {
     deobfCompile "mezz.jei:jei_1.10.2:3.9.+"
     compile "net.darkhax.tesla:Tesla:1.10-1.2.+"
-    compile "net.industrial-craft:industrialcraft-2:2.6.41-ex110:api"
+    compile "net.industrial-craft:industrialcraft-2:2.6.60-ex110:api"
     deobfCompile "MCMultiPart:MCMultiPart:1.2.1+:universal"
 }
 
diff --git a/src/main/java/refinedstorage/integration/jei/RecipeHandlerSolderer.java b/src/main/java/refinedstorage/integration/jei/RecipeHandlerSolderer.java
index 95b511da2..f6d574d20 100755
--- a/src/main/java/refinedstorage/integration/jei/RecipeHandlerSolderer.java
+++ b/src/main/java/refinedstorage/integration/jei/RecipeHandlerSolderer.java
@@ -7,28 +7,32 @@ import javax.annotation.Nonnull;
 
 public class RecipeHandlerSolderer implements IRecipeHandler<RecipeWrapperSolderer> {
     @Override
+    @Nonnull
     public Class<RecipeWrapperSolderer> getRecipeClass() {
         return RecipeWrapperSolderer.class;
     }
 
     @Override
+    @Nonnull
+    @SuppressWarnings("deprecation")
     public String getRecipeCategoryUid() {
         return RecipeCategorySolderer.ID;
     }
 
-    @Nonnull
     @Override
+    @Nonnull
     public String getRecipeCategoryUid(@Nonnull RecipeWrapperSolderer recipe) {
         return RecipeCategorySolderer.ID;
     }
 
     @Override
-    public IRecipeWrapper getRecipeWrapper(RecipeWrapperSolderer recipe) {
+    @Nonnull
+    public IRecipeWrapper getRecipeWrapper(@Nonnull RecipeWrapperSolderer recipe) {
         return recipe;
     }
 
     @Override
-    public boolean isRecipeValid(RecipeWrapperSolderer recipe) {
+    public boolean isRecipeValid(@Nonnull RecipeWrapperSolderer recipe) {
         return true;
     }
 }