Fix compile errors from merge

This commit is contained in:
Ben Spiers committed 2016-04-25 17:47:54 +01:00
1 parent 0cb18773aa
commit 8064beb0fc
57 files changed
+270 -315

No files matched your search

@@ -104,6 +104,7 @@ import mekanism.common.MekanismItems;
import mekanism.common.base.ISideConfiguration;
import mekanism.common.base.IUpgradeTile;
import mekanism.common.block.states.BlockStateMachine;
import mekanism.common.block.states.BlockStateMachine.MachineType;
import mekanism.common.entity.EntityBabySkeleton;
import mekanism.common.entity.EntityBalloon;
import mekanism.common.entity.EntityFlame;