diff --git a/build.gradle b/build.gradle
index 9e4c1db6e..1e2239d6e 100755
--- a/build.gradle
+++ b/build.gradle
@@ -51,11 +51,11 @@ repositories {
 }
 
 dependencies {
-    deobfCompile "mezz.jei:jei_1.10.2:3.13.+:api"
-    runtime "mezz.jei:jei_1.10.2:3.13.+"
-    compile "net.darkhax.tesla:Tesla:1.10-1.2.+"
+    deobfCompile "mezz.jei:jei_1.10.2:3.13.1.345:api"
+    runtime "mezz.jei:jei_1.10.2:3.13.1.345"
+    compile "net.darkhax.tesla:Tesla:1.10.2-1.2.1.49"
     compile "net.industrial-craft:industrialcraft-2:2.6.96-ex110:api"
-    deobfCompile "MCMultiPart:MCMultiPart:1.2.1+:universal"
+    deobfCompile "MCMultiPart:MCMultiPart:1.2.1:universal"
 }
 
 processResources {
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/integration/jei/RecipeCategorySolderer.java b/src/main/java/com/raoulvdberge/refinedstorage/integration/jei/RecipeCategorySolderer.java
index 2cc49fb13..1276a4d42 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/integration/jei/RecipeCategorySolderer.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/integration/jei/RecipeCategorySolderer.java
@@ -5,14 +5,14 @@ import mezz.jei.api.gui.IDrawable;
 import mezz.jei.api.gui.IGuiItemStackGroup;
 import mezz.jei.api.gui.IRecipeLayout;
 import mezz.jei.api.ingredients.IIngredients;
-import mezz.jei.api.recipe.IRecipeCategory;
-import mezz.jei.api.recipe.IRecipeWrapper;
-import net.minecraft.client.Minecraft;
+import mezz.jei.api.recipe.BlankRecipeCategory;
 import net.minecraft.client.resources.I18n;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.ResourceLocation;
 
-public class RecipeCategorySolderer implements IRecipeCategory {
+import javax.annotation.Nonnull;
+
+public class RecipeCategorySolderer extends BlankRecipeCategory<RecipeWrapperSolderer> {
     public static final String ID = "refinedstorage.solderer";
 
     private IDrawable background;
@@ -36,17 +36,9 @@ public class RecipeCategorySolderer implements IRecipeCategory {
         return background;
     }
 
-    @Override
-    public void drawExtras(Minecraft minecraft) {
-    }
-
-    @Override
-    public void drawAnimations(Minecraft minecraft) {
-    }
-
     @Override
     @SuppressWarnings("deprecation")
-    public void setRecipe(IRecipeLayout recipeLayout, IRecipeWrapper recipeWrapper) {
+    public void setRecipe(@Nonnull IRecipeLayout recipeLayout, @Nonnull RecipeWrapperSolderer recipeWrapper) {
         IGuiItemStackGroup group = recipeLayout.getItemStacks();
 
         int x = 0;
@@ -60,17 +52,15 @@ public class RecipeCategorySolderer implements IRecipeCategory {
 
         group.init(3, false, 83, 18);
 
-        if (recipeWrapper instanceof RecipeWrapperSolderer) {
-            for (int i = 0; i < 3; ++i) {
-                group.set(i, (ItemStack) recipeWrapper.getInputs().get(i));
-            }
-
-            group.set(3, (ItemStack) recipeWrapper.getOutputs().get(0));
+        for (int i = 0; i < 3; ++i) {
+            group.set(i, recipeWrapper.getInputs().get(i));
         }
+
+        group.set(3, recipeWrapper.getOutputs().get(0));
     }
 
     @Override
-    public void setRecipe(IRecipeLayout recipeLayout, IRecipeWrapper recipeWrapper, IIngredients ingredients) {
+    public void setRecipe(@Nonnull IRecipeLayout recipeLayout, @Nonnull RecipeWrapperSolderer recipeWrapper, @Nonnull IIngredients ingredients) {
         IGuiItemStackGroup group = recipeLayout.getItemStacks();
 
         int x = 0;
@@ -84,12 +74,10 @@ public class RecipeCategorySolderer implements IRecipeCategory {
 
         group.init(3, false, 83, 18);
 
-        if (recipeWrapper instanceof RecipeWrapperSolderer) {
-            for (int i = 0; i < 3; ++i) {
-                group.set(i, ingredients.getInputs(ItemStack.class).get(i));
-            }
-
-            group.set(3, ingredients.getOutputs(ItemStack.class).get(0));
+        for (int i = 0; i < 3; ++i) {
+            group.set(i, ingredients.getInputs(ItemStack.class).get(i));
         }
+
+        group.set(3, ingredients.getOutputs(ItemStack.class).get(0));
     }
 }