diff --git a/build.gradle b/build.gradle index feee9af..709a2dd 100644 --- a/build.gradle +++ b/build.gradle @@ -72,10 +72,6 @@ repositories { name "HWYLA" url "http://tehnut.info/maven" } - ivy { - name "AE2" - artifactPattern "http://addons-origin.cursecdn.com/files/${config.ae2.cf}/[module]-[revision](-[classifier])(.[ext])" - } } dependencies { @@ -84,7 +80,7 @@ dependencies { deobfCompile "mezz.jei:jei_${config.minecraft.version}:${config.jei.version}" deobfCompile "mcp.mobius.waila:Hwyla:${config.hwyla.version}" - deobfCompile ":appliedenergistics2:${config.ae2.version}@jar" + deobfCompile "appeng:appliedenergistics2:${config.ae2.version}@jar" } @@ -187,4 +183,4 @@ curseforge { optionalLibrary 'just-enough-items-jei' } } -} \ No newline at end of file +} diff --git a/build.properties b/build.properties index d25ce96..ff3adb9 100644 --- a/build.properties +++ b/build.properties @@ -4,7 +4,7 @@ bdlib.version=1.14.3.9 minecraft.version=1.12.2 minecraft.mappings=snapshot_20171003 forge.version=14.23.0.2512 -ae2.version=rv5-beta-1 +ae2.version=rv6-stable-6 ae2.cf=2490/639 jei.version=4.8.0.105 hwyla.version=1.8.20-B35_1.12 diff --git a/src/net/bdew/ae2stuff/machines/inscriber/TileInscriber.scala b/src/net/bdew/ae2stuff/machines/inscriber/TileInscriber.scala index 5e86c61..283d688 100644 --- a/src/net/bdew/ae2stuff/machines/inscriber/TileInscriber.scala +++ b/src/net/bdew/ae2stuff/machines/inscriber/TileInscriber.scala @@ -168,8 +168,8 @@ class TileInscriber extends TileDataSlots with GridTile with SidedInventory with override def canExtractItem(slot: Int, stack: ItemStack, side: EnumFacing) = slot match { case slots.output => true - case slots.top => (!topLocked) && output.isDefined && inv(slots.middle).isEmpty - case slots.bottom => (!bottomLocked) && output.isDefined && inv(slots.middle).isEmpty + case slots.top => (!topLocked) && (!output.isDefined) && inv(slots.middle).isEmpty + case slots.bottom => (!bottomLocked) && (!output.isDefined) && inv(slots.middle).isEmpty case _ => false }