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

@ -242,7 +242,10 @@ public class DynamicCell extends Item {
}
return cell;
}
@Override
protected void setContainerToEmpty() {
container = new ItemStack(ModItems.CELL, 1);
}
}
}