Update
Merge branch 'master' of https://github.com/EwyBoy/ModJam4

Conflicts:
	src/main/java/com/modjam/TerrificTransportation/Blocks/Block/Conveyor.java
	src/main/java/com/modjam/TerrificTransportation/Render/ConveyorRenderer.java
added ignore
Commit of Awesome