diff options
| author | Technus <daniel112092@gmail.com> | 2017-08-22 11:49:20 +0200 |
|---|---|---|
| committer | Technus <daniel112092@gmail.com> | 2017-08-22 11:49:20 +0200 |
| commit | cd1618552ab310c9735b786b63b44947346e3e4e (patch) | |
| tree | e679e93284944bbbd091898dd4053b9f7ef2dc03 /src/main/java/openmodularturrets | |
| parent | 9864e0f93a9eac02fd395c26c8bef725c3fb0fee (diff) | |
| parent | 7502e2c13b9f44c9f0ff7b4d935d5f4df0be0bdf (diff) | |
| download | GT5-Unofficial-cd1618552ab310c9735b786b63b44947346e3e4e.tar.gz GT5-Unofficial-cd1618552ab310c9735b786b63b44947346e3e4e.tar.bz2 GT5-Unofficial-cd1618552ab310c9735b786b63b44947346e3e4e.zip | |
Merge branch 'master' into nh-recipes
# Conflicts:
# src/main/java/com/github/technus/tectech/auxiliary/TecTechConfig.java
Diffstat (limited to 'src/main/java/openmodularturrets')
| -rw-r--r-- | src/main/java/openmodularturrets/blocks/turretheads/TurretHeadEM.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/main/java/openmodularturrets/blocks/turretheads/TurretHeadEM.java b/src/main/java/openmodularturrets/blocks/turretheads/TurretHeadEM.java index b19b1f3560..90318ef390 100644 --- a/src/main/java/openmodularturrets/blocks/turretheads/TurretHeadEM.java +++ b/src/main/java/openmodularturrets/blocks/turretheads/TurretHeadEM.java @@ -1,7 +1,6 @@ package openmodularturrets.blocks.turretheads; import com.github.technus.tectech.TecTech; -import com.github.technus.tectech.auxiliary.Reference; import cpw.mods.fml.common.registry.GameRegistry; import net.minecraft.block.Block; import net.minecraft.block.ITileEntityProvider; @@ -27,7 +26,7 @@ public class TurretHeadEM extends Block implements ITileEntityProvider { this.setStepSound(Block.soundTypeMetal); this.setBlockBounds(0.2F, 0.0F, 0.2F, 0.8F, 1F, 0.8F); this.setBlockName("turretHeadEM"); - this.setBlockTextureName(Reference.MODID+":turretHeadEM"); + //this.setBlockTextureName(Reference.MODID+":turretHeadEM"); } @Override |