Merge remote-tracking branch 'remotes/origin/1.8.9' into 1.9

This commit is contained in:
modmuss50 2016-03-13 21:14:41 +00:00
commit 72b16c2306
9 changed files with 2 additions and 2 deletions

View file

@ -21,7 +21,7 @@ public class BlockReinforcedGlass extends BaseBlock implements ITexturedBlock {
@Override
public boolean isOpaqueCube(IBlockState state) {
return true;
return false;
}
@SideOnly(Side.CLIENT)
@ -35,7 +35,7 @@ public class BlockReinforcedGlass extends BaseBlock implements ITexturedBlock {
return false;
}
private final String prefix = "techreborn:blocks/machine/";
private final String prefix = "techreborn:blocks/";
@Override
public int amountOfStates() {