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

Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8

Browse Source
This commit is contained in:
Florian Nücke 2015-09-18 16:01:07 +02:00
commit cce8ae5cec
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/resources/assets/opencomputers/lang/en_US.lang
View File

@ -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.

2
src/main/scala/li/cil/oc/common/nanomachines/provider/HungryProvider.scala
View File

@ -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).