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:
commit
53b450acea
158 changed files with 264 additions and 477 deletions
Loading…
Add table
Add a link
Reference in a new issue