Merge branch 'master-MC1.7.10' into ic2-crop-integration

.gitignore

@@ -24,3 +24,4 @@
 
 # VSCode
 /.vscode
+*.bat

build.gradle

@@ -88,7 +88,7 @@ repositories {
         artifactPattern "https://maven.cil.li/[module]/[revision]/[module]-[revision]-[classifier].[ext]"
     }
     maven {
-        name = "ic2, forestry"
+        name = "ic2"
         url = "http://maven.ic2.player.to/"
     }
 }

build.properties

@@ -1,7 +1,7 @@
 minecraft.version=1.7.10
 forge.version=10.13.4.1614-1.7.10
 
-oc.version=1.7.5
+oc.version=1.7.5.1
 
 ae2.version=rv2-beta-26
 bc.version=7.0.9

src/main/scala/li/cil/oc/integration/thaumicenergistics/ConvertAspectCraftable.scala

@@ -0,0 +1,15 @@
+package li.cil.oc.integration.thaumicenergistics
+import java.util
+import cpw.mods.fml.common.registry.GameRegistry
+import li.cil.oc.api.driver.Converter
+import net.minecraft.item.ItemStack
+import scala.collection.convert.WrapAsScala._
+
+object ConvertAspectCraftable extends Converter {
+  private val DistillationPattern = GameRegistry.findItem("thaumicenergistics", "crafting.aspect")
+  override def convert(value: scala.Any, output: util.Map[AnyRef, AnyRef]): Unit = value match {
+    case stack: ItemStack if stack.getItem == DistillationPattern && stack.hasTagCompound =>
+      output += "aspect" -> stack.getTagCompound.getString("Aspect")
+    case _ =>
+  }
+}

src/main/scala/li/cil/oc/integration/thaumicenergistics/ModThaumicEnergistics.scala

@@ -14,5 +14,6 @@ object ModThaumicEnergistics extends ModProxy {
 
     Driver.add(DriverController.Provider)
     Driver.add(DriverBlockInterface.Provider)
+    Driver.add(ConvertAspectCraftable)
   }
 }