Changes

Summary

manual merges of up to 9a578fc (details)

Commit 0c9c8100adbfc270b0f91dc926bca5f9a5c2b87d by progwml6 manual merges of up to 9a578fc
The file was modified	src/main/java/tconstruct/common/TContent.java (diff)
The file was modified	src/main/java/tconstruct/blocks/LavaTankBlock.java (diff)
The file was added	resources/assets/tinker/textures/items/food/jerky_blood.png
The file was modified	src/main/java/tconstruct/items/Jerky.java (diff)
The file was modified	src/main/java/tconstruct/items/blocks/CraftedSoilItemBlock.java (diff)
The file was modified	src/main/java/tconstruct/blocks/ConveyorBase.java (diff)
The file was modified	resources/assets/tinker/textures/items/food/edibleslime.png (diff)
The file was added	resources/assets/tinker/textures/items/food/edibleblood.png
The file was modified	src/main/java/tconstruct/items/StrangeFood.java (diff)
The file was modified	src/main/java/tconstruct/util/config/PHConstruct.java (diff)
The file was modified	src/main/java/tconstruct/blocks/SearedBlock.java (diff)
The file was modified	src/main/java/tconstruct/common/TRepo.java (diff)
The file was modified	src/main/java/tconstruct/common/TRecipes.java (diff)
The file was modified	src/main/java/tconstruct/items/MaterialItem.java (diff)
The file was added	resources/assets/tinker/textures/items/food/jerky_blueslime.png
The file was modified	resources/assets/tinker/lang/en_US.lang (diff)
The file was modified	src/main/java/tconstruct/util/TEventHandler.java (diff)
The file was modified	src/main/java/tconstruct/blocks/SmelteryBlock.java (diff)
The file was modified	src/main/java/tconstruct/blocks/SoilBlock.java (diff)
The file was modified	src/main/java/tconstruct/blocks/logic/SmelteryLogic.java (diff)
The file was modified	src/main/java/tconstruct/blocks/slime/SlimeGrass.java (diff)