Merge branch 'master-MC1.8.9' of github.com:MightyPirates/OpenComputers into master-MC1.9.4

This commit is contained in:
Florian Nücke 2016-06-26 11:38:02 +02:00
commit cf61e52d19

View File

@ -75,7 +75,7 @@ class Rack extends RedstoneAware with traits.PowerAcceptor with traits.StateAwar
new AxisAlignedBB(0, 0, 15 / 16f, 1, 1, 1),
new AxisAlignedBB(0, 0, 0, 1 / 16f, 1, 1),
new AxisAlignedBB(15 / 16f, 0, 0, 1, 1, 1),
new AxisAlignedBB(1 / 16f, 1 / 16f, 1 / 16f, 15 / 16f, 15 / 16f, 15 / 16f)
new AxisAlignedBB(0.5f / 16f, 0.5f / 16f, 0.5f / 16f, 15.5f / 16f, 15.5f / 16f, 15.5f / 16f)
)
override def collisionRayTrace(world: World, pos: BlockPos, start: Vec3, end: Vec3): MovingObjectPosition = {