Merge remote-tracking branch 'origin/1.16' into 1.16

# Conflicts:
#	src/main/java/techreborn/init/TRContent.java
This commit is contained in:
modmuss50 2020-07-25 00:23:59 +01:00
commit 18a08b798e
235 changed files with 3995 additions and 3065 deletions

View file

@ -148,6 +148,7 @@ public class TechRebornClient implements ClientModInitializer {
BlockRenderLayerMap.INSTANCE.putBlock(TRContent.Machine.ALARM.block, RenderLayer.getCutout());
BlockRenderLayerMap.INSTANCE.putBlock(TRContent.RUBBER_SAPLING, RenderLayer.getCutout());
BlockRenderLayerMap.INSTANCE.putBlock(TRContent.REINFORCED_GLASS, RenderLayer.getCutout());
BlockRenderLayerMap.INSTANCE.putBlock(TRContent.Machine.RESIN_BASIN.block, RenderLayer.getCutout());
BlockRenderLayerMap.INSTANCE.putBlock(TRContent.RUBBER_LEAVES, RenderLayer.getCutoutMipped());