merge oops

This commit is contained in:
payonel 2017-11-27 13:56:36 -08:00
parent 747213ba6c
commit 4a9b24c9b7

View File

@ -261,18 +261,11 @@ class Microcontroller extends traits.PowerAcceptor with traits.Hub with traits.C
override def removeStackFromSlot(slot: Int) = null
// Nope.
override def getAccessibleSlotsFromSide(side: Int): Array[Int] = Array()
override def canExtractItem(slot: Int, stack: ItemStack, side: EnumFacing) = false
override def canExtractItem(slot: Int, stack: ItemStack, side: Int) = false
override def canInsertItem(slot: Int, stack: ItemStack, side: EnumFacing) = false
override def canInsertItem(slot: Int, stack: ItemStack, side: Int) = false
// Nope.
override def getAccessibleSlotsFromSide(side: Int): Array[Int] = Array()
override def canExtractItem(slot: Int, stack: ItemStack, side: Int) = false
override def canInsertItem(slot: Int, stack: ItemStack, side: Int) = false
override def getSlotsForFace(side: EnumFacing): Array[Int] = Array()
// For hotswapping EEPROMs.
def changeEEPROM(newEeprom: ItemStack) = {