AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-16 10:51:55 -04:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
# Conflicts:
#	build.properties
This commit is contained in:
payonel 2017-11-08 22:03:51 -08:00
commit c0cb3695fc
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/resources/assets/opencomputers/recipes/default.recipes
View File

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

2
src/main/scala/li/cil/oc/common/item/Tablet.scala
View File

@ -378,7 +378,7 @@ class TabletWrapper(var stack: ItemStack, var player: EntityPlayer) extends Comp
def containerSlotTier: Int = def containerSlotTier: Int =
if (data.container.isEmpty) Tier.None 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 Some(driver: Container) => driver.providedTier(stack)
case _ => Tier.None case _ => Tier.None
} }

5
src/main/scala/li/cil/oc/integration/minecraft/ConverterItemStack.scala
View File

@ -41,6 +41,11 @@ object ConverterItemStack extends api.driver.Converter {
mkString("\n") 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]] val enchantments = mutable.ArrayBuffer.empty[mutable.Map[String, Any]]
EnchantmentHelper.getEnchantments(stack).collect { EnchantmentHelper.getEnchantments(stack).collect {
case (enchantment, level) => case (enchantment, level) =>