Merge branch master-MC1.11 into master-MC1.12

# Conflicts:
#	build.properties

src/main/resources/assets/opencomputers/recipes/default.recipes

@@ -385,12 +385,14 @@ ingotiron {
 }
 chipdiamond {
   type: shapeless
-  input: gemDiamond
+  input: ["oc:materialCuttingWire", gemDiamond]
   output: 6
 }
 gemDiamond = false
 
-cuttingwire = false
+cuttingwire {
+  input: [[stickWood, nuggetIron, stickWood]]
+}
 acid {
   type: shapeless
   input: [bucketWater, sugar, slimeball, fermentedSpiderEye, bone]

src/main/scala/li/cil/oc/common/item/Tablet.scala

@@ -378,7 +378,7 @@ class TabletWrapper(var stack: ItemStack, var player: EntityPlayer) extends Comp
 
   def containerSlotTier: Int =
     if (data.container.isEmpty) Tier.None
-    else Option(Driver.driverFor(stack, getClass)) match {
+    else Option(Driver.driverFor(data.container, getClass)) match {
       case Some(driver: Container) => driver.providedTier(stack)
       case _ => Tier.None
     }

src/main/scala/li/cil/oc/integration/minecraft/ConverterItemStack.scala

@@ -41,6 +41,11 @@ object ConverterItemStack extends api.driver.Converter {
             mkString("\n")
         }
 
+        // IC2 reactor items custom damage
+        if (stack.hasTagCompound && stack.getTagCompound.hasKey("advDmg", NBT.TAG_INT)) {
+          output += "customDamage" -> Int.box(stack.getTagCompound.getInteger("advDmg"))
+        }
+
         val enchantments = mutable.ArrayBuffer.empty[mutable.Map[String, Any]]
         EnchantmentHelper.getEnchantments(stack).collect {
           case (enchantment, level) =>