From d6b0deb989e649e2800932d4a587c3ba9e3e24c7 Mon Sep 17 00:00:00 2001
From: Vanessa Ezekowitz <vanessaezekowitz@gmail.com>
Date: Sat, 17 Jan 2015 01:16:39 +0100
Subject: [PATCH] fix cnc stick formspec img (missed the border)
---
technic/machines/register/cables.lua | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/technic/machines/register/cables.lua b/technic/machines/register/cables.lua
index 4f7dcf5..7abdfcb 100644
--- a/technic/machines/register/cables.lua
+++ b/technic/machines/register/cables.lua
@@ -59,7 +59,6 @@
end
end
-
minetest.register_on_placenode(function(pos, node)
for tier, machine_list in pairs(technic.machines) do
if machine_list[node.name] ~= nil then
@@ -78,7 +77,6 @@
end
end
end)
-
function technic.get_cable_id(links)
return (links[6] * 1) + (links[5] * 2)
@@ -132,7 +130,11 @@
function technic.cables_should_connect(pos1, pos2, tier)
local name = minetest.get_node(pos2).name
- if technic.is_tier_cable(name, tier) then
+ if name == "technic:switching_station" then
+ return pos2.y == pos1.y + 1 and "machine" or false
+ elseif name == "technic:supply_converter" then
+ return math.abs(pos2.y - pos1.y) == 1 and "machine" or false
+ elseif technic.is_tier_cable(name, tier) then
return "cable"
elseif technic.machines[tier][name] then
return "machine"
@@ -146,7 +148,7 @@
local box_center = {-size, -size, -size, size, size, size}
local box_y1 = {-size, -size, -size, size, 0.5, size} -- y+
local box_x1 = {-size, -size, -size, 0.5, size, size} -- x+
- local box_z1 = {-size, -size, size, size, size, 0.5} -- z+
+ local box_z1 = {-size, -size, size, size, size, 0.5} -- z+
local box_z2 = {-size, -size, -0.5, size, size, size} -- z-
local box_y2 = {-size, -0.5, -size, size, size, size} -- y-
local box_x2 = {-0.5, -size, -size, size, size, size} -- x-
--
Gitblit v1.8.0