Merge remote-tracking branch 'remotes/origin/1.12' into feature-alarm

This commit is contained in:
modmuss50 2018-01-08 17:45:29 +00:00
commit 2a0a9e5636
81 changed files with 2824 additions and 790 deletions

View file

@ -32,7 +32,7 @@ import net.minecraft.util.ResourceLocation;
import net.minecraftforge.fml.common.registry.GameRegistry;
import net.minecraftforge.oredict.OreDictionary;
import reborncore.RebornRegistry;
import reborncore.common.tile.TileMachineBase;
import reborncore.common.tile.TileLegacyMachineBase;
import reborncore.common.util.OreUtil;
import reborncore.common.util.StringUtils;
import techreborn.Core;
@ -350,7 +350,7 @@ public class ModBlocks {
registerBlock(WIND_MILL, "wind_mill");
GameRegistry.registerTileEntity(TileWindMill.class, "TileWindMillTR");
GameRegistry.registerTileEntity(TileMachineBase.class, "TileMachineBaseTR");
GameRegistry.registerTileEntity(TileLegacyMachineBase.class, "TileMachineBaseTR");
RUBBER_LOG = new BlockRubberLog();
registerBlock(RUBBER_LOG, "rubber_log");