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

Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7

Browse Source 
Conflicts:
	src/main/scala/li/cil/oc/util/ItemCosts.scala
This commit is contained in:
Florian Nücke 2014-04-09 15:19:30 +02:00
commit cd7229f23c
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/scala/li/cil/oc/server/component/GraphicsCard.scala
View File

@ -1,13 +1,13 @@
package li.cil.oc.server.component
import li.cil.oc.Settings
import li.cil.oc.api.Network
import li.cil.oc.api.network._
import li.cil.oc.common.component.Buffer
import li.cil.oc.common.tileentity
import li.cil.oc.Settings
import li.cil.oc.util.PackedColor
import net.minecraft.nbt.NBTTagCompound
import scala.Some
import net.minecraft.util.StatCollector
abstract class GraphicsCard extends ManagedComponent {
val node = Network.newNode(this, Visibility.Neighbors).
@ -228,7 +228,7 @@ abstract class GraphicsCard extends ManagedComponent {
buffer.owner.onScreenFill(0, 0, w, h, ' ')
}
try {
val message = "Unrecoverable error:\n" + machine.lastError + "\n"
val message = "Unrecoverable error:\n" + StatCollector.translateToLocal(machine.lastError) + "\n"
val wrapRegEx = s"(.{1,${math.max(1, w - 2)}})\\s".r
val lines = wrapRegEx.replaceAllIn(message, m => m.group(1) + "\n").lines.toArray
for ((line, idx) <- lines.zipWithIndex) {

1
src/main/scala/li/cil/oc/util/ItemCosts.scala
View File

@ -41,6 +41,7 @@ object ItemCosts {
terminate(Items.iron_ingot)
terminate(Items.quartz)
terminate(Items.nether_star)
terminate(Items.paper)
terminate(Items.redstone)
terminate(Items.string)
terminate(Items.slime_ball)