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

This commit is contained in:
Florian Nücke 2015-04-30 13:35:52 +02:00
commit e310d16b03

View File

@ -256,7 +256,7 @@ class PrintPart(val original: Option[tileentity.Print] = None) extends SimpleBlo
case print: PrintPart if print.data.emitRedstone(print.state) => math.max(power, print.data.redstoneLevel) case print: PrintPart if print.data.emitRedstone(print.state) => math.max(power, print.data.redstoneLevel)
case _ => power case _ => power
}) })
math.max(inner, ForgeDirection.VALID_DIRECTIONS.map(BundledRedstone.computeInput(BlockPosition(x, y, z), _)).max) math.max(inner, ForgeDirection.VALID_DIRECTIONS.map(BundledRedstone.computeInput(BlockPosition(x, y, z, world), _)).max)
} }
// ----------------------------------------------------------------------- // // ----------------------------------------------------------------------- //