From 1a764219be8433000cdb11b43966a8b5d7e4eab0 Mon Sep 17 00:00:00 2001
From: Mohammad-Ali Minaie <mminaie@bstonetech.com>
Date: Tue, 16 Jul 2019 00:42:28 -0400
Subject: [PATCH] updating merge from master and updating dependencies

---
 .../main/java/nmd/primal/forgecraft/compat/ct/CTSaw.java  | 5 -----
 .../primal/forgecraft/crafting/MachineSawCrafting.java    | 8 ++------
 .../forgecraft/crafting/registery/RecipesMachineSaw.java  | 8 --------
 3 files changed, 2 insertions(+), 19 deletions(-)

diff --git a/kfc/src/main/java/nmd/primal/forgecraft/compat/ct/CTSaw.java b/kfc/src/main/java/nmd/primal/forgecraft/compat/ct/CTSaw.java
index 74574d6f..1306a05f 100644
--- a/kfc/src/main/java/nmd/primal/forgecraft/compat/ct/CTSaw.java
+++ b/kfc/src/main/java/nmd/primal/forgecraft/compat/ct/CTSaw.java
@@ -6,17 +6,12 @@ import crafttweaker.IAction;
 import crafttweaker.annotations.ModOnly;
 import crafttweaker.annotations.ZenRegister;
 import crafttweaker.api.item.IIngredient;
-import crafttweaker.api.item.IItemStack;
 import crafttweaker.api.minecraft.CraftTweakerMC;
-import net.minecraft.inventory.ItemStackHelper;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.crafting.Ingredient;
-import nmd.primal.core.api.PrimalAPI;
 import nmd.primal.core.common.PrimalCore;
 import nmd.primal.core.common.helper.RecipeHelper;
 import nmd.primal.forgecraft.ModInfo;
-import nmd.primal.forgecraft.blocks.machine.MachineSaw;
-import nmd.primal.forgecraft.crafting.CrucibleCrafting;
 import nmd.primal.forgecraft.crafting.MachineSawCrafting;
 import stanhebben.zenscript.annotations.ZenClass;
 import stanhebben.zenscript.annotations.ZenMethod;
diff --git a/kfc/src/main/java/nmd/primal/forgecraft/crafting/MachineSawCrafting.java b/kfc/src/main/java/nmd/primal/forgecraft/crafting/MachineSawCrafting.java
index 599e7fb2..e80816d7 100644
--- a/kfc/src/main/java/nmd/primal/forgecraft/crafting/MachineSawCrafting.java
+++ b/kfc/src/main/java/nmd/primal/forgecraft/crafting/MachineSawCrafting.java
@@ -1,17 +1,15 @@
 package nmd.primal.forgecraft.crafting;
 
-import net.minecraft.block.Block;
-import net.minecraft.block.state.IBlockState;
+
 import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.crafting.Ingredient;
 import net.minecraftforge.registries.IForgeRegistry;
+import nmd.primal.core.common.crafting.AbstractRecipe;
 import nmd.primal.core.common.helper.RecipeHelper;
-import nmd.primal.core.common.recipes.AbstractRecipe;
 import nmd.primal.forgecraft.ModInfo;
 
 import javax.annotation.Nullable;
-import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 
@@ -101,12 +99,10 @@ public class MachineSawCrafting extends AbstractRecipe<MachineSawCrafting> { //e
         return null;
     }
 
-    @Override
     public Collection<MachineSawCrafting> getRecipes() {
         return RECIPES;
     }
 
-    @Override
     public String getRecipePrefix() {
         return RECIPE_PREFIX;
     }
diff --git a/kfc/src/main/java/nmd/primal/forgecraft/crafting/registery/RecipesMachineSaw.java b/kfc/src/main/java/nmd/primal/forgecraft/crafting/registery/RecipesMachineSaw.java
index 1861602e..9fe6c517 100644
--- a/kfc/src/main/java/nmd/primal/forgecraft/crafting/registery/RecipesMachineSaw.java
+++ b/kfc/src/main/java/nmd/primal/forgecraft/crafting/registery/RecipesMachineSaw.java
@@ -1,28 +1,20 @@
 package nmd.primal.forgecraft.crafting.registery;
 
-import crafttweaker.api.block.IBlock;
-import net.minecraft.block.state.IBlockState;
 import net.minecraft.init.Blocks;
 import net.minecraft.init.Items;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
-import net.minecraft.item.crafting.Ingredient;
-import net.minecraft.util.NonNullList;
 import net.minecraftforge.event.RegistryEvent;
 import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
 import net.minecraftforge.fml.common.registry.GameRegistry;
-import net.minecraftforge.oredict.OreDictionary;
 import net.minecraftforge.oredict.OreIngredient;
 import net.minecraftforge.registries.IForgeRegistry;
 import nmd.primal.core.api.PrimalAPI;
 import nmd.primal.core.common.helper.RecipeHelper;
 import nmd.primal.forgecraft.ModInfo;
 import nmd.primal.forgecraft.crafting.MachineSawCrafting;
-import nmd.primal.forgecraft.crafting.WorkbenchCrafting;
-import nmd.primal.forgecraft.init.ModItems;
 
-import java.util.List;
 
 @GameRegistry.ObjectHolder(ModInfo.MOD_ID)
 @Mod.EventBusSubscriber