Merge remote-tracking branch 'remotes/origin/1.12' into 1.13-prep

# Conflicts:
#	src/main/java/techreborn/compat/immersiveengineering/RecipeImmersiveEngineering.java
#	src/main/java/techreborn/compat/jei/TechRebornJeiPlugin.java
#	src/main/java/techreborn/init/ModRecipes.java
#	src/main/java/techreborn/packets/PacketAutoCraftingTableLock.java
This commit is contained in:
modmuss50 2018-08-03 18:04:40 +01:00
commit 53b450acea
No known key found for this signature in database
GPG key ID: 773D17BE8BF49C82
158 changed files with 264 additions and 477 deletions

View file

@ -233,6 +233,11 @@ public class ModRecipes {
ItemDusts.getDustByName("obsidian", 4),
170, 19));
RecipeHandler.addRecipe(Reference.GRINDER_RECIPE, new GrinderRecipe(
new ItemStack(Items.BLAZE_ROD),
new ItemStack(Items.BLAZE_POWDER, 4),
170, 19));
if (OreUtil.doesOreExistAndValid("stoneMarble")) {
ItemStack marbleStack = getOre("stoneMarble");
marbleStack.setCount(1);
@ -248,7 +253,7 @@ public class ModRecipes {
120, 10));
}
//See comments bellow, this allows the ore to go to the product when it sometimes goes stright to dust.
//See comments bellow, this allows the ore to go to the product when it sometimes goes straight to dust.
RecipeHandler.addRecipe(Reference.GRINDER_RECIPE, new GrinderRecipe(
"oreCoal", new ItemStack(Items.COAL, 2),
270, 31));