AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-19 12:17:17 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'OC1.3-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.7.10

Browse Source
This commit is contained in:
Florian Nücke 2014-08-24 12:18:17 +02:00
commit 693d0646e7
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/scala/li/cil/oc/common/block/SimpleBlock.scala
View File

@ -4,9 +4,8 @@ import java.util
import cpw.mods.fml.relauncher.{Side, SideOnly}
import li.cil.oc.Settings
import li.cil.oc.client.renderer.block.BlockRenderer
import li.cil.oc.common.tileentity
import li.cil.oc.util.{Tooltip, ItemCosts}
import li.cil.oc.util.{ItemCosts, Tooltip}
import net.minecraft.block.Block
import net.minecraft.block.material.Material
import net.minecraft.entity.player.EntityPlayer
@ -55,7 +54,7 @@ class SimpleBlock(material: Material) extends Block(material) {
def setBlockBoundsForItemRender(metadata: Int) = super.setBlockBoundsForItemRender()
override def getRenderType = BlockRenderer.getRenderId
override def getRenderType = Settings.blockRenderId
override def canBeReplacedByLeaves(world: IBlockAccess, x: Int, y: Int, z: Int) = false