Merge branch 'development' into 1.8.9

* development:
  Block texture updates
  Machine icon bug fix
This commit is contained in:
aidancbrady committed 2016-05-05 16:49:09 -04:00
commit 6a14acd987
15 files changed
+30 -3

No files matched your search

@@ -206,7 +206,7 @@ public abstract class BlockMachine extends BlockContainer implements ISpecialBou
public void registerBlockIcons(IIconRegister register)
{
BASE_ICON = register.registerIcon("mekanism:SteelCasing");
DefIcon def = DefIcon.getAll(BASE_ICON);
DefIcon def = DefIcon.getAll(BASE_ICON).setOverrides(false);
switch(blockType)
{