From 733f37a13a5c677771015afe4c371782c9a0dc8d Mon Sep 17 00:00:00 2001 From: Vexatos Date: Fri, 18 Sep 2015 15:35:54 +0200 Subject: [PATCH 1/2] Update en_US.lang --- src/main/resources/assets/opencomputers/lang/en_US.lang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/assets/opencomputers/lang/en_US.lang b/src/main/resources/assets/opencomputers/lang/en_US.lang index 866a1153f..6ec6bc10f 100644 --- a/src/main/resources/assets/opencomputers/lang/en_US.lang +++ b/src/main/resources/assets/opencomputers/lang/en_US.lang @@ -455,7 +455,7 @@ achievement.oc.wirelessNetworkCard.desc=Time to go where no packet has gone befo # set in the actual damage source in code. death.attack.oc.nanomachinesOverload.1=%s got too greedy. death.attack.oc.nanomachinesOverload.2=%s had a nervous breakdown. -death.attack.oc.nanomachinesOverload.3=%s's nanomachines went out of control. +death.attack.oc.nanomachinesOverload.3=The nanomachines of %s went out of control. death.attack.oc.nanomachinesHungry.1=%s was eaten by nanomachines. death.attack.oc.nanomachinesHungry.2=%s didn't keep their nanomachines fed. death.attack.oc.nanomachinesHungry.3=%s has been digested. From 13db6ccd7af62b9aedcebe7575c4661b10a0054a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20N=C3=BCcke?= Date: Fri, 18 Sep 2015 16:00:35 +0200 Subject: [PATCH 2/2] And this why you `???`, kids! --- .../li/cil/oc/common/nanomachines/provider/HungryProvider.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/scala/li/cil/oc/common/nanomachines/provider/HungryProvider.scala b/src/main/scala/li/cil/oc/common/nanomachines/provider/HungryProvider.scala index bf7d52b01..29a4bd2e1 100644 --- a/src/main/scala/li/cil/oc/common/nanomachines/provider/HungryProvider.scala +++ b/src/main/scala/li/cil/oc/common/nanomachines/provider/HungryProvider.scala @@ -9,7 +9,7 @@ import li.cil.oc.integration.util.DamageSourceWithRandomCause import net.minecraft.entity.player.EntityPlayer import net.minecraft.nbt.NBTTagCompound -object HungryProvider extends ScalaProvider("") { +object HungryProvider extends ScalaProvider("d697c24a-014c-4773-a288-23084a59e9e8") { final val FillCount = 10 // Create a bunch of these to have a higher chance of one being picked / available. final val HungryDamage = new DamageSourceWithRandomCause("oc.nanomachinesHungry", 3).