Screw it, this will be 2.0.0, too much breakage and world save incompatibility so the cut should be cleared in the version number.

Also: fixed templates.
This commit is contained in:
Florian Nücke 2014-10-09 23:16:33 +02:00
parent 34249f7131
commit 06e9044b11
3 changed files with 6 additions and 6 deletions

View File

@ -1,7 +1,7 @@
minecraft.version=1.7.10 minecraft.version=1.7.10
forge.version=10.13.1.1217 forge.version=10.13.1.1217
oc.version=1.4.0 oc.version=2.0.0
oc.subversion=dev oc.subversion=dev
ae2.version=+ ae2.version=+

View File

@ -49,7 +49,7 @@ object RobotTemplate extends Template {
nbt.setString("select", "li.cil.oc.common.template.RobotTemplate.selectTier1") nbt.setString("select", "li.cil.oc.common.template.RobotTemplate.selectTier1")
nbt.setString("validate", "li.cil.oc.common.template.RobotTemplate.validate") nbt.setString("validate", "li.cil.oc.common.template.RobotTemplate.validate")
nbt.setString("assemble", "li.cil.oc.common.template.RobotTemplate.assemble") nbt.setString("assemble", "li.cil.oc.common.template.RobotTemplate.assemble")
nbt.setString("hostClass", "li.cil.oc.api.tileentity.Robot") nbt.setString("hostClass", "li.cil.oc.api.internal.Robot")
val containerSlots = new NBTTagList() val containerSlots = new NBTTagList()
containerSlots.appendTag(Map("tier" -> Tier.Two)) containerSlots.appendTag(Map("tier" -> Tier.Two))
@ -83,7 +83,7 @@ object RobotTemplate extends Template {
nbt.setString("select", "li.cil.oc.common.template.RobotTemplate.selectTier2") nbt.setString("select", "li.cil.oc.common.template.RobotTemplate.selectTier2")
nbt.setString("validate", "li.cil.oc.common.template.RobotTemplate.validate") nbt.setString("validate", "li.cil.oc.common.template.RobotTemplate.validate")
nbt.setString("assemble", "li.cil.oc.common.template.RobotTemplate.assemble") nbt.setString("assemble", "li.cil.oc.common.template.RobotTemplate.assemble")
nbt.setString("hostClass", "li.cil.oc.api.tileentity.Robot") nbt.setString("hostClass", "li.cil.oc.api.internal.Robot")
val containerSlots = new NBTTagList() val containerSlots = new NBTTagList()
containerSlots.appendTag(Map("tier" -> Tier.Three)) containerSlots.appendTag(Map("tier" -> Tier.Three))
@ -120,7 +120,7 @@ object RobotTemplate extends Template {
nbt.setString("select", "li.cil.oc.common.template.RobotTemplate.selectTier3") nbt.setString("select", "li.cil.oc.common.template.RobotTemplate.selectTier3")
nbt.setString("validate", "li.cil.oc.common.template.RobotTemplate.validate") nbt.setString("validate", "li.cil.oc.common.template.RobotTemplate.validate")
nbt.setString("assemble", "li.cil.oc.common.template.RobotTemplate.assemble") nbt.setString("assemble", "li.cil.oc.common.template.RobotTemplate.assemble")
nbt.setString("hostClass", "li.cil.oc.api.tileentity.Robot") nbt.setString("hostClass", "li.cil.oc.api.internal.Robot")
val containerSlots = new NBTTagList() val containerSlots = new NBTTagList()
containerSlots.appendTag(Map("tier" -> Tier.Three)) containerSlots.appendTag(Map("tier" -> Tier.Three))
@ -161,7 +161,7 @@ object RobotTemplate extends Template {
nbt.setString("select", "li.cil.oc.common.template.RobotTemplate.selectCreative") nbt.setString("select", "li.cil.oc.common.template.RobotTemplate.selectCreative")
nbt.setString("validate", "li.cil.oc.common.template.RobotTemplate.validate") nbt.setString("validate", "li.cil.oc.common.template.RobotTemplate.validate")
nbt.setString("assemble", "li.cil.oc.common.template.RobotTemplate.assemble") nbt.setString("assemble", "li.cil.oc.common.template.RobotTemplate.assemble")
nbt.setString("hostClass", "li.cil.oc.api.tileentity.Robot") nbt.setString("hostClass", "li.cil.oc.api.internal.Robot")
val containerSlots = new NBTTagList() val containerSlots = new NBTTagList()
containerSlots.appendTag(Map("tier" -> Tier.Three)) containerSlots.appendTag(Map("tier" -> Tier.Three))

View File

@ -46,7 +46,7 @@ object TabletTemplate extends Template {
nbt.setString("select", "li.cil.oc.common.template.TabletTemplate.select") nbt.setString("select", "li.cil.oc.common.template.TabletTemplate.select")
nbt.setString("validate", "li.cil.oc.common.template.TabletTemplate.validate") nbt.setString("validate", "li.cil.oc.common.template.TabletTemplate.validate")
nbt.setString("assemble", "li.cil.oc.common.template.TabletTemplate.assemble") nbt.setString("assemble", "li.cil.oc.common.template.TabletTemplate.assemble")
nbt.setString("hostClass", "li.cil.oc.common.item.TabletWrapper") nbt.setString("hostClass", "li.cil.oc.api.internal.Tablet")
val upgradeSlots = new NBTTagList() val upgradeSlots = new NBTTagList()
upgradeSlots.appendTag(Map("tier" -> Tier.Three)) upgradeSlots.appendTag(Map("tier" -> Tier.Three))