diff --git a/src/main/resources/assets/opencomputers/loot/openos/lib/tty.lua b/src/main/resources/assets/opencomputers/loot/openos/lib/tty.lua index 4a76dc8be..60b694f22 100644 --- a/src/main/resources/assets/opencomputers/loot/openos/lib/tty.lua +++ b/src/main/resources/assets/opencomputers/loot/openos/lib/tty.lua @@ -103,7 +103,7 @@ function tty.stream:write(value) local x, y = tty.getCursor() - local _, ei, delim = unicode.sub(window.output_buffer, 1, window.width):find("([\27\t\r\n\a\b\15])") + local _, ei, delim = unicode.sub(window.output_buffer, 1, window.width):find("([\27\t\r\n\a\b\v\15])") local segment = ansi_print .. (ei and window.output_buffer:sub(1, ei - 1) or window.output_buffer) if segment ~= "" then @@ -139,6 +139,8 @@ function tty.stream:write(value) y = y + 1 elseif delim == "\b" then x = x - 1 + elseif delim == "\v" then + y = y + 1 elseif delim == "\a" and not beeped then computer.beep() beeped = true diff --git a/src/main/resources/assets/opencomputers/robot.names b/src/main/resources/assets/opencomputers/robot.names index e6e948f64..7cead7cfa 100644 --- a/src/main/resources/assets/opencomputers/robot.names +++ b/src/main/resources/assets/opencomputers/robot.names @@ -40,7 +40,7 @@ Dalek Sec # Doctor Who Data # Star Trek David # A.I. (the movie) Death Trap # Borderlands 2's Mechromancer -Decepticon #Transformers +Decepticon # Transformers Deep Thought # Hitchhiker's Guide to the Galaxy Deputy ANDY # Eureka Dog # Half-Life @@ -54,10 +54,11 @@ E.V.E # Anno 2070 Eve # Wall-E Fact Core # Portal Flexo # Futurama -Gerty # Moon (film) +Gerty # Moon Ghost # I, Robot quote "There have always been ghosts in the machine" GLaDOS # Portal Gipsy Danger # Pacific Rim +G.U.N.T.E.R. # Lost in Space HAL 9000 # Space Odyssey Harbinger # Mass Effect Harkness # Fallout 3 @@ -84,7 +85,7 @@ Mawhrin-skel # The Player of Games (Iain M Banks) Michiyo # Contributor *Mute # Analogue: A Hate Story / Hate Plus Mycroft Holmes # The Moon Is a Harsh Mistress -PacMan # Pacman +Pac-Man # Pac-Man Optimus # Transformers. Seperated "Optimus Prime" into two names, as both are quite fitting robot names. P-Body # Portal Pintsize # Questionable Content diff --git a/src/main/scala/li/cil/oc/server/component/WirelessNetworkCard.scala b/src/main/scala/li/cil/oc/server/component/WirelessNetworkCard.scala index 475d07ad5..08d8e3cf0 100644 --- a/src/main/scala/li/cil/oc/server/component/WirelessNetworkCard.scala +++ b/src/main/scala/li/cil/oc/server/component/WirelessNetworkCard.scala @@ -161,6 +161,9 @@ object WirelessNetworkCard { ) override def getDeviceInfo: util.Map[String, String] = deviceInfo + + override protected def isPacketAccepted(packet: Packet, distance: Double) = distance != 0 && super.isPacketAccepted(packet, distance) + } class Tier2(host: EnvironmentHost) extends Tier1(host) {