From 170ce28ebea4a66032be105d38e31e07278009e6 Mon Sep 17 00:00:00 2001 From: payonel Date: Fri, 1 Feb 2019 22:46:36 -0800 Subject: [PATCH 1/5] use transferBetweenInventoriesSlots for the slot closes #2988 --- src/main/scala/li/cil/oc/util/InventoryUtils.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/scala/li/cil/oc/util/InventoryUtils.scala b/src/main/scala/li/cil/oc/util/InventoryUtils.scala index d4a6b4c04..6089f221e 100644 --- a/src/main/scala/li/cil/oc/util/InventoryUtils.scala +++ b/src/main/scala/li/cil/oc/util/InventoryUtils.scala @@ -335,7 +335,7 @@ object InventoryUtils { inventoryAt(sourcePos) match { case Some(sourceInventory) => inventoryAt(sinkPos) match { - case Some(sinkInventory) => () => transferBetweenInventories(sourceInventory, sourceSide, sinkInventory, sinkSide, limit) + case Some(sinkInventory) => () => transferBetweenInventoriesSlots(sourceInventory, sourceSide, sourceSlot, sinkInventory, sinkSide, sinkSlot, limit) case _ => null } case _ => null From b1083980c4167bad66cb74fcd7d91d6513ab6baf Mon Sep 17 00:00:00 2001 From: "Wilma456 (Jakob0815)" Date: Tue, 15 Jan 2019 16:22:11 +0100 Subject: [PATCH 2/5] Add \v escape sequenz --- .../resources/assets/opencomputers/loot/openos/lib/tty.lua | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 From 9d03bd497fdb59992aba48ada525baba4dd5731b Mon Sep 17 00:00:00 2001 From: Anar Abdullayev Date: Sat, 29 Dec 2018 11:20:33 +0400 Subject: [PATCH 3/5] Update robot.names --- src/main/resources/assets/opencomputers/robot.names | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/main/resources/assets/opencomputers/robot.names b/src/main/resources/assets/opencomputers/robot.names index e6e948f64..b0a3421f3 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,12 @@ 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 +Give Me A Name Please # Just a Funny Name :) +G.U.N.T.E.R. # Lost in Space HAL 9000 # Space Odyssey Harbinger # Mass Effect Harkness # Fallout 3 @@ -84,7 +86,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 +Pacman # Pacman Optimus # Transformers. Seperated "Optimus Prime" into two names, as both are quite fitting robot names. P-Body # Portal Pintsize # Questionable Content From 96a856c6699b2a9c0511c58a62154649d726e93c Mon Sep 17 00:00:00 2001 From: Anar Abdullayev Date: Mon, 31 Dec 2018 18:47:33 +0400 Subject: [PATCH 4/5] Update robot.names --- src/main/resources/assets/opencomputers/robot.names | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/resources/assets/opencomputers/robot.names b/src/main/resources/assets/opencomputers/robot.names index b0a3421f3..7cead7cfa 100644 --- a/src/main/resources/assets/opencomputers/robot.names +++ b/src/main/resources/assets/opencomputers/robot.names @@ -58,7 +58,6 @@ Gerty # Moon Ghost # I, Robot quote "There have always been ghosts in the machine" GLaDOS # Portal Gipsy Danger # Pacific Rim -Give Me A Name Please # Just a Funny Name :) G.U.N.T.E.R. # Lost in Space HAL 9000 # Space Odyssey Harbinger # Mass Effect @@ -86,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 From 04a1fb77c91fc474a44ca4072c3c4202ab806cdf Mon Sep 17 00:00:00 2001 From: TheCodex6824 Date: Wed, 28 Nov 2018 16:15:37 -0500 Subject: [PATCH 5/5] Fixed T1 wireless cards receiving wired messages --- .../scala/li/cil/oc/server/component/WirelessNetworkCard.scala | 3 +++ 1 file changed, 3 insertions(+) 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 9cacc8a01..120d9ebda 100644 --- a/src/main/scala/li/cil/oc/server/component/WirelessNetworkCard.scala +++ b/src/main/scala/li/cil/oc/server/component/WirelessNetworkCard.scala @@ -156,6 +156,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) {