diff --git a/autobahn/init.lua b/autobahn/init.lua
index 5083365..a55b0ad 100644
--- a/autobahn/init.lua
+++ b/autobahn/init.lua
@@ -184,7 +184,9 @@ local function update_node(pos)
 	nnode = minetest.get_node(npos)
 	if NodeTbl1[nnode.name] and NodeTbl3[node.name] then
 		node.name = node.name .. "1"
-		minetest.swap_node(pos, node)
+		if minetest.registered_nodes[node.name] then
+			minetest.swap_node(pos, node)
+		end
 		return
 	end
 	-- check case 2
@@ -192,7 +194,9 @@ local function update_node(pos)
 	nnode = minetest.get_node(npos)
 	if NodeTbl2[nnode.name] then
 		node.name = string.sub(node.name,1,-1) .. "2"
-		minetest.swap_node(pos, node)
+		if minetest.registered_nodes[node.name] then
+			minetest.swap_node(pos, node)
+		end
 		return
 	end
 	-- check case 3
@@ -203,7 +207,9 @@ local function update_node(pos)
 	if NodeTbl1[nnode.name] and NodeTbl3[node.name] then
 		node.name = node.name .. "1"
 		node.param2 = 3
-		minetest.swap_node(pos, node)
+		if minetest.registered_nodes[node.name] then
+			minetest.swap_node(pos, node)
+		end
 		return
 	end
 	-- check case 4
@@ -212,7 +218,9 @@ local function update_node(pos)
 	if NodeTbl2[nnode.name] then
 		node.name = string.sub(node.name,1,-1) .. "2"
 		node.param2 = 3
-		minetest.swap_node(pos, node)
+		if minetest.registered_nodes[node.name] then
+			minetest.swap_node(pos, node)
+		end
 		return
 	end
 end		
diff --git a/basic_materials/.gitlab-ci.yml b/basic_materials/.gitlab-ci.yml
new file mode 100644
index 0000000..ff51e7e
--- /dev/null
+++ b/basic_materials/.gitlab-ci.yml
@@ -0,0 +1,8 @@
+stages:
+  - test
+
+luacheck:
+ stage: test
+ image: pipelinecomponents/luacheck:latest
+ script:
+  - luacheck .
diff --git a/compost/init.lua b/compost/init.lua
index 561e1c9..b2b6395 100644
--- a/compost/init.lua
+++ b/compost/init.lua
@@ -2,7 +2,7 @@ local S = minetest.get_translator("compost")
 
 compost = {}
 
-local CYCLE_TIME = 10
+local CYCLE_TIME = 30
 
 -- Version for compatibility checks
 compost.version = 1.0
diff --git a/hyperloop/README.md b/hyperloop/README.md
index fc20f34..f1cd423 100644
--- a/hyperloop/README.md
+++ b/hyperloop/README.md
@@ -11,8 +11,7 @@ It is the fast and modern way of travelling.
 * It can be used even on small servers without lagging
 * No configuration or programming of the tube network is necessary (only the station names have to be entered)
 
-
-**![See Wiki Page for more info](https://github.com/joe7575/Minetest-Hyperloop/wiki)**
+**[See Wiki Page for more info](https://github.com/joe7575/Minetest-Hyperloop/wiki)**
 
 ![screenshot](https://github.com/joe7575/Minetest-Hyperloop/blob/master/screenshot.png)
 
@@ -33,9 +32,9 @@ The mod includes many different kind of blocks:
 ..and more.
 
 
-Browse on: ![GitHub](https://github.com/joe7575/Minetest-Hyperloop)
+Browse on: [GitHub](https://github.com/joe7575/Minetest-Hyperloop)
 
-Download: ![GitHub](https://github.com/joe7575/Minetest-Hyperloop/archive/master.zip)
+Download: [GitHub](https://github.com/joe7575/Minetest-Hyperloop/archive/master.zip)
 
 
 ## Migration from v1 to v2
@@ -59,7 +58,7 @@ has some risks. Therefore:
 
 ## Introduction
 
-**![See Wiki Page for more info](https://github.com/joe7575/Minetest-Hyperloop/wiki)**
+**[See Wiki Page for more info](https://github.com/joe7575/Minetest-Hyperloop/wiki)**
 
 
 ## Configuration
@@ -68,23 +67,25 @@ The following can be changed in the minetest menu (Settings -> Advanced Settings
 * "WiFi block crafting enabled" - To enable the crafting of WiFi blocks (default: false)
 * "free tube placement enabled" - If enabled Hyperloop Tubes and Elevator Shafts can be build in all directions (default: true)
   When this option is disabled, Hyperloop tubes can only be built in the horizontal direction and elevator shafts in the vertical direction.
+* "enable building of subnets" - If enabled the ticket block has an additional field for specifying a subnet name. Stations with the same subnet name (optional) represent an isolated subnet within the Hyperloop network.
 
 Example for 'minetest.conf':
 ```LUA
-hyperloop_wifi_enabled = true
-hyperloop_wifi_crafting_enabled = false
-hyperloop_free_tube_placement_enabled = true
+hyperloop_wifi_enabled = true                  -- WiFi block enabled
+hyperloop_wifi_crafting_enabled = false        -- WiFi block crafting enabled
+hyperloop_free_tube_placement_enabled = true   -- free tube placement enabled
+hyperloop_subnet_enabled = true                -- enable building of subnets
 ```
 
 ## Dependencies
-tubelib2 (![GitHub](https://github.com/joe7575/tubelib2))  
+tubelib2 ([GitHub](https://github.com/joe7575/tubelib2))  
 default  
 intllib  
 optional: worldedit, techage
 
 
 # License
-Copyright (C) 2017,2020 Joachim Stolberg  
+Copyright (C) 2017,2021 Joachim Stolberg  
 Code: Licensed under the GNU LGPL version 2.1 or later. See LICENSE.txt and http://www.gnu.org/licenses/lgpl-2.1.txt  
 Textures: CC0  
 Display: Derived from the work of kaeza, sofar and others (digilines) LGPLv2.1+
diff --git a/hyperloop/booking_node.lua b/hyperloop/booking_node.lua
index 494d4cb..4b4809d 100644
--- a/hyperloop/booking_node.lua
+++ b/hyperloop/booking_node.lua
@@ -75,35 +75,72 @@ local function remove_junctions(sortedList)
 	return tbl
 end
 
-local function station_list_as_string(pos)
-	-- Generate a distance sorted list of all connected stations
-	local sortedList = Stations:station_list(pos, pos, "dist")
-	-- Delete the own station from list
-	table.remove(sortedList, 1)
+local function filter_subnet(sortedList, subnet)
+	if hyperloop.subnet_enabled then
+		if subnet == "" then
+			subnet = nil
+		end
+		
+		local tbl = {}
+		for idx,item in ipairs(sortedList) do
+			if item.subnet == subnet then
+				tbl[#tbl+1] = item
+			end
+		end
+		return tbl
+	end
+	return sortedList
+end
+
+-- Used to update the station list for booking machine
+-- and teleport list.
+local function station_list_as_string(pos, subnet)
+	local meta = M(pos)
+	-- Generate a name sorted list of all connected stations
+	local sortedList = Stations:station_list(pos, pos, "name")
 	-- remove all junctions from the list
 	sortedList = remove_junctions(sortedList)
+	-- use subnet pattern to reduce the list
+	sortedList = filter_subnet(sortedList, subnet)
 	-- store the list for later use
 	store_station_list(pos, sortedList)
 	-- Generate the formspec string
 	return generate_string(sortedList)
 end
 
+local naming_formspec = nil
 
-local function naming_formspec(pos)
-	local meta = minetest.get_meta(pos)
-	local formspec = "size[6,4]"..
-	default.gui_bg..
-	default.gui_bg_img..
-	default.gui_slots..
-	"label[0,0;"..S("Please enter the station name to\nwhich this booking machine belongs.").."]" ..
-	"field[0.5,1.5;5,1;name;"..S("Station name")..";MyTown]" ..
-	"field[0.5,2.7;5,1;info;"..S("Additional station information")..";]" ..
-	"button_exit[2,3.6;2,1;exit;Save]"
-	meta:set_string("formspec", formspec)
-	meta:set_int("change_counter", 0)
+if hyperloop.subnet_enabled then
+	naming_formspec = function(pos)
+		local meta = M(pos)
+		local formspec = "size[7,5.4]"..
+		default.gui_bg..
+		default.gui_bg_img..
+		default.gui_slots..
+		"label[0,0;"..S("Please enter the station name to\nwhich this booking machine belongs.").."]" ..
+		"field[0.2,1.5;7.1,1;name;"..S("Station name")..";MyTown]" ..
+		"field[0.2,2.7;7.1,1;info;"..S("Additional station information")..";]" ..
+		"field[0.2,3.9;7.1,1;subnet;"..S("Subnet name (optional)")..";]" ..
+		"button_exit[2.5,4.7;2,1;exit;Save]"
+		meta:set_string("formspec", formspec)
+		meta:set_int("change_counter", 0)
+	end
+else
+	naming_formspec = function(pos)
+		local meta = M(pos)
+		local formspec = "size[7,4.4]"..
+		default.gui_bg..
+		default.gui_bg_img..
+		default.gui_slots..
+		"label[0,0;"..S("Please enter the station name to\nwhich this booking machine belongs.").."]" ..
+		"field[0.2,1.5;7.1,1;name;"..S("Station name")..";MyTown]" ..
+		"field[0.2,2.7;7.1,1;info;"..S("Additional station information")..";]" ..
+		"button_exit[2.5,3.7;2,1;exit;Save]"
+		meta:set_string("formspec", formspec)
+		meta:set_int("change_counter", 0)
+	end
 end
 
-
 local function booking_machine_update(pos)
 	local meta = M(pos)
 	local sStationPos = meta:get_string("sStationPos")
@@ -111,25 +148,19 @@ local function booking_machine_update(pos)
 		local station_pos = P(sStationPos)
 		local counter = meta:get_int("change_counter") or 0
 		local changed, newcounter = Stations:changed(counter)
-		if changed then
-			meta:set_string("formspec", station_list_as_string(station_pos))
+		if changed or not tStationList[sStationPos] then
+			local subnet = meta:get_string("subnet")
+			meta:set_string("formspec", station_list_as_string(station_pos, subnet))
 			meta:set_int("change_counter", newcounter)
 		end
-		if not tStationList[sStationPos] then
-			local sortedList = Stations:station_list(station_pos, station_pos, "dist")
-			-- Delete the own station from list
-			table.remove(sortedList, 1)
-			-- remove all junctions from the list
-			sortedList = remove_junctions(sortedList)
-			-- store the list for later use
-			store_station_list(station_pos, sortedList)
-		end
 	end
 end
 
+local function on_rightclick(pos)
+	booking_machine_update(pos)
+end
 
 local function on_receive_fields(pos, formname, fields, player)
-	booking_machine_update(pos)
 	-- station name entered?
 	if fields.name ~= nil then
 		local station_name = string.trim(fields.name)
@@ -142,17 +173,25 @@ local function on_receive_fields(pos, formname, fields, player)
 				hyperloop.chat(player, S("Station has already a booking machine!"))
 				return
 			end
+			-- add subnet name if available
+			local subnet = string.trim(fields.subnet or "")
+			if subnet == "" then
+				subnet = nil
+			end
 			-- store meta and generate station formspec
 			Stations:update(stationPos, {
 					name = station_name,
 					booking_pos = pos,
 					booking_info = string.trim(fields.info),
+					subnet = subnet,
 			})
 			
 			local meta = M(pos)
 			meta:set_string("sStationPos", SP(stationPos))
 			meta:set_string("infotext", "Station: "..station_name)
-			meta:set_string("formspec", station_list_as_string(stationPos))
+			meta:set_string("subnet", string.trim(fields.subnet or ""))
+			meta:set_int("change_counter", 0) -- force update
+			booking_machine_update(pos)
 		else
 			hyperloop.chat(player, S("Invalid station name!"))
 		end
@@ -233,6 +272,7 @@ minetest.register_node("hyperloop:booking", {
 	on_rotate = screwdriver.disallow,	
 	on_receive_fields = on_receive_fields,
 	on_destruct = on_destruct,
+	on_rightclick = on_rightclick,
 
 	paramtype = 'light',
 	light_source = 2,
@@ -279,10 +319,4 @@ minetest.register_node("hyperloop:booking_ground", {
 })
 
 
-minetest.register_lbm({
-	label = "[Hyperloop] Booking machine update",
-	name = "hyperloop:update",
-	nodenames = {"hyperloop:booking", "hyperloop:booking_ground"},
-	run_at_every_load = true,
-	action = booking_machine_update
-})
+
diff --git a/hyperloop/init.lua b/hyperloop/init.lua
index 2d4cff9..8798e07 100644
--- a/hyperloop/init.lua
+++ b/hyperloop/init.lua
@@ -5,7 +5,7 @@
 
 	v2.06 by JoSt
 
-	Copyright (C) 2017-2019 Joachim Stolberg
+	Copyright (C) 2017-2021 Joachim Stolberg
 
 	LGPLv2.1+
 	See LICENSE.txt for more information
@@ -34,6 +34,7 @@
 	2020-01-03  v2.04  Elevator door bugfix (MT 5+)
 	2020-03-12  v2.05  minetest translator added (thanks to acmgit/Clyde)
 	2020-06-14  v2.06  The default value for `hyperloop_free_tube_placement_enabled` is now true
+        2021-02-07  v2.07  tube_crowbar: Add tube length check
 
 ]]--
 
@@ -65,7 +66,8 @@ else
 	hyperloop.wifi_enabled = minetest.settings:get_bool("hyperloop_wifi_enabled")
 	hyperloop.wifi_crafting_enabled = minetest.settings:get_bool("hyperloop_wifi_crafting_enabled")
 	hyperloop.free_tube_placement_enabled = minetest.settings:get_bool("hyperloop_free_tube_placement_enabled", true)
-	
+        hyperloop.subnet_enabled = minetest.settings:get_bool("hyperloop_subnet_enabled")
+
 	dofile(minetest.get_modpath("hyperloop") .. "/network.lua")
 	dofile(minetest.get_modpath("hyperloop") .. "/data_base.lua")
 	dofile(minetest.get_modpath("hyperloop") .. "/booking.lua")
diff --git a/hyperloop/network.lua b/hyperloop/network.lua
index ddb8fa8..ea9611f 100644
--- a/hyperloop/network.lua
+++ b/hyperloop/network.lua
@@ -96,6 +96,15 @@ local function sort_based_on_distance(tStations, pos)
 	return lStations
 end
 
+-- Return a list with sorted stations
+local function sort_based_on_name(tStations, pos)
+	local lStations = table_to_list(table.copy(tStations))
+	-- Add distance 
+	lStations = add_distance_to_list(lStations, pos)
+	table.sort(lStations, function(a,b) return a.name < b.name end)
+	return lStations
+end
+
 
 --
 -- Class Network
@@ -233,8 +242,12 @@ function Network:station_list(pos, station_pos, sorted)
 	end
 	if sorted == "dist" then
 		lStations = sort_based_on_distance(tStations, pos)
-	else
+	elseif sorted == "level" then
 		lStations = sort_based_on_level(tStations)
+	else
+		-- delete own station from list
+		tStations[S(station_pos)] = nil
+		lStations = sort_based_on_name(tStations, pos)
 	end
 	return lStations
 end
@@ -263,4 +276,4 @@ end
 function Network:serialize()
 	return minetest.serialize(self)
 end
-	
\ No newline at end of file
+	
diff --git a/hyperloop/settingtypes.txt b/hyperloop/settingtypes.txt
index 1fc0431..2c2e90e 100644
--- a/hyperloop/settingtypes.txt
+++ b/hyperloop/settingtypes.txt
@@ -8,3 +8,8 @@ hyperloop_wifi_crafting_enabled (WiFi block crafting enabled) bool false
 # If disabled, connected stations have to be on one level, 
 # typically underground.
 hyperloop_free_tube_placement_enabled (free tube placement enabled) bool false
+
+# The ticket block has an additional field for specifying a subnet name.
+# Stations with the same subnet name (optional) represent an isolated
+# subnet within the Hyperloop network.
+hyperloop_subnet_enabled (enable building of subnets) bool false
\ No newline at end of file
diff --git a/minecart/README.md b/minecart/README.md
index 27a267c..0a9f5c2 100644
--- a/minecart/README.md
+++ b/minecart/README.md
@@ -4,9 +4,9 @@ Minecart
 **Minecart, the lean railway transportation automation system**
 
 
-Browse on: ![GitHub](https://github.com/joe7575/minecart)
+Browse on: [GitHub](https://github.com/joe7575/minecart)
 
-Download: ![GitHub](https://github.com/joe7575/minecart/archive/master.zip)
+Download: [GitHub](https://github.com/joe7575/minecart/archive/master.zip)
 
 ![minecart](https://github.com/joe7575/minecart/blob/master/screenshot.png)
 
@@ -26,21 +26,15 @@ license).
 3. https://github.com/stujones11/railcart/
 
 
-Original Cart Features
-----------------------
-
-- A fast cart for your railway or roller coaster (up to 7 m/s!)
-- Boost and brake rails
-- Rail junction switching with the 'right-left' walking keys
-- Handbrake with the 'back' key
-
-
 Minecart Features
 -----------------
 
 The mod Minecart has its own cart (called Minecart) in addition to the standard cart.
 Minecarts are used for automated item transport on private and public rail networks.
 The mod features are:
+- a fast cart for your railway or roller coaster (up to 8 m/s!)
+- boost rails and speed limit signs
+- rail junction switching with the 'right-left' walking keys
 - configurable timetables and routes for Minecarts
 - automated loading/unloading of Minecarts by means of a Minecart Hopper
 - rail network protection based on protection blocks called Land Marks
@@ -73,17 +67,16 @@ Introduction
 5. Drive from buffer to buffer in both directions using the Minecart(!) to record the 
    routes (use 'right-left' keys to control the Minecart)
 6. Punch the buffers to check the connection data (e.g. "Oxford: connected to Cambridge")
-7. Optional: Configure the Minecart stop time in one or both buffers. The Minecart 
+7. Optional: Configure the Minecart waiting time in both buffers. The Minecart
    will then start automatically after the configured time
 8. Optional: Protect your rail network with the Protection Landmarks (one Landmark 
    at least every 16 nodes/meters)
 9. Place a Minecart in front of the buffer and check whether it starts after the 
    configured time
 10. Check the cart state via the chat command: /mycart <num>
-    '<num>' is the cart number
+    '<num>' is the cart number, or get a list of carts with /mycart
 11. Drop items into the Minecart and punch the cart to start it, or "sneak+click" the 
-    Minecart to get the items back
-12. Dig the empty cart with a second "sneak+click" (as usual)
+    Minecart to get cart and items back
 
 
 Hopper
@@ -97,6 +90,43 @@ to/from Minecarts. To unload a Minecart place the hopper below the rail.
 To load the Minecart, place the hopper right next to the Minecart.
 
 
+Cart Pusher
+-----------
+
+Used to push a cart if the cart does not stop directly at a buffer.
+The block has to be placed below the rail.
+
+
+Cart Speed / Speed Limit Signs
+------------------------------
+
+As before, the speed of the carts is also influenced by power rails.
+Brake rails are irrelevant, the cart does not brake here.
+The maximum speed is 8 m/s. This assumes a ratio of power rails
+to normal rails of 1 to 4 on a flat section of rail. A rail section is a
+series of rail nodes without a change of direction. After every curve / kink,
+the speed for the next section of the route is newly determined,
+taking into account the swing of the cart. This means that a cart can
+roll over short rail sections without power rails.
+
+In order to additionally brake the cart at certain points
+(at switches or in front of a buffer), speed limit signs can be placed
+on the track. With these signs the speed can be reduced to 4, 2, or 1 m / s.
+The "No speed limit" sign can be used to remove the speed limit.
+
+The speed limit signs must be placed next to the track so that they can
+be read from the cart. This allows different speeds in each direction of travel.
+
+
+Migration to v2
+---------------
+
+The way how carts are monitored and the cart speed is calculated has changed.
+Therefore, it is necessary that all carts are repositioned and the
+recording is repeated.
+Rails and buffers are not affected and can be kept unchanged.
+
+
 History
 -------
 
@@ -117,4 +147,6 @@ History
 2020-06-27  v1.07  Route storage and cart command bugfixes  
 2020-07-24  V1.08  Adapted to new techage ICTA style  
 2020-08-14  V1.09  Hopper support for digtron, protector:chest and default:furnace added    
-2020-11-12  V1.10  Make carts more robust against server lag
+2020-11-12  V1.10  Make carts more robust against server lag  
+2021-04-10  V2.00  Complete revision to make carts robust against server load/lag,
+                   Speed limit signs and cart terminal added
diff --git a/minecart/api.lua b/minecart/api.lua
new file mode 100644
index 0000000..d93e188
--- /dev/null
+++ b/minecart/api.lua
@@ -0,0 +1,52 @@
+--[[
+
+	Minecart
+	========
+
+	Copyright (C) 2019-2021 Joachim Stolberg
+
+	MIT
+	See license.txt for more information
+	
+]]--
+
+--
+-- API functions
+--
+
+-- 'pos' is the position of the puncher/sensor, the cart
+-- position will be determined by means of 'param2' and 'radius'
+function minecart.is_cart_available(pos, param2, radius)
+	local pos2 = minecart.get_nodecart_nearby(pos, param2, radius)	
+	if pos2 then
+		return true
+	end
+	-- The entity check is needed for a cart with driver
+	local entity = minecart.get_entitycart_nearby(pos, param2, radius)
+	if entity then
+		return true
+	end
+end	
+
+function minecart.is_nodecart_available(pos, param2, radius)
+	local pos2 = minecart.get_nodecart_nearby(pos, param2, radius)	
+	if pos2 then
+		return true
+	end
+end	
+
+-- 'pos' is the position of the puncher/sensor, the cart
+-- position will be determined by means of 'param2' and 'radius'
+function minecart.punch_cart(pos, param2, radius, punch_dir)
+	local pos2, node = minecart.get_nodecart_nearby(pos, param2, radius)	
+	if pos2 then
+		minecart.start_nodecart(pos2, node.name, nil, punch_dir)
+		return true
+	end
+	-- The entity check is needed for a cart with driver
+	local entity = minecart.get_entitycart_nearby(pos, param2, radius)
+	if entity and entity.driver then
+		minecart.push_entitycart(entity, punch_dir)
+		return true
+	end
+end
\ No newline at end of file
diff --git a/minecart/baselib.lua b/minecart/baselib.lua
new file mode 100644
index 0000000..d0c035a
--- /dev/null
+++ b/minecart/baselib.lua
@@ -0,0 +1,360 @@
+--[[
+
+	Minecart
+	========
+
+	Copyright (C) 2019-2020 Joachim Stolberg
+
+	MIT
+	See license.txt for more information
+	
+]]--
+
+-- for lazy programmers
+local M = minetest.get_meta
+local P2S = function(pos) if pos then return minetest.pos_to_string(pos) end end
+local S2P = minetest.string_to_pos
+local P2H = minetest.hash_node_position
+local H2P = minetest.get_position_from_hash
+
+local param2_to_dir = {[0]=
+	{x=0,  y=0,  z=1},
+	{x=1,  y=0,  z=0},
+	{x=0,  y=0, z=-1},
+	{x=-1, y=0,  z=0},
+	{x=0,  y=-1, z=0},
+	{x=0,  y=1,  z=0}
+}
+
+-- Registered carts
+minecart.tNodeNames = {} -- [<cart_node_name>] =  <cart_entity_name>
+minecart.tEntityNames = {} -- [<cart_entity_name>] =  true
+minecart.lCartNodeNames = {} -- {<cart_node_name>, <cart_node_name>, ...}
+minecart.tCartTypes = {}
+
+function minecart.param2_to_dir(param2)
+	return param2_to_dir[param2 % 6]
+end
+
+function minecart.get_node_lvm(pos)
+	local node = minetest.get_node_or_nil(pos)
+	if node then
+		return node
+	end
+	local vm = minetest.get_voxel_manip()
+	local MinEdge, MaxEdge = vm:read_from_map(pos, pos)
+	local data = vm:get_data()
+	local param2_data = vm:get_param2_data()
+	local area = VoxelArea:new({MinEdge = MinEdge, MaxEdge = MaxEdge})
+	local idx = area:indexp(pos)
+	if data[idx] and param2_data[idx] then
+		return {
+			name = minetest.get_name_from_content_id(data[idx]),
+			param2 = param2_data[idx]
+		}
+	end
+	return {name="ignore", param2=0}
+end
+
+function minecart.find_node_near_lvm(pos, radius, items)
+	local npos = minetest.find_node_near(pos, radius, items)
+	if npos then
+		return npos
+	end
+	local tItems = {}
+	for _,v in ipairs(items) do
+		tItems[v] = true
+	end
+	local pos1 = {x = pos.x - radius, y = pos.y - radius, z = pos.z - radius}
+	local pos2 = {x = pos.x + radius, y = pos.y + radius, z = pos.z + radius}
+	local vm = minetest.get_voxel_manip()
+	local MinEdge, MaxEdge = vm:read_from_map(pos1, pos2)
+	local data = vm:get_data()
+	local area = VoxelArea:new({MinEdge = MinEdge, MaxEdge = MaxEdge})
+	for x = pos1.x, pos2.x do
+		for y = pos1.y, pos2.y do
+			for z = pos1.z, pos2.z do
+				local idx = area:indexp({x = x, y = y, z = z})
+				if minetest.get_name_from_content_id(data[idx]) then
+					return {x = x, y = y, z = z}
+				end
+			end
+		end
+	end
+end
+
+-- Marker entities for debugging purposes
+function minecart.set_marker(pos, text, size, ttl)
+	local marker = minetest.add_entity(pos, "minecart:marker_cube")
+	if marker ~= nil then
+		marker:set_nametag_attributes({color = "#FFFFFF", text = text})
+		size = size or 1
+		marker:set_properties({visual_size = {x = size, y = size}})
+		if ttl then
+			minetest.after(ttl, marker.remove, marker)
+		end
+	end
+end
+
+minetest.register_entity(":minecart:marker_cube", {
+	initial_properties = {
+		visual = "cube",
+		textures = {
+			"minecart_marker_cube.png",
+			"minecart_marker_cube.png",
+			"minecart_marker_cube.png",
+			"minecart_marker_cube.png",
+			"minecart_marker_cube.png",
+			"minecart_marker_cube.png",
+		},
+		physical = false,
+		visual_size = {x = 1, y = 1},
+		collisionbox = {-0.25,-0.25,-0.25, 0.25,0.25,0.25},
+		glow = 8,
+		static_save = false,
+	},
+	on_punch = function(self)
+		self.object:remove()
+	end,
+})
+
+function minecart.is_air_like(name)
+	local ndef = minetest.registered_nodes[name]
+	if ndef and ndef.buildable_to then
+		return true
+	end
+	return false
+end
+
+function minecart.range(val, min, max)
+	val = tonumber(val)
+	if val < min then return min end
+	if val > max then return max end
+	return val
+end
+
+function minecart.get_next_node(pos, param2)
+	local pos2 = param2 and vector.add(pos, param2_to_dir[param2]) or pos
+	local node = minetest.get_node(pos2)
+	return pos2, node
+end
+
+function minecart.get_object_id(object)
+	for id, entity in pairs(minetest.luaentities) do
+		if entity.object == object then
+			return id
+		end
+	end
+end
+
+function minecart.is_owner(player, owner)
+	if not player or not player:is_player() or not owner or owner == "" then
+		return true
+	end
+
+	local name = player:get_player_name()
+	if minetest.check_player_privs(name, "minecart") then
+		return true
+	end
+	return name == owner
+end
+
+function minecart.get_buffer_pos(pos, player_name)
+	local pos1 = minecart.find_node_near_lvm(pos, 1, {"minecart:buffer"})
+	if pos1 then
+		local meta = minetest.get_meta(pos1)
+		if player_name == nil or player_name == meta:get_string("owner") then
+			return pos1
+		end
+	end
+end
+
+function minecart.get_buffer_name(pos)
+	local pos1 = minecart.find_node_near_lvm(pos, 1, {"minecart:buffer"})
+	if pos1 then
+		local name = M(pos1):get_string("name")
+		if name ~= "" then
+			return name
+		end
+		return P2S(pos1)
+	end
+end
+
+function minecart.manage_attachment(player, entity, get_on)
+	if not player then
+		return
+	end
+	local player_name = player:get_player_name()
+	if player_api.player_attached[player_name] == get_on then
+		return
+	end
+	player_api.player_attached[player_name] = get_on
+	
+	local obj = entity.object
+	if get_on then
+		player:set_attach(obj, "", {x=0, y=-4.5, z=-4}, {x=0, y=0, z=0})
+		player:set_eye_offset({x=0, y=-6, z=0},{x=0, y=-6, z=0})
+		player:set_properties({visual_size = {x = 2.5, y = 2.5}})
+		player_api.set_animation(player, "sit")
+		entity.driver = player:get_player_name()
+	else
+		player:set_detach()
+		player:set_eye_offset({x=0, y=0, z=0},{x=0, y=0, z=0})
+		player:set_properties({visual_size = {x = 1, y = 1}})
+		player_api.set_animation(player, "stand")
+		entity.driver = nil
+	end
+end
+
+function minecart.register_cart_names(node_name, entity_name, cart_type)
+	minecart.tNodeNames[node_name] = entity_name
+	minecart.tEntityNames[entity_name] = true
+	minecart.lCartNodeNames[#minecart.lCartNodeNames+1] = node_name
+	minecart.add_raillike_nodes(node_name)
+	minecart.tCartTypes[node_name] = cart_type
+end
+
+function minecart.add_nodecart(pos, node_name, param2, cargo, owner, userID)
+	if pos and node_name and param2 and cargo and owner and userID then
+		local pos2
+		if not minecart.is_rail(pos) then
+			pos2 = minetest.find_node_near(pos, 1, minecart.lRails)
+			if not pos2 or not minecart.is_rail(pos2) then
+				pos2 = minetest.find_node_near(pos, 2, minecart.lRails)
+				if not pos2 or not minecart.is_rail(pos2) then
+					pos2 = minetest.find_node_near(pos, 2, {"air"})
+				end
+			end
+		else
+			pos2 = vector.new(pos)
+		end
+		if pos2 then
+			local node = minetest.get_node(pos2)
+			local ndef = minetest.registered_nodes[node_name]
+			local rail = node.name
+			minetest.swap_node(pos2, {name = node_name, param2 = param2})
+			local meta = M(pos2)
+			meta:set_string("removed_rail", rail)
+			meta:set_string("owner", owner)
+			meta:set_int("userID", userID)
+			meta:set_string("infotext", owner .. ": " .. userID)
+			
+			if cargo and ndef.set_cargo then
+				ndef.set_cargo(pos2, cargo)
+			end
+			if ndef.after_place_node then
+				ndef.after_place_node(pos2)
+			end
+			return pos2
+		else
+			minetest.add_item(pos, ItemStack({name = node_name}))
+		end
+	end
+end
+
+function minecart.add_entitycart(pos, node_name, entity_name, vel, cargo, owner, userID)
+	local obj = minetest.add_entity(pos, entity_name)
+	local objID = minecart.get_object_id(obj)
+	
+	if objID then
+		local entity = obj:get_luaentity()
+		entity.start_pos = pos
+		entity.owner = owner
+		entity.node_name = node_name
+		entity.userID = userID
+		entity.objID = objID
+		entity.cargo = cargo
+		obj:set_nametag_attributes({color = "#ffff00", text = owner..": "..userID})
+		obj:set_velocity(vel)
+		return obj
+	end
+end
+
+function minecart.start_entitycart(self, pos)
+	local route = {}
+	
+	self.is_running = true
+	self.arrival_time = 0
+	self.start_pos = minecart.get_buffer_pos(pos, self.owner)
+	if self.start_pos then
+		-- Read buffer route for the junction info
+		route = minecart.get_route(self.start_pos) or {}
+		self.junctions = route and route.junctions
+	end
+	-- If set the start waypoint will be deleted
+	self.no_normal_start = self.start_pos == nil
+	if self.driver == nil then
+		minecart.start_monitoring(self.owner, self.userID, pos, self.objID, 
+				route.checkpoints, route.junctions, self.cargo or {})
+	end
+end
+
+function minecart.remove_nodecart(pos)
+	local node = minetest.get_node(pos)
+	local ndef = minetest.registered_nodes[node.name]
+	local meta = M(pos)
+	local rail = meta:get_string("removed_rail")
+	if rail == "" then rail = "air" end
+	local userID = meta:get_int("userID")
+	local owner = meta:get_string("owner")
+	meta:set_string("infotext", "")
+	meta:set_string("formspec", "")
+	local cargo = ndef.get_cargo and ndef.get_cargo(pos) or {}
+	minetest.swap_node(pos, {name = rail})
+	return cargo, owner, userID
+end	
+	
+function minecart.node_to_entity(pos, node_name, entity_name)
+	-- Remove node
+	local cargo, owner, userID = minecart.remove_nodecart(pos)
+	local obj = minecart.add_entitycart(pos, node_name, entity_name,
+			{x = 0, y = 0, z = 0}, cargo, owner, userID)
+	if obj then
+		return obj
+	else
+		print("Entity has no ID")
+	end
+end
+
+function minecart.entity_to_node(pos, entity)
+	-- Stop sound
+	if entity.sound_handle then
+		minetest.sound_stop(entity.sound_handle)
+		entity.sound_handle = nil
+	end
+	
+	local rot = entity.object:get_rotation()
+	local dir = minetest.yaw_to_dir(rot.y)
+	local facedir = minetest.dir_to_facedir(dir)
+	minecart.stop_recording(entity, pos)
+	entity.object:remove()
+	local pos2 = minecart.add_nodecart(pos, entity.node_name, facedir, entity.cargo, entity.owner, entity.userID)
+	minecart.stop_monitoring(entity.owner, entity.userID, pos2)
+end
+
+function minecart.add_node_to_player_inventory(pos, player, node_name)
+	local inv = player:get_inventory()
+	if not (creative and creative.is_enabled_for
+			and creative.is_enabled_for(player:get_player_name()))
+			or not inv:contains_item("main", node_name) then
+		local leftover = inv:add_item("main", node_name)
+		-- If no room in inventory, drop the cart
+		if not leftover:is_empty() then
+			minetest.add_item(pos, leftover)
+		end
+	end
+end
+
+-- Player removes the node
+function minecart.remove_entity(self, pos, player)
+	-- Stop sound
+	if self.sound_handle then
+		minetest.sound_stop(self.sound_handle)
+		self.sound_handle = nil
+	end
+	minecart.add_node_to_player_inventory(pos, player, self.node_name or "minecart:cart")
+	minecart.stop_monitoring(self.owner, self.userID, pos)
+	minecart.stop_recording(self, pos)	
+	minecart.monitoring_remove_cart(self.owner, self.userID)
+	self.object:remove()
+end
diff --git a/minecart/buffer.lua b/minecart/buffer.lua
index 89e642b..3c2100c 100644
--- a/minecart/buffer.lua
+++ b/minecart/buffer.lua
@@ -3,7 +3,7 @@
 	Minecart
 	========
 
-	Copyright (C) 2019-2020 Joachim Stolberg
+	Copyright (C) 2019-2021 Joachim Stolberg
 
 	MIT
 	See license.txt for more information
@@ -23,21 +23,17 @@ local StopTime = {}
 local function formspec(pos)
 	local name = M(pos):get_string("name")
 	local time = M(pos):get_int("time")
-	local s = "size[4,4.2]" ..
+	return "size[4,4.2]" ..
 		"label[0,0;Configuration]" ..
 		"field[0.5,1.2;3.6,1;name;"..S("Station name")..":;"..name.."]"..
-		"button_exit[1,3.4;2,1;exit;Save]"
-	if minecart.hopper_enabled then
-		return s.."field[0.5,2.5;3.6,1;time;"..S("Stop time/sec")..":;"..time.."]"
-	end
-	return s
+		"button_exit[1,3.4;2,1;exit;Save]"..
+		"field[0.5,2.5;3.6,1;time;"..S("Waiting time/sec")..":;"..time.."]"
 end
 
 local function remote_station_name(pos)
-	local route = minecart.get_route(P2S(pos))
+	local route = minecart.get_route(pos)
 	if route and route.dest_pos then
-		local pos2 = S2P(route.dest_pos)
-		return M(pos2):get_string("name")
+		return M(route.dest_pos):get_string("name")
 	end
 	return "none"
 end
@@ -46,23 +42,21 @@ local function on_punch(pos, node, puncher)
 	local name = M(pos):get_string("name")
 	M(pos):set_string("infotext", name..": "..S("connected to").." "..remote_station_name(pos))
 	M(pos):set_string("formspec", formspec(pos))
-	if minecart.hopper_enabled then
-		minetest.get_node_timer(pos):start(CYCLE_TIME)
-	end
+	minetest.get_node_timer(pos):start(CYCLE_TIME)
+
 	-- Optional Teleport function
 	if not minecart.teleport_enabled then return end
-	local route = minecart.get_route(P2S(pos))
+	local route = minecart.get_route(pos)
 	if route and route.dest_pos and puncher and puncher:is_player() then
 
 		-- only teleport if the user is not pressing shift
 		if not puncher:get_player_control()['sneak'] then
 			local playername = puncher:get_player_name()
-			local pos = S2P(route.dest_pos)
 
 			local teleport = function()
 				-- Make sure the player object still exists
 				local player = minetest.get_player_by_name(playername)
-				if player and pos then player:set_pos(pos) end
+				if player then player:set_pos(route.dest_pos) end
 			end
 			minetest.after(0.25, teleport)
 		end
@@ -95,24 +89,21 @@ minetest.register_node("minecart:buffer", {
 	},
 	after_place_node = function(pos, placer)
 		M(pos):set_string("owner", placer:get_player_name())
-		minecart.del_route(minetest.pos_to_string(pos))
+		minecart.del_route(pos)
 		M(pos):set_string("formspec", formspec(pos))
-		if minecart.hopper_enabled then
-			minetest.get_node_timer(pos):start(CYCLE_TIME)
-		end
+		minetest.get_node_timer(pos):start(CYCLE_TIME)
 	end,
 	on_timer = function(pos, elapsed)
 		local time = M(pos):get_int("time")
 		if time > 0 then
 			local hash = minetest.hash_node_position(pos)
 			local param2 = (minetest.get_node(pos).param2 + 2) % 4
-			if minecart.check_cart_for_pushing(pos, param2) then
+			if minecart.is_cart_available(pos, param2, 0.5) then
 				if StopTime[hash] then
 					if StopTime[hash] < minetest.get_gametime() then
 						StopTime[hash] = nil
-						local node = minetest.get_node(pos)
-						local dir = minetest.facedir_to_dir(node.param2)
-						minecart.punch_cart(pos, param2, 0, dir)
+						local dir = minetest.facedir_to_dir(param2)
+						minecart.punch_cart(pos, param2, 0.5, dir)
 					end
 				else
 					StopTime[hash] = minetest.get_gametime() + time
@@ -124,7 +115,7 @@ minetest.register_node("minecart:buffer", {
 		return true
 	end,
 	after_dig_node = function(pos)
-		minecart.del_route(minetest.pos_to_string(pos))
+		minecart.del_route(pos)
 		local hash = minetest.hash_node_position(pos)
 		StopTime[hash] = nil
 	end,
@@ -137,6 +128,7 @@ minetest.register_node("minecart:buffer", {
 			M(pos):set_int("time", tonumber(fields.time) or 0)
 			M(pos):set_string("formspec", formspec(pos))
 			M(pos):set_string("infotext", fields.name.." "..S("connected to").." "..remote_station_name(pos))
+			minetest.get_node_timer(pos):start(CYCLE_TIME)
 		end
 	end,
 	on_punch = on_punch,
@@ -156,3 +148,15 @@ minetest.register_craft({
 		{"default:steel_ingot", "default:junglewood", "default:steel_ingot"},
 	},
 })
+
+minetest.register_lbm({
+	label = "Delete waiting times",
+	name = "minecart:del_time",
+	nodenames = {"minecart:buffer"},
+	run_at_every_load = false,
+	action = function(pos, node)
+		-- delete old data
+		minecart.get_route(pos)
+		M(pos):set_string("formspec", formspec(pos))
+	end,
+})
diff --git a/minecart/cart_lib1.lua b/minecart/cart_lib1.lua
deleted file mode 100644
index afde093..0000000
--- a/minecart/cart_lib1.lua
+++ /dev/null
@@ -1,397 +0,0 @@
---[[
-
-	Minecart
-	========
-
-	Copyright (C) 2019-2020 Joachim Stolberg
-
-	MIT
-	See license.txt for more information
-	
-	Cart library functions (level 1)
-	
-]]--
-
--- Notes:
--- 1) Only the owner can punch der cart
--- 2) Only the owner can start the recording
--- 3) But any player can act as cargo, cart punched by owner or buffer
-
-local SLOPE_ACCELERATION = 3
-local MAX_SPEED = 7
-local PUNCH_SPEED = 3
-local SLOWDOWN = 0.4
-local RAILTYPE = minetest.get_item_group("carts:rail", "connect_to_raillike")
-local Y_OFFS_ON_SLOPES = 0.5
-
--- for lazy programmers
-local M = minetest.get_meta
-local S = minecart.S
-local P2S = function(pos) if pos then return minetest.pos_to_string(pos) end end
-local S2P = minetest.string_to_pos
-local MP = minetest.get_modpath("minecart")
-local D = function(pos) return minetest.pos_to_string(vector.round(pos)) end 
-
-local tRails = {
-	["carts:rail"] = true,
-	["carts:powerrail"] = true,
-	["carts:brakerail"] = true,
-}
-
-local lRails = {"carts:rail", "carts:powerrail", "carts:brakerail"}
-
-local function get_rail_node(pos)
-	local rail_pos = vector.round(pos)
-	local node = minecart.get_node_lvm(rail_pos)
-	if tRails[node.name] then
-		return rail_pos, node
-	end
-end
-
-local function find_rail_node(pos)
-	local rail_pos = vector.round(pos)
-	local node = get_rail_node(rail_pos)
-	if node then
-		return rail_pos, node
-	end
-	local pos1 = {x=rail_pos.x-1, y=rail_pos.y-1, z=rail_pos.z-1}
-	local pos2 = {x=rail_pos.x+1, y=rail_pos.y+1, z=rail_pos.z+1}
-	for _,pos3 in ipairs(minetest.find_nodes_in_area(pos1, pos2, lRails)) do
-		--print("invalid position1", D(pos), D(pos3))
-		return pos3, minecart.get_node_lvm(pos3)
-	end
-	--print("invalid position2", D(pos))
-end
-
-local function get_pitch(dir)
-	local pitch = 0
-	if dir.y == -1 then
-		pitch = -math.pi/4
-	elseif dir.y == 1 then
-		pitch = math.pi/4
-	end
-	return pitch * (dir.z == 0 and -1 or 1)
-end
-
-local function get_yaw(dir)
-	local yaw = 0
-	if dir.x < 0 then
-		yaw = math.pi/2*3
-	elseif dir.x > 0 then
-		yaw = math.pi/2
-	elseif dir.z < 0 then
-		yaw = math.pi
-	end
-	return yaw
-end
-
-local function push_cart(self, pos, punch_dir, puncher)
-	local vel = self.object:get_velocity()
-	punch_dir = punch_dir or carts:velocity_to_dir(puncher:get_look_dir())
-	punch_dir.y = 0
-	local cart_dir = carts:get_rail_direction(pos, punch_dir, nil, nil, RAILTYPE)
-	
-	-- Always start in horizontal direction
-	cart_dir.y = 0
-	
-	if vector.equals(cart_dir, {x=0, y=0, z=0}) then return end
-	
-	local speed = vector.multiply(cart_dir, PUNCH_SPEED)
-	local new_vel = vector.add(vel, speed)
-	local yaw = get_yaw(cart_dir)
-	local pitch = get_pitch(cart_dir)
-
-	self.object:set_rotation({x = pitch, y = yaw, z = 0})
-	self.object:set_velocity(new_vel)
-
-	self.old_pos = vector.round(pos)
-	self.stopped = false
-end
-
-local api = {}
-
-function api:init(is_node_cart)
-	local lib
-	
-	if is_node_cart then
-		lib = dofile(MP.."/cart_lib2n.lua")
-	else
-		lib = dofile(MP.."/cart_lib2e.lua")
-	end
-		
-	-- add lib to local api
-	for k,v in pairs(lib) do
-		api[k] = v
-	end
-end
-
--- Player get on / off
-function api:on_rightclick(clicker)
-	if not clicker or not clicker:is_player() then
-		return
-	end
-	local player_name = clicker:get_player_name()
-	if self.driver and player_name == self.driver then
-		self.driver = nil
-		carts:manage_attachment(clicker, nil)
-	elseif not self.driver then
-		self.driver = player_name
-		carts:manage_attachment(clicker, self.object)
-
-		-- player_api does not update the animation
-		-- when the player is attached, reset to default animation
-		player_api.set_animation(clicker, "stand")
-	end
-end
-
-function api:on_activate(staticdata, dtime_s)
-	self.object:set_armor_groups({immortal=1})
-end
-
-function api:on_detach_child(child)
-	if child and child:get_player_name() == self.driver then
-		self.driver = nil
-	end
-end
-
-function api:on_punch(puncher, time_from_last_punch, tool_capabilities, direction)
-	local pos = self.object:get_pos()
-	local vel = self.object:get_velocity()
-	local stopped = vector.equals(vel, {x=0, y=0, z=0})
-	local is_minecart = self.node_name == nil
-	local node_name = self.node_name or "minecart:cart"
-	local puncher_name = puncher and puncher:is_player() and puncher:get_player_name()
-	local puncher_is_owner = puncher_name and (not self.owner or self.owner == "" or
-			puncher_name == self.owner or
-			minetest.check_player_privs(puncher_name, "minecart"))
-	local puncher_is_driver = self.driver and self.driver == puncher_name
-	local sneak_punch = puncher_name and puncher:get_player_control().sneak
-	local no_cargo = next(self.cargo or {}) == nil
-	
-	-- driver wants to leave/remove the empty Minecart by sneak-punch
-	if is_minecart and sneak_punch and puncher_is_driver and no_cargo then
-		if puncher_is_owner then
-			api.remove_cart(self, pos, puncher)
-		end
-		carts:manage_attachment(puncher, nil)
-		return
-	end
-	
-	-- Punched by non-authorized player
-	if puncher_name and not puncher_is_owner then
-		minetest.chat_send_player(puncher_name, S("[minecart] Cart is protected by ")..(self.owner or ""))
-		return
-	end
-	
-	-- Punched by non-player
-	if not puncher_name then
-		local cart_dir = carts:get_rail_direction(pos, direction, nil, nil, RAILTYPE)
-		if vector.equals(cart_dir, {x=0, y=0, z=0}) then
-			return
-		end
-		api.load_cargo(self, pos)
-		push_cart(self, pos, cart_dir)
-		minecart.start_cart(pos, self.myID)
-		return
-	end
-	
-	-- Sneak-punched by owner
-	if sneak_punch then
-		-- Unload the cargo
-		if api.add_cargo_to_player_inv(self, pos, puncher) then
-			return
-		end
-		-- detach driver
-		if self.driver then
-			carts:manage_attachment(puncher, nil)
-		end
-		-- Pick up cart
-		api.remove_cart(self, pos, puncher)
-		return
-	end
-	
-	-- Cart with driver punched to start recording
-	if puncher_is_driver then
-		minecart.start_recording(self, pos, vel, puncher)
-	else
-		minecart.start_cart(pos, self.myID)
-	end
-
-	api.load_cargo(self, pos)
-	
-	push_cart(self, pos, nil, puncher)
-end
-
--- sound refresh interval = 1.0sec
-local function rail_sound(self, dtime)
-	if not self.sound_ttl then
-		self.sound_ttl = 1.0
-		return
-	elseif self.sound_ttl > 0 then
-		self.sound_ttl = self.sound_ttl - dtime
-		return
-	end
-	self.sound_ttl = 1.0
-	if self.sound_handle then
-		local handle = self.sound_handle
-		self.sound_handle = nil
-		minetest.after(0.2, minetest.sound_stop, handle)
-	end
-	if not self.stopped then
-		local vel = self.object:get_velocity() or {x=0, y=0, z=0}
-		local speed = vector.length(vel)
-		self.sound_handle = minetest.sound_play(
-			"carts_cart_moving", {
-			object = self.object,
-			gain = (speed / carts.speed_max) / 2,
-			loop = true,
-		})
-	end
-end
-
-local function rail_on_step(self)
-	-- Check if same position as before
-	local pos = self.object:get_pos()
-	local rot = self.object:get_rotation()
-	local on_slope = rot.x ~= 0
-	--print("rail_on_step_new", P2S(pos), rot.x)
-	
-	-- cart position correction on slopes
-	if on_slope then
-		pos.y = pos.y - Y_OFFS_ON_SLOPES
-	end
-	
-	-- Used as fallback position
-	self.old_pos = self.old_pos or pos
-	local pos_rounded = vector.round(pos)
-	-- Same pos as before
-	if vector.equals(pos_rounded, self.old_pos) then
-		return -- nothing todo
-	end
-	
-	-- Check if stopped
-	local vel = self.object:get_velocity()
-	local stopped = not on_slope and minecart.stopped(vel)
-	local is_minecart = self.node_name == nil
-	local recording = is_minecart and self.driver == self.owner
-	
-	if stopped then
-		if not self.stopped then
-			local param2 = minetest.dir_to_facedir(self.old_dir)
-			api.stop_cart(pos, self, self.node_name or "minecart:cart", param2)
-			if recording then
-				minecart.stop_recording(self, pos_rounded, vel, self.driver)
-			end
-			api.unload_cargo(self, pos) 
-			self.stopped = true
-		end
-		self.old_pos = pos_rounded
-		return -- nothing todo
-	end
-	
-	-- Check if invalid position (not on rail anymore)
-	local rail_pos, node = get_rail_node(pos)
-	if not node then
-		rail_pos, node = find_rail_node(self.old_pos)
-		if rail_pos then
-			pos_rounded = rail_pos
-			if on_slope then
-				self.object:set_pos({x=rail_pos.x, y=rail_pos.y + Y_OFFS_ON_SLOPES, z=rail_pos.z})
-			else
-				self.object:set_pos(rail_pos)
-			end
-		else
-			self.object:set_pos(pos)
-			minetest.log("error", "[minecart] No valid position "..(P2S(pos) or "nil"))
-			return -- no valid position
-		end
-	end
-	
-	-- Calc speed (value)
-	local speed = math.sqrt((vel.x+vel.z)^2 + vel.y^2)
-    -- Check if slope position
-	if pos_rounded.y > self.old_pos.y then
-		speed = speed - SLOPE_ACCELERATION
-	elseif pos_rounded.y < self.old_pos.y then
-		speed = speed + SLOPE_ACCELERATION
-	else
-		speed = speed - SLOWDOWN
-	end
-	-- Add power/brake rail acceleration
-	local acc = (carts.railparams[node.name] or {}).acceleration or 0
-	speed = speed + acc
- 
-	-- Determine new direction
-	local dir = carts:velocity_to_dir(vel)
-	if speed < 0 then
-		if on_slope then
-			dir = vector.multiply(dir, -1)
-			-- start with a value > 0
-			speed = 0.5 
-		else
-			speed = 0
-		end
-	end
-	
-	-- Get player controls
-	local ctrl, player
-	if recording then
-		player = minetest.get_player_by_name(self.driver)
-		if player then
-			ctrl = player:get_player_control()
-		end
-	end	
-
-	-- new_dir: New moving direction of the cart
-	-- keys: Currently pressed L/R key, used to ignore the key on the next rail node
-	local new_dir, keys = carts:get_rail_direction(rail_pos, dir, ctrl, self.old_keys, RAILTYPE)
-
-	-- handle junctions
-	if recording and keys then
-		minecart.set_junction(self, rail_pos, new_dir, keys)
-	else  -- normal run
-		new_dir, keys = minecart.get_junction(self, rail_pos, new_dir)
-	end
-	self.old_keys = keys
-	
-	-- Detect U-turn
-	if (dir.x ~= 0 and dir.x == -new_dir.x) or (dir.z ~= 0 and dir.z == -new_dir.z) then
-		-- Stop the cart
-		self.object:set_velocity({x=0, y=0, z=0})
-		self.object:move_to(pos_rounded)
-		return
-	-- New direction
-	elseif not vector.equals(dir, new_dir) then
-		if new_dir.y ~= 0 then
-			self.object:set_pos({x=pos_rounded.x, y=pos_rounded.y + Y_OFFS_ON_SLOPES, z=pos_rounded.z})
-		else
-			self.object:set_pos(pos_rounded)
-		end
-	end
-	
-	-- Set velocity and rotation
-	local new_vel = vector.multiply(new_dir, math.min(speed, MAX_SPEED))
-	local yaw = get_yaw(new_dir)
-	local pitch = get_pitch(new_dir)
-
-	self.object:set_rotation({x = pitch, y = yaw, z = 0})
-	self.object:set_velocity(new_vel)
-	
-
-	if recording then
-		minecart.store_next_waypoint(self, rail_pos, vel)
-	end
-	
-	self.old_pos = pos_rounded
-end
-
-function api:on_step(dtime)
-	self.delay = (self.delay or 0) + dtime
-	if self.delay > 0.09 then
-		rail_on_step(self)
-		rail_sound(self, self.delay)
-		self.delay = 0
-	end
-end
-
-return api
diff --git a/minecart/cart_lib2e.lua b/minecart/cart_lib2e.lua
deleted file mode 100644
index cea4700..0000000
--- a/minecart/cart_lib2e.lua
+++ /dev/null
@@ -1,150 +0,0 @@
---[[
-
-	Minecart
-	========
-
-	Copyright (C) 2019-2020 Joachim Stolberg
-
-	MIT
-	See license.txt for more information
-	
-	Cart library functions for entity based carts (level 2)
-	
-]]--
-
--- for lazy programmers
-local M = minetest.get_meta
-local S = minecart.S
-local P2S = function(pos) if pos then return minetest.pos_to_string(pos) end end
-local S2P = minetest.string_to_pos
-local MP = minetest.get_modpath("minecart")
-
-local api = dofile(MP.."/cart_lib3.lua")
-
--- Add node, set metadata, and load carge
-local function add_cart(pos, node_name, param2, owner, userID, cargo)
-	local obj = minetest.add_entity(pos, node_name)
-	local myID = api.get_object_id(obj)
-	if myID then
-		-- Copy item data to cart entity
-		local entity = obj:get_luaentity()
-		entity.owner = owner
-		entity.userID = userID
-		entity.cargo = cargo
-		entity.myID = myID
-		obj:set_nametag_attributes({color = "#FFFF00", text = owner..": "..userID})
-		minecart.add_to_monitoring(obj, myID, owner, userID)
-		return myID
-	else
-		print("Entity has no ID")
-	end
-end
-
-function api.stop_cart(pos, entity, node_name, param2)
-	-- Stop sound
-	if entity.sound_handle then
-		minetest.sound_stop(entity.sound_handle)
-		entity.sound_handle = nil
-	end
-	minecart.stop_cart(pos, entity.myID)
-end
-
-
--- Player adds the node
-function api.add_cart(itemstack, placer, pointed_thing, node_name)
-	local owner = placer:get_player_name()
-	local meta = placer:get_meta()
-	local param2 = minetest.dir_to_facedir(placer:get_look_dir())
-	local userID = 0
-	local cargo = {}
-	
-	-- Add node
-	if carts:is_rail(pointed_thing.under) then
-		add_cart(pointed_thing.under, node_name, param2, owner, userID, cargo)
-		meta:set_string("cart_pos", P2S(pointed_thing.under))
-	elseif carts:is_rail(pointed_thing.above) then
-		add_cart(pointed_thing.above, node_name, param2, owner, userID, cargo)
-		meta:set_string("cart_pos", P2S(pointed_thing.above))
-	else
-		return
-	end
-
-	minetest.sound_play({name = "default_place_node_metal", gain = 0.5},
-		{pos = pointed_thing.above})
-
-	if not (creative and creative.is_enabled_for
-			and creative.is_enabled_for(placer:get_player_name())) then
-		itemstack:take_item()
-	end
-	
-	minetest.show_formspec(owner, "minecart:userID_entity",
-                "size[4,3]" ..
-                "label[0,0;Enter cart number:]" ..
-                "field[1,1;3,1;userID;;]" ..
-                "button_exit[1,2;2,1;exit;Save]")	
-	
-	return itemstack
-end
-
--- Player removes the node
-function api.remove_cart(self, pos, player)
-	-- Add cart to player inventory
-	local inv = player:get_inventory()
-	if not (creative and creative.is_enabled_for
-			and creative.is_enabled_for(player:get_player_name()))
-			or not inv:contains_item("main", "minecart:cart") then
-		local leftover = inv:add_item("main", "minecart:cart")
-		-- If no room in inventory add a replacement cart to the world
-		if not leftover:is_empty() then
-			minetest.add_item(pos, leftover)
-		end
-	end
-	minecart.remove_from_monitoring(self.myID)
-	self.object:remove()
-	-- Stop sound
-	if self.sound_handle then
-		minetest.sound_stop(self.sound_handle)
-		self.sound_handle = nil
-	end
-	return true
-end
-
-function api.load_cargo(self, pos) 
-	self.cargo = self.cargo or {}
-	for _, obj_ in pairs(minetest.get_objects_inside_radius(pos, 1)) do
-		local entity = obj_:get_luaentity()
-		if not obj_:is_player() and entity and entity.name == "__builtin:item" then
-			obj_:remove()
-			self.cargo[#self.cargo + 1] = entity.itemstring
-		end
-	end
-end
-	
-function api.unload_cargo(self, pos) 
-	-- Spawn loaded items again
-	for _,item in ipairs(self.cargo or {}) do
-		minetest.add_item(pos, ItemStack(item))
-	end
-	self.cargo = {}
-end
-
--- in the case the owner punches the cart
-function api.add_cargo_to_player_inv(self, pos, puncher)
-	local added = false
-	local inv = puncher:get_inventory()
-	for _, obj in pairs(minetest.get_objects_inside_radius(pos, 1)) do
-		local entity = obj:get_luaentity()
-		if not obj:is_player() and entity and entity.name == "__builtin:item" then
-			obj:remove()
-			local item = ItemStack(entity.itemstring)
-			local leftover = inv:add_item("main", item)
-			if leftover:get_count() > 0 then
-				minetest.add_item(pos, leftover)
-			end
-			added = true  -- don't dig the cart
-		end
-	end
-	return added
-end
-
-return api
diff --git a/minecart/cart_lib2n.lua b/minecart/cart_lib2n.lua
deleted file mode 100644
index 4625491..0000000
--- a/minecart/cart_lib2n.lua
+++ /dev/null
@@ -1,198 +0,0 @@
---[[
-
-	Minecart
-	========
-
-	Copyright (C) 2019-2020 Joachim Stolberg
-
-	MIT
-	See license.txt for more information
-	
-	Cart library functions for node based carts (level 2)
-	
-]]--
-
--- for lazy programmers
-local M = minetest.get_meta
-local S = minecart.S
-local P2S = function(pos) if pos then return minetest.pos_to_string(pos) end end
-local S2P = minetest.string_to_pos
-local MP = minetest.get_modpath("minecart")
-
-local api = dofile(MP.."/cart_lib3.lua")
-
--- Add node, set metadata, and load carge
-local function add_cart(pos, node_name, param2, owner, userID, cargo)
-	local ndef = minetest.registered_nodes[node_name]
-	local node = minetest.get_node(pos)
-	local meta = M(pos)
-	local rail = node.name
-	minetest.add_node(pos, {name = node_name, param2 = param2})
-	meta:set_string("removed_rail", rail)
-	meta:set_string("owner", owner)
-	meta:set_string("userID", userID)
-	meta:set_string("infotext", minetest.get_color_escape_sequence("#FFFF00")..owner..": "..userID)
-	if ndef.after_place_node then
-		ndef.after_place_node(pos)
-	end
-	if cargo and ndef.set_cargo then
-		ndef.set_cargo(pos, cargo)
-	end
-end
-
--- called after punch cart
-local function start_cart(pos, node_name, entity_name, puncher, dir)
-	-- Read node metadata
-	local ndef = minetest.registered_nodes[node_name]
-	if ndef then
-		local meta = M(pos)
-		local rail = meta:get_string("removed_rail")
-		local userID = meta:get_int("userID")
-		local cart_owner = meta:get_string("owner")
-		local cargo = ndef.get_cargo and ndef.get_cargo(pos) or {}
-		-- swap node to rail
-		minetest.remove_node(pos)
-		minetest.add_node(pos, {name = rail})
-		-- Add entity
-		local obj = minetest.add_entity(pos, entity_name)
-		-- Determine ID
-		local myID = api.get_object_id(obj)
-		if myID then
-			-- Copy metadata to cart entity
-			local entity = obj:get_luaentity()
-			entity.owner = cart_owner
-			entity.userID = userID
-			entity.cargo = cargo
-			entity.myID = myID
-			obj:set_nametag_attributes({color = "#ffff00", text = cart_owner..": "..userID})
-			minecart.add_to_monitoring(obj, myID, cart_owner, userID)
-			minecart.node_at_station(cart_owner, userID, nil)
-			-- punch cart to prevent the stopped handling
-			obj:punch(puncher or obj, 1, {
-					full_punch_interval = 1.0,
-					damage_groups = {fleshy = 1},
-				}, dir)
-			return myID
-		else
-			print("Entity has no ID")
-		end
-	end
-end
-
-function api.stop_cart(pos, entity, node_name, param2)
-	-- rail buffer reached?
-	if api.get_route_key(pos) then
-		-- Read entity data
-		local owner = entity.owner or ""
-		local userID = entity.userID or 0
-		local cargo = entity.cargo or {}
-		-- Remove entity
-		minecart.remove_from_monitoring(entity.myID)
-		minecart.node_at_station(owner, userID, pos)
-		entity.object:remove()
-		-- Add cart node
-		add_cart(pos, node_name, param2, owner, userID, cargo)
-	end
-	-- Stop sound
-	if entity.sound_handle then
-		minetest.sound_stop(entity.sound_handle)
-		entity.sound_handle = nil
-	end
-end
-
--- Player adds the node
-function api.add_cart(itemstack, placer, pointed_thing, node_name)
-	local owner = placer:get_player_name()
-	local meta = placer:get_meta()
-	local param2 = minetest.dir_to_facedir(placer:get_look_dir())
-	local userID = 0
-	local cargo = {}
-	
-	-- Add node
-	if carts:is_rail(pointed_thing.under) then
-		add_cart(pointed_thing.under, node_name, param2, owner, userID, cargo)
-		meta:set_string("cart_pos", P2S(pointed_thing.under))
-	elseif carts:is_rail(pointed_thing.above) then
-		add_cart(pointed_thing.above, node_name, param2, owner, userID, cargo)
-		meta:set_string("cart_pos", P2S(pointed_thing.above))
-	else
-		return
-	end
-
-	minetest.sound_play({name = "default_place_node_metal", gain = 0.5},
-		{pos = pointed_thing.above})
-
-	if not (creative and creative.is_enabled_for
-			and creative.is_enabled_for(placer:get_player_name())) then
-		itemstack:take_item()
-	end
-	
-	minetest.show_formspec(owner, "minecart:userID_node",
-                "size[4,3]" ..
-                "label[0,0;Enter cart number:]" ..
-                "field[1,1;3,1;userID;;]" ..
-                "button_exit[1,2;2,1;exit;Save]")	
-	
-	return itemstack
-end
-
-function api.node_on_punch(pos, node, puncher, pointed_thing, entity_name, dir)
-	local ndef = minetest.registered_nodes[node.name]
-	-- Player digs cart by sneak-punch
-	if puncher and puncher:get_player_control().sneak then
-		api.remove_cart(nil, pos, puncher)
-		return
-	end
-	start_cart(pos, node.name, entity_name, puncher, dir)
-end
-
-local function add_to_player_inventory(pos, player, node_name)
-	local inv = player:get_inventory()
-	if not (creative and creative.is_enabled_for
-			and creative.is_enabled_for(player:get_player_name()))
-			or not inv:contains_item("main", node_name) then
-		local leftover = inv:add_item("main", node_name)
-		-- If no room in inventory add a replacement cart to the world
-		if not leftover:is_empty() then
-			minetest.add_item(pos, leftover)
-		end
-	end
-end
-
--- Player removes the node
-function api.remove_cart(self, pos, player)
-	if self then  -- cart is still an entity
-		add_to_player_inventory(pos, player, self.node_name or "minecart:cart")
-		minecart.remove_from_monitoring(self.myID)
-		self.object:remove()
-	else
-		local node = minetest.get_node(pos)
-		local ndef = minetest.registered_nodes[node.name]
-		if ndef.can_dig and ndef.can_dig(pos, player) then
-			add_to_player_inventory(pos, player, node.name)
-			node.name = M(pos):get_string("removed_rail")
-			if node.name == "" then
-				node.name = "carts:rail"
-			end
-			minetest.remove_node(pos)
-			minetest.add_node(pos, node)
-		end
-	end
-end
-
-function api.load_cargo() 
-	-- nothing to load
-end
-	
-function api.unload_cargo() 
-	-- nothing to unload
-end
-
-function api.add_cargo_to_player_inv()
-	-- nothing to do
-end
-
--- needed by minecart.punch_cart and node carts
-minecart.node_on_punch = api.node_on_punch
-
-return api
\ No newline at end of file
diff --git a/minecart/cart_lib3.lua b/minecart/cart_lib3.lua
deleted file mode 100644
index 6cecc9c..0000000
--- a/minecart/cart_lib3.lua
+++ /dev/null
@@ -1,90 +0,0 @@
---[[
-
-	Minecart
-	========
-
-	Copyright (C) 2019-2020 Joachim Stolberg
-
-	MIT
-	See license.txt for more information
-	
-	Cart library base functions (level 3)
-	
-]]--
-
--- for lazy programmers
-local M = minetest.get_meta
-local S = minecart.S
-local P2S = function(pos) if pos then return minetest.pos_to_string(pos) end end
-local S2P = minetest.string_to_pos
-
-local api = {}
-
-function api.get_object_id(object)
-	for id, entity in pairs(minetest.luaentities) do
-		if entity.object == object then
-			return id
-		end
-	end
-end
-
-function api.get_route_key(pos, player_name)
-	local pos1 = minetest.find_node_near(pos, 1, {"minecart:buffer"})
-	if pos1 then
-		local meta = minetest.get_meta(pos1)
-		if player_name == nil or player_name == meta:get_string("owner") then
-			return P2S(pos1)
-		end
-	end
-end
-
-function api.get_station_name(pos)
-	local pos1 = minetest.find_node_near(pos, 1, {"minecart:buffer"})
-	if pos1 then
-		local name = M(pos1):get_string("name")
-		if name ~= "" then
-			return name
-		end
-		return "-"
-	end
-end
-
-function api.load_cart(pos, vel, pitch, yaw, item)
-	-- Add cart to map
-	local obj = minetest.add_entity(pos, item.entity_name or "minecart:cart", nil)
-	-- Determine ID
-	local myID = api.get_object_id(obj)
-	if myID then
-		-- Copy item data to cart entity
-		local entity = obj:get_luaentity()
-		entity.owner = item.owner or ""
-		entity.userID = item.userID or 0
-		entity.cargo = item.cargo or {}
-		entity.myID = myID
-		obj:set_nametag_attributes({color = "#FFFF00", text = entity.owner..": "..entity.userID})
-		-- Update item data
-		item.owner = entity.owner
-		item.cargo = nil
-		-- Start cart
-		obj:set_velocity(vel)
-		obj:set_rotation({x = pitch or 0, y = yaw or 0, z = 0})
-		return myID
-	else
-		print("Entity has no ID")
-	end
-end
-
-function api.unload_cart(pos, vel, entity, item)
-	-- Copy entity data to item
-	item.cargo = entity.cargo
-	item.entity_name = entity.object:get_entity_name()
-	-- Remove entity from map
-	entity.object:remove()
-	-- Stop sound
-	if entity.sound_handle then
-		minetest.sound_stop(entity.sound_handle)
-		entity.sound_handle = nil
-	end
-end
-
-return api
diff --git a/minecart/doc.lua b/minecart/doc.lua
index 3bb7cb6..3f43b37 100644
--- a/minecart/doc.lua
+++ b/minecart/doc.lua
@@ -3,7 +3,7 @@
 	Minecart
 	========
 
-	Copyright (C) 2019-2020 Joachim Stolberg
+	Copyright (C) 2019-2021 Joachim Stolberg
 
 	MIT
 	See license.txt for more information
@@ -29,15 +29,15 @@ local summary_doc = table.concat({
 	S("4. Place a Minecart at a buffer and give it a cart number (1..999)"),
 	S("5. Drive from buffer to buffer in both directions using the Minecart(!) to record the routes (use 'right-left' keys to control the Minecart)."),
 	S("6. Punch the buffers to check the connection data (e.g. 'Oxford: connected to Cambridge')."),
-	S("7. Optional: Configure the Minecart stop time in one or both buffers. The Minecart will then start automatically after the configured time."),
+	S("7. Optional: Configure the Minecart waiting time in both buffers. The Minecart will then start automatically after the configured time."),
 	S("8. Optional: Protect your rail network with the Protection Landmarks (one Landmark at least every 16 nodes/meters)."),
 	S("9. Place a Minecart in front of the buffer and check whether it starts after the configured time."),
 	S("10. Check the cart state via the chat command: /mycart <num>\n   '<num>' is the cart number"),
-	S("11. Drop items into the Minecart and punch the cart to start it, or 'sneak+click' the Minecart to get the items back."),
-	S("12. Dig the empty cart with a second 'sneak+click' (as usual)."),
+	S("11. Drop items into the Minecart and punch the cart to start it."),
+	S("12. Dig the cart with 'sneak+click' (as usual). The items will be drop down."),
 }, "\n")
 
-local cart_doc = S("Primary used to transport items. You can drop items into the Minecart and punch the cart to get started. Sneak+click the cart to get the items back")
+local cart_doc = S("Primary used to transport items. You can drop items into the Minecart and punch the cart to get started. Sneak+click the cart to get cart and items back")
 
 local buffer_doc = S("Used as buffer on both rail ends. Needed to be able to record the cart routes")
 
@@ -45,6 +45,29 @@ local landmark_doc = S("Protect your rails with the Landmarks (one Landmark at l
 
 local hopper_doc = S("Used to load/unload Minecart. The Hopper can push/pull items to/from chests and drop/pickup items to/from Minecarts. To unload a Minecart place the hopper below the rail. To load the Minecart, place the hopper right next to the Minecart.")
 
+local pusher_doc = S([[If several carts are running on one route,
+it can happen that a buffer position is already occupied and one cart therefore stops earlier.
+In this case, the cart pusher is used to push the cart towards the buffer again.
+This block must be placed under the rail at a distance of 2 m in front of the buffer.]])
+
+local speed_doc = S([[Limit the cart speed with speed limit signs.
+
+As before, the speed of the carts is also influenced by power rails.
+Brake rails are irrelevant, the cart does not brake here.
+The maximum speed is 8 m/s. This assumes a ratio of power rails
+to normal rails of 1 to 4 on a flat section of rail. A rail section is a
+series of rail nodes without a change of direction. After every curve / kink,
+the speed for the next section of the route is newly determined,
+taking into account the swing of the cart. This means that a cart can
+roll over short rail sections without power rails.
+
+In order to additionally brake the cart at certain points
+(at switches or in front of a buffer), speed limit signs can be placed
+on the track. With these signs the speed can be reduced to 4, 2, or 1 m / s.
+The "No speed limit" sign can be used to remove the speed limit.
+
+The speed limit signs must be placed next to the track so that they can
+be read from the cart. This allows different speeds in each direction of travel.]])
 
 local function formspec(data)
 	if data.image then
@@ -90,6 +113,16 @@ doc.add_entry("minecart", "landmark", {
 	data = {text = landmark_doc, item="minecart:landmark"},
 })
 
+doc.add_entry("minecart", "speed signs", {
+	name = S("Minecart Speed Signs"),
+	data = {text = speed_doc, item="minecart:speed4"},
+})
+
+doc.add_entry("minecart", "cart pusher", {
+	name = S("Cart Pusher"),
+	data = {text = pusher_doc, item="minecart:cart_pusher"},
+})
+
 if minecart.hopper_enabled then
 	doc.add_entry("minecart", "hopper", {
 		name = S("Minecart Hopper"),
diff --git a/minecart/entitylib.lua b/minecart/entitylib.lua
new file mode 100644
index 0000000..bf20953
--- /dev/null
+++ b/minecart/entitylib.lua
@@ -0,0 +1,318 @@
+--[[
+
+	Minecart
+	========
+
+	Copyright (C) 2019-2021 Joachim Stolberg
+
+	MIT
+	See license.txt for more information
+	
+]]--
+
+local P2S = function(pos) if pos then return minetest.pos_to_string(pos) end end
+local P2H = minetest.hash_node_position
+local H2P = minetest.get_position_from_hash
+local MAX_SPEED = minecart.MAX_SPEED
+local dot2dir = minecart.dot2dir
+local get_waypoint = minecart.get_waypoint
+local recording_waypoints = minecart.recording_waypoints
+local recording_junctions = minecart.recording_junctions
+local set_junctions = minecart.set_junctions
+local player_ctrl = minecart.player_ctrl
+local tEntityNames = minecart.tEntityNames
+
+local function stop_cart(self, cart_pos)
+	self.is_running = false
+	self.arrival_time = 0
+	
+	if self.driver then
+		local player = minetest.get_player_by_name(self.driver)
+		if player then
+			minecart.stop_recording(self, cart_pos)	
+			minecart.manage_attachment(player, self, false)
+		end
+	end
+	if not minecart.get_buffer_pos(cart_pos, self.owner) then
+		-- Probably somewhere in the pampas 
+		minecart.delete_cart_waypoint(cart_pos)
+	end
+	minecart.entity_to_node(cart_pos, self)
+end
+
+local function get_ctrl(self, pos)
+	-- Use player ctrl or junction data from recorded routes
+	return (self.driver and self.ctrl) or (self.junctions and self.junctions[P2H(pos)]) or {}
+end
+
+local function new_speed(self, new_dir)
+	self.cart_speed = self.cart_speed or 0
+	local rail_speed = (self.waypoint.speed or 0) / 10
+	
+	if rail_speed <= 0 then
+		rail_speed = math.max(self.cart_speed + rail_speed, 0)
+	elseif rail_speed <= self.cart_speed then
+		rail_speed = math.max((self.cart_speed + rail_speed) / 2, 0)
+	end
+	
+	-- Speed corrections
+	if new_dir.y == 1 then
+		if rail_speed < 1 then rail_speed = 0 end
+	else
+		if rail_speed < 0.4 then rail_speed = 0 end
+	end
+	
+	self.cart_speed = rail_speed -- store for next cycle
+	return rail_speed
+end
+
+local function running(self)
+	local rot = self.object:get_rotation()
+	local dir = minetest.yaw_to_dir(rot.y)
+	dir.y = math.floor((rot.x / (math.pi/4)) + 0.5)
+	dir = vector.round(dir)
+	local facedir = minetest.dir_to_facedir(dir)
+	local cart_pos, wayp_pos, is_junction
+	
+	if self.reenter then -- through monitoring
+		cart_pos = H2P(self.reenter[1])
+		wayp_pos = cart_pos
+		is_junction = false
+		self.waypoint = {pos = H2P(self.reenter[2]), power = 0, dot = self.reenter[4]}
+		self.cart_speed = self.reenter[3]
+		self.speed_limit = MAX_SPEED
+		self.reenter = nil
+	elseif not self.waypoint then
+		-- get waypoint
+		cart_pos = vector.round(self.object:get_pos())
+		wayp_pos = cart_pos
+		is_junction = false
+		self.waypoint = get_waypoint(cart_pos, facedir, get_ctrl(self, cart_pos), true)
+		if self.no_normal_start then
+			-- Probably somewhere in the pampas
+			minecart.delete_waypoint(cart_pos)
+			self.no_normal_start = nil
+		end
+		self.cart_speed = 2  -- push speed
+		self.speed_limit = MAX_SPEED
+	else
+		-- next waypoint
+		cart_pos = vector.new(self.waypoint.cart_pos or self.waypoint.pos)
+		wayp_pos = self.waypoint.pos
+		local vel = self.object:get_velocity()
+		self.waypoint, is_junction = get_waypoint(wayp_pos, facedir, get_ctrl(self, wayp_pos), self.cart_speed < 0.1)
+	end
+
+	if not self.waypoint then
+		stop_cart(self, wayp_pos)
+		return
+	end
+	
+	if is_junction then
+		if self.is_recording then
+			set_junctions(self, wayp_pos)
+		end
+		self.ctrl = nil
+	end
+	
+	--print("dist", P2S(cart_pos), P2S(self.waypoint.pos), P2S(self.waypoint.cart_pos), self.waypoint.dot)
+	local dist = vector.distance(cart_pos, self.waypoint.cart_pos or self.waypoint.pos)
+	local new_dir = dot2dir(self.waypoint.dot)
+	local new_speed = new_speed(self, new_dir)
+	local straight_ahead = vector.equals(new_dir, dir)
+	-- If straight_ahead, then it's probably a speed limit sign
+	if straight_ahead then
+		self.speed_limit = minecart.get_speedlimit(wayp_pos, facedir) or self.speed_limit
+	end
+	new_speed = math.min(new_speed, self.speed_limit)
+	
+	local new_cart_pos, extra_cycle = minecart.get_current_cart_pos_correction(
+			wayp_pos, facedir, dir.y, self.waypoint.dot)  -- TODO: Why has self.waypoint no dot?
+	if extra_cycle and not vector.equals(cart_pos, new_cart_pos) then
+		self.waypoint = {pos = wayp_pos, cart_pos = new_cart_pos}
+		new_dir = vector.direction(cart_pos, new_cart_pos)
+		dist = vector.distance(cart_pos, new_cart_pos)
+		--print("extra_cycle", P2S(cart_pos), P2S(wayp_pos), P2S(new_cart_pos), new_speed)
+	end
+	
+	-- Slope corrections
+	--print("Slope corrections", P2S(new_dir), P2S(cart_pos))
+	if new_dir.y ~= 0 then
+		cart_pos.y = cart_pos.y + 0.2
+	end	
+	
+	-- Calc velocity, rotation and arrival_time
+	local yaw = minetest.dir_to_yaw(new_dir)
+	local pitch = new_dir.y * math.pi/4
+	--print("new_speed", new_speed / (new_dir.y ~= 0 and 1.41 or 1))
+	local vel = vector.multiply(new_dir, new_speed / ((new_dir.y ~= 0) and 1.41 or 1))
+	self.arrival_time = self.timebase + (dist / new_speed)
+	-- needed for recording
+	self.curr_speed = new_speed  
+	self.num_sections = (self.num_sections or 0) + 1
+	
+	-- Got stuck somewhere
+	if new_speed < 0.1 or dist < 0 then
+		print("Got stuck somewhere", new_speed, dist)
+		stop_cart(self, wayp_pos)
+		return
+	end
+	
+	self.object:set_pos(cart_pos)
+	self.object:set_rotation({x = pitch, y = yaw, z = 0})
+	self.object:set_velocity(vel)
+	return
+end
+
+local function play_sound(self)
+	if self.sound_handle then
+		local handle = self.sound_handle
+		self.sound_handle = nil
+		minetest.after(0.2, minetest.sound_stop, handle)
+	end
+	if self.object then
+		self.sound_handle = minetest.sound_play(
+			"carts_cart_moving", {
+			object = self.object,
+			gain = self.curr_speed / MAX_SPEED,
+		})
+	end
+end
+
+local function on_step(self, dtime)
+	self.timebase = (self.timebase or 0) + dtime
+	
+	if self.is_running then
+		if self.arrival_time <= self.timebase then
+			running(self)
+		end
+		
+		if (self.sound_ttl or 0) <= self.timebase then
+			play_sound(self)
+			self.sound_ttl = self.timebase + 1.0
+		end
+	else
+		if self.sound_handle then
+			minetest.sound_stop(self.sound_handle)
+			self.sound_handle = nil
+		end		
+	end
+
+	if self.driver then
+		if self.is_recording then
+			if self.rec_time <= self.timebase then
+				recording_waypoints(self)
+				self.rec_time = self.rec_time + 2.0
+			end
+			recording_junctions(self)
+		else
+			player_ctrl(self)
+		end
+	end
+end
+
+local function on_entitycard_activate(self, staticdata, dtime_s)
+	self.object:set_armor_groups({immortal=1})
+end
+
+-- Start the entity cart (or dig by shift+leftclick)
+local function on_entitycard_punch(self, puncher, time_from_last_punch, tool_capabilities, dir)
+	if minecart.is_owner(puncher, self.owner) then
+		if puncher:get_player_control().sneak then
+			if not self.only_dig_if_empty or not next(self.cargo) then
+				-- drop items
+				local pos = vector.round(self.object:get_pos())
+				for _,item in ipairs(self.cargo or {}) do
+					minetest.add_item(pos, ItemStack(item))
+				end
+				-- Dig cart
+				if self.driver then
+					-- remove cart as driver
+					minecart.stop_recording(self, pos)	
+					minecart.monitoring_remove_cart(self.owner, self.userID)
+					minecart.remove_entity(self, pos, puncher)
+					minecart.manage_attachment(puncher, self, false)
+				else
+					-- remove cart from outside
+					minecart.monitoring_remove_cart(self.owner, self.userID)				
+					minecart.remove_entity(self, pos, puncher)
+				end
+			end
+		elseif not self.is_running then
+			-- start the cart
+			local pos = vector.round(self.object:get_pos())
+			if puncher then
+				local yaw = puncher:get_look_horizontal()
+				self.object:set_rotation({x = 0, y = yaw, z = 0})
+			end
+			minecart.start_entitycart(self, pos)
+			minecart.start_recording(self, pos) 
+		end
+	end
+end
+	
+-- Player get on / off
+local function on_entitycard_rightclick(self, clicker)
+	if clicker and clicker:is_player() and self.driver_allowed then
+		-- Get on / off
+		if self.driver then
+			-- get off
+			local pos = vector.round(self.object:get_pos())
+			minecart.manage_attachment(clicker, self, false)
+			minecart.entity_to_node(pos, self)
+		else
+			-- get on
+			local pos = vector.round(self.object:get_pos())
+			minecart.stop_recording(self, pos)	
+			minecart.manage_attachment(clicker, self, true)
+		end
+	end
+end
+
+local function on_entitycard_detach_child(self, child)
+	if child and child:get_player_name() == self.driver then
+		self.driver = nil
+	end
+end
+
+function minecart.get_entitycart_nearby(pos, param2, radius)
+	local pos2 = param2 and vector.add(pos, minecart.param2_to_dir(param2)) or pos
+	for _, object in pairs(minetest.get_objects_inside_radius(pos2, radius or 0.5)) do
+		local entity = object:get_luaentity()
+		if entity and entity.name and tEntityNames[entity.name] then
+			local vel = object:get_velocity()
+			if vector.equals(vel, {x=0, y=0, z=0}) then  -- still standing?
+				return entity
+			end
+		end
+	end	
+end
+
+function minecart.push_entitycart(self, punch_dir)
+	--print("push_entitycart")
+	local vel = self.object:get_velocity()
+	punch_dir.y = 0
+	local yaw = minetest.dir_to_yaw(punch_dir)
+	self.object:set_rotation({x = 0, y = yaw, z = 0})
+	self.is_running = true
+	self.arrival_time = 0
+end
+
+function minecart.register_cart_entity(entity_name, node_name, cart_type, entity_def)
+	entity_def.entity_name = entity_name
+	entity_def.node_name = node_name
+	entity_def.on_activate = on_entitycard_activate
+	entity_def.on_punch = on_entitycard_punch
+	entity_def.on_step = on_step
+	entity_def.on_rightclick = on_entitycard_rightclick
+	entity_def.on_detach_child = on_entitycard_detach_child
+	
+	entity_def.owner = nil
+	entity_def.driver = nil
+	entity_def.cargo = {}
+	
+	minetest.register_entity(entity_name, entity_def)
+	-- register node for punching
+	minecart.register_cart_names(node_name, entity_name, cart_type)
+end
+
diff --git a/minecart/hopper.lua b/minecart/hopper.lua
index 49f045b..7b7fbbf 100644
--- a/minecart/hopper.lua
+++ b/minecart/hopper.lua
@@ -3,7 +3,7 @@
 	Minecart
 	========
 
-	Copyright (C) 2019-2020 Joachim Stolberg
+	Copyright (C) 2019-2021 Joachim Stolberg
 
 	MIT
 	See license.txt for more information
@@ -155,6 +155,7 @@ minetest.register_node("minecart:hopper", {
 	paramtype = "light",
 	sunlight_propagates = true,
 	paramtype2 = "facedir",
+	use_texture_alpha = minecart.CLIP,
 	groups = {choppy=2, cracky=2, crumbly=2},
 	is_ground_content = false,
 	sounds = default.node_sound_wood_defaults(),
diff --git a/minecart/hopperlib.lua b/minecart/hopperlib.lua
new file mode 100644
index 0000000..6f2a583
--- /dev/null
+++ b/minecart/hopperlib.lua
@@ -0,0 +1,141 @@
+--[[
+
+	Minecart
+	========
+
+	Copyright (C) 2019-2020 Joachim Stolberg
+
+	MIT
+	See license.txt for more information
+	
+]]--
+
+-- for lazy programmers
+local M = minetest.get_meta
+
+local RegisteredInventories = {}
+
+-- Take the given number of items from the inv.
+-- Returns nil if ItemList is empty.
+function minecart.inv_take_items(inv, listname, num)
+	if inv:is_empty(listname) then
+		return nil
+	end
+	local size = inv:get_size(listname)
+	for idx = 1, size do
+		local items = inv:get_stack(listname, idx)
+		if items:get_count() > 0 then
+			local taken = items:take_item(num)
+			inv:set_stack(listname, idx, items)
+			return taken
+		end
+	end
+	return nil
+end
+
+function minecart.take_items(pos, param2, num)
+	local npos, node
+	if param2 then
+		npos, node = minecart.get_next_node(pos, (param2 + 2) % 4)
+	else
+		npos, node = pos, minetest.get_node(pos)
+	end
+	local def = RegisteredInventories[node.name]
+	local owner = M(pos):get_string("owner")
+	local inv = minetest.get_inventory({type="node", pos=npos})
+	
+	if def and inv and def.take_listname and (not def.allow_take or def.allow_take(npos, nil, owner)) then
+		return minecart.inv_take_items(inv, def.take_listname, num)
+	elseif def and def.take_item then
+		return def.take_item(npos, num, owner)
+	else
+		local ndef = minetest.registered_nodes[node.name]
+		if ndef and ndef.minecart_hopper_takeitem then
+			return ndef.minecart_hopper_takeitem(npos, num)
+		end
+	end
+end
+
+function minecart.put_items(pos, param2, stack)
+	local npos, node = minecart.get_next_node(pos, param2)
+	local def = RegisteredInventories[node.name]
+	local owner = M(pos):get_string("owner")
+	local inv = minetest.get_inventory({type="node", pos=npos})
+	
+	if def and inv and def.put_listname and (not def.allow_put or def.allow_put(npos, stack, owner)) then
+		local leftover = inv:add_item(def.put_listname, stack)
+		if leftover:get_count() > 0 then
+			return leftover
+		end
+	elseif def and def.put_item then
+		return def.put_item(npos, stack, owner)
+	elseif minecart.is_air_like(node.name) or minecart.is_nodecart_available(npos) then
+		minetest.add_item(npos, stack)
+	else
+		local ndef = minetest.registered_nodes[node.name]
+		if ndef and ndef.minecart_hopper_additem then
+			local leftover = ndef.minecart_hopper_additem(npos, stack)
+			if leftover:get_count() > 0 then
+				return leftover
+			end
+		else
+			return stack
+		end
+	end
+end
+
+function minecart.untake_items(pos, param2, stack)
+	local npos, node
+	if param2 then
+		npos, node = minecart.get_next_node(pos, (param2 + 2) % 4)
+	else
+		npos, node = pos, minetest.get_node(pos)
+	end
+	local def = RegisteredInventories[node.name]
+	local inv = minetest.get_inventory({type="node", pos=npos})
+	
+	if def and inv and def.put_listname then
+		return inv:add_item(def.put_listname, stack)
+	elseif def and def.untake_item then
+		return def.untake_item(npos, stack)
+	else
+		local ndef = minetest.registered_nodes[node.name]
+		if ndef and ndef.minecart_hopper_untakeitem then
+			return ndef.minecart_hopper_untakeitem(npos, stack)
+		end
+	end
+end
+
+-- Register inventory node for hopper access
+-- (for example, see below)
+function minecart.register_inventory(node_names, def)
+	for _, name in ipairs(node_names) do
+		RegisteredInventories[name] = {
+			allow_put = def.put and def.put.allow_inventory_put,
+			put_listname = def.put and def.put.listname,
+			allow_take = def.take and def.take.allow_inventory_take,
+			take_listname = def.take and def.take.listname,
+			put_item = def.put and def.put.put_item,
+			take_item = def.take and def.take.take_item,
+			untake_item = def.take and def.take.untake_item,
+		}
+	end
+end
+
+-- Allow the hopper the access to itself
+minecart.register_inventory({"minecart:hopper"}, {
+	put = {
+		allow_inventory_put = function(pos, stack, player_name)
+			local owner = M(pos):get_string("owner")
+			return owner == player_name
+		end, 
+		listname = "main",
+	},
+	take = {
+		allow_inventory_take = function(pos, stack, player_name)
+			local owner = M(pos):get_string("owner")
+			return owner == player_name
+		end, 
+		listname = "main",
+	},
+})
diff --git a/minecart/i18n.py b/minecart/i18n.py
index b218fcf..3c6ce1b 100755
--- a/minecart/i18n.py
+++ b/minecart/i18n.py
@@ -1,79 +1,469 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 #
 # Script to generate the template file and update the translation files.
+# Copy the script into the mod or modpack root folder and run it there.
 #
-# Copyright (C) 2019 Joachim Stolberg
+# Copyright (C) 2019 Joachim Stolberg, 2020 FaceDeer, 2020 Louis Royer
 # LGPLv2.1+
-# 
-# Copy the script into the mod root folder and adapt the last code lines to you needs.
+#
+# See https://github.com/minetest-tools/update_translations for
+# potential future updates to this script.
 
 from __future__ import print_function
-import os, fnmatch, re, shutil
+import os, fnmatch, re, shutil, errno
+from sys import argv as _argv
+from sys import stderr as _stderr
 
-pattern_lua = re.compile(r'[ \.=^\t]S\("(.+?)"\)', re.DOTALL)
-pattern_tr = re.compile(r'(.+?[^@])=(.+)')
+# Running params
+params = {"recursive": False,
+    "help": False,
+    "mods": False,
+    "verbose": False,
+    "folders": [],
+    "no-old-file": False,
+    "break-long-lines": False,
+    "sort": False,
+    "print-source": False
+}
+# Available CLI options
+options = {"recursive": ['--recursive', '-r'],
+    "help": ['--help', '-h'],
+    "mods": ['--installed-mods', '-m'],
+    "verbose": ['--verbose', '-v'],
+    "no-old-file": ['--no-old-file', '-O'],
+    "break-long-lines": ['--break-long-lines', '-b'],
+    "sort": ['--sort', '-s'],
+    "print-source": ['--print-source', '-p']
+}
 
-def gen_template(templ_file, lkeyStrings):
-    lOut = []
-    lkeyStrings.sort()
-    for s in lkeyStrings:
-        lOut.append("%s=" % s)
-    open(templ_file, "wt").write("\n".join(lOut))
+# Strings longer than this will have extra space added between
+# them in the translation files to make it easier to distinguish their
+# beginnings and endings at a glance
+doublespace_threshold = 80
 
+def set_params_folders(tab: list):
+    '''Initialize params["folders"] from CLI arguments.'''
+    # Discarding argument 0 (tool name)
+    for param in tab[1:]:
+        stop_param = False
+        for option in options:
+            if param in options[option]:
+                stop_param = True
+                break
+        if not stop_param:
+            params["folders"].append(os.path.abspath(param))
+
+def set_params(tab: list):
+    '''Initialize params from CLI arguments.'''
+    for option in options:
+        for option_name in options[option]:
+            if option_name in tab:
+                params[option] = True
+                break
+
+def print_help(name):
+    '''Prints some help message.'''
+    print(f'''SYNOPSIS
+    {name} [OPTIONS] [PATHS...]
+DESCRIPTION
+    {', '.join(options["help"])}
+        prints this help message
+    {', '.join(options["recursive"])}
+        run on all subfolders of paths given
+    {', '.join(options["mods"])}
+        run on locally installed modules
+    {', '.join(options["no-old-file"])}
+        do not create *.old files
+    {', '.join(options["sort"])}
+        sort output strings alphabetically
+    {', '.join(options["break-long-lines"])}
+        add extra line breaks before and after long strings
+    {', '.join(options["verbose"])}
+        add output information
+''')
+
+
+def main():
+    '''Main function'''
+    set_params(_argv)
+    set_params_folders(_argv)
+    if params["help"]:
+        print_help(_argv[0])
+    elif params["recursive"] and params["mods"]:
+        print("Option --installed-mods is incompatible with --recursive")
+    else:
+        # Add recursivity message
+        print("Running ", end='')
+        if params["recursive"]:
+            print("recursively ", end='')
+        # Running
+        if params["mods"]:
+            print(f"on all locally installed modules in {os.path.expanduser('~/.minetest/mods/')}")
+            run_all_subfolders(os.path.expanduser("~/.minetest/mods"))
+        elif len(params["folders"]) >= 2:
+            print("on folder list:", params["folders"])
+            for f in params["folders"]:
+                if params["recursive"]:
+                    run_all_subfolders(f)
+                else:
+                    update_folder(f)
+        elif len(params["folders"]) == 1:
+            print("on folder", params["folders"][0])
+            if params["recursive"]:
+                run_all_subfolders(params["folders"][0])
+            else:
+                update_folder(params["folders"][0])
+        else:
+            print("on folder", os.path.abspath("./"))
+            if params["recursive"]:
+                run_all_subfolders(os.path.abspath("./"))
+            else:
+                update_folder(os.path.abspath("./"))
+
+#group 2 will be the string, groups 1 and 3 will be the delimiters (" or ')
+#See https://stackoverflow.com/questions/46967465/regex-match-text-in-either-single-or-double-quote
+pattern_lua_s = re.compile(r'[\.=^\t,{\(\s]N?S\(\s*(["\'])((?:\\\1|(?:(?!\1)).)*)(\1)[\s,\)]', re.DOTALL)
+pattern_lua_fs = re.compile(r'[\.=^\t,{\(\s]N?FS\(\s*(["\'])((?:\\\1|(?:(?!\1)).)*)(\1)[\s,\)]', re.DOTALL)
+pattern_lua_bracketed_s = re.compile(r'[\.=^\t,{\(\s]N?S\(\s*\[\[(.*?)\]\][\s,\)]', re.DOTALL)
+pattern_lua_bracketed_fs = re.compile(r'[\.=^\t,{\(\s]N?FS\(\s*\[\[(.*?)\]\][\s,\)]', re.DOTALL)
+
+# Handles "concatenation" .. " of strings"
+pattern_concat = re.compile(r'["\'][\s]*\.\.[\s]*["\']', re.DOTALL)
+
+pattern_tr = re.compile(r'(.*?[^@])=(.*)')
+pattern_name = re.compile(r'^name[ ]*=[ ]*([^ \n]*)')
+pattern_tr_filename = re.compile(r'\.tr$')
+pattern_po_language_code = re.compile(r'(.*)\.po$')
+
+#attempt to read the mod's name from the mod.conf file or folder name. Returns None on failure
+def get_modname(folder):
+    try:
+        with open(os.path.join(folder, "mod.conf"), "r", encoding='utf-8') as mod_conf:
+            for line in mod_conf:
+                match = pattern_name.match(line)
+                if match:
+                    return match.group(1)
+    except FileNotFoundError:
+        if not os.path.isfile(os.path.join(folder, "modpack.txt")):
+            folder_name = os.path.basename(folder)
+            # Special case when run in Minetest's builtin directory
+            if folder_name == "builtin":
+                return "__builtin"
+            else:
+                return folder_name
+        else:
+            return None
+    return None
+
+#If there are already .tr files in /locale, returns a list of their names
+def get_existing_tr_files(folder):
+    out = []
+    for root, dirs, files in os.walk(os.path.join(folder, 'locale/')):
+        for name in files:
+            if pattern_tr_filename.search(name):
+                out.append(name)
+    return out
+
+# A series of search and replaces that massage a .po file's contents into
+# a .tr file's equivalent
+def process_po_file(text):
+    # The first three items are for unused matches
+    text = re.sub(r'#~ msgid "', "", text)
+    text = re.sub(r'"\n#~ msgstr ""\n"', "=", text)
+    text = re.sub(r'"\n#~ msgstr "', "=", text)
+    # comment lines
+    text = re.sub(r'#.*\n', "", text)
+    # converting msg pairs into "=" pairs
+    text = re.sub(r'msgid "', "", text)
+    text = re.sub(r'"\nmsgstr ""\n"', "=", text)
+    text = re.sub(r'"\nmsgstr "', "=", text)
+    # various line breaks and escape codes
+    text = re.sub(r'"\n"', "", text)
+    text = re.sub(r'"\n', "\n", text)
+    text = re.sub(r'\\"', '"', text)
+    text = re.sub(r'\\n', '@n', text)
+    # remove header text
+    text = re.sub(r'=Project-Id-Version:.*\n', "", text)
+    # remove double-spaced lines
+    text = re.sub(r'\n\n', '\n', text)
+    return text
+
+# Go through existing .po files and, if a .tr file for that language
+# *doesn't* exist, convert it and create it.
+# The .tr file that results will subsequently be reprocessed so
+# any "no longer used" strings will be preserved.
+# Note that "fuzzy" tags will be lost in this process.
+def process_po_files(folder, modname):
+    for root, dirs, files in os.walk(os.path.join(folder, 'locale/')):
+        for name in files:
+            code_match = pattern_po_language_code.match(name)
+            if code_match == None:
+                continue
+            language_code = code_match.group(1)
+            tr_name = f'{modname}.{language_code}.tr'
+            tr_file = os.path.join(root, tr_name)
+            if os.path.exists(tr_file):
+                if params["verbose"]:
+                    print(f"{tr_name} already exists, ignoring {name}")
+                continue
+            fname = os.path.join(root, name)
+            with open(fname, "r", encoding='utf-8') as po_file:
+                if params["verbose"]:
+                    print(f"Importing translations from {name}")
+                text = process_po_file(po_file.read())
+                with open(tr_file, "wt", encoding='utf-8') as tr_out:
+                    tr_out.write(text)
+
+# from https://stackoverflow.com/questions/600268/mkdir-p-functionality-in-python/600612#600612
+# Creates a directory if it doesn't exist, silently does
+# nothing if it already exists
+def mkdir_p(path):
+    try:
+        os.makedirs(path)
+    except OSError as exc: # Python >2.5
+        if exc.errno == errno.EEXIST and os.path.isdir(path):
+            pass
+        else: raise
+
+# Converts the template dictionary to a text to be written as a file
+# dKeyStrings is a dictionary of localized string to source file sets
+# dOld is a dictionary of existing translations and comments from
+# the previous version of this text
+def strings_to_text(dkeyStrings, dOld, mod_name, header_comments):
+    lOut = [f"# textdomain: {mod_name}"]
+    if header_comments is not None:
+        lOut.append(header_comments)
+    
+    dGroupedBySource = {}
+
+    for key in dkeyStrings:
+        sourceList = list(dkeyStrings[key])
+        if params["sort"]:
+            sourceList.sort()
+        sourceString = "\n".join(sourceList)
+        listForSource = dGroupedBySource.get(sourceString, [])
+        listForSource.append(key)
+        dGroupedBySource[sourceString] = listForSource
+    
+    lSourceKeys = list(dGroupedBySource.keys())
+    lSourceKeys.sort()
+    for source in lSourceKeys:
+        localizedStrings = dGroupedBySource[source]
+        if params["sort"]:
+            localizedStrings.sort()
+        if params["print-source"]:
+            if lOut[-1] != "":
+                lOut.append("")
+            lOut.append(source)
+        for localizedString in localizedStrings:
+            val = dOld.get(localizedString, {})
+            translation = val.get("translation", "")
+            comment = val.get("comment")
+            if params["break-long-lines"] and len(localizedString) > doublespace_threshold and not lOut[-1] == "":
+                lOut.append("")
+            if comment != None and comment != "" and not comment.startswith("# textdomain:"):
+                lOut.append(comment)
+            lOut.append(f"{localizedString}={translation}")
+            if params["break-long-lines"] and len(localizedString) > doublespace_threshold:
+                lOut.append("")
+
+
+    unusedExist = False
+    for key in dOld:
+        if key not in dkeyStrings:
+            val = dOld[key]
+            translation = val.get("translation")
+            comment = val.get("comment")
+            # only keep an unused translation if there was translated
+            # text or a comment associated with it
+            if translation != None and (translation != "" or comment):
+                if not unusedExist:
+                    unusedExist = True
+                    lOut.append("\n\n##### not used anymore #####\n")
+                if params["break-long-lines"] and len(key) > doublespace_threshold and not lOut[-1] == "":
+                    lOut.append("")
+                if comment != None:
+                    lOut.append(comment)
+                lOut.append(f"{key}={translation}")
+                if params["break-long-lines"] and len(key) > doublespace_threshold:
+                    lOut.append("")
+    return "\n".join(lOut) + '\n'
+
+# Writes a template.txt file
+# dkeyStrings is the dictionary returned by generate_template
+def write_template(templ_file, dkeyStrings, mod_name):
+    # read existing template file to preserve comments
+    existing_template = import_tr_file(templ_file)
+    
+    text = strings_to_text(dkeyStrings, existing_template[0], mod_name, existing_template[2])
+    mkdir_p(os.path.dirname(templ_file))
+    with open(templ_file, "wt", encoding='utf-8') as template_file:
+        template_file.write(text)
+
+
+# Gets all translatable strings from a lua file
 def read_lua_file_strings(lua_file):
     lOut = []
-    text = open(lua_file).read()
-    for s in pattern_lua.findall(text):
-        s = re.sub(r'"\.\.\s+"', "", s)
-        s = re.sub("@[^@=n]", "@@", s)
-        s = s.replace("\n", "@n")
-        s = s.replace("\\n", "@n")
-        s = s.replace("=", "@=")
-        lOut.append(s)
+    with open(lua_file, encoding='utf-8') as text_file:
+        text = text_file.read()
+        #TODO remove comments here
+
+        text = re.sub(pattern_concat, "", text)
+
+        strings = []
+        for s in pattern_lua_s.findall(text):
+            strings.append(s[1])
+        for s in pattern_lua_bracketed_s.findall(text):
+            strings.append(s)
+        for s in pattern_lua_fs.findall(text):
+            strings.append(s[1])
+        for s in pattern_lua_bracketed_fs.findall(text):
+            strings.append(s)
+                
+        for s in strings:
+            s = re.sub(r'"\.\.\s+"', "", s)
+            s = re.sub("@[^@=0-9]", "@@", s)
+            s = s.replace('\\"', '"')
+            s = s.replace("\\'", "'")
+            s = s.replace("\n", "@n")
+            s = s.replace("\\n", "@n")
+            s = s.replace("=", "@=")
+            lOut.append(s)
     return lOut
 
-def inport_tr_file(tr_file):
+# Gets strings from an existing translation file
+# returns both a dictionary of translations
+# and the full original source text so that the new text
+# can be compared to it for changes.
+# Returns also header comments in the third return value.
+def import_tr_file(tr_file):
     dOut = {}
+    text = None
+    header_comment = None
     if os.path.exists(tr_file):
-        for line in open(tr_file, "r").readlines():
-            s = line.strip()
-            if s == "" or s[0] == "#":
-                 continue
-            match = pattern_tr.match(s)
-            if match:
-                dOut[match.group(1)] = match.group(2)
-    return dOut
+        with open(tr_file, "r", encoding='utf-8') as existing_file :
+            # save the full text to allow for comparison
+            # of the old version with the new output
+            text = existing_file.read()
+            existing_file.seek(0)
+            # a running record of the current comment block
+            # we're inside, to allow preceeding multi-line comments
+            # to be retained for a translation line
+            latest_comment_block = None
+            for line in existing_file.readlines():
+                line = line.rstrip('\n')
+                if line.startswith("###"):
+                    if header_comment is None and not latest_comment_block is None:
+                        # Save header comments
+                        header_comment = latest_comment_block
+                        # Strip textdomain line
+                        tmp_h_c = ""
+                        for l in header_comment.split('\n'):
+                            if not l.startswith("# textdomain:"):
+                                tmp_h_c += l + '\n'
+                        header_comment = tmp_h_c
 
-def generate_template(templ_file):
-    lOut = []
-    for root, dirs, files in os.walk('./'):
+                    # Reset comment block if we hit a header
+                    latest_comment_block = None
+                    continue
+                elif line.startswith("#"):
+                    # Save the comment we're inside
+                    if not latest_comment_block:
+                        latest_comment_block = line
+                    else:
+                        latest_comment_block = latest_comment_block + "\n" + line
+                    continue
+                match = pattern_tr.match(line)
+                if match:
+                    # this line is a translated line
+                    outval = {}
+                    outval["translation"] = match.group(2)
+                    if latest_comment_block:
+                        # if there was a comment, record that.
+                        outval["comment"] = latest_comment_block
+                    latest_comment_block = None
+                    dOut[match.group(1)] = outval
+    return (dOut, text, header_comment)
+
+# Walks all lua files in the mod folder, collects translatable strings,
+# and writes it to a template.txt file
+# Returns a dictionary of localized strings to source file sets
+# that can be used with the strings_to_text function.
+def generate_template(folder, mod_name):
+    dOut = {}
+    for root, dirs, files in os.walk(folder):
         for name in files:
             if fnmatch.fnmatch(name, "*.lua"):
                 fname = os.path.join(root, name)
                 found = read_lua_file_strings(fname)
-                print(fname, len(found))
-                lOut.extend(found)
-    lOut = list(set(lOut))
-    lOut.sort()
-    gen_template(templ_file, lOut)
-    return lOut
+                if params["verbose"]:
+                    print(f"{fname}: {str(len(found))} translatable strings")
 
-def update_tr_file(lNew, mod_name, tr_file):
-    lOut = ["# textdomain: %s\n" % mod_name]
-    if os.path.exists(tr_file):
-        shutil.copyfile(tr_file, tr_file+".old")
-    dOld = inport_tr_file(tr_file)
-    for key in lNew:
-        val = dOld.get(key, "")
-        lOut.append("%s=%s" % (key, val))
-    lOut.append("##### not used anymore #####")
-    for key in dOld:
-        if key not in lNew:
-            lOut.append("%s=%s" % (key, dOld[key]))
-    open(tr_file, "w").write("\n".join(lOut))
-    
-data = generate_template("./locale/template.txt")
-update_tr_file(data, "minecart", "./locale/minecart.de.tr")
-print("Done.\n")
+                for s in found:
+                    sources = dOut.get(s, set())
+                    sources.add(f"### {os.path.basename(fname)} ###")
+                    dOut[s] = sources
+                    
+    if len(dOut) == 0:
+        return None
+    templ_file = os.path.join(folder, "locale/template.txt")
+    write_template(templ_file, dOut, mod_name)
+    return dOut
 
+# Updates an existing .tr file, copying the old one to a ".old" file
+# if any changes have happened
+# dNew is the data used to generate the template, it has all the
+# currently-existing localized strings
+def update_tr_file(dNew, mod_name, tr_file):
+    if params["verbose"]:
+        print(f"updating {tr_file}")
+
+    tr_import = import_tr_file(tr_file)
+    dOld = tr_import[0]
+    textOld = tr_import[1]
+
+    textNew = strings_to_text(dNew, dOld, mod_name, tr_import[2])
+
+    if textOld and textOld != textNew:
+        print(f"{tr_file} has changed.")
+        if not params["no-old-file"]:
+            shutil.copyfile(tr_file, f"{tr_file}.old")
+
+    with open(tr_file, "w", encoding='utf-8') as new_tr_file:
+        new_tr_file.write(textNew)
+
+# Updates translation files for the mod in the given folder
+def update_mod(folder):
+    modname = get_modname(folder)
+    if modname is not None:
+        process_po_files(folder, modname)
+        print(f"Updating translations for {modname}")
+        data = generate_template(folder, modname)
+        if data == None:
+            print(f"No translatable strings found in {modname}")
+        else:
+            for tr_file in get_existing_tr_files(folder):
+                update_tr_file(data, modname, os.path.join(folder, "locale/", tr_file))
+    else:
+        print(f"\033[31mUnable to find modname in folder {folder}.\033[0m", file=_stderr)
+        exit(1)
+
+# Determines if the folder being pointed to is a mod or a mod pack
+# and then runs update_mod accordingly
+def update_folder(folder):
+    is_modpack = os.path.exists(os.path.join(folder, "modpack.txt")) or os.path.exists(os.path.join(folder, "modpack.conf"))
+    if is_modpack:
+        subfolders = [f.path for f in os.scandir(folder) if f.is_dir() and not f.name.startswith('.')]
+        for subfolder in subfolders:
+            update_mod(subfolder)
+    else:
+        update_mod(folder)
+    print("Done.")
+
+def run_all_subfolders(folder):
+    for modfolder in [f.path for f in os.scandir(folder) if f.is_dir() and not f.name.startswith('.')]:
+        update_folder(modfolder)
+
+
+main()
diff --git a/minecart/init.lua b/minecart/init.lua
index c484085..b1e66b1 100644
--- a/minecart/init.lua
+++ b/minecart/init.lua
@@ -3,7 +3,7 @@
 	Minecart
 	========
 
-	Copyright (C) 2019-2020 Joachim Stolberg
+	Copyright (C) 2019-2021 Joachim Stolberg
 
 	MIT
 	See license.txt for more information
@@ -13,24 +13,37 @@
 minecart = {}
 
 -- Version for compatibility checks, see readme.md/history
-minecart.version = 1.10
+minecart.version = 2.00
 
 minecart.hopper_enabled = minetest.settings:get_bool("minecart_hopper_enabled") ~= false
 minecart.teleport_enabled = minetest.settings:get_bool("minecart_teleport_enabled") == true
+-- Test for MT 5.4 new string mode
+minecart.CLIP = minetest.features.use_texture_alpha_string_modes and "clip" or false
+
 
 minecart.S = minetest.get_translator("minecart")
 local MP = minetest.get_modpath("minecart")
-dofile(MP.."/storage.lua")
-dofile(MP.."/lib.lua")
-dofile(MP.."/monitoring.lua")
-dofile(MP.."/recording.lua")
-dofile(MP.."/minecart.lua")
-dofile(MP.."/buffer.lua")
-dofile(MP.."/protection.lua")
+dofile(MP .. "/baselib.lua")
+dofile(MP .. "/storage.lua")
+dofile(MP .. "/rails.lua")
+dofile(MP .. "/monitoring.lua")
+dofile(MP .. "/recording.lua")
+dofile(MP .. "/hopperlib.lua")
+dofile(MP .. "/nodelib.lua")
+dofile(MP .. "/entitylib.lua")
+dofile(MP .. "/api.lua")
+dofile(MP .. "/minecart.lua")
+dofile(MP .. "/buffer.lua")
+dofile(MP .. "/protection.lua")
+--dofile(MP .. "/tool.lua") # for debugging only
+dofile(MP .. "/signs.lua")
+dofile(MP .. "/terminal.lua")
+dofile(MP .. "/pusher.lua")
 
 if minecart.hopper_enabled then
-	dofile(MP.."/hopper.lua")
-	dofile(MP.."/mods_support.lua")
+	dofile(MP .. "/hopper.lua")
+	dofile(MP .. "/mods_support.lua")
 end
-dofile(MP.."/doc.lua")
+
+dofile(MP .. "/doc.lua")
 minetest.log("info", "[MOD] Minecart loaded")
diff --git a/minecart/lib.lua b/minecart/lib.lua
deleted file mode 100644
index efdcf72..0000000
--- a/minecart/lib.lua
+++ /dev/null
@@ -1,326 +0,0 @@
---[[
-
-	Minecart
-	========
-
-	Copyright (C) 2019-2020 Joachim Stolberg
-
-	MIT
-	See license.txt for more information
-	
-]]--
-
--- for lazy programmers
-local M = minetest.get_meta
-local P2S = function(pos) if pos then return minetest.pos_to_string(pos) end end
-local S2P = minetest.string_to_pos
-local S = minecart.S
-
-local RegisteredInventories = {}
-
-local param2_to_dir = {[0]=
-	{x=0,  y=0,  z=1},
-	{x=1,  y=0,  z=0},
-	{x=0,  y=0, z=-1},
-	{x=-1, y=0,  z=0},
-	{x=0,  y=-1, z=0},
-	{x=0,  y=1,  z=0}
-}
-
--- Registered carts
-local tValidCarts = {} -- [<cart_name_stopped>] =  <cart_name_running>
-local lValidCartNodes = {}
-local tValidCartEntities = {}
-
-minetest.tValidCarts = tValidCarts
-
-function minecart.register_cart_names(cart_name_stopped, cart_name_running)
-	tValidCarts[cart_name_stopped] = cart_name_running
-	
-	if minetest.registered_nodes[cart_name_stopped] then
-		lValidCartNodes[#lValidCartNodes+1] = cart_name_stopped
-	end
-	if minetest.registered_nodes[cart_name_running] then
-		lValidCartNodes[#lValidCartNodes+1] = cart_name_running
-	end
-	if minetest.registered_entities[cart_name_stopped] then
-		tValidCartEntities[cart_name_stopped] = true
-	end
-	if minetest.registered_entities[cart_name_running] then
-		tValidCartEntities[cart_name_running] = true
-	end
-end
-
-function minecart.get_node_lvm(pos)
-	local node = minetest.get_node_or_nil(pos)
-	if node then
-		return node
-	end
-	local vm = minetest.get_voxel_manip()
-	local MinEdge, MaxEdge = vm:read_from_map(pos, pos)
-	local data = vm:get_data()
-	local param2_data = vm:get_param2_data()
-	local area = VoxelArea:new({MinEdge = MinEdge, MaxEdge = MaxEdge})
-	local idx = area:indexp(pos)
-	if data[idx] and param2_data[idx] then
-		return {
-			name = minetest.get_name_from_content_id(data[idx]),
-			param2 = param2_data[idx]
-		}
-	end
-	return {name="ignore", param2=0}
-end
-
-function minecart.stopped(vel, tolerance)
-	tolerance = tolerance or 0.05
-	return math.abs(vel.x) < tolerance and math.abs(vel.z) < tolerance
-end
-
-local function is_air_like(name)
-	local ndef = minetest.registered_nodes[name]
-	if ndef and ndef.buildable_to then
-		return true
-	end
-	return false
-end
-
-function minecart.range(val, min, max)
-	val = tonumber(val)
-	if val < min then return min end
-	if val > max then return max end
-	return val
-end
-
-function minecart.get_next_node(pos, param2)
-	local pos2 = param2 and vector.add(pos, param2_to_dir[param2]) or pos
-	local node = minetest.get_node(pos2)
-	return pos2, node
-end
-
-local function get_cart_object(pos, radius)
-	for _, object in pairs(minetest.get_objects_inside_radius(pos, radius or 0.5)) do
-		if tValidCartEntities[object:get_entity_name()] then
-			local vel = object:get_velocity()
-			if vector.equals(vel, {x=0, y=0, z=0}) then  -- still standing?
-				return object
-			end
-		end
-	end
-end
-
--- check if cart can be pushed
-function minecart.check_cart_for_pushing(pos, param2, radius)	
-	local pos2 = param2 and vector.add(pos, param2_to_dir[param2]) or pos
-	
-	if minetest.find_node_near(pos2, radius or 0.5, lValidCartNodes, true) then
-		return true
-	end
-	
-	return get_cart_object(pos2, radius) ~= nil
-end
-
--- check if cargo can be loaded
-function minecart.check_cart_for_loading(pos, param2, radius)	
-	local pos2 = param2 and vector.add(pos, param2_to_dir[param2]) or pos
-	
-	if minetest.find_node_near(pos2, radius or 0.5, lValidCartNodes, true) then
-		return true
-	end
-	
-	for _, object in pairs(minetest.get_objects_inside_radius(pos2, radius or 0.5)) do
-		if object:get_entity_name() == "minecart:cart" then
-			local vel = object:get_velocity()
-			if vector.equals(vel, {x=0, y=0, z=0}) then  -- still standing?
-				return true
-			end
-		end
-	end
-	
-	return false
-end
-
-local get_next_node = minecart.get_next_node
-local check_cart_for_loading = minecart.check_cart_for_loading
-local check_cart_for_pushing = minecart.check_cart_for_pushing
-
--- Take the given number of items from the inv.
--- Returns nil if ItemList is empty.
-function minecart.inv_take_items(inv, listname, num)
-	if inv:is_empty(listname) then
-		return nil
-	end
-	local size = inv:get_size(listname)
-	for idx = 1, size do
-		local items = inv:get_stack(listname, idx)
-		if items:get_count() > 0 then
-			local taken = items:take_item(num)
-			inv:set_stack(listname, idx, items)
-			return taken
-		end
-	end
-	return nil
-end
-
-function minecart.take_items(pos, param2, num)
-	local npos, node
-	if param2 then
-		npos, node = get_next_node(pos, (param2 + 2) % 4)
-	else
-		npos, node = pos, minetest.get_node(pos)
-	end
-	local def = RegisteredInventories[node.name]
-	local owner = M(pos):get_string("owner")
-	local inv = minetest.get_inventory({type="node", pos=npos})
-	
-	if def and inv and def.take_listname and (not def.allow_take or def.allow_take(npos, nil, owner)) then
-		return minecart.inv_take_items(inv, def.take_listname, num)
-	elseif def and def.take_item then
-		return def.take_item(npos, num, owner)
-	else
-		local ndef = minetest.registered_nodes[node.name]
-		if ndef and ndef.minecart_hopper_takeitem then
-			return ndef.minecart_hopper_takeitem(npos, num)
-		end
-	end
-end
-
-function minecart.put_items(pos, param2, stack)
-	local npos, node = get_next_node(pos, param2)
-	local def = RegisteredInventories[node.name]
-	local owner = M(pos):get_string("owner")
-	local inv = minetest.get_inventory({type="node", pos=npos})
-	
-	if def and inv and def.put_listname and (not def.allow_put or def.allow_put(npos, stack, owner)) then
-		local leftover = inv:add_item(def.put_listname, stack)
-		if leftover:get_count() > 0 then
-			return leftover
-		end
-	elseif def and def.put_item then
-		return def.put_item(npos, stack, owner)
-	elseif is_air_like(node.name) or check_cart_for_loading(npos) then
-		minetest.add_item(npos, stack)
-	else
-		local ndef = minetest.registered_nodes[node.name]
-		if ndef and ndef.minecart_hopper_additem then
-			local leftover = ndef.minecart_hopper_additem(npos, stack)
-			if leftover:get_count() > 0 then
-				return leftover
-			end
-		else
-			return stack
-		end
-	end
-end
-
-function minecart.untake_items(pos, param2, stack)
-	local npos, node
-	if param2 then
-		npos, node = get_next_node(pos, (param2 + 2) % 4)
-	else
-		npos, node = pos, minetest.get_node(pos)
-	end
-	local def = RegisteredInventories[node.name]
-	local inv = minetest.get_inventory({type="node", pos=npos})
-	
-	if def and inv and def.put_listname then
-		return inv:add_item(def.put_listname, stack)
-	elseif def and def.untake_item then
-		return def.untake_item(npos, stack)
-	else
-		local ndef = minetest.registered_nodes[node.name]
-		if ndef and ndef.minecart_hopper_untakeitem then
-			return ndef.minecart_hopper_untakeitem(npos, stack)
-		end
-	end
-end
-
-function minecart.punch_cart(pos, param2, radius, dir)
-	local pos2 = param2 and vector.add(pos, param2_to_dir[param2]) or pos
-	
-	local pos3 = minetest.find_node_near(pos2, radius or 0.5, lValidCartNodes, true)
-	if pos3 then
-		local node = minetest.get_node(pos3)
-		--print(node.name)
-		minecart.node_on_punch(pos3, node, nil, nil, tValidCarts[node.name], dir)
-		return true
-	end
-	
-	local obj = get_cart_object(pos2, radius)
-	if obj then
-		obj:punch(obj, 1.0, {
-			full_punch_interval = 1.0,
-			damage_groups = {fleshy = 1},
-		}, dir)
-	end
-end	
-
--- Register inventory node for hopper access
--- (for examples, see below)
-function minecart.register_inventory(node_names, def)
-	for _, name in ipairs(node_names) do
-		RegisteredInventories[name] = {
-			allow_put = def.put and def.put.allow_inventory_put,
-			put_listname = def.put and def.put.listname,
-			allow_take = def.take and def.take.allow_inventory_take,
-			take_listname = def.take and def.take.listname,
-			put_item = def.put and def.put.put_item,
-			take_item = def.take and def.take.take_item,
-			untake_item = def.take and def.take.untake_item,
-		}
-	end
-end
-
-function minecart.register_cart_entity(entity_name, node_name, entity_def)
-	entity_def.velocity = {x=0, y=0, z=0} -- only used on punch
-	entity_def.old_dir = {x=1, y=0, z=0} -- random value to start the cart on punch
-	entity_def.old_pos = nil
-	entity_def.old_switch = 0
-	entity_def.node_name = node_name
-	minetest.register_entity(entity_name, entity_def)
-	-- register node for punching
-	minecart.register_cart_names(node_name, entity_name)
-end
-
-minetest.register_on_player_receive_fields(function(player, formname, fields)
-    if formname == "minecart:userID_node" then
-		if fields.exit == "Save" or fields.key_enter == "true" then
-			local cart_pos = S2P(player:get_meta():get_string("cart_pos"))
-			local userID = tonumber(fields.userID) or 0
-			M(cart_pos):set_int("userID", userID)
-			M(cart_pos):set_string("infotext", minetest.get_color_escape_sequence("#FFFF00")..player:get_player_name()..": "..userID)
-			minecart.node_at_station(player:get_player_name(), userID, cart_pos)
-		end
-		return true
-	end
-    if formname == "minecart:userID_entity" then
-		if fields.exit == "Save" or fields.key_enter == "true" then
-			local cart_pos = S2P(player:get_meta():get_string("cart_pos"))
-			local obj = get_cart_object(cart_pos)
-			if obj then
-				local entity = obj:get_luaentity()
-				entity.userID = tonumber(fields.userID) or 0
-				obj:set_nametag_attributes({color = "#ffff00", text = entity.owner..": "..entity.userID})
-				minecart.update_userID(entity.myID, entity.userID)
-			end
-		end
-		return true
-	end
-    return false
-end)
-
-minecart.register_inventory({"minecart:hopper"}, {
-	put = {
-		allow_inventory_put = function(pos, stack, player_name)
-			local owner = M(pos):get_string("owner")
-			return owner == player_name
-		end, 
-		listname = "main",
-	},
-	take = {
-		allow_inventory_take = function(pos, stack, player_name)
-			local owner = M(pos):get_string("owner")
-			return owner == player_name
-		end, 
-		listname = "main",
-	},
-})
diff --git a/minecart/locale/minecart.de.tr b/minecart/locale/minecart.de.tr
index 94954c5..615b0cc 100644
--- a/minecart/locale/minecart.de.tr
+++ b/minecart/locale/minecart.de.tr
@@ -1,37 +1,58 @@
 # textdomain: minecart
-
+Station name=Stationsname
+Waiting time/sec=Wartezeit/s
+connected to=verbunden mit
+Minecart Railway Buffer=Minecart Prellbock
+Summary=Zusammenfassung
 1. Place your rails and build a route with two endpoints. Junctions are allowed as long as each route has its own start and endpoint.=1. Baue eine Schienenstrecke mit zwei Enden. Kreuzungen sind zulässig, solange jede Route ihre eigenen Start- und Endpunkte hat.
-10. Check the cart state via the chat command: /mycart <num>@n   '<num>' is the cart number=Prüfe den Status des Wagen mit dem Chat Kommando: /mycart <num>@n    <num> ist die Wagennummer
-11. Drop items into the Minecart and punch the cart to start it, or 'sneak+click' the Minecart to get the items back.=11: Lege Gegenstände in ein Wagen (Taste Q) und starte dann den Wagen durch Anklicken. Klicke mit gedrückter Shift-Taste auf den Wagen, um Gegenstände wieder auszuladen.
-12. Dig the empty cart with a second 'sneak+click' (as usual).=10. Klicke erneut mit gedrückter Shift-Taste auf den Wagen, um diesen zu entfernen.
 2. Place a Railway Buffer at both endpoints (buffers are always needed, they store the route and timing information).=2. Platziere einen Prellbock an beide Schienenenden (Prellböcke sind zwingend notwendig, sie speichern die Routen- und Zeit-Informationen).
 3. Give both Railway Buffers unique station names, like Oxford and Cambridge.=3. Gib beiden Prellböcken eindeutige Stationsnamen wie: Stuttgart und München.
 4. Place a Minecart at a buffer and give it a cart number (1..999)=4. Platziere einen Minecart Wagen an einem Prellbock und gib dem Wagen eine Wagennummer (1..999)
 5. Drive from buffer to buffer in both directions using the Minecart(!) to record the routes (use 'right-left' keys to control the Minecart).=5. Um eine Route aufzuzeichnen, fahre die Route in beide Richtungen von Prellbock zu Prellbock mit dem Minecart Wagen(!). Nutze 'links-rechts' Tasten zur Steuerung.
 6. Punch the buffers to check the connection data (e.g. 'Oxford: connected to Cambridge').=6. Schlage auf die Prellböcke um die Verbindungsdaten zu prüfen (bspw.: 'München: verbunden mit Stuttgart')
-7. Optional: Configure the Minecart stop time in one or both buffers. The Minecart will then start automatically after the configured time.=7. Optional: Konfiguriere die Wagenwartezeit in einem oder in beiden Prellböcken. Der Wagen startet dann nach dieser Zeit automatisch.
+7. Optional: Configure the Minecart waiting time in both buffers. The Minecart will then start automatically after the configured time.=7. Optional: Konfiguriere die Wagenwartezeit in beiden Prellböcken. Der Wagen startet dann nach dieser Zeit automatisch.
 8. Optional: Protect your rail network with the Protection Landmarks (one Landmark at least every 16 nodes/meters).=8. Optional: Schütze deine Schienen mit Hilfe der Meilensteine (ein Meilenstein mindestens alle 16 Blöcke).
 9. Place a Minecart in front of the buffer and check whether it starts after the configured time.=9. Platziere einen Wagen direkt vor einem Prellbock und prüfe, ob er nach der konfigurierten Zeit startet.
-Allow to dig/place rails in Minecart Landmark areas=Erlaubt dir, Schienen in Meilensteinbereichen zu setzen/zu entfernen
-Minecart=Minecart
-Minecart (Sneak+Click to pick up)=Minecart (Shift+Klick zum Entfernen des Carts)
-Minecart Cart=Wagen
-Minecart Hopper=Minecart Hopper
-Minecart Landmark=Minecart Meilenstein
-Minecart Railway Buffer=Minecart Prellbock
-Minecart, the lean railway transportation automation system=Minecart, das schlanke Schienentransport Automatisierungssystem
-Primary used to transport items. You can drop items into the Minecart and punch the cart to get started. Sneak+click the cart to get the items back=Primär für den Transport von Gegenständen genutzt. Du kannst Gegenstände in ein Cart legen (Taste Q) und dann den Wagen durch Anklicken starten. Klicke mit gedrückter Shift-Taste auf den Wagen, um die Gegenstände wieder auszuladen
-Protect your rails with the Landmarks (one Landmark at least every 16 blocks near the rail)=Schütze deine Schienen mit Hilfe der Meilensteine (ein Meilenstein mindestens alle 16 Blöcke der Strecke entlang)
-Station name=Stationsname
-Stop time/sec=Haltezeit/s
-Summary=Zusammenfassung
+10. Check the cart state via the chat command: /mycart <num>@n   '<num>' is the cart number=Prüfe den Status des Wagen mit dem Chat Kommando: /mycart <num>@n    <num> ist die Wagennummer
+11. Drop items into the Minecart and punch the cart to start it.=11: Lege Gegenstände in ein Wagen (Taste Q) und starte dann den Wagen durch Anklicken.
+12. Dig the cart with 'sneak+click' (as usual). The items will be drop down.=10. Klicke mit gedrückter Shift-Taste auf den Wagen, um diesen zu entfernen. Die Gegenstände fallen dann zu Boden.
+Primary used to transport items. You can drop items into the Minecart and punch the cart to get started. Sneak+click the cart to get cart and items back=Primär für den Transport von Gegenständen genutzt. Du kannst Gegenstände in ein Cart legen (Taste Q) und dann den Wagen durch Anklicken starten. Klicke mit gedrückter Shift-Taste auf den Wagen, um Cart und Gegenstände zurückzuerhalten
 Used as buffer on both rail ends. Needed to be able to record the cart routes=Preckblöcke müssen an beiden Schienenenden platziert sein, so dass Aufzeichnungen der Strecke gemacht werden können.
+Protect your rails with the Landmarks (one Landmark at least every 16 blocks near the rail)=Schütze deine Schienen mit Hilfe der Meilensteine (ein Meilenstein mindestens alle 16 Blöcke der Strecke entlang)
 Used to load/unload Minecart. The Hopper can push/pull items to/from chests and drop/pickup items to/from Minecarts. To unload a Minecart place the hopper below the rail. To load the Minecart, place the hopper right next to the Minecart.=Um Wagen zu be- und entladen. Der Hopper kann Gegenstände aus Kisten Holen und legen, sowie diese in Wagen fallen lassen bzw. aus Wagen entnehmen. Um einen Wagen zu entladen, muss der Hopper unter die Schiene platziert werden. Um einen Wagen zu beladen, muss der Hopper direkt neben die Schiene platziert werden.
+Minecart=Minecart
+Minecart, the lean railway transportation automation system=Minecart, das schlanke Schienentransport Automatisierungssystem
+Minecart Cart=Wagen
+Minecart Speed Signs=Geschwindigkeitsbegrenzungszeichen
+If several carts are running on one route,@nit can happen that a buffer position is already occupied and one cart therefore stops earlier.@nIn this case, the cart pusher is used to push the cart towards the buffer again.@nThis block must be placed under the rail at a distance of 2 m in front of the buffer.=Wenn mehrere Wagen auf einer Route fahren, kann es vorkommen,@ndass eine Prellbock Position bereits belegt ist und ein Wagen daher früher anhält.@nDer Cart Anschieber dient in diesem Fall dazu, die Wagen wieder in Richtung Prellbock anzuschieben.@nDieser Block muss unter der Schiene mit 2 m Abstand vor dem Prellbock platziert werden.
+Limit the cart speed with speed limit signs.@n@nAs before, the speed of the carts is also influenced by power rails.@nBrake rails are irrelevant, the cart does not brake here.@nThe maximum speed is 8 m/s. This assumes a ratio of power rails@nto normal rails of 1 to 4 on a flat section of rail. A rail section is a@nseries of rail nodes without a change of direction. After every curve / kink,@nthe speed for the next section of the route is newly determined,@ntaking into account the swing of the cart. This means that a cart can@nroll over short rail sections without power rails.@n@nIn order to additionally brake the cart at certain points@n(at switches or in front of a buffer), speed limit signs can be placed@non the track. With these signs the speed can be reduced to 4, 2, or 1 m / s.@nThe "No speed limit" sign can be used to remove the speed limit.@n@nThe speed limit signs must be placed next to the track so that they can@nbe read from the cart. This allows different speeds in each direction of travel.=Begrenze die Geschwindigkeit der Wagen mit Geschwindigkeitsbegrenzungszeichen@n@nDie Geschwindigkeit der Carts wird wie bisher auch über "power rails" beeinflusst. "Brake rails" sind ohne Bedeutung, das Cart bremst hier nicht. Die maximale Geschwindigkeit beträgt 8 m/s. Dies setzt eine Verhältnis von "power rails" zu "normal rails" von 1 zu 4 auf einem ebenen Streckenabschnitt voraus. Ein Streckenabschnitt ist dabei ein Reihe von Schienenblöcken ohne Richtungsänderung. Nach jeder Kurve/Knick wird die Geschwindigkeit für den nächsten Streckenabschnitt neu bestimmt, wobei hier der Schwung des Carts mit berücksichtigt wird. So kann ein Cart auch über kurze Streckenabschnitt ohne "power rails" rollen.@n@nUm das Cart zusätzlich an bestimmten Stellen abzubremsen (an Weichen oder vor einen Puffer), können Geschwindigkeitsbegrenzungszeichen an der Strecke platziert werden. Durch diese Zeichen kann die Geschwindigkeit auf 4, 2, oder 1 m/s reduziert werden. Durch das Aufhebungszeichen kann die Geschwindigkeitsbegrenzung wieder aufgehoben werden.@n@nDie Geschwindigkeitsbegrenzungszeichen müssen so neben die Strecke platziert werden, dass sie vom Cart ablesbar sind. Dies erlaubt damit unterschiedliche Geschwindigkeiten pro Fahrtrichtung.
+Minecart Hopper=Minecart Hopper
+Minecart (Sneak+Click to pick up)=Minecart (Shift+Klick zum Entfernen des Carts)
+Output cart state and position, or a list of carts, if no cart number is given.=Gibt Status und Position des Wagens, oder eine Liste aller Wagen aus, wenn keine Wagennummer angegeben ist.
+List of carts=Liste aller Wagen
+Enter cart number=Gebe Cart Nummer ein
+Save=Speichern
 [minecart] Area is protected!=[minecart] Bereich ist geschützt!
-[minecart] Cart is protected by = Wagen ist geschützt durch 
-[minecart] Recording canceled!=[minecart] Aufzeichnung abgebrochen!
+Allow to dig/place rails in Minecart Landmark areas=Erlaubt dir, Schienen in Meilensteinbereichen zu setzen/zu entfernen
+Minecart Landmark=Minecart Meilenstein
+Cart Pusher=Wagen Anschieber
+left=links
+right=rechts
+straight=geradeaus
+Recording=Aufzeichnung
+speed=Tempo
+next junction=nächste Weiche
+Travel time=Fahrzeit
 [minecart] Route stored!=[minecart] Strecke gespeichert
-[minecart] Start route recording!=[minecart] Starte die Streckenaufzeichnung!
-connected to=verbunden mit
+[minecart] Speed @= %u m/s, Time @= %u s, Route length @= %u m=[minecart] Geschw. @= %u m/s, Zeit @= %u s, Routenlänge @= %u m
+Speed "1"=Tempo "1"
+Speed "2"=Tempo "2"
+Speed "4"=Tempo "4"
+No speed limit=Keine Geschwindigkeitsbegrenzung
+Cart List=Cart Liste
+Cart Terminal=Cart Terminal
+
+
 ##### not used anymore #####
 
+Used to push a cart if the cart does not stop directly at a buffer. Block has to be placed below the rail.=Wird verwendet, um einen Wagen anzuschieben, wenn der Wagen nicht direkt an einem Puffer anhält. Der Block muss unter der Schiene platziert werden.
diff --git a/minecart/locale/template.txt b/minecart/locale/template.txt
index 8d66077..b9a4ae5 100644
--- a/minecart/locale/template.txt
+++ b/minecart/locale/template.txt
@@ -1,33 +1,53 @@
+# textdomain: minecart
+Station name=
+Waiting time/sec=
+connected to=
+Minecart Railway Buffer=
+Summary=
 1. Place your rails and build a route with two endpoints. Junctions are allowed as long as each route has its own start and endpoint.=
-10. Check the cart state via the chat command: /mycart <num>@n   '<num>' is the cart number=
-11. Drop items into the Minecart and punch the cart to start it, or 'sneak+click' the Minecart to get the items back.=
-12. Dig the empty cart with a second 'sneak+click' (as usual).=
 2. Place a Railway Buffer at both endpoints (buffers are always needed, they store the route and timing information).=
 3. Give both Railway Buffers unique station names, like Oxford and Cambridge.=
 4. Place a Minecart at a buffer and give it a cart number (1..999)=
 5. Drive from buffer to buffer in both directions using the Minecart(!) to record the routes (use 'right-left' keys to control the Minecart).=
 6. Punch the buffers to check the connection data (e.g. 'Oxford: connected to Cambridge').=
-7. Optional: Configure the Minecart stop time in one or both buffers. The Minecart will then start automatically after the configured time.=
+7. Optional: Configure the Minecart waiting time in both buffers. The Minecart will then start automatically after the configured time.=
 8. Optional: Protect your rail network with the Protection Landmarks (one Landmark at least every 16 nodes/meters).=
 9. Place a Minecart in front of the buffer and check whether it starts after the configured time.=
-Allow to dig/place rails in Minecart Landmark areas=
-Minecart=
-Minecart (Sneak+Click to pick up)=
-Minecart Cart=
-Minecart Hopper=
-Minecart Landmark=
-Minecart Railway Buffer=
-Minecart, the lean railway transportation automation system=
-Primary used to transport items. You can drop items into the Minecart and punch the cart to get started. Sneak+click the cart to get the items back=
-Protect your rails with the Landmarks (one Landmark at least every 16 blocks near the rail)=
-Station name=
-Stop time/sec=
-Summary=
+10. Check the cart state via the chat command: /mycart <num>@n   '<num>' is the cart number=
+11. Drop items into the Minecart and punch the cart to start it.=
+12. Dig the cart with 'sneak+click' (as usual). The items will be drop down.=
+Primary used to transport items. You can drop items into the Minecart and punch the cart to get started. Sneak+click the cart to get cart and items back=
 Used as buffer on both rail ends. Needed to be able to record the cart routes=
+Protect your rails with the Landmarks (one Landmark at least every 16 blocks near the rail)=
 Used to load/unload Minecart. The Hopper can push/pull items to/from chests and drop/pickup items to/from Minecarts. To unload a Minecart place the hopper below the rail. To load the Minecart, place the hopper right next to the Minecart.=
+Minecart=
+Minecart, the lean railway transportation automation system=
+Minecart Cart=
+Minecart Speed Signs=
+If several carts are running on one route,@nit can happen that a buffer position is already occupied and one cart therefore stops earlier.@nIn this case, the cart pusher is used to push the cart towards the buffer again.@nThis block must be placed under the rail at a distance of 2 m in front of the buffer.=
+Limit the cart speed with speed limit signs.@n@nAs before, the speed of the carts is also influenced by power rails.@nBrake rails are irrelevant, the cart does not brake here.@nThe maximum speed is 8 m/s. This assumes a ratio of power rails@nto normal rails of 1 to 4 on a flat section of rail. A rail section is a@nseries of rail nodes without a change of direction. After every curve / kink,@nthe speed for the next section of the route is newly determined,@ntaking into account the swing of the cart. This means that a cart can@nroll over short rail sections without power rails.@n@nIn order to additionally brake the cart at certain points@n(at switches or in front of a buffer), speed limit signs can be placed@non the track. With these signs the speed can be reduced to 4, 2, or 1 m / s.@nThe "No speed limit" sign can be used to remove the speed limit.@n@nThe speed limit signs must be placed next to the track so that they can@nbe read from the cart. This allows different speeds in each direction of travel.=
+Minecart Hopper=
+Minecart (Sneak+Click to pick up)=
+Output cart state and position, or a list of carts, if no cart number is given.=
+List of carts=
+Enter cart number=
+Save=
 [minecart] Area is protected!=
-[minecart] Cart is protected by =
-[minecart] Recording canceled!=
+Allow to dig/place rails in Minecart Landmark areas=
+Minecart Landmark=
+Cart Pusher=
+left=
+right=
+straight=
+Recording=
+speed=
+next junction=
+Travel time=
 [minecart] Route stored!=
-[minecart] Start route recording!=
-connected to=
\ No newline at end of file
+[minecart] Speed @= %u m/s, Time @= %u s, Route length @= %u m=
+Speed "1"=
+Speed "2"=
+Speed "4"=
+No speed limit=
+Cart List=
+Cart Terminal=
diff --git a/minecart/minecart.lua b/minecart/minecart.lua
index 6918d89..1237019 100644
--- a/minecart/minecart.lua
+++ b/minecart/minecart.lua
@@ -3,7 +3,7 @@
 	Minecart
 	========
 
-	Copyright (C) 2019-2020 Joachim Stolberg
+	Copyright (C) 2019-2021 Joachim Stolberg
 
 	MIT
 	See license.txt for more information
@@ -11,69 +11,92 @@
 ]]--
 
 local S = minecart.S
-local MP = minetest.get_modpath("minecart")
-local lib = dofile(MP.."/cart_lib1.lua")
+local M = minetest.get_meta
 
-lib:init(false)
-
-local cart_entity = {
-	initial_properties = {
-		physical = false, -- otherwise going uphill breaks
-		collisionbox = {-0.5, -0.5, -0.5, 0.5, 0.5, 0.5},
-		visual = "mesh",
-		mesh = "carts_cart.b3d",
-		visual_size = {x=1, y=1},
-		textures = {"carts_cart.png^minecart_cart.png"},
-		static_save = false,
-	},
-    ------------------------------------ changed
-	owner = nil,
-	------------------------------------ changed
-	driver = nil,
-	punched = false, -- used to re-send velocity and position
-	velocity = {x=0, y=0, z=0}, -- only used on punch
-	old_dir = {x=1, y=0, z=0}, -- random value to start the cart on punch
-	old_pos = nil,
-	old_switch = 0,
-	railtype = nil,
-	cargo = {},
-	on_rightclick = lib.on_rightclick,
-	on_activate = lib.on_activate,
-	on_detach_child = lib.on_detach_child,
-	on_punch = lib.on_punch,
-	on_step = lib.on_step,
-}
-
-
-minetest.register_entity("minecart:cart", cart_entity)
-
-minecart.register_cart_names("minecart:cart", "minecart:cart")
-
-
-minetest.register_craftitem("minecart:cart", {
+minetest.register_node("minecart:cart", {
 	description = S("Minecart (Sneak+Click to pick up)"),
-	inventory_image = minetest.inventorycube("carts_cart_top.png", "carts_cart_side.png^minecart_logo.png", "carts_cart_side.png^minecart_logo.png"),
-	wield_image = "carts_cart_side.png",
-	on_place = function(itemstack, placer, pointed_thing)
-		-- use cart as tool
-		local under = pointed_thing.under
-		local node = minetest.get_node(under)
-		local udef = minetest.registered_nodes[node.name]
-		if udef and udef.on_rightclick and
-				not (placer and placer:is_player() and
-				placer:get_player_control().sneak) then
-			return udef.on_rightclick(under, node, placer, itemstack,
-				pointed_thing) or itemstack
-		end
+	tiles = {
+		-- up, down, right, left, back, front		
+			"carts_cart_top.png^minecart_appl_cart_top.png",
+			"carts_cart_top.png",
+			"carts_cart_side.png^minecart_logo.png",
+			"carts_cart_side.png^minecart_logo.png",
+			"carts_cart_side.png^minecart_logo.png",
+			"carts_cart_side.png^minecart_logo.png",
+		},
+	drawtype = "nodebox",
+	node_box = {
+		type = "fixed",
+		fixed = {
+			{-8/16,-8/16,-8/16,  8/16, 8/16,-7/16},
+			{-8/16,-8/16, 7/16,  8/16, 8/16, 8/16},
+			{-8/16,-8/16,-8/16, -7/16, 8/16, 8/16},
+			{ 7/16,-8/16,-8/16,  8/16, 8/16, 8/16},
+			{-8/16,-8/16,-8/16,  8/16,-6/16, 8/16},
+		},
+	},
+--	collision_box = {
+--        type = "fixed",
+--        fixed = {
+--            {-8/16,-8/16,-8/16,  8/16,-4/16, 8/16},
+--        },
+--    },
+	paramtype2 = "facedir",
+	paramtype = "light",
+	use_texture_alpha = minecart.CLIP,
+	sunlight_propagates = true,
+	is_ground_content = false,
+	groups = {cracky = 2, crumbly = 2, choppy = 2},
+	node_placement_prediction = "",
+	diggable = false,
+	
+	on_place = minecart.on_nodecart_place,
+	on_punch = minecart.on_nodecart_punch,
 
-		if not pointed_thing.type == "node" then
-			return
+	on_rightclick = function(pos, node, clicker)
+		if clicker and clicker:is_player() then
+			if M(pos):get_int("userID") ~= 0 then
+				-- enter the cart
+				local object = minecart.node_to_entity(pos, "minecart:cart", "minecart:cart_entity")
+				minecart.manage_attachment(clicker, object:get_luaentity(), true)
+			else 
+				minecart.show_formspec(pos, clicker)
+			end
 		end
-		
-		return lib.add_cart(itemstack, placer, pointed_thing, "minecart:cart")
+	end,
+	
+	set_cargo = function(pos, data)
+		for _,item in ipairs(data or {}) do
+			minetest.add_item(pos, ItemStack(item))
+		end
+	end,
+	
+	get_cargo = function(pos)
+		local data = {}
+		for _, obj in pairs(minetest.get_objects_inside_radius(pos, 1)) do
+			local entity = obj:get_luaentity()
+			if not obj:is_player() and entity and entity.name == "__builtin:item" then
+				obj:remove()
+				data[#data + 1] = entity.itemstring
+			end
+		end
+		return data
 	end,
 })
 
+minecart.register_cart_entity("minecart:cart_entity", "minecart:cart", "default", {
+	initial_properties = {
+		physical = false,
+		collisionbox = {-0.5, -0.5, -0.5, 0.5, 0.5, 0.5},
+		visual = "wielditem",
+		textures = {"minecart:cart"},
+		visual_size = {x=0.66, y=0.66, z=0.66},
+		static_save = false,
+	},
+	driver_allowed = true,
+})
+
+
 minetest.register_craft({
 	output = "minecart:cart",
 	recipe = {
diff --git a/minecart/mods_support.lua b/minecart/mods_support.lua
index 14aaaa7..cebb9ea 100644
--- a/minecart/mods_support.lua
+++ b/minecart/mods_support.lua
@@ -3,7 +3,7 @@
 	Minecart
 	========
 
-	Copyright (C) 2019-2020 Joachim Stolberg
+	Copyright (C) 2019-2021 Joachim Stolberg
 
 	MIT
 	See license.txt for more information
diff --git a/minecart/monitoring.lua b/minecart/monitoring.lua
index a77d89e..4d66b5e 100644
--- a/minecart/monitoring.lua
+++ b/minecart/monitoring.lua
@@ -3,274 +3,271 @@
 	Minecart
 	========
 
-	Copyright (C) 2019-2020 Joachim Stolberg
+	Copyright (C) 2019-2021 Joachim Stolberg
 
 	MIT
 	See license.txt for more information
 	
 ]]--
 
--- Some notes:
--- 1) Entity IDs are volatile. For each server restart all carts get new IDs.
--- 2) Monitoring is performed for entities only. Stopped carts in form of
---    real nodes need no monitoring.
--- 3) But nodes at stations have to call 'node_at_station' to be "visible"
---    for the chat commands
-
-
 -- for lazy programmers
 local M = minetest.get_meta
 local P2S = function(pos) if pos then return minetest.pos_to_string(pos) end end
 local S2P = minetest.string_to_pos
+local P2H = minetest.hash_node_position
+local H2P = minetest.get_position_from_hash
 local S = minecart.S
-local MP = minetest.get_modpath("minecart")
-local lib = dofile(MP.."/cart_lib3.lua")
 
-local CartsOnRail = minecart.CartsOnRail  -- from storage.lua
-local get_route = minecart.get_route  -- from storage.lua
-local NodesAtStation = {}
+local tCartsOnRail = minecart.CartsOnRail
+local Queue = {}
+local first = 0
+local last = -1
 
---
--- Helper functions
---
-local function get_pos_vel_pitch_yaw(item)
-	if item.start_time and item.start_key then  -- cart on recorded route
-		local run_time = minetest.get_gametime() - item.start_time
-		local waypoints = get_route(item.start_key).waypoints
-		local waypoint = waypoints[run_time]
-		if waypoint then
-			return S2P(waypoint[1]), S2P(waypoint[2]), 0, 0
-		end
-	end
-	if item.last_pos then
-		item.last_pos = vector.round(item.last_pos)
-		if carts:is_rail(item.last_pos, minetest.raillike_group("rail")) then
-			return item.last_pos, item.last_vel, item.last_pitch or 0, item.last_yaw or 0
-		end
-		item.last_pos.y = item.last_pos.y - 1
-		if carts:is_rail(item.last_pos, minetest.raillike_group("rail")) then
-			return item.last_pos, item.last_vel, item.last_pitch or 0, item.last_yaw or 0
-		end
-	end
-	return item.start_pos, {x=0, y=0, z=0}, 0, 0
+local function push(cycle, item)
+	last = last + 1
+	item.cycle = cycle
+	Queue[last] = item
 end
 
---
--- Monitoring of cart entities
---
-function minecart.add_to_monitoring(obj, myID, owner, userID)
-	local pos = vector.round(obj:get_pos())
-	CartsOnRail[myID] = {
-		start_key = lib.get_route_key(pos),
-		start_pos = pos,
-		owner = owner,  -- needed for query API
-		userID = userID,  -- needed for query API
-		stopped = true,
-		entity_name = obj:get_entity_name()
-	}
-end
-
--- Called after cart number formspec is closed
-function minecart.update_userID(myID, userID)
-	if CartsOnRail[myID] then
-		CartsOnRail[myID].userID = userID
+local function pop(cycle)
+	if first > last then return end
+	local item = Queue[first]
+	if item.cycle < cycle then
+		Queue[first] = nil -- to allow garbage collection
+		first = first + 1
+		return item
 	end
 end
 
--- When cart entity is removed
-function minecart.remove_from_monitoring(myID)
-	if myID then
-		CartsOnRail[myID] = nil
-		minecart.store_carts()
-	end
-end	
-
--- For node carts at stations
-function minecart.node_at_station(owner, userID, pos)
-	NodesAtStation[owner] = NodesAtStation[owner] or {}
-	NodesAtStation[owner][userID] = pos
-end
-		
-function minecart.start_cart(pos, myID)
-	local item = CartsOnRail[myID]
-	if item and item.stopped then
-		item.stopped = false
-		item.start_pos = pos
-		item.start_time = nil
-		-- cart started from a buffer?
-		local start_key = lib.get_route_key(pos)
-		if start_key then
-			item.start_time = minetest.get_gametime()
-			item.start_key = start_key
-			item.junctions = minecart.get_route(start_key).junctions
-			minecart.store_carts()
+local function is_player_nearby(pos)
+	for _, object in pairs(minetest.get_objects_inside_radius(pos, 64)) do
+		if object:is_player() then
 			return true
 		end
 	end
-	return false
 end
 
-function minecart.stop_cart(pos, myID)
-	local item = CartsOnRail[myID]
-	if item and not item.stopped then
-		item.start_time = nil
-		item.start_key = nil
-		item.start_pos = nil
-		item.junctions = nil
-		item.stopped = true
-		minecart.store_carts()
-		return true
+local function zombie_to_entity(pos, cart, checkpoint)
+	local vel = {x = 0, y = 0, z = 0}
+	local obj = minecart.add_entitycart(pos, cart.node_name, cart.entity_name, 
+				vel, cart.cargo, cart.owner, cart.userID)
+	if obj then
+		local entity = obj:get_luaentity()
+		entity.reenter = checkpoint
+		entity.junctions = cart.junctions
+		entity.is_running = true
+		entity.arrival_time = 0
+		cart.objID = entity.objID
 	end
-	return false
 end
 
-local function monitoring()
-	local to_be_added = {}
-	for key, item in pairs(CartsOnRail) do
-		local entity = minetest.luaentities[key]
-		--print("Cart:", key, item.owner, item.userID, item.stopped)
-		if entity then  -- cart entity running
-			local pos = entity.object:get_pos()
-			local vel = entity.object:get_velocity()
-			local rot = entity.object:get_rotation()
-			if pos and vel and rot then
-				if not minetest.get_node_or_nil(pos) then  -- unloaded area
-					lib.unload_cart(pos, vel, entity, item)
-					item.stopped = minecart.stopped(vel)
-				end
-				-- store last pos from cart
-				item.last_pos, item.last_vel, item.last_pitch, item.last_yaw = pos, vel, rot.x, rot.y
-			end
-		else  -- no cart running
-			local pos, vel, pitch, yaw = get_pos_vel_pitch_yaw(item)
-			if pos and vel then
-				if minetest.get_node_or_nil(pos) then  -- loaded area
-					if pitch > 0 then 
-						pos.y = pos.y + 0.5 
-					end
-					local myID = lib.load_cart(pos, vel, pitch, yaw, item)
-					if myID then
-						item.stopped = minecart.stopped(vel)
-						to_be_added[myID] = table.copy(item)
-						CartsOnRail[key] = nil  -- invalid old ID 
-					end
-				end
-				item.last_pos, item.last_vel, item.last_pitch, item.last_yaw = pos, vel, pitch, yaw
-			else
-				-- should never happen
-				minetest.log("error", "[minecart] Cart of owner "..(item.owner or "nil").." got lost")
-				CartsOnRail[key] = nil
-			end
+local function get_checkpoint(cart)
+	local cp = cart.checkpoints[cart.idx]
+	if not cp then
+		cart.idx = #cart.checkpoints
+		cp = cart.checkpoints[cart.idx]
+	end
+	local pos = H2P(cp[1])
+--	if M(pos):contains("waypoints") then
+--		print("get_checkpoint", P2S(H2P(cp[1])), P2S(H2P(cp[2])))
+--	end
+	return cp, cart.idx == #cart.checkpoints
+end
+
+-- Function returns the cart state ("running" / "stopped") and
+-- the station name or position string, or if cart is running, 
+-- the distance to the query_pos.
+local function get_cart_state_and_loc(name, userID, query_pos)
+	if tCartsOnRail[name] and tCartsOnRail[name][userID] then
+		local cart = tCartsOnRail[name][userID]
+		local pos = cart.last_pos or cart.pos
+		local loc = minecart.get_buffer_name(cart.pos) or
+				math.floor(vector.distance(pos, query_pos))
+		if cart.objID == 0 then
+			return "stopped",  minecart.get_buffer_name(cart.pos) or
+					math.floor(vector.distance(pos, query_pos)), cart.node_name
+		else
+			return "running", math.floor(vector.distance(pos, query_pos)), cart.node_name
 		end
 	end
-	-- table maintenance
-	local is_changed = false
-	for key,val in pairs(to_be_added) do
-		CartsOnRail[key] = val
-		is_changed = true
+	return "unknown", 0, "unknown"
+end	
+
+local function get_cart_info(owner, userID, query_pos)
+	local state, loc, name = get_cart_state_and_loc(owner, userID, query_pos)
+	local cart_type = minecart.tCartTypes[name] or "unknown"
+	if type(loc) == "number" then
+		return "Cart #" .. userID .. " (" .. cart_type .. ") " .. state .. " " .. loc .. " m away  "
+	else
+		return "Cart #" .. userID .. " (" .. cart_type .. ") " .. state .. " at ".. loc .. "  "
 	end
-	if is_changed then
+end
+
+local function monitoring(cycle)
+    local cart = pop(cycle)
+	
+    while cart do
+		-- All running cars
+		if cart.objID and cart.objID ~= 0 then
+			cart.idx = cart.idx + 1
+			local entity = minetest.luaentities[cart.objID]
+			if entity then  -- cart entity running
+				local pos = entity.object:get_pos()
+				if pos then
+					cart.last_pos = vector.round(pos)
+					--print("entity card " .. cart.userID .. " at " .. P2S(cart.last_pos))
+				else
+					print("entity card without pos!")
+				end
+				push(cycle, cart)
+			elseif cart.checkpoints then
+				local cp, last_cp = get_checkpoint(cart)
+				if cp then
+					cart.last_pos = H2P(cp[1])
+					--print("zombie " .. cart.userID .. " at " .. P2S(cart.last_pos))
+					if is_player_nearby(cart.last_pos) or last_cp then
+						zombie_to_entity(cart.last_pos, cart, cp)
+					end
+					push(cycle, cart)
+				else
+					print("zombie got lost")
+				end
+			else
+				local pos = cart.last_pos or cart.pos
+				pos = minecart.add_nodecart(pos, cart.node_name, 0, cart.cargo, cart.owner, cart.userID)
+				cart.objID = 0
+				cart.pos = pos
+				--print("cart to node", cycle, cart.userID, P2S(pos))
+			end
+		elseif cart and not cart.objID and tCartsOnRail[cart.owner] then
+			-- Delete carts marked as "to be deleted"
+			tCartsOnRail[cart.owner][cart.userID] = nil
+		end
+		cart = pop(cycle)
+	end
+	minetest.after(2, monitoring, cycle + 1)
+end
+
+minetest.after(5, monitoring, 2)
+
+
+function minecart.monitoring_add_cart(owner, userID, pos, node_name, entity_name)
+	--print("monitoring_add_cart", owner, userID)
+	tCartsOnRail[owner] = tCartsOnRail[owner] or {}
+	tCartsOnRail[owner][userID] = {
+		owner = owner,
+		userID = userID,
+		objID = 0,
+		pos = pos,
+		idx = 0,
+		node_name = node_name,
+		entity_name = entity_name,
+	}
+	minecart.store_carts()
+end
+	
+function minecart.start_monitoring(owner, userID, pos, objID, checkpoints, junctions, cargo)
+	--print("start_monitoring", owner, userID)
+	if tCartsOnRail[owner] and tCartsOnRail[owner][userID] then
+		tCartsOnRail[owner][userID].pos = pos
+		tCartsOnRail[owner][userID].objID = objID
+		tCartsOnRail[owner][userID].checkpoints = checkpoints
+		tCartsOnRail[owner][userID].junctions = junctions
+		tCartsOnRail[owner][userID].cargo = cargo
+		tCartsOnRail[owner][userID].idx = 0
+		push(0, tCartsOnRail[owner][userID])
 		minecart.store_carts()
 	end
-	minetest.after(1, monitoring)
 end
--- delay the start to prevent cart disappear into nirvana
-minetest.register_on_mods_loaded(function()
-	minetest.after(10, monitoring)
-end)
+
+function minecart.stop_monitoring(owner, userID, pos)
+	--print("stop_monitoring", owner, userID)
+	if tCartsOnRail[owner] and tCartsOnRail[owner][userID] then
+		tCartsOnRail[owner][userID].pos = pos
+		tCartsOnRail[owner][userID].objID = 0
+		minecart.store_carts()
+	end
+end
+
+function minecart.monitoring_remove_cart(owner, userID)
+	--print("monitoring_remove_cart", owner, userID)
+	if tCartsOnRail[owner] and tCartsOnRail[owner][userID] then
+		tCartsOnRail[owner][userID].objID = nil
+		tCartsOnRail[owner][userID] = nil
+		minecart.store_carts()
+	end
+end
+
+function minecart.monitoring_valid_cart(owner, userID, pos, node_name)
+	if tCartsOnRail[owner] and tCartsOnRail[owner][userID] then
+		return vector.equals(tCartsOnRail[owner][userID].pos, pos) and 
+				tCartsOnRail[owner][userID].node_name == node_name
+	end
+end
+
+function minecart.userID_available(owner, userID)
+	return not tCartsOnRail[owner] or tCartsOnRail[owner][userID] == nil
+end
+
+function minecart.get_cart_monitoring_data(owner, userID)
+	if tCartsOnRail[owner] then
+		return tCartsOnRail[owner][userID]
+	end
+end
 
 
 --
 -- API functions
 --
 
--- Return a list of carts with current position and speed.
-function minecart.get_cart_list()
-	local tbl = {}
-	for id, item in pairs(CartsOnRail) do
-		local pos, speed = calc_pos_and_vel(item)
-		tbl[#tbl+1] = {pos = pos, speed = speed, id = id}
-	end
-	return tbl
-end
-
-local function get_cart_pos(query_pos, cart_pos)
-	local dist = math.floor(vector.distance(cart_pos, query_pos))
-	local station = lib.get_station_name(cart_pos)
-	return station or dist
-end
-
-local function get_cart_state(name, userID)
-	for id, item in pairs(CartsOnRail) do
-		if item.owner == name and item.userID == userID then
-			return item.stopped and "stopped" or "running", item.last_pos
-		end
-	end
-	return nil, nil
-end	
+-- Needed by storage to re-construct the queue after server start
+minecart.push = push
 
 minetest.register_chatcommand("mycart", {
 	params = "<cart-num>",
-	description = "Output cart state and position, or a list of carts, if no cart number is given.",
-    func = function(name, param)
+	description = S("Output cart state and position, or a list of carts, if no cart number is given."),
+    func = function(owner, param)
 		local userID = tonumber(param)
-		local query_pos = minetest.get_player_by_name(name):get_pos()
+		local query_pos = minetest.get_player_by_name(owner):get_pos()
 		
 		if userID then
-			-- First check if it is a node cart at a station
-			local cart_pos = NodesAtStation[name] and NodesAtStation[name][userID]
-			if cart_pos then
-				local pos = get_cart_pos(query_pos, cart_pos)
-				return true, "Cart #"..userID.." stopped at "..pos.."  "
-			end
-			-- Check all running carts
-			local state, cart_pos = get_cart_state(name, userID)
-			if state and cart_pos then
-				local pos = get_cart_pos(query_pos, cart_pos)
-				if type(pos) == "string" then
-					return true, "Cart #"..userID.." stopped at "..pos.."  "
-				elseif state == "running" then
-					return true, "Cart #"..userID.." running "..pos.." m away  "
-				else
-					return true, "Cart #"..userID.." stopped "..pos.." m away  "
-				end
-			end
-			return false, "Cart #"..userID.." is unknown"
-		else
+			return true, get_cart_info(owner, userID, query_pos)
+		elseif tCartsOnRail[owner] then
 			-- Output a list with all numbers
 			local tbl = {}
-			for userID, pos in pairs(NodesAtStation[name] or {}) do
+			for userID, cart in pairs(tCartsOnRail[owner]) do
 				tbl[#tbl + 1] = userID
 			end
-			for id, item in pairs(CartsOnRail) do
-				if item.owner == name then
-					tbl[#tbl + 1] = item.userID
-				end
-			end
-			return true, "List of carts: "..table.concat(tbl, ", ").."  "
+			return true, S("List of carts") .. ": "..table.concat(tbl, ", ").."  "
 		end
     end
 })
 
 function minecart.cmnd_cart_state(name, userID)
-	-- First check if it is a node cart at a station
-	local pos = NodesAtStation[name] and NodesAtStation[name][userID]
-	if pos then
-		return "stopped"
-	end
-	return get_cart_state(name, userID)
+	local state, loc = get_cart_state_and_loc(name, userID, {x=0, y=0, z=0})
+	return state
 end
 
 function minecart.cmnd_cart_location(name, userID, query_pos)
-	-- First check if it is a node cart at a station
-	local station = NodesAtStation[name] and NodesAtStation[name][userID]
-	if station then
-		return station
+	local state, loc = get_cart_state_and_loc(name, userID, query_pos)
+	return loc
+end
+
+function minecart.get_cart_list(pos, name)
+	local userIDs = {}
+	local carts = {}
+	
+	for userID, cart in pairs(tCartsOnRail[name] or {}) do
+		userIDs[#userIDs + 1] = userID
 	end
-	local state, cart_pos = get_cart_state(name, userID)
-	if state then
-		return get_cart_pos(query_pos, cart_pos)
+	
+	table.sort(userIDs, function(a,b) return a < b end)
+	
+	for _, userID in ipairs(userIDs) do
+		carts[#carts + 1] = get_cart_info(name, userID, pos)
 	end
+	
+	return table.concat(carts, "\n")
 end
 
 minetest.register_on_mods_loaded(function()
@@ -357,4 +354,3 @@ minetest.register_on_mods_loaded(function()
 		})
 	end
 end)
-
diff --git a/minecart/nodelib.lua b/minecart/nodelib.lua
new file mode 100644
index 0000000..efb540c
--- /dev/null
+++ b/minecart/nodelib.lua
@@ -0,0 +1,139 @@
+--[[
+
+	Minecart
+	========
+
+	Copyright (C) 2019-2021 Joachim Stolberg
+
+	MIT
+	See license.txt for more information
+	
+]]--
+
+-- for lazy programmers
+local M = minetest.get_meta
+local S = minecart.S
+local P2S = function(pos) if pos then return minetest.pos_to_string(pos) end end
+local S2P = minetest.string_to_pos
+
+function minecart.get_nodecart_nearby(pos, param2, radius)	
+	local pos2 = param2 and vector.add(pos, minecart.param2_to_dir(param2)) or pos
+	local pos3 = minetest.find_node_near(pos2, radius or 0.5, minecart.lCartNodeNames, true)
+	if pos3 then
+		return pos3, minetest.get_node(pos3)
+	end
+end
+
+-- Convert node to entity and start cart
+function minecart.start_nodecart(pos, node_name, puncher, punch_dir)
+	local owner = M(pos):get_string("owner")
+	local userID = M(pos):get_int("userID")
+	-- check if valid cart
+	if not minecart.monitoring_valid_cart(owner, userID, pos, node_name) then
+		--print("invalid cart", owner, userID, P2S(pos), node_name)
+		M(pos):set_string("infotext", 
+				minetest.get_color_escape_sequence("#FFFF00") .. owner .. ": 0")
+		return
+	end
+	-- Only the owner or a noplayer can start the cart, but owner has to be online
+	if minecart.is_owner(puncher, owner) and minetest.get_player_by_name(owner) and
+			userID ~= 0 then
+		local entity_name = minecart.tNodeNames[node_name]
+		local obj = minecart.node_to_entity(pos, node_name, entity_name)
+		if obj then
+			local entity = obj:get_luaentity()
+			if puncher then
+				local yaw = puncher:get_look_horizontal()
+				entity.object:set_rotation({x = 0, y = yaw, z = 0})
+			elseif punch_dir then
+				local yaw = minetest.dir_to_yaw(punch_dir)
+				entity.object:set_rotation({x = 0, y = yaw, z = 0})
+			end
+			 minecart.start_entitycart(entity, pos)
+		end
+	end
+end
+
+function minecart.show_formspec(pos, clicker)
+	local owner = M(pos):get_string("owner")
+	if minecart.is_owner(clicker, owner) then
+		clicker:get_meta():set_string("cart_pos", P2S(pos))
+		minetest.show_formspec(owner, "minecart:userID_node",
+			"size[4,3]" ..
+			"label[0,0;" .. S("Enter cart number") .. ":]" ..
+			"field[1,1;3,1;userID;;]" ..
+			"button_exit[1,2;2,1;exit;" .. S("Save") .. "]")	
+	end
+end
+
+-- Player places the node
+function minecart.on_nodecart_place(itemstack, placer, pointed_thing)
+	local node_name = itemstack:get_name()
+	local param2 = minetest.dir_to_facedir(placer:get_look_dir())
+	local owner = placer:get_player_name()
+	
+	-- Add node
+	if minecart.is_rail(pointed_thing.under) then
+		minecart.add_nodecart(pointed_thing.under, node_name, param2, {}, owner, 0)
+		placer:get_meta():set_string("cart_pos", P2S(pointed_thing.under))
+		minecart.show_formspec(pointed_thing.under, placer)
+	elseif minecart.is_rail(pointed_thing.above) then
+		minecart.add_nodecart(pointed_thing.above, node_name, param2, {}, owner, 0)
+		placer:get_meta():set_string("cart_pos", P2S(pointed_thing.above))
+		minecart.show_formspec(pointed_thing.above, placer)
+	else
+		return itemstack
+	end
+
+	minetest.sound_play({name = "default_place_node_metal", gain = 0.5},
+		{pos = pointed_thing.above})
+
+	if not (creative and creative.is_enabled_for
+			and creative.is_enabled_for(placer:get_player_name())) then
+		itemstack:take_item()
+	end
+	
+	return itemstack
+end
+
+-- Start the node cart (or dig by shift+leftclick)
+function minecart.on_nodecart_punch(pos, node, puncher, pointed_thing)
+	--print("on_nodecart_punch")
+	local owner = M(pos):get_string("owner")
+	local userID = M(pos):get_int("userID")
+	if minecart.is_owner(puncher, owner) then
+		if puncher:get_player_control().sneak then
+			local ndef = minetest.registered_nodes[node.name]
+			if not ndef.has_cargo or not ndef.has_cargo(pos) then
+				minecart.remove_nodecart(pos)
+				minecart.add_node_to_player_inventory(pos, puncher, node.name)
+				minecart.monitoring_remove_cart(owner, userID)
+			end
+		else
+			minecart.start_nodecart(pos, node.name, puncher)
+		end
+	end
+end
+
+minetest.register_on_player_receive_fields(function(player, formname, fields)
+    if formname == "minecart:userID_node" then
+		if fields.exit or fields.key_enter == "true" then
+			local cart_pos = S2P(player:get_meta():get_string("cart_pos"))
+			local owner = M(cart_pos):get_string("owner")
+			if minecart.is_owner(player, owner) then
+				local userID = tonumber(fields.userID) or 0
+				if minecart.userID_available(owner, userID) then
+					M(cart_pos):set_int("userID", userID)
+					M(cart_pos):set_string("infotext", 
+							minetest.get_color_escape_sequence("#FFFF00") ..
+							player:get_player_name() .. ": " .. userID)
+					local node = minetest.get_node(cart_pos)
+					local entity_name = minecart.tNodeNames[node.name]
+					minecart.monitoring_add_cart(owner, userID, cart_pos, node.name, entity_name)
+				end
+			end
+		end
+		return true
+	end
+    return false
+end)
diff --git a/minecart/protection.lua b/minecart/protection.lua
index bc02bfc..6d4a542 100644
--- a/minecart/protection.lua
+++ b/minecart/protection.lua
@@ -3,7 +3,7 @@
 	Minecart
 	========
 
-	Copyright (C) 2019-2020 Joachim Stolberg
+	Copyright (C) 2019-2021 Joachim Stolberg
 
 	MIT
 	See license.txt for more information
@@ -198,3 +198,8 @@ minecart.register_protected_node("minecart:buffer")
 minecart.register_protected_node("minecart:ballast")
 minecart.register_protected_node("minecart:ballast_slope")
 minecart.register_protected_node("minecart:ballast_ramp")
+minecart.register_protected_node("minecart:speed1")
+minecart.register_protected_node("minecart:speed2")
+minecart.register_protected_node("minecart:speed4")
+minecart.register_protected_node("minecart:speed8")
+
diff --git a/minecart/pusher.lua b/minecart/pusher.lua
new file mode 100644
index 0000000..bc49ad5
--- /dev/null
+++ b/minecart/pusher.lua
@@ -0,0 +1,67 @@
+--[[
+
+	Minecart
+	========
+
+	Copyright (C) 2019-2021 Joachim Stolberg
+
+	MIT
+	See license.txt for more information
+	
+]]--
+
+-- for lazy programmers
+local M = minetest.get_meta
+local S = minecart.S
+local CYCLE_TIME = 4
+
+local function node_timer(pos)
+	local node = minetest.get_node(pos)
+	local dir = minetest.facedir_to_dir(node.param2)
+	minecart.punch_cart({x = pos.x, y = pos.y + 1, z = pos.z}, nil, 1, dir)
+	return true
+end
+
+
+local function after_dig_node(pos, oldnode, oldmetadata, digger)
+	techage.remove_node(pos, oldnode, oldmetadata)
+end
+
+minetest.register_node("minecart:cart_pusher", {
+	description = S("Cart Pusher"),
+	drawtype = "nodebox",
+	node_box = {
+		type = "fixed",
+		fixed = {
+			{-8/16,-8/16,-8/16,  8/16,  8/16, 8/16},
+			{-1/16, 8/16,-4/16,  1/16, 10/16, 4/16},
+		},
+	},
+	tiles = {
+		-- up, down, right, left, back, front
+		"default_steel_block.png^minecart_pusher_top.png",
+		"default_steel_block.png",
+		"default_steel_block.png^minecart_pusher.png",
+		"default_steel_block.png^minecart_pusher.png",
+		"default_steel_block.png^minecart_pusher.png",
+		"default_steel_block.png^minecart_pusher.png",
+	},
+	after_place_node = function(pos)
+		minetest.get_node_timer(pos):start(CYCLE_TIME)
+	end,
+
+	on_timer = node_timer,
+	paramtype2 = "facedir",
+	groups = {choppy=2, cracky=2, crumbly=2},
+	is_ground_content = true,
+	sounds = default.node_sound_metal_defaults(),
+})
+
+minetest.register_craft({
+	output = "minecart:cart_pusher",
+	recipe = {
+		{"dye:black", "default:steel_ingot", "dye:yellow"},
+		{"default:steel_ingot", "default:mese_crystal", "default:steel_ingot"},
+		{"default:steel_ingot", "default:steel_ingot", "default:steel_ingot"},
+	},
+})
diff --git a/minecart/rails.lua b/minecart/rails.lua
new file mode 100644
index 0000000..b7b5622
--- /dev/null
+++ b/minecart/rails.lua
@@ -0,0 +1,548 @@
+--[[
+
+	Minecart
+	========
+
+	Copyright (C) 2019-2021 Joachim Stolberg
+
+	MIT
+	See license.txt for more information
+	
+]]--
+
+-- for lazy programmers
+local M = minetest.get_meta
+local P2S = function(pos) if pos then return minetest.pos_to_string(pos) end end
+local P2H = minetest.hash_node_position
+
+local get_node_lvm = minecart.get_node_lvm
+
+local MAX_SPEED = 8
+local SLOWDOWN = 0.3
+local MAX_NODES = 100
+
+--waypoint = {
+--	dot = travel direction, 
+--	pos = destination pos, 
+--	speed = 10 times the section speed (as int), 
+--	limit = 10 times the speed limit (as int),
+--}
+--
+-- waypoints = {facedir = waypoint,...}
+
+local tWaypoints = {} -- {pos_hash = waypoints, ...}
+
+local tRailsPower = {
+	["carts:rail"] = 0,
+	["carts:powerrail"] = 1,
+	["minecart:rail"] = 0,
+	["minecart:powerrail"] = 1,
+	["carts:brakerail"] = 0,
+}
+-- Real rails from the mod carts
+local tRails = {
+	["carts:rail"] = true,
+	["carts:powerrail"] = true,
+	["carts:brakerail"] = true,
+	["minecart:rail"] = true,
+	["minecart:powerrail"] = true,
+}
+-- Rails plus node carts. Used to find waypoints. Added via add_raillike_nodes
+local tRailsExt = {
+	["carts:rail"] = true,
+	["carts:powerrail"] = true,
+	["carts:brakerail"] = true,
+	["minecart:rail"] = true,
+	["minecart:powerrail"] = true,
+}
+
+local tSigns = {
+	["minecart:speed1"] = 1, 
+	["minecart:speed2"] = 2, 
+	["minecart:speed4"] = 4,
+	["minecart:speed8"] = 8,
+}
+
+-- Real rails from the mod carts
+local lRails = {"carts:rail", "carts:powerrail", "carts:brakerail", "minecart:rail", "minecart:powerrail"}
+-- Rails plus node carts used to find waypoints, , added via add_raillike_nodes
+local lRailsExt = {"carts:rail", "carts:powerrail", "carts:brakerail", "minecart:rail", "minecart:powerrail"}
+
+minecart.MAX_SPEED = MAX_SPEED
+minecart.lRails = lRails
+minecart.tRails = tRails
+minecart.tRailsExt = tRailsExt
+minecart.lRailsExt = lRailsExt
+
+local Dot2Dir = {}
+local Dir2Dot = {}
+local Facedir2Dir = {[0] =
+	{x= 0, y=0,  z= 1},
+	{x= 1, y=0,  z= 0},
+	{x= 0, y=0,  z=-1},
+	{x=-1, y=0,  z= 0},
+	{x= 0, y=-1, z= 0},
+	{x= 0, y=1,  z= 0},
+}
+
+local flip = {
+	[0] = 2,
+	[1] = 3,
+	[2] = 0,
+	[3] = 1,
+	[4] = 5,
+	[5] = 4,
+}
+
+-- facedir = math.floor(dot / 4)
+-- y       = (dot % 4) - 1
+
+-- Create helper tables
+for facedir = 0,3 do
+	for y = -1,1 do
+		local dot = 1 + facedir * 4 + y
+		local dir = vector.new(Facedir2Dir[facedir])
+		dir.y = y
+		Dot2Dir[dot] = dir
+		Dir2Dot[P2H(dir)] = dot
+	end
+end
+
+local function dot2dir(dot)    return vector.new(Dot2Dir[dot]) end
+local function facedir2dir(fd) return vector.new(Facedir2Dir[fd]) end
+
+minecart.dot2dir = dot2dir
+minecart.facedir2dir = facedir2dir
+
+-------------------------------------------------------------------------------
+-- waypoint metadata
+-------------------------------------------------------------------------------
+local function has_metadata(pos)
+	return M(pos):contains("waypoints")
+end
+
+local function get_metadata(pos)
+	local hash = P2H(pos)
+	if tWaypoints[hash] then 
+		return tWaypoints[hash]
+	end
+    local s = M(pos):get_string("waypoints")
+    if s ~= "" then
+        tWaypoints[hash] = minetest.deserialize(s)
+		return tWaypoints[hash]
+    end
+end
+
+local function get_oldmetadata(meta)
+    local s = meta:get_string("waypoints")
+    if s ~= "" then
+        return minetest.deserialize(s)
+    end
+end
+
+local function set_metadata(pos, t)
+	local hash = P2H(pos)
+	tWaypoints[hash] = t
+	local s = minetest.serialize(t)
+	M(pos):set_string("waypoints", s)
+	-- visualization
+	local name = get_node_lvm(pos).name
+	if name == "carts:rail" then
+		minetest.swap_node(pos, {name = "minecart:rail"})
+	elseif name == "carts:powerrail" then
+		minetest.swap_node(pos, {name = "minecart:powerrail"})
+	end
+end
+
+local function del_metadata(pos)
+	local hash = P2H(pos)
+	tWaypoints[hash] = nil
+	local meta = M(pos)
+    if meta:contains("waypoints") then
+        meta:set_string("waypoints", "")
+		-- visualization
+		local name = get_node_lvm(pos).name
+		if name == "minecart:rail" then
+			minetest.swap_node(pos, {name = "carts:rail"})
+		elseif name == "minecart:powerrail" then
+			minetest.swap_node(pos, {name = "carts:powerrail"})
+		end
+    end
+end
+
+-------------------------------------------------------------------------------
+-- find_next_waypoint
+-------------------------------------------------------------------------------
+local function check_right(pos, facedir)
+    local fdr = (facedir + 1) % 4  -- right
+	local new_pos = vector.add(pos, facedir2dir(fdr)) 
+	
+	local name = get_node_lvm(new_pos).name
+    if tRailsExt[name] or tSigns[name] then
+		return true
+    end
+    new_pos.y = new_pos.y - 1
+    if tRailsExt[get_node_lvm(new_pos).name] then
+        return true
+    end
+end
+
+local function check_left(pos, facedir)
+    local fdl = (facedir + 3) % 4  -- left
+	local new_pos = vector.add(pos, facedir2dir(fdl)) 
+	
+	local name = get_node_lvm(new_pos).name
+    if tRailsExt[name] or tSigns[name] then
+		return true
+    end
+    new_pos.y = new_pos.y - 1
+    if tRailsExt[get_node_lvm(new_pos).name] then
+        return true
+    end
+end
+
+local function get_next_pos(pos, facedir, y)
+	local new_pos = vector.add(pos, facedir2dir(facedir)) 
+    new_pos.y = new_pos.y + y
+	local name = get_node_lvm(new_pos).name
+    return tRailsExt[name] ~= nil, new_pos, tRailsPower[name] or 0
+end
+
+local function is_ramp(pos)
+    return tRailsExt[get_node_lvm({x = pos.x, y = pos.y + 1, z = pos.z}).name]  ~= nil
+end
+
+-- Check also the next position to detect a ramp
+local function slope_detection(pos, facedir)
+	local is_rail, new_pos = get_next_pos(pos, facedir, 0)
+	if not is_rail then
+		return is_ramp(new_pos)
+	end
+end
+
+local function find_next_waypoint(pos, facedir, y)
+	local cnt = 0
+	local name = get_node_lvm(pos).name
+	local speed = tRailsPower[name] or 0
+	local is_rail, new_pos, _speed
+	
+	while cnt < MAX_NODES do
+		is_rail, new_pos, _speed = get_next_pos(pos, facedir, y)
+		speed = speed + _speed
+		if not is_rail then
+			return pos, y == 0 and is_ramp(new_pos), speed
+		end
+		if y == 0 then  -- no slope
+			if check_right(new_pos, facedir) then
+				return new_pos, slope_detection(new_pos, facedir), speed
+			elseif check_left(new_pos, facedir) then
+				return new_pos, slope_detection(new_pos, facedir), speed
+			end
+		end
+		pos = new_pos
+		cnt = cnt + 1
+	end
+	return new_pos, false, speed
+end
+
+-------------------------------------------------------------------------------
+-- find_all_next_waypoints
+-------------------------------------------------------------------------------
+local function check_front_up_down(pos, facedir)
+	local new_pos = vector.add(pos, facedir2dir(facedir)) 
+	
+    if tRailsExt[get_node_lvm(new_pos).name] then
+		return 0
+    end
+    new_pos.y = new_pos.y - 1
+    if tRailsExt[get_node_lvm(new_pos).name] then
+        return -1
+    end
+    new_pos.y = new_pos.y + 2
+    if tRailsExt[get_node_lvm(new_pos).name] then
+        return 1
+    end
+end
+
+-- Search for rails in all 4 directions
+local function find_all_rails_nearby(pos)
+	--print("find_all_rails_nearby")
+    local tbl = {}
+    for fd = 0, 3 do
+		tbl[#tbl + 1] = check_front_up_down(pos, fd, true)
+    end
+	return tbl
+end
+
+-- Recalc the value based on waypoint length and slope
+local function recalc_speed(num_pow_rails, pos1, pos2, y)
+	local num_norm_rails = vector.distance(pos1, pos2) - num_pow_rails
+	local ratio, speed
+	
+	if y ~= 0 then
+		num_norm_rails = math.floor(num_norm_rails / 1.41 + 0.5)
+	end
+	
+	if y ~= -1 then
+		if num_pow_rails == 0 then
+			return num_norm_rails * -SLOWDOWN
+		else
+			ratio = math.floor(num_norm_rails / num_pow_rails)
+			ratio = minecart.range(ratio, 0, 11)
+		end
+	else
+		ratio = 3 + num_norm_rails * SLOWDOWN + num_pow_rails
+	end
+	
+	if y == 1 then
+		speed = 7 - ratio
+	elseif y == -1 then
+		speed = 15 - ratio
+	else
+		speed = 11 - ratio
+	end
+	
+	return minecart.range(speed, 0, 8)
+end	
+
+local function find_all_next_waypoints(pos)
+    local wp = {}
+	local dots = {}
+	
+	for facedir = 0,3 do
+		local y = check_front_up_down(pos, facedir)
+		if y then
+			local new_pos, is_ramp, speed = find_next_waypoint(pos, facedir, y)
+			--print("find_all_next_waypoints", P2S(new_pos), is_ramp, speed)
+			local dot = 1 + facedir * 4 + y
+			speed = recalc_speed(speed, pos, new_pos, y) * 10
+			wp[facedir] = {dot = dot, pos = new_pos, speed = speed, is_ramp = is_ramp}
+		end
+	end
+	
+	return wp
+end
+
+-------------------------------------------------------------------------------
+-- get_waypoint
+-------------------------------------------------------------------------------
+-- If ramp, stop 0.5 nodes earlier or later
+local function ramp_correction(pos, wp, facedir)
+	if wp.is_ramp or pos.y < wp.pos.y then  -- ramp detection
+		local dir = facedir2dir(facedir)
+		local pos = wp.pos
+		
+		wp.cart_pos = {
+			x = pos.x - dir.x / 2,
+			y = pos.y,
+			z = pos.z - dir.z / 2}
+	elseif pos.y > wp.pos.y then
+		local dir = facedir2dir(facedir)
+		local pos = wp.pos
+		
+		wp.cart_pos = {
+			x = pos.x + dir.x / 2,
+			y = pos.y,
+			z = pos.z + dir.z / 2}
+	end
+	return wp
+end
+
+-- Returns waypoint and is_junction
+function minecart.get_waypoint(pos, facedir, ctrl, uturn)
+	local t = get_metadata(pos) 
+	if not t then
+		t = find_all_next_waypoints(pos)
+		set_metadata(pos, t)
+	end
+	
+	local left  = (facedir + 3) % 4
+	local right = (facedir + 1) % 4
+	local back  = (facedir + 2) % 4
+	
+	if ctrl.right and t[right] then return t[right], t[facedir] ~= nil or t[left] ~= nil end
+	if ctrl.left  and t[left]  then return t[left] , t[facedir] ~= nil or t[right] ~= nil end
+	
+	if t[facedir] then return ramp_correction(pos, t[facedir], facedir), false end
+	if t[right]   then return ramp_correction(pos, t[right], right),     false end
+	if t[left]    then return ramp_correction(pos, t[left], left),       false end
+	
+	if uturn and t[back] then return t[back], false end
+end
+
+-------------------------------------------------------------------------------
+-- delete waypoints
+-------------------------------------------------------------------------------
+local function delete_counterpart_metadata(pos, wp)
+	for facedir = 0,3 do
+		if wp[facedir] then
+			del_metadata(wp[facedir].pos)
+		end
+	end
+	del_metadata(pos)
+end
+
+local function delete_next_metadata(pos, facedir, y)
+	local cnt = 0
+	while cnt <= MAX_NODES do
+		local is_rail, new_pos = get_next_pos(pos, facedir, y)
+		if not is_rail then
+			return
+		end
+		
+		if has_metadata(new_pos) then
+			del_metadata(new_pos)
+		end
+		
+		pos = new_pos
+		cnt = cnt + 1
+	end
+	if has_metadata(pos) then
+		del_metadata(pos)
+	end
+end
+
+function minecart.delete_waypoint(pos)
+	if has_metadata(pos) then
+		local wp = get_metadata(pos)
+		delete_counterpart_metadata(pos, wp)
+		return
+	end
+	
+	for facedir = 0,3 do
+		local y = check_front_up_down(pos, facedir)
+		if y then
+			local new_pos = vector.add(pos, facedir2dir(facedir)) 
+			new_pos.y = new_pos.y + y
+			if has_metadata(new_pos) then
+				local wp = get_metadata(new_pos)
+				delete_counterpart_metadata(new_pos, wp)
+			else
+				delete_next_metadata(pos, facedir, y)	
+			end
+		end
+	end
+end	
+
+carts:register_rail("minecart:rail", {
+	description = "Rail",
+	tiles = {
+		"carts_rail_straight.png^minecart_waypoint.png", "carts_rail_curved.png^minecart_waypoint.png",
+		"carts_rail_t_junction.png^minecart_waypoint.png", "carts_rail_crossing.png^minecart_waypoint.png"
+	},
+	inventory_image = "carts_rail_straight.png",
+	wield_image = "carts_rail_straight.png",
+	groups = carts:get_rail_groups({not_in_creative_inventory = 1}),
+	drop = "carts:rail",
+}, {})
+
+carts:register_rail("minecart:powerrail", {
+	description = "Powered Rail",
+	tiles = {
+		"carts_rail_straight_pwr.png^minecart_waypoint.png", "carts_rail_curved_pwr.png^minecart_waypoint.png",
+		"carts_rail_t_junction_pwr.png^minecart_waypoint.png", "carts_rail_crossing_pwr.png^minecart_waypoint.png"
+	},
+	inventory_image = "carts_rail_straight.png",
+	wield_image = "carts_rail_straight.png",
+	groups = carts:get_rail_groups({not_in_creative_inventory = 1}),
+	drop = "carts:powerrail",
+}, {})
+	
+for name,_ in pairs(tRails) do
+	minetest.override_item(name, {
+		after_destruct = minecart.delete_waypoint,
+		after_place_node = minecart.delete_waypoint,
+	})
+end	
+
+-------------------------------------------------------------------------------
+-- API functions
+-------------------------------------------------------------------------------
+-- Return new cart pos and if an extra move cycle is needed
+function minecart.get_current_cart_pos_correction(curr_pos, curr_fd, curr_y, new_dot)
+	if new_dot then
+		local new_y = (new_dot % 4) - 1
+		local new_fd = math.floor(new_dot / 4)
+		
+		if curr_y == -1 or new_y == -1 then
+			local new_fd = math.floor(new_dot / 4)
+			local dir = facedir2dir(new_fd)
+			return {
+				x = curr_pos.x + dir.x / 2,
+				y = curr_pos.y,
+				z = curr_pos.z + dir.z / 2}, new_y == -1
+		elseif curr_y == 1 and curr_fd ~= new_fd then
+			local dir = facedir2dir(new_fd)
+			return {
+				x = curr_pos.x + dir.x / 2,
+				y = curr_pos.y,
+				z = curr_pos.z + dir.z / 2}, true
+		elseif curr_y == 1 or new_y == 1 then
+			local dir = facedir2dir(curr_fd)
+			return {
+				x = curr_pos.x - dir.x / 2,
+				y = curr_pos.y,
+				z = curr_pos.z - dir.z / 2}, false
+		end
+	end
+	return curr_pos, false
+end
+
+-- Called by carts, returns the speed value or nil
+function minecart.get_speedlimit(pos, facedir)
+    local fd = (facedir + 1) % 4  -- right
+	local new_pos = vector.add(pos, facedir2dir(fd)) 
+	local node = get_node_lvm(new_pos)
+	if tSigns[node.name] and node.param2 == facedir then
+		return tSigns[node.name]
+    end
+	
+    fd = (facedir + 3) % 4  -- left
+	new_pos = vector.add(pos, facedir2dir(fd)) 
+	node = get_node_lvm(new_pos)
+	if tSigns[node.name] and node.param2 == facedir then
+		return tSigns[node.name]
+    end
+end
+
+-- Called by carts, to delete temporarily created waypoints
+function minecart.delete_cart_waypoint(pos)
+	del_metadata(pos)
+end
+	
+-- Called by signs, to delete the rail waypoints nearby
+function minecart.delete_signs_waypoint(pos) 
+	local node = minetest.get_node(pos)
+    local facedir = (node.param2 + 1) % 4  -- right
+	local new_pos = vector.add(pos, facedir2dir(facedir)) 
+	if tRailsExt[get_node_lvm(new_pos).name] then
+		minecart.delete_waypoint(new_pos)
+	end
+	
+    facedir = (node.param2 + 3) % 4  -- left
+	new_pos = vector.add(pos, facedir2dir(facedir)) 
+	if tRailsExt[get_node_lvm(new_pos).name] then
+		minecart.delete_waypoint(new_pos)
+	end
+end
+
+function minecart.is_rail(pos)
+	return tRails[get_node_lvm(pos).name] ~= nil
+end
+
+-- To register node cart names
+function minecart.add_raillike_nodes(name)
+	tRailsExt[name] = true
+	lRailsExt[#lRailsExt + 1] = name
+end
+
+--minetest.register_lbm({
+--	label = "Delete waypoints",
+--	name = "minecart:del_meta",
+--	nodenames = {"carts:brakerail"},
+--	run_at_every_load = true,
+--	action = function(pos, node)
+--		del_metadata(pos)
+--	end,
+--})
+
diff --git a/minecart/recording.lua b/minecart/recording.lua
index a5d5996..d516a47 100644
--- a/minecart/recording.lua
+++ b/minecart/recording.lua
@@ -3,7 +3,7 @@
 	Minecart
 	========
 
-	Copyright (C) 2019-2020 Joachim Stolberg
+	Copyright (C) 2019-2021 Joachim Stolberg
 
 	MIT
 	See license.txt for more information
@@ -14,76 +14,172 @@
 local M = minetest.get_meta
 local P2S = function(pos) if pos then return minetest.pos_to_string(pos) end end
 local S2P = minetest.string_to_pos
+local P2H = minetest.hash_node_position
+local H2P = minetest.get_position_from_hash
 local S = minecart.S
-local MP = minetest.get_modpath("minecart")
-local lib = dofile(MP.."/cart_lib3.lua")
 
-local CartsOnRail = minecart.CartsOnRail  -- from storage.lua
-local get_route = minecart.get_route  -- from storage.lua
+local function dashboard_destroy(self)
+	if self.driver and self.hud_id then
+		local player = minetest.get_player_by_name(self.driver)
+		if player then
+			player:hud_remove(self.hud_id)
+			self.hud_id = nil
+		end
+	end
+end
+
+local function dashboard_create(self)
+	if self.driver then	
+		local player = minetest.get_player_by_name(self.driver)
+		if player then
+			dashboard_destroy(self)
+			self.hud_id = player:hud_add({
+				name = "minecart",
+				hud_elem_type = "text",
+				position = {x = 0.4, y = 0.25},
+				scale = {x=100, y=100},
+				text = "Recording:",
+				number = 0xFFFFFF,
+				size = {x = 1},
+			})
+		end
+	end
+end
+
+local function dashboard_update(self)
+	if self.driver and self.hud_id then
+		local player = minetest.get_player_by_name(self.driver)
+		if player then
+			local time = self.runtime or 0
+			local dir = (self.ctrl and self.ctrl.left and S("left")) or 
+					(self.ctrl and self.ctrl.right and S("right")) or S("straight")
+			local speed = math.floor((self.curr_speed or 0) + 0.5)
+			local s = string.format(S("Recording") .. 
+					" | " .. S("speed") .. 
+					": %.1f | " .. S("next junction") .. 
+					": %-8s | " .. S("Travel time") .. ": %.1f s", 
+					speed, dir, time)
+			player:hud_change(self.hud_id, "text", s)
+		end
+	end
+end
+
+local function check_waypoint(self, pos)
+	-- If next waypoint already reached but not handled
+	-- determine next waypoint
+	if vector.equals(pos, self.waypoint.pos) then
+		local rot = self.object:get_rotation()
+		local dir = minetest.yaw_to_dir(rot.y)
+		dir.y = math.floor((rot.x / (math.pi/4)) + 0.5)
+		local facedir = minetest.dir_to_facedir(dir)
+		local waypoint = minecart.get_waypoint(pos, facedir, self.ctrl or {}, false)
+		if waypoint then
+			return waypoint.pos
+		end
+	end
+	return self.waypoint.pos
+end
 
 --
 -- Route recording
 --
 function minecart.start_recording(self, pos)	
-	self.start_key = lib.get_route_key(pos, self.driver)
-	if self.start_key then
-		self.waypoints = {}
-		self.junctions = {}
-		self.recording = true
-		self.next_time = minetest.get_us_time() + 1000000
-		minetest.chat_send_player(self.driver, S("[minecart] Start route recording!"))
-	end
-end
-
-function minecart.store_next_waypoint(self, pos, vel)	
-	if self.start_key and self.recording and self.driver and 
-			self.next_time < minetest.get_us_time() then
-		self.next_time = minetest.get_us_time() + 1000000
-		self.waypoints[#self.waypoints+1] = {P2S(vector.round(pos)), P2S(vector.round(vel))}
-	elseif self.recording and not self.driver then
-		self.recording = false
-		self.waypoints = nil
-		self.junctions = nil
-	end
-end
-
--- destination reached(speed == 0)
-function minecart.stop_recording(self, pos, vel, puncher)	
-	local dest_pos = lib.get_route_key(pos, self.driver)
-	if dest_pos then
-		if self.start_key and self.start_key ~= dest_pos then
-			local route = {
-				waypoints = self.waypoints,
-				dest_pos = dest_pos,
-				junctions = self.junctions,
-			}
-			minecart.store_route(self.start_key, route)
-			minetest.chat_send_player(self.driver, S("[minecart] Route stored!"))
-		else
-			minetest.chat_send_player(self.driver, S("[minecart] Recording canceled!"))
+	--print("start_recording")
+	if self.driver then
+		self.start_pos = minecart.get_buffer_pos(pos, self.driver)
+		if self.start_pos then
+			self.checkpoints = {} -- {cart_pos, next_waypoint_pos, speed, dot}
+			self.junctions = {}
+			self.is_recording = true
+			self.rec_time = self.timebase
+			self.hud_time = self.timebase
+			self.runtime = 0
+			self.num_sections = 0
+			self.sum_speed = 0
+			self.ctrl = {}
+			dashboard_create(self)
+			dashboard_update(self, 0)
 		end
-	else
-		minetest.chat_send_player(self.driver, S("[minecart] Recording canceled!"))
 	end
-	self.recording = false
+end
+
+function minecart.stop_recording(self, pos)	
+	--print("stop_recording")
+	if self.driver and self.is_recording then
+		local dest_pos = minecart.get_buffer_pos(pos, self.driver)
+		local player = minetest.get_player_by_name(self.driver)
+		if dest_pos and player and #self.checkpoints > 3 then
+			-- Remove last checkpoint, because it is potentially too close to the dest_pos
+			table.remove(self.checkpoints) 
+			if self.start_pos then
+				local route = {
+					dest_pos = dest_pos,
+					checkpoints = self.checkpoints,
+					junctions = self.junctions,
+				}
+				minecart.store_route(self.start_pos, route)
+				minetest.chat_send_player(self.driver, S("[minecart] Route stored!"))
+				local speed = self.sum_speed / #self.checkpoints
+				local length = speed * self.runtime
+				local fmt = S("[minecart] Speed = %u m/s, Time = %u s, Route length = %u m")
+				minetest.chat_send_player(self.driver, string.format(fmt, speed, self.runtime, length))
+			end
+		end
+		dashboard_destroy(self)
+	end
+	self.is_recording = false
+	self.checkpoints = nil
 	self.waypoints = nil
 	self.junctions = nil
 end
 
-function minecart.set_junction(self, pos, dir, switch_keys)
-	if self.junctions then
-		self.junctions[P2S(vector.round(pos))] = {dir, switch_keys}
-	end
+function minecart.recording_waypoints(self)	
+	local pos = vector.round(self.object:get_pos())
+	-- hier müsste überprüfung dest_pos rein
+	self.sum_speed = self.sum_speed + self.curr_speed 
+	local wp_pos = check_waypoint(self, pos)
+	self.checkpoints[#self.checkpoints+1] = {
+		-- cart_pos, next_waypoint_pos, speed, dot
+		P2H(pos), 
+		P2H(wp_pos), 
+		math.floor(self.curr_speed + 0.5),
+		self.waypoint.dot
+	}
 end
 
-function minecart.get_junction(self, pos, dir)
-	local junctions = CartsOnRail[self.myID] and CartsOnRail[self.myID].junctions
-	if junctions then
-		local data = junctions[P2S(vector.round(pos))]
-		if data then
-			return data[1], data[2]
+function minecart.recording_junctions(self)
+	local player = minetest.get_player_by_name(self.driver)
+	if player then
+		local ctrl = player:get_player_control()
+		if ctrl.left then
+			self.ctrl = {left = true}
+		elseif ctrl.right then
+			self.ctrl = {right = true}
+		elseif ctrl.up or ctrl.down then
+			self.ctrl = nil
 		end
 	end
-	return dir
+	if self.hud_time <= self.timebase then
+		dashboard_update(self)
+		self.hud_time = self.timebase + 0.5
+		self.runtime = self.runtime + 0.5
+	end
 end
 
+function minecart.set_junctions(self, wayp_pos)
+	if self.ctrl then
+		self.junctions[P2H(wayp_pos)] = self.ctrl
+	end
+end
+
+function minecart.player_ctrl(self)
+	local player = minetest.get_player_by_name(self.driver)
+	if player then
+		local ctrl = player:get_player_control()
+		if ctrl.left then
+			self.ctrl = {left = true}
+		elseif ctrl.right then
+			self.ctrl = {right = true}
+		end
+	end
+end
diff --git a/minecart/signs.lua b/minecart/signs.lua
new file mode 100644
index 0000000..266e161
--- /dev/null
+++ b/minecart/signs.lua
@@ -0,0 +1,107 @@
+--[[
+
+	Minecart
+	========
+
+	Copyright (C) 2019-2021 Joachim Stolberg 4
+
+	MIT
+	See license.txt for more information
+
+]]--
+
+local S = minecart.S
+
+
+local function register_sign(def)
+	minetest.register_node("minecart:"..def.name, {
+		description = def.description,
+		inventory_image = def.image,
+		drawtype = "nodebox",
+		node_box = {
+			type = "fixed",
+			fixed = {
+				{ -1/16, -8/16, -1/16,   1/16,-2/16, 1/16},
+				{ -5/16, -2/16, -1/32,   5/16, 8/16, 1/32},
+			},
+		},
+		paramtype2 = "facedir",
+		tiles = {
+			"default_steel_block.png",
+			"default_steel_block.png",
+			"default_steel_block.png",
+			"default_steel_block.png",
+			"default_steel_block.png",
+			"default_steel_block.png^"..def.image,
+		},
+		
+		after_place_node = minecart.delete_signs_waypoint,
+		preserve_metadata = minecart.delete_signs_waypoint,
+		
+		on_rotate = screwdriver.disallow,
+		paramtype = "light",
+		use_texture_alpha = minecart.CLIP,
+		sunlight_propagates = true,
+		is_ground_content = false,
+		groups = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 2, minecart_sign = 1},
+		sounds = default.node_sound_wood_defaults(),
+	})
+end
+
+register_sign({
+	name = "speed1",
+	description = S('Speed "1"'),
+	image = "minecart_sign1.png",
+})
+
+register_sign({
+	name = "speed2",
+	description = S('Speed "2"'),
+	image = "minecart_sign2.png",
+})
+
+register_sign({
+	name = "speed4",
+	description = S('Speed "4"'),
+	image = "minecart_sign4.png",
+})
+
+register_sign({
+	name = "speed8",
+	description = S('No speed limit'),
+	image = "minecart_sign8.png",
+})
+
+minetest.register_craft({
+	output = "minecart:speed8 8",
+	recipe = {
+		{"default:tin_ingot", "dye:red", "default:tin_ingot"},
+		{"", "default:steel_ingot", ""},
+		{"", "default:steel_ingot", ""}
+	}
+})
+
+minetest.register_craft({
+	type = "shapeless",
+	output = "minecart:speed4",
+	recipe = {"minecart:speed8"}
+})
+
+minetest.register_craft({
+	type = "shapeless",
+	output = "minecart:speed2",
+	recipe = {"minecart:speed4"}
+})
+
+minetest.register_craft({
+	type = "shapeless",
+	output = "minecart:speed1",
+	recipe = {"minecart:speed2"}
+})
+
+minetest.register_craft({
+	type = "shapeless",
+	output = "minecart:speed8",
+	recipe = {"minecart:speed1"}
+})
+
diff --git a/minecart/storage.lua b/minecart/storage.lua
index 34d3f02..04e471f 100644
--- a/minecart/storage.lua
+++ b/minecart/storage.lua
@@ -3,7 +3,7 @@
 	Minecart
 	========
 
-	Copyright (C) 2019-2020 Joachim Stolberg
+	Copyright (C) 2019-2021 Joachim Stolberg
 
 	MIT
 	See license.txt for more information
@@ -14,24 +14,75 @@
 local M = minetest.get_meta
 local P2S = function(pos) if pos then return minetest.pos_to_string(pos) end end
 local S2P = minetest.string_to_pos
+local P2H = minetest.hash_node_position
+local H2P = minetest.get_position_from_hash
 local S = minecart.S
 
 local storage = minetest.get_mod_storage()
 
+local function place_carts(t)
+	local Carts = {
+		["minecart:cart"] = "minecart:cart",
+		["techage:tank_cart_entity"] = "techage:tank_cart",
+		["techage:chest_cart_entity"] = "techage:chest_cart",
+	}
+	for id, item in pairs(t) do
+		local pos = vector.round((item.start_pos or item.last_pos))
+		local name = Carts[item.entity_name] or "minecart:cart"
+		--print(P2S(pos), name, item.owner, item.userID)
+		if minetest.registered_nodes[name] then
+			minecart.add_nodecart(pos, name, 0, {}, item.owner or "", item.userID or 0)
+		end
+	end
+end
+
 -------------------------------------------------------------------------------
 -- Store data of running carts
 -------------------------------------------------------------------------------
 minecart.CartsOnRail = {}
 
 minetest.register_on_mods_loaded(function()
-	for key,val in pairs(minetest.deserialize(storage:get_string("CartsOnRail")) or {}) do
-		-- use invalid keys to force the cart spawning
-		minecart.CartsOnRail[-key] = val
+	local version = storage:get_int("version")
+	if version < 2 then
+		local t = minetest.deserialize(storage:get_string("CartsOnRail")) or {}
+		minetest.after(5, place_carts, t)
+		storage:set_int("version", 2)
+	else
+		local t = minetest.deserialize(storage:get_string("CartsOnRail")) or {}
+		for owner, carts in pairs(t) do
+			minecart.CartsOnRail[owner] = {}
+			for userID, cart in pairs(carts) do
+     				print("reload cart", owner, userID, cart.objID)
+				minecart.CartsOnRail[owner][userID] = cart
+				-- mark all entity carts as zombified
+				if cart.objID and cart.objID ~= 0 then
+					cart.objID = -1
+					minecart.push(1, cart)
+				end
+			end
+		end
+	end
+end)
+
+minetest.after(10, function()
+	for owner, carts in pairs(minecart.CartsOnRail) do
+		for userID, cart in pairs(carts) do
+			-- Remove node carts that are not available anymore
+			if cart.objID == 0 or not cart.objID then
+				local node = minecart.get_node_lvm(cart.pos)
+				if not minecart.tNodeNames[node.name] then
+					-- Mark as "to be deleted"
+					print("Node cart deleted", owner, userID)
+					minecart.CartsOnRail[owner][userID] = nil
+				end
+			end
+		end
 	end
 end)
 
 minetest.register_on_shutdown(function()
 	storage:set_string("CartsOnRail", minetest.serialize(minecart.CartsOnRail))
+	print("minecart shutdown finished!!!")
 end)
 
 function minecart.store_carts()
@@ -39,69 +90,31 @@ function minecart.store_carts()
 end
 
 -------------------------------------------------------------------------------
--- Store routes
+-- Store routes (in buffers)
 -------------------------------------------------------------------------------
--- All positions as "pos_to_string" string
---Routes = {
---	  start_pos = {
---        waypoints = {{spos, svel}, {spos, svel}, ...}, 
---        dest_pos = spos,
---        junctions = {
---            {spos = num}, 
---            {spos = num},
---        },
---    },
---	  start_pos = {...},
---}
-local Routes = {}
-local NEW_ROUTE = {waypoints = {}, junctions = {}}
-
-function minecart.store_route(key, route)
-	if key and route then
-		Routes[key] = route
-		local meta = M(S2P(key))
-		if meta then
-			meta:set_string("route", minetest.serialize(route))
-			return true
-		end
+function minecart.store_route(pos, route)
+	if pos and route then
+		M(pos):set_string("route", minetest.serialize(route))
+		return true
 	end
 	return false
 end
 
-function minecart.get_route(key)
-	if not Routes[key] then
-		local s = M(S2P(key)):get_string("route")
+function minecart.get_route(pos)
+	if pos then
+		local s = M(pos):get_string("route")
 		if s ~= "" then
-			Routes[key] = minetest.deserialize(s) or NEW_ROUTE
-		else
-			Routes[key] = NEW_ROUTE
-		end
-	end
-	return Routes[key]
-end
-
-function minecart.del_route(key)
-	Routes[key] = nil  -- remove from memory
-	M(S2P(key)):set_string("route", "") -- and as metadata
-end
-
--------------------------------------------------------------------------------
--- Convert data to v2
--------------------------------------------------------------------------------
-minetest.after(5, function()
-	local tbl = storage:to_table()
-	for key,s in pairs(tbl.fields) do
-		if key ~= "CartsOnRail" then
 			local route = minetest.deserialize(s)
-			if route.waypoints and route.junctions then
-				if minecart.store_route(key, route) then
-					storage:set_string(key, "")
-				end
-			else
-				storage:set_string(key, "")
+			if route.waypoints then
+				M(pos):set_string("route", "")
+				M(pos):set_int("time", 0)
+				return
 			end
+			return minetest.deserialize(s)
 		end
 	end
-end)
-
+end
 
+function minecart.del_route(pos)
+	M(pos):set_string("route", "")
+end
diff --git a/minecart/terminal.lua b/minecart/terminal.lua
new file mode 100644
index 0000000..60420de
--- /dev/null
+++ b/minecart/terminal.lua
@@ -0,0 +1,90 @@
+--[[
+
+	Minecart
+	========
+
+	Copyright (C) 2019-2021 Joachim Stolberg
+
+	MIT
+	See license.txt for more information
+	
+]]--
+
+-- for lazy programmers
+local M = minetest.get_meta
+local S = minecart.S
+
+local function is_player_nearby(pos)
+	for _, object in pairs(minetest.get_objects_inside_radius(pos, 6)) do
+		if object:is_player() then
+			return true
+		end
+	end
+end
+
+local function formspec(pos, text)
+	text = minetest.formspec_escape(text)
+	text = text:gsub("\n", ",")
+	
+	return "size[11,9]"..
+		default.gui_bg..
+		default.gui_bg_img..
+		default.gui_slots..
+		"box[0,-0.1;10.8,0.5;#c6e8ff]"..
+		"label[4.5,-0.1;"..minetest.colorize( "#000000", S("Cart List")).."]"..
+		"style_type[table,field;font=mono]"..
+		"table[0,0.5;10.8,8.6;output;"..text..";200]"
+end
+
+minetest.register_node("minecart:terminal", {
+	description = S("Cart Terminal"),
+	inventory_image = "minecart_terminal_front.png",
+	tiles = {
+		"minecart_terminal_top.png",
+		"minecart_terminal_top.png",
+		"minecart_terminal_side.png",
+		"minecart_terminal_side.png",
+		"minecart_terminal_back.png",
+		"minecart_terminal_front.png",
+		},
+	drawtype = "nodebox",
+	node_box = {
+		type = "fixed",
+		fixed = {
+			{ -8/16, -8/16, 0/16,  8/16, 8/16, 8/16},
+		},
+	},
+	
+	after_place_node = function(pos, placer)
+		local meta = M(pos)
+		meta:set_string("owner", placer:get_player_name())
+		meta:set_string("formspec", formspec(pos, ""))
+		minetest.get_node_timer(pos):start(2)
+	end,
+	
+	on_timer = function(pos, elapsed)
+		if is_player_nearby(pos) then
+			local text = minecart.get_cart_list(pos, M(pos):get_string("owner"))
+			M(pos):set_string("formspec", formspec(pos, text))
+		end
+		return true
+	end,
+	
+	paramtype2 = "facedir",
+	paramtype = "light",
+	use_texture_alpha = minecart.CLIP,
+	on_rotate = screwdriver.disallow,
+	sunlight_propagates = true,
+	is_ground_content = false,
+	groups = {cracky = 2, level = 2},
+	sounds = default.node_sound_metal_defaults(),
+})
+
+minetest.register_craft({
+	output = "minecart:terminal",
+	recipe = {
+		{"", "default:obsidian_glass", "default:steel_ingot"},
+		{"", "default:obsidian_glass", "default:copper_ingot"},
+		{"default:steel_ingot", "default:steel_ingot", "default:steel_ingot"},
+	},
+})
diff --git a/minecart/textures/minecart_appl_cart_top.png b/minecart/textures/minecart_appl_cart_top.png
new file mode 100644
index 0000000..9a11a0b
Binary files /dev/null and b/minecart/textures/minecart_appl_cart_top.png differ
diff --git a/minecart/textures/minecart_appl_hopper.png b/minecart/textures/minecart_appl_hopper.png
index 7c703e2..7eaf8a2 100644
Binary files a/minecart/textures/minecart_appl_hopper.png and b/minecart/textures/minecart_appl_hopper.png differ
diff --git a/minecart/textures/minecart_appl_hopper_right.png b/minecart/textures/minecart_appl_hopper_right.png
index 5e8c302..48e1037 100644
Binary files a/minecart/textures/minecart_appl_hopper_right.png and b/minecart/textures/minecart_appl_hopper_right.png differ
diff --git a/minecart/textures/minecart_appl_hopper_top.png b/minecart/textures/minecart_appl_hopper_top.png
index 97ce3c2..4c2fb4d 100644
Binary files a/minecart/textures/minecart_appl_hopper_top.png and b/minecart/textures/minecart_appl_hopper_top.png differ
diff --git a/minecart/textures/minecart_ballast.png b/minecart/textures/minecart_ballast.png
index 9bca948..0c99602 100644
Binary files a/minecart/textures/minecart_ballast.png and b/minecart/textures/minecart_ballast.png differ
diff --git a/minecart/textures/minecart_buffer.png b/minecart/textures/minecart_buffer.png
index 1bb752e..19ff9a0 100644
Binary files a/minecart/textures/minecart_buffer.png and b/minecart/textures/minecart_buffer.png differ
diff --git a/minecart/textures/minecart_cart.png b/minecart/textures/minecart_cart.png
index 621b8d2..2d48b12 100644
Binary files a/minecart/textures/minecart_cart.png and b/minecart/textures/minecart_cart.png differ
diff --git a/minecart/textures/minecart_doc_image.png b/minecart/textures/minecart_doc_image.png
index 209b412..07e22db 100644
Binary files a/minecart/textures/minecart_doc_image.png and b/minecart/textures/minecart_doc_image.png differ
diff --git a/minecart/textures/minecart_logo.png b/minecart/textures/minecart_logo.png
index f7e2e6c..17ff7b2 100644
Binary files a/minecart/textures/minecart_logo.png and b/minecart/textures/minecart_logo.png differ
diff --git a/minecart/textures/minecart_marker_cube.png b/minecart/textures/minecart_marker_cube.png
new file mode 100644
index 0000000..1321451
Binary files /dev/null and b/minecart/textures/minecart_marker_cube.png differ
diff --git a/minecart/textures/minecart_protect.png b/minecart/textures/minecart_protect.png
index def72c7..6ca8308 100644
Binary files a/minecart/textures/minecart_protect.png and b/minecart/textures/minecart_protect.png differ
diff --git a/minecart/textures/minecart_pusher.png b/minecart/textures/minecart_pusher.png
new file mode 100644
index 0000000..12704ed
Binary files /dev/null and b/minecart/textures/minecart_pusher.png differ
diff --git a/minecart/textures/minecart_pusher_top.png b/minecart/textures/minecart_pusher_top.png
new file mode 100644
index 0000000..f0c4179
Binary files /dev/null and b/minecart/textures/minecart_pusher_top.png differ
diff --git a/minecart/textures/minecart_sign1.png b/minecart/textures/minecart_sign1.png
new file mode 100644
index 0000000..240b44e
Binary files /dev/null and b/minecart/textures/minecart_sign1.png differ
diff --git a/minecart/textures/minecart_sign2.png b/minecart/textures/minecart_sign2.png
new file mode 100644
index 0000000..adf879d
Binary files /dev/null and b/minecart/textures/minecart_sign2.png differ
diff --git a/minecart/textures/minecart_sign4.png b/minecart/textures/minecart_sign4.png
new file mode 100644
index 0000000..f981cc7
Binary files /dev/null and b/minecart/textures/minecart_sign4.png differ
diff --git a/minecart/textures/minecart_sign8.png b/minecart/textures/minecart_sign8.png
new file mode 100644
index 0000000..7190be3
Binary files /dev/null and b/minecart/textures/minecart_sign8.png differ
diff --git a/minecart/textures/minecart_terminal_back.png b/minecart/textures/minecart_terminal_back.png
new file mode 100644
index 0000000..daeff71
Binary files /dev/null and b/minecart/textures/minecart_terminal_back.png differ
diff --git a/minecart/textures/minecart_terminal_front.png b/minecart/textures/minecart_terminal_front.png
new file mode 100644
index 0000000..c6bf658
Binary files /dev/null and b/minecart/textures/minecart_terminal_front.png differ
diff --git a/minecart/textures/minecart_terminal_side.png b/minecart/textures/minecart_terminal_side.png
new file mode 100644
index 0000000..6102404
Binary files /dev/null and b/minecart/textures/minecart_terminal_side.png differ
diff --git a/minecart/textures/minecart_terminal_top.png b/minecart/textures/minecart_terminal_top.png
new file mode 100644
index 0000000..5604b88
Binary files /dev/null and b/minecart/textures/minecart_terminal_top.png differ
diff --git a/minecart/textures/minecart_tool.png b/minecart/textures/minecart_tool.png
new file mode 100644
index 0000000..4fddeb2
Binary files /dev/null and b/minecart/textures/minecart_tool.png differ
diff --git a/minecart/textures/minecart_waypoint.png b/minecart/textures/minecart_waypoint.png
new file mode 100644
index 0000000..d607a53
Binary files /dev/null and b/minecart/textures/minecart_waypoint.png differ
diff --git a/minecart/textures/shrink.py b/minecart/textures/shrink.py
deleted file mode 100644
index 96863b9..0000000
--- a/minecart/textures/shrink.py
+++ /dev/null
@@ -1,16 +0,0 @@
-import os, fnmatch
-
-
-print ">>> Convert"
-for filename in os.listdir("./"):
-    if fnmatch.fnmatch(filename, "*.png"):
-        print(filename)
-        os.system("pngquant --skip-if-larger --quality=8-32 --output ./%s.new  ./%s" % (filename, filename))
-
-print "\n>>> Copy"
-for filename in os.listdir("./"):
-    if fnmatch.fnmatch(filename, "*.new"):
-        print(filename)
-        os.remove("./" + filename[:-4])
-        os.rename("./" + filename, "./" + filename[:-4])
-
diff --git a/minecart/textures/shrink.sh b/minecart/textures/shrink.sh
new file mode 100755
index 0000000..36036c5
--- /dev/null
+++ b/minecart/textures/shrink.sh
@@ -0,0 +1,2 @@
+#!/bin/bash
+pngquant --skip-if-larger --quality=80 --strip *.png --ext .png --force
\ No newline at end of file
diff --git a/minecart/tool.lua b/minecart/tool.lua
new file mode 100644
index 0000000..c5b192c
--- /dev/null
+++ b/minecart/tool.lua
@@ -0,0 +1,101 @@
+--[[
+
+	Minecart
+	========
+
+	Copyright (C) 2019-2021 Joachim Stolberg
+
+	MIT
+	See license.txt for more information
+	
+]]--
+
+-- for lazy programmers
+local M = minetest.get_meta
+local S = minecart.S
+local P2S = function(pos) if pos then return minetest.pos_to_string(pos) end end
+local S2P = minetest.string_to_pos
+local P2H = minetest.hash_node_position
+
+local sDir = {[0] =	"north", "east", "south", "west"}
+
+local function DOTS(dots) 
+	if dots then
+		return table.concat(dots, ", ")
+	else
+		return ""
+	end
+end
+
+local old_pos
+
+local function test_get_route(pos, node, player)
+	local yaw = player:get_look_horizontal()
+	local dir = minetest.yaw_to_dir(yaw)
+	local facedir = minetest.dir_to_facedir(dir)
+	local route = minecart.get_waypoint(pos, facedir, {})
+	if route then
+--		print(dump(route))
+		minecart.set_marker(route.pos, "pos", 0.3, 10)
+		if route.cart_pos then
+			minecart.set_marker(route.cart_pos, "cart", 0.3, 10)
+		end
+		
+		-- determine some kind of current y
+		old_pos = old_pos or pos
+		local curr_y = pos.y > old_pos.y and 1 or pos.y < old_pos.y and -1 or 0
+		
+		local cart_pos, extra_cycle = minecart.get_current_cart_pos_correction(pos, facedir, curr_y, route.dot)
+		minecart.set_marker(cart_pos, "curr", 0.3, 10)
+		old_pos = pos
+		print(string.format("Route: dist = %u, dot = %u, speed = %d, extra cycle = %s", 
+				vector.distance(pos, route.pos), route.dot, route.speed or 0, extra_cycle))
+	end
+end
+
+local function test_get_connections(pos, node, player, ctrl)
+	local wp = minecart.get_waypoints(pos)
+	for i = 0,3 do
+		if wp[i] then
+			local dir = minecart.Dot2Dir[ wp[i].dot]
+			print(sDir[i], vector.distance(pos, wp[i].pos), dir.y)
+		end
+	end
+	print(dump(M(pos):to_table()))
+end
+
+local function click_left(itemstack, placer, pointed_thing)
+	if pointed_thing.type == "node" then
+		local pos = pointed_thing.under
+		local node = minetest.get_node(pos)
+		if node.name == "carts:rail" or node.name == "carts:powerrail" then
+			test_get_route(pos, node, placer)
+		end
+	end
+end
+
+local function click_right(itemstack, placer, pointed_thing)
+	if pointed_thing.type == "node" then
+		local pos = pointed_thing.under
+		local node = minetest.get_node(pos)
+		if node.name == "carts:rail" or node.name == "carts:powerrail" then
+			test_get_connections(pos, node, placer)
+		elseif node.name == "minecart:buffer" then
+			local route = minecart.get_route(P2S(pos))
+			print(dump(route))
+		end
+	end
+end
+
+minetest.register_node("minecart:tool", {
+	description = "Tool",
+	inventory_image = "minecart_tool.png",
+	wield_image = "minecart_tool.png",
+	liquids_pointable = true,
+	use_texture_alpha = true,
+	groups = {cracky=1, book=1},
+	on_use = click_left,
+	on_place = click_right,
+	node_placement_prediction = "",
+	stack_max = 1,
+})
diff --git a/signs_bot/README.md b/signs_bot/README.md
index b7831c5..fec834c 100644
--- a/signs_bot/README.md
+++ b/signs_bot/README.md
@@ -96,6 +96,7 @@ For all Inventory commands applies: If the inventory stack specified by <slot> i
     pattern                   - save the blocks behind the shield (up to 5x3x3) as template
     copy <size>               - make a copy of "pattern". Size is e.g. 3x3 (see ingame help)
     punch_cart                - Punch a rail cart to start it
+    print <text>              - Output chat message for debug purposes
 
 #### Flow control commands
 
@@ -169,4 +170,7 @@ optional: farming redo, node_io, doc, techage, minecart
 - 2020-06-21  v1.03  * Interpreter bugfixes, node and crop sensors changed
 - 2020-10-01  v1.04  * Many improvements and bugfixes (Thanks to Thomas-S)
 - 2021-01-30  v1.05  * Many improvements and bugfixes
+- 2021-03-14  v1.06  * Switch translation from intllib to minetest.translator
+- 2021-04-24  v1.07  * Adapted to minecart v2.0
+- 2021-05-04  v1.08  * Add print command, improve error msg
 
diff --git a/signs_bot/basis.lua b/signs_bot/basis.lua
index c5c0bf9..7f9ef00 100644
--- a/signs_bot/basis.lua
+++ b/signs_bot/basis.lua
@@ -3,7 +3,7 @@
 	Signs Bot
 	=========
 
-	Copyright (C) 2019 Joachim Stolberg
+	Copyright (C) 2019-2021 Joachim Stolberg
 
 	GPL v3
 	See LICENSE.txt for more information
@@ -13,13 +13,10 @@
 ]]--
 
 -- for lazy programmers
-local S = function(pos) if pos then return minetest.pos_to_string(pos) end end
-local P = minetest.string_to_pos
 local M = minetest.get_meta
 
--- Load support for intllib.
-local MP = minetest.get_modpath("signs_bot")
-local I,_ = dofile(MP.."/intllib.lua")
+-- Load support for I18n.
+local S = signs_bot.S
 
 local lib = signs_bot.lib
 
@@ -112,16 +109,33 @@ local function preassigned_slots(pos)
 	return table.concat(tbl, "")
 end
 
+local function status(mem)
+	if mem.error then
+		if type(mem.error) == "string" then
+			return mem.error
+		else
+			return dump(mem.error)
+		end
+	end
+	if mem.running then
+		return S("running")
+	end
+	if mem.charging then
+		return S("charging")
+	end
+	return S("stopped")
+end	
+
 local function formspec(pos, mem)
 	mem.running = mem.running or false
-	local cmnd = mem.running and "stop;"..I("Off") or "start;"..I("On") 
+	local cmnd = mem.running and "stop;"..S("Off") or "start;"..S("On") 
 	local bot = not mem.running and "image[0.6,0;1,1;signs_bot_bot_inv.png]" or ""
 	local current_capa = mem.capa or (signs_bot.MAX_CAPA * 0.9)
-	return "size[9,7.6]"..
+	return "size[9,8.2]"..
 	default.gui_bg..
 	default.gui_bg_img..
 	default.gui_slots..
-	"label[2.1,0;"..I("Signs").."]label[5.3,0;"..I("Other items").."]"..
+	"label[2.1,0;"..S("Signs").."]label[5.3,0;"..S("Other items").."]"..
 	"image[0.6,0;1,1;signs_bot_form_mask.png]"..
 	bot..
 	preassigned_slots(pos)..
@@ -132,24 +146,27 @@ local function formspec(pos, mem)
 	"label[5.3,0.5;1]label[6.3,0.5;2]label[7.3,0.5;3]label[8.3,0.5;4]"..
 	"list[context;main;5,1;4,2;]"..
 	"label[5.3,3;5]label[6.3,3;6]label[7.3,3;7]label[8.3,3;8]"..
-	"button[0.2,1;1.5,1;config;"..I("Config").."]"..
+	"button[0.2,1;1.5,1;config;"..S("Config").."]"..
 	"button[0.2,2;1.5,1;"..cmnd.."]"..
-	"list[current_player;main;0.5,3.8;8,4;]"..
+	"label[1,3.6;"..status(mem).."]"..
+	"list[current_player;main;0.5,4.4;8,4;]"..
 	"listring[context;main]"..
 	"listring[current_player;main]"
 end
 
-local function formspec_cfg(pos, mem)
-	return "size[9,7.6]"..
+local function formspec_cfg()
+	return "size[9,8.2]"..
 	default.gui_bg..
 	default.gui_bg_img..
 	default.gui_slots..
-	"label[5.3,0;"..I("Preassign slots items").."]"..
+	"label[5.3,0;"..S("Preassign slots items").."]"..
 	"label[5.3,0.5;1]label[6.3,0.5;2]label[7.3,0.5;3]label[8.3,0.5;4]"..
 	"list[context;filter;5,1;4,2;]"..
 	"label[5.3,3;5]label[6.3,3;6]label[7.3,3;7]label[8.3,3;8]"..
-	"button[0.2,1;1.5,1;back;"..I("Back").."]"..
-	"list[current_player;main;0.5,3.8;8,4;]"
+	"button[0.2,1;1.5,1;back;"..S("Back").."]"..
+	"list[current_player;main;0.5,4.4;8,4;]"..
+	"listring[context;filter]"..
+	"listring[current_player;main]"
 end
 
 local function get_capa(itemstack)
@@ -166,7 +183,7 @@ local function set_capa(pos, oldnode, digger, capa)
 	capa = techage.power.percent(signs_bot.MAX_CAPA, capa)
 	capa = (math.floor((capa or 0) / 5)) * 5
 	meta:set_int("capa", capa)
-	local text = I("Robot Box ").." ("..capa.." %)"
+	local text = S("Robot Box").." ("..capa.." %)"
 	meta:set_string("description", text)
 	local inv = minetest.get_inventory({type="player", name=digger:get_player_name()})
 	local left_over = inv:add_item("main", node)
@@ -179,7 +196,7 @@ function signs_bot.infotext(pos, state)
 	local meta = M(pos)
 	local number = meta:get_string("number")
 	state = state or "<unknown>"
-	meta:set_string("infotext", I("Robot Box ")..number..": "..state)
+	meta:set_string("infotext", S("Robot Box").." "..number..": "..state)
 end
 
 local function reset_robot(pos, mem)
@@ -205,7 +222,7 @@ function signs_bot.start_robot(base_pos)
 		mem.capa = nil
 	end
 	meta:set_string("formspec", formspec(base_pos, mem))
-	signs_bot.infotext(base_pos, I("running"))
+	signs_bot.infotext(base_pos, S("running"))
 	reset_robot(base_pos, mem)
 	minetest.get_node_timer(base_pos):start(CYCLE_TIME)
 	return true
@@ -224,9 +241,9 @@ function signs_bot.stop_robot(base_pos, mem)
 			mem.charging = false
 		end
 		if mem.power_available then
-			signs_bot.infotext(base_pos, I("charging"))
+			signs_bot.infotext(base_pos, S("charging"))
 		else
-			signs_bot.infotext(base_pos, I("stopped"))
+			signs_bot.infotext(base_pos, S("stopped"))
 		end
 		meta:set_string("formspec", formspec(base_pos, mem))
 		signs_bot.remove_robot(mem)
@@ -285,7 +302,7 @@ local function on_receive_fields(pos, formname, fields, player)
 	if fields.update then
 		meta:set_string("formspec", formspec(pos, mem))
 	elseif fields.config then
-		meta:set_string("formspec", formspec_cfg(pos, mem))
+		meta:set_string("formspec", formspec_cfg())
 	elseif fields.back then
 		meta:set_string("formspec", formspec(pos, mem))
 	elseif fields.start then
@@ -373,6 +390,7 @@ end
 local function on_power(pos)
 	local mem = tubelib2.get_mem(pos)
 	mem.power_available = true
+	mem.charging = true
 	signs_bot.infotext(pos, S("charging"))
 end
 
@@ -383,7 +401,7 @@ local function on_nopower(pos)
 end
 
 minetest.register_node("signs_bot:box", {
-	description = I("Signs Bot Box"),
+	description = S("Signs Bot Box"),
 	stack_max = 1,
 	tiles = {
 		-- up, down, right, left, back, front
@@ -417,7 +435,7 @@ minetest.register_node("signs_bot:box", {
 		meta:set_string("formspec", formspec(pos, mem))
 		meta:set_string("signs_bot_cmnd", "turn_off")
 		meta:set_int("err_code", 0)
-		signs_bot.infotext(pos, I("stopped"))
+		signs_bot.infotext(pos, S("stopped"))
 		if minetest.global_exists("techage") then
 			techage.ElectricCable:after_place_node(pos)
 			mem.capa = get_capa(itemstack)
@@ -473,12 +491,12 @@ minetest.register_node("signs_bot:box", {
 			on_power = function(pos)
 				local mem = tubelib2.get_mem(pos)
 				mem.power_available = true
-				signs_bot.infotext(pos, I("charging"))
+				signs_bot.infotext(pos, S("charging"))
 			end,
 			on_nopower = function(pos)
 				local mem = tubelib2.get_mem(pos)
 				mem.power_available = false
-				signs_bot.infotext(pos, I("no power"))
+				signs_bot.infotext(pos, S("no power"))
 			end,
 			nominal = PWR_NEEDED,
 		}
@@ -516,22 +534,22 @@ end
 
 if minetest.get_modpath("doc") then
 	doc.add_entry("signs_bot", "box", {
-		name = I("Signs Bot Box"),
+		name = S("Signs Bot Box"),
 		data = {
 			item = "signs_bot:box",
 			text = table.concat({
-				I("The Box is the housing of the bot."),
-				I("Place the box and start the bot by means of the 'On' button."), 
-				I("If the mod techage is installed, the bot needs electrical power."),
+				S("The Box is the housing of the bot."),
+				S("Place the box and start the bot by means of the 'On' button."), 
+				S("If the mod techage is installed, the bot needs electrical power."),
 				"",
-				I("The bot leaves the box on the right side."),
-				I("It will not start, if this position is blocked."),
+				S("The bot leaves the box on the right side."),
+				S("It will not start, if this position is blocked."),
 				"",
-				I("To stop and remove the bot, press the 'Off' button."),
+				S("To stop and remove the bot, press the 'Off' button."),
 				"",
-				I("The box inventory simulates the inventory of the bot."),
-				I("You will not be able to access the inventory, if the bot is running."),
-				I("The bot can carry up to 8 stacks and 6 signs with it."),
+				S("The box inventory simulates the inventory of the bot."),
+				S("You will not be able to access the inventory, if the bot is running."),
+				S("The bot can carry up to 8 stacks and 6 signs with it."),
 			}, "\n")		
 		},
 	})
diff --git a/signs_bot/bot_flap.lua b/signs_bot/bot_flap.lua
index e4b9347..ed2ecaa 100644
--- a/signs_bot/bot_flap.lua
+++ b/signs_bot/bot_flap.lua
@@ -3,7 +3,7 @@
 	Signs Bot
 	=========
 
-	Copyright (C) 2019 Joachim Stolberg
+	Copyright (C) 2019-2021 Joachim Stolberg
 
 	GPLv3
 	See LICENSE.txt for more information
@@ -12,14 +12,8 @@
 
 ]]--
 
--- for lazy programmers
-local S = function(pos) if pos then return minetest.pos_to_string(pos) end end
-local P = minetest.string_to_pos
-local M = minetest.get_meta
-
--- Load support for intllib.
-local MP = minetest.get_modpath("signs_bot")
-local I,_ = dofile(MP.."/intllib.lua")
+-- Load support for I18n.
+local S = signs_bot.S
 
 local function formspec(cmnd)
 	cmnd = minetest.formspec_escape(cmnd)
@@ -28,7 +22,7 @@ local function formspec(cmnd)
 	default.gui_bg_img..
 	default.gui_slots..
 	"label[0.3,0.3;"..cmnd.."]"..
-	"button_exit[2.5,5.5;2,1;exit;"..I("Exit").."]"
+	"button_exit[2.5,5.5;2,1;exit;"..S("Exit").."]"
 end
 
 local commands = [[dig_sign 6
@@ -37,7 +31,7 @@ place_sign_behind 6
 ]]
 
 minetest.register_node("signs_bot:bot_flap", {
-	description = "Bot Flap",
+	description = S("Bot Flap"),
 	paramtype2 = "facedir",
 	tiles = {
 		"signs_bot_bot_flap_top.png",
@@ -69,13 +63,13 @@ minetest.register_craft({
 
 if minetest.get_modpath("doc") then
 	doc.add_entry("signs_bot", "bot_flap", {
-		name = I("Bot Flap"),
+		name = S("Bot Flap"),
 		data = {
 			item = "signs_bot:bot_flap",
 			text = table.concat({
-				I("The flap is a simple block used as door for the bot."),
-				I("Place the flap in any wall, and the bot will automatically open"),
-				I("and close the flap as it passes through it."),
+				S("The flap is a simple block used as door for the bot."),
+				S("Place the flap in any wall, and the bot will automatically open"),
+				S("and close the flap as it passes through it."),
 			}, "\n")		
 		},
 	})
diff --git a/signs_bot/bot_sensor.lua b/signs_bot/bot_sensor.lua
index db8c037..0d2e90f 100644
--- a/signs_bot/bot_sensor.lua
+++ b/signs_bot/bot_sensor.lua
@@ -3,7 +3,7 @@
 	Signs Bot
 	=========
 
-	Copyright (C) 2019 Joachim Stolberg
+	Copyright (C) 2019-2021 Joachim Stolberg
 
 	GPL v3
 	See LICENSE.txt for more information
@@ -13,22 +13,19 @@
 ]]--
 
 -- for lazy programmers
-local S = function(pos) if pos then return minetest.pos_to_string(pos) end end
-local P = minetest.string_to_pos
+local P2S = function(pos) if pos then return minetest.pos_to_string(pos) end end
+local S2P = minetest.string_to_pos
 local M = minetest.get_meta
 
--- Load support for intllib.
-local MP = minetest.get_modpath("signs_bot")
-local I,_ = dofile(MP.."/intllib.lua")
-
-local lib = signs_bot.lib
+-- Load support for I18n.
+local S = signs_bot.S
 
 local function update_infotext(pos, dest_pos, cmnd)
-	M(pos):set_string("infotext", I("Bot Sensor: Connected with ")..S(dest_pos).." / "..cmnd)
+	M(pos):set_string("infotext", S("Bot Sensor: Connected with").." "..P2S(dest_pos).." / "..cmnd)
 end	
 
 minetest.register_node("signs_bot:bot_sensor", {
-	description = I("Bot Sensor"),
+	description = S("Bot Sensor"),
 	inventory_image = "signs_bot_sensor_bot_inv.png",
 	drawtype = "nodebox",
 	node_box = {
@@ -49,7 +46,7 @@ minetest.register_node("signs_bot:bot_sensor", {
 	
 	after_place_node = function(pos, placer)
 		local meta = M(pos)
-		meta:set_string("infotext", I("Bot Sensor: Not connected"))
+		meta:set_string("infotext", S("Bot Sensor: Not connected"))
 	end,
 	
 	update_infotext = update_infotext,
@@ -57,13 +54,14 @@ minetest.register_node("signs_bot:bot_sensor", {
 	paramtype = "light",
 	sunlight_propagates = true,
 	paramtype2 = "facedir",
+	use_texture_alpha = signs_bot.CLIP,
 	is_ground_content = false,
 	groups = {sign_bot_sensor = 1, cracky = 1},
 	sounds = default.node_sound_metal_defaults(),
 })
 
 minetest.register_node("signs_bot:bot_sensor_on", {
-	description = I("Bot Sensor"),
+	description = S("Bot Sensor"),
 	drawtype = "nodebox",
 	node_box = {
 		type = "fixed",
@@ -100,6 +98,7 @@ minetest.register_node("signs_bot:bot_sensor_on", {
 	paramtype = "light",
 	sunlight_propagates = true,
 	paramtype2 = "facedir",
+	use_texture_alpha = signs_bot.CLIP,
 	is_ground_content = false,
 	diggable = false,
 	groups = {sign_bot_sensor = 1, not_in_creative_inventory = 1},
@@ -118,13 +117,13 @@ minetest.register_craft({
 
 if minetest.get_modpath("doc") then
 	doc.add_entry("signs_bot", "bot_sensor", {
-		name = I("Bot Sensor"),
+		name = S("Bot Sensor"),
 		data = {
 			item = "signs_bot:bot_sensor",
 			text = table.concat({
-				I("The Bot Sensor detects any bot and sends a signal, if a bot is nearby."),
-				I("the sensor range is one node/meter."), 
-				I("The sensor direction does not care."),
+				S("The Bot Sensor detects any bot and sends a signal, if a bot is nearby."),
+				S("the sensor range is one node/meter."), 
+				S("The sensor direction does not care."),
 			}, "\n")		
 		},
 	})
diff --git a/signs_bot/cart_sensor.lua b/signs_bot/cart_sensor.lua
index 4aa4420..350e035 100644
--- a/signs_bot/cart_sensor.lua
+++ b/signs_bot/cart_sensor.lua
@@ -3,7 +3,7 @@
 	Signs Bot
 	=========
 
-	Copyright (C) 2019 Joachim Stolberg
+	Copyright (C) 2019-2021 Joachim Stolberg
 
 	GPL v3
 	See LICENSE.txt for more information
@@ -13,20 +13,19 @@
 ]]--
 
 -- for lazy programmers
-local S = function(pos) if pos then return minetest.pos_to_string(pos) end end
-local P = minetest.string_to_pos
+local P2S = function(pos) if pos then return minetest.pos_to_string(pos) end end
+local S2P = minetest.string_to_pos
 local M = minetest.get_meta
 
--- Load support for intllib.
-local MP = minetest.get_modpath("signs_bot")
-local I,_ = dofile(MP.."/intllib.lua")
+-- Load support for I18n.
+local S = signs_bot.S
 
 local lib = signs_bot.lib
 
 local CYCLE_TIME = 2
 
 local function update_infotext(pos, dest_pos, dest_idx)
-	M(pos):set_string("infotext", I("Cart Sensor: Connected with ")..S(dest_pos).." / "..dest_idx)
+	M(pos):set_string("infotext", S("Cart Sensor: Connected with").." "..P2S(dest_pos).." / "..dest_idx)
 end	
 
 local function swap_node(pos, name)
@@ -39,18 +38,8 @@ local function swap_node(pos, name)
 	return true
 end
 	
-local function check_cart(pos)	
-	for _, object in pairs(minetest.get_objects_inside_radius(pos, 1)) do
-		if object:get_entity_name() == "minecart:cart" then
-			return true
-		end
-	end
-	return false
-end
-
 local function node_timer(pos)
-	local pos1 = lib.next_pos(pos, M(pos):get_int("param2"))
-	if check_cart(pos1) then
+	if minecart.is_cart_available(pos, M(pos):get_int("param2"), 1) then
 		if swap_node(pos, "signs_bot:cart_sensor_on") then
 			signs_bot.send_signal(pos)
 			signs_bot.lib.activate_extender_nodes(pos, true)
@@ -62,7 +51,7 @@ local function node_timer(pos)
 end
 
 minetest.register_node("signs_bot:cart_sensor", {
-	description = I("Cart Sensor"),
+	description = S("Cart Sensor"),
 	inventory_image = "signs_bot_sensor_cart_inv.png",
 	drawtype = "nodebox",
 	node_box = {
@@ -83,7 +72,7 @@ minetest.register_node("signs_bot:cart_sensor", {
 	
 	after_place_node = function(pos, placer)
 		local meta = M(pos)
-		meta:set_string("infotext", "Cart Sensor: Not connected")
+		meta:set_string("infotext", S("Cart Sensor: Not connected"))
 		minetest.get_node_timer(pos):start(CYCLE_TIME)
 		local node = minetest.get_node(pos)
 		meta:set_int("param2", (node.param2 + 2) % 4)
@@ -93,6 +82,7 @@ minetest.register_node("signs_bot:cart_sensor", {
 	update_infotext = update_infotext,
 	on_rotate = screwdriver.disallow,
 	paramtype = "light",
+	use_texture_alpha = signs_bot.CLIP,
 	sunlight_propagates = true,
 	paramtype2 = "facedir",
 	is_ground_content = false,
@@ -101,7 +91,7 @@ minetest.register_node("signs_bot:cart_sensor", {
 })
 
 minetest.register_node("signs_bot:cart_sensor_on", {
-	description = I("Cart Sensor"),
+	description = S("Cart Sensor"),
 	drawtype = "nodebox",
 	node_box = {
 		type = "fixed",
@@ -123,6 +113,7 @@ minetest.register_node("signs_bot:cart_sensor_on", {
 	update_infotext = update_infotext,
 	on_rotate = screwdriver.disallow,
 	paramtype = "light",
+	use_texture_alpha = signs_bot.CLIP,
 	sunlight_propagates = true,
 	paramtype2 = "facedir",
 	is_ground_content = false,
@@ -156,13 +147,13 @@ minetest.register_lbm({
 
 if minetest.get_modpath("doc") then
 	doc.add_entry("signs_bot", "cart_sensor", {
-		name = I("Cart Sensor"),
+		name = S("Cart Sensor"),
 		data = {
 			item = "signs_bot:cart_sensor",
 			text = table.concat({
-				I("The Cart Sensor detects and sends a signal, if a cart (Minecart) is nearby."),
-				I("the sensor range is one node/meter."), 
-				I("The sensor has an active side (red) that must point to the rail/cart."),
+				S("The Cart Sensor detects and sends a signal, if a cart (Minecart) is nearby."),
+				S("the sensor range is one node/meter."), 
+				S("The sensor has an active side (red) that must point to the rail/cart."),
 			}, "\n")		
 		},
 	})
diff --git a/signs_bot/changer.lua b/signs_bot/changer.lua
index c299ede..6baa9c8 100644
--- a/signs_bot/changer.lua
+++ b/signs_bot/changer.lua
@@ -3,7 +3,7 @@
 	Signs Bot
 	=========
 
-	Copyright (C) 2019 Joachim Stolberg
+	Copyright (C) 2019-2021 Joachim Stolberg
 
 	GPL v3
 	See LICENSE.txt for more information
@@ -13,13 +13,10 @@
 ]]--
 
 -- for lazy programmers
-local S = function(pos) if pos then return minetest.pos_to_string(pos) end end
-local P = minetest.string_to_pos
 local M = minetest.get_meta
 
--- Load support for intllib.
-local MP = minetest.get_modpath("signs_bot")
-local I,_ = dofile(MP.."/intllib.lua")
+-- Load support for I18n.
+local S = signs_bot.S
 
 local lib = signs_bot.lib
 
@@ -34,7 +31,7 @@ local formspec = "size[8,7]"..
 	default.gui_bg..
 	default.gui_bg_img..
 	default.gui_slots..
-	"label[1,1.3;"..I("Signs:").."]"..
+	"label[1,1.3;"..S("Signs:").."]"..
 	"label[2.6,0.7;1]label[5.1,0.7;2]"..
 	"list[context;sign;3,0.5;2,2;]"..
 	"label[2.6,1.7;3]label[5.1,1.7;4]"..
@@ -100,10 +97,15 @@ local function allow_metadata_inventory()
 	return 0
 end
 
+local function can_dig(pos)
+	local inv = minetest.get_inventory({type="node", pos=pos})
+	return inv:is_empty("sign")
+end
+
 for idx = 1,4 do
 	local not_in_inv = idx == 1 and 0 or 1
 	minetest.register_node("signs_bot:changer"..idx, {
-		description = I("Bot Control Unit"),
+		description = S("Bot Control Unit"),
 		inventory_image = "signs_bot_ctrl_unit_inv.png",
 		drawtype = "nodebox",
 		node_box = {
@@ -139,9 +141,11 @@ for idx = 1,4 do
 		allow_metadata_inventory_put = allow_metadata_inventory,
 		allow_metadata_inventory_take = allow_metadata_inventory,
 		on_punch = swap_node,
+		can_dig = can_dig,
 
 		on_rotate = screwdriver.disallow,
 		paramtype = "light",
+		use_texture_alpha = signs_bot.CLIP,
 		sunlight_propagates = true,
 		paramtype2 = "facedir",
 		is_ground_content = false,
@@ -162,18 +166,18 @@ minetest.register_craft({
 
 if minetest.get_modpath("doc") then
 	doc.add_entry("signs_bot", "changer", {
-		name = I("Bot Control Unit"),
+		name = S("Bot Control Unit"),
 		data = {
 			item = "signs_bot:changer1",
 			text = table.concat({
-				I("The Bot Control Unit is used to lead the bot by means of signs."),
-				I("The unit can be loaded with up to 4 different signs and can be programmed by means of sensors."), 
+				S("The Bot Control Unit is used to lead the bot by means of signs."),
+				S("The unit can be loaded with up to 4 different signs and can be programmed by means of sensors."), 
 				"",
-				I("To load the unit, place a sign on the red side of the unit and click on the unit."),
-				I("The sign disappears / is moved to the inventory of the unit."),
-				I("This can be repeated 3 times."),
+				S("To load the unit, place a sign on the red side of the unit and click on the unit."),
+				S("The sign disappears / is moved to the inventory of the unit."),
+				S("This can be repeated 3 times."),
 				"",
-				I("Use the connection tool to connect up to 4 sensors with the Bot Control Unit."),
+				S("Use the connection tool to connect up to 4 sensors with the Bot Control Unit."),
 			}, "\n")		
 		},
 	})
diff --git a/signs_bot/chest.lua b/signs_bot/chest.lua
index e7f7f8b..024f977 100644
--- a/signs_bot/chest.lua
+++ b/signs_bot/chest.lua
@@ -3,7 +3,7 @@
 	Signs Bot
 	=========
 
-	Copyright (C) 2019 Joachim Stolberg
+	Copyright (C) 2019-0221 Joachim Stolberg
 
 	GPL v3
 	See LICENSE.txt for more information
@@ -13,13 +13,12 @@
 ]]--
 
 -- for lazy programmers
-local S = function(pos) if pos then return minetest.pos_to_string(pos) end end
-local P = minetest.string_to_pos
+local P2S = function(pos) if pos then return minetest.pos_to_string(pos) end end
+local S2P = minetest.string_to_pos
 local M = minetest.get_meta
 
--- Load support for intllib.
-local MP = minetest.get_modpath("signs_bot")
-local I,_ = dofile(MP.."/intllib.lua")
+-- Load support for I18n.
+local S = signs_bot.S
 
 local NODE_IO = minetest.global_exists("node_io")
 
@@ -50,7 +49,7 @@ end
 local function update_infotext(pos, dest_pos, cmnd)
 	local meta = M(pos)
 	local state = get_inv_state(pos)
-	meta:set_string("infotext", I("Bot Chest: Sends signal to ")..S(dest_pos).." / "..cmnd..", if "..state)
+	meta:set_string("infotext", S("Bot Chest: Sends signal to").." "..P2S(dest_pos).." / "..cmnd..", if "..state)
 	meta:set_string("state", state)
 	
 end	
@@ -68,7 +67,7 @@ end
 
 if NODE_IO then
 	minetest.register_node("signs_bot:chest", {
-		description = I("Signs Bot Chest"),
+		description = S("Signs Bot Chest"),
 		tiles = {
 			-- up, down, right, left, back, front
 			'signs_bot_chest_top.png',
@@ -91,7 +90,7 @@ if NODE_IO then
 			local meta = minetest.get_meta(pos)
 			meta:set_string("owner", placer:get_player_name())
 			meta:set_string("formspec", formspec(pos, mem))
-			meta:set_string("infotext", "Bot Chest: Not connected")
+			meta:set_string("infotext", S("Bot Chest: Not connected"))
 		end,
 
 		allow_metadata_inventory_put = function(pos, listname, index, stack, player)
@@ -158,7 +157,7 @@ if NODE_IO then
 	})
 else
 	minetest.register_node("signs_bot:chest", {
-		description = I("Signs Bot Chest"),
+		description = S("Signs Bot Chest"),
 		tiles = {
 			-- up, down, right, left, back, front
 			'signs_bot_chest_top.png',
@@ -181,7 +180,7 @@ else
 			local meta = minetest.get_meta(pos)
 			meta:set_string("owner", placer:get_player_name())
 			meta:set_string("formspec", formspec(pos, mem))
-			meta:set_string("infotext", "Bot Chest: Not connected")
+			meta:set_string("infotext", S("Bot Chest: Not connected"))
 		end,
 
 		allow_metadata_inventory_put = function(pos, listname, index, stack, player)
@@ -245,15 +244,15 @@ minetest.register_craft({
 
 if minetest.get_modpath("doc") then
 	doc.add_entry("signs_bot", "chest", {
-		name = I("Signs Bot Chest"),
+		name = S("Signs Bot Chest"),
 		data = {
 			item = "signs_bot:chest",
 			text = table.concat({
-				I("The Signs Bot Chest is a special chest with sensor function."),
-				I("It sends a signal depending on the chest state."), 
-				I("Possible states are 'empty', 'not empty', 'almost full'"),
+				S("The Signs Bot Chest is a special chest with sensor function."),
+				S("It sends a signal depending on the chest state."), 
+				S("Possible states are 'empty', 'not empty', 'almost full'"),
 				"",
-				I("A typical use case is to turn off the bot, when the chest is almost full or empty."),
+				S("A typical use case is to turn off the bot, when the chest is almost full or empty."),
 			}, "\n")		
 		},
 	})
diff --git a/signs_bot/cmd_farming.lua b/signs_bot/cmd_farming.lua
index 56dffff..905be0e 100644
--- a/signs_bot/cmd_farming.lua
+++ b/signs_bot/cmd_farming.lua
@@ -3,7 +3,7 @@
 	Signs Bot
 	=========
 
-	Copyright (C) 2019 Joachim Stolberg
+	Copyright (C) 2019-2021 Joachim Stolberg
 
 	GPL v3
 	See LICENSE.txt for more information
@@ -11,14 +11,8 @@
 	Bot farming commands
 ]]--
 
--- for lazy programmers
-local S = function(pos) if pos then return minetest.pos_to_string(pos) end end
-local P = minetest.string_to_pos
-local M = minetest.get_meta
-
--- Load support for intllib.
-local MP = minetest.get_modpath("signs_bot")
-local I,_ = dofile(MP.."/intllib.lua")
+-- Load support for I18n.
+local S = signs_bot.S
 
 local lib = signs_bot.lib
 
@@ -65,7 +59,7 @@ signs_bot.register_botcommand("sow_seed", {
 	mod = "farming",
 	params = "<slot>",
 	num_param = 1,
-	description = I("Sow farming seeds\nin front of the robot"),
+	description = S("Sow farming seeds\nin front of the robot"),
 	check = function(slot)
 		slot = tonumber(slot)
 		return slot and slot > 0 and slot < 9
@@ -97,7 +91,10 @@ local function harvesting(base_pos, mem)
 			-- Do not cache the result of get_node_drops; it is a probabilistic function!
 			local drops = minetest.get_node_drops(node.name)
 			for _,itemstring in ipairs(drops) do
-				bot_inv_put_item(base_pos, 0,  ItemStack(itemstring))
+				local leftover = bot_inv_put_item(base_pos, 0,  ItemStack(itemstring))
+				if leftover and leftover:get_count() > 0 then
+					signs_bot.lib.drop_items(mem.robot_pos, leftover)
+				end
 			end
 		end
 	end
@@ -107,7 +104,7 @@ signs_bot.register_botcommand("harvest", {
 	mod = "farming",
 	params = "",
 	num_param = 0,
-	description = I("Harvest farming products\nin front of the robot\non a 3x3 field."),
+	description = S("Harvest farming products\nin front of the robot\non a 3x3 field."),
 	cmnd = function(base_pos, mem)
 		if not mem.steps then
 			mem.pos_tbl = signs_bot.lib.gen_position_table(mem.robot_pos, mem.robot_param2, 3, 3, 0)
@@ -145,7 +142,7 @@ signs_bot.register_botcommand("plant_sapling", {
 	mod = "farming",
 	params = "<slot>",
 	num_param = 1,
-	description = I("Plant a sapling\nin front of the robot"),
+	description = S("Plant a sapling\nin front of the robot"),
 	check = function(slot)
 		slot = tonumber(slot)
 		return slot and slot > 0 and slot < 9
@@ -168,7 +165,7 @@ turn_around]]
 
 signs_bot.register_sign({
 	name = "farming", 
-	description = I('Sign "farming"'), 
+	description = S('Sign "farming"'), 
 	commands = CMD, 
 	image = "signs_bot_sign_farming.png",
 })
@@ -184,14 +181,14 @@ minetest.register_craft({
 
 if minetest.get_modpath("doc") then
 	doc.add_entry("signs_bot", "farming", {
-		name = I("Sign 'farming'"),
+		name = S("Sign 'farming'"),
 		data = {
 			item = "signs_bot:farming",
 			text = table.concat({
-				I("Used to harvest and seed a 3x3 field."),
-				I("Place the sign in front of the field."), 
-				I("The seed to be placed has to be in the first inventory slot of the bot."),
-				I("When finished, the bot turns."),
+				S("Used to harvest and seed a 3x3 field."),
+				S("Place the sign in front of the field."), 
+				S("The seed to be placed has to be in the first inventory slot of the bot."),
+				S("When finished, the bot turns."),
 			}, "\n")		
 		},
 	})
diff --git a/signs_bot/cmd_flowers.lua b/signs_bot/cmd_flowers.lua
index 61d3c31..01fa355 100644
--- a/signs_bot/cmd_flowers.lua
+++ b/signs_bot/cmd_flowers.lua
@@ -11,14 +11,8 @@
 	Bot flower cutting command
 ]]--
 
--- for lazy programmers
-local S = function(pos) if pos then return minetest.pos_to_string(pos) end end
-local P = minetest.string_to_pos
-local M = minetest.get_meta
-
--- Load support for intllib.
-local MP = minetest.get_modpath("signs_bot")
-local I,_ = dofile(MP.."/intllib.lua")
+-- Load support for I18n.
+local S = signs_bot.S
 
 local lib = signs_bot.lib
 
@@ -48,16 +42,28 @@ minetest.after(1, function()
 	end
 end)
 
+local function is_tree(node)
+	if minetest.get_item_group(node.name, "tree") == 1 then
+		return signs_bot.handle_drop_like_a_player(node)
+	end
+	if minetest.get_item_group(node.name, "leaves") == 1 then
+		return signs_bot.handle_drop_like_a_player(node)
+	end
+end
+
 local function harvesting(base_pos, mem)
 	local pos = mem.pos_tbl and mem.pos_tbl[mem.steps]
 	mem.steps = (mem.steps or 1) + 1
 	
 	if pos and lib.not_protected(base_pos, pos) then
 		local node = minetest.get_node_or_nil(pos)
-		local drop = Flowers[node.name]
+		local drop = Flowers[node.name] or is_tree(node)
 		if drop then
 			minetest.remove_node(pos)
-			bot_inv_put_item(base_pos, 0,  ItemStack(drop))
+			local leftover = bot_inv_put_item(base_pos, 0,  ItemStack(drop))
+			if leftover and leftover:get_count() > 0 then
+				signs_bot.lib.drop_items(mem.robot_pos, leftover)
+			end
 		end
 	end
 end
@@ -66,7 +72,7 @@ signs_bot.register_botcommand("cutting", {
 	mod = "farming",
 	params = "",
 	num_param = 0,
-	description = I("Cutting flowers\nin front of the robot\non a 3x3 field."),
+	description = S("Cutting flowers, leaves and tree blocks\nin front of the robot\non a 3x3 field."),
 	cmnd = function(base_pos, mem)
 		if not mem.steps then
 			mem.pos_tbl = signs_bot.lib.gen_position_table(mem.robot_pos, mem.robot_param2, 3, 3, 0)
@@ -91,7 +97,7 @@ turn_around]]
 
 signs_bot.register_sign({
 	name = "flowers", 
-	description = I('Sign "flowers"'), 
+	description = S('Sign "flowers"'), 
 	commands = CMD, 
 	image = "signs_bot_sign_flowers.png",
 })
@@ -107,13 +113,13 @@ minetest.register_craft({
 
 if minetest.get_modpath("doc") then
 	doc.add_entry("signs_bot", "flowers", {
-		name = I("Sign 'flowers'"),
+		name = S("Sign 'flowers'"),
 		data = {
 			item = "signs_bot:flowers",
 			text = table.concat({
-				I("Used to cut flowers on a 3x3 field."),
-				I("Place the sign in front of the field."), 
-				I("When finished, the bot turns."),
+				S("Used to cut flowers on a 3x3 field."),
+				S("Place the sign in front of the field."), 
+				S("When finished, the bot turns."),
 			}, "\n")		
 		},
 	})
diff --git a/signs_bot/cmd_item.lua b/signs_bot/cmd_item.lua
index 6aa1d12..4ed7d70 100644
--- a/signs_bot/cmd_item.lua
+++ b/signs_bot/cmd_item.lua
@@ -3,7 +3,7 @@
 	Signs Bot
 	=========
 
-	Copyright (C) 2019 Joachim Stolberg
+	Copyright (C) 2019-2021 Joachim Stolberg
 
 	GPL v3
 	See LICENSE.txt for more information
@@ -13,13 +13,10 @@
 ]]--
 
 -- for lazy programmers
-local S = function(pos) if pos then return minetest.pos_to_string(pos) end end
-local P = minetest.string_to_pos
 local M = minetest.get_meta
 
--- Load support for intllib.
-local MP = minetest.get_modpath("signs_bot")
-local I,_ = dofile(MP.."/intllib.lua")
+-- Load support for I18n.
+local S = signs_bot.S
 
 local lib = signs_bot.lib
 
@@ -90,7 +87,7 @@ signs_bot.register_botcommand("take_item", {
 	mod = "item",
 	params = "<num> <slot>",	
 	num_param = 2,
-	description = I("Take <num> items from a chest like node\nand put it into the item inventory.\n"..
+	description = S("Take <num> items from a chest like node\nand put it into the item inventory.\n"..
 		"<slot> is the inventory slot (1..8) or 0 for any one"),
 	check = function(num, slot)
 		num = tonumber(num) or 1
@@ -115,7 +112,7 @@ signs_bot.register_botcommand("add_item", {
 	mod = "item",
 	params = "<num> <slot>",	
 	num_param = 2,
-	description = I("Add <num> items to a chest like node\ntaken from the item inventory.\n"..
+	description = S("Add <num> items to a chest like node\ntaken from the item inventory.\n"..
 		"<slot> is the inventory slot (1..8) or 0 for any one"),
 	check = function(num, slot)
 		num = tonumber(num) or 1
@@ -140,7 +137,7 @@ signs_bot.register_botcommand("add_fuel", {
 	mod = "item",
 	params = "<num> <slot>",
 	num_param = 2,
-	description = I("Add <num> fuel to a furnace like node\ntaken from the item inventory.\n"..
+	description = S("Add <num> fuel to a furnace like node\ntaken from the item inventory.\n"..
 		"<slot> is the inventory slot (1..8) or 0 for any one"),
 	check = function(num, slot)
 		num = tonumber(num) or 1
@@ -165,7 +162,7 @@ signs_bot.register_botcommand("cond_take_item", {
 	mod = "item",
 	params = "<num> <slot>",
 	num_param = 2,
-	description = I("deprecated, use bot inventory configuration instead"),
+	description = S("deprecated, use bot inventory configuration instead"),
 	check = function(num, slot)
 		return false 
 	end,
@@ -178,7 +175,7 @@ signs_bot.register_botcommand("cond_add_item", {
 	mod = "item",
 	params = "<num> <slot>",
 	num_param = 2,
-	description = I("deprecated, use bot inventory configuration instead"),
+	description = S("deprecated, use bot inventory configuration instead"),
 	check = function(num, slot)
 		return false 
 	end,
@@ -191,7 +188,7 @@ signs_bot.register_botcommand("pickup_items", {
 	mod = "item",
 	params = "<slot>",
 	num_param = 1,
-	description = I("Pick up all objects\n"..
+	description = S("Pick up all objects\n"..
 		"in a 3x3 field.\n"..
 		"<slot> is the inventory slot (1..8) or 0 for any one"),
 	check = function(slot)
@@ -219,7 +216,7 @@ signs_bot.register_botcommand("drop_items", {
 	mod = "item",
 	params = "<num> <slot>",
 	num_param = 2,
-	description = I("Drop items in front of the bot.\n"..
+	description = S("Drop items in front of the bot.\n"..
 		"<slot> is the inventory slot (1..8) or 0 for any one"),
 	check = function(num, slot)
 		num = tonumber(num) or 1
@@ -246,18 +243,10 @@ signs_bot.register_botcommand("punch_cart", {
 	mod = "item",
 	params = "",
 	num_param = 0,
-	description = I("Punch a rail cart to start it"),
+	description = S("Punch a rail cart to start it"),
 	cmnd = function(base_pos, mem)
-		local pos = lib.dest_pos(mem.robot_pos, mem.robot_param2, {0})
-		for _, object in pairs(minetest.get_objects_inside_radius(pos, 2)) do
-			if object:get_entity_name() == "minecart:cart" then
-				object:punch(object, 1.0, {
-					full_punch_interval = 1.0,
-					damage_groups = {fleshy = 1},
-				}, minetest.facedir_to_dir(mem.robot_param2))
-				break -- start only one cart
-			end
-		end
+		local punch_dir = minetest.facedir_to_dir(mem.robot_param2)
+		minecart.punch_cart(mem.robot_pos, mem.robot_param2, 1, punch_dir)
 		return signs_bot.DONE
 	end,
 })
diff --git a/signs_bot/cmd_move.lua b/signs_bot/cmd_move.lua
index 5d11438..76cae4d 100644
--- a/signs_bot/cmd_move.lua
+++ b/signs_bot/cmd_move.lua
@@ -3,7 +3,7 @@
 	Signs Bot
 	=========
 
-	Copyright (C) 2019 Joachim Stolberg
+	Copyright (C) 2019-2021 Joachim Stolberg
 
 	GPL v3
 	See LICENSE.txt for more information
@@ -12,14 +12,8 @@
 
 ]]--
 
--- for lazy programmers
-local S = function(pos) if pos then return minetest.pos_to_string(pos) end end
-local P = minetest.string_to_pos
-local M = minetest.get_meta
-
--- Load support for intllib.
-local MP = minetest.get_modpath("signs_bot")
-local I,_ = dofile(MP.."/intllib.lua")
+-- Load support for I18n.
+local S = signs_bot.S
 
 local lib = signs_bot.lib
 local get_node_lvm = tubelib2.get_node_lvm
@@ -135,7 +129,7 @@ signs_bot.register_botcommand("backward", {
 	mod = "move",
 	params = "",
 	num_param = 0,
-	description = I("Move the robot one step back"),
+	description = S("Move the robot one step back"),
 	cmnd = function(base_pos, mem)
 		local new_pos = backward_robot(mem)
 		if new_pos then  -- not blocked?
@@ -160,7 +154,7 @@ signs_bot.register_botcommand("turn_left", {
 	mod = "move",
 	params = "",
 	num_param = 0,
-	description = I("Turn the robot to the left"),
+	description = S("Turn the robot to the left"),
 	cmnd = function(base_pos, mem)
 		mem.robot_param2 = turn_robot(mem.robot_pos, mem.robot_param2, "L")
 		return signs_bot.DONE
@@ -171,7 +165,7 @@ signs_bot.register_botcommand("turn_right", {
 	mod = "move",
 	params = "",
 	num_param = 0,
-	description = I("Turn the robot to the right"),
+	description = S("Turn the robot to the right"),
 	cmnd = function(base_pos, mem)
 		mem.robot_param2 = turn_robot(mem.robot_pos, mem.robot_param2, "R")
 		return signs_bot.DONE
@@ -182,7 +176,7 @@ signs_bot.register_botcommand("turn_around", {
 	mod = "move",
 	params = "",
 	num_param = 0,
-	description = I("Turn the robot around"),
+	description = S("Turn the robot around"),
 	cmnd = function(base_pos, mem)
 		mem.robot_param2 = turn_robot(mem.robot_pos, mem.robot_param2, "R")
 		mem.robot_param2 = turn_robot(mem.robot_pos, mem.robot_param2, "R")
@@ -217,7 +211,7 @@ signs_bot.register_botcommand("move_up", {
 	mod = "move",
 	params = "",
 	num_param = 0,
-	description = I("Move the robot upwards"),
+	description = S("Move the robot upwards"),
 	cmnd = function(base_pos, mem)
 		local new_pos = robot_up(mem.robot_pos, mem.robot_param2)
 		if new_pos then  -- not blocked?
@@ -251,7 +245,7 @@ signs_bot.register_botcommand("move_down", {
 	mod = "move",
 	params = "",
 	num_param = 0,
-	description = I("Move the robot down"),
+	description = S("Move the robot down"),
 	cmnd = function(base_pos, mem)
 		local new_pos = robot_down(mem.robot_pos, mem.robot_param2)
 		if new_pos then  -- not blocked?
@@ -265,14 +259,14 @@ signs_bot.register_botcommand("pause", {
 	mod = "move",
 	params = "<sec>",
 	num_param = 1,
-	description = I("Stop the robot for <sec> seconds\n(1..9999)"),
+	description = S("Stop the robot for <sec> seconds\n(1..9999)"),
 	check = function(sec)
 		sec = tonumber(sec) or 1
 		return sec and sec > 0 and sec < 10000
 	end,
 	cmnd = function(base_pos, mem, sec)
 		if not mem.steps then
-			mem.steps = tonumber(sec or 1)
+			mem.steps = tonumber(sec) or 1
 		end
 		mem.steps = mem.steps - 1
 		if mem.steps == 0 then
@@ -290,7 +284,7 @@ signs_bot.register_botcommand("stop", {
 	mod = "move",
 	params = "",
 	num_param = 0,
-	description = I("Stop the robot."),
+	description = S("Stop the robot."),
 	cmnd = function(base_pos, mem, slot)
 		if mem.capa then
 			mem.capa = mem.capa + 2
@@ -303,7 +297,7 @@ signs_bot.register_botcommand("turn_off", {
 	mod = "move",
 	params = "",
 	num_param = 0,
-	description = I("Turn the robot off\n"..
+	description = S("Turn the robot off\n"..
 		"and put it back in the box."),
 	cmnd = function(base_pos, mem)
 		signs_bot.stop_robot(base_pos, mem)
diff --git a/signs_bot/cmd_pattern.lua b/signs_bot/cmd_pattern.lua
index 960cd7c..867e61f 100644
--- a/signs_bot/cmd_pattern.lua
+++ b/signs_bot/cmd_pattern.lua
@@ -3,7 +3,7 @@
 	Signs Bot
 	=========
 
-	Copyright (C) 2019 Joachim Stolberg
+	Copyright (C) 2019-2021 Joachim Stolberg
 
 	GPL v3
 	See LICENSE.txt for more information
@@ -12,14 +12,8 @@
 
 ]]--
 
--- for lazy programmers
-local S = function(pos) if pos then return minetest.pos_to_string(pos) end end
-local P = minetest.string_to_pos
-local M = minetest.get_meta
-
--- Load support for intllib.
-local MP = minetest.get_modpath("signs_bot")
-local I,_ = dofile(MP.."/intllib.lua")
+-- Load support for I18n.
+local S = signs_bot.S
 
 local lib = signs_bot.lib
 
@@ -117,7 +111,7 @@ signs_bot.register_botcommand("pattern", {
 	mod = "copy",
 	params = "",
 	num_param = 0,
-	description = I("Store pattern to be cloned."),
+	description = S("Store pattern to be cloned."),
 	cmnd = function(base_pos, mem)
 		mem.pttrn_pos = lib.next_pos(mem.robot_pos, mem.robot_param2)
 		mem.pttrn_param2 = mem.robot_param2
@@ -129,7 +123,7 @@ signs_bot.register_botcommand("copy", {
 	mod = "copy",
 	params = "<size> <lvl>",
 	num_param = 2,
-	description = I("Copy the nodes from\n"..
+	description = S("Copy the nodes from\n"..
 		"the stored pattern position\n"..
 		"<size> is: 3x1, 3x2, 3x3,\n"..
 		"5x1, 5x2, 5x3 (wide x deep)\n"..
@@ -178,7 +172,7 @@ minetest.register_node("signs_bot:missing", {
 
 signs_bot.register_sign({
 	name = "pattern", 
-	description = I('Sign "pattern"'), 
+	description = S('Sign "pattern"'), 
 	commands = "pattern\nturn_around", 
 	image = "signs_bot_sign_pattern.png",
 })
@@ -207,7 +201,7 @@ turn_around]]
 
 signs_bot.register_sign({
 	name = "copy3x3x3", 
-	description = I('Sign "copy 3x3x3"'), 
+	description = S('Sign "copy 3x3x3"'), 
 	commands = CMND, 
 	image = "signs_bot_sign_copy3x3x3.png",
 })
@@ -223,14 +217,14 @@ minetest.register_craft({
 
 if minetest.get_modpath("doc") then
 	doc.add_entry("signs_bot", "pattern", {
-		name = I("Sign 'pattern'"),
+		name = S("Sign 'pattern'"),
 		data = {
 			item = "signs_bot:pattern",
 			text = table.concat({
-				I("Used to make a copy of a 3x3x3 cube."),
-				I("Place the sign in front of the pattern to be copied."), 
-				I("Use the copy sign to make the copy of this pattern on a different location."),
-				I("The bot must first reach the pattern sign, then the copy sign."),
+				S("Used to make a copy of a 3x3x3 cube."),
+				S("Place the sign in front of the pattern to be copied."), 
+				S("Use the copy sign to make the copy of this pattern on a different location."),
+				S("The bot must first reach the pattern sign, then the copy sign."),
 			}, "\n")		
 		},
 	})
@@ -238,13 +232,13 @@ end
 
 if minetest.get_modpath("doc") then
 	doc.add_entry("signs_bot", "copy3x3x3", {
-		name = I("Sign 'copy3x3x3'"),
+		name = S("Sign 'copy3x3x3'"),
 		data = {
 			item = "signs_bot:copy3x3x3",
 			text = table.concat({
-				I("Used to make a copy of a 3x3x3 cube."),
-				I("Place the sign in front of the location, where the copy should be made."), 
-				I("Use the pattern sign to mark the pattern."),
+				S("Used to make a copy of a 3x3x3 cube."),
+				S("Place the sign in front of the location, where the copy should be made."), 
+				S("Use the pattern sign to mark the pattern."),
 			}, "\n")		
 		},
 	})
diff --git a/signs_bot/cmd_place.lua b/signs_bot/cmd_place.lua
index 23bfe6f..920d49e 100644
--- a/signs_bot/cmd_place.lua
+++ b/signs_bot/cmd_place.lua
@@ -3,7 +3,7 @@
 	Signs Bot
 	=========
 
-	Copyright (C) 2019 Joachim Stolberg
+	Copyright (C) 2019-2021 Joachim Stolberg
 
 	GPL v3
 	See LICENSE.txt for more information
@@ -12,14 +12,8 @@
 
 ]]--
 
--- for lazy programmers
-local S = function(pos) if pos then return minetest.pos_to_string(pos) end end
-local P = minetest.string_to_pos
-local M = minetest.get_meta
-
--- Load support for intllib.
-local MP = minetest.get_modpath("signs_bot")
-local I,_ = dofile(MP.."/intllib.lua")
+-- Load support for I18n.
+local S = signs_bot.S
 
 local lib = signs_bot.lib
 local bot_inv_take_item = signs_bot.bot_inv_take_item
@@ -32,13 +26,23 @@ end
 local tValidLevels = {[-1] = -1, [0] = 0, [1] = 1}
 
 -- for items with paramtype2 = "facedir"
-local tRotations = {
-	[0] = {8,20,4},
-	[1] = {16,20,12},
-	[2] = {4,20,8},
-	[3] = {12,20,16},
+local tRotations = {}
+
+local Rotations = {
+	{0,8,22,4},
+	{1,17,21,13},
+	{2,6,20,10},
+	{3,15,23,19},
 }
 
+for _,v in ipairs(Rotations) do
+	local t = table.copy(v)
+	for i = 1,4 do
+		table.insert(t, 1, table.remove(t))
+		tRotations[t[1]] = {t[2], t[3], t[4]}
+	end
+end
+
 --
 -- Place/dig items
 --
@@ -46,7 +50,7 @@ local function place_item(base_pos, robot_pos, param2, slot, route, level)
 	local pos1, p2 = lib.dest_pos(robot_pos, param2, route)
 	pos1.y = pos1.y + level
 	if not lib.not_protected(base_pos, pos1) then
-		return signs_bot.ERROR, I("Error: Position protected")
+		return signs_bot.ERROR, S("Error: Position protected")
 	end
 	if lib.is_air_like(pos1) then
 		local taken = signs_bot.bot_inv_take_item(base_pos, slot, 1)
@@ -74,7 +78,7 @@ signs_bot.register_botcommand("place_front", {
 	mod = "place",
 	params = "<slot> <lvl>",
 	num_param = 2,
-	description = I("Place a block in front of the robot\n"..
+	description = S("Place a block in front of the robot\n"..
 		"<slot> is the inventory slot (1..8)\n"..
 		"<lvl> is one of: -1   0   +1"),
 	check = function(slot, lvl)
@@ -95,7 +99,7 @@ signs_bot.register_botcommand("place_left", {
 	mod = "place",
 	params = "<slot> <lvl>",
 	num_param = 2,
-	description = I("Place a block on the left side\n"..
+	description = S("Place a block on the left side\n"..
 		"<slot> is the inventory slot (1..8)\n"..
 		"<lvl> is one of: -1   0   +1"),
 	check = function(slot, lvl)
@@ -116,7 +120,7 @@ signs_bot.register_botcommand("place_right", {
 	mod = "place",
 	params = "<slot> <lvl>",
 	num_param = 2,
-	description = I("Place a block on the right side\n"..
+	description = S("Place a block on the right side\n"..
 		"<slot> is the inventory slot (1..8)\n"..
 		"<lvl> is one of: -1   0   +1"),
 	check = function(slot, lvl)
@@ -136,7 +140,7 @@ signs_bot.register_botcommand("place_right", {
 local function place_item_below(base_pos, robot_pos, param2, slot)
 	local pos1 = {x=robot_pos.x,y=robot_pos.y-1,z=robot_pos.z}
 	if not lib.not_protected(base_pos, pos1) then
-		return signs_bot.ERROR, I("Error: Position protected")
+		return signs_bot.ERROR, S("Error: Position protected")
 	end
 	local node = tubelib2.get_node_lvm(pos1)
 	if node.name == "signs_bot:robot_foot" then
@@ -155,7 +159,7 @@ signs_bot.register_botcommand("place_below", {
 	mod = "place",
 	params = "<slot>",
 	num_param = 1,
-	description = I("Place a block under the robot.\n"..
+	description = S("Place a block under the robot.\n"..
 		"Hint: use 'move_up' first.\n"..
 		"<slot> is the inventory slot (1..8)"),
 	check = function(slot)
@@ -171,7 +175,7 @@ signs_bot.register_botcommand("place_below", {
 local function place_item_above(base_pos, robot_pos, param2, slot)
 	local pos1 = {x=robot_pos.x,y=robot_pos.y+1,z=robot_pos.z}
 	if not lib.not_protected(base_pos, pos1) then
-		return signs_bot.ERROR, I("Error: Position protected")
+		return signs_bot.ERROR, S("Error: Position protected")
 	end
 	if lib.is_air_like(pos1) then
 		local taken = bot_inv_take_item(base_pos, slot, 1)
@@ -189,7 +193,7 @@ signs_bot.register_botcommand("place_above", {
 	mod = "place",
 	params = "<slot>",
 	num_param = 1,
-	description = I("Place a block above the robot.\n"..
+	description = S("Place a block above the robot.\n"..
 		"<slot> is the inventory slot (1..8)"),
 	check = function(slot)
 		slot = tonumber(slot) or 0
@@ -207,13 +211,13 @@ local function dig_item(base_pos, robot_pos, param2, slot, route, level)
 	local node = tubelib2.get_node_lvm(pos1)
 	local dug_name = lib.is_simple_node(node)
 	if not lib.not_protected(base_pos, pos1) then
-		return signs_bot.ERROR, I("Error: Position protected")
+		return signs_bot.ERROR, S("Error: Position protected")
 	end
 	if dug_name then
 		if bot_inv_put_item(base_pos, slot, ItemStack(dug_name)) then
 			minetest.remove_node(pos1)
 		else
-			return signs_bot.ERROR, I("Error: No free inventory space")
+			return signs_bot.ERROR, S("Error: No free inventory space")
 		end
 	end
 	return signs_bot.DONE
@@ -223,7 +227,7 @@ signs_bot.register_botcommand("dig_front", {
 	mod = "place",
 	params = "<slot> <lvl>",
 	num_param = 2,
-	description = I("Dig the block in front of the robot\n"..
+	description = S("Dig the block in front of the robot\n"..
 		"<slot> is the inventory slot (1..8)\n"..
 		"<lvl> is one of: -1   0   +1"),
 	check = function(slot, lvl)
@@ -245,7 +249,7 @@ signs_bot.register_botcommand("dig_left", {
 	mod = "place",
 	params = "<slot> <lvl>",
 	num_param = 2,
-	description = I("Dig the block on the left side\n"..
+	description = S("Dig the block on the left side\n"..
 		"<slot> is the inventory slot (1..8)\n"..
 		"<lvl> is one of: -1   0   +1"),
 	check = function(slot, lvl)
@@ -267,7 +271,7 @@ signs_bot.register_botcommand("dig_right", {
 	mod = "place",
 	params = "<slot> <lvl>",
 	num_param = 2,
-	description = I("Dig the block on the right side\n"..
+	description = S("Dig the block on the right side\n"..
 		"<slot> is the inventory slot (1..8)\n"..
 		"<lvl> is one of: -1   0   +1"),
 	check = function(slot, lvl)
@@ -290,13 +294,13 @@ local function dig_item_below(base_pos, robot_pos, param2, slot)
 	local node = tubelib2.get_node_lvm(pos1)
 	local dug_name = lib.is_simple_node(node)
 	if not lib.not_protected(base_pos, pos1) then
-		return signs_bot.ERROR, I("Error: Position protected")
+		return signs_bot.ERROR, S("Error: Position protected")
 	end
 	if dug_name then
 		if bot_inv_put_item(base_pos, slot, ItemStack(dug_name)) then
 			minetest.set_node(pos1, {name="signs_bot:robot_foot"})
 		else
-			return signs_bot.ERROR, I("Error: No free inventory space")
+			return signs_bot.ERROR, S("Error: No free inventory space")
 		end
 	end
 	return signs_bot.DONE
@@ -306,7 +310,7 @@ signs_bot.register_botcommand("dig_below", {
 	mod = "place",
 	params = "<slot>",
 	num_param = 1,
-	description = I("Dig the block under the robot.\n"..
+	description = S("Dig the block under the robot.\n"..
 		"<slot> is the inventory slot (1..8)"),
 	check = function(slot)
 		slot = tonumber(slot) or 0
@@ -324,13 +328,13 @@ local function dig_item_above(base_pos, robot_pos, param2, slot)
 	local node = tubelib2.get_node_lvm(pos1)
 	local dug_name = lib.is_simple_node(node)
 	if not lib.not_protected(base_pos, pos1) then
-		return signs_bot.ERROR, I("Error: Position protected")
+		return signs_bot.ERROR, S("Error: Position protected")
 	end
 	if dug_name then
 		if bot_inv_put_item(base_pos, slot, ItemStack(dug_name)) then
 			minetest.remove_node(pos1)
 		else
-			return signs_bot.ERROR, I("Error: No free inventory space")
+			return signs_bot.ERROR, S("Error: No free inventory space")
 		end
 	end
 	return signs_bot.DONE
@@ -340,7 +344,7 @@ signs_bot.register_botcommand("dig_above", {
 	mod = "place",
 	params = "<slot>",
 	num_param = 1,
-	description = I("Dig the block above the robot.\n"..
+	description = S("Dig the block above the robot.\n"..
 		"<slot> is the inventory slot (1..8)"),
 	check = function(slot)
 		slot = tonumber(slot) or 0
@@ -358,7 +362,7 @@ local function rotate_item(base_pos, robot_pos, param2, route, level, steps)
 	pos1.y = pos1.y + level
 	local node = tubelib2.get_node_lvm(pos1)
 	if not lib.not_protected(base_pos, pos1) then
-		return signs_bot.ERROR, I("Error: Position protected")
+		return signs_bot.ERROR, S("Error: Position protected")
 	end
 	if lib.is_simple_node(node) then
 		local p2 = tRotations[node.param2] and tRotations[node.param2][steps]
@@ -372,7 +376,8 @@ end
 signs_bot.register_botcommand("rotate_item", {
 	mod = "place",
 	params = "<lvl> <steps>",	
-	description = I("Rotate the block in front of the robot\n"..
+	num_param = 2,
+	description = S("Rotate the block in front of the robot\n"..
 		"<lvl> is one of:  -1   0   +1\n"..
 		"<steps> is one of:  1   2   3"),
 	check = function(lvl, steps)
@@ -391,7 +396,7 @@ signs_bot.register_botcommand("rotate_item", {
 	
 -- Simplified torch which can be placed w/o a fake player
 minetest.register_node("signs_bot:torch", {
-	description = "Bot torch",
+	description = S("Bot torch"),
 	inventory_image = "default_torch_on_floor.png",
 	wield_image = "default_torch_on_floor.png",
 	drawtype = "nodebox",
@@ -428,6 +433,7 @@ minetest.register_node("signs_bot:torch", {
 		"group:bakedclay", "group:soil"},
 	paramtype = "light",
 	paramtype2 = "facedir",
+	use_texture_alpha = signs_bot.CLIP,
 	sunlight_propagates = true,
 	walkable = false,
 	liquids_pointable = false,
diff --git a/signs_bot/cmd_sign.lua b/signs_bot/cmd_sign.lua
index 4e9f9aa..8917dab 100644
--- a/signs_bot/cmd_sign.lua
+++ b/signs_bot/cmd_sign.lua
@@ -3,7 +3,7 @@
 	Signs Bot
 	=========
 
-	Copyright (C) 2019 Joachim Stolberg
+	Copyright (C) 2019-2021 Joachim Stolberg
 
 	GPL v3
 	See LICENSE.txt for more information
@@ -13,13 +13,10 @@
 ]]--
 
 -- for lazy programmers
-local S = function(pos) if pos then return minetest.pos_to_string(pos) end end
-local P = minetest.string_to_pos
 local M = minetest.get_meta
 
--- Load support for intllib.
-local MP = minetest.get_modpath("signs_bot")
-local I,_ = dofile(MP.."/intllib.lua")
+-- Load support for I18n.
+local S = signs_bot.S
 
 local lib = signs_bot.lib
 
@@ -48,12 +45,12 @@ local function formspec1(meta)
 	default.gui_bg_img..
 	default.gui_slots..
 	"style_type[textarea,table;font=mono]"..
-	"tabheader[0,0;tab;"..I("Commands,Help")..";1;;true]"..
-	"field[0.3,0.5;9,1;name;"..I("Sign name:")..";"..name.."]"..
+	"tabheader[0,0;tab;"..S("Commands,Help")..";1;;true]"..
+	"field[0.3,0.5;9,1;name;"..S("Sign name:")..";"..name.."]"..
 	"textarea[0.3,1.2;9,7.2;cmnd;;"..cmnd.."]"..
 	"label[0.3,7.5;"..err_msg.."]"..
-	"button_exit[5,7.5;2,1;cancel;"..I("Cancel").."]"..
-	"button[7,7.5;2,1;check;"..I("Check").."]"
+	"button_exit[5,7.5;2,1;cancel;"..S("Cancel").."]"..
+	"button[7,7.5;2,1;check;"..S("Check").."]"
 end
 
 local function formspec2(pos, text)
@@ -62,10 +59,10 @@ local function formspec2(pos, text)
 	default.gui_bg_img..
 	default.gui_slots..
 	"style_type[textarea,table;font=mono]"..
-	"tabheader[0,0;tab;"..I("Commands,Help")..";2;;true]"..
+	"tabheader[0,0;tab;"..S("Commands,Help")..";2;;true]"..
 	"table[0.1,0;8.6,4;command;"..sCmnds..";"..pos.."]"..
-	"textarea[0.3,4.5;9,3.5;help;Help:;"..text.."]"..
-	"button[3,7.5;3,1;copy;"..I("Copy Cmnd").."]"
+	"textarea[0.3,4.5;9,3.5;help;"..S("Help")..":;"..text.."]"..
+	"button[3,7.5;3,1;copy;"..S("Copy Cmnd").."]"
 end
 
 local function add_arrow(text, line_num)
@@ -94,7 +91,7 @@ local function append_line(pos, meta, line)
 	local text = meta:get_string("signs_bot_cmnd").."\n"..line
 	meta:set_string("signs_bot_cmnd", text)
 	meta:set_int("err_code", 1) -- zero means OK
-	meta:set_string("err_msg", "please check the added line(s)")
+	meta:set_string("err_msg", S("please check the added line(s)"))
 end	
 	
 local function check_and_store(pos, meta, fields)	
@@ -106,7 +103,7 @@ local function check_and_store(pos, meta, fields)
 end
 
 minetest.register_node("signs_bot:sign_cmnd", {
-	description = I('Sign "command"'),
+	description = S('Sign "command"'),
 	drawtype = "nodebox",
 	inventory_image = "signs_bot_sign_cmnd.png",
 	node_box = {
@@ -134,8 +131,8 @@ minetest.register_node("signs_bot:sign_cmnd", {
 			nmeta:set_string("err_msg", imeta:get_string("err_msg"))
 			nmeta:set_int("err_code", imeta:get_int("err_code"))
 		else
-			nmeta:set_string("sign_name", I('Sign "command"'))
-			nmeta:set_string("signs_bot_cmnd", I("-- enter or copy commands from help page"))
+			nmeta:set_string("sign_name", S('Sign "command"'))
+			nmeta:set_string("signs_bot_cmnd", S("-- enter or copy commands from help page"))
 			nmeta:set_int("err_code", 0)
 		end
 		nmeta:set_string("infotext", nmeta:get_string("sign_name"))
@@ -175,6 +172,7 @@ minetest.register_node("signs_bot:sign_cmnd", {
 	
 	after_dig_node = lib.after_dig_sign_node,
 	paramtype = "light",
+	use_texture_alpha = signs_bot.CLIP,
 	sunlight_propagates = true,
 	is_ground_content = false,
 	drop = "",
@@ -215,18 +213,18 @@ local function place_sign(base_pos, robot_pos, param2, slot)
 				lib.place_sign(pos1, sign, param2)
 				return signs_bot.DONE
 			else
-				return signs_bot.ERROR, I("Error: Signs inventory empty")
+				return signs_bot.ERROR, S("Error: Signs inventory empty")
 			end
 		end
 	end
-	return signs_bot.ERROR, I("Error: Position protected or occupied")
+	return signs_bot.ERROR, S("Error: Position protected or occupied")
 end
 
 signs_bot.register_botcommand("place_sign", {
 	mod = "sign",
 	params = "<slot>",
 	num_param = 1,
-	description = I("Place a sign in front of the robot\ntaken from the signs inventory\n"..
+	description = S("Place a sign in front of the robot\ntaken from the signs inventory\n"..
 		"<slot> is the inventory slot (1..6)"),
 	check = function(slot)
 		slot = tonumber(slot) or 1
@@ -247,18 +245,18 @@ local function place_sign_behind(base_pos, robot_pos, param2, slot)
 				lib.place_sign(pos1, sign, param2)
 				return signs_bot.DONE
 			else
-				return signs_bot.ERROR, I("Error: Signs inventory empty")
+				return signs_bot.ERROR, S("Error: Signs inventory empty")
 			end
 		end
 	end
-	return signs_bot.ERROR, I("Error: Position protected or occupied")
+	return signs_bot.ERROR, S("Error: Position protected or occupied")
 end
 
 signs_bot.register_botcommand("place_sign_behind", {
 	mod = "sign",
 	params = "<slot>",
 	num_param = 1,
-	description = I("Place a sign behind the robot\ntaken from the signs inventory\n"..
+	description = S("Place a sign behind the robot\ntaken from the signs inventory\n"..
 		"<slot> is the inventory slot (1..6)"),
 	check = function(slot)
 		slot = tonumber(slot) or 1
@@ -277,7 +275,7 @@ local function dig_sign(base_pos, robot_pos, param2, slot)
 	local err_code = meta:get_int("err_code")
 	local name = meta:get_string("sign_name")
 	if cmnd == "" then
-		return signs_bot.ERROR, I("Error: No sign available")
+		return signs_bot.ERROR, S("Error: No sign available")
 	end
 	if lib.not_protected(base_pos, pos1) then
 		local node = tubelib2.get_node_lvm(pos1)
@@ -289,18 +287,18 @@ local function dig_sign(base_pos, robot_pos, param2, slot)
 		minetest.remove_node(pos1)
 		if not put_inv_sign(base_pos, slot, sign) then	
 			signs_bot.lib.drop_items(robot_pos, sign)
-			return signs_bot.ERROR, I("Error: Signs inventory slot is occupied")
+			return signs_bot.ERROR, S("Error: Signs inventory slot is occupied")
 		end
 		return signs_bot.DONE
 	end
-	return signs_bot.ERROR, I("Error: Position is protected")
+	return signs_bot.ERROR, S("Error: Position is protected")
 end
 
 signs_bot.register_botcommand("dig_sign", {
 	mod = "sign",
 	params = "<slot>",
 	num_param = 1,
-	description = I("Dig the sign in front of the robot\n"..
+	description = S("Dig the sign in front of the robot\n"..
 		"and add it to the signs inventory.\n"..
 		"<slot> is the inventory slot (1..6)"),
 	check = function(slot)
@@ -317,23 +315,26 @@ local function trash_sign(base_pos, robot_pos, param2, slot)
 	local pos1 = lib.dest_pos(robot_pos, param2, {0})
 	local cmnd = M(pos1):get_string("signs_bot_cmnd")
 	if cmnd == "" then
-		return signs_bot.ERROR, I("Error: No sign available")
+		return signs_bot.ERROR, S("Error: No sign available")
 	end
 	if lib.not_protected(base_pos, pos1) then
 		local node = tubelib2.get_node_lvm(pos1)
 		local sign = ItemStack("signs_bot:sign_cmnd")
 		minetest.remove_node(pos1)
-		signs_bot.bot_inv_put_item(base_pos, slot, sign)
+		local leftover = signs_bot.bot_inv_put_item(base_pos, slot, sign)
+		if leftover and leftover:get_count() > 0 then
+			signs_bot.lib.drop_items(robot_pos, leftover)
+		end
 		return signs_bot.DONE
 	end
-	return signs_bot.ERROR, I("Error: Position is protected")
+	return signs_bot.ERROR, S("Error: Position is protected")
 end
 
 signs_bot.register_botcommand("trash_sign", {
 	mod = "sign",
 	params = "<slot>",	
 	num_param = 1,
-	description = I("Dig the sign in front of the robot\n"..
+	description = S("Dig the sign in front of the robot\n"..
 		"and add the cleared sign to\nthe item iventory.\n"..
 		"<slot> is the inventory slot (1..8)"),
 	check = function(slot)
@@ -358,14 +359,14 @@ minetest.register_craft({
 
 if minetest.get_modpath("doc") then
 	doc.add_entry("signs_bot", "sign_cmnd", {
-		name = I("Sign 'command'"),
+		name = S("Sign 'command'"),
 		data = {
 			item = "signs_bot:sign_cmnd",
 			text = table.concat({
-				I("The 'command' sign can be programmed by the player."),
-				I("Place the sign in front of you and use the node menu to program your sequence of bot commands."), 
-				I("The menu has an edit field for your commands and a help page with all available commands."),
-				I("The help page has a copy button to simplify the programming."),
+				S("The 'command' sign can be programmed by the player."),
+				S("Place the sign in front of you and use the node menu to program your sequence of bot commands."), 
+				S("The menu has an edit field for your commands and a help page with all available commands."),
+				S("The help page has a copy button to simplify the programming."),
 			}, "\n")		
 		},
 	})
diff --git a/signs_bot/commands.lua b/signs_bot/commands.lua
index e009a8d..6347273 100644
--- a/signs_bot/commands.lua
+++ b/signs_bot/commands.lua
@@ -3,7 +3,7 @@
 	Signs Bot
 	=========
 
-	Copyright (C) 2019 Joachim Stolberg
+	Copyright (C) 2019-2021 Joachim Stolberg
 
 	GPL v3
 	See LICENSE.txt for more information
@@ -13,13 +13,12 @@
 ]]--
 
 -- for lazy programmers
-local S = function(pos) if pos then return minetest.pos_to_string(pos) end end
-local P = minetest.string_to_pos
 local M = minetest.get_meta
 
--- Load support for intllib.
+-- Load support for I18n.
+local S = signs_bot.S
+
 local MP = minetest.get_modpath("signs_bot")
-local I,_ = dofile(MP.."/intllib.lua")
 local ci = dofile(MP.."/interpreter.lua")
 
 local lib = signs_bot.lib
@@ -73,7 +72,7 @@ end
 function signs_bot.get_commands()
 	local tbl = {}
 	for _,mod in ipairs(SortedMods) do
-		tbl[#tbl+1] = mod.." "..I("commands:")
+		tbl[#tbl+1] = mod.." "..S("commands:")
 		for _,cmnd in ipairs(SortedKeys[mod]) do
 			local item = tCommands[cmnd]
 			tbl[#tbl+1] = "    "..item.name.." "..item.params
@@ -90,7 +89,7 @@ function signs_bot.get_help_text(cmnd)
 			return item.description
 		end
 	end
-	return I("unknown command")
+	return S("unknown command")
 end	
 	
 function signs_bot.check_commands(pos, text)
@@ -154,12 +153,16 @@ local function activate_sensor(pos, param2)
 	end
 end
 
-local function bot_error(base_pos, mem, err)
+local function bot_error(base_pos, mem, err, cmd)
 	minetest.sound_play('signs_bot_error', {pos = base_pos})
 	minetest.sound_play('signs_bot_error', {pos = mem.robot_pos})
-	print(err)
-	signs_bot.infotext(base_pos, err)
-	mem.error = true
+	if cmd then
+		signs_bot.infotext(base_pos, err .. ":\n'" .. cmd .. "'")
+		mem.error = err .. ": '" .. cmd .. "'"
+	else
+		signs_bot.infotext(base_pos, err)
+		mem.error = err
+	end
 	return false
 end
 
@@ -176,9 +179,9 @@ local function power_consumption(mem, cmnd)
 end
 
 function signs_bot.run_next_command(base_pos, mem)
-	local res, err = ci.run_script(base_pos, mem)
+	local res, err, cmd = ci.run_script(base_pos, mem)
 	if res == ci.ERROR then
-		return bot_error(base_pos, mem, err)
+		return bot_error(base_pos, mem, err, cmd)
 	elseif res == ci.EXIT then
 		signs_bot.stop_robot(base_pos, mem)
 		return false
@@ -198,31 +201,31 @@ end
 signs_bot.register_botcommand("repeat", {
 	mod = "core",
 	params = "<num>",	
-	description = I("start of a 'repeat..end' block"),
+	description = S("start of a 'repeat..end' block"),
 })	
 
 signs_bot.register_botcommand("end", {
 	mod = "core",
 	params = "",	
-	description = I("end command of a 'repeat..end' block"),
+	description = S("end command of a 'repeat..end' block"),
 })	
 
 signs_bot.register_botcommand("call", {
 	mod = "core",
 	params = "<label>",	
-	description = I("call a subroutine (with 'return' statement)"),
+	description = S("call a subroutine (with 'return' statement)"),
 })	
 
 signs_bot.register_botcommand("return", {
 	mod = "core",
 	params = "",	
-	description = I("return from a subroutine"),
+	description = S("return from a subroutine"),
 })	
 
 signs_bot.register_botcommand("jump", {
 	mod = "core",
 	params = "<label>",	
-	description = I("jump to a label"),
+	description = S("jump to a label"),
 })	
 
 local function move(mem, any_sensor)
@@ -242,7 +245,7 @@ signs_bot.register_botcommand("move", {
 	mod = "move",
 	params = "<steps>",	
 	num_param = 1,
-	description = I([[Move the robot 1..999 steps forward
+	description = S([[Move the robot 1..999 steps forward
 without paying attention to any signs.
 Up and down movements also become
 counted as steps.]]),
@@ -262,7 +265,7 @@ signs_bot.register_botcommand("cond_move", {
 	mod = "move",
 	params = "",
 	num_param = 0,
-	description = I([[Walk until a sign or obstacle is
+	description = S([[Walk until a sign or obstacle is
 reached. Then continue with the next command.
 When a sign has been reached, 
 the current program is ended
@@ -280,4 +283,22 @@ new program from the sign]]),
 	end,
 })
 
-	
+signs_bot.register_botcommand("print", {
+	mod = "debug",
+	params = "<text>",
+	num_param = 1,
+	description = S([[Print given text as chat message.
+For two or more words, use the '*' character 
+instead of spaces, like "Hello*world"]]),
+	check = function(text)
+		return text ~= ""
+	end,
+	cmnd = function(base_pos, mem, text)
+		text = text:gsub("*", " ")
+		local owner = M(base_pos):get_string("owner")
+		if owner ~= "" and text ~= "" then
+			minetest.chat_send_player(owner, "Bot: " .. text)
+		end
+		return signs_bot.DONE
+	end,
+})
diff --git a/signs_bot/compost.lua b/signs_bot/compost.lua
new file mode 100644
index 0000000..d4f5e18
--- /dev/null
+++ b/signs_bot/compost.lua
@@ -0,0 +1,101 @@
+--[[
+
+	Signs Bot
+	=========
+
+	Copyright (C) 2019-2021 Joachim Stolberg
+
+	GPL v3
+	See LICENSE.txt for more information
+	
+	Signs Bot: Commands for the compost mod
+
+]]--
+
+-- Load support for I18n.
+local S = signs_bot.S
+
+local NUM_LEAVES = 2
+
+-- we reuse the minecart hopper API here
+local function additem(mem, stack)
+	local pos = signs_bot.lib.next_pos(mem.robot_pos, mem.robot_param2)
+	local node = minetest.get_node(pos)
+	local ndef = minetest.registered_nodes[node.name]
+	if ndef.minecart_hopper_additem then
+		return ndef.minecart_hopper_additem(pos, stack)
+	end
+	
+	pos = {x = pos.x, y = pos.y - 1, z = pos.z}
+	node = minetest.get_node(pos)
+	ndef = minetest.registered_nodes[node.name]
+	if ndef.minecart_hopper_additem then
+		return ndef.minecart_hopper_additem(pos, stack)
+	end
+	
+	return stack
+end
+
+local function takeitem(mem)
+	local pos = signs_bot.lib.next_pos(mem.robot_pos, mem.robot_param2)
+	local node = minetest.get_node(pos)
+	local ndef = minetest.registered_nodes[node.name]
+	if ndef.minecart_hopper_takeitem then
+		return ndef.minecart_hopper_takeitem(pos, 1)
+	end
+	
+	pos = {x = pos.x, y = pos.y - 1, z = pos.z}
+	node = minetest.get_node(pos)
+	ndef = minetest.registered_nodes[node.name]
+	if ndef.minecart_hopper_takeitem then
+		return ndef.minecart_hopper_takeitem(pos, 1)
+	end
+end
+
+
+if  minetest.global_exists("signs_bot") then
+
+	signs_bot.register_botcommand("add_compost", {
+		mod = "compost",
+		params = "<slot>",
+		num_param = 1,
+		description = S("Put 2 leaves into the compost barrel\n"..
+			"<slot> is the bot inventory slot (1..8)\n"..
+			"with the leaves."),
+		check = function(slot)
+			slot = tonumber(slot) or 0
+			return slot > 0 and slot < 9
+		end,
+		cmnd = function(base_pos, mem, slot)
+			slot = tonumber(slot) or 0
+			local taken = signs_bot.bot_inv_take_item(base_pos, slot, NUM_LEAVES)
+			local leftover = additem(mem, taken)
+			if leftover and leftover:get_count() > 0 then
+				signs_bot.bot_inv_put_item(base_pos, slot, leftover)
+			end
+			return signs_bot.DONE
+		end,
+	})
+
+	signs_bot.register_botcommand("take_compost", {
+		mod = "compost",
+		params = "<slot>",
+		num_param = 1,
+		description = S("Take a compost item from the barrel.\n"..
+			"<slot> (1..8 or 0 for the first free slot) is the bot\n"..
+			"slot for the compost item."),
+		check = function(num, slot)
+			slot = tonumber(slot) or 0
+			return slot >= 0 and slot < 9
+		end,
+		cmnd = function(base_pos, mem, slot)
+			slot = tonumber(slot) or 0
+			local taken = takeitem(mem)
+			local leftover = signs_bot.bot_inv_put_item(base_pos, slot, taken)
+			if leftover and leftover:get_count() > 0 then
+				signs_bot.lib.drop_items(mem.robot_pos, leftover)
+			end
+			return signs_bot.DONE
+		end,
+	})
+end
diff --git a/signs_bot/crop_sensor.lua b/signs_bot/crop_sensor.lua
index 12a5389..b009aca 100644
--- a/signs_bot/crop_sensor.lua
+++ b/signs_bot/crop_sensor.lua
@@ -3,7 +3,7 @@
 	Signs Bot
 	=========
 
-	Copyright (C) 2019 Joachim Stolberg
+	Copyright (C) 2019-2021 Joachim Stolberg
 
 	GPL v3
 	See LICENSE.txt for more information
@@ -13,20 +13,18 @@
 ]]--
 
 -- for lazy programmers
-local S = function(pos) if pos then return minetest.pos_to_string(pos) end end
-local P = minetest.string_to_pos
+local P2S = function(pos) if pos then return minetest.pos_to_string(pos) end end
 local M = minetest.get_meta
 
--- Load support for intllib.
-local MP = minetest.get_modpath("signs_bot")
-local I,_ = dofile(MP.."/intllib.lua")
+-- Load support for I18n.
+local S = signs_bot.S
 
 local lib = signs_bot.lib
 
 local CYCLE_TIME = 4
 
 local function update_infotext(pos, dest_pos, dest_idx)
-	M(pos):set_string("infotext", I("Crop Sensor: Connected with ")..S(dest_pos).." / "..dest_idx)
+	M(pos):set_string("infotext", S("Crop Sensor: Connected with").." "..P2S(dest_pos).." / "..dest_idx)
 end	
 
 local function swap_node(pos, name)
@@ -56,7 +54,7 @@ local function node_timer(pos)
 end
 
 minetest.register_node("signs_bot:crop_sensor", {
-	description = I("Crop Sensor"),
+	description = S("Crop Sensor"),
 	inventory_image = "signs_bot_sensor_crop_inv.png",
 	drawtype = "nodebox",
 	node_box = {
@@ -77,7 +75,7 @@ minetest.register_node("signs_bot:crop_sensor", {
 	
 	after_place_node = function(pos, placer)
 		local meta = M(pos)
-		meta:set_string("infotext", "Crop Sensor: Not connected")
+		meta:set_string("infotext", S("Crop Sensor: Not connected"))
 		minetest.get_node_timer(pos):start(CYCLE_TIME)
 		local node = minetest.get_node(pos)
 		meta:set_int("param2", (node.param2 + 2) % 4)
@@ -87,6 +85,7 @@ minetest.register_node("signs_bot:crop_sensor", {
 	update_infotext = update_infotext,
 	on_rotate = screwdriver.disallow,
 	paramtype = "light",
+	use_texture_alpha = signs_bot.CLIP,
 	sunlight_propagates = true,
 	paramtype2 = "facedir",
 	is_ground_content = false,
@@ -95,7 +94,7 @@ minetest.register_node("signs_bot:crop_sensor", {
 })
 
 minetest.register_node("signs_bot:crop_sensor_on", {
-	description = I("Crop Sensor"),
+	description = S("Crop Sensor"),
 	drawtype = "nodebox",
 	node_box = {
 		type = "fixed",
@@ -117,6 +116,7 @@ minetest.register_node("signs_bot:crop_sensor_on", {
 	update_infotext = update_infotext,
 	on_rotate = screwdriver.disallow,
 	paramtype = "light",
+	use_texture_alpha = signs_bot.CLIP,
 	sunlight_propagates = true,
 	paramtype2 = "facedir",
 	is_ground_content = false,
@@ -150,13 +150,13 @@ minetest.register_lbm({
 
 if minetest.get_modpath("doc") then
 	doc.add_entry("signs_bot", "crop_sensor", {
-		name = I("Crop Sensor"),
+		name = S("Crop Sensor"),
 		data = {
 			item = "signs_bot:crop_sensor",
 			text = table.concat({
-				I("The Crop Sensor sends cyclical signals when, for example, wheat is fully grown."),
-				I("The sensor range is one node/meter."), 
-				I("The sensor has an active side (red) that must point to the crop/field."),
+				S("The Crop Sensor sends cyclical signals when, for example, wheat is fully grown."),
+				S("The sensor range is one node/meter."), 
+				S("The sensor has an active side (red) that must point to the crop/field."),
 
 			}, "\n")		
 		},
diff --git a/signs_bot/delayer.lua b/signs_bot/delayer.lua
index 3edc912..7d39c29 100644
--- a/signs_bot/delayer.lua
+++ b/signs_bot/delayer.lua
@@ -3,7 +3,7 @@
 	Signs Bot
 	=========
 
-	Copyright (C) 2019 Joachim Stolberg
+	Copyright (C) 2019-2021 Joachim Stolberg
 
 	GPL v3
 	See LICENSE.txt for more information
@@ -13,20 +13,17 @@
 ]]--
 
 -- for lazy programmers
-local S = function(pos) if pos then return minetest.pos_to_string(pos) end end
-local P = minetest.string_to_pos
+local P2S = function(pos) if pos then return minetest.pos_to_string(pos) end end
+local S2P = minetest.string_to_pos
 local M = minetest.get_meta
 
--- Load support for intllib.
-local MP = minetest.get_modpath("signs_bot")
-local I,_ = dofile(MP.."/intllib.lua")
+-- Load support for I18n.
+local S = signs_bot.S
 
 local CYCLE_TIME = 2
 
-local lib = signs_bot.lib
-
 local function update_infotext(pos, dest_pos, cmnd)
-	M(pos):set_string("infotext", I("Signal Delayer: Connected with ")..S(dest_pos).." / "..cmnd)
+	M(pos):set_string("infotext", S("Signal Delayer: Connected with").." "..P2S(dest_pos).." / "..cmnd)
 end	
 
 local function infotext(pos)
@@ -34,19 +31,19 @@ local function infotext(pos)
 	local dest_pos = meta:get_string("signal_pos")
 	local signal = meta:get_string("signal_data")
 	if dest_pos ~= "" and signal ~= "" then
-		update_infotext(pos, P(dest_pos), signal)
+		update_infotext(pos, S2P(dest_pos), signal)
 	end
 end
 
 local function formspec(meta)
-	local label = minetest.formspec_escape(I("Delay time [sec]:"))
+	local label = minetest.formspec_escape(S("Delay time [sec]:"))
 	local value = minetest.formspec_escape(meta:get_int("time"))
 	return "size[4,3]"..
 	default.gui_bg..
 	default.gui_bg_img..
 	default.gui_slots..
 	"field[0.3,1;4,1;time;"..label..";"..value.."]"..
-	"button_exit[1,2.2;2,1;start;"..I("Start").."]"
+	"button_exit[1,2.2;2,1;start;"..S("Start").."]"
 end
 
 -- Used by the pairing tool
@@ -141,7 +138,7 @@ local function on_receive_fields(pos, formname, fields, player)
 end
 
 minetest.register_node("signs_bot:delayer", {
-	description = I("Signal Delayer"),
+	description = S("Signal Delayer"),
 	inventory_image = "signs_bot_delayer_inv.png",
 	drawtype = "nodebox",
 	node_box = {
@@ -172,6 +169,7 @@ minetest.register_node("signs_bot:delayer", {
 	update_infotext = update_infotext,
 	on_rotate = screwdriver.disallow,
 	paramtype = "light",
+	use_texture_alpha = signs_bot.CLIP,
 	sunlight_propagates = true,
 	paramtype2 = "facedir",
 	is_ground_content = false,
@@ -180,7 +178,7 @@ minetest.register_node("signs_bot:delayer", {
 })
 
 minetest.register_node("signs_bot:delayer_loaded", {
-	description = I("Signal Delayer"),
+	description = S("Signal Delayer"),
 	drawtype = "nodebox",
 	node_box = {
 		type = "fixed",
@@ -203,6 +201,7 @@ minetest.register_node("signs_bot:delayer_loaded", {
 	paramtype = "light",
 	sunlight_propagates = true,
 	paramtype2 = "facedir",
+	use_texture_alpha = signs_bot.CLIP,
 	is_ground_content = false,
 	diggable = false,
 	groups = {sign_bot_sensor = 1, not_in_creative_inventory = 1},
@@ -210,7 +209,7 @@ minetest.register_node("signs_bot:delayer_loaded", {
 })
 
 minetest.register_node("signs_bot:delayer_on", {
-	description = I("Signal Delayer"),
+	description = S("Signal Delayer"),
 	drawtype = "nodebox",
 	node_box = {
 		type = "fixed",
@@ -230,6 +229,7 @@ minetest.register_node("signs_bot:delayer_on", {
 	paramtype = "light",
 	sunlight_propagates = true,
 	paramtype2 = "facedir",
+	use_texture_alpha = signs_bot.CLIP,
 	is_ground_content = false,
 	diggable = false,
 	groups = {sign_bot_sensor = 1, not_in_creative_inventory = 1},
@@ -261,12 +261,12 @@ minetest.register_lbm({
 
 if minetest.get_modpath("doc") then
 	doc.add_entry("signs_bot", "delayer", {
-		name = I("Signal Delayer"),
+		name = S("Signal Delayer"),
 		data = {
 			item = "signs_bot:delayer",
 			text = table.concat({
-				I("Signals are forwarded delayed. Subsequent signals are queued."), 
-				I("The delay time can be configured."),
+				S("Signals are forwarded delayed. Subsequent signals are queued."), 
+				S("The delay time can be configured."),
 			}, "\n")		
 		},
 	})
diff --git a/signs_bot/doc.lua b/signs_bot/doc.lua
index 9e18863..a929780 100644
--- a/signs_bot/doc.lua
+++ b/signs_bot/doc.lua
@@ -1,13 +1,26 @@
+--[[
+
+	Signs Bot
+	=========
+
+	Copyright (C) 2019-2021 Joachim Stolberg
+
+	GPLv3
+	See LICENSE.txt for more information
+	
+	Signs Bot: Bot Flap
+
+]]--
+
+-- Load support for I18n.
+local S = signs_bot.S
+
 signs_bot.doc = {}
 
 if not minetest.get_modpath("doc") then
 	return
 end
 
--- Load support for intllib.
-local MP = minetest.get_modpath("signs_bot")
-local I,_ = dofile(MP.."/intllib.lua")
-
 local function formspec(data)
 	if data.image then
 		local image = "image["..(doc.FORMSPEC.ENTRY_WIDTH - 3)..",0;3,2;"..data.image.."]"
@@ -24,112 +37,113 @@ local function formspec(data)
 end
 
 local start_doc = table.concat({
-	I("After you have placed the Signs Bot Box, you can start the bot by means of the 'On' button in the box menu."),
-	I("The bot then runs straight up until it reaches an obstacle (a step with two or more blocks up or down or a sign.)"),
-	I("If the bot first reaches a sign it will execute the commands on the sign."),
-	I("If the command(s) on the sign is e.g. 'turn_around', the bot turns and goes back."),
-	I("In this case, the bot reaches his box again and turns off."),
+	S("After you have placed the Signs Bot Box, you can start the bot by means of the 'On' button in the box menu."),
+	S("If the bot returns to its box right away, you will likely need to charge it with electrical energy (techage) first."),
+	S("The bot then runs straight up until it reaches an obstacle (a step with two or more blocks up or down or a sign.)"),
+	S("If the bot first reaches a sign it will execute the commands on the sign."),
+	S("If the command(s) on the sign is e.g. 'turn_around', the bot turns and goes back."),
+	S("In this case, the bot reaches his box again and turns off."),
 	"",
-	I("The Signs Bot Box has an inventory with 6 stacks for signs and 8 stacks for other items (to be placed/dug by the bot)."),
-	I("This inventory simulates the bot internal inventory."),
-	I("That means you will only have access to the inventory if the bot is turned off ('sitting' in his box)."),
+	S("The Signs Bot Box has an inventory with 6 stacks for signs and 8 stacks for other items (to be placed/dug by the bot)."),
+	S("This inventory simulates the bot internal inventory."),
+	S("That means you will only have access to the inventory if the bot is turned off ('sitting' in his box)."),
 }, "\n")
 
 local control_doc = table.concat({
-	I("You simply control the direction of the bot by means of the 'turn left' and 'turn right' signs (signs with the arrow)."),
-	I("The bot can run over steps (one block up/down). But there are also commands to move the bot up and down."),
+	S("You simply control the direction of the bot by means of the 'turn left' and 'turn right' signs (signs with the arrow)."),
+	S("The bot can run over steps (one block up/down). But there are also commands to move the bot up and down."),
 	"",
-	I("It is not necessary to mark a way back to the box."),
-	I("With the command 'turn_off' the bot will turn off and be back in his box from every position."),
-	I("The same applies if you turn off the bot by the box menu."),
-	I("If the bot reaches a sign from the wrong direction (from back or sides) the sign will be ignored."),
-	I("The bot will walk over."),
+	S("It is not necessary to mark a way back to the box."),
+	S("With the command 'turn_off' the bot will turn off and be back in his box from every position."),
+	S("The same applies if you turn off the bot by the box menu."),
+	S("If the bot reaches a sign from the wrong direction (from back or sides) the sign will be ignored."),
+	S("The bot will walk over."),
 	"",
-	I("All predefined signs have a menu with a list of the bot commands."),
-	I("These signs can't be changed, but you can craft and program your own signs."),
-	I("For this you have to use the 'command' sign."),
-	I("This sign has an edit field for your commands and a help page with all available commands."),
-	I("The help page has a copy button to simplify the programming."),
+	S("All predefined signs have a menu with a list of the bot commands."),
+	S("These signs can't be changed, but you can craft and program your own signs."),
+	S("For this you have to use the 'command' sign."),
+	S("This sign has an edit field for your commands and a help page with all available commands."),
+	S("The help page has a copy button to simplify the programming."),
 	"",
-	I("Also for your own signs it is important to know:"),
-	I("After the execution of the last command of the sign, the bot falls back into its default behaviour and runs in its taken direction."),
+	S("Also for your own signs it is important to know:"),
+	S("After the execution of the last command of the sign, the bot falls back into its default behaviour and runs in its taken direction."),
 	"",
-	I("A standard job for the bot is to move items from one chest to another"),
-	I("(chest or node with a chest like inventory)."),
-	I("This can be done by means of the two signs 'take item' and 'add item'."),
-	I("These signs have to be placed on top of chest nodes."),
+	S("A standard job for the bot is to move items from one chest to another"),
+	S("(chest or node with a chest like inventory)."),
+	S("This can be done by means of the two signs 'take item' and 'add item'."),
+	S("These signs have to be placed on top of chest nodes."),
 }, "\n")
 
 local sensor_doc = table.concat({
-	I("In addition to the signs the bot can be controlled by means of sensors."),
-	I("Sensors like the Bot Sensor have two states: on and off."),
-	I("If the Bot Sensor detects a bot it will switch to the state 'on' and"),
-	I("sends a signal to a connected block, called an actuator."),
+	S("In addition to the signs the bot can be controlled by means of sensors."),
+	S("Sensors like the Bot Sensor have two states: on and off."),
+	S("If the Bot Sensor detects a bot it will switch to the state 'on' and"),
+	S("sends a signal to a connected block, called an actuator."),
 	"",
-	I("Sensors are:"),
-	I("- Bot Sensor: Sends a signal when the robot passes by"),
-	I("- Node Sensor: Sends a signal when it detects any node"),
-	I("- Crop Sensor: Sends a signal when, for example wheat is fully grown"),
-	I("- Bot Chest: Sends a signal depending on the chest state (empty, full)"),
+	S("Sensors are:"),
+	S("- Bot Sensor: Sends a signal when the robot passes by"),
+	S("- Node Sensor: Sends a signal when it detects any node"),
+	S("- Crop Sensor: Sends a signal when, for example wheat is fully grown"),
+	S("- Bot Chest: Sends a signal depending on the chest state (empty, full)"),
 	"",
-	I("Actuators are:"),
-	I("- Signs Bot Box: Can turn the bot off and on"),
-	I("- Control Unit: Can be used to exchange the sign to lead the bot"),
+	S("Actuators are:"),
+	S("- Signs Bot Box: Can turn the bot off and on"),
+	S("- Control Unit: Can be used to exchange the sign to lead the bot"),
 	"",
-	I("Additional sensors and actuator can be added by other mods."),
+	S("Additional sensors and actuator can be added by other mods."),
 }, "\n")
 
 
 local tool_doc = table.concat({
-	I("To send a signal from a sensor to an actuator, the sensor has to be connected (paired) with actuator."),
-	I("To connect sensor and actuator, the Sensor Connection Tool has to be used."),
-	I("Simply click with the tool on both blocks and the sensor will be connected with the actuator."),
-	I("A successful connection is indicated by a ping/pong noise."),
+	S("To send a signal from a sensor to an actuator, the sensor has to be connected (paired) with actuator."),
+	S("To connect sensor and actuator, the Sensor Connection Tool has to be used."),
+	S("Simply click with the tool on both blocks and the sensor will be connected with the actuator."),
+	S("A successful connection is indicated by a ping/pong noise."),
 	"",
-	I("Before you connect sensor with actuator, take care that the actuator is in the requested state."),
-	I("For example: If you want to start the Bot with a sensor, connect the sensor with the Bot Box,"),
-	I("when the Bot is in the state 'on'. Otherwise the sensor signal will stop the Bot,"),
-	I("instead of starting it."),
+	S("Before you connect sensor with actuator, take care that the actuator is in the requested state."),
+	S("For example: If you want to start the Bot with a sensor, connect the sensor with the Bot Box,"),
+	S("when the Bot is in the state 'on'. Otherwise the sensor signal will stop the Bot,"),
+	S("instead of starting it."),
 }, "\n")
 
 
 local inventory_doc = table.concat({
-	I("The following applies to all commands that are used to place items in the bot inventory, like:"),
+	S("The following applies to all commands that are used to place items in the bot inventory, like:"),
 	"",
-	I("- take_item <num> <slot>"),
-	I("- pickup_items <slot>"),
-	I("- trash_sign <slot>"),
-	I("- harvest <slot>"),
-	I("- dig_front <slot> <lvl>"),
-	I("- dig_left <slot> <lvl>"),
-	I("- dig_right <slot> <lvl>"),
-	I("- dig_below <slot> <lvl>"),
-	I("- dig_above <slot> <lvl>"),
+	S("- take_item <num> <slot>"),
+	S("- pickup_items <slot>"),
+	S("- trash_sign <slot>"),
+	S("- harvest <slot>"),
+	S("- dig_front <slot> <lvl>"),
+	S("- dig_left <slot> <lvl>"),
+	S("- dig_right <slot> <lvl>"),
+	S("- dig_below <slot> <lvl>"),
+	S("- dig_above <slot> <lvl>"),
 	"",
-	I("If no slot or slot 0 was specified with the command (case A), all 8 slots of the bot inventory "),
-	I("are checked one after the other. If a slot was specified (case B), only this slot is checked."),
-	I("In both cases the following applies: If the slot is preconfigured and fits the item, "),
-	I("or if the slot is not configured and empty, or is only partially filled with the item type "),
-	I("(which should be added), then the items are added."),
-	I("If not all items can be added, the remaining slots will be tried out in case A."),
-	I("Anything that could not be added to your own inventory goes back."),
+	S("If no slot or slot 0 was specified with the command (case A), all 8 slots of the bot inventory "),
+	S("are checked one after the other. If a slot was specified (case B), only this slot is checked."),
+	S("In both cases the following applies: If the slot is preconfigured and fits the item, "),
+	S("or if the slot is not configured and empty, or is only partially filled with the item type "),
+	S("(which should be added), then the items are added."),
+	S("If not all items can be added, the remaining slots will be tried out in case A."),
+	S("Anything that could not be added to your own inventory goes back."),
 	"",
-	I("The following applies to all commands that are used to take items from the bot inventory, like:"),
+	S("The following applies to all commands that are used to take items from the bot inventory, like:"),
 	"",
-	I("- add_item <num> <slot>"),
+	S("- add_item <num> <slot>"),
 	"",
-	I("It doesn't matter whether a slot is configured or not. The bot takes the first stack that "),
-	I("it can find from its own inventory and tries to use it."),
-	I("If a slot is specified, it only takes this, if no slot has been specified, it checks all of "),
-	I("them one after the other, starting from slot 1 until it finds something."),
-	I("If the number found is smaller than requested, he tries to take the rest out of any slot."),
+	S("It doesn't matter whether a slot is configured or not. The bot takes the first stack that "),
+	S("it can find from its own inventory and tries to use it."),
+	S("If a slot is specified, it only takes this, if no slot has been specified, it checks all of "),
+	S("them one after the other, starting from slot 1 until it finds something."),
+	S("If the number found is smaller than requested, he tries to take the rest out of any slot."),
 }, "\n")
 
 
 doc.add_category("signs_bot",
 {
-	name = I("Signs Bot"),
-	description = I("A robot controlled by signs, used for automated work"),
+	name = S("Signs Bot"),
+	description = S("A robot controlled by signs, used for automated work"),
 	sorting = "custom",
 	sorting_data = {"start", "control", "sensor_doc", "tool", 
 		"box", "bot_flap", "duplicator",
@@ -141,26 +155,26 @@ doc.add_category("signs_bot",
 })
 
 doc.add_entry("signs_bot", "start", {
-	name = I("Start the Bot"),
+	name = S("Start the Bot"),
 	data = {text = start_doc, image = "signs_bot_doc_image.png"},
 })
 
 doc.add_entry("signs_bot", "control", {
-	name = I("Control the Bot"),
+	name = S("Control the Bot"),
 	data = {text = control_doc, image = "signs_bot_doc_image.png"},
 })
 
 doc.add_entry("signs_bot", "sensor_doc", {
-	name = I("Sensors and Actuators"),
+	name = S("Sensors and Actuators"),
 	data = {text = sensor_doc, image = "signs_bot_doc_image.png"},
 })
 
 doc.add_entry("signs_bot", "tool", {
-	name = I("Connecting sensors and actuator"),
+	name = S("Connecting sensors and actuator"),
 	data = {text = tool_doc, image = "signs_bot_doc_image.png"},
 })
 
 doc.add_entry("signs_bot", "tool", {
-	name = I("Bot inventory behavior"),
+	name = S("Bot inventory behavior"),
 	data = {text = inventory_doc, image = "signs_bot_doc_image.png"},
 })
diff --git a/signs_bot/duplicator.lua b/signs_bot/duplicator.lua
index ee460cb..fb6b942 100644
--- a/signs_bot/duplicator.lua
+++ b/signs_bot/duplicator.lua
@@ -3,7 +3,7 @@
 	Signs Bot
 	=========
 
-	Copyright (C) 2019 Joachim Stolberg
+	Copyright (C) 2019-2021 Joachim Stolberg
 
 	GPL v3
 	See LICENSE.txt for more information
@@ -13,13 +13,10 @@
 ]]--
 
 -- for lazy programmers
-local S = function(pos) if pos then return minetest.pos_to_string(pos) end end
-local P = minetest.string_to_pos
 local M = minetest.get_meta
 
--- Load support for intllib.
-local MP = minetest.get_modpath("signs_bot")
-local I,_ = dofile(MP.."/intllib.lua")
+-- Load support for I18n.
+local S = signs_bot.S
 
 local lib = signs_bot.lib
 
@@ -27,15 +24,15 @@ local formspec = "size[8,7.3]"..
 	default.gui_bg..
 	default.gui_bg_img..
 	default.gui_slots..
-	"label[0.3,0;"..I("Input:").."]"..
-	"list[context;inp;3,0;1,1;]"..
-	"label[0.3,1;"..I("Template:").."]"..
-	"list[context;temp;3,1;1,1;]"..
-	"label[0.3,2;"..I("Output:").."]"..
-	"list[context;outp;3,2;1,1;]"..
-	"label[4,0;"..I("1. Place one 'cmnd' sign to be\n    used as template.\n")..
-			I("2. Add 'blank signs' to\n    the input inventory.\n")..
-			I("3. Take the copies\n    from the output inventory.").."]"..
+	"label[0.1,0.2;"..S("Template:").."]"..
+	"list[context;temp;2,0;1,1;]"..
+	"label[0.1,1.2;"..S("Input:").."]"..
+	"list[context;inp;2,1;1,1;]"..
+	"label[0.1,2.2;"..S("Output:").."]"..
+	"list[context;outp;2,2;1,1;]"..
+	"label[3,0.2;"..S("1. Place one 'cmnd' sign").."]"..
+	"label[3,1.2;"..S("2. Add 'blank signs'").."]"..
+	"label[3,2.2;"..S("3. Take the copies").."]"..
 	"list[current_player;main;0,3.5;8,4;]"..
 	"listring[context;inp]"..
 	"listring[current_player;main]"..
@@ -108,7 +105,7 @@ local function on_metadata_inventory_put(pos, listname, index, stack, player)
 end
 
 minetest.register_node("signs_bot:duplicator", {
-	description = I("Signs Duplicator"),
+	description = S("Signs Duplicator"),
 	stack_max = 1,
 	tiles = {
 		-- up, down, right, left, back, front
@@ -167,7 +164,7 @@ local function formspec_user(cmnd)
 end
 
 minetest.register_node("signs_bot:sign_user", {
-	description = I('Sign "user"'),
+	description = S('Sign "user"'),
 	drawtype = "nodebox",
 	inventory_image = "signs_bot_sign_user.png",
 	node_box = {
@@ -210,7 +207,7 @@ minetest.register_node("signs_bot:sign_user", {
 
 signs_bot.register_sign({
 	name = "sign_blank", 
-	description = I('Sign "blank"'), 
+	description = S('Sign "blank"'), 
 	commands = "", 
 	image = "signs_bot_sign_blank.png",
 })
@@ -226,17 +223,17 @@ minetest.register_craft({
 
 if minetest.get_modpath("doc") then
 	doc.add_entry("signs_bot", "duplicator", {
-		name = I("Signs Duplicator"),
+		name = S("Signs Duplicator"),
 		data = {
 			item = "signs_bot:duplicator",
 			text = table.concat({
-				I("The Duplicator can be used to make copies of signs."),
-				I("1. Put one 'cmnd' sign to be used as template into the 'Template' inventory"), 
-				I("2. Add one or several 'blank signs' to the 'Input' inventory."),
-				I("3. Take the copies from the 'Output' inventory."),
+				S("The Duplicator can be used to make copies of signs."),
+				S("1. Put one 'cmnd' sign to be used as template into the 'Template' inventory"), 
+				S("2. Add one or several 'blank signs' to the 'Input' inventory."),
+				S("3. Take the copies from the 'Output' inventory."),
 				"",
-				I("Written books [default:book_written] can alternatively be used as template"),
-				I("Already written signs can be used as input, too."),
+				S("Written books [default:book_written] can alternatively be used as template"),
+				S("Already written signs can be used as input, too."),
 			}, "\n")		
 		},
 	})
@@ -244,10 +241,10 @@ end
 
 if minetest.get_modpath("doc") then
 	doc.add_entry("signs_bot", "sign_blank", {
-		name = I('Sign "blank"'),
+		name = S('Sign "blank"'),
 		data = {
 			item = "signs_bot:sign_blank",
-			text = I("Needed as input for the Duplicator.")		
+			text = S("Needed as input for the Duplicator.")		
 		},
 	})
 end
diff --git a/signs_bot/extender.lua b/signs_bot/extender.lua
index fadab03..61c3063 100644
--- a/signs_bot/extender.lua
+++ b/signs_bot/extender.lua
@@ -3,7 +3,7 @@
 	Signs Bot
 	=========
 
-	Copyright (C) 2019 Joachim Stolberg
+	Copyright (C) 2019-2021 Joachim Stolberg
 
 	GPL v3
 	See LICENSE.txt for more information
@@ -13,22 +13,18 @@
 ]]--
 
 -- for lazy programmers
-local S = function(pos) if pos then return minetest.pos_to_string(pos) end end
-local P = minetest.string_to_pos
+local P2S = function(pos) if pos then return minetest.pos_to_string(pos) end end
 local M = minetest.get_meta
 
--- Load support for intllib.
-local MP = minetest.get_modpath("signs_bot")
-local I,_ = dofile(MP.."/intllib.lua")
-
-local lib = signs_bot.lib
+-- Load support for I18n.
+local S = signs_bot.S
 
 local function update_infotext(pos, dest_pos, cmnd)
-	M(pos):set_string("infotext", I("Sensor Extender: Connected with ")..S(dest_pos).." / "..cmnd)
+	M(pos):set_string("infotext", S("Sensor Extender: Connected with").." "..P2S(dest_pos).." / "..cmnd)
 end	
 
 minetest.register_node("signs_bot:sensor_extender", {
-	description = I("Sensor Extender"),
+	description = S("Sensor Extender"),
 	inventory_image = "signs_bot_extender_inv.png",
 	drawtype = "nodebox",
 	node_box = {
@@ -54,12 +50,13 @@ minetest.register_node("signs_bot:sensor_extender", {
 	
 	after_place_node = function(pos, placer)
 		local meta = M(pos)
-		meta:set_string("infotext", I("Sensor Extender: Not connected"))
+		meta:set_string("infotext", S("Sensor Extender: Not connected"))
 	end,
 	
 	update_infotext = update_infotext,
 	on_rotate = screwdriver.disallow,
 	paramtype = "light",
+	use_texture_alpha = signs_bot.CLIP,
 	sunlight_propagates = true,
 	paramtype2 = "facedir",
 	is_ground_content = false,
@@ -68,7 +65,7 @@ minetest.register_node("signs_bot:sensor_extender", {
 })
 
 minetest.register_node("signs_bot:sensor_extender_on", {
-	description = I("Sensor Extender"),
+	description = S("Sensor Extender"),
 	drawtype = "nodebox",
 	node_box = {
 		type = "connected",
@@ -108,6 +105,7 @@ minetest.register_node("signs_bot:sensor_extender_on", {
 	update_infotext = update_infotext,
 	on_rotate = screwdriver.disallow,
 	paramtype = "light",
+	use_texture_alpha = signs_bot.CLIP,
 	sunlight_propagates = true,
 	paramtype2 = "facedir",
 	is_ground_content = false,
@@ -127,13 +125,13 @@ minetest.register_craft({
 
 if minetest.get_modpath("doc") then
 	doc.add_entry("signs_bot", "sensor_extender", {
-		name = I("Sensor Extender"),
+		name = S("Sensor Extender"),
 		data = {
 			item = "signs_bot:sensor_extender",
 			text = table.concat({
-				I("With the Sensor Extender, sensor signals can be sent to more than one actuator."),
-				I("Place one or more extender nearby the sensor and connect each extender"), 
-				I("with one further actuator by means of the Connection Tool."), 
+				S("With the Sensor Extender, sensor signals can be sent to more than one actuator."),
+				S("Place one or more extender nearby the sensor and connect each extender"), 
+				S("with one further actuator by means of the Connection Tool."), 
 			}, "\n")		
 		},
 	})
diff --git a/signs_bot/i18n.py b/signs_bot/i18n.py
new file mode 100644
index 0000000..ece4e4c
--- /dev/null
+++ b/signs_bot/i18n.py
@@ -0,0 +1,458 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+#
+# Script to generate the template file and update the translation files.
+# Copy the script into the mod or modpack root folder and run it there.
+#
+# Copyright (C) 2019 Joachim Stolberg, 2020 FaceDeer, 2020 Louis Royer
+# LGPLv2.1+
+#
+# See https://github.com/minetest-tools/update_translations for
+# potential future updates to this script.
+
+from __future__ import print_function
+import os, fnmatch, re, shutil, errno
+from sys import argv as _argv
+from sys import stderr as _stderr
+
+# Running params
+params = {"recursive": False,
+    "help": False,
+    "mods": False,
+    "verbose": False,
+    "folders": [],
+    "no-old-file": False,
+    "break-long-lines": False,
+    "sort": False
+}
+# Available CLI options
+options = {"recursive": ['--recursive', '-r'],
+    "help": ['--help', '-h'],
+    "mods": ['--installed-mods', '-m'],
+    "verbose": ['--verbose', '-v'],
+    "no-old-file": ['--no-old-file', '-O'],
+    "break-long-lines": ['--break-long-lines', '-b'],
+    "sort": ['--sort', '-s']
+}
+
+# Strings longer than this will have extra space added between
+# them in the translation files to make it easier to distinguish their
+# beginnings and endings at a glance
+doublespace_threshold = 80
+
+def set_params_folders(tab: list):
+    '''Initialize params["folders"] from CLI arguments.'''
+    # Discarding argument 0 (tool name)
+    for param in tab[1:]:
+        stop_param = False
+        for option in options:
+            if param in options[option]:
+                stop_param = True
+                break
+        if not stop_param:
+            params["folders"].append(os.path.abspath(param))
+
+def set_params(tab: list):
+    '''Initialize params from CLI arguments.'''
+    for option in options:
+        for option_name in options[option]:
+            if option_name in tab:
+                params[option] = True
+                break
+
+def print_help(name):
+    '''Prints some help message.'''
+    print(f'''SYNOPSIS
+    {name} [OPTIONS] [PATHS...]
+DESCRIPTION
+    {', '.join(options["help"])}
+        prints this help message
+    {', '.join(options["recursive"])}
+        run on all subfolders of paths given
+    {', '.join(options["mods"])}
+        run on locally installed modules
+    {', '.join(options["no-old-file"])}
+        do not create *.old files
+    {', '.join(options["sort"])}
+        sort output strings alphabetically
+    {', '.join(options["break-long-lines"])}
+        add extra line breaks before and after long strings
+    {', '.join(options["verbose"])}
+        add output information
+''')
+
+
+def main():
+    '''Main function'''
+    set_params(_argv)
+    set_params_folders(_argv)
+    if params["help"]:
+        print_help(_argv[0])
+    elif params["recursive"] and params["mods"]:
+        print("Option --installed-mods is incompatible with --recursive")
+    else:
+        # Add recursivity message
+        print("Running ", end='')
+        if params["recursive"]:
+            print("recursively ", end='')
+        # Running
+        if params["mods"]:
+            print(f"on all locally installed modules in {os.path.abspath('~/.minetest/mods/')}")
+            run_all_subfolders("~/.minetest/mods")
+        elif len(params["folders"]) >= 2:
+            print("on folder list:", params["folders"])
+            for f in params["folders"]:
+                if params["recursive"]:
+                    run_all_subfolders(f)
+                else:
+                    update_folder(f)
+        elif len(params["folders"]) == 1:
+            print("on folder", params["folders"][0])
+            if params["recursive"]:
+                run_all_subfolders(params["folders"][0])
+            else:
+                update_folder(params["folders"][0])
+        else:
+            print("on folder", os.path.abspath("./"))
+            if params["recursive"]:
+                run_all_subfolders(os.path.abspath("./"))
+            else:
+                update_folder(os.path.abspath("./"))
+
+#group 2 will be the string, groups 1 and 3 will be the delimiters (" or ')
+#See https://stackoverflow.com/questions/46967465/regex-match-text-in-either-single-or-double-quote
+pattern_lua_s = re.compile(r'[\.=^\t,{\(\s]N?S\(\s*(["\'])((?:\\\1|(?:(?!\1)).)*)(\1)[\s,\)]', re.DOTALL)
+pattern_lua_fs = re.compile(r'[\.=^\t,{\(\s]N?FS\(\s*(["\'])((?:\\\1|(?:(?!\1)).)*)(\1)[\s,\)]', re.DOTALL)
+pattern_lua_bracketed_s = re.compile(r'[\.=^\t,{\(\s]N?S\(\s*\[\[(.*?)\]\][\s,\)]', re.DOTALL)
+pattern_lua_bracketed_fs = re.compile(r'[\.=^\t,{\(\s]N?FS\(\s*\[\[(.*?)\]\][\s,\)]', re.DOTALL)
+
+# Handles "concatenation" .. " of strings"
+pattern_concat = re.compile(r'["\'][\s]*\.\.[\s]*["\']', re.DOTALL)
+
+pattern_tr = re.compile(r'(.*?[^@])=(.*)')
+pattern_name = re.compile(r'^name[ ]*=[ ]*([^ \n]*)')
+pattern_tr_filename = re.compile(r'\.tr$')
+pattern_po_language_code = re.compile(r'(.*)\.po$')
+
+#attempt to read the mod's name from the mod.conf file. Returns None on failure
+def get_modname(folder):
+    try:
+        with open(os.path.join(folder, "mod.conf"), "r", encoding='utf-8') as mod_conf:
+            for line in mod_conf:
+                match = pattern_name.match(line)
+                if match:
+                    return match.group(1)
+    except FileNotFoundError:
+        pass
+    return None
+
+#If there are already .tr files in /locale, returns a list of their names
+def get_existing_tr_files(folder):
+    out = []
+    for root, dirs, files in os.walk(os.path.join(folder, 'locale/')):
+        for name in files:
+            if pattern_tr_filename.search(name):
+                out.append(name)
+    return out
+
+# A series of search and replaces that massage a .po file's contents into
+# a .tr file's equivalent
+def process_po_file(text):
+    # The first three items are for unused matches
+    text = re.sub(r'#~ msgid "', "", text)
+    text = re.sub(r'"\n#~ msgstr ""\n"', "=", text)
+    text = re.sub(r'"\n#~ msgstr "', "=", text)
+    # comment lines
+    text = re.sub(r'#.*\n', "", text)
+    # converting msg pairs into "=" pairs
+    text = re.sub(r'msgid "', "", text)
+    text = re.sub(r'"\nmsgstr ""\n"', "=", text)
+    text = re.sub(r'"\nmsgstr "', "=", text)
+    # various line breaks and escape codes
+    text = re.sub(r'"\n"', "", text)
+    text = re.sub(r'"\n', "\n", text)
+    text = re.sub(r'\\"', '"', text)
+    text = re.sub(r'\\n', '@n', text)
+    # remove header text
+    text = re.sub(r'=Project-Id-Version:.*\n', "", text)
+    # remove double-spaced lines
+    text = re.sub(r'\n\n', '\n', text)
+    return text
+
+# Go through existing .po files and, if a .tr file for that language
+# *doesn't* exist, convert it and create it.
+# The .tr file that results will subsequently be reprocessed so
+# any "no longer used" strings will be preserved.
+# Note that "fuzzy" tags will be lost in this process.
+def process_po_files(folder, modname):
+    for root, dirs, files in os.walk(os.path.join(folder, 'locale/')):
+        for name in files:
+            code_match = pattern_po_language_code.match(name)
+            if code_match == None:
+                continue
+            language_code = code_match.group(1)
+            tr_name = modname + "." + language_code + ".tr"
+            tr_file = os.path.join(root, tr_name)
+            if os.path.exists(tr_file):
+                if params["verbose"]:
+                    print(f"{tr_name} already exists, ignoring {name}")
+                continue
+            fname = os.path.join(root, name)
+            with open(fname, "r", encoding='utf-8') as po_file:
+                if params["verbose"]:
+                    print(f"Importing translations from {name}")
+                text = process_po_file(po_file.read())
+                with open(tr_file, "wt", encoding='utf-8') as tr_out:
+                    tr_out.write(text)
+
+# from https://stackoverflow.com/questions/600268/mkdir-p-functionality-in-python/600612#600612
+# Creates a directory if it doesn't exist, silently does
+# nothing if it already exists
+def mkdir_p(path):
+    try:
+        os.makedirs(path)
+    except OSError as exc: # Python >2.5
+        if exc.errno == errno.EEXIST and os.path.isdir(path):
+            pass
+        else: raise
+
+# Converts the template dictionary to a text to be written as a file
+# dKeyStrings is a dictionary of localized string to source file sets
+# dOld is a dictionary of existing translations and comments from
+# the previous version of this text
+def strings_to_text(dkeyStrings, dOld, mod_name, header_comments):
+    lOut = [f"# textdomain: {mod_name}\n"]
+    if header_comments is not None:
+        lOut.append(header_comments)
+
+    dGroupedBySource = {}
+
+    for key in dkeyStrings:
+        sourceList = list(dkeyStrings[key])
+        if params["sort"]:
+            sourceList.sort()
+        sourceString = "\n".join(sourceList)
+        listForSource = dGroupedBySource.get(sourceString, [])
+        listForSource.append(key)
+        dGroupedBySource[sourceString] = listForSource
+
+    lSourceKeys = list(dGroupedBySource.keys())
+    lSourceKeys.sort()
+    for source in lSourceKeys:
+        localizedStrings = dGroupedBySource[source]
+        if params["sort"]:
+            localizedStrings.sort()
+        lOut.append("")
+        lOut.append(source)
+        lOut.append("")
+        for localizedString in localizedStrings:
+            val = dOld.get(localizedString, {})
+            translation = val.get("translation", "")
+            comment = val.get("comment")
+            if params["break-long-lines"] and len(localizedString) > doublespace_threshold and not lOut[-1] == "":
+                lOut.append("")
+            if comment != None:
+                lOut.append(comment)
+            lOut.append(f"{localizedString}={translation}")
+            if params["break-long-lines"] and len(localizedString) > doublespace_threshold:
+                lOut.append("")
+
+
+    unusedExist = False
+    for key in dOld:
+        if key not in dkeyStrings:
+            val = dOld[key]
+            translation = val.get("translation")
+            comment = val.get("comment")
+            # only keep an unused translation if there was translated
+            # text or a comment associated with it
+            if translation != None and (translation != "" or comment):
+                if not unusedExist:
+                    unusedExist = True
+                    lOut.append("\n\n##### not used anymore #####\n")
+                if params["break-long-lines"] and len(key) > doublespace_threshold and not lOut[-1] == "":
+                    lOut.append("")
+                if comment != None:
+                    lOut.append(comment)
+                lOut.append(f"{key}={translation}")
+                if params["break-long-lines"] and len(key) > doublespace_threshold:
+                    lOut.append("")
+    return "\n".join(lOut) + '\n'
+
+# Writes a template.txt file
+# dkeyStrings is the dictionary returned by generate_template
+def write_template(templ_file, dkeyStrings, mod_name):
+    # read existing template file to preserve comments
+    existing_template = import_tr_file(templ_file)
+
+    text = strings_to_text(dkeyStrings, existing_template[0], mod_name, existing_template[2])
+    mkdir_p(os.path.dirname(templ_file))
+    with open(templ_file, "wt", encoding='utf-8') as template_file:
+        template_file.write(text)
+
+
+# Gets all translatable strings from a lua file
+def read_lua_file_strings(lua_file):
+    lOut = []
+    with open(lua_file, encoding='utf-8') as text_file:
+        text = text_file.read()
+        #TODO remove comments here
+
+        text = re.sub(pattern_concat, "", text)
+
+        strings = []
+        for s in pattern_lua_s.findall(text):
+            strings.append(s[1])
+        for s in pattern_lua_bracketed_s.findall(text):
+            strings.append(s)
+        for s in pattern_lua_fs.findall(text):
+            strings.append(s[1])
+        for s in pattern_lua_bracketed_fs.findall(text):
+            strings.append(s)
+
+        for s in strings:
+            s = re.sub(r'"\.\.\s+"', "", s)
+            s = re.sub("@[^@=0-9]", "@@", s)
+            s = s.replace('\\"', '"')
+            s = s.replace("\\'", "'")
+            s = s.replace("\n", "@n")
+            s = s.replace("\\n", "@n")
+            s = s.replace("=", "@=")
+            lOut.append(s)
+    return lOut
+
+# Gets strings from an existing translation file
+# returns both a dictionary of translations
+# and the full original source text so that the new text
+# can be compared to it for changes.
+# Returns also header comments in the third return value.
+def import_tr_file(tr_file):
+    dOut = {}
+    text = None
+    header_comment = None
+    if os.path.exists(tr_file):
+        with open(tr_file, "r", encoding='utf-8') as existing_file :
+            # save the full text to allow for comparison
+            # of the old version with the new output
+            text = existing_file.read()
+            existing_file.seek(0)
+            # a running record of the current comment block
+            # we're inside, to allow preceeding multi-line comments
+            # to be retained for a translation line
+            latest_comment_block = None
+            for line in existing_file.readlines():
+                line = line.rstrip('\n')
+                if line[:3] == "###":
+                    if header_comment is None:
+                        # Save header comments
+                        header_comment = latest_comment_block
+                        # Stip textdomain line
+                        tmp_h_c = ""
+                        for l in header_comment.split('\n'):
+                            if not l.startswith("# textdomain:"):
+                                tmp_h_c += l + '\n'
+                        header_comment = tmp_h_c
+
+                    # Reset comment block if we hit a header
+                    latest_comment_block = None
+                    continue
+                if line[:1] == "#":
+                    # Save the comment we're inside
+                    if not latest_comment_block:
+                        latest_comment_block = line
+                    else:
+                        latest_comment_block = latest_comment_block + "\n" + line
+                    continue
+                match = pattern_tr.match(line)
+                if match:
+                    # this line is a translated line
+                    outval = {}
+                    outval["translation"] = match.group(2)
+                    if latest_comment_block:
+                        # if there was a comment, record that.
+                        outval["comment"] = latest_comment_block
+                    latest_comment_block = None
+                    dOut[match.group(1)] = outval
+    return (dOut, text, header_comment)
+
+# Walks all lua files in the mod folder, collects translatable strings,
+# and writes it to a template.txt file
+# Returns a dictionary of localized strings to source file sets
+# that can be used with the strings_to_text function.
+def generate_template(folder, mod_name):
+    dOut = {}
+    for root, dirs, files in os.walk(folder):
+        for name in files:
+            if fnmatch.fnmatch(name, "*.lua"):
+                fname = os.path.join(root, name)
+                found = read_lua_file_strings(fname)
+                if params["verbose"]:
+                    print(f"{fname}: {str(len(found))} translatable strings")
+
+                for s in found:
+                    sources = dOut.get(s, set())
+                    sources.add(f"### {os.path.basename(fname)} ###")
+                    dOut[s] = sources
+
+    if len(dOut) == 0:
+        return None
+    templ_file = os.path.join(folder, "locale/template.txt")
+    write_template(templ_file, dOut, mod_name)
+    return dOut
+
+# Updates an existing .tr file, copying the old one to a ".old" file
+# if any changes have happened
+# dNew is the data used to generate the template, it has all the
+# currently-existing localized strings
+def update_tr_file(dNew, mod_name, tr_file):
+    if params["verbose"]:
+        print(f"updating {tr_file}")
+
+    tr_import = import_tr_file(tr_file)
+    dOld = tr_import[0]
+    textOld = tr_import[1]
+
+    textNew = strings_to_text(dNew, dOld, mod_name, tr_import[2])
+
+    if textOld and textOld != textNew:
+        print(f"{tr_file} has changed.")
+        if not params["no-old-file"]:
+            shutil.copyfile(tr_file, f"{tr_file}.old")
+
+    with open(tr_file, "w", encoding='utf-8') as new_tr_file:
+        new_tr_file.write(textNew)
+
+# Updates translation files for the mod in the given folder
+def update_mod(folder):
+    modname = get_modname(folder)
+    if modname is not None:
+        process_po_files(folder, modname)
+        print(f"Updating translations for {modname}")
+        data = generate_template(folder, modname)
+        if data == None:
+            print(f"No translatable strings found in {modname}")
+        else:
+            for tr_file in get_existing_tr_files(folder):
+                update_tr_file(data, modname, os.path.join(folder, "locale/", tr_file))
+    else:
+        print(f"\033[31mUnable to find modname in folder {folder}.\033[0m", file=_stderr)
+        exit(1)
+
+# Determines if the folder being pointed to is a mod or a mod pack
+# and then runs update_mod accordingly
+def update_folder(folder):
+    is_modpack = os.path.exists(os.path.join(folder, "modpack.txt")) or os.path.exists(os.path.join(folder, "modpack.conf"))
+    if is_modpack:
+        subfolders = [f.path for f in os.scandir(folder) if f.is_dir()]
+        for subfolder in subfolders:
+            update_mod(subfolder + "/")
+    else:
+        update_mod(folder)
+    print("Done.")
+
+def run_all_subfolders(folder):
+    for modfolder in [f.path for f in os.scandir(folder) if f.is_dir()]:
+        update_folder(modfolder + "/")
+
+
+main()
diff --git a/signs_bot/init.lua b/signs_bot/init.lua
index 27a61c1..5db123f 100644
--- a/signs_bot/init.lua
+++ b/signs_bot/init.lua
@@ -3,7 +3,7 @@
 	Signs Bot
 	=========
 
-	Copyright (C) 2019 Joachim Stolberg
+	Copyright (C) 2019-2021 Joachim Stolberg
 
 	GPL v3
 	See LICENSE.txt for more information
@@ -15,7 +15,10 @@
 signs_bot = {}
 
 -- Version for compatibility checks, see readme.md/history
-signs_bot.version = 1.05
+signs_bot.version = 1.08
+
+-- Test for MT 5.4 new string mode
+signs_bot.CLIP = minetest.features.use_texture_alpha_string_modes and "clip" or true
 
 if minetest.global_exists("techage") and techage.version < 0.25 then
 	error("[signs_bot] Signs Bot requires techage version 0.25 or newer!")
@@ -25,8 +28,15 @@ if tubelib2.version < 1.9 then
 	error("[signs_bot] Signs Bot requires tubelib2 version 1.9 or newer!")
 end
 
+if minetest.global_exists("minecart") and minecart.version < 2.0 then
+	error("[signs_bot] Signs Bot requires minecart version 2.0 or newer!")
+end
+
+-- Load support for I18n.
 signs_bot.S = minetest.get_translator("signs_bot")
+
 local MP = minetest.get_modpath("signs_bot")
+
 dofile(MP.."/doc.lua")
 dofile(MP.."/random.lua")
 dofile(MP.."/lib.lua")
@@ -60,5 +70,6 @@ dofile(MP.."/techage.lua")
 dofile(MP.."/timer.lua")
 dofile(MP.."/delayer.lua")
 dofile(MP.."/logic_and.lua")
+dofile(MP.."/compost.lua")
 
 dofile(MP.."/tool.lua")
diff --git a/signs_bot/interpreter.lua b/signs_bot/interpreter.lua
index 6aa64fd..a0e859e 100644
--- a/signs_bot/interpreter.lua
+++ b/signs_bot/interpreter.lua
@@ -3,7 +3,7 @@
 	Signs Bot
 	=========
 
-	Copyright (C) 2019-2020 Joachim Stolberg
+	Copyright (C) 2019-2021 Joachim Stolberg
 
 	GPL v3
 	See LICENSE.txt for more information
@@ -12,9 +12,8 @@
 
 ]]--
 
--- Load support for intllib.
-local MP = minetest.get_modpath("signs_bot")
-local I,_ = dofile(MP.."/intllib.lua")
+-- Load support for I18n.
+local S = signs_bot.S
 
 local MAX_SIZE = 1000  -- max number of tokens
 
@@ -128,6 +127,19 @@ local function compile(script)
 	return pass2(tokens)
 end	
 
+local function gen_string_cmnd(code, pc, num_param, script)
+	local tokens = tokenizer(script)
+	if num_param == 0 then
+		return tokens[pc]
+	elseif num_param == 1 then
+		return tokens[pc] .. " " .. (tokens[pc+1] or "")
+	elseif num_param == 2 then
+		return tokens[pc] .. " " .. (tokens[pc+1] or "") .. " " .. (tokens[pc+2] or "")
+	else
+		return tokens[pc] .. " " .. (tokens[pc+1] or "") .. " " .. (tokens[pc+2] or "") .. " " .. (tokens[pc+3] or "")
+	end
+end
+
 -------------------------------------------------------------------------------
 -- Commands
 -------------------------------------------------------------------------------
@@ -235,29 +247,29 @@ function api.check_script(script)
 		if tCmdDef[cmnd] then
 			num_token = num_token + 1 + tCmdDef[cmnd].num_param
 			if num_token > MAX_SIZE then
-				return false, I("Maximum programm size exceeded"), idx
+				return false, S("Maximum programm size exceeded"), idx
 			end
 			param1 = tonumber(param1) or param1
 			param2 = tonumber(param2) or param2
 			param3 = tonumber(param3) or param3
 			local num_param = (param1 and 1 or 0) + (param2 and 1 or 0) + (param3 and 1 or 0)
 			if tCmdDef[cmnd].num_param < num_param then
-				return false, I("Too many parameters"), idx
+				return false, S("Too many parameters"), idx
 			end
 			if tCmdDef[cmnd].num_param > 0 and not tCmdDef[cmnd].check(param1, param2, param3) then
-				return false, I("Parameter error"), idx
+				return false, S("Parameter error"), idx
 			end
 		elseif not cmnd:find("%w+:") then
-			return false, I("Command error"), idx
+			return false, S("Command error"), idx
 		end
 		tbl[cmnd] = (tbl[cmnd] or 0) + 1
 	end
 	if (tbl["end"] or 0) > (tbl["repeat"] or 0) then
-		return false, I("'repeat' missing"), 0
+		return false, S("'repeat' missing"), 0
 	elseif (tbl["end"] or 0) < (tbl["repeat"] or 0) then
-		return false, I("'end' missing"), 0
+		return false, S("'end' missing"), 0
 	end
-	return true, I("Checked and approved"), 0
+	return true, S("Checked and approved"), 0
 end	
 
 -- function returns: true/false, error-string
@@ -281,7 +293,7 @@ function api.run_script(base_pos, mem)
 			mem.pc = 1
 			mem.Stack = {}
 		end
-		return res, err
+		return res, err, gen_string_cmnd(code, mem.pc, num_param, mem.script)
 	end
 	return api.EXIT
 end
diff --git a/signs_bot/intllib.lua b/signs_bot/intllib.lua
deleted file mode 100644
index 6669d72..0000000
--- a/signs_bot/intllib.lua
+++ /dev/null
@@ -1,45 +0,0 @@
-
--- Fallback functions for when `intllib` is not installed.
--- Code released under Unlicense <http://unlicense.org>.
-
--- Get the latest version of this file at:
---   https://raw.githubusercontent.com/minetest-mods/intllib/master/lib/intllib.lua
-
-local function format(str, ...)
-	local args = { ... }
-	local function repl(escape, open, num, close)
-		if escape == "" then
-			local replacement = tostring(args[tonumber(num)])
-			if open == "" then
-				replacement = replacement..close
-			end
-			return replacement
-		else
-			return "@"..open..num..close
-		end
-	end
-	return (str:gsub("(@?)@(%(?)(%d+)(%)?)", repl))
-end
-
-local gettext, ngettext
-if minetest.get_modpath("intllib") then
-	if intllib.make_gettext_pair then
-		-- New method using gettext.
-		gettext, ngettext = intllib.make_gettext_pair()
-	else
-		-- Old method using text files.
-		gettext = intllib.Getter()
-	end
-end
-
--- Fill in missing functions.
-
-gettext = gettext or function(msgid, ...)
-	return format(msgid, ...)
-end
-
-ngettext = ngettext or function(msgid, msgid_plural, n, ...)
-	return format(n==1 and msgid or msgid_plural, ...)
-end
-
-return gettext, ngettext
diff --git a/signs_bot/intllib.sh b/signs_bot/intllib.sh
index 3d13319..d4c7453 100755
--- a/signs_bot/intllib.sh
+++ b/signs_bot/intllib.sh
@@ -1,4 +1,4 @@
 #!/bin/bash
 
-../intllib/tools/xgettext.sh ./basis.lua ./bot_flap.lua ./bot_sensor.lua ./cart_sensor.lua ./changer.lua ./chest.lua ./cmd_farming.lua ./cmd_flowers.lua ./cmd_item.lua ./cmd_move.lua ./cmd_pattern.lua ./cmd_place.lua ./cmd_sign.lua ./commands.lua ./crop_sensor.lua ./doc.lua ./duplicator.lua ./extender.lua ./init.lua ./lib.lua ./node_sensor.lua ./nodes.lua ./robot.lua ./signal.lua ./signs.lua ./tool.lua ./timer.lua ./delayer.lua ./logic_and.lua ./interpreter.lua
+../intllib/tools/xgettext.sh ./basis.lua ./bot_flap.lua ./bot_sensor.lua ./cart_sensor.lua ./changer.lua ./chest.lua ./cmd_farming.lua ./cmd_flowers.lua ./cmd_item.lua ./cmd_move.lua ./cmd_pattern.lua ./cmd_place.lua ./cmd_sign.lua ./commands.lua ./crop_sensor.lua ./doc.lua ./duplicator.lua ./extender.lua ./init.lua ./lib.lua ./node_sensor.lua ./nodes.lua ./robot.lua ./signal.lua ./signs.lua ./tool.lua ./timer.lua ./delayer.lua ./logic_and.lua ./interpreter.lua ./compost.lua
 
diff --git a/signs_bot/legacy.lua b/signs_bot/legacy.lua
index 7587a21..e0982e3 100644
--- a/signs_bot/legacy.lua
+++ b/signs_bot/legacy.lua
@@ -3,7 +3,7 @@
 	Signs Bot
 	=========
 
-	Copyright (C) 2019 Joachim Stolberg
+	Copyright (C) 2019-2021 Joachim Stolberg
 
 	GPL v3
 	See LICENSE.txt for more information
@@ -13,8 +13,6 @@
 ]]--
 
 -- for lazy programmers
-local S = function(pos) if pos then return minetest.pos_to_string(pos) end end
-local P = minetest.string_to_pos
 local M = minetest.get_meta
 
 signs_bot.register_inventory({"default:chest", "default:chest_open"}, {
@@ -63,3 +61,21 @@ signs_bot.register_inventory({"default:furnace", "default:furnace_active"}, {
 	},
 })
 
+signs_bot.register_inventory({"mobs:beehive"}, {
+	put = {
+		listname = "beehive",
+	},
+	take = {
+		listname = "beehive",
+	},
+})
+
+signs_bot.register_inventory({"xdecor:hive"}, {
+	put = {
+		listname = "honey",
+	},
+	take = {
+		listname = "honey",
+	},
+})
+
diff --git a/signs_bot/lib.lua b/signs_bot/lib.lua
index 35b0f51..9a82db1 100644
--- a/signs_bot/lib.lua
+++ b/signs_bot/lib.lua
@@ -3,7 +3,7 @@
 	Signs Bot
 	=========
 
-	Copyright (C) 2019 Joachim Stolberg
+	Copyright (C) 2019-2021 Joachim Stolberg
 
 	GPL v3
 	See LICENSE.txt for more information
@@ -13,8 +13,6 @@
 ]]--
 
 -- for lazy programmers
-local S = function(pos) if pos then return minetest.pos_to_string(pos) end end
-local P = minetest.string_to_pos
 local M = minetest.get_meta
 
 signs_bot.lib = {}
@@ -90,6 +88,13 @@ local function handle_drop(drop)
 			end
 		end
 		return name
+        end
+end
+
+function signs_bot.handle_drop_like_a_player(node)
+	local drops = minetest.get_node_drops(node)
+	if #drops >= 1 then
+		return drops[1]
 	end
 	return false
 end
@@ -213,7 +218,6 @@ function signs_bot.lib.after_dig_sign_node(pos, oldnode, oldmetadata, digger)
 		smeta:set_string("err_msg", oldmetadata.fields.err_msg or "")
 	end
 	local player_name = digger:get_player_name()
-	-- See https://github.com/minetest/minetest/blob/34e3ede8eeb05e193e64ba3d055fc67959d87d86/doc/lua_api.txt#L6222
 	if player_name == "" then
 		minetest.add_item(pos, sign)
 	else
diff --git a/signs_bot/locale/de.mo b/signs_bot/locale/de.mo
deleted file mode 100644
index 6d8ce86..0000000
Binary files a/signs_bot/locale/de.mo and /dev/null differ
diff --git a/signs_bot/locale/de.po b/signs_bot/locale/de.po
deleted file mode 100644
index 8ce5fb7..0000000
--- a/signs_bot/locale/de.po
+++ /dev/null
@@ -1,1674 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-23 17:16+0200\n"
-"PO-Revision-Date: 2020-06-23 17:19+0200\n"
-"Last-Translator: \n"
-"Language-Team: \n"
-"Language: de\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 2.0.6\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: basis.lua
-msgid "Off"
-msgstr "Aus"
-
-#: basis.lua
-msgid "On"
-msgstr "An"
-
-#: basis.lua
-msgid "Signs"
-msgstr "Zeichen"
-
-#: basis.lua
-msgid "Other items"
-msgstr "Andere Gegenstände"
-
-#: basis.lua
-msgid "Config"
-msgstr "Konfig."
-
-#: basis.lua
-msgid "Preassign slots items"
-msgstr "Vorbelegungen"
-
-#: basis.lua
-msgid "Back"
-msgstr "Zurück"
-
-#: basis.lua
-msgid "Robot Box "
-msgstr "Roboter Box "
-
-#: basis.lua
-msgid "running"
-msgstr "läuft"
-
-#: basis.lua
-msgid "charging"
-msgstr "aufladen"
-
-#: basis.lua
-msgid "stopped"
-msgstr "gestoppt"
-
-#: basis.lua
-msgid "Signs Bot Box"
-msgstr "Roboter Box"
-
-#: basis.lua
-msgid "no power"
-msgstr "kein Strom"
-
-#: basis.lua
-msgid "The Box is the housing of the bot."
-msgstr "Die Box ist das Gehäuse des Roboters."
-
-#: basis.lua
-msgid "Place the box and start the bot by means of the 'On' button."
-msgstr "Platziere die Box und starte den Roboter über den \"An\" Button."
-
-#: basis.lua
-msgid "If the mod techage is installed, the bot needs electrical power."
-msgstr ""
-"Wenn die Mod techage installiert ist, benötigt der Roboter elektrischen "
-"Strom."
-
-#: basis.lua
-msgid "The bot leaves the box on the right side."
-msgstr "Der Roboter verlässt die Box auf der rechten Seite."
-
-#: basis.lua
-msgid "It will not start, if this position is blocked."
-msgstr "Er startet nicht, wenn diese Position belegt ist."
-
-#: basis.lua
-msgid "To stop and remove the bot, press the 'Off' button."
-msgstr ""
-"Um den Roboter zu stoppen bzw. zu entfernen, drücke den \"Aus\" Button."
-
-#: basis.lua
-msgid "The box inventory simulates the inventory of the bot."
-msgstr "Das Inventar der Box simuliert das Roboter Inventar."
-
-#: basis.lua
-msgid "You will not be able to access the inventory, if the bot is running."
-msgstr ""
-"Du hast keinen Zugriff auf das Inventar, sofern der Roboter unterwegs ist."
-
-#: basis.lua
-msgid "The bot can carry up to 8 stacks and 6 signs with it."
-msgstr "Der Roboter kann 8 Stapel von Blöcken und 6 Zeichen transportieren."
-
-#: bot_flap.lua
-msgid "Exit"
-msgstr "Beenden"
-
-#: bot_flap.lua
-msgid "Bot Flap"
-msgstr "Roboterklappe"
-
-#: bot_flap.lua
-msgid "The flap is a simple block used as door for the bot."
-msgstr ""
-"Die Klappe ist ein einfacher Block, welcher vom Roboter als Tür genutzt wird."
-
-#: bot_flap.lua
-msgid "Place the flap in any wall, and the bot will automatically open"
-msgstr ""
-"Platziere die Klappe in eine Mauer und der Roboter wird die Klappe "
-"automatisch öffnen"
-
-#: bot_flap.lua
-msgid "and close the flap as it passes through it."
-msgstr "und wieder schließen, wenn er durchgegangen ist."
-
-#: bot_sensor.lua
-msgid "Bot Sensor: Connected with "
-msgstr "Bot Sensor: Verbunden mit "
-
-#: bot_sensor.lua
-msgid "Bot Sensor"
-msgstr "Bot Sensor"
-
-#: bot_sensor.lua
-msgid "Bot Sensor: Not connected"
-msgstr "Bot Sensor: Nicht verbunden"
-
-#: bot_sensor.lua
-msgid "The Bot Sensor detects any bot and sends a signal, if a bot is nearby."
-msgstr ""
-"Der Roboter Sensor entdeckt jeden Roboter und sendet ein Signal, sofern ein "
-"Roboter in der Nähe ist."
-
-#: bot_sensor.lua cart_sensor.lua
-msgid "the sensor range is one node/meter."
-msgstr "Der Sensorbereich ist einen Block/Meter groß."
-
-#: bot_sensor.lua
-msgid "The sensor direction does not care."
-msgstr "Die Ausrichtung des Sensor spielt keine Rolle."
-
-#: cart_sensor.lua
-msgid "Cart Sensor: Connected with "
-msgstr "Wagen Sensor: Verbunden mit "
-
-#: cart_sensor.lua
-msgid "Cart Sensor"
-msgstr "Wagen Sensor"
-
-#: cart_sensor.lua
-msgid ""
-"The Cart Sensor detects and sends a signal, if a cart (Minecart) is nearby."
-msgstr "Der Wagen Sensor sendet ein Signal, sofern ein Wagen in der Nähe ist."
-
-#: cart_sensor.lua
-msgid "The sensor has an active side (red) that must point to the rail/cart."
-msgstr ""
-"Der Sensor hat eine aktive Seite (rot), welche zu den Schienen zeigen muss."
-
-#: changer.lua
-msgid "Signs:"
-msgstr "Zeichen:"
-
-#: changer.lua
-msgid "Bot Control Unit"
-msgstr "Roboter Steuerungseinheit"
-
-#: changer.lua
-msgid "The Bot Control Unit is used to lead the bot by means of signs."
-msgstr ""
-"Die Roboter Steuerungseinheit dient zur Steuerung des Roboters über Zeichen."
-
-#: changer.lua
-msgid ""
-"The unit can be loaded with up to 4 different signs and can be programmed by "
-"means of sensors."
-msgstr ""
-"Die Einheit kann mit bis zu 4 verschiedenen Zeichen geladen und über "
-"Sensoren programmiert werden."
-
-#: changer.lua
-msgid ""
-"To load the unit, place a sign on the red side of the unit and click on the "
-"unit."
-msgstr ""
-"Um die Steuerungseinheit zu laden, platziere ein Zeichen auf die rote Seite "
-"der Einheit und klicke auf die Einheit."
-
-#: changer.lua
-msgid "The sign disappears / is moved to the inventory of the unit."
-msgstr "Das Zeichen verschwindet/ist in die Steuerungseinheit verschoben."
-
-#: changer.lua
-msgid "This can be repeated 3 times."
-msgstr "Dies kann bis zu 3 mal wiederholt werden."
-
-#: changer.lua
-msgid ""
-"Use the connection tool to connect up to 4 sensors with the Bot Control Unit."
-msgstr ""
-"Benutze das Verbinde-Werkzeug um die bis zu 4 Sensoren mit der "
-"Steuerungseinheit zu verbinden."
-
-#: chest.lua
-msgid "Bot Chest: Sends signal to "
-msgstr "Roboter Kiste: Sende Signal zu "
-
-#: chest.lua
-msgid "Signs Bot Chest"
-msgstr "Signs Bot Kiste"
-
-#: chest.lua
-msgid "The Signs Bot Chest is a special chest with sensor function."
-msgstr ""
-"Die Roboter Kiste ist eine spezielle Kiste mit zusätzlicher Sensor-Funktion."
-
-#: chest.lua
-msgid "It sends a signal depending on the chest state."
-msgstr "Sie sendet ein Signal abhängig vom Zustand der Kiste."
-
-#: chest.lua
-msgid "Possible states are 'empty', 'not empty', 'almost full'"
-msgstr "Mögliche Zustände sind \"leer\", \"nicht leer\" und \"fast voll\""
-
-#: chest.lua
-msgid ""
-"A typical use case is to turn off the bot, when the chest is almost full or "
-"empty."
-msgstr ""
-"Ein typischer Anwendungsfall ist den Roboter zu stoppen, wenn die Kiste fast "
-"voll oder leer ist."
-
-#: cmd_farming.lua
-msgid ""
-"Sow farming seeds\n"
-"in front of the robot"
-msgstr ""
-"Sähe Saatgut\n"
-"vor dem Roboter"
-
-#: cmd_farming.lua
-msgid ""
-"Harvest farming products\n"
-"in front of the robot\n"
-"on a 3x3 field."
-msgstr ""
-"Ernte Früchte/Getreide\n"
-"in einem 3x3 großem Feld\n"
-"vor dem Roboter."
-
-#: cmd_farming.lua
-msgid ""
-"Plant a sapling\n"
-"in front of the robot"
-msgstr ""
-"Pflanze einen Setzling\n"
-"vor den Roboter"
-
-#: cmd_farming.lua
-msgid "Sign \"farming\""
-msgstr "Zeichen \"Farming\""
-
-#: cmd_farming.lua
-msgid "Sign 'farming'"
-msgstr "Zeichen 'Farming'"
-
-#: cmd_farming.lua
-msgid "Used to harvest and seed a 3x3 field."
-msgstr "Benötigt um ein 3x3 Feld zu ernten und wieder zu sähen."
-
-#: cmd_farming.lua cmd_flowers.lua
-msgid "Place the sign in front of the field."
-msgstr "Platziere das Zeichen vor das Feld."
-
-#: cmd_farming.lua
-msgid "The seed to be placed has to be in the first inventory slot of the bot."
-msgstr ""
-"Das Saatgut, dass gesät werden soll, muss sich an der 1. Position im "
-"Inventar befinden."
-
-#: cmd_farming.lua cmd_flowers.lua
-msgid "When finished, the bot turns."
-msgstr "Der Roboter dreht um, wenn er fertig ist."
-
-#: cmd_flowers.lua
-msgid ""
-"Cutting flowers\n"
-"in front of the robot\n"
-"on a 3x3 field."
-msgstr ""
-"Schneide Blumen\n"
-"in einem 3x3 großem Feld\n"
-"vor dem Roboter."
-
-#: cmd_flowers.lua
-msgid "Sign \"flowers\""
-msgstr "Zeichen \"Blumen\""
-
-#: cmd_flowers.lua
-msgid "Sign 'flowers'"
-msgstr "Zeichen 'Blumen'"
-
-#: cmd_flowers.lua
-msgid "Used to cut flowers on a 3x3 field."
-msgstr "Benötigt um ein 3x3 Blumenfeld zu ernten."
-
-#: cmd_item.lua
-msgid ""
-"Take <num> items from a chest like node\n"
-"and put it into the item inventory.\n"
-"<slot> is the inventory slot (1..8) or 0 for any one"
-msgstr ""
-"Nehme <num> Gegenstände aus der\n"
-"Kiste oder dem Kisten-ähnlichen Block\n"
-"und tue diese in das eigene Inventar\n"
-"an der Position <slot>. Slot = (1..8)\n"
-"oder 0 für irgend eine Position"
-
-#: cmd_item.lua
-msgid ""
-"Add <num> items to a chest like node\n"
-"taken from the item inventory.\n"
-"<slot> is the inventory slot (1..8) or 0 for any one"
-msgstr ""
-"Lege <num> Gegenstände aus dem\n"
-"eigenen Inventar in die andere Kiste.\n"
-"<slot> ist die Position im\n"
-"eigenen Inventar (1--8).\n"
-"oder 0 für irgend eine Position"
-
-#: cmd_item.lua
-msgid ""
-"Add <num> fuel to a furnace like node\n"
-"taken from the item inventory.\n"
-"<slot> is the inventory slot (1..8) or 0 for any one"
-msgstr ""
-"Lege <num> Brennstoffe aus dem\n"
-"eigenen Inventar in den anderen Block.\n"
-"<slot> ist die Position im\n"
-"eigenen Inventar (1--8).\n"
-"oder 0 für irgend eine Position"
-
-#: cmd_item.lua
-msgid "deprecated, use bot inventory configuration instead"
-msgstr "veraltet, benutze stattdessen die Inventar Konfigurationsmöglichkeit"
-
-#: cmd_item.lua
-msgid ""
-"Pick up all objects\n"
-"in a 3x3 field.\n"
-"<slot> is the inventory slot (1..8) or 0 for any one"
-msgstr ""
-"Hebe alle Objekte in einem\n"
-"3x3 Blöcke großen Feld auf\n"
-"und lege diese in das eigene\n"
-"Inventar an Position <slot> (1-8)\n"
-"oder 0 für irgend eine Position"
-
-#: cmd_item.lua
-msgid ""
-"Drop items in front of the bot.\n"
-"<slot> is the inventory slot (1..8) or 0 for any one"
-msgstr ""
-"Lasse ein Objekt aus dem eigenen\n"
-"Inventar vor dem Roboter fallen.\n"
-"<slot> ist die Position im\n"
-"eigenen Inventar (1--8).\n"
-"oder 0 für irgend eine Position"
-
-#: cmd_item.lua
-msgid "Punch a rail cart to start it"
-msgstr "Schlage den Wagen um ihn zu starten"
-
-#: cmd_move.lua
-msgid "Move the robot one step back"
-msgstr ""
-"Bewege den Roboter\n"
-"einen Schritt zurück"
-
-#: cmd_move.lua
-msgid "Turn the robot to the left"
-msgstr ""
-"Drehe den Roboter\n"
-"nach links"
-
-#: cmd_move.lua
-msgid "Turn the robot to the right"
-msgstr ""
-"Drehe den Roboter\n"
-"nach rechts"
-
-#: cmd_move.lua
-msgid "Turn the robot around"
-msgstr ""
-"Drehe den Roboter\n"
-"um (180 Grad)"
-
-#: cmd_move.lua
-msgid "Move the robot upwards"
-msgstr ""
-"Bewege den Roboter\n"
-"nach oben"
-
-#: cmd_move.lua
-msgid "Move the robot down"
-msgstr ""
-"Bewege den Roboter\n"
-"nach unten"
-
-#: cmd_move.lua
-msgid ""
-"Stop the robot for <sec> seconds\n"
-"(1..9999)"
-msgstr ""
-"Stoppe den Roboter\n"
-"für <sec> Sekunden (1.9999)"
-
-#: cmd_move.lua
-msgid "Stop the robot."
-msgstr "Stoppe den Roboter."
-
-#: cmd_move.lua
-msgid ""
-"Turn the robot off\n"
-"and put it back in the box."
-msgstr ""
-"Schalte den Roboter aus und\n"
-"setze ihn damit zurück in\n"
-"seine Box."
-
-#: cmd_pattern.lua
-msgid "Store pattern to be cloned."
-msgstr ""
-"Speichere die Vorlage\n"
-"die kopiert werden soll."
-
-#: cmd_pattern.lua
-msgid ""
-"Copy the nodes from\n"
-"the stored pattern position\n"
-"<size> is: 3x1, 3x2, 3x3,\n"
-"5x1, 5x2, 5x3 (wide x deep)\n"
-"<lvl> pattern level offset (0..4)"
-msgstr ""
-"Kopiere die Blöcke von der\n"
-"\"Vorlage\" Position.\n"
-"<size> ist: 3x1, 3x2, 3x3,\n"
-"5x1, 5x2, 5x3 (Breite x Tiefe)\n"
-"<lvl> Vorlagenebene (0..4)"
-
-#: cmd_pattern.lua
-msgid "Sign \"pattern\""
-msgstr "Zeichen \"Vorlage\""
-
-#: cmd_pattern.lua
-msgid "Sign \"copy 3x3x3\""
-msgstr "Zeichen \"kopiere 3x3x3\""
-
-#: cmd_pattern.lua
-msgid "Sign 'pattern'"
-msgstr "Zeichen 'Vorlage'"
-
-#: cmd_pattern.lua
-msgid "Used to make a copy of a 3x3x3 cube."
-msgstr "Benötigt um eine Kopie eines 3x3x3 Quadrats zu machen."
-
-#: cmd_pattern.lua
-msgid "Place the sign in front of the pattern to be copied."
-msgstr "Platziere das Zeichen vor die Vorlage, die kopiert werden soll."
-
-#: cmd_pattern.lua
-msgid ""
-"Use the copy sign to make the copy of this pattern on a different location."
-msgstr ""
-"Benutze das Kopier-Zeichen, um eine Kopie dieser Vorlage an einer anderen "
-"Stelle zu machen."
-
-#: cmd_pattern.lua
-msgid "The bot must first reach the pattern sign, then the copy sign."
-msgstr ""
-"Der Roboter muss zuerst das Vorlage-Zeichen und dann das Kopier-Zeichen "
-"erreichen."
-
-#: cmd_pattern.lua
-msgid "Sign 'copy3x3x3'"
-msgstr "Zeichen 'kopiere 3x3x3'"
-
-#: cmd_pattern.lua
-msgid "Place the sign in front of the location, where the copy should be made."
-msgstr ""
-"Platziere das Zeichen vor die Stelle, wo die Kopie hergestellt werden soll."
-
-#: cmd_pattern.lua
-msgid "Use the pattern sign to mark the pattern."
-msgstr "Benutze das Vorlage-Zeichen und die Vorlage zu markieren."
-
-#: cmd_place.lua
-msgid "Error: Position protected"
-msgstr "Fehler: Position geschützt"
-
-#: cmd_place.lua
-msgid ""
-"Place a block in front of the robot\n"
-"<slot> is the inventory slot (1..8)\n"
-"<lvl> is one of: -1   0   +1"
-msgstr ""
-"Setze einen Block vor den Roboter.\n"
-"<slot> ist die Position im\n"
-"eigenen Inventar (1--8).\n"
-"Für <lvl> ist zulässig: -1   0   +1"
-
-#: cmd_place.lua
-msgid ""
-"Place a block on the left side\n"
-"<slot> is the inventory slot (1..8)\n"
-"<lvl> is one of: -1   0   +1"
-msgstr ""
-"Setze einen Block links vorne.\n"
-"<slot> ist die Position im\n"
-"eigenen Inventar (1--8).\n"
-"Für <lvl> ist zulässig: -1   0   +1"
-
-#: cmd_place.lua
-msgid ""
-"Place a block on the right side\n"
-"<slot> is the inventory slot (1..8)\n"
-"<lvl> is one of: -1   0   +1"
-msgstr ""
-"Setze einen Block rechts vorne.\n"
-"<slot> ist die Position im\n"
-"eigenen Inventar (1--8).\n"
-"Für <lvl> ist zulässig: -1   0   +1"
-
-#: cmd_place.lua
-msgid ""
-"Place a block under the robot.\n"
-"Hint: use 'move_up' first.\n"
-"<slot> is the inventory slot (1..8)"
-msgstr ""
-"Setze einen Block unter den Roboter.\n"
-"<slot> ist die Position im\n"
-"eigenen Inventar (1--8)."
-
-#: cmd_place.lua
-msgid ""
-"Place a block above the robot.\n"
-"<slot> is the inventory slot (1..8)"
-msgstr ""
-"Setze einen Block über den Roboter.\n"
-"<slot> ist die Position im\n"
-"eigenen Inventar (1--8)."
-
-#: cmd_place.lua
-msgid "Error: No free inventory space"
-msgstr "Fehler: Kein freier Inventarplatz"
-
-#: cmd_place.lua
-msgid ""
-"Dig the block in front of the robot\n"
-"<slot> is the inventory slot (1..8)\n"
-"<lvl> is one of: -1   0   +1"
-msgstr ""
-"Entferne einen Block vor den Roboter.\n"
-"<slot> ist die Position im\n"
-"eigenen Inventar (1--8).\n"
-"Für <lvl> ist zulässig: -1   0   +1"
-
-#: cmd_place.lua
-msgid ""
-"Dig the block on the left side\n"
-"<slot> is the inventory slot (1..8)\n"
-"<lvl> is one of: -1   0   +1"
-msgstr ""
-"Entferne einen links vorne.\n"
-"<slot> ist die Position im\n"
-"eigenen Inventar (1--8).\n"
-"Für <lvl> ist zulässig: -1   0   +1"
-
-#: cmd_place.lua
-msgid ""
-"Dig the block on the right side\n"
-"<slot> is the inventory slot (1..8)\n"
-"<lvl> is one of: -1   0   +1"
-msgstr ""
-"Entferne einen rechts vorne.\n"
-"<slot> ist die Position im\n"
-"eigenen Inventar (1--8).\n"
-"Für <lvl> ist zulässig: -1   0   +1"
-
-#: cmd_place.lua
-msgid ""
-"Dig the block under the robot.\n"
-"<slot> is the inventory slot (1..8)"
-msgstr ""
-"Entferne einen Block unter dem\n"
-"Roboter.\n"
-"<slot> ist die Position im\n"
-"eigenen Inventar (1--8)."
-
-#: cmd_place.lua
-msgid ""
-"Dig the block above the robot.\n"
-"<slot> is the inventory slot (1..8)"
-msgstr ""
-"Entferne einen Block über dem\n"
-"Roboter.\n"
-"<slot> ist die Position im\n"
-"eigenen Inventar (1--8)."
-
-#: cmd_place.lua
-msgid ""
-"Rotate the block in front of the robot\n"
-"<lvl> is one of:  -1   0   +1\n"
-"<steps> is one of:  1   2   3"
-msgstr ""
-"Rotiere den Block vor dem Roboter.\n"
-"Für <lvl> ist zulässig: -1   0   +1\n"
-"Für <steps> ist zulässig: 1   2   3"
-
-#: cmd_sign.lua
-msgid "Commands,Help"
-msgstr "Kommandos,Hilfe"
-
-#: cmd_sign.lua
-msgid "Sign name:"
-msgstr "Zeichenname:"
-
-#: cmd_sign.lua
-msgid "Cancel"
-msgstr "Abbruch"
-
-#: cmd_sign.lua
-msgid "Check"
-msgstr "Prüfen"
-
-#: cmd_sign.lua
-msgid "Copy Cmnd"
-msgstr "Kopiere Kommando"
-
-#: cmd_sign.lua
-msgid "Sign \"command\""
-msgstr "Zeichen \"Kommando\""
-
-#: cmd_sign.lua
-msgid "-- enter or copy commands from help page"
-msgstr "-- Kommandos eingeben oder von der Hilfeseite kopieren"
-
-#: cmd_sign.lua
-msgid "Error: Signs inventory empty"
-msgstr "Fehler: Zeichen Inventar ist leer"
-
-#: cmd_sign.lua
-msgid "Error: Position protected or occupied"
-msgstr "Fehler: Position ist geschützt oder belegt"
-
-#: cmd_sign.lua
-msgid ""
-"Place a sign in front of the robot\n"
-"taken from the signs inventory\n"
-"<slot> is the inventory slot (1..6)"
-msgstr ""
-"Setze ein Zeichen vor den Roboter.\n"
-"<slot> ist die Position im\n"
-"eigenen Inventar (1--6)."
-
-#: cmd_sign.lua
-msgid ""
-"Place a sign behind the robot\n"
-"taken from the signs inventory\n"
-"<slot> is the inventory slot (1..6)"
-msgstr ""
-"Setze ein Zeichen hinter den Roboter.\n"
-"<slot> ist die Position im\n"
-"eigenen Inventar (1--6)."
-
-#: cmd_sign.lua
-msgid "Error: No sign available"
-msgstr "Fehler: Kein Zeichen verfügar"
-
-#: cmd_sign.lua
-msgid "Error: Signs inventory slot is occupied"
-msgstr "Fehler: Die Zeicheninventar Position ist belegt"
-
-#: cmd_sign.lua
-msgid "Error: Position is protected"
-msgstr "Fehler: Die Position ist geschützt"
-
-#: cmd_sign.lua
-msgid ""
-"Dig the sign in front of the robot\n"
-"and add it to the signs inventory.\n"
-"<slot> is the inventory slot (1..6)"
-msgstr ""
-"Entferne das Zeichen vor den Roboter.\n"
-"<slot> ist die Position im\n"
-"eigenen Inventar (1--6)."
-
-#: cmd_sign.lua
-msgid ""
-"Dig the sign in front of the robot\n"
-"and add the cleared sign to\n"
-"the item iventory.\n"
-"<slot> is the inventory slot (1..8)"
-msgstr ""
-"Entferne das Zeichen vor den Roboter.\n"
-"<slot> ist die Position im\n"
-"eigenen Inventar (1--6)."
-
-#: cmd_sign.lua
-msgid "Sign 'command'"
-msgstr "Zeichen 'Kommando'"
-
-#: cmd_sign.lua
-msgid "The 'command' sign can be programmed by the player."
-msgstr "Das 'Kommando' Zeichen kann vom Spieler programmiert werden."
-
-#: cmd_sign.lua
-msgid ""
-"Place the sign in front of you and use the node menu to program your "
-"sequence of bot commands."
-msgstr ""
-"Platziere das Zeichen vor dir und nutze das Zeichen-Menü, um die Kommando-"
-"Sequenz zu programmieren."
-
-#: cmd_sign.lua
-msgid ""
-"The menu has an edit field for your commands and a help page with all "
-"available commands."
-msgstr ""
-"Das Menü hat ein Eingabefeld für deine Kommandos und eine Hilfeseite zu "
-"allen Kommandos."
-
-#: cmd_sign.lua doc.lua
-msgid "The help page has a copy button to simplify the programming."
-msgstr ""
-"Die Hilfeseite hat einen Kopier-Button um die Programmierung zu erleichtern."
-
-#: commands.lua
-msgid "commands:"
-msgstr "Kommandos:"
-
-#: commands.lua
-msgid "unknown command"
-msgstr "unbekanntes Kommando"
-
-#: commands.lua
-msgid "start of a 'repeat..end' block"
-msgstr "Anfang eines 'repeat..end' Blocks"
-
-#: commands.lua
-msgid "end command of a 'repeat..end' block"
-msgstr "Ende Kommando eines 'repeat..end' Blocks"
-
-#: commands.lua
-msgid "call a subroutine (with 'return' statement)"
-msgstr "Aufruf einer Unterfunktion (mit 'return' Anweisung)"
-
-#: commands.lua
-msgid "return from a subroutine"
-msgstr "Rückkehr von einer Unterfunktion"
-
-#: commands.lua
-msgid "jump to a label"
-msgstr "Sprung zu einer Marke"
-
-#: commands.lua
-msgid ""
-"Move the robot 1..999 steps forward\n"
-"without paying attention to any signs.\n"
-"Up and down movements also become\n"
-"counted as steps."
-msgstr ""
-"Bewege den Roboter 1..999 Schritte\n"
-"vorwärts ohne auf Zeichen zu achten.\n"
-"Auf- und Ab-Bewegungen werden auch\n"
-"als Schritte gezählt."
-
-#: commands.lua
-msgid ""
-"Walk until a sign or obstacle is\n"
-"reached. Then continue with the next command.\n"
-"When a sign has been reached, \n"
-"the current program is ended\n"
-"and the bot executes the\n"
-"new program from the sign"
-msgstr ""
-"Gehe bis ein Zeichen oder Hindernis\n"
-"erreicht wurde. Führe dann das nächste\n"
-"Kommando aus. \n"
-"Wurde ein Zeichen erreicht, so arbeite\n"
-"die Kommandos des Zeichens als\n"
-"Unter-Prozess ab"
-
-#: crop_sensor.lua
-msgid "Crop Sensor: Connected with "
-msgstr "Ernte Sensor: Verbunden mit "
-
-#: crop_sensor.lua
-msgid "Crop Sensor"
-msgstr "Ernte Sensor"
-
-#: crop_sensor.lua
-msgid ""
-"The Crop Sensor sends cyclical signals when, for example, wheat is fully "
-"grown."
-msgstr ""
-"Der Ernte Sensor sendet zyklisch ein Signal, wenn bspw. der Weizen voll "
-"ausgewachsen ist."
-
-#: crop_sensor.lua
-msgid "The sensor range is one node/meter."
-msgstr "Der Sensorbereich beträgt einen Block/Meter."
-
-#: crop_sensor.lua
-msgid "The sensor has an active side (red) that must point to the crop/field."
-msgstr ""
-"Der Sensor hat eine aktive Seite (rot), welche zur der Pflanze zeigen muss."
-
-#: doc.lua
-msgid ""
-"After you have placed the Signs Bot Box, you can start the bot by means of "
-"the 'On' button in the box menu."
-msgstr ""
-"Nachdem du die Roboter-Kiste platziert hast, kannst du den Roboter über den "
-"\"An\" Button im Kistenmenü starten."
-
-#: doc.lua
-msgid ""
-"The bot then runs straight up until it reaches an obstacle (a step with two "
-"or more blocks up or down or a sign.)"
-msgstr ""
-"Der Roboter läuft dann geradeaus, bis er ein Hindernis erreicht (eine Stufe "
-"mit zwei oder mehr Blöcken, auf oder ab)."
-
-#: doc.lua
-msgid ""
-"If the bot first reaches a sign it will execute the commands on the sign."
-msgstr ""
-"Falls der Roboter zuerst ein Zeichen erreicht, wird er die Kommandos auf dem "
-"Zeichen ausführen."
-
-#: doc.lua
-msgid ""
-"If the command(s) on the sign is e.g. 'turn_around', the bot turns and goes "
-"back."
-msgstr ""
-"Falls das Kommandos auf dem Zeichen bspw. ein 'turn_around' ist, dreht der "
-"Roboter um und geht zurück."
-
-#: doc.lua
-msgid "In this case, the bot reaches his box again and turns off."
-msgstr ""
-"In diesem Fall erreicht der Roboter wieder seine Box und schaltet sich ab."
-
-#: doc.lua
-msgid ""
-"The Signs Bot Box has an inventory with 6 stacks for signs and 8 stacks for "
-"other items (to be placed/dug by the bot)."
-msgstr ""
-"Die Roboter Box hat ein Inventar für 6 Stapel Zeichen und 8 Stapel für "
-"andere Gegenstände (welche platziert oder eingesammelt werden können)."
-
-#: doc.lua
-msgid "This inventory simulates the bot internal inventory."
-msgstr "Das Inventar der Box simuliert das Roboter Inventar."
-
-#: doc.lua
-msgid ""
-"That means you will only have access to the inventory if the bot is turned "
-"off ('sitting' in his box)."
-msgstr ""
-"Das bedeutet, du hast nur Zugriff auf das Inventar, sofern der Roboter "
-"ausgeschaltet ist."
-
-#: doc.lua
-msgid ""
-"You simply control the direction of the bot by means of the 'turn left' and "
-"'turn right' signs (signs with the arrow)."
-msgstr ""
-"Du kannst die Richtung des Roboters ganz einfach über 'turn_left' (drehe "
-"nach links) oder 'turn_right' (drehe nach rechts) Zeichen verändern."
-
-#: doc.lua
-msgid ""
-"The bot can run over steps (one block up/down). But there are also commands "
-"to move the bot up and down."
-msgstr ""
-"Der Roboter kann auch Stufen überwinden (eine Block hoch oder runter). Aber "
-"es gibt auch Kommandos, um den Roboter nach oben oder unten zu bewegen."
-
-#: doc.lua
-msgid "It is not necessary to mark a way back to the box."
-msgstr ""
-"Es ist nicht notwendig, dem Roboter einen Weg zurück zu seiner Box zu "
-"markieren."
-
-#: doc.lua
-msgid ""
-"With the command 'turn_off' the bot will turn off and be back in his box "
-"from every position."
-msgstr ""
-"Mit dem Kommando \"turn_off\" wird der Roboter ausgeschaltet und befindet "
-"sich danach wieder in seiner Box, egal wo er war."
-
-#: doc.lua
-msgid "The same applies if you turn off the bot by the box menu."
-msgstr ""
-"Das gleiche gilt, wenn du den Roboter über den 'Aus' Button ausschaltest."
-
-#: doc.lua
-msgid ""
-"If the bot reaches a sign from the wrong direction (from back or sides) the "
-"sign will be ignored."
-msgstr ""
-"Wenn der Roboter ein Zeichen von der falschen Richtung erreicht (von der "
-"Seite oder von hinten), wird das Zeichen ignoriert."
-
-#: doc.lua
-msgid "The bot will walk over."
-msgstr "Der Roboter läuft einfach hinüber."
-
-#: doc.lua
-msgid "All predefined signs have a menu with a list of the bot commands."
-msgstr ""
-"Alle vordefinierten Zeichen haben ein Menü mit der Liste der Kommandos."
-
-#: doc.lua
-msgid ""
-"These signs can't be changed, but you can craft and program your own signs."
-msgstr ""
-"Diese Zeichen können nicht geändert werden, aber du kannst eigene Zeichen "
-"herstellen und programmieren."
-
-#: doc.lua
-msgid "For this you have to use the 'command' sign."
-msgstr "Dafür kannst du das 'command' Zeichen verwenden."
-
-#: doc.lua
-msgid ""
-"This sign has an edit field for your commands and a help page with all "
-"available commands."
-msgstr ""
-"Das Zeichen hat ein Eingabefeld für deine Kommandos und eine Hilfeseite zu "
-"allen Kommandos."
-
-#: doc.lua
-msgid "Also for your own signs it is important to know:"
-msgstr "Es ist auch für eigene Zeichen wichtig zu wissen:"
-
-#: doc.lua
-msgid ""
-"After the execution of the last command of the sign, the bot falls back into "
-"its default behaviour and runs in its taken direction."
-msgstr ""
-"Nach der Ausführung des letzten Kommandos eines Zeichens fällt der Roboter "
-"immer zurück in sein Standardverhalten und läuft in die eingeschlagene "
-"Richtung weiter."
-
-#: doc.lua
-msgid "A standard job for the bot is to move items from one chest to another"
-msgstr ""
-"Eine Standardaufgabe für den Roboter ist, Gegenstände von einer Kiste in "
-"eine andere zu tun"
-
-#: doc.lua
-msgid "(chest or node with a chest like inventory)."
-msgstr "(Kiste oder Block mit Kisten-ähnlichem Inventar)."
-
-#: doc.lua
-msgid "This can be done by means of the two signs 'take item' and 'add item'."
-msgstr ""
-"Das kann mit Hilfe von zwei Zeichen realisiert werden: 'take_item' und "
-"'add_item'."
-
-#: doc.lua
-msgid "These signs have to be placed on top of chest nodes."
-msgstr "Diese Zeichen müssen auf den Kisten platziert werden."
-
-#: doc.lua
-msgid "In addition to the signs the bot can be controlled by means of sensors."
-msgstr ""
-"Zusätzlich zu den Zeichen kann der Roboter auch über Sensoren gesteuert "
-"werden."
-
-#: doc.lua
-msgid "Sensors like the Bot Sensor have two states: on and off."
-msgstr ""
-"Sensoren wie der Roboter-Sensor haben zwei Zustande: on' (an) und "
-"'off' (aus)."
-
-#: doc.lua
-msgid "If the Bot Sensor detects a bot it will switch to the state 'on' and"
-msgstr ""
-"Wenn der Roboter-Sensor einen Roboter erkennt geht er in den Zustand 'on' und"
-
-#: doc.lua
-msgid "sends a signal to a connected block, called an actuator."
-msgstr "sendet ein Signal zu einem verbundenen Block, einem Aktor."
-
-#: doc.lua
-msgid "Sensors are:"
-msgstr "Sensoren sind:"
-
-#: doc.lua
-msgid "- Bot Sensor: Sends a signal when the robot passes by"
-msgstr "- Roboter Sensor: Sendet ein Signal wenn ein Roboter vorbei geht"
-
-#: doc.lua
-msgid "- Node Sensor: Sends a signal when it detects any node"
-msgstr ""
-"- Block Sensor: Sendet ein Signal bei einer Veränderung von Blocken vor sich"
-
-#: doc.lua
-msgid "- Crop Sensor: Sends a signal when, for example wheat is fully grown"
-msgstr ""
-"- Ernte Sensor: Sendet ein Signal, wenn bspw. der Weizen voll ausgewachsen "
-"ist"
-
-#: doc.lua
-msgid "- Bot Chest: Sends a signal depending on the chest state (empty, full)"
-msgstr ""
-"- Roboter-Kiste: Sendet ein Signal abhängig vom Zustand der Kiste (voll, "
-"leer)"
-
-#: doc.lua
-msgid "Actuators are:"
-msgstr "Aktoren sind:"
-
-#: doc.lua
-msgid "- Signs Bot Box: Can turn the bot off and on"
-msgstr "- Roboter-Box: Kann den Roboter ein- und ausschalten"
-
-#: doc.lua
-msgid "- Control Unit: Can be used to exchange the sign to lead the bot"
-msgstr ""
-"- Steuerungseinheit: Wird genutzt um Zeichen auszutauschen und damit den "
-"Roboter zu steuern"
-
-#: doc.lua
-msgid "Additional sensors and actuator can be added by other mods."
-msgstr ""
-"Weitere Sensoren und Aktoren können von weiteren Mods hinzugefügt werden."
-
-#: doc.lua
-msgid ""
-"To send a signal from a sensor to an actuator, the sensor has to be "
-"connected (paired) with actuator."
-msgstr ""
-"Um ein Signal von einem Sensor zu einem Aktor senden zu können, muss der "
-"Sensor mit dem Aktor verbunden werden (Pairing)."
-
-#: doc.lua
-msgid ""
-"To connect sensor and actuator, the Sensor Connection Tool has to be used."
-msgstr ""
-"Das Sensor Verbinde-Werkzeug wir genutzt, um Sensoren mit Aktoren zu "
-"verbinden."
-
-#: doc.lua
-msgid ""
-"Simply click with the tool on both blocks and the sensor will be connected "
-"with the actuator."
-msgstr ""
-"Klicke einfach mit dem Werkzeug nacheinander auf beide Blöcke und der Sensor "
-"wird mit dem Aktor verbunden."
-
-#: doc.lua
-msgid "A successful connection is indicated by a ping/pong noise."
-msgstr ""
-"Eine erfolgreiche Verbindung wird über ein Ping/Pong-Geräusch angezeigt."
-
-#: doc.lua
-msgid ""
-"Before you connect sensor with actuator, take care that the actuator is in "
-"the requested state."
-msgstr ""
-"Bevor du einen Sensor mit einem Aktor verbindest, achte darauf, dass sich "
-"der Aktor im richtigen Zustand befindet."
-
-#: doc.lua
-msgid ""
-"For example: If you want to start the Bot with a sensor, connect the sensor "
-"with the Bot Box,"
-msgstr ""
-"Zum Beispiel: Wenn du den Roboter über einen Sensor starten willst, verbinde "
-"Sensor und Roboter-Kiste nur,"
-
-#: doc.lua
-msgid ""
-"when the Bot is in the state 'on'. Otherwise the sensor signal will stop the "
-"Bot,"
-msgstr ""
-"wenn der Roboter an ist (im Zustand 'on'). Anderenfalls würde der Sensor den "
-"Roboter ausschalten,"
-
-#: doc.lua
-msgid "instead of starting it."
-msgstr "anstatt ihn zu starten."
-
-#: doc.lua
-msgid ""
-"The following applies to all commands that are used to place items in the "
-"bot inventory, like:"
-msgstr ""
-"Das folgende gilt für alle Kommandos, um Items in das Roboter Inventar zu "
-"legen, wie:"
-
-#: doc.lua
-msgid "- take_item <num> <slot>"
-msgstr "- take_item <num> <slot>"
-
-#: doc.lua
-msgid "- pickup_items <slot>"
-msgstr "- pickup_items <slot>"
-
-#: doc.lua
-msgid "- trash_sign <slot>"
-msgstr "- trash_sign <slot>"
-
-#: doc.lua
-msgid "- harvest <slot>"
-msgstr "- harvest <slot>"
-
-#: doc.lua
-msgid "- dig_front <slot> <lvl>"
-msgstr "- dig_front <slot> <lvl>"
-
-#: doc.lua
-msgid "- dig_left <slot> <lvl>"
-msgstr "- dig_left <slot> <lvl>"
-
-#: doc.lua
-msgid "- dig_right <slot> <lvl>"
-msgstr "- dig_right <slot> <lvl>"
-
-#: doc.lua
-msgid "- dig_below <slot> <lvl>"
-msgstr "- dig_below <slot> <lvl>"
-
-#: doc.lua
-msgid "- dig_above <slot> <lvl>"
-msgstr "- dig_above <slot> <lvl>"
-
-#: doc.lua
-msgid ""
-"If no slot or slot 0 was specified with the command (case A), all 8 slots of "
-"the bot inventory "
-msgstr ""
-"Wurde beim Kommando kein Slot oder Slot 0 angegeben (Fall A), werden "
-"nacheinander alle "
-
-#: doc.lua
-msgid ""
-"are checked one after the other. If a slot was specified (case B), only this "
-"slot is checked."
-msgstr ""
-"8 Slots des Bot Inventars geprüft, Wurde ein Slot angegeben (Fall B), wird "
-"nur dieser geprüft."
-
-#: doc.lua
-msgid ""
-"In both cases the following applies: If the slot is preconfigured and fits "
-"the item, "
-msgstr ""
-"In beiden Fällen gilt: Ist der Slot vorkonfiguriert und passt das Item dazu, "
-"oder ist der Slot "
-
-#: doc.lua
-msgid ""
-"or if the slot is not configured and empty, or is only partially filled with "
-"the item type "
-msgstr ""
-"nicht konfiguriert und leer, oder mit dem Item-Typ (das hinzu gefügt werden "
-"soll) nur "
-
-#: doc.lua
-msgid "(which should be added), then the items are added."
-msgstr "teilweise gefüllt, dann werden die Items hinzugefügt."
-
-#: doc.lua
-msgid ""
-"If not all items can be added, the remaining slots will be tried out in case "
-"A."
-msgstr ""
-"Können nicht alle Items hinzugefügt werden, werden im Falle A die restlichen "
-"Slots weiter durchprobiert."
-
-#: doc.lua
-msgid "Anything that could not be added to your own inventory goes back."
-msgstr "Was nicht dem eigenen Inventar hinzugefügt werden konnte, geht zurück."
-
-#: doc.lua
-msgid ""
-"The following applies to all commands that are used to take items from the "
-"bot inventory, like:"
-msgstr ""
-"Das folgende gilt für alle Kommandos, um Items aus dem Roboter Inventar zu "
-"nehmen, wie:"
-
-#: doc.lua
-msgid "- add_item <num> <slot>"
-msgstr "- add_item <num> <slot>"
-
-#: doc.lua
-msgid ""
-"It doesn't matter whether a slot is configured or not. The bot takes the "
-"first stack that "
-msgstr ""
-"Hier ist es egal, ob ein Slot konfiguriert ist, oder nicht. Der Bot nimmt "
-"den ersten Stack, den "
-
-#: doc.lua
-msgid "it can find from its own inventory and tries to use it."
-msgstr ""
-"er finden kann, aus dem eigenen Inventar und versucht diesen zu nutzen."
-
-#: doc.lua
-msgid ""
-"If a slot is specified, it only takes this, if no slot has been specified, "
-"it checks all of "
-msgstr ""
-"Ist ein Slot angegeben, nimmt er nur diesen, wurde kein Slot angegeben, "
-"prüft er alle "
-
-#: doc.lua
-msgid ""
-"them one after the other, starting from slot 1 until it finds something."
-msgstr ""
-"nacheinander, von Slot 1 beginnend, bis er etwas findet. Ist die gefundene "
-"Anzahl kleiner als "
-
-#: doc.lua
-msgid ""
-"If the number found is smaller than requested, he tries to take the rest out "
-"of any slot."
-msgstr "gefordert, versucht er den Rest aus irgend einem Slot zu nehmen."
-
-#: doc.lua
-msgid "Signs Bot"
-msgstr "Signs Bot"
-
-#: doc.lua
-msgid "A robot controlled by signs, used for automated work"
-msgstr "Ein Roboter, gesteuert über Zeichen, für Automatisierungsaufgaben"
-
-#: doc.lua
-msgid "Start the Bot"
-msgstr "Starte den Roboter"
-
-#: doc.lua
-msgid "Control the Bot"
-msgstr "Steuere den Roboter"
-
-#: doc.lua
-msgid "Sensors and Actuators"
-msgstr "Sensoren und Aktoren"
-
-#: doc.lua
-msgid "Connecting sensors and actuator"
-msgstr "Verbinde Sensor mit Aktor"
-
-#: doc.lua
-msgid "Bot inventory behavior"
-msgstr "Verhalten beim Roboter Inventar"
-
-#: duplicator.lua
-msgid "Input:"
-msgstr "Eingabe:"
-
-#: duplicator.lua
-msgid "Template:"
-msgstr "Vorlage:"
-
-#: duplicator.lua
-msgid "Output:"
-msgstr "Ausgabe:"
-
-#: duplicator.lua
-msgid ""
-"1. Place one 'cmnd' sign to be\n"
-"    used as template.\n"
-msgstr ""
-"1. Verwende ein Kommando-\n"
-"     Zeichen als Vorlage.\n"
-
-#: duplicator.lua
-msgid ""
-"2. Add 'blank signs' to\n"
-"    the input inventory.\n"
-msgstr ""
-"2. Füge 'leere Zeichen'\n"
-"     als Eingabe hinzu.\n"
-
-#: duplicator.lua
-msgid ""
-"3. Take the copies\n"
-"    from the output inventory."
-msgstr ""
-"3. Entnehme die Kopieren\n"
-"     aus der Ausgabe."
-
-#: duplicator.lua
-msgid "Signs Duplicator"
-msgstr "Zeichen Kopierer"
-
-#: duplicator.lua
-msgid "Sign \"user\""
-msgstr "Zeichen \"Benutzer\""
-
-#: duplicator.lua
-msgid "Sign \"blank\""
-msgstr "\"Leeres\" Zeichen"
-
-#: duplicator.lua
-msgid "The Duplicator can be used to make copies of signs."
-msgstr ""
-"Der Zeichen Kopierer kann zur Herstellung von Kopien eines Zeichens genutzt "
-"werden."
-
-#: duplicator.lua
-msgid ""
-"1. Put one 'cmnd' sign to be used as template into the 'Template' inventory"
-msgstr "1. Lege ein Kommando-Zeichen als Vorlage in das 'Vorlage' Inventar"
-
-#: duplicator.lua
-msgid "2. Add one or several 'blank signs' to the 'Input' inventory."
-msgstr "2. Füge ein oder mehrere 'leere Zeichen' als Eingabe hinzu."
-
-#: duplicator.lua
-msgid "3. Take the copies from the 'Output' inventory."
-msgstr "3. Entnehme die Kopieren aus der Ausgabe."
-
-#: duplicator.lua
-msgid ""
-"Written books [default:book_written] can alternatively be used as template"
-msgstr ""
-"Alternativ können auch beschriebene Bücher [default:book_written] als "
-"Vorlage verwendet werden"
-
-#: duplicator.lua
-msgid "Already written signs can be used as input, too."
-msgstr ""
-"Bereits beschriebene Zeichen können auch als Eingabe-Zeichen genutzt werden."
-
-#: duplicator.lua
-msgid "Needed as input for the Duplicator."
-msgstr "Wird als Eingabe für den Zeichen Kopierer benötigt."
-
-#: extender.lua
-msgid "Sensor Extender: Connected with "
-msgstr "Sensor Erweiterung: Verbunden mit "
-
-#: extender.lua
-msgid "Sensor Extender"
-msgstr "Sensor Erweiterung"
-
-#: extender.lua
-msgid "Sensor Extender: Not connected"
-msgstr "Sensor Erweiterung: Nicht verbunden"
-
-#: extender.lua
-msgid ""
-"With the Sensor Extender, sensor signals can be sent to more than one "
-"actuator."
-msgstr ""
-"Mit Hilfe der Sensor-Erweiterung können weitere Aktoren mit dem Sensor "
-"verbunden werden."
-
-#: extender.lua
-msgid "Place one or more extender nearby the sensor and connect each extender"
-msgstr ""
-"Platziere ein oder mehrere Sensor-Erweiterungen neben einen Sensor und "
-"verbinde diese"
-
-#: extender.lua
-msgid "with one further actuator by means of the Connection Tool."
-msgstr "mit weiteren Aktoren mit Hilfe des Verbinde-Werkzeuges."
-
-#: node_sensor.lua
-msgid "Node Sensor: Connected with "
-msgstr "Block Sensor: Verbunden mit "
-
-#: node_sensor.lua
-msgid "added"
-msgstr "hinzukommen"
-
-#: node_sensor.lua
-msgid "removed"
-msgstr "fehlen"
-
-#: node_sensor.lua
-msgid "added or removed"
-msgstr "hinzukommen oder fehlen"
-
-#: node_sensor.lua
-msgid "Send signal if nodes have been:"
-msgstr "Sende ein Signal wenn Blöcke:"
-
-#: node_sensor.lua
-msgid "accept"
-msgstr "übernehmen"
-
-#: node_sensor.lua
-msgid "Node Sensor"
-msgstr "Block Sensor"
-
-#: node_sensor.lua
-msgid ""
-"The node sensor sends cyclical signals when it detects that nodes have "
-"appeared or disappeared,"
-msgstr ""
-"Der Block Sensor sendet zyklisch ein Signal, wenn er eine Veränderung von "
-"Blöcken vor sich entdeckt (ein Block erscheint oder verschwindet),"
-
-#: node_sensor.lua
-msgid "but has to be configured accordingly."
-msgstr "aber muss entsprechend konfiguriert werden."
-
-#: node_sensor.lua
-msgid "Valid nodes are all kind of blocks and plants."
-msgstr "Gültig sind alle Arten von Blöcken oder Pflanzen."
-
-#: node_sensor.lua
-msgid "The sensor range is 3 nodes/meters in one direction."
-msgstr "Die Sensor-Reichweite beträgt 3 Blöcke/Meter in eine Richtung."
-
-#: node_sensor.lua
-msgid ""
-"The sensor has an active side (red) that must point to the observed area."
-msgstr ""
-"Der Sensor hat eine aktive Seite (rot) welche zu dem zu überwachenden "
-"Bereich zeigen muss."
-
-#: signs.lua
-msgid "Sign \"turn right\""
-msgstr "Zeichen \"rechts drehen\""
-
-#: signs.lua
-msgid "Sign \"turn left\""
-msgstr "Zeichen \"links drehen\""
-
-#: signs.lua
-msgid "Sign \"take item\""
-msgstr "Zeichen \"Nehme Gegenstand\""
-
-#: signs.lua
-msgid "Sign \"add item\""
-msgstr "Zeichen \"Lege Gegenstand\""
-
-#: signs.lua
-msgid "Sign \"stop\""
-msgstr "Zeichen \"Stopp\""
-
-#: signs.lua
-msgid "Sign \"add to cart\""
-msgstr "Zeichen \"Lege in den Wagen\""
-
-#: signs.lua
-msgid "Sign \"take from cart\""
-msgstr "Zeichen \"Nehme aus dem Wagen\""
-
-#: signs.lua
-msgid "The Bot turns right when it detects this sign in front of it."
-msgstr "Der Roboter dreht nach rechts, wenn er dieses Zeichen vor sich hat."
-
-#: signs.lua
-msgid "The Bot turns left when it detects this sign in front of it."
-msgstr "Der Roboter dreht nach links, wenn er dieses Zeichen vor sich hat."
-
-#: signs.lua
-msgid ""
-"The Bot takes items out of a chest in front of it and then turns around."
-msgstr ""
-"Der Roboter nimmt Gegenstände aus einer Kiste vor sich und dreht dann um."
-
-#: signs.lua
-msgid "This sign has to be placed on top of the chest."
-msgstr "Das Zeichen muss auf der Kiste platziert werden."
-
-#: signs.lua
-msgid "The Bot puts items into a chest in front of it and then turns around."
-msgstr "Der Roboter legt Gegenstände in eine Kiste vor sich und dreht dann um."
-
-#: signs.lua
-msgid ""
-"The Bot will stop in front of this sign until the sign is removed or the bot "
-"is turned off."
-msgstr ""
-"Der Roboter stoppt vor diesem Zeichen, bis das Zeichen entfernt, oder der "
-"Roboter ausgeschaltet wird."
-
-#: signs.lua
-msgid ""
-"The Bot puts items into a minecart in front of it, pushes the cart and then "
-"turns around."
-msgstr ""
-"Der Roboter legt Gegenstände in den Wagen vor sich, startet den Wagen und "
-"dreht dann um."
-
-#: signs.lua
-msgid "This sign has to be placed on top of the rail at the cart end position."
-msgstr ""
-"Das Zeichen muss auf dem Gleis und damit über dem Wagen platziert werden."
-
-#: signs.lua
-msgid ""
-"The Bot takes items out of a minecart in front of it, pushes the cart and "
-"then turns around."
-msgstr ""
-"Der Roboter nimmt Gegenstände aus dem Wagen vor sich, startet den Wagen und "
-"dreht dann um."
-
-#: tool.lua
-msgid "Sensor Connection Tool"
-msgstr "Sensor Verbindungswerkzeug"
-
-#: timer.lua
-msgid "Bot Timer"
-msgstr "Roboter Timer"
-
-#: timer.lua logic_and.lua
-msgid "Connected with"
-msgstr "Verbunden mit"
-
-#: timer.lua
-msgid "Cycle time [min]:"
-msgstr "Zykluszeit [min]:"
-
-#: timer.lua delayer.lua
-msgid "Start"
-msgstr "Start"
-
-#: timer.lua
-msgid "Special kind of sensor."
-msgstr "Spezielle Form eines Sensors."
-
-#: timer.lua
-msgid ""
-"Can be programmed with a time in seconds, e.g. to start the bot cyclically."
-msgstr ""
-"Kann mit einer Zeit in Sekunden programmiert werden, um bspw. den Roboter "
-"zyklisch zu starten."
-
-#: delayer.lua
-msgid "Signal Delayer: Connected with "
-msgstr "Sensor Verzögerer: Verbunden mit "
-
-#: delayer.lua
-msgid "Delay time [sec]:"
-msgstr "Verzögerungszeit [s]:"
-
-#: delayer.lua
-msgid "Signal Delayer"
-msgstr "Signal Verzögerer"
-
-#: delayer.lua
-msgid "Signals are forwarded delayed. Subsequent signals are queued."
-msgstr ""
-"Signale werden verzögert weitergeleitet. Nachfolgende Signale werden in die "
-"Warteschlange gestellt."
-
-#: delayer.lua
-msgid "The delay time can be configured."
-msgstr "Die Verzögerungszeit kann eingestellt werden."
-
-#: logic_and.lua
-msgid "Signal AND with"
-msgstr "Signal UND mit"
-
-#: logic_and.lua
-msgid "inputs"
-msgstr "Eingängen"
-
-#: logic_and.lua
-msgid "Signal AND"
-msgstr "Signal UND"
-
-#: logic_and.lua
-msgid "Signal is sent, if all input signals are received."
-msgstr "Signal wird gesendet, wenn all Eingangssignale empfangen wurden."
-
-#: interpreter.lua
-msgid "Maximum programm size exceeded"
-msgstr "Maximale Programmlänge überschritten"
-
-#: interpreter.lua
-msgid "Too many parameters"
-msgstr "Zu viele Parameter"
-
-#: interpreter.lua
-msgid "Parameter error"
-msgstr "Parameter Fehler"
-
-#: interpreter.lua
-msgid "Command error"
-msgstr "Kommandozeilen Fehler"
-
-#: interpreter.lua
-msgid "'repeat' missing"
-msgstr "Es fehlt ein 'repeat'"
-
-#: interpreter.lua
-msgid "'end' missing"
-msgstr "Es fehlt ein 'end'"
-
-#: interpreter.lua
-msgid "Checked and approved"
-msgstr "Geprüft und genehmigt"
-
-#~ msgid "'return' missing"
-#~ msgstr "Es fehlt ein 'return'"
-
-#~ msgid "'call' missing"
-#~ msgstr "Es fehlt ein 'call'"
-
-#~ msgid ""
-#~ "Take <num> items from a chest like node\n"
-#~ "and put it into the item inventory.\n"
-#~ "Take care that at least one more\n"
-#~ "item of this type is available.\n"
-#~ "<slot> is the inventory slot (1..8)"
-#~ msgstr ""
-#~ "Nehme <num> Gegenstände aus der\n"
-#~ "Kiste oder dem Kisten-ähnlichen Block\n"
-#~ "und tue diese in das eigene Inventar.\n"
-#~ "Achte darauf, dass mindestens ein\n"
-#~ "weiterer Gegenstand von diesem Typ\n"
-#~ "verfügbar ist.\n"
-#~ "<slot> ist die Inventar Position (1..8)"
-
-#~ msgid ""
-#~ "Add <num> items to a chest like node\n"
-#~ "taken from the item inventory,\n"
-#~ "but only if at least one item\n"
-#~ "of this type is already available.\n"
-#~ "<slot> is the inventory slot (1..8)"
-#~ msgstr ""
-#~ "Lege <num> Gegenstände aus dem\n"
-#~ "eigenen Inventar in die andere Kiste,\n"
-#~ "aber nur, wenn bereits mindestens ein\n"
-#~ "Gegenstand von gleichen Typ verfügbar\n"
-#~ "ist. <slot> ist die Position im\n"
-#~ "eigenen Inventar (1--8)."
-
-#~ msgid ""
-#~ "Go to the next sign\n"
-#~ "to be executed as a sub-process.\n"
-#~ "After that it will go on with the next command\n"
-#~ "on this sign."
-#~ msgstr ""
-#~ "Gehe bis zum nächsten Zeichen,\n"
-#~ "das dann als Unterprogramm\n"
-#~ "bearbeitet wird. Mache danach mit\n"
-#~ "dem nächsten Kommando weiter."
diff --git a/signs_bot/locale/de.po~ b/signs_bot/locale/de.po~
deleted file mode 100644
index b3ac266..0000000
--- a/signs_bot/locale/de.po~
+++ /dev/null
@@ -1,1671 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-05-30 15:09+0200\n"
-"PO-Revision-Date: 2020-05-30 15:14+0200\n"
-"Last-Translator: \n"
-"Language-Team: \n"
-"Language: de\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 2.0.6\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: basis.lua
-msgid "Off"
-msgstr "Aus"
-
-#: basis.lua
-msgid "On"
-msgstr "An"
-
-#: basis.lua
-msgid "Signs"
-msgstr "Zeichen"
-
-#: basis.lua
-msgid "Other items"
-msgstr "Andere Gegenstände"
-
-#: basis.lua
-msgid "Config"
-msgstr "Konfig."
-
-#: basis.lua
-msgid "Preassign slots items"
-msgstr "Vorbelegungen"
-
-#: basis.lua
-msgid "Back"
-msgstr "Zurück"
-
-#: basis.lua
-msgid "Robot Box "
-msgstr "Roboter Box "
-
-#: basis.lua
-msgid "running"
-msgstr "läuft"
-
-#: basis.lua
-msgid "charging"
-msgstr "aufladen"
-
-#: basis.lua
-msgid "stopped"
-msgstr "gestoppt"
-
-#: basis.lua
-msgid "Signs Bot Box"
-msgstr "Roboter Box"
-
-#: basis.lua
-msgid "no power"
-msgstr "kein Strom"
-
-#: basis.lua
-msgid "The Box is the housing of the bot."
-msgstr "Die Box ist das Gehäuse des Roboters."
-
-#: basis.lua
-msgid "Place the box and start the bot by means of the 'On' button."
-msgstr "Platziere die Box und starte den Roboter über den \"An\" Button."
-
-#: basis.lua
-msgid "If the mod techage is installed, the bot needs electrical power."
-msgstr ""
-"Wenn die Mod techage installiert ist, benötigt der Roboter elektrischen "
-"Strom."
-
-#: basis.lua
-msgid "The bot leaves the box on the right side."
-msgstr "Der Roboter verlässt die Box auf der rechten Seite."
-
-#: basis.lua
-msgid "It will not start, if this position is blocked."
-msgstr "Er startet nicht, wenn diese Position belegt ist."
-
-#: basis.lua
-msgid "To stop and remove the bot, press the 'Off' button."
-msgstr ""
-"Um den Roboter zu stoppen bzw. zu entfernen, drücke den \"Aus\" Button."
-
-#: basis.lua
-msgid "The box inventory simulates the inventory of the bot."
-msgstr "Das Inventar der Box simuliert das Roboter Inventar."
-
-#: basis.lua
-msgid "You will not be able to access the inventory, if the bot is running."
-msgstr ""
-"Du hast keinen Zugriff auf das Inventar, sofern der Roboter unterwegs ist."
-
-#: basis.lua
-msgid "The bot can carry up to 8 stacks and 6 signs with it."
-msgstr "Der Roboter kann 8 Stapel von Blöcken und 6 Zeichen transportieren."
-
-#: bot_flap.lua
-msgid "Exit"
-msgstr "Beenden"
-
-#: bot_flap.lua
-msgid "Bot Flap"
-msgstr "Roboterklappe"
-
-#: bot_flap.lua
-msgid "The flap is a simple block used as door for the bot."
-msgstr ""
-"Die Klappe ist ein einfacher Block, welcher vom Roboter als Tür genutzt wird."
-
-#: bot_flap.lua
-msgid "Place the flap in any wall, and the bot will automatically open"
-msgstr ""
-"Platziere die Klappe in eine Mauer und der Roboter wird die Klappe "
-"automatisch öffnen"
-
-#: bot_flap.lua
-msgid "and close the flap as it passes through it."
-msgstr "und wieder schließen, wenn er durchgegangen ist."
-
-#: bot_sensor.lua
-msgid "Bot Sensor: Connected with "
-msgstr "Bot Sensor: Verbunden mit "
-
-#: bot_sensor.lua
-msgid "Bot Sensor"
-msgstr "Bot Sensor"
-
-#: bot_sensor.lua
-msgid "Bot Sensor: Not connected"
-msgstr "Bot Sensor: Nicht verbunden"
-
-#: bot_sensor.lua
-msgid "The Bot Sensor detects any bot and sends a signal, if a bot is nearby."
-msgstr ""
-"Der Roboter Sensor entdeckt jeden Roboter und sendet ein Signal, sofern ein "
-"Roboter in der Nähe ist."
-
-#: bot_sensor.lua cart_sensor.lua
-msgid "the sensor range is one node/meter."
-msgstr "Der Sensorbereich ist einen Block/Meter groß."
-
-#: bot_sensor.lua
-msgid "The sensor direction does not care."
-msgstr "Die Ausrichtung des Sensor spielt keine Rolle."
-
-#: cart_sensor.lua
-msgid "Cart Sensor: Connected with "
-msgstr "Wagen Sensor: Verbunden mit "
-
-#: cart_sensor.lua
-msgid "Cart Sensor"
-msgstr "Wagen Sensor"
-
-#: cart_sensor.lua
-msgid ""
-"The Cart Sensor detects and sends a signal, if a cart (Minecart) is nearby."
-msgstr "Der Wagen Sensor sendet ein Signal, sofern ein Wagen in der Nähe ist."
-
-#: cart_sensor.lua
-msgid "The sensor has an active side (red) that must point to the rail/cart."
-msgstr ""
-"Der Sensor hat eine aktive Seite (rot), welche zu den Schienen zeigen muss."
-
-#: changer.lua
-msgid "Signs:"
-msgstr "Zeichen:"
-
-#: changer.lua
-msgid "Bot Control Unit"
-msgstr "Roboter Steuerungseinheit"
-
-#: changer.lua
-msgid "The Bot Control Unit is used to lead the bot by means of signs."
-msgstr ""
-"Die Roboter Steuerungseinheit dient zur Steuerung des Roboters über Zeichen."
-
-#: changer.lua
-msgid ""
-"The unit can be loaded with up to 4 different signs and can be programmed by "
-"means of sensors."
-msgstr ""
-"Die Einheit kann mit bis zu 4 verschiedenen Zeichen geladen und über "
-"Sensoren programmiert werden."
-
-#: changer.lua
-msgid ""
-"To load the unit, place a sign on the red side of the unit and click on the "
-"unit."
-msgstr ""
-"Um die Steuerungseinheit zu laden, platziere ein Zeichen auf die rote Seite "
-"der Einheit und klicke auf die Einheit."
-
-#: changer.lua
-msgid "The sign disappears / is moved to the inventory of the unit."
-msgstr "Das Zeichen verschwindet/ist in die Steuerungseinheit verschoben."
-
-#: changer.lua
-msgid "This can be repeated 3 times."
-msgstr "Dies kann bis zu 3 mal wiederholt werden."
-
-#: changer.lua
-msgid ""
-"Use the connection tool to connect up to 4 sensors with the Bot Control Unit."
-msgstr ""
-"Benutze das Verbinde-Werkzeug um die bis zu 4 Sensoren mit der "
-"Steuerungseinheit zu verbinden."
-
-#: chest.lua
-msgid "Bot Chest: Sends signal to "
-msgstr "Roboter Kiste: Sende Signal zu "
-
-#: chest.lua
-msgid "Signs Bot Chest"
-msgstr "Signs Bot Kiste"
-
-#: chest.lua
-msgid "The Signs Bot Chest is a special chest with sensor function."
-msgstr ""
-"Die Roboter Kiste ist eine spezielle Kiste mit zusätzlicher Sensor-Funktion."
-
-#: chest.lua
-msgid "It sends a signal depending on the chest state."
-msgstr "Sie sendet ein Signal abhängig vom Zustand der Kiste."
-
-#: chest.lua
-msgid "Possible states are 'empty', 'not empty', 'almost full'"
-msgstr "Mögliche Zustände sind \"leer\", \"nicht leer\" und \"fast voll\""
-
-#: chest.lua
-msgid ""
-"A typical use case is to turn off the bot, when the chest is almost full or "
-"empty."
-msgstr ""
-"Ein typischer Anwendungsfall ist den Roboter zu stoppen, wenn die Kiste fast "
-"voll oder leer ist."
-
-#: cmd_farming.lua
-msgid ""
-"Sow farming seeds\n"
-"in front of the robot"
-msgstr ""
-"Sähe Saatgut\n"
-"vor dem Roboter"
-
-#: cmd_farming.lua
-msgid ""
-"Harvest farming products\n"
-"in front of the robot\n"
-"on a 3x3 field."
-msgstr ""
-"Ernte Früchte/Getreide\n"
-"in einem 3x3 großem Feld\n"
-"vor dem Roboter."
-
-#: cmd_farming.lua
-msgid ""
-"Plant a sapling\n"
-"in front of the robot"
-msgstr ""
-"Pflanze einen Setzling\n"
-"vor den Roboter"
-
-#: cmd_farming.lua
-msgid "Sign \"farming\""
-msgstr "Zeichen \"Farming\""
-
-#: cmd_farming.lua
-msgid "Sign 'farming'"
-msgstr "Zeichen 'Farming'"
-
-#: cmd_farming.lua
-msgid "Used to harvest and seed a 3x3 field."
-msgstr "Benötigt um ein 3x3 Feld zu ernten und wieder zu sähen."
-
-#: cmd_farming.lua cmd_flowers.lua
-msgid "Place the sign in front of the field."
-msgstr "Platziere das Zeichen vor das Feld."
-
-#: cmd_farming.lua
-msgid "The seed to be placed has to be in the first inventory slot of the bot."
-msgstr ""
-"Das Saatgut, dass gesät werden soll, muss sich an der 1. Position im "
-"Inventar befinden."
-
-#: cmd_farming.lua cmd_flowers.lua
-msgid "When finished, the bot turns."
-msgstr "Der Roboter dreht um, wenn er fertig ist."
-
-#: cmd_flowers.lua
-msgid ""
-"Cutting flowers\n"
-"in front of the robot\n"
-"on a 3x3 field."
-msgstr ""
-"Schneide Blumen\n"
-"in einem 3x3 großem Feld\n"
-"vor dem Roboter."
-
-#: cmd_flowers.lua
-msgid "Sign \"flowers\""
-msgstr "Zeichen \"Blumen\""
-
-#: cmd_flowers.lua
-msgid "Sign 'flowers'"
-msgstr "Zeichen 'Blumen'"
-
-#: cmd_flowers.lua
-msgid "Used to cut flowers on a 3x3 field."
-msgstr "Benötigt um ein 3x3 Blumenfeld zu ernten."
-
-#: cmd_item.lua
-msgid ""
-"Take <num> items from a chest like node\n"
-"and put it into the item inventory.\n"
-"<slot> is the inventory slot (1..8) or 0 for any one"
-msgstr ""
-"Nehme <num> Gegenstände aus der\n"
-"Kiste oder dem Kisten-ähnlichen Block\n"
-"und tue diese in das eigene Inventar\n"
-"an der Position <slot>. Slot = (1..8)\n"
-"oder 0 für irgend eine Position"
-
-#: cmd_item.lua
-msgid ""
-"Add <num> items to a chest like node\n"
-"taken from the item inventory.\n"
-"<slot> is the inventory slot (1..8) or 0 for any one"
-msgstr ""
-"Lege <num> Gegenstände aus dem\n"
-"eigenen Inventar in die andere Kiste.\n"
-"<slot> ist die Position im\n"
-"eigenen Inventar (1--8).\n"
-"oder 0 für irgend eine Position"
-
-#: cmd_item.lua
-msgid ""
-"Add <num> fuel to a furnace like node\n"
-"taken from the item inventory.\n"
-"<slot> is the inventory slot (1..8) or 0 for any one"
-msgstr ""
-"Lege <num> Brennstoffe aus dem\n"
-"eigenen Inventar in den anderen Block.\n"
-"<slot> ist die Position im\n"
-"eigenen Inventar (1--8).\n"
-"oder 0 für irgend eine Position"
-
-#: cmd_item.lua
-msgid "deprecated, use bot inventory configuration instead"
-msgstr "veraltet, benutze stattdessen die Inventar Konfigurationsmöglichkeit"
-
-#: cmd_item.lua
-msgid ""
-"Pick up all objects\n"
-"in a 3x3 field.\n"
-"<slot> is the inventory slot (1..8) or 0 for any one"
-msgstr ""
-"Hebe alle Objekte in einem\n"
-"3x3 Blöcke großen Feld auf\n"
-"und lege diese in das eigene\n"
-"Inventar an Position <slot> (1-8)\n"
-"oder 0 für irgend eine Position"
-
-#: cmd_item.lua
-msgid ""
-"Drop items in front of the bot.\n"
-"<slot> is the inventory slot (1..8) or 0 for any one"
-msgstr ""
-"Lasse ein Objekt aus dem eigenen\n"
-"Inventar vor dem Roboter fallen.\n"
-"<slot> ist die Position im\n"
-"eigenen Inventar (1--8).\n"
-"oder 0 für irgend eine Position"
-
-#: cmd_item.lua
-msgid "Punch a rail cart to start it"
-msgstr "Schlage den Wagen um ihn zu starten"
-
-#: cmd_move.lua
-msgid "Move the robot one step back"
-msgstr ""
-"Bewege den Roboter\n"
-"einen Schritt zurück"
-
-#: cmd_move.lua
-msgid "Turn the robot to the left"
-msgstr ""
-"Drehe den Roboter\n"
-"nach links"
-
-#: cmd_move.lua
-msgid "Turn the robot to the right"
-msgstr ""
-"Drehe den Roboter\n"
-"nach rechts"
-
-#: cmd_move.lua
-msgid "Turn the robot around"
-msgstr ""
-"Drehe den Roboter\n"
-"um (180 Grad)"
-
-#: cmd_move.lua
-msgid "Move the robot upwards"
-msgstr ""
-"Bewege den Roboter\n"
-"nach oben"
-
-#: cmd_move.lua
-msgid "Move the robot down"
-msgstr ""
-"Bewege den Roboter\n"
-"nach unten"
-
-#: cmd_move.lua
-msgid ""
-"Stop the robot for <sec> seconds\n"
-"(1..9999)"
-msgstr ""
-"Stoppe den Roboter\n"
-"für <sec> Sekunden (1.9999)"
-
-#: cmd_move.lua
-msgid "Stop the robot."
-msgstr "Stoppe den Roboter."
-
-#: cmd_move.lua
-msgid ""
-"Turn the robot off\n"
-"and put it back in the box."
-msgstr ""
-"Schalte den Roboter aus und\n"
-"setze ihn damit zurück in\n"
-"seine Box."
-
-#: cmd_pattern.lua
-msgid "Store pattern to be cloned."
-msgstr ""
-"Speichere die Vorlage\n"
-"die kopiert werden soll."
-
-#: cmd_pattern.lua
-msgid ""
-"Copy the nodes from\n"
-"the stored pattern position\n"
-"<size> is: 3x1, 3x2, 3x3,\n"
-"5x1, 5x2, 5x3 (wide x deep)\n"
-"<lvl> pattern level offset (0..4)"
-msgstr ""
-"Kopiere die Blöcke von der\n"
-"\"Vorlage\" Position.\n"
-"<size> ist: 3x1, 3x2, 3x3,\n"
-"5x1, 5x2, 5x3 (Breite x Tiefe)\n"
-"<lvl> Vorlagenebene (0..4)"
-
-#: cmd_pattern.lua
-msgid "Sign \"pattern\""
-msgstr "Zeichen \"Vorlage\""
-
-#: cmd_pattern.lua
-msgid "Sign \"copy 3x3x3\""
-msgstr "Zeichen \"kopiere 3x3x3\""
-
-#: cmd_pattern.lua
-msgid "Sign 'pattern'"
-msgstr "Zeichen 'Vorlage'"
-
-#: cmd_pattern.lua
-msgid "Used to make a copy of a 3x3x3 cube."
-msgstr "Benötigt um eine Kopie eines 3x3x3 Quadrats zu machen."
-
-#: cmd_pattern.lua
-msgid "Place the sign in front of the pattern to be copied."
-msgstr "Platziere das Zeichen vor die Vorlage, die kopiert werden soll."
-
-#: cmd_pattern.lua
-msgid ""
-"Use the copy sign to make the copy of this pattern on a different location."
-msgstr ""
-"Benutze das Kopier-Zeichen, um eine Kopie dieser Vorlage an einer anderen "
-"Stelle zu machen."
-
-#: cmd_pattern.lua
-msgid "The bot must first reach the pattern sign, then the copy sign."
-msgstr ""
-"Der Roboter muss zuerst das Vorlage-Zeichen und dann das Kopier-Zeichen "
-"erreichen."
-
-#: cmd_pattern.lua
-msgid "Sign 'copy3x3x3'"
-msgstr "Zeichen 'kopiere 3x3x3'"
-
-#: cmd_pattern.lua
-msgid "Place the sign in front of the location, where the copy should be made."
-msgstr ""
-"Platziere das Zeichen vor die Stelle, wo die Kopie hergestellt werden soll."
-
-#: cmd_pattern.lua
-msgid "Use the pattern sign to mark the pattern."
-msgstr "Benutze das Vorlage-Zeichen und die Vorlage zu markieren."
-
-#: cmd_place.lua
-msgid "Error: Position protected"
-msgstr "Fehler: Position geschützt"
-
-#: cmd_place.lua
-msgid ""
-"Place a block in front of the robot\n"
-"<slot> is the inventory slot (1..8)\n"
-"<lvl> is one of: -1   0   +1"
-msgstr ""
-"Setze einen Block vor den Roboter.\n"
-"<slot> ist die Position im\n"
-"eigenen Inventar (1--8).\n"
-"Für <lvl> ist zulässig: -1   0   +1"
-
-#: cmd_place.lua
-msgid ""
-"Place a block on the left side\n"
-"<slot> is the inventory slot (1..8)\n"
-"<lvl> is one of: -1   0   +1"
-msgstr ""
-"Setze einen Block links vorne.\n"
-"<slot> ist die Position im\n"
-"eigenen Inventar (1--8).\n"
-"Für <lvl> ist zulässig: -1   0   +1"
-
-#: cmd_place.lua
-msgid ""
-"Place a block on the right side\n"
-"<slot> is the inventory slot (1..8)\n"
-"<lvl> is one of: -1   0   +1"
-msgstr ""
-"Setze einen Block rechts vorne.\n"
-"<slot> ist die Position im\n"
-"eigenen Inventar (1--8).\n"
-"Für <lvl> ist zulässig: -1   0   +1"
-
-#: cmd_place.lua
-msgid ""
-"Place a block under the robot.\n"
-"Hint: use 'move_up' first.\n"
-"<slot> is the inventory slot (1..8)"
-msgstr ""
-"Setze einen Block unter den Roboter.\n"
-"<slot> ist die Position im\n"
-"eigenen Inventar (1--8)."
-
-#: cmd_place.lua
-msgid ""
-"Place a block above the robot.\n"
-"<slot> is the inventory slot (1..8)"
-msgstr ""
-"Setze einen Block über den Roboter.\n"
-"<slot> ist die Position im\n"
-"eigenen Inventar (1--8)."
-
-#: cmd_place.lua
-msgid "Error: No free inventory space"
-msgstr "Fehler: Kein freier Inventarplatz"
-
-#: cmd_place.lua
-msgid ""
-"Dig the block in front of the robot\n"
-"<slot> is the inventory slot (1..8)\n"
-"<lvl> is one of: -1   0   +1"
-msgstr ""
-"Entferne einen Block vor den Roboter.\n"
-"<slot> ist die Position im\n"
-"eigenen Inventar (1--8).\n"
-"Für <lvl> ist zulässig: -1   0   +1"
-
-#: cmd_place.lua
-msgid ""
-"Dig the block on the left side\n"
-"<slot> is the inventory slot (1..8)\n"
-"<lvl> is one of: -1   0   +1"
-msgstr ""
-"Entferne einen links vorne.\n"
-"<slot> ist die Position im\n"
-"eigenen Inventar (1--8).\n"
-"Für <lvl> ist zulässig: -1   0   +1"
-
-#: cmd_place.lua
-msgid ""
-"Dig the block on the right side\n"
-"<slot> is the inventory slot (1..8)\n"
-"<lvl> is one of: -1   0   +1"
-msgstr ""
-"Entferne einen rechts vorne.\n"
-"<slot> ist die Position im\n"
-"eigenen Inventar (1--8).\n"
-"Für <lvl> ist zulässig: -1   0   +1"
-
-#: cmd_place.lua
-msgid ""
-"Dig the block under the robot.\n"
-"<slot> is the inventory slot (1..8)"
-msgstr ""
-"Entferne einen Block unter dem\n"
-"Roboter.\n"
-"<slot> ist die Position im\n"
-"eigenen Inventar (1--8)."
-
-#: cmd_place.lua
-msgid ""
-"Dig the block above the robot.\n"
-"<slot> is the inventory slot (1..8)"
-msgstr ""
-"Entferne einen Block über dem\n"
-"Roboter.\n"
-"<slot> ist die Position im\n"
-"eigenen Inventar (1--8)."
-
-#: cmd_place.lua
-msgid ""
-"Rotate the block in front of the robot\n"
-"<lvl> is one of:  -1   0   +1\n"
-"<steps> is one of:  1   2   3"
-msgstr ""
-"Rotiere den Block vor dem Roboter.\n"
-"Für <lvl> ist zulässig: -1   0   +1\n"
-"Für <steps> ist zulässig: 1   2   3"
-
-#: cmd_sign.lua
-msgid "Commands,Help"
-msgstr "Kommandos,Hilfe"
-
-#: cmd_sign.lua
-msgid "Sign name:"
-msgstr "Zeichenname:"
-
-#: cmd_sign.lua
-msgid "Cancel"
-msgstr "Abbruch"
-
-#: cmd_sign.lua
-msgid "Check"
-msgstr "Prüfen"
-
-#: cmd_sign.lua
-msgid "Copy Cmnd"
-msgstr "Kopiere Kommando"
-
-#: cmd_sign.lua
-msgid "Sign \"command\""
-msgstr "Zeichen \"Kommando\""
-
-#: cmd_sign.lua
-msgid "-- enter or copy commands from help page"
-msgstr "-- Kommandos eingeben oder von der Hilfeseite kopieren"
-
-#: cmd_sign.lua
-msgid "Error: Signs inventory empty"
-msgstr "Fehler: Zeichen Inventar ist leer"
-
-#: cmd_sign.lua
-msgid "Error: Position protected or occupied"
-msgstr "Fehler: Position ist geschützt oder belegt"
-
-#: cmd_sign.lua
-msgid ""
-"Place a sign in front of the robot\n"
-"taken from the signs inventory\n"
-"<slot> is the inventory slot (1..6)"
-msgstr ""
-"Setze ein Zeichen vor den Roboter.\n"
-"<slot> ist die Position im\n"
-"eigenen Inventar (1--6)."
-
-#: cmd_sign.lua
-msgid ""
-"Place a sign behind the robot\n"
-"taken from the signs inventory\n"
-"<slot> is the inventory slot (1..6)"
-msgstr ""
-"Setze ein Zeichen hinter den Roboter.\n"
-"<slot> ist die Position im\n"
-"eigenen Inventar (1--6)."
-
-#: cmd_sign.lua
-msgid "Error: No sign available"
-msgstr "Fehler: Kein Zeichen verfügar"
-
-#: cmd_sign.lua
-msgid "Error: Signs inventory slot is occupied"
-msgstr "Fehler: Die Zeicheninventar Position ist belegt"
-
-#: cmd_sign.lua
-msgid "Error: Position is protected"
-msgstr "Fehler: Die Position ist geschützt"
-
-#: cmd_sign.lua
-msgid ""
-"Dig the sign in front of the robot\n"
-"and add it to the signs inventory.\n"
-"<slot> is the inventory slot (1..6)"
-msgstr ""
-"Entferne das Zeichen vor den Roboter.\n"
-"<slot> ist die Position im\n"
-"eigenen Inventar (1--6)."
-
-#: cmd_sign.lua
-msgid ""
-"Dig the sign in front of the robot\n"
-"and add the cleared sign to\n"
-"the item iventory.\n"
-"<slot> is the inventory slot (1..8)"
-msgstr ""
-"Entferne das Zeichen vor den Roboter.\n"
-"<slot> ist die Position im\n"
-"eigenen Inventar (1--6)."
-
-#: cmd_sign.lua
-msgid "Sign 'command'"
-msgstr "Zeichen 'Kommando'"
-
-#: cmd_sign.lua
-msgid "The 'command' sign can be programmed by the player."
-msgstr "Das 'Kommando' Zeichen kann vom Spieler programmiert werden."
-
-#: cmd_sign.lua
-msgid ""
-"Place the sign in front of you and use the node menu to program your "
-"sequence of bot commands."
-msgstr ""
-"Platziere das Zeichen vor dir und nutze das Zeichen-Menü, um die Kommando-"
-"Sequenz zu programmieren."
-
-#: cmd_sign.lua
-msgid ""
-"The menu has an edit field for your commands and a help page with all "
-"available commands."
-msgstr ""
-"Das Menü hat ein Eingabefeld für deine Kommandos und eine Hilfeseite zu "
-"allen Kommandos."
-
-#: cmd_sign.lua doc.lua
-msgid "The help page has a copy button to simplify the programming."
-msgstr ""
-"Die Hilfeseite hat einen Kopier-Button um die Programmierung zu erleichtern."
-
-#: commands.lua
-msgid "commands:"
-msgstr "Kommandos:"
-
-#: commands.lua
-msgid "unknown command"
-msgstr "unbekanntes Kommando"
-
-#: commands.lua
-msgid "start of a 'repeat..end' block"
-msgstr "Anfang eines 'repeat..end' Blocks"
-
-#: commands.lua
-msgid "end command of a 'repeat..end' block"
-msgstr "Ende Kommando eines 'repeat..end' Blocks"
-
-#: commands.lua
-msgid "call a subroutine (with 'return' statement)"
-msgstr "Aufruf einer Unterfunktion (mit 'return' Anweisung)"
-
-#: commands.lua
-msgid "return from a subroutine"
-msgstr "Rückkehr von einer Unterfunktion"
-
-#: commands.lua
-msgid "jump to a label"
-msgstr "Sprung zu einer Marke"
-
-#: commands.lua
-#, fuzzy
-msgid ""
-"Move the robot 1..999 steps forward\n"
-"without paying attention to any signs.\n"
-"Up and down movements also become\n"
-"counted as steps."
-msgstr ""
-"Bewege den Roboter 1..99 Schritte\n"
-"vorwärts ohne auf Zeichen zu achten.\n"
-"Auf- und Ab-Bewegungen werden auch\n"
-"als Schritte gezählt."
-
-#: commands.lua
-msgid ""
-"Walk until a sign or obstacle is\n"
-"reached. Then continue with the next command.\n"
-"When a sign has been reached, \n"
-"the current program is ended\n"
-"and the bot executes the\n"
-"new program from the sign"
-msgstr ""
-"Gehe bis ein Zeichen oder Hindernis\n"
-"erreicht wurde. Führe dann das nächste\n"
-"Kommando aus. \n"
-"Wurde ein Zeichen erreicht, so arbeite\n"
-"die Kommandos des Zeichens als\n"
-"Unter-Prozess ab"
-
-#: crop_sensor.lua
-msgid "Crop Sensor: Connected with "
-msgstr "Ernte Sensor: Verbunden mit "
-
-#: crop_sensor.lua
-msgid "Crop Sensor"
-msgstr "Ernte Sensor"
-
-#: crop_sensor.lua
-msgid "The Crop Sensor sends a signal when, for example wheat is fully grown."
-msgstr ""
-"Der Ernte Sensor sendet ein Signal, wenn bspw. der Weizen voll ausgewachsen "
-"ist."
-
-#: crop_sensor.lua
-msgid "The sensor range is one node/meter."
-msgstr "Der Sensorbereich beträgt einen Block/Meter."
-
-#: crop_sensor.lua
-msgid "The sensor has an active side (red) that must point to the crop/field."
-msgstr ""
-"Der Sensor hat eine aktive Seite (rot), welche zur der Pflanze zeigen muss."
-
-#: doc.lua
-msgid ""
-"After you have placed the Signs Bot Box, you can start the bot by means of "
-"the 'On' button in the box menu."
-msgstr ""
-"Nachdem du die Roboter-Kiste platziert hast, kannst du den Roboter über den "
-"\"An\" Button im Kistenmenü starten."
-
-#: doc.lua
-msgid ""
-"The bot then runs straight up until it reaches an obstacle (a step with two "
-"or more blocks up or down or a sign.)"
-msgstr ""
-"Der Roboter läuft dann geradeaus, bis er ein Hindernis erreicht (eine Stufe "
-"mit zwei oder mehr Blöcken, auf oder ab)."
-
-#: doc.lua
-msgid ""
-"If the bot first reaches a sign it will execute the commands on the sign."
-msgstr ""
-"Falls der Roboter zuerst ein Zeichen erreicht, wird er die Kommandos auf dem "
-"Zeichen ausführen."
-
-#: doc.lua
-msgid ""
-"If the command(s) on the sign is e.g. 'turn_around', the bot turns and goes "
-"back."
-msgstr ""
-"Falls das Kommandos auf dem Zeichen bspw. ein 'turn_around' ist, dreht der "
-"Roboter um und geht zurück."
-
-#: doc.lua
-msgid "In this case, the bot reaches his box again and turns off."
-msgstr ""
-"In diesem Fall erreicht der Roboter wieder seine Box und schaltet sich ab."
-
-#: doc.lua
-msgid ""
-"The Signs Bot Box has an inventory with 6 stacks for signs and 8 stacks for "
-"other items (to be placed/dug by the bot)."
-msgstr ""
-"Die Roboter Box hat ein Inventar für 6 Stapel Zeichen und 8 Stapel für "
-"andere Gegenstände (welche platziert oder eingesammelt werden können)."
-
-#: doc.lua
-msgid "This inventory simulates the bot internal inventory."
-msgstr "Das Inventar der Box simuliert das Roboter Inventar."
-
-#: doc.lua
-msgid ""
-"That means you will only have access to the inventory if the bot is turned "
-"off ('sitting' in his box)."
-msgstr ""
-"Das bedeutet, du hast nur Zugriff auf das Inventar, sofern der Roboter "
-"ausgeschaltet ist."
-
-#: doc.lua
-msgid ""
-"You simply control the direction of the bot by means of the 'turn left' and "
-"'turn right' signs (signs with the arrow)."
-msgstr ""
-"Du kannst die Richtung des Roboters ganz einfach über 'turn_left' (drehe "
-"nach links) oder 'turn_right' (drehe nach rechts) Zeichen verändern."
-
-#: doc.lua
-msgid ""
-"The bot can run over steps (one block up/down). But there are also commands "
-"to move the bot up and down."
-msgstr ""
-"Der Roboter kann auch Stufen überwinden (eine Block hoch oder runter). Aber "
-"es gibt auch Kommandos, um den Roboter nach oben oder unten zu bewegen."
-
-#: doc.lua
-msgid "It is not necessary to mark a way back to the box."
-msgstr ""
-"Es ist nicht notwendig, dem Roboter einen Weg zurück zu seiner Box zu "
-"markieren."
-
-#: doc.lua
-msgid ""
-"With the command 'turn_off' the bot will turn off and be back in his box "
-"from every position."
-msgstr ""
-"Mit dem Kommando \"turn_off\" wird der Roboter ausgeschaltet und befindet "
-"sich danach wieder in seiner Box, egal wo er war."
-
-#: doc.lua
-msgid "The same applies if you turn off the bot by the box menu."
-msgstr ""
-"Das gleiche gilt, wenn du den Roboter über den 'Aus' Button ausschaltest."
-
-#: doc.lua
-msgid ""
-"If the bot reaches a sign from the wrong direction (from back or sides) the "
-"sign will be ignored."
-msgstr ""
-"Wenn der Roboter ein Zeichen von der falschen Richtung erreicht (von der "
-"Seite oder von hinten), wird das Zeichen ignoriert."
-
-#: doc.lua
-msgid "The bot will walk over."
-msgstr "Der Roboter läuft einfach hinüber."
-
-#: doc.lua
-msgid "All predefined signs have a menu with a list of the bot commands."
-msgstr ""
-"Alle vordefinierten Zeichen haben ein Menü mit der Liste der Kommandos."
-
-#: doc.lua
-msgid ""
-"These signs can't be changed, but you can craft and program your own signs."
-msgstr ""
-"Diese Zeichen können nicht geändert werden, aber du kannst eigene Zeichen "
-"herstellen und programmieren."
-
-#: doc.lua
-msgid "For this you have to use the 'command' sign."
-msgstr "Dafür kannst du das 'command' Zeichen verwenden."
-
-#: doc.lua
-msgid ""
-"This sign has an edit field for your commands and a help page with all "
-"available commands."
-msgstr ""
-"Das Zeichen hat ein Eingabefeld für deine Kommandos und eine Hilfeseite zu "
-"allen Kommandos."
-
-#: doc.lua
-msgid "Also for your own signs it is important to know:"
-msgstr "Es ist auch für eigene Zeichen wichtig zu wissen:"
-
-#: doc.lua
-msgid ""
-"After the execution of the last command of the sign, the bot falls back into "
-"its default behaviour and runs in its taken direction."
-msgstr ""
-"Nach der Ausführung des letzten Kommandos eines Zeichens fällt der Roboter "
-"immer zurück in sein Standardverhalten und läuft in die eingeschlagene "
-"Richtung weiter."
-
-#: doc.lua
-msgid "A standard job for the bot is to move items from one chest to another"
-msgstr ""
-"Eine Standardaufgabe für den Roboter ist, Gegenstände von einer Kiste in "
-"eine andere zu tun"
-
-#: doc.lua
-msgid "(chest or node with a chest like inventory)."
-msgstr "(Kiste oder Block mit Kisten-ähnlichem Inventar)."
-
-#: doc.lua
-msgid "This can be done by means of the two signs 'take item' and 'add item'."
-msgstr ""
-"Das kann mit Hilfe von zwei Zeichen realisiert werden: 'take_item' und "
-"'add_item'."
-
-#: doc.lua
-msgid "These signs have to be placed on top of chest nodes."
-msgstr "Diese Zeichen müssen auf den Kisten platziert werden."
-
-#: doc.lua
-msgid "In addition to the signs the bot can be controlled by means of sensors."
-msgstr ""
-"Zusätzlich zu den Zeichen kann der Roboter auch über Sensoren gesteuert "
-"werden."
-
-#: doc.lua
-msgid "Sensors like the Bot Sensor have two states: on and off."
-msgstr ""
-"Sensoren wie der Roboter-Sensor haben zwei Zustande: on' (an) und "
-"'off' (aus)."
-
-#: doc.lua
-msgid "If the Bot Sensor detects a bot it will switch to the state 'on' and"
-msgstr ""
-"Wenn der Roboter-Sensor einen Roboter erkennt geht er in den Zustand 'on' und"
-
-#: doc.lua
-msgid "sends a signal to a connected block, called an actuator."
-msgstr "sendet ein Signal zu einem verbundenen Block, einem Aktor."
-
-#: doc.lua
-msgid "Sensors are:"
-msgstr "Sensoren sind:"
-
-#: doc.lua
-msgid "- Bot Sensor: Sends a signal when the robot passes by"
-msgstr "- Roboter Sensor: Sendet ein Signal wenn ein Roboter vorbei geht"
-
-#: doc.lua
-msgid "- Node Sensor: Sends a signal when it detects any node"
-msgstr ""
-"- Block Sensor: Sendet ein Signal bei einer Veränderung von Blocken vor sich"
-
-#: doc.lua
-msgid "- Crop Sensor: Sends a signal when, for example wheat is fully grown"
-msgstr ""
-"- Ernte Sensor: Sendet ein Signal, wenn bspw. der Weizen voll ausgewachsen "
-"ist"
-
-#: doc.lua
-msgid "- Bot Chest: Sends a signal depending on the chest state (empty, full)"
-msgstr ""
-"- Roboter-Kiste: Sendet ein Signal abhängig vom Zustand der Kiste (voll, "
-"leer)"
-
-#: doc.lua
-msgid "Actuators are:"
-msgstr "Aktoren sind:"
-
-#: doc.lua
-msgid "- Signs Bot Box: Can turn the bot off and on"
-msgstr "- Roboter-Box: Kann den Roboter ein- und ausschalten"
-
-#: doc.lua
-msgid "- Control Unit: Can be used to exchange the sign to lead the bot"
-msgstr ""
-"- Steuerungseinheit: Wird genutzt um Zeichen auszutauschen und damit den "
-"Roboter zu steuern"
-
-#: doc.lua
-msgid "Additional sensors and actuator can be added by other mods."
-msgstr ""
-"Weitere Sensoren und Aktoren können von weiteren Mods hinzugefügt werden."
-
-#: doc.lua
-msgid ""
-"To send a signal from a sensor to an actuator, the sensor has to be "
-"connected (paired) with actuator."
-msgstr ""
-"Um ein Signal von einem Sensor zu einem Aktor senden zu können, muss der "
-"Sensor mit dem Aktor verbunden werden (Pairing)."
-
-#: doc.lua
-msgid ""
-"To connect sensor and actuator, the Sensor Connection Tool has to be used."
-msgstr ""
-"Das Sensor Verbinde-Werkzeug wir genutzt, um Sensoren mit Aktoren zu "
-"verbinden."
-
-#: doc.lua
-msgid ""
-"Simply click with the tool on both blocks and the sensor will be connected "
-"with the actuator."
-msgstr ""
-"Klicke einfach mit dem Werkzeug nacheinander auf beide Blöcke und der Sensor "
-"wird mit dem Aktor verbunden."
-
-#: doc.lua
-msgid "A successful connection is indicated by a ping/pong noise."
-msgstr ""
-"Eine erfolgreiche Verbindung wird über ein Ping/Pong-Geräusch angezeigt."
-
-#: doc.lua
-msgid ""
-"Before you connect sensor with actuator, take care that the actuator is in "
-"the requested state."
-msgstr ""
-"Bevor du einen Sensor mit einem Aktor verbindest, achte darauf, dass sich "
-"der Aktor im richtigen Zustand befindet."
-
-#: doc.lua
-msgid ""
-"For example: If you want to start the Bot with a sensor, connect the sensor "
-"with the Bot Box,"
-msgstr ""
-"Zum Beispiel: Wenn du den Roboter über einen Sensor starten willst, verbinde "
-"Sensor und Roboter-Kiste nur,"
-
-#: doc.lua
-msgid ""
-"when the Bot is in the state 'on'. Otherwise the sensor signal will stop the "
-"Bot,"
-msgstr ""
-"wenn der Roboter an ist (im Zustand 'on'). Anderenfalls würde der Sensor den "
-"Roboter ausschalten,"
-
-#: doc.lua
-msgid "instead of starting it."
-msgstr "anstatt ihn zu starten."
-
-#: doc.lua
-msgid ""
-"The following applies to all commands that are used to place items in the "
-"bot inventory, like:"
-msgstr ""
-"Das folgende gilt für alle Kommandos, um Items in das Roboter Inventar zu "
-"legen, wie:"
-
-#: doc.lua
-msgid "- take_item <num> <slot>"
-msgstr "- take_item <num> <slot>"
-
-#: doc.lua
-msgid "- pickup_items <slot>"
-msgstr "- pickup_items <slot>"
-
-#: doc.lua
-msgid "- trash_sign <slot>"
-msgstr "- trash_sign <slot>"
-
-#: doc.lua
-msgid "- harvest <slot>"
-msgstr "- harvest <slot>"
-
-#: doc.lua
-msgid "- dig_front <slot> <lvl>"
-msgstr "- dig_front <slot> <lvl>"
-
-#: doc.lua
-msgid "- dig_left <slot> <lvl>"
-msgstr "- dig_left <slot> <lvl>"
-
-#: doc.lua
-msgid "- dig_right <slot> <lvl>"
-msgstr "- dig_right <slot> <lvl>"
-
-#: doc.lua
-msgid "- dig_below <slot> <lvl>"
-msgstr "- dig_below <slot> <lvl>"
-
-#: doc.lua
-msgid "- dig_above <slot> <lvl>"
-msgstr "- dig_above <slot> <lvl>"
-
-#: doc.lua
-msgid ""
-"If no slot or slot 0 was specified with the command (case A), all 8 slots of "
-"the bot inventory "
-msgstr ""
-"Wurde beim Kommando kein Slot oder Slot 0 angegeben (Fall A), werden "
-"nacheinander alle "
-
-#: doc.lua
-msgid ""
-"are checked one after the other. If a slot was specified (case B), only this "
-"slot is checked."
-msgstr ""
-"8 Slots des Bot Inventars geprüft, Wurde ein Slot angegeben (Fall B), wird "
-"nur dieser geprüft."
-
-#: doc.lua
-msgid ""
-"In both cases the following applies: If the slot is preconfigured and fits "
-"the item, "
-msgstr ""
-"In beiden Fällen gilt: Ist der Slot vorkonfiguriert und passt das Item dazu, "
-"oder ist der Slot "
-
-#: doc.lua
-msgid ""
-"or if the slot is not configured and empty, or is only partially filled with "
-"the item type "
-msgstr ""
-"nicht konfiguriert und leer, oder mit dem Item-Typ (das hinzu gefügt werden "
-"soll) nur "
-
-#: doc.lua
-msgid "(which should be added), then the items are added."
-msgstr "teilweise gefüllt, dann werden die Items hinzugefügt."
-
-#: doc.lua
-msgid ""
-"If not all items can be added, the remaining slots will be tried out in case "
-"A."
-msgstr ""
-"Können nicht alle Items hinzugefügt werden, werden im Falle A die restlichen "
-"Slots weiter durchprobiert."
-
-#: doc.lua
-msgid "Anything that could not be added to your own inventory goes back."
-msgstr "Was nicht dem eigenen Inventar hinzugefügt werden konnte, geht zurück."
-
-#: doc.lua
-msgid ""
-"The following applies to all commands that are used to take items from the "
-"bot inventory, like:"
-msgstr ""
-"Das folgende gilt für alle Kommandos, um Items aus dem Roboter Inventar zu "
-"nehmen, wie:"
-
-#: doc.lua
-msgid "- add_item <num> <slot>"
-msgstr "- add_item <num> <slot>"
-
-#: doc.lua
-msgid ""
-"It doesn't matter whether a slot is configured or not. The bot takes the "
-"first stack that "
-msgstr ""
-"Hier ist es egal, ob ein Slot konfiguriert ist, oder nicht. Der Bot nimmt "
-"den ersten Stack, den "
-
-#: doc.lua
-msgid "it can find from its own inventory and tries to use it."
-msgstr ""
-"er finden kann, aus dem eigenen Inventar und versucht diesen zu nutzen."
-
-#: doc.lua
-msgid ""
-"If a slot is specified, it only takes this, if no slot has been specified, "
-"it checks all of "
-msgstr ""
-"Ist ein Slot angegeben, nimmt er nur diesen, wurde kein Slot angegeben, "
-"prüft er alle "
-
-#: doc.lua
-msgid ""
-"them one after the other, starting from slot 1 until it finds something."
-msgstr ""
-"nacheinander, von Slot 1 beginnend, bis er etwas findet. Ist die gefundene "
-"Anzahl kleiner als "
-
-#: doc.lua
-msgid ""
-"If the number found is smaller than requested, he tries to take the rest out "
-"of any slot."
-msgstr "gefordert, versucht er den Rest aus irgend einem Slot zu nehmen."
-
-#: doc.lua
-msgid "Signs Bot"
-msgstr "Signs Bot"
-
-#: doc.lua
-msgid "A robot controlled by signs, used for automated work"
-msgstr "Ein Roboter, gesteuert über Zeichen, für Automatisierungsaufgaben"
-
-#: doc.lua
-msgid "Start the Bot"
-msgstr "Starte den Roboter"
-
-#: doc.lua
-msgid "Control the Bot"
-msgstr "Steuere den Roboter"
-
-#: doc.lua
-msgid "Sensors and Actuators"
-msgstr "Sensoren und Aktoren"
-
-#: doc.lua
-msgid "Connecting sensors and actuator"
-msgstr "Verbinde Sensor mit Aktor"
-
-#: doc.lua
-msgid "Bot inventory behavior"
-msgstr "Verhalten beim Roboter Inventar"
-
-#: duplicator.lua
-msgid "Input:"
-msgstr "Eingabe:"
-
-#: duplicator.lua
-msgid "Template:"
-msgstr "Vorlage:"
-
-#: duplicator.lua
-msgid "Output:"
-msgstr "Ausgabe:"
-
-#: duplicator.lua
-msgid ""
-"1. Place one 'cmnd' sign to be\n"
-"    used as template.\n"
-msgstr ""
-"1. Verwende ein Kommando-\n"
-"     Zeichen als Vorlage.\n"
-
-#: duplicator.lua
-msgid ""
-"2. Add 'blank signs' to\n"
-"    the input inventory.\n"
-msgstr ""
-"2. Füge 'leere Zeichen'\n"
-"     als Eingabe hinzu.\n"
-
-#: duplicator.lua
-msgid ""
-"3. Take the copies\n"
-"    from the output inventory."
-msgstr ""
-"3. Entnehme die Kopieren\n"
-"     aus der Ausgabe."
-
-#: duplicator.lua
-msgid "Signs Duplicator"
-msgstr "Zeichen Kopierer"
-
-#: duplicator.lua
-msgid "Sign \"user\""
-msgstr "Zeichen \"Benutzer\""
-
-#: duplicator.lua
-msgid "Sign \"blank\""
-msgstr "\"Leeres\" Zeichen"
-
-#: duplicator.lua
-msgid "The Duplicator can be used to make copies of signs."
-msgstr ""
-"Der Zeichen Kopierer kann zur Herstellung von Kopien eines Zeichens genutzt "
-"werden."
-
-#: duplicator.lua
-msgid ""
-"1. Put one 'cmnd' sign to be used as template into the 'Template' inventory"
-msgstr "1. Lege ein Kommando-Zeichen als Vorlage in das 'Vorlage' Inventar"
-
-#: duplicator.lua
-msgid "2. Add one or several 'blank signs' to the 'Input' inventory."
-msgstr "2. Füge ein oder mehrere 'leere Zeichen' als Eingabe hinzu."
-
-#: duplicator.lua
-msgid "3. Take the copies from the 'Output' inventory."
-msgstr "3. Entnehme die Kopieren aus der Ausgabe."
-
-#: duplicator.lua
-msgid ""
-"Written books [default:book_written] can alternatively be used as template"
-msgstr ""
-"Alternativ können auch beschriebene Bücher [default:book_written] als "
-"Vorlage verwendet werden"
-
-#: duplicator.lua
-msgid "Already written signs can be used as input, too."
-msgstr ""
-"Bereits beschriebene Zeichen können auch als Eingabe-Zeichen genutzt werden."
-
-#: duplicator.lua
-msgid "Needed as input for the Duplicator."
-msgstr "Wird als Eingabe für den Zeichen Kopierer benötigt."
-
-#: extender.lua
-msgid "Sensor Extender: Connected with "
-msgstr "Sensor Erweiterung: Verbunden mit "
-
-#: extender.lua
-msgid "Sensor Extender"
-msgstr "Sensor Erweiterung"
-
-#: extender.lua
-msgid "Sensor Extender: Not connected"
-msgstr "Sensor Erweiterung: Nicht verbunden"
-
-#: extender.lua
-msgid ""
-"With the Sensor Extender, sensor signals can be sent to more than one "
-"actuator."
-msgstr ""
-"Mit Hilfe der Sensor-Erweiterung können weitere Aktoren mit dem Sensor "
-"verbunden werden."
-
-#: extender.lua
-msgid "Place one or more extender nearby the sensor and connect each extender"
-msgstr ""
-"Platziere ein oder mehrere Sensor-Erweiterungen neben einen Sensor und "
-"verbinde diese"
-
-#: extender.lua
-msgid "with one further actuator by means of the Connection Tool."
-msgstr "mit weiteren Aktoren mit Hilfe des Verbinde-Werkzeuges."
-
-#: node_sensor.lua
-msgid "Node Sensor: Connected with "
-msgstr "Block Sensor: Verbunden mit "
-
-#: node_sensor.lua
-msgid "added"
-msgstr "hinzukommen"
-
-#: node_sensor.lua
-msgid "removed"
-msgstr "fehlen"
-
-#: node_sensor.lua
-msgid "added or removed"
-msgstr "hinzukommen oder fehlen"
-
-#: node_sensor.lua
-msgid "Send signal if nodes have been:"
-msgstr "Sende ein Signal wenn Blöcke:"
-
-#: node_sensor.lua
-msgid "accept"
-msgstr "übernehmen"
-
-#: node_sensor.lua
-msgid "Node Sensor"
-msgstr "Block Sensor"
-
-#: node_sensor.lua
-msgid ""
-"The node sensor can send a signal when it detects that nodes appear or "
-"disappear,"
-msgstr ""
-"Der Block Sensor kann ein Signal senden, wenn er eine Veränderung von "
-"Blöcken vor sich entdeckt (ein Block erscheint oder verschwindet),"
-
-#: node_sensor.lua
-msgid "but has to be configured accordingly."
-msgstr "aber muss entsprechend konfiguriert werden."
-
-#: node_sensor.lua
-msgid "Valid nodes are all kind of blocks and plants."
-msgstr "Gültig sind alle Arten von Blöcken oder Pflanzen."
-
-#: node_sensor.lua
-msgid "The sensor range is 3 nodes/meters in one direction."
-msgstr "Die Sensor-Reichweite beträgt 3 Blöcke/Meter in eine Richtung."
-
-#: node_sensor.lua
-msgid ""
-"The sensor has an active side (red) that must point to the observed area."
-msgstr ""
-"Der Sensor hat eine aktive Seite (rot) welche zu dem zu überwachenden "
-"Bereich zeigen muss."
-
-#: signs.lua
-msgid "Sign \"turn right\""
-msgstr "Zeichen \"rechts drehen\""
-
-#: signs.lua
-msgid "Sign \"turn left\""
-msgstr "Zeichen \"links drehen\""
-
-#: signs.lua
-msgid "Sign \"take item\""
-msgstr "Zeichen \"Nehme Gegenstand\""
-
-#: signs.lua
-msgid "Sign \"add item\""
-msgstr "Zeichen \"Lege Gegenstand\""
-
-#: signs.lua
-msgid "Sign \"stop\""
-msgstr "Zeichen \"Stopp\""
-
-#: signs.lua
-msgid "Sign \"add to cart\""
-msgstr "Zeichen \"Lege in den Wagen\""
-
-#: signs.lua
-msgid "Sign \"take from cart\""
-msgstr "Zeichen \"Nehme aus dem Wagen\""
-
-#: signs.lua
-msgid "The Bot turns right when it detects this sign in front of it."
-msgstr "Der Roboter dreht nach rechts, wenn er dieses Zeichen vor sich hat."
-
-#: signs.lua
-msgid "The Bot turns left when it detects this sign in front of it."
-msgstr "Der Roboter dreht nach links, wenn er dieses Zeichen vor sich hat."
-
-#: signs.lua
-msgid ""
-"The Bot takes items out of a chest in front of it and then turns around."
-msgstr ""
-"Der Roboter nimmt Gegenstände aus einer Kiste vor sich und dreht dann um."
-
-#: signs.lua
-msgid "This sign has to be placed on top of the chest."
-msgstr "Das Zeichen muss auf der Kiste platziert werden."
-
-#: signs.lua
-msgid "The Bot puts items into a chest in front of it and then turns around."
-msgstr "Der Roboter legt Gegenstände in eine Kiste vor sich und dreht dann um."
-
-#: signs.lua
-msgid ""
-"The Bot will stop in front of this sign until the sign is removed or the bot "
-"is turned off."
-msgstr ""
-"Der Roboter stoppt vor diesem Zeichen, bis das Zeichen entfernt, oder der "
-"Roboter ausgeschaltet wird."
-
-#: signs.lua
-msgid ""
-"The Bot puts items into a minecart in front of it, pushes the cart and then "
-"turns around."
-msgstr ""
-"Der Roboter legt Gegenstände in den Wagen vor sich, startet den Wagen und "
-"dreht dann um."
-
-#: signs.lua
-msgid "This sign has to be placed on top of the rail at the cart end position."
-msgstr ""
-"Das Zeichen muss auf dem Gleis und damit über dem Wagen platziert werden."
-
-#: signs.lua
-msgid ""
-"The Bot takes items out of a minecart in front of it, pushes the cart and "
-"then turns around."
-msgstr ""
-"Der Roboter nimmt Gegenstände aus dem Wagen vor sich, startet den Wagen und "
-"dreht dann um."
-
-#: tool.lua
-msgid "Sensor Connection Tool"
-msgstr "Sensor Verbindungswerkzeug"
-
-#: timer.lua
-msgid "Bot Timer"
-msgstr "Roboter Timer"
-
-#: timer.lua logic_and.lua
-msgid "Connected with"
-msgstr "Verbunden mit"
-
-#: timer.lua
-msgid "Cycle time [min]:"
-msgstr "Zykluszeit [min]:"
-
-#: timer.lua delayer.lua
-msgid "Start"
-msgstr "Start"
-
-#: timer.lua
-msgid "Special kind of sensor."
-msgstr "Spezielle Form eines Sensors."
-
-#: timer.lua
-msgid ""
-"Can be programmed with a time in seconds, e.g. to start the bot cyclically."
-msgstr ""
-"Kann mit einer Zeit in Sekunden programmiert werden, um bspw. den Roboter "
-"zyklisch zu starten."
-
-#: delayer.lua
-msgid "Signal Delayer: Connected with "
-msgstr "Sensor Verzögerer: Verbunden mit "
-
-#: delayer.lua
-msgid "Delay time [sec]:"
-msgstr "Verzögerungszeit [s]:"
-
-#: delayer.lua
-msgid "Signal Delayer"
-msgstr "Signal Verzögerer"
-
-#: delayer.lua
-msgid "Signals are forwarded delayed. Subsequent signals are queued."
-msgstr ""
-"Signale werden verzögert weitergeleitet. Nachfolgende Signale werden in die "
-"Warteschlange gestellt."
-
-#: delayer.lua
-msgid "The delay time can be configured."
-msgstr "Die Verzögerungszeit kann eingestellt werden."
-
-#: logic_and.lua
-msgid "Signal AND with"
-msgstr "Signal UND mit"
-
-#: logic_and.lua
-msgid "inputs"
-msgstr "Eingängen"
-
-#: logic_and.lua
-msgid "Signal AND"
-msgstr "Signal UND"
-
-#: logic_and.lua
-msgid "Signal is sent, if all input signals are received."
-msgstr "Signal wird gesendet, wenn all Eingangssignale empfangen wurden."
-
-#: interpreter.lua
-msgid "Maximum programm size exceeded"
-msgstr "Maximale Programmlänge überschritten"
-
-#: interpreter.lua
-msgid "Parameter error"
-msgstr "Parameter Fehler"
-
-#: interpreter.lua
-msgid "Command error"
-msgstr "Kommandozeilen Fehler"
-
-#: interpreter.lua
-msgid "'repeat' missing"
-msgstr "Es fehlt ein 'repeat'"
-
-#: interpreter.lua
-msgid "'end' missing"
-msgstr "Es fehlt ein 'end'"
-
-#: interpreter.lua
-msgid "'return' missing"
-msgstr "Es fehlt ein 'return'"
-
-#: interpreter.lua
-msgid "'call' missing"
-msgstr "Es fehlt ein 'call'"
-
-#: interpreter.lua
-msgid "Checked and approved"
-msgstr "Geprüft und genehmigt"
-
-#~ msgid ""
-#~ "Take <num> items from a chest like node\n"
-#~ "and put it into the item inventory.\n"
-#~ "Take care that at least one more\n"
-#~ "item of this type is available.\n"
-#~ "<slot> is the inventory slot (1..8)"
-#~ msgstr ""
-#~ "Nehme <num> Gegenstände aus der\n"
-#~ "Kiste oder dem Kisten-ähnlichen Block\n"
-#~ "und tue diese in das eigene Inventar.\n"
-#~ "Achte darauf, dass mindestens ein\n"
-#~ "weiterer Gegenstand von diesem Typ\n"
-#~ "verfügbar ist.\n"
-#~ "<slot> ist die Inventar Position (1..8)"
-
-#~ msgid ""
-#~ "Add <num> items to a chest like node\n"
-#~ "taken from the item inventory,\n"
-#~ "but only if at least one item\n"
-#~ "of this type is already available.\n"
-#~ "<slot> is the inventory slot (1..8)"
-#~ msgstr ""
-#~ "Lege <num> Gegenstände aus dem\n"
-#~ "eigenen Inventar in die andere Kiste,\n"
-#~ "aber nur, wenn bereits mindestens ein\n"
-#~ "Gegenstand von gleichen Typ verfügbar\n"
-#~ "ist. <slot> ist die Position im\n"
-#~ "eigenen Inventar (1--8)."
-
-#~ msgid ""
-#~ "Go to the next sign\n"
-#~ "to be executed as a sub-process.\n"
-#~ "After that it will go on with the next command\n"
-#~ "on this sign."
-#~ msgstr ""
-#~ "Gehe bis zum nächsten Zeichen,\n"
-#~ "das dann als Unterprogramm\n"
-#~ "bearbeitet wird. Mache danach mit\n"
-#~ "dem nächsten Kommando weiter."
diff --git a/signs_bot/locale/signs_bot.de.tr b/signs_bot/locale/signs_bot.de.tr
new file mode 100644
index 0000000..1504914
--- /dev/null
+++ b/signs_bot/locale/signs_bot.de.tr
@@ -0,0 +1,413 @@
+# textdomain: signs_bot
+
+
+
+### basis.lua ###
+
+running=läuft
+charging=aufladen
+stopped=gestoppt
+Off=Aus
+On=An
+Signs=Zeichen
+Other items=Andere Gegenstände
+Config=Konfig.
+Preassign slots items=Vorbelegungen
+Back=Zurück
+Robot Box=Roboterbox
+no power=kein Strom
+Signs Bot Box=Roboter Box
+The Box is the housing of the bot.=Die Box ist das Gehäuse des Roboters.
+Place the box and start the bot by means of the 'On' button.=Platziere die Box und starte den Roboter über den "An" Button.
+If the mod techage is installed, the bot needs electrical power.=Wenn die Mod techage installiert ist, benötigt der Roboter elektrischen Strom.
+The bot leaves the box on the right side.=Der Roboter verlässt die Box auf der rechten Seite.
+It will not start, if this position is blocked.=Er startet nicht, wenn diese Position belegt ist.
+To stop and remove the bot, press the 'Off' button.=Um den Roboter zu stoppen bzw. zu entfernen, drücke den "Aus" Button.
+The box inventory simulates the inventory of the bot.=Das Inventar der Box simuliert das Roboter Inventar.
+You will not be able to access the inventory, if the bot is running.=Du hast keinen Zugriff auf das Inventar, sofern der Roboter unterwegs ist.
+The bot can carry up to 8 stacks and 6 signs with it.=Der Roboter kann 8 Stapel von Blöcken und 6 Zeichen transportieren.
+
+### bot_flap.lua ###
+
+Exit=Beenden
+Bot Flap=Roboterklappe
+The flap is a simple block used as door for the bot.=Die Klappe ist ein einfacher Block, welcher vom Roboter als Tür genutzt wird.
+Place the flap in any wall, and the bot will automatically open=Platziere die Klappe in eine Mauer und der Roboter wird die Klappe automatisch öffnen
+and close the flap as it passes through it.=und wieder schließen, wenn er durchgegangen ist.
+
+### bot_sensor.lua ###
+
+Bot Sensor: Connected with=Bot Sensor: Verbunden mit
+Bot Sensor=Bot Sensor
+Bot Sensor: Not connected=Bot Sensor: Nicht verbunden
+The Bot Sensor detects any bot and sends a signal, if a bot is nearby.=Der Roboter Sensor entdeckt jeden Roboter und sendet ein Signal, sofern ein Roboter in der Nähe ist.
+The sensor direction does not care.=Die Ausrichtung des Sensor spielt keine Rolle.
+
+### cart_sensor.lua ###
+
+Cart Sensor: Connected with=Wagen Sensor: Verbunden mit
+Cart Sensor=Wagen Sensor
+Cart Sensor: Not connected=Wagen Sensor: Nicht verbunden
+The Cart Sensor detects and sends a signal, if a cart (Minecart) is nearby.=Der Wagen Sensor sendet ein Signal, sofern ein Wagen in der Nähe ist.
+The sensor has an active side (red) that must point to the rail/cart.=Der Sensor hat eine aktive Seite (rot), welche zu den Schienen zeigen muss.
+
+### cart_sensor.lua ###
+### bot_sensor.lua ###
+
+the sensor range is one node/meter.=Der Sensorbereich ist einen Block/Meter groß.
+
+### changer.lua ###
+
+Signs:=Zeichen:
+Bot Control Unit=Roboter Steuerungseinheit
+The Bot Control Unit is used to lead the bot by means of signs.=Die Roboter Steuerungseinheit dient zur Steuerung des Roboters über Zeichen.
+The unit can be loaded with up to 4 different signs and can be programmed by means of sensors.=Die Einheit kann mit bis zu 4 verschiedenen Zeichen geladen und über Sensoren programmiert werden.
+To load the unit, place a sign on the red side of the unit and click on the unit.=Um die Steuerungseinheit zu laden, platziere ein Zeichen auf die rote Seite der Einheit und klicke auf die Einheit.
+The sign disappears / is moved to the inventory of the unit.=Das Zeichen verschwindet/ist in die Steuerungseinheit verschoben.
+This can be repeated 3 times.=Dies kann bis zu 3 mal wiederholt werden.
+Use the connection tool to connect up to 4 sensors with the Bot Control Unit.=Benutze das Verbinde-Werkzeug um die bis zu 4 Sensoren mit der Steuerungseinheit zu verbinden.
+
+### chest.lua ###
+
+Bot Chest: Sends signal to=Bot Kiste: Sende Signal zu
+Signs Bot Chest=Signs Bot Kiste
+Bot Chest: Not connected=Bot Kiste: nicht verbunden
+The Signs Bot Chest is a special chest with sensor function.=Die Roboter Kiste ist eine spezielle Kiste mit zusätzlicher Sensor-Funktion.
+It sends a signal depending on the chest state.=Sie sendet ein Signal abhängig vom Zustand der Kiste.
+Possible states are 'empty', 'not empty', 'almost full'=Mögliche Zustände sind "leer", "nicht leer" und "fast voll"
+A typical use case is to turn off the bot, when the chest is almost full or empty.=Ein typischer Anwendungsfall ist den Roboter zu stoppen, wenn die Kiste fast voll oder leer ist.
+
+### cmd_farming.lua ###
+
+Sow farming seeds@nin front of the robot=Sähe Saatgut@nvor dem Roboter
+Harvest farming products@nin front of the robot@non a 3x3 field.=Ernte Früchte/Getreide@nin einem 3x3 großem Feld@nvor dem Roboter.
+Plant a sapling@nin front of the robot=Pflanze einen Setzling@nvor den Roboter
+Sign "farming"=Zeichen "Farming"
+Sign 'farming'=Zeichen 'Farming'
+Used to harvest and seed a 3x3 field.=Benötigt um ein 3x3 Feld zu ernten und wieder zu sähen.
+The seed to be placed has to be in the first inventory slot of the bot.=Das Saatgut, dass gesät werden soll, muss sich an der 1. Position im Inventar befinden.
+
+### cmd_farming.lua ###
+### cmd_flowers.lua ###
+
+Place the sign in front of the field.=Platziere das Zeichen vor das Feld.
+When finished, the bot turns.=Der Roboter dreht um, wenn er fertig ist.
+
+### cmd_flowers.lua ###
+
+Cutting flowers, leaves and tree blocks@nin front of the robot@non a 3x3 field.=Schneide Blumen, Blätter und Baumblöcke@nin einem 3x3 großem Feld@nvor dem Roboter.
+Sign "flowers"=Zeichen "Blumen"
+Sign 'flowers'=Zeichen 'Blumen'
+Used to cut flowers on a 3x3 field.=Benötigt um ein 3x3 Blumenfeld zu ernten.
+
+### cmd_item.lua ###
+
+Take <num> items from a chest like node@nand put it into the item inventory.@n<slot> is the inventory slot (1..8) or 0 for any one=Nehme <num> Gegenstände aus der@nKiste oder dem Kisten-ähnlichen Block@nund tue diese in das eigene Inventar@nan der Position <slot>. Slot = (1..8)@noder 0 für irgend eine Position
+Add <num> items to a chest like node@ntaken from the item inventory.@n<slot> is the inventory slot (1..8) or 0 for any one=Lege <num> Gegenstände aus dem@neigenen Inventar in die andere Kiste.@n<slot> ist die Position im@neigenen Inventar (1--8).@noder 0 für irgend eine Position
+Add <num> fuel to a furnace like node@ntaken from the item inventory.@n<slot> is the inventory slot (1..8) or 0 for any one=Lege <num> Brennstoffe aus dem@neigenen Inventar in den anderen Block.@n<slot> ist die Position im@neigenen Inventar (1--8).@noder 0 für irgend eine Position
+deprecated, use bot inventory configuration instead=veraltet, benutze stattdessen die Inventar Konfigurationsmöglichkeit
+Pick up all objects@nin a 3x3 field.@n<slot> is the inventory slot (1..8) or 0 for any one=Hebe alle Objekte in einem@n3x3 Blöcke großen Feld auf@nund lege diese in das eigene@nInventar an Position <slot> (1-8)@noder 0 für irgend eine Position
+Drop items in front of the bot.@n<slot> is the inventory slot (1..8) or 0 for any one=Lasse ein Objekt aus dem eigenen@nInventar vor dem Roboter fallen.@n<slot> ist die Position im@neigenen Inventar (1--8).@noder 0 für irgend eine Position
+Punch a rail cart to start it=Schlage den Wagen um ihn zu starten
+
+### cmd_move.lua ###
+
+Move the robot one step back=Bewege den Roboter@neinen Schritt zurück
+Turn the robot to the left=Drehe den Roboter@nnach links
+Turn the robot to the right=Drehe den Roboter@nnach rechts
+Turn the robot around=Drehe den Roboter@num (180 Grad)
+Move the robot upwards=Bewege den Roboter@nnach oben
+Move the robot down=Bewege den Roboter@nnach unten
+Stop the robot for <sec> seconds@n(1..9999)=Stoppe den Roboter@nfür <sec> Sekunden (1.9999)
+Stop the robot.=Stoppe den Roboter.
+Turn the robot off@nand put it back in the box.=Schalte den Roboter aus und@nsetze ihn damit zurück in@nseine Box.
+
+### cmd_pattern.lua ###
+
+Store pattern to be cloned.=Speichere die Vorlage@ndie kopiert werden soll.
+Copy the nodes from@nthe stored pattern position@n<size> is: 3x1, 3x2, 3x3,@n5x1, 5x2, 5x3 (wide x deep)@n<lvl> pattern level offset (0..4)=Kopiere die Blöcke von der@n"Vorlage" Position.@n<size> ist: 3x1, 3x2, 3x3,@n5x1, 5x2, 5x3 (Breite x Tiefe)@n<lvl> Vorlagenebene (0..4)
+Sign "pattern"=Zeichen "Vorlage"
+Sign "copy 3x3x3"=Zeichen "kopiere 3x3x3"
+Sign 'pattern'=Zeichen 'Vorlage'
+Used to make a copy of a 3x3x3 cube.=Benötigt um eine Kopie eines 3x3x3 Quadrats zu machen.
+Place the sign in front of the pattern to be copied.=Platziere das Zeichen vor die Vorlage, die kopiert werden soll.
+Use the copy sign to make the copy of this pattern on a different location.=Benutze das Kopier-Zeichen, um eine Kopie dieser Vorlage an einer anderen Stelle zu machen.
+The bot must first reach the pattern sign, then the copy sign.=Der Roboter muss zuerst das Vorlage-Zeichen und dann das Kopier-Zeichen erreichen.
+Sign 'copy3x3x3'=Zeichen 'kopiere 3x3x3'
+Place the sign in front of the location, where the copy should be made.=Platziere das Zeichen vor die Stelle, wo die Kopie hergestellt werden soll.
+Use the pattern sign to mark the pattern.=Benutze das Vorlage-Zeichen und die Vorlage zu markieren.
+
+### cmd_place.lua ###
+
+Error: Position protected=Fehler: Position geschützt
+Place a block in front of the robot@n<slot> is the inventory slot (1..8)@n<lvl> is one of: -1   0   +1=Setze einen Block vor den Roboter.@n<slot> ist die Position im@neigenen Inventar (1--8).@nFür <lvl> ist zulässig: -1   0   +1
+Place a block on the left side@n<slot> is the inventory slot (1..8)@n<lvl> is one of: -1   0   +1=Setze einen Block links vorne.@n<slot> ist die Position im@neigenen Inventar (1--8).@nFür <lvl> ist zulässig: -1   0   +1
+Place a block on the right side@n<slot> is the inventory slot (1..8)@n<lvl> is one of: -1   0   +1=Setze einen Block rechts vorne.@n<slot> ist die Position im@neigenen Inventar (1--8).@nFür <lvl> ist zulässig: -1   0   +1
+Place a block under the robot.@nHint: use 'move_up' first.@n<slot> is the inventory slot (1..8)=Setze einen Block unter den Roboter.@n<slot> ist die Position im@neigenen Inventar (1--8).
+Place a block above the robot.@n<slot> is the inventory slot (1..8)=Setze einen Block über den Roboter.@n<slot> ist die Position im@neigenen Inventar (1--8).
+Error: No free inventory space=Fehler: Kein freier Inventarplatz
+Dig the block in front of the robot@n<slot> is the inventory slot (1..8)@n<lvl> is one of: -1   0   +1=Entferne einen Block vor den Roboter.@n<slot> ist die Position im@neigenen Inventar (1--8).@nFür <lvl> ist zulässig: -1   0   +1
+Dig the block on the left side@n<slot> is the inventory slot (1..8)@n<lvl> is one of: -1   0   +1=Entferne einen links vorne.@n<slot> ist die Position im@neigenen Inventar (1--8).@nFür <lvl> ist zulässig: -1   0   +1
+Dig the block on the right side@n<slot> is the inventory slot (1..8)@n<lvl> is one of: -1   0   +1=Entferne einen rechts vorne.@n<slot> ist die Position im@neigenen Inventar (1--8).@nFür <lvl> ist zulässig: -1   0   +1
+Dig the block under the robot.@n<slot> is the inventory slot (1..8)=Entferne einen Block unter dem@nRoboter.@n<slot> ist die Position im@neigenen Inventar (1--8).
+Dig the block above the robot.@n<slot> is the inventory slot (1..8)=Entferne einen Block über dem@nRoboter.@n<slot> ist die Position im@neigenen Inventar (1--8).
+Rotate the block in front of the robot@n<lvl> is one of:  -1   0   +1@n<steps> is one of:  1   2   3=Rotiere den Block vor dem Roboter.@nFür <lvl> ist zulässig: -1   0   +1@nFür <steps> ist zulässig: 1   2   3
+Bot torch=Bot Fackel
+
+### cmd_sign.lua ###
+
+Commands,Help=Kommandos,Hilfe
+Sign name:=Zeichenname:
+Cancel=Abbruch
+Check=Prüfen
+Help=Hilfe
+Copy Cmnd=Kopiere Kommando
+please check the added line(s)=bitte prüfe die neue(n) Zeile(n)
+Sign "command"=Zeichen "Kommando"
+-- enter or copy commands from help page=-- Kommandos eingeben oder von der Hilfeseite kopieren
+Error: Signs inventory empty=Fehler: Zeichen Inventar ist leer
+Error: Position protected or occupied=Fehler: Position ist geschützt oder belegt
+Place a sign in front of the robot@ntaken from the signs inventory@n<slot> is the inventory slot (1..6)=Setze ein Zeichen vor den Roboter.@n<slot> ist die Position im@neigenen Inventar (1--6).
+Place a sign behind the robot@ntaken from the signs inventory@n<slot> is the inventory slot (1..6)=Setze ein Zeichen hinter den Roboter.@n<slot> ist die Position im@neigenen Inventar (1--6).
+Error: No sign available=Fehler: Kein Zeichen verfügar
+Error: Signs inventory slot is occupied=Fehler: Die Zeicheninventar Position ist belegt
+Error: Position is protected=Fehler: Die Position ist geschützt
+Dig the sign in front of the robot@nand add it to the signs inventory.@n<slot> is the inventory slot (1..6)=Entferne das Zeichen vor den Roboter.@n<slot> ist die Position im@neigenen Inventar (1--6).
+Dig the sign in front of the robot@nand add the cleared sign to@nthe item iventory.@n<slot> is the inventory slot (1..8)=Entferne das Zeichen vor den Roboter.@n<slot> ist die Position im@neigenen Inventar (1--6).
+Sign 'command'=Zeichen 'Kommando'
+The 'command' sign can be programmed by the player.=Das 'Kommando' Zeichen kann vom Spieler programmiert werden.
+Place the sign in front of you and use the node menu to program your sequence of bot commands.=Platziere das Zeichen vor dir und nutze das Zeichen-Menü, um die Kommando-Sequenz zu programmieren.
+The menu has an edit field for your commands and a help page with all available commands.=Das Menü hat ein Eingabefeld für deine Kommandos und eine Hilfeseite zu allen Kommandos.
+
+### commands.lua ###
+
+commands:=Kommandos:
+unknown command=unbekanntes Kommando
+start of a 'repeat..end' block=Anfang eines 'repeat..end' Blocks
+end command of a 'repeat..end' block=Ende Kommando eines 'repeat..end' Blocks
+call a subroutine (with 'return' statement)=Aufruf einer Unterfunktion (mit 'return' Anweisung)
+return from a subroutine=Rückkehr von einer Unterfunktion
+jump to a label=Sprung zu einer Marke
+Move the robot 1..999 steps forward@nwithout paying attention to any signs.@nUp and down movements also become@ncounted as steps.=Bewege den Roboter 1..999 Schritte@nvorwärts ohne auf Zeichen zu achten.@nAuf- und Ab-Bewegungen werden auch@nals Schritte gezählt.
+Walk until a sign or obstacle is@nreached. Then continue with the next command.@nWhen a sign has been reached, @nthe current program is ended@nand the bot executes the@nnew program from the sign=Gehe bis ein Zeichen oder Hindernis@nerreicht wurde. Führe dann das nächste@nKommando aus. @nWurde ein Zeichen erreicht, so arbeite@ndie Kommandos des Zeichens als@nUnter-Prozess ab
+Print given text as chat message.@nFor two or more words, use the '*' character @ninstead of spaces, like "Hello*world"=Gebe den angegebenen Text als Chat-Nachricht aus.@nFür zwei oder mehr Wörter verwende das Zeichen '*' @nanstelle von Leerzeichen, z. B. "Hallo*Welt".
+
+### compost.lua ###
+
+Put 2 leaves into the compost barrel@n<slot> is the bot inventory slot (1..8)@nwith the leaves.=Lege 2 Blätter in den Kompostbehälter@n<slot> ist die Position im@nBot Inventar (1..8)@nmit den Blättern.
+Take a compost item from the barrel.@n<slot> (1..8 or 0 for the first free slot) is the bot@nslot for the compost item.=Nimm einen Kompostblock aus dem@nKompostbehälter. <slot> ist die Position im@nBot Inventar für den Block.@nWerte für <slot>: 0..8, oder 0 für die erste@nfreie Inventarposition.
+
+### crop_sensor.lua ###
+
+Crop Sensor: Connected with=Ernte Sensor: Verbunden mit
+Crop Sensor=Ernte Sensor
+Crop Sensor: Not connected=Ernte Sensor: Nicht verbunden
+The Crop Sensor sends cyclical signals when, for example, wheat is fully grown.=Der Ernte Sensor sendet zyklisch ein Signal, wenn bspw. der Weizen voll ausgewachsen ist.
+The sensor range is one node/meter.=Der Sensorbereich beträgt einen Block/Meter.
+The sensor has an active side (red) that must point to the crop/field.=Der Sensor hat eine aktive Seite (rot), welche zur der Pflanze zeigen muss.
+
+### delayer.lua ###
+
+Signal Delayer: Connected with=Signal Verzögerer: Verbunden mit
+Delay time [sec]:=Verzögerungszeit [s]:
+Signal Delayer=Signal Verzögerer
+Signals are forwarded delayed. Subsequent signals are queued.=Signale werden verzögert weitergeleitet. Nachfolgende Signale werden in die Warteschlange gestellt.
+The delay time can be configured.=Die Verzögerungszeit kann eingestellt werden.
+
+### doc.lua ###
+
+After you have placed the Signs Bot Box, you can start the bot by means of the 'On' button in the box menu.=Nachdem du die Roboter-Kiste platziert hast, kannst du den Roboter über den "An" Button im Kistenmenü starten.
+If the bot returns to its box right away, you will likely need to charge it with electrical energy (techage) first.=Wenn der Bot sofort in seine Box zurückkehrt, musst du ihn wahrscheinlich zuerst mit elektrischer Energie (Techage) aufladen.
+The bot then runs straight up until it reaches an obstacle (a step with two or more blocks up or down or a sign.)=Der Roboter läuft dann geradeaus, bis er ein Hindernis erreicht (eine Stufe mit zwei oder mehr Blöcken, auf oder ab).
+If the bot first reaches a sign it will execute the commands on the sign.=Falls der Roboter zuerst ein Zeichen erreicht, wird er die Kommandos auf dem Zeichen ausführen.
+If the command(s) on the sign is e.g. 'turn_around', the bot turns and goes back.=Falls das Kommandos auf dem Zeichen bspw. ein 'turn_around' ist, dreht der Roboter um und geht zurück.
+In this case, the bot reaches his box again and turns off.=In diesem Fall erreicht der Roboter wieder seine Box und schaltet sich ab.
+The Signs Bot Box has an inventory with 6 stacks for signs and 8 stacks for other items (to be placed/dug by the bot).=Die Roboter Box hat ein Inventar für 6 Stapel Zeichen und 8 Stapel für andere Gegenstände (welche platziert oder eingesammelt werden können).
+This inventory simulates the bot internal inventory.=Das Inventar der Box simuliert das Roboter Inventar.
+That means you will only have access to the inventory if the bot is turned off ('sitting' in his box).=Das bedeutet, du hast nur Zugriff auf das Inventar, sofern der Roboter ausgeschaltet ist.
+You simply control the direction of the bot by means of the 'turn left' and 'turn right' signs (signs with the arrow).=Du kannst die Richtung des Roboters ganz einfach über 'turn_left' (drehe nach links) oder 'turn_right' (drehe nach rechts) Zeichen verändern.
+The bot can run over steps (one block up/down). But there are also commands to move the bot up and down.=Der Roboter kann auch Stufen überwinden (eine Block hoch oder runter). Aber es gibt auch Kommandos, um den Roboter nach oben oder unten zu bewegen.
+It is not necessary to mark a way back to the box.=Es ist nicht notwendig, dem Roboter einen Weg zurück zu seiner Box zu markieren.
+With the command 'turn_off' the bot will turn off and be back in his box from every position.=Mit dem Kommando "turn_off" wird der Roboter ausgeschaltet und befindet sich danach wieder in seiner Box, egal wo er war.
+The same applies if you turn off the bot by the box menu.=Das gleiche gilt, wenn du den Roboter über den 'Aus' Button ausschaltest.
+If the bot reaches a sign from the wrong direction (from back or sides) the sign will be ignored.=Wenn der Roboter ein Zeichen von der falschen Richtung erreicht (von der Seite oder von hinten), wird das Zeichen ignoriert.
+The bot will walk over.=Der Roboter läuft einfach hinüber.
+All predefined signs have a menu with a list of the bot commands.=Alle vordefinierten Zeichen haben ein Menü mit der Liste der Kommandos.
+These signs can't be changed, but you can craft and program your own signs.=Diese Zeichen können nicht geändert werden, aber du kannst eigene Zeichen herstellen und programmieren.
+For this you have to use the 'command' sign.=Dafür kannst du das 'command' Zeichen verwenden.
+This sign has an edit field for your commands and a help page with all available commands.=Das Zeichen hat ein Eingabefeld für deine Kommandos und eine Hilfeseite zu allen Kommandos.
+Also for your own signs it is important to know:=Es ist auch für eigene Zeichen wichtig zu wissen:
+After the execution of the last command of the sign, the bot falls back into its default behaviour and runs in its taken direction.=Nach der Ausführung des letzten Kommandos eines Zeichens fällt der Roboter immer zurück in sein Standardverhalten und läuft in die eingeschlagene Richtung weiter.
+A standard job for the bot is to move items from one chest to another=Eine Standardaufgabe für den Roboter ist, Gegenstände von einer Kiste in eine andere zu tun
+(chest or node with a chest like inventory).=(Kiste oder Block mit Kisten-ähnlichem Inventar).
+This can be done by means of the two signs 'take item' and 'add item'.=Das kann mit Hilfe von zwei Zeichen realisiert werden: 'take_item' und 'add_item'.
+These signs have to be placed on top of chest nodes.=Diese Zeichen müssen auf den Kisten platziert werden.
+In addition to the signs the bot can be controlled by means of sensors.=Zusätzlich zu den Zeichen kann der Roboter auch über Sensoren gesteuert werden.
+Sensors like the Bot Sensor have two states: on and off.=Sensoren wie der Roboter-Sensor haben zwei Zustande: on' (an) und 'off' (aus).
+If the Bot Sensor detects a bot it will switch to the state 'on' and=Wenn der Roboter-Sensor einen Roboter erkennt geht er in den Zustand 'on' und
+sends a signal to a connected block, called an actuator.=sendet ein Signal zu einem verbundenen Block, einem Aktor.
+Sensors are:=Sensoren sind:
+- Bot Sensor: Sends a signal when the robot passes by=- Roboter Sensor: Sendet ein Signal wenn ein Roboter vorbei geht
+- Node Sensor: Sends a signal when it detects any node=- Block Sensor: Sendet ein Signal bei einer Veränderung von Blocken vor sich
+- Crop Sensor: Sends a signal when, for example wheat is fully grown=- Ernte Sensor: Sendet ein Signal, wenn bspw. der Weizen voll ausgewachsen ist
+- Bot Chest: Sends a signal depending on the chest state (empty, full)=- Roboter-Kiste: Sendet ein Signal abhängig vom Zustand der Kiste (voll, leer)
+Actuators are:=Aktoren sind:
+- Signs Bot Box: Can turn the bot off and on=- Roboter-Box: Kann den Roboter ein- und ausschalten
+- Control Unit: Can be used to exchange the sign to lead the bot=- Steuerungseinheit: Wird genutzt um Zeichen auszutauschen und damit den Roboter zu steuern
+Additional sensors and actuator can be added by other mods.=Weitere Sensoren und Aktoren können von weiteren Mods hinzugefügt werden.
+To send a signal from a sensor to an actuator, the sensor has to be connected (paired) with actuator.=Um ein Signal von einem Sensor zu einem Aktor senden zu können, muss der Sensor mit dem Aktor verbunden werden (Pairing).
+To connect sensor and actuator, the Sensor Connection Tool has to be used.=Das Sensor Verbinde-Werkzeug wir genutzt, um Sensoren mit Aktoren zu verbinden.
+Simply click with the tool on both blocks and the sensor will be connected with the actuator.=Klicke einfach mit dem Werkzeug nacheinander auf beide Blöcke und der Sensor wird mit dem Aktor verbunden.
+A successful connection is indicated by a ping/pong noise.=Eine erfolgreiche Verbindung wird über ein Ping/Pong-Geräusch angezeigt.
+Before you connect sensor with actuator, take care that the actuator is in the requested state.=Bevor du einen Sensor mit einem Aktor verbindest, achte darauf, dass sich der Aktor im richtigen Zustand befindet.
+For example: If you want to start the Bot with a sensor, connect the sensor with the Bot Box,=Zum Beispiel: Wenn du den Roboter über einen Sensor starten willst, verbinde Sensor und Roboter-Kiste nur,
+when the Bot is in the state 'on'. Otherwise the sensor signal will stop the Bot,=wenn der Roboter an ist (im Zustand 'on'). Anderenfalls würde der Sensor den Roboter ausschalten,
+instead of starting it.=anstatt ihn zu starten.
+The following applies to all commands that are used to place items in the bot inventory, like:=Das folgende gilt für alle Kommandos, um Items in das Roboter Inventar zu legen, wie:
+- take_item <num> <slot>=- take_item <num> <slot>
+- pickup_items <slot>=- pickup_items <slot>
+- trash_sign <slot>=- trash_sign <slot>
+- harvest <slot>=- harvest <slot>
+- dig_front <slot> <lvl>=- dig_front <slot> <lvl>
+- dig_left <slot> <lvl>=- dig_left <slot> <lvl>
+- dig_right <slot> <lvl>=- dig_right <slot> <lvl>
+- dig_below <slot> <lvl>=- dig_below <slot> <lvl>
+- dig_above <slot> <lvl>=- dig_above <slot> <lvl>
+If no slot or slot 0 was specified with the command (case A), all 8 slots of the bot inventory =Wurde beim Kommando kein Slot oder Slot 0 angegeben (Fall A), werden nacheinander alle 
+are checked one after the other. If a slot was specified (case B), only this slot is checked.=8 Slots des Bot Inventars geprüft, Wurde ein Slot angegeben (Fall B), wird nur dieser geprüft.
+In both cases the following applies: If the slot is preconfigured and fits the item, =In beiden Fällen gilt: Ist der Slot vorkonfiguriert und passt das Item dazu, oder ist der Slot 
+or if the slot is not configured and empty, or is only partially filled with the item type =nicht konfiguriert und leer, oder mit dem Item-Typ (das hinzu gefügt werden soll) nur 
+(which should be added), then the items are added.=teilweise gefüllt, dann werden die Items hinzugefügt.
+If not all items can be added, the remaining slots will be tried out in case A.=Können nicht alle Items hinzugefügt werden, werden im Falle A die restlichen Slots weiter durchprobiert.
+Anything that could not be added to your own inventory goes back.=Was nicht dem eigenen Inventar hinzugefügt werden konnte, geht zurück.
+The following applies to all commands that are used to take items from the bot inventory, like:=Das folgende gilt für alle Kommandos, um Items aus dem Roboter Inventar zu nehmen, wie:
+- add_item <num> <slot>=- add_item <num> <slot>
+It doesn't matter whether a slot is configured or not. The bot takes the first stack that =Hier ist es egal, ob ein Slot konfiguriert ist, oder nicht. Der Bot nimmt den ersten Stack, den 
+it can find from its own inventory and tries to use it.=er finden kann, aus dem eigenen Inventar und versucht diesen zu nutzen.
+If a slot is specified, it only takes this, if no slot has been specified, it checks all of =Ist ein Slot angegeben, nimmt er nur diesen, wurde kein Slot angegeben, prüft er alle 
+them one after the other, starting from slot 1 until it finds something.=nacheinander, von Slot 1 beginnend, bis er etwas findet. Ist die gefundene Anzahl kleiner als 
+If the number found is smaller than requested, he tries to take the rest out of any slot.=gefordert, versucht er den Rest aus irgend einem Slot zu nehmen.
+Signs Bot=Signs Bot
+A robot controlled by signs, used for automated work=Ein Roboter, gesteuert über Zeichen, für Automatisierungsaufgaben
+Start the Bot=Starte den Roboter
+Control the Bot=Steuere den Roboter
+Sensors and Actuators=Sensoren und Aktoren
+Connecting sensors and actuator=Verbinde Sensor mit Aktor
+Bot inventory behavior=Verhalten beim Roboter Inventar
+
+### doc.lua ###
+### cmd_sign.lua ###
+
+The help page has a copy button to simplify the programming.=Die Hilfeseite hat einen Kopier-Button um die Programmierung zu erleichtern.
+
+### duplicator.lua ###
+
+Template:=Vorlage:
+Input:=Eingabe:
+Output:=Ausgabe:
+1. Place one 'cmnd' sign= 1. Kommando Zeichen einlegen
+2. Add 'blank signs'=2. Füge 'leere Zeichen' hinzu
+3. Take the copies=3. Entnehme die Kopien
+Signs Duplicator=Zeichen Kopierer
+Sign "user"=Zeichen "Benutzer"
+Sign "blank"="Leeres" Zeichen
+The Duplicator can be used to make copies of signs.=Der Zeichen Kopierer kann zur Herstellung von Kopien eines Zeichens genutzt werden.
+1. Put one 'cmnd' sign to be used as template into the 'Template' inventory=1. Lege ein Kommando-Zeichen als Vorlage in das 'Vorlage' Inventar
+2. Add one or several 'blank signs' to the 'Input' inventory.=2. Füge ein oder mehrere 'leere Zeichen' als Eingabe hinzu.
+3. Take the copies from the 'Output' inventory.=3. Entnehme die Kopieren aus der Ausgabe.
+Written books [default:book_written] can alternatively be used as template=Alternativ können auch beschriebene Bücher [default:book_written] als Vorlage verwendet werden
+Already written signs can be used as input, too.=Bereits beschriebene Zeichen können auch als Eingabe-Zeichen genutzt werden.
+Needed as input for the Duplicator.=Wird als Eingabe für den Zeichen Kopierer benötigt.
+
+### extender.lua ###
+
+Sensor Extender: Connected with=Sensor Erweiterung: Verbunden mit
+Sensor Extender=Sensor Erweiterung
+Sensor Extender: Not connected=Sensor Erweiterung: Nicht verbunden
+With the Sensor Extender, sensor signals can be sent to more than one actuator.=Mit Hilfe der Sensor-Erweiterung können weitere Aktoren mit dem Sensor verbunden werden.
+Place one or more extender nearby the sensor and connect each extender=Platziere ein oder mehrere Sensor-Erweiterungen neben einen Sensor und verbinde diese
+with one further actuator by means of the Connection Tool.=mit weiteren Aktoren mit Hilfe des Verbinde-Werkzeuges.
+
+### interpreter.lua ###
+
+Maximum programm size exceeded=Maximale Programmlänge überschritten
+Too many parameters=Zu viele Parameter
+Parameter error=Parameter Fehler
+Command error=Kommandozeilen Fehler
+'repeat' missing=Es fehlt ein 'repeat'
+'end' missing=Es fehlt ein 'end'
+Checked and approved=Geprüft und genehmigt
+
+### logic_and.lua ###
+
+Signal AND with=Signal UND mit
+inputs=Eingängen
+Signal AND=Signal UND
+Signal is sent, if all input signals are received.=Signal wird gesendet, wenn all Eingangssignale empfangen wurden.
+
+### node_sensor.lua ###
+
+Node Sensor: Connected with =Block Sensor: Verbunden mit 
+added=hinzukommen
+removed=fehlen
+added or removed=hinzukommen oder fehlen
+Send signal if nodes have been:=Sende ein Signal wenn Blöcke:
+accept=übernehmen
+Node Sensor=Block Sensor
+Node Sensor: Not connected=Block Sensor: Nicht verbunden
+The node sensor sends cyclical signals when it detects that nodes have appeared or disappeared,=Der Block Sensor sendet zyklisch ein Signal, wenn er eine Veränderung von Blöcken vor sich entdeckt (ein Block erscheint oder verschwindet),
+but has to be configured accordingly.=aber muss entsprechend konfiguriert werden.
+Valid nodes are all kind of blocks and plants.=Gültig sind alle Arten von Blöcken oder Pflanzen.
+The sensor range is 3 nodes/meters in one direction.=Die Sensor-Reichweite beträgt 3 Blöcke/Meter in eine Richtung.
+The sensor has an active side (red) that must point to the observed area.=Der Sensor hat eine aktive Seite (rot) welche zu dem zu überwachenden Bereich zeigen muss.
+
+### signs.lua ###
+
+Sign "turn right"=Zeichen "rechts drehen"
+Sign "turn left"=Zeichen "links drehen"
+Sign "take item"=Zeichen "Nehme Gegenstand"
+Sign "add item"=Zeichen "Lege Gegenstand"
+Sign "stop"=Zeichen "Stopp"
+Sign "add to cart"=Zeichen "Lege in den Wagen"
+Sign "take from cart"=Zeichen "Nehme aus dem Wagen"
+The Bot turns right when it detects this sign in front of it.=Der Roboter dreht nach rechts, wenn er dieses Zeichen vor sich hat.
+The Bot turns left when it detects this sign in front of it.=Der Roboter dreht nach links, wenn er dieses Zeichen vor sich hat.
+The Bot takes items out of a chest in front of it and then turns around.=Der Roboter nimmt Gegenstände aus einer Kiste vor sich und dreht dann um.
+This sign has to be placed on top of the chest.=Das Zeichen muss auf der Kiste platziert werden.
+The Bot puts items into a chest in front of it and then turns around.=Der Roboter legt Gegenstände in eine Kiste vor sich und dreht dann um.
+The Bot will stop in front of this sign until the sign is removed or the bot is turned off.=Der Roboter stoppt vor diesem Zeichen, bis das Zeichen entfernt, oder der Roboter ausgeschaltet wird.
+The Bot puts items into a minecart in front of it, pushes the cart and then turns around.=Der Roboter legt Gegenstände in den Wagen vor sich, startet den Wagen und dreht dann um.
+This sign has to be placed on top of the rail at the cart end position.=Das Zeichen muss auf dem Gleis und damit über dem Wagen platziert werden.
+The Bot takes items out of a minecart in front of it, pushes the cart and then turns around.=Der Roboter nimmt Gegenstände aus dem Wagen vor sich, startet den Wagen und dreht dann um.
+
+### techage.lua ###
+
+Ignite the techage charcoal lighter=Zünde den Holzkohle-Anzünder an
+Turns the bot off if the@nbattery power is below the@ngiven value in percent (1..99)=Schalte den Bot aus,@nwenn die Batterieladung kleiner@nist als der angegebene Wert@nin Prozent (1.99)
+fully charged=voll geladen
+Sends a techage command@nto a given node. @nReceiver is addressed by@nthe techage node number.@nFor commands with two or more @nwords, use the '*' character @ninstead of spaces, e.g.: @nsend_cmnd 3465 pull*default:dirt*2=Sende ein techage Kommando@nan einen Block mit der@nangegebenen Blocknummer.@nFür Kommandos mit zwei oder mehr @nWörtern verwende das Zeichen '*' @nanstelle des Leerzeichens, wie bspw.:@nsend_cmnd 3465 pull*default:dirt*2
+
+### timer.lua ###
+
+Bot Timer=Roboter Timer
+Cycle time [min]:=Zykluszeit [min]:
+Bot Timer: Not connected=Roboter Timer: Nicht verbunden
+Special kind of sensor.=Spezielle Form eines Sensors.
+Can be programmed with a time in seconds, e.g. to start the bot cyclically.=Kann mit einer Zeit in Sekunden programmiert werden, um bspw. den Roboter zyklisch zu starten.
+
+### timer.lua ###
+### delayer.lua ###
+
+Start=Start
+
+### timer.lua ###
+### logic_and.lua ###
+
+Connected with=Verbunden mit
+
+### tool.lua ###
+
+Sensor Connection Tool=Sensor Verbindungswerkzeug
+
+
+##### not used anymore #####
diff --git a/signs_bot/locale/template.pot b/signs_bot/locale/template.pot
deleted file mode 100644
index df25467..0000000
--- a/signs_bot/locale/template.pot
+++ /dev/null
@@ -1,1356 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-23 17:16+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: basis.lua
-msgid "Off"
-msgstr ""
-
-#: basis.lua
-msgid "On"
-msgstr ""
-
-#: basis.lua
-msgid "Signs"
-msgstr ""
-
-#: basis.lua
-msgid "Other items"
-msgstr ""
-
-#: basis.lua
-msgid "Config"
-msgstr ""
-
-#: basis.lua
-msgid "Preassign slots items"
-msgstr ""
-
-#: basis.lua
-msgid "Back"
-msgstr ""
-
-#: basis.lua
-msgid "Robot Box "
-msgstr ""
-
-#: basis.lua
-msgid "running"
-msgstr ""
-
-#: basis.lua
-msgid "charging"
-msgstr ""
-
-#: basis.lua
-msgid "stopped"
-msgstr ""
-
-#: basis.lua
-msgid "Signs Bot Box"
-msgstr ""
-
-#: basis.lua
-msgid "no power"
-msgstr ""
-
-#: basis.lua
-msgid "The Box is the housing of the bot."
-msgstr ""
-
-#: basis.lua
-msgid "Place the box and start the bot by means of the 'On' button."
-msgstr ""
-
-#: basis.lua
-msgid "If the mod techage is installed, the bot needs electrical power."
-msgstr ""
-
-#: basis.lua
-msgid "The bot leaves the box on the right side."
-msgstr ""
-
-#: basis.lua
-msgid "It will not start, if this position is blocked."
-msgstr ""
-
-#: basis.lua
-msgid "To stop and remove the bot, press the 'Off' button."
-msgstr ""
-
-#: basis.lua
-msgid "The box inventory simulates the inventory of the bot."
-msgstr ""
-
-#: basis.lua
-msgid "You will not be able to access the inventory, if the bot is running."
-msgstr ""
-
-#: basis.lua
-msgid "The bot can carry up to 8 stacks and 6 signs with it."
-msgstr ""
-
-#: bot_flap.lua
-msgid "Exit"
-msgstr ""
-
-#: bot_flap.lua
-msgid "Bot Flap"
-msgstr ""
-
-#: bot_flap.lua
-msgid "The flap is a simple block used as door for the bot."
-msgstr ""
-
-#: bot_flap.lua
-msgid "Place the flap in any wall, and the bot will automatically open"
-msgstr ""
-
-#: bot_flap.lua
-msgid "and close the flap as it passes through it."
-msgstr ""
-
-#: bot_sensor.lua
-msgid "Bot Sensor: Connected with "
-msgstr ""
-
-#: bot_sensor.lua
-msgid "Bot Sensor"
-msgstr ""
-
-#: bot_sensor.lua
-msgid "Bot Sensor: Not connected"
-msgstr ""
-
-#: bot_sensor.lua
-msgid "The Bot Sensor detects any bot and sends a signal, if a bot is nearby."
-msgstr ""
-
-#: bot_sensor.lua cart_sensor.lua
-msgid "the sensor range is one node/meter."
-msgstr ""
-
-#: bot_sensor.lua
-msgid "The sensor direction does not care."
-msgstr ""
-
-#: cart_sensor.lua
-msgid "Cart Sensor: Connected with "
-msgstr ""
-
-#: cart_sensor.lua
-msgid "Cart Sensor"
-msgstr ""
-
-#: cart_sensor.lua
-msgid ""
-"The Cart Sensor detects and sends a signal, if a cart (Minecart) is nearby."
-msgstr ""
-
-#: cart_sensor.lua
-msgid "The sensor has an active side (red) that must point to the rail/cart."
-msgstr ""
-
-#: changer.lua
-msgid "Signs:"
-msgstr ""
-
-#: changer.lua
-msgid "Bot Control Unit"
-msgstr ""
-
-#: changer.lua
-msgid "The Bot Control Unit is used to lead the bot by means of signs."
-msgstr ""
-
-#: changer.lua
-msgid ""
-"The unit can be loaded with up to 4 different signs and can be programmed by "
-"means of sensors."
-msgstr ""
-
-#: changer.lua
-msgid ""
-"To load the unit, place a sign on the red side of the unit and click on the "
-"unit."
-msgstr ""
-
-#: changer.lua
-msgid "The sign disappears / is moved to the inventory of the unit."
-msgstr ""
-
-#: changer.lua
-msgid "This can be repeated 3 times."
-msgstr ""
-
-#: changer.lua
-msgid ""
-"Use the connection tool to connect up to 4 sensors with the Bot Control Unit."
-msgstr ""
-
-#: chest.lua
-msgid "Bot Chest: Sends signal to "
-msgstr ""
-
-#: chest.lua
-msgid "Signs Bot Chest"
-msgstr ""
-
-#: chest.lua
-msgid "The Signs Bot Chest is a special chest with sensor function."
-msgstr ""
-
-#: chest.lua
-msgid "It sends a signal depending on the chest state."
-msgstr ""
-
-#: chest.lua
-msgid "Possible states are 'empty', 'not empty', 'almost full'"
-msgstr ""
-
-#: chest.lua
-msgid ""
-"A typical use case is to turn off the bot, when the chest is almost full or "
-"empty."
-msgstr ""
-
-#: cmd_farming.lua
-msgid ""
-"Sow farming seeds\n"
-"in front of the robot"
-msgstr ""
-
-#: cmd_farming.lua
-msgid ""
-"Harvest farming products\n"
-"in front of the robot\n"
-"on a 3x3 field."
-msgstr ""
-
-#: cmd_farming.lua
-msgid ""
-"Plant a sapling\n"
-"in front of the robot"
-msgstr ""
-
-#: cmd_farming.lua
-msgid "Sign \"farming\""
-msgstr ""
-
-#: cmd_farming.lua
-msgid "Sign 'farming'"
-msgstr ""
-
-#: cmd_farming.lua
-msgid "Used to harvest and seed a 3x3 field."
-msgstr ""
-
-#: cmd_farming.lua cmd_flowers.lua
-msgid "Place the sign in front of the field."
-msgstr ""
-
-#: cmd_farming.lua
-msgid "The seed to be placed has to be in the first inventory slot of the bot."
-msgstr ""
-
-#: cmd_farming.lua cmd_flowers.lua
-msgid "When finished, the bot turns."
-msgstr ""
-
-#: cmd_flowers.lua
-msgid ""
-"Cutting flowers\n"
-"in front of the robot\n"
-"on a 3x3 field."
-msgstr ""
-
-#: cmd_flowers.lua
-msgid "Sign \"flowers\""
-msgstr ""
-
-#: cmd_flowers.lua
-msgid "Sign 'flowers'"
-msgstr ""
-
-#: cmd_flowers.lua
-msgid "Used to cut flowers on a 3x3 field."
-msgstr ""
-
-#: cmd_item.lua
-msgid ""
-"Take <num> items from a chest like node\n"
-"and put it into the item inventory.\n"
-"<slot> is the inventory slot (1..8) or 0 for any one"
-msgstr ""
-
-#: cmd_item.lua
-msgid ""
-"Add <num> items to a chest like node\n"
-"taken from the item inventory.\n"
-"<slot> is the inventory slot (1..8) or 0 for any one"
-msgstr ""
-
-#: cmd_item.lua
-msgid ""
-"Add <num> fuel to a furnace like node\n"
-"taken from the item inventory.\n"
-"<slot> is the inventory slot (1..8) or 0 for any one"
-msgstr ""
-
-#: cmd_item.lua
-msgid "deprecated, use bot inventory configuration instead"
-msgstr ""
-
-#: cmd_item.lua
-msgid ""
-"Pick up all objects\n"
-"in a 3x3 field.\n"
-"<slot> is the inventory slot (1..8) or 0 for any one"
-msgstr ""
-
-#: cmd_item.lua
-msgid ""
-"Drop items in front of the bot.\n"
-"<slot> is the inventory slot (1..8) or 0 for any one"
-msgstr ""
-
-#: cmd_item.lua
-msgid "Punch a rail cart to start it"
-msgstr ""
-
-#: cmd_move.lua
-msgid "Move the robot one step back"
-msgstr ""
-
-#: cmd_move.lua
-msgid "Turn the robot to the left"
-msgstr ""
-
-#: cmd_move.lua
-msgid "Turn the robot to the right"
-msgstr ""
-
-#: cmd_move.lua
-msgid "Turn the robot around"
-msgstr ""
-
-#: cmd_move.lua
-msgid "Move the robot upwards"
-msgstr ""
-
-#: cmd_move.lua
-msgid "Move the robot down"
-msgstr ""
-
-#: cmd_move.lua
-msgid ""
-"Stop the robot for <sec> seconds\n"
-"(1..9999)"
-msgstr ""
-
-#: cmd_move.lua
-msgid "Stop the robot."
-msgstr ""
-
-#: cmd_move.lua
-msgid ""
-"Turn the robot off\n"
-"and put it back in the box."
-msgstr ""
-
-#: cmd_pattern.lua
-msgid "Store pattern to be cloned."
-msgstr ""
-
-#: cmd_pattern.lua
-msgid ""
-"Copy the nodes from\n"
-"the stored pattern position\n"
-"<size> is: 3x1, 3x2, 3x3,\n"
-"5x1, 5x2, 5x3 (wide x deep)\n"
-"<lvl> pattern level offset (0..4)"
-msgstr ""
-
-#: cmd_pattern.lua
-msgid "Sign \"pattern\""
-msgstr ""
-
-#: cmd_pattern.lua
-msgid "Sign \"copy 3x3x3\""
-msgstr ""
-
-#: cmd_pattern.lua
-msgid "Sign 'pattern'"
-msgstr ""
-
-#: cmd_pattern.lua
-msgid "Used to make a copy of a 3x3x3 cube."
-msgstr ""
-
-#: cmd_pattern.lua
-msgid "Place the sign in front of the pattern to be copied."
-msgstr ""
-
-#: cmd_pattern.lua
-msgid ""
-"Use the copy sign to make the copy of this pattern on a different location."
-msgstr ""
-
-#: cmd_pattern.lua
-msgid "The bot must first reach the pattern sign, then the copy sign."
-msgstr ""
-
-#: cmd_pattern.lua
-msgid "Sign 'copy3x3x3'"
-msgstr ""
-
-#: cmd_pattern.lua
-msgid "Place the sign in front of the location, where the copy should be made."
-msgstr ""
-
-#: cmd_pattern.lua
-msgid "Use the pattern sign to mark the pattern."
-msgstr ""
-
-#: cmd_place.lua
-msgid "Error: Position protected"
-msgstr ""
-
-#: cmd_place.lua
-msgid ""
-"Place a block in front of the robot\n"
-"<slot> is the inventory slot (1..8)\n"
-"<lvl> is one of: -1   0   +1"
-msgstr ""
-
-#: cmd_place.lua
-msgid ""
-"Place a block on the left side\n"
-"<slot> is the inventory slot (1..8)\n"
-"<lvl> is one of: -1   0   +1"
-msgstr ""
-
-#: cmd_place.lua
-msgid ""
-"Place a block on the right side\n"
-"<slot> is the inventory slot (1..8)\n"
-"<lvl> is one of: -1   0   +1"
-msgstr ""
-
-#: cmd_place.lua
-msgid ""
-"Place a block under the robot.\n"
-"Hint: use 'move_up' first.\n"
-"<slot> is the inventory slot (1..8)"
-msgstr ""
-
-#: cmd_place.lua
-msgid ""
-"Place a block above the robot.\n"
-"<slot> is the inventory slot (1..8)"
-msgstr ""
-
-#: cmd_place.lua
-msgid "Error: No free inventory space"
-msgstr ""
-
-#: cmd_place.lua
-msgid ""
-"Dig the block in front of the robot\n"
-"<slot> is the inventory slot (1..8)\n"
-"<lvl> is one of: -1   0   +1"
-msgstr ""
-
-#: cmd_place.lua
-msgid ""
-"Dig the block on the left side\n"
-"<slot> is the inventory slot (1..8)\n"
-"<lvl> is one of: -1   0   +1"
-msgstr ""
-
-#: cmd_place.lua
-msgid ""
-"Dig the block on the right side\n"
-"<slot> is the inventory slot (1..8)\n"
-"<lvl> is one of: -1   0   +1"
-msgstr ""
-
-#: cmd_place.lua
-msgid ""
-"Dig the block under the robot.\n"
-"<slot> is the inventory slot (1..8)"
-msgstr ""
-
-#: cmd_place.lua
-msgid ""
-"Dig the block above the robot.\n"
-"<slot> is the inventory slot (1..8)"
-msgstr ""
-
-#: cmd_place.lua
-msgid ""
-"Rotate the block in front of the robot\n"
-"<lvl> is one of:  -1   0   +1\n"
-"<steps> is one of:  1   2   3"
-msgstr ""
-
-#: cmd_sign.lua
-msgid "Commands,Help"
-msgstr ""
-
-#: cmd_sign.lua
-msgid "Sign name:"
-msgstr ""
-
-#: cmd_sign.lua
-msgid "Cancel"
-msgstr ""
-
-#: cmd_sign.lua
-msgid "Check"
-msgstr ""
-
-#: cmd_sign.lua
-msgid "Copy Cmnd"
-msgstr ""
-
-#: cmd_sign.lua
-msgid "Sign \"command\""
-msgstr ""
-
-#: cmd_sign.lua
-msgid "-- enter or copy commands from help page"
-msgstr ""
-
-#: cmd_sign.lua
-msgid "Error: Signs inventory empty"
-msgstr ""
-
-#: cmd_sign.lua
-msgid "Error: Position protected or occupied"
-msgstr ""
-
-#: cmd_sign.lua
-msgid ""
-"Place a sign in front of the robot\n"
-"taken from the signs inventory\n"
-"<slot> is the inventory slot (1..6)"
-msgstr ""
-
-#: cmd_sign.lua
-msgid ""
-"Place a sign behind the robot\n"
-"taken from the signs inventory\n"
-"<slot> is the inventory slot (1..6)"
-msgstr ""
-
-#: cmd_sign.lua
-msgid "Error: No sign available"
-msgstr ""
-
-#: cmd_sign.lua
-msgid "Error: Signs inventory slot is occupied"
-msgstr ""
-
-#: cmd_sign.lua
-msgid "Error: Position is protected"
-msgstr ""
-
-#: cmd_sign.lua
-msgid ""
-"Dig the sign in front of the robot\n"
-"and add it to the signs inventory.\n"
-"<slot> is the inventory slot (1..6)"
-msgstr ""
-
-#: cmd_sign.lua
-msgid ""
-"Dig the sign in front of the robot\n"
-"and add the cleared sign to\n"
-"the item iventory.\n"
-"<slot> is the inventory slot (1..8)"
-msgstr ""
-
-#: cmd_sign.lua
-msgid "Sign 'command'"
-msgstr ""
-
-#: cmd_sign.lua
-msgid "The 'command' sign can be programmed by the player."
-msgstr ""
-
-#: cmd_sign.lua
-msgid ""
-"Place the sign in front of you and use the node menu to program your "
-"sequence of bot commands."
-msgstr ""
-
-#: cmd_sign.lua
-msgid ""
-"The menu has an edit field for your commands and a help page with all "
-"available commands."
-msgstr ""
-
-#: cmd_sign.lua doc.lua
-msgid "The help page has a copy button to simplify the programming."
-msgstr ""
-
-#: commands.lua
-msgid "commands:"
-msgstr ""
-
-#: commands.lua
-msgid "unknown command"
-msgstr ""
-
-#: commands.lua
-msgid "start of a 'repeat..end' block"
-msgstr ""
-
-#: commands.lua
-msgid "end command of a 'repeat..end' block"
-msgstr ""
-
-#: commands.lua
-msgid "call a subroutine (with 'return' statement)"
-msgstr ""
-
-#: commands.lua
-msgid "return from a subroutine"
-msgstr ""
-
-#: commands.lua
-msgid "jump to a label"
-msgstr ""
-
-#: commands.lua
-msgid ""
-"Move the robot 1..999 steps forward\n"
-"without paying attention to any signs.\n"
-"Up and down movements also become\n"
-"counted as steps."
-msgstr ""
-
-#: commands.lua
-msgid ""
-"Walk until a sign or obstacle is\n"
-"reached. Then continue with the next command.\n"
-"When a sign has been reached, \n"
-"the current program is ended\n"
-"and the bot executes the\n"
-"new program from the sign"
-msgstr ""
-
-#: crop_sensor.lua
-msgid "Crop Sensor: Connected with "
-msgstr ""
-
-#: crop_sensor.lua
-msgid "Crop Sensor"
-msgstr ""
-
-#: crop_sensor.lua
-msgid ""
-"The Crop Sensor sends cyclical signals when, for example, wheat is fully "
-"grown."
-msgstr ""
-
-#: crop_sensor.lua
-msgid "The sensor range is one node/meter."
-msgstr ""
-
-#: crop_sensor.lua
-msgid "The sensor has an active side (red) that must point to the crop/field."
-msgstr ""
-
-#: doc.lua
-msgid ""
-"After you have placed the Signs Bot Box, you can start the bot by means of "
-"the 'On' button in the box menu."
-msgstr ""
-
-#: doc.lua
-msgid ""
-"The bot then runs straight up until it reaches an obstacle (a step with two "
-"or more blocks up or down or a sign.)"
-msgstr ""
-
-#: doc.lua
-msgid ""
-"If the bot first reaches a sign it will execute the commands on the sign."
-msgstr ""
-
-#: doc.lua
-msgid ""
-"If the command(s) on the sign is e.g. 'turn_around', the bot turns and goes "
-"back."
-msgstr ""
-
-#: doc.lua
-msgid "In this case, the bot reaches his box again and turns off."
-msgstr ""
-
-#: doc.lua
-msgid ""
-"The Signs Bot Box has an inventory with 6 stacks for signs and 8 stacks for "
-"other items (to be placed/dug by the bot)."
-msgstr ""
-
-#: doc.lua
-msgid "This inventory simulates the bot internal inventory."
-msgstr ""
-
-#: doc.lua
-msgid ""
-"That means you will only have access to the inventory if the bot is turned "
-"off ('sitting' in his box)."
-msgstr ""
-
-#: doc.lua
-msgid ""
-"You simply control the direction of the bot by means of the 'turn left' and "
-"'turn right' signs (signs with the arrow)."
-msgstr ""
-
-#: doc.lua
-msgid ""
-"The bot can run over steps (one block up/down). But there are also commands "
-"to move the bot up and down."
-msgstr ""
-
-#: doc.lua
-msgid "It is not necessary to mark a way back to the box."
-msgstr ""
-
-#: doc.lua
-msgid ""
-"With the command 'turn_off' the bot will turn off and be back in his box "
-"from every position."
-msgstr ""
-
-#: doc.lua
-msgid "The same applies if you turn off the bot by the box menu."
-msgstr ""
-
-#: doc.lua
-msgid ""
-"If the bot reaches a sign from the wrong direction (from back or sides) the "
-"sign will be ignored."
-msgstr ""
-
-#: doc.lua
-msgid "The bot will walk over."
-msgstr ""
-
-#: doc.lua
-msgid "All predefined signs have a menu with a list of the bot commands."
-msgstr ""
-
-#: doc.lua
-msgid ""
-"These signs can't be changed, but you can craft and program your own signs."
-msgstr ""
-
-#: doc.lua
-msgid "For this you have to use the 'command' sign."
-msgstr ""
-
-#: doc.lua
-msgid ""
-"This sign has an edit field for your commands and a help page with all "
-"available commands."
-msgstr ""
-
-#: doc.lua
-msgid "Also for your own signs it is important to know:"
-msgstr ""
-
-#: doc.lua
-msgid ""
-"After the execution of the last command of the sign, the bot falls back into "
-"its default behaviour and runs in its taken direction."
-msgstr ""
-
-#: doc.lua
-msgid "A standard job for the bot is to move items from one chest to another"
-msgstr ""
-
-#: doc.lua
-msgid "(chest or node with a chest like inventory)."
-msgstr ""
-
-#: doc.lua
-msgid "This can be done by means of the two signs 'take item' and 'add item'."
-msgstr ""
-
-#: doc.lua
-msgid "These signs have to be placed on top of chest nodes."
-msgstr ""
-
-#: doc.lua
-msgid "In addition to the signs the bot can be controlled by means of sensors."
-msgstr ""
-
-#: doc.lua
-msgid "Sensors like the Bot Sensor have two states: on and off."
-msgstr ""
-
-#: doc.lua
-msgid "If the Bot Sensor detects a bot it will switch to the state 'on' and"
-msgstr ""
-
-#: doc.lua
-msgid "sends a signal to a connected block, called an actuator."
-msgstr ""
-
-#: doc.lua
-msgid "Sensors are:"
-msgstr ""
-
-#: doc.lua
-msgid "- Bot Sensor: Sends a signal when the robot passes by"
-msgstr ""
-
-#: doc.lua
-msgid "- Node Sensor: Sends a signal when it detects any node"
-msgstr ""
-
-#: doc.lua
-msgid "- Crop Sensor: Sends a signal when, for example wheat is fully grown"
-msgstr ""
-
-#: doc.lua
-msgid "- Bot Chest: Sends a signal depending on the chest state (empty, full)"
-msgstr ""
-
-#: doc.lua
-msgid "Actuators are:"
-msgstr ""
-
-#: doc.lua
-msgid "- Signs Bot Box: Can turn the bot off and on"
-msgstr ""
-
-#: doc.lua
-msgid "- Control Unit: Can be used to exchange the sign to lead the bot"
-msgstr ""
-
-#: doc.lua
-msgid "Additional sensors and actuator can be added by other mods."
-msgstr ""
-
-#: doc.lua
-msgid ""
-"To send a signal from a sensor to an actuator, the sensor has to be "
-"connected (paired) with actuator."
-msgstr ""
-
-#: doc.lua
-msgid ""
-"To connect sensor and actuator, the Sensor Connection Tool has to be used."
-msgstr ""
-
-#: doc.lua
-msgid ""
-"Simply click with the tool on both blocks and the sensor will be connected "
-"with the actuator."
-msgstr ""
-
-#: doc.lua
-msgid "A successful connection is indicated by a ping/pong noise."
-msgstr ""
-
-#: doc.lua
-msgid ""
-"Before you connect sensor with actuator, take care that the actuator is in "
-"the requested state."
-msgstr ""
-
-#: doc.lua
-msgid ""
-"For example: If you want to start the Bot with a sensor, connect the sensor "
-"with the Bot Box,"
-msgstr ""
-
-#: doc.lua
-msgid ""
-"when the Bot is in the state 'on'. Otherwise the sensor signal will stop the "
-"Bot,"
-msgstr ""
-
-#: doc.lua
-msgid "instead of starting it."
-msgstr ""
-
-#: doc.lua
-msgid ""
-"The following applies to all commands that are used to place items in the "
-"bot inventory, like:"
-msgstr ""
-
-#: doc.lua
-msgid "- take_item <num> <slot>"
-msgstr ""
-
-#: doc.lua
-msgid "- pickup_items <slot>"
-msgstr ""
-
-#: doc.lua
-msgid "- trash_sign <slot>"
-msgstr ""
-
-#: doc.lua
-msgid "- harvest <slot>"
-msgstr ""
-
-#: doc.lua
-msgid "- dig_front <slot> <lvl>"
-msgstr ""
-
-#: doc.lua
-msgid "- dig_left <slot> <lvl>"
-msgstr ""
-
-#: doc.lua
-msgid "- dig_right <slot> <lvl>"
-msgstr ""
-
-#: doc.lua
-msgid "- dig_below <slot> <lvl>"
-msgstr ""
-
-#: doc.lua
-msgid "- dig_above <slot> <lvl>"
-msgstr ""
-
-#: doc.lua
-msgid ""
-"If no slot or slot 0 was specified with the command (case A), all 8 slots of "
-"the bot inventory "
-msgstr ""
-
-#: doc.lua
-msgid ""
-"are checked one after the other. If a slot was specified (case B), only this "
-"slot is checked."
-msgstr ""
-
-#: doc.lua
-msgid ""
-"In both cases the following applies: If the slot is preconfigured and fits "
-"the item, "
-msgstr ""
-
-#: doc.lua
-msgid ""
-"or if the slot is not configured and empty, or is only partially filled with "
-"the item type "
-msgstr ""
-
-#: doc.lua
-msgid "(which should be added), then the items are added."
-msgstr ""
-
-#: doc.lua
-msgid ""
-"If not all items can be added, the remaining slots will be tried out in case "
-"A."
-msgstr ""
-
-#: doc.lua
-msgid "Anything that could not be added to your own inventory goes back."
-msgstr ""
-
-#: doc.lua
-msgid ""
-"The following applies to all commands that are used to take items from the "
-"bot inventory, like:"
-msgstr ""
-
-#: doc.lua
-msgid "- add_item <num> <slot>"
-msgstr ""
-
-#: doc.lua
-msgid ""
-"It doesn't matter whether a slot is configured or not. The bot takes the "
-"first stack that "
-msgstr ""
-
-#: doc.lua
-msgid "it can find from its own inventory and tries to use it."
-msgstr ""
-
-#: doc.lua
-msgid ""
-"If a slot is specified, it only takes this, if no slot has been specified, "
-"it checks all of "
-msgstr ""
-
-#: doc.lua
-msgid ""
-"them one after the other, starting from slot 1 until it finds something."
-msgstr ""
-
-#: doc.lua
-msgid ""
-"If the number found is smaller than requested, he tries to take the rest out "
-"of any slot."
-msgstr ""
-
-#: doc.lua
-msgid "Signs Bot"
-msgstr ""
-
-#: doc.lua
-msgid "A robot controlled by signs, used for automated work"
-msgstr ""
-
-#: doc.lua
-msgid "Start the Bot"
-msgstr ""
-
-#: doc.lua
-msgid "Control the Bot"
-msgstr ""
-
-#: doc.lua
-msgid "Sensors and Actuators"
-msgstr ""
-
-#: doc.lua
-msgid "Connecting sensors and actuator"
-msgstr ""
-
-#: doc.lua
-msgid "Bot inventory behavior"
-msgstr ""
-
-#: duplicator.lua
-msgid "Input:"
-msgstr ""
-
-#: duplicator.lua
-msgid "Template:"
-msgstr ""
-
-#: duplicator.lua
-msgid "Output:"
-msgstr ""
-
-#: duplicator.lua
-msgid ""
-"1. Place one 'cmnd' sign to be\n"
-"    used as template.\n"
-msgstr ""
-
-#: duplicator.lua
-msgid ""
-"2. Add 'blank signs' to\n"
-"    the input inventory.\n"
-msgstr ""
-
-#: duplicator.lua
-msgid ""
-"3. Take the copies\n"
-"    from the output inventory."
-msgstr ""
-
-#: duplicator.lua
-msgid "Signs Duplicator"
-msgstr ""
-
-#: duplicator.lua
-msgid "Sign \"user\""
-msgstr ""
-
-#: duplicator.lua
-msgid "Sign \"blank\""
-msgstr ""
-
-#: duplicator.lua
-msgid "The Duplicator can be used to make copies of signs."
-msgstr ""
-
-#: duplicator.lua
-msgid ""
-"1. Put one 'cmnd' sign to be used as template into the 'Template' inventory"
-msgstr ""
-
-#: duplicator.lua
-msgid "2. Add one or several 'blank signs' to the 'Input' inventory."
-msgstr ""
-
-#: duplicator.lua
-msgid "3. Take the copies from the 'Output' inventory."
-msgstr ""
-
-#: duplicator.lua
-msgid ""
-"Written books [default:book_written] can alternatively be used as template"
-msgstr ""
-
-#: duplicator.lua
-msgid "Already written signs can be used as input, too."
-msgstr ""
-
-#: duplicator.lua
-msgid "Needed as input for the Duplicator."
-msgstr ""
-
-#: extender.lua
-msgid "Sensor Extender: Connected with "
-msgstr ""
-
-#: extender.lua
-msgid "Sensor Extender"
-msgstr ""
-
-#: extender.lua
-msgid "Sensor Extender: Not connected"
-msgstr ""
-
-#: extender.lua
-msgid ""
-"With the Sensor Extender, sensor signals can be sent to more than one "
-"actuator."
-msgstr ""
-
-#: extender.lua
-msgid "Place one or more extender nearby the sensor and connect each extender"
-msgstr ""
-
-#: extender.lua
-msgid "with one further actuator by means of the Connection Tool."
-msgstr ""
-
-#: node_sensor.lua
-msgid "Node Sensor: Connected with "
-msgstr ""
-
-#: node_sensor.lua
-msgid "added"
-msgstr ""
-
-#: node_sensor.lua
-msgid "removed"
-msgstr ""
-
-#: node_sensor.lua
-msgid "added or removed"
-msgstr ""
-
-#: node_sensor.lua
-msgid "Send signal if nodes have been:"
-msgstr ""
-
-#: node_sensor.lua
-msgid "accept"
-msgstr ""
-
-#: node_sensor.lua
-msgid "Node Sensor"
-msgstr ""
-
-#: node_sensor.lua
-msgid ""
-"The node sensor sends cyclical signals when it detects that nodes have "
-"appeared or disappeared,"
-msgstr ""
-
-#: node_sensor.lua
-msgid "but has to be configured accordingly."
-msgstr ""
-
-#: node_sensor.lua
-msgid "Valid nodes are all kind of blocks and plants."
-msgstr ""
-
-#: node_sensor.lua
-msgid "The sensor range is 3 nodes/meters in one direction."
-msgstr ""
-
-#: node_sensor.lua
-msgid ""
-"The sensor has an active side (red) that must point to the observed area."
-msgstr ""
-
-#: signs.lua
-msgid "Sign \"turn right\""
-msgstr ""
-
-#: signs.lua
-msgid "Sign \"turn left\""
-msgstr ""
-
-#: signs.lua
-msgid "Sign \"take item\""
-msgstr ""
-
-#: signs.lua
-msgid "Sign \"add item\""
-msgstr ""
-
-#: signs.lua
-msgid "Sign \"stop\""
-msgstr ""
-
-#: signs.lua
-msgid "Sign \"add to cart\""
-msgstr ""
-
-#: signs.lua
-msgid "Sign \"take from cart\""
-msgstr ""
-
-#: signs.lua
-msgid "The Bot turns right when it detects this sign in front of it."
-msgstr ""
-
-#: signs.lua
-msgid "The Bot turns left when it detects this sign in front of it."
-msgstr ""
-
-#: signs.lua
-msgid ""
-"The Bot takes items out of a chest in front of it and then turns around."
-msgstr ""
-
-#: signs.lua
-msgid "This sign has to be placed on top of the chest."
-msgstr ""
-
-#: signs.lua
-msgid "The Bot puts items into a chest in front of it and then turns around."
-msgstr ""
-
-#: signs.lua
-msgid ""
-"The Bot will stop in front of this sign until the sign is removed or the bot "
-"is turned off."
-msgstr ""
-
-#: signs.lua
-msgid ""
-"The Bot puts items into a minecart in front of it, pushes the cart and then "
-"turns around."
-msgstr ""
-
-#: signs.lua
-msgid "This sign has to be placed on top of the rail at the cart end position."
-msgstr ""
-
-#: signs.lua
-msgid ""
-"The Bot takes items out of a minecart in front of it, pushes the cart and "
-"then turns around."
-msgstr ""
-
-#: tool.lua
-msgid "Sensor Connection Tool"
-msgstr ""
-
-#: timer.lua
-msgid "Bot Timer"
-msgstr ""
-
-#: timer.lua logic_and.lua
-msgid "Connected with"
-msgstr ""
-
-#: timer.lua
-msgid "Cycle time [min]:"
-msgstr ""
-
-#: timer.lua delayer.lua
-msgid "Start"
-msgstr ""
-
-#: timer.lua
-msgid "Special kind of sensor."
-msgstr ""
-
-#: timer.lua
-msgid ""
-"Can be programmed with a time in seconds, e.g. to start the bot cyclically."
-msgstr ""
-
-#: delayer.lua
-msgid "Signal Delayer: Connected with "
-msgstr ""
-
-#: delayer.lua
-msgid "Delay time [sec]:"
-msgstr ""
-
-#: delayer.lua
-msgid "Signal Delayer"
-msgstr ""
-
-#: delayer.lua
-msgid "Signals are forwarded delayed. Subsequent signals are queued."
-msgstr ""
-
-#: delayer.lua
-msgid "The delay time can be configured."
-msgstr ""
-
-#: logic_and.lua
-msgid "Signal AND with"
-msgstr ""
-
-#: logic_and.lua
-msgid "inputs"
-msgstr ""
-
-#: logic_and.lua
-msgid "Signal AND"
-msgstr ""
-
-#: logic_and.lua
-msgid "Signal is sent, if all input signals are received."
-msgstr ""
-
-#: interpreter.lua
-msgid "Maximum programm size exceeded"
-msgstr ""
-
-#: interpreter.lua
-msgid "Too many parameters"
-msgstr ""
-
-#: interpreter.lua
-msgid "Parameter error"
-msgstr ""
-
-#: interpreter.lua
-msgid "Command error"
-msgstr ""
-
-#: interpreter.lua
-msgid "'repeat' missing"
-msgstr ""
-
-#: interpreter.lua
-msgid "'end' missing"
-msgstr ""
-
-#: interpreter.lua
-msgid "Checked and approved"
-msgstr ""
diff --git a/signs_bot/locale/template.txt b/signs_bot/locale/template.txt
new file mode 100644
index 0000000..f12d7e3
--- /dev/null
+++ b/signs_bot/locale/template.txt
@@ -0,0 +1,410 @@
+# textdomain: signs_bot
+
+
+
+### basis.lua ###
+
+running=
+charging=
+stopped=
+Off=
+On=
+Signs=
+Other items=
+Config=
+Preassign slots items=
+Back=
+Robot Box=
+no power=
+Signs Bot Box=
+The Box is the housing of the bot.=
+Place the box and start the bot by means of the 'On' button.=
+If the mod techage is installed, the bot needs electrical power.=
+The bot leaves the box on the right side.=
+It will not start, if this position is blocked.=
+To stop and remove the bot, press the 'Off' button.=
+The box inventory simulates the inventory of the bot.=
+You will not be able to access the inventory, if the bot is running.=
+The bot can carry up to 8 stacks and 6 signs with it.=
+
+### bot_flap.lua ###
+
+Exit=
+Bot Flap=
+The flap is a simple block used as door for the bot.=
+Place the flap in any wall, and the bot will automatically open=
+and close the flap as it passes through it.=
+
+### bot_sensor.lua ###
+
+Bot Sensor: Connected with=
+Bot Sensor=
+Bot Sensor: Not connected=
+The Bot Sensor detects any bot and sends a signal, if a bot is nearby.=
+The sensor direction does not care.=
+
+### cart_sensor.lua ###
+
+Cart Sensor: Connected with=
+Cart Sensor=
+Cart Sensor: Not connected=
+The Cart Sensor detects and sends a signal, if a cart (Minecart) is nearby.=
+The sensor has an active side (red) that must point to the rail/cart.=
+
+### cart_sensor.lua ###
+### bot_sensor.lua ###
+
+the sensor range is one node/meter.=
+
+### changer.lua ###
+
+Signs:=
+Bot Control Unit=
+The Bot Control Unit is used to lead the bot by means of signs.=
+The unit can be loaded with up to 4 different signs and can be programmed by means of sensors.=
+To load the unit, place a sign on the red side of the unit and click on the unit.=
+The sign disappears / is moved to the inventory of the unit.=
+This can be repeated 3 times.=
+Use the connection tool to connect up to 4 sensors with the Bot Control Unit.=
+
+### chest.lua ###
+
+Bot Chest: Sends signal to=
+Signs Bot Chest=
+Bot Chest: Not connected=
+The Signs Bot Chest is a special chest with sensor function.=
+It sends a signal depending on the chest state.=
+Possible states are 'empty', 'not empty', 'almost full'=
+A typical use case is to turn off the bot, when the chest is almost full or empty.=
+
+### cmd_farming.lua ###
+
+Sow farming seeds@nin front of the robot=
+Harvest farming products@nin front of the robot@non a 3x3 field.=
+Plant a sapling@nin front of the robot=
+Sign "farming"=
+Sign 'farming'=
+Used to harvest and seed a 3x3 field.=
+The seed to be placed has to be in the first inventory slot of the bot.=
+
+### cmd_farming.lua ###
+### cmd_flowers.lua ###
+
+Place the sign in front of the field.=
+When finished, the bot turns.=
+
+### cmd_flowers.lua ###
+
+Cutting flowers, leaves and tree blocks@nin front of the robot@non a 3x3 field.=
+Sign "flowers"=
+Sign 'flowers'=
+Used to cut flowers on a 3x3 field.=
+
+### cmd_item.lua ###
+
+Take <num> items from a chest like node@nand put it into the item inventory.@n<slot> is the inventory slot (1..8) or 0 for any one=
+Add <num> items to a chest like node@ntaken from the item inventory.@n<slot> is the inventory slot (1..8) or 0 for any one=
+Add <num> fuel to a furnace like node@ntaken from the item inventory.@n<slot> is the inventory slot (1..8) or 0 for any one=
+deprecated, use bot inventory configuration instead=
+Pick up all objects@nin a 3x3 field.@n<slot> is the inventory slot (1..8) or 0 for any one=
+Drop items in front of the bot.@n<slot> is the inventory slot (1..8) or 0 for any one=
+Punch a rail cart to start it=
+
+### cmd_move.lua ###
+
+Move the robot one step back=
+Turn the robot to the left=
+Turn the robot to the right=
+Turn the robot around=
+Move the robot upwards=
+Move the robot down=
+Stop the robot for <sec> seconds@n(1..9999)=
+Stop the robot.=
+Turn the robot off@nand put it back in the box.=
+
+### cmd_pattern.lua ###
+
+Store pattern to be cloned.=
+Copy the nodes from@nthe stored pattern position@n<size> is: 3x1, 3x2, 3x3,@n5x1, 5x2, 5x3 (wide x deep)@n<lvl> pattern level offset (0..4)=
+Sign "pattern"=
+Sign "copy 3x3x3"=
+Sign 'pattern'=
+Used to make a copy of a 3x3x3 cube.=
+Place the sign in front of the pattern to be copied.=
+Use the copy sign to make the copy of this pattern on a different location.=
+The bot must first reach the pattern sign, then the copy sign.=
+Sign 'copy3x3x3'=
+Place the sign in front of the location, where the copy should be made.=
+Use the pattern sign to mark the pattern.=
+
+### cmd_place.lua ###
+
+Error: Position protected=
+Place a block in front of the robot@n<slot> is the inventory slot (1..8)@n<lvl> is one of: -1   0   +1=
+Place a block on the left side@n<slot> is the inventory slot (1..8)@n<lvl> is one of: -1   0   +1=
+Place a block on the right side@n<slot> is the inventory slot (1..8)@n<lvl> is one of: -1   0   +1=
+Place a block under the robot.@nHint: use 'move_up' first.@n<slot> is the inventory slot (1..8)=
+Place a block above the robot.@n<slot> is the inventory slot (1..8)=
+Error: No free inventory space=
+Dig the block in front of the robot@n<slot> is the inventory slot (1..8)@n<lvl> is one of: -1   0   +1=
+Dig the block on the left side@n<slot> is the inventory slot (1..8)@n<lvl> is one of: -1   0   +1=
+Dig the block on the right side@n<slot> is the inventory slot (1..8)@n<lvl> is one of: -1   0   +1=
+Dig the block under the robot.@n<slot> is the inventory slot (1..8)=
+Dig the block above the robot.@n<slot> is the inventory slot (1..8)=
+Rotate the block in front of the robot@n<lvl> is one of:  -1   0   +1@n<steps> is one of:  1   2   3=
+Bot torch=
+
+### cmd_sign.lua ###
+
+Commands,Help=
+Sign name:=
+Cancel=
+Check=
+Help=
+Copy Cmnd=
+please check the added line(s)=
+Sign "command"=
+-- enter or copy commands from help page=
+Error: Signs inventory empty=
+Error: Position protected or occupied=
+Place a sign in front of the robot@ntaken from the signs inventory@n<slot> is the inventory slot (1..6)=
+Place a sign behind the robot@ntaken from the signs inventory@n<slot> is the inventory slot (1..6)=
+Error: No sign available=
+Error: Signs inventory slot is occupied=
+Error: Position is protected=
+Dig the sign in front of the robot@nand add it to the signs inventory.@n<slot> is the inventory slot (1..6)=
+Dig the sign in front of the robot@nand add the cleared sign to@nthe item iventory.@n<slot> is the inventory slot (1..8)=
+Sign 'command'=
+The 'command' sign can be programmed by the player.=
+Place the sign in front of you and use the node menu to program your sequence of bot commands.=
+The menu has an edit field for your commands and a help page with all available commands.=
+
+### commands.lua ###
+
+commands:=
+unknown command=
+start of a 'repeat..end' block=
+end command of a 'repeat..end' block=
+call a subroutine (with 'return' statement)=
+return from a subroutine=
+jump to a label=
+Move the robot 1..999 steps forward@nwithout paying attention to any signs.@nUp and down movements also become@ncounted as steps.=
+Walk until a sign or obstacle is@nreached. Then continue with the next command.@nWhen a sign has been reached, @nthe current program is ended@nand the bot executes the@nnew program from the sign=
+Print given text as chat message.@nFor two or more words, use the '*' character @ninstead of spaces, like "Hello*world"=
+
+### compost.lua ###
+
+Put 2 leaves into the compost barrel@n<slot> is the bot inventory slot (1..8)@nwith the leaves.=
+Take a compost item from the barrel.@n<slot> (1..8 or 0 for the first free slot) is the bot@nslot for the compost item.=
+
+### crop_sensor.lua ###
+
+Crop Sensor: Connected with=
+Crop Sensor=
+Crop Sensor: Not connected=
+The Crop Sensor sends cyclical signals when, for example, wheat is fully grown.=
+The sensor range is one node/meter.=
+The sensor has an active side (red) that must point to the crop/field.=
+
+### delayer.lua ###
+
+Signal Delayer: Connected with=
+Delay time [sec]:=
+Signal Delayer=
+Signals are forwarded delayed. Subsequent signals are queued.=
+The delay time can be configured.=
+
+### doc.lua ###
+
+After you have placed the Signs Bot Box, you can start the bot by means of the 'On' button in the box menu.=
+If the bot returns to its box right away, you will likely need to charge it with electrical energy (techage) first.=
+The bot then runs straight up until it reaches an obstacle (a step with two or more blocks up or down or a sign.)=
+If the bot first reaches a sign it will execute the commands on the sign.=
+If the command(s) on the sign is e.g. 'turn_around', the bot turns and goes back.=
+In this case, the bot reaches his box again and turns off.=
+The Signs Bot Box has an inventory with 6 stacks for signs and 8 stacks for other items (to be placed/dug by the bot).=
+This inventory simulates the bot internal inventory.=
+That means you will only have access to the inventory if the bot is turned off ('sitting' in his box).=
+You simply control the direction of the bot by means of the 'turn left' and 'turn right' signs (signs with the arrow).=
+The bot can run over steps (one block up/down). But there are also commands to move the bot up and down.=
+It is not necessary to mark a way back to the box.=
+With the command 'turn_off' the bot will turn off and be back in his box from every position.=
+The same applies if you turn off the bot by the box menu.=
+If the bot reaches a sign from the wrong direction (from back or sides) the sign will be ignored.=
+The bot will walk over.=
+All predefined signs have a menu with a list of the bot commands.=
+These signs can't be changed, but you can craft and program your own signs.=
+For this you have to use the 'command' sign.=
+This sign has an edit field for your commands and a help page with all available commands.=
+Also for your own signs it is important to know:=
+After the execution of the last command of the sign, the bot falls back into its default behaviour and runs in its taken direction.=
+A standard job for the bot is to move items from one chest to another=
+(chest or node with a chest like inventory).=
+This can be done by means of the two signs 'take item' and 'add item'.=
+These signs have to be placed on top of chest nodes.=
+In addition to the signs the bot can be controlled by means of sensors.=
+Sensors like the Bot Sensor have two states: on and off.=
+If the Bot Sensor detects a bot it will switch to the state 'on' and=
+sends a signal to a connected block, called an actuator.=
+Sensors are:=
+- Bot Sensor: Sends a signal when the robot passes by=
+- Node Sensor: Sends a signal when it detects any node=
+- Crop Sensor: Sends a signal when, for example wheat is fully grown=
+- Bot Chest: Sends a signal depending on the chest state (empty, full)=
+Actuators are:=
+- Signs Bot Box: Can turn the bot off and on=
+- Control Unit: Can be used to exchange the sign to lead the bot=
+Additional sensors and actuator can be added by other mods.=
+To send a signal from a sensor to an actuator, the sensor has to be connected (paired) with actuator.=
+To connect sensor and actuator, the Sensor Connection Tool has to be used.=
+Simply click with the tool on both blocks and the sensor will be connected with the actuator.=
+A successful connection is indicated by a ping/pong noise.=
+Before you connect sensor with actuator, take care that the actuator is in the requested state.=
+For example: If you want to start the Bot with a sensor, connect the sensor with the Bot Box,=
+when the Bot is in the state 'on'. Otherwise the sensor signal will stop the Bot,=
+instead of starting it.=
+The following applies to all commands that are used to place items in the bot inventory, like:=
+- take_item <num> <slot>=
+- pickup_items <slot>=
+- trash_sign <slot>=
+- harvest <slot>=
+- dig_front <slot> <lvl>=
+- dig_left <slot> <lvl>=
+- dig_right <slot> <lvl>=
+- dig_below <slot> <lvl>=
+- dig_above <slot> <lvl>=
+If no slot or slot 0 was specified with the command (case A), all 8 slots of the bot inventory =
+are checked one after the other. If a slot was specified (case B), only this slot is checked.=
+In both cases the following applies: If the slot is preconfigured and fits the item, =
+or if the slot is not configured and empty, or is only partially filled with the item type =
+(which should be added), then the items are added.=
+If not all items can be added, the remaining slots will be tried out in case A.=
+Anything that could not be added to your own inventory goes back.=
+The following applies to all commands that are used to take items from the bot inventory, like:=
+- add_item <num> <slot>=
+It doesn't matter whether a slot is configured or not. The bot takes the first stack that =
+it can find from its own inventory and tries to use it.=
+If a slot is specified, it only takes this, if no slot has been specified, it checks all of =
+them one after the other, starting from slot 1 until it finds something.=
+If the number found is smaller than requested, he tries to take the rest out of any slot.=
+Signs Bot=
+A robot controlled by signs, used for automated work=
+Start the Bot=
+Control the Bot=
+Sensors and Actuators=
+Connecting sensors and actuator=
+Bot inventory behavior=
+
+### doc.lua ###
+### cmd_sign.lua ###
+
+The help page has a copy button to simplify the programming.=
+
+### duplicator.lua ###
+
+Template:=
+Input:=
+Output:=
+1. Place one 'cmnd' sign=
+2. Add 'blank signs'=
+3. Take the copies=
+Signs Duplicator=
+Sign "user"=
+Sign "blank"=
+The Duplicator can be used to make copies of signs.=
+1. Put one 'cmnd' sign to be used as template into the 'Template' inventory=
+2. Add one or several 'blank signs' to the 'Input' inventory.=
+3. Take the copies from the 'Output' inventory.=
+Written books [default:book_written] can alternatively be used as template=
+Already written signs can be used as input, too.=
+Needed as input for the Duplicator.=
+
+### extender.lua ###
+
+Sensor Extender: Connected with=
+Sensor Extender=
+Sensor Extender: Not connected=
+With the Sensor Extender, sensor signals can be sent to more than one actuator.=
+Place one or more extender nearby the sensor and connect each extender=
+with one further actuator by means of the Connection Tool.=
+
+### interpreter.lua ###
+
+Maximum programm size exceeded=
+Too many parameters=
+Parameter error=
+Command error=
+'repeat' missing=
+'end' missing=
+Checked and approved=
+
+### logic_and.lua ###
+
+Signal AND with=
+inputs=
+Signal AND=
+Signal is sent, if all input signals are received.=
+
+### node_sensor.lua ###
+
+Node Sensor: Connected with =
+added=
+removed=
+added or removed=
+Send signal if nodes have been:=
+accept=
+Node Sensor=
+Node Sensor: Not connected=
+The node sensor sends cyclical signals when it detects that nodes have appeared or disappeared,=
+but has to be configured accordingly.=
+Valid nodes are all kind of blocks and plants.=
+The sensor range is 3 nodes/meters in one direction.=
+The sensor has an active side (red) that must point to the observed area.=
+
+### signs.lua ###
+
+Sign "turn right"=
+Sign "turn left"=
+Sign "take item"=
+Sign "add item"=
+Sign "stop"=
+Sign "add to cart"=
+Sign "take from cart"=
+The Bot turns right when it detects this sign in front of it.=
+The Bot turns left when it detects this sign in front of it.=
+The Bot takes items out of a chest in front of it and then turns around.=
+This sign has to be placed on top of the chest.=
+The Bot puts items into a chest in front of it and then turns around.=
+The Bot will stop in front of this sign until the sign is removed or the bot is turned off.=
+The Bot puts items into a minecart in front of it, pushes the cart and then turns around.=
+This sign has to be placed on top of the rail at the cart end position.=
+The Bot takes items out of a minecart in front of it, pushes the cart and then turns around.=
+
+### techage.lua ###
+
+Ignite the techage charcoal lighter=
+Turns the bot off if the@nbattery power is below the@ngiven value in percent (1..99)=
+fully charged=
+Sends a techage command@nto a given node. @nReceiver is addressed by@nthe techage node number.@nFor commands with two or more @nwords, use the '*' character @ninstead of spaces, e.g.: @nsend_cmnd 3465 pull*default:dirt*2=
+
+### timer.lua ###
+
+Bot Timer=
+Cycle time [min]:=
+Bot Timer: Not connected=
+Special kind of sensor.=
+Can be programmed with a time in seconds, e.g. to start the bot cyclically.=
+
+### timer.lua ###
+### delayer.lua ###
+
+Start=
+
+### timer.lua ###
+### logic_and.lua ###
+
+Connected with=
+
+### tool.lua ###
+
+Sensor Connection Tool=
diff --git a/signs_bot/logic_and.lua b/signs_bot/logic_and.lua
index 3b7b46d..3a8fcde 100644
--- a/signs_bot/logic_and.lua
+++ b/signs_bot/logic_and.lua
@@ -3,7 +3,7 @@
 	Signs Bot
 	=========
 
-	Copyright (C) 2019 Joachim Stolberg
+	Copyright (C) 2019-2021 Joachim Stolberg
 
 	GPL v3
 	See LICENSE.txt for more information
@@ -13,13 +13,12 @@
 ]]--
 
 -- for lazy programmers
-local S = function(pos) if pos then return minetest.pos_to_string(pos) end end
-local P = minetest.string_to_pos
+local P2S = function(pos) if pos then return minetest.pos_to_string(pos) end end
+local S2P = minetest.string_to_pos
 local M = minetest.get_meta
 
--- Load support for intllib.
-local MP = minetest.get_modpath("signs_bot")
-local I,_ = dofile(MP.."/intllib.lua")
+-- Load support for I18n.
+local S = signs_bot.S
 
 local lib = signs_bot.lib
 
@@ -38,12 +37,12 @@ end
 local function update_infotext(pos, dest_pos, cmnd)
 	local mem = tubelib2.get_mem(pos)
 	local text = table.concat({
-		I("Signal AND with"),
+		S("Signal AND with"),
 		#mem.inputs or 0,
-		I("inputs"),
+		S("inputs"),
 		":",
-		I("Connected with"),
-		S(dest_pos),
+		S("Connected with"),
+		P2S(dest_pos),
 		"/",
 		cmnd,
 		":",
@@ -80,7 +79,7 @@ local function infotext(pos)
 	local dest_pos = meta:get_string("signal_pos")
 	local signal = meta:get_string("signal_data")
 	if dest_pos ~= "" and signal ~= "" then
-		update_infotext(pos, P(dest_pos), signal)
+		update_infotext(pos, S2P(dest_pos), signal)
 	end
 end
 
@@ -143,7 +142,7 @@ local function signs_bot_on_signal(pos, node, signal)
 end
 
 minetest.register_node("signs_bot:and1", {
-	description = I("Signal AND"),
+	description = S("Signal AND"),
 	inventory_image = "signs_bot_and_inv.png",
 	drawtype = "nodebox",
 	node_box = {
@@ -170,6 +169,7 @@ minetest.register_node("signs_bot:and1", {
 	update_infotext = update_infotext,
 	on_rotate = screwdriver.disallow,
 	paramtype = "light",
+	use_texture_alpha = signs_bot.CLIP,
 	sunlight_propagates = true,
 	paramtype2 = "facedir",
 	is_ground_content = false,
@@ -178,7 +178,7 @@ minetest.register_node("signs_bot:and1", {
 })
 
 minetest.register_node("signs_bot:and2", {
-	description = I("Signal AND"),
+	description = S("Signal AND"),
 	drawtype = "nodebox",
 	node_box = {
 		type = "fixed",
@@ -197,6 +197,7 @@ minetest.register_node("signs_bot:and2", {
 	update_infotext = update_infotext,
 	on_rotate = screwdriver.disallow,
 	paramtype = "light",
+	use_texture_alpha = signs_bot.CLIP,
 	sunlight_propagates = true,
 	paramtype2 = "facedir",
 	is_ground_content = false,
@@ -206,7 +207,7 @@ minetest.register_node("signs_bot:and2", {
 })
 
 minetest.register_node("signs_bot:and3", {
-	description = I("Signal AND"),
+	description = S("Signal AND"),
 	drawtype = "nodebox",
 	node_box = {
 		type = "fixed",
@@ -223,6 +224,7 @@ minetest.register_node("signs_bot:and3", {
 	update_infotext = update_infotext,
 	on_rotate = screwdriver.disallow,
 	paramtype = "light",
+	use_texture_alpha = signs_bot.CLIP,
 	sunlight_propagates = true,
 	paramtype2 = "facedir",
 	is_ground_content = false,
@@ -242,11 +244,11 @@ minetest.register_craft({
 
 if minetest.get_modpath("doc") then
 	doc.add_entry("signs_bot", "and", {
-		name = I("Signal AND"),
+		name = S("Signal AND"),
 		data = {
 			item = "signs_bot:and1",
 			text = table.concat({
-				I("Signal is sent, if all input signals are received."), 
+				S("Signal is sent, if all input signals are received."), 
 			}, "\n")		
 		},
 	})
diff --git a/signs_bot/node_sensor.lua b/signs_bot/node_sensor.lua
index 88eb1f5..519f4b3 100644
--- a/signs_bot/node_sensor.lua
+++ b/signs_bot/node_sensor.lua
@@ -3,7 +3,7 @@
 	Signs Bot
 	=========
 
-	Copyright (C) 2019 Joachim Stolberg
+	Copyright (C) 2019-2021 Joachim Stolberg
 
 	GPL v3
 	See LICENSE.txt for more information
@@ -13,20 +13,18 @@
 ]]--
 
 -- for lazy programmers
-local S = function(pos) if pos then return minetest.pos_to_string(pos) end end
-local P = minetest.string_to_pos
+local P2S = function(pos) if pos then return minetest.pos_to_string(pos) end end
 local M = minetest.get_meta
 
--- Load support for intllib.
-local MP = minetest.get_modpath("signs_bot")
-local I,_ = dofile(MP.."/intllib.lua")
+-- Load support for I18n.
+local S = signs_bot.S
 
 local lib = signs_bot.lib
 
 local CYCLE_TIME = 2
 
 local function update_infotext(pos, dest_pos, cmnd)
-	M(pos):set_string("infotext", I("Node Sensor: Connected with ")..S(dest_pos).." / "..cmnd)
+	M(pos):set_string("infotext", S("Node Sensor: Connected with ")..P2S(dest_pos).." / "..cmnd)
 end	
 
 local function swap_node(pos, name)
@@ -44,20 +42,20 @@ end
 	
 	
 local DropdownValues = {
-	[I("added")] = 1,
-	[I("removed")] = 2,
-	[I("added or removed")] = 3,
+	[S("added")] = 1,
+	[S("removed")] = 2,
+	[S("added or removed")] = 3,
 }
 
 local function formspec(mem)
-	local label = I("added")..","..I("removed")..","..I("added or removed")
+	local label = S("added")..","..S("removed")..","..S("added or removed")
 	return "size[6,3]"..
 	default.gui_bg..
 	default.gui_bg_img..
 	default.gui_slots..
-	"label[0.2,0.4;"..I("Send signal if nodes have been:").."]"..
+	"label[0.2,0.4;"..S("Send signal if nodes have been:").."]"..
 	"dropdown[0.2,1;6,1;mode;"..label..";"..(mem.mode or 3).."]"..
-	"button_exit[1.5,2.2;3,1;accept;"..I("accept").."]"
+	"button_exit[1.5,2.2;3,1;accept;"..S("accept").."]"
 end
 
 local function any_node_changed(pos)
@@ -115,7 +113,7 @@ local function node_timer(pos)
 end
 
 minetest.register_node("signs_bot:node_sensor", {
-	description = I("Node Sensor"),
+	description = S("Node Sensor"),
 	inventory_image = "signs_bot_sensor_node_inv.png",
 	drawtype = "nodebox",
 	node_box = {
@@ -137,7 +135,7 @@ minetest.register_node("signs_bot:node_sensor", {
 	after_place_node = function(pos, placer)
 		local meta = M(pos)
 		local mem = tubelib2.init_mem(pos)
-		meta:set_string("infotext", "Node Sensor: Not connected")
+		meta:set_string("infotext", S("Node Sensor: Not connected"))
 		mem.mode = 3 -- default legacy mode
 		meta:set_string("formspec", formspec(mem))
 		minetest.get_node_timer(pos):start(CYCLE_TIME)
@@ -149,6 +147,7 @@ minetest.register_node("signs_bot:node_sensor", {
 	on_receive_fields = on_receive_fields,
 	on_rotate = screwdriver.disallow,
 	paramtype = "light",
+	use_texture_alpha = signs_bot.CLIP,
 	sunlight_propagates = true,
 	paramtype2 = "facedir",
 	is_ground_content = false,
@@ -157,7 +156,7 @@ minetest.register_node("signs_bot:node_sensor", {
 })
 
 minetest.register_node("signs_bot:node_sensor_on", {
-	description = I("Node Sensor"),
+	description = S("Node Sensor"),
 	drawtype = "nodebox",
 	node_box = {
 		type = "fixed",
@@ -180,6 +179,7 @@ minetest.register_node("signs_bot:node_sensor_on", {
 	on_receive_fields = on_receive_fields,
 	on_rotate = screwdriver.disallow,
 	paramtype = "light",
+	use_texture_alpha = signs_bot.CLIP,
 	sunlight_propagates = true,
 	paramtype2 = "facedir",
 	is_ground_content = false,
@@ -213,15 +213,15 @@ minetest.register_lbm({
 
 if minetest.get_modpath("doc") then
 	doc.add_entry("signs_bot", "node_sensor", {
-		name = I("Node Sensor"),
+		name = S("Node Sensor"),
 		data = {
 			item = "signs_bot:node_sensor",
 			text = table.concat({
-				I("The node sensor sends cyclical signals when it detects that nodes have appeared or disappeared,"),
-				I("but has to be configured accordingly."),
-				I("Valid nodes are all kind of blocks and plants."),
-				I("The sensor range is 3 nodes/meters in one direction."), 
-				I("The sensor has an active side (red) that must point to the observed area."),
+				S("The node sensor sends cyclical signals when it detects that nodes have appeared or disappeared,"),
+				S("but has to be configured accordingly."),
+				S("Valid nodes are all kind of blocks and plants."),
+				S("The sensor range is 3 nodes/meters in one direction."), 
+				S("The sensor has an active side (red) that must point to the observed area."),
 			}, "\n")		
 		},
 	})
diff --git a/signs_bot/nodes.lua b/signs_bot/nodes.lua
index 13b8067..e46837d 100644
--- a/signs_bot/nodes.lua
+++ b/signs_bot/nodes.lua
@@ -3,7 +3,7 @@
 	Signs Bot
 	=========
 
-	Copyright (C) 2019 Joachim Stolberg
+	Copyright (C) 2019-2021 Joachim Stolberg
 
 	GPL v3
 	See LICENSE.txt for more information
@@ -69,7 +69,7 @@ if farming.mod == "redo" then
 	fp("farming:cocoa_beans", "farming:cocoa_1", "farming:cocoa_4")
 	fp("farming:garlic_clove", "farming:garlic_1", "farming:garlic_5")
 	fp("farming:onion", "farming:onion_1", "farming:onion_5")
-	fp("farming:peas", "farming:pea_1", "farming:pea_5")
+	fp("farming:pea_pod", "farming:pea_1", "farming:pea_5")
 	fp("farming:peppercorn", "farming:pepper_1", "farming:pepper_5")
 	fp("farming:pineapple_top", "farming:pineapple_1", "farming:pineapple_8")
 end
diff --git a/signs_bot/random.lua b/signs_bot/random.lua
index d795273..0564ba9 100644
--- a/signs_bot/random.lua
+++ b/signs_bot/random.lua
@@ -3,7 +3,7 @@
 	Signs Bot
 	=========
 
-	Copyright (C) 2019 Joachim Stolberg
+	Copyright (C) 2019-2021 Joachim Stolberg
 
 	GPL v3
 	See LICENSE.txt for more information
diff --git a/signs_bot/robot.lua b/signs_bot/robot.lua
index 0806dd7..b305606 100644
--- a/signs_bot/robot.lua
+++ b/signs_bot/robot.lua
@@ -3,7 +3,7 @@
 	Signs Bot
 	=========
 
-	Copyright (C) 2019 Joachim Stolberg
+	Copyright (C) 2019-2021 Joachim Stolberg
 
 	GPL v3
 	See LICENSE.txt for more information
@@ -12,11 +12,6 @@
 
 ]]--
 
--- for lazy programmers
-local S = function(pos) if pos then return minetest.pos_to_string(pos) end end
-local P = minetest.string_to_pos
-local M = minetest.get_meta
-
 local lib = signs_bot.lib
 
 -- Called when robot is started
@@ -76,10 +71,13 @@ minetest.register_node("signs_bot:robot", {
 	},
 	paramtype2 = "facedir",
 	paramtype = "light",
+	use_texture_alpha = signs_bot.CLIP,
 	sunlight_propagates = true,
 	is_ground_content = false,
 	drop = "",
-	groups = {cracky=1, not_in_creative_inventory = 1},
+	groups = {cracky=1, not_in_creative_inventory = 1,
+		plant = 1, -- prevents the transformation from wet soil to soil
+	},
 	sounds = default.node_sound_metal_defaults(),
 })
 
@@ -94,6 +92,7 @@ minetest.register_node("signs_bot:robot_leg", {
 	},
 	paramtype2 = "facedir",
 	paramtype = "light",
+	use_texture_alpha = signs_bot.CLIP,
 	sunlight_propagates = true,
 	is_ground_content = false,
 	drop = "",
@@ -113,9 +112,12 @@ minetest.register_node("signs_bot:robot_foot", {
 	},
 	paramtype2 = "facedir",
 	paramtype = "light",
+	use_texture_alpha = signs_bot.CLIP,
 	sunlight_propagates = true,
 	is_ground_content = false,
 	drop = "",
-	groups = {cracky=1, not_in_creative_inventory = 1},
+	groups = {cracky=1, not_in_creative_inventory = 1,
+		plant = 1, -- prevents the transformation from wet soil to soil
+	},
 	sounds = default.node_sound_metal_defaults(),
 })
diff --git a/signs_bot/signal.lua b/signs_bot/signal.lua
index ec9ff90..3c5e4db 100644
--- a/signs_bot/signal.lua
+++ b/signs_bot/signal.lua
@@ -3,7 +3,7 @@
 	Signs Bot
 	=========
 
-	Copyright (C) 2019 Joachim Stolberg
+	Copyright (C) 2019-2021 Joachim Stolberg
 
 	GPL v3
 	See LICENSE.txt for more information
@@ -13,12 +13,10 @@
 ]]--
 
 -- for lazy programmers
-local S = function(pos) if pos then return minetest.pos_to_string(pos) end end
-local P = minetest.string_to_pos
+local P2S = function(pos) if pos then return minetest.pos_to_string(pos) end end
+local S2P = minetest.string_to_pos
 local M = minetest.get_meta
 
-local lib = signs_bot.lib
-
 -- Used by the pairing tool
 function signs_bot.get_node_type(pos)
 	local node = tubelib2.get_node_lvm(pos)
@@ -50,7 +48,7 @@ end
 function signs_bot.store_signal(sensor_pos, dest_pos, signal)
 	local meta = sensor_pos and M(sensor_pos)
 	if meta then
-		meta:set_string("signal_pos", S(dest_pos))
+		meta:set_string("signal_pos", P2S(dest_pos))
 		meta:set_string("signal_data", signal)
 	end
 end
@@ -64,7 +62,7 @@ function signs_bot.send_signal(sensor_pos)
 		local dest_pos = meta:get_string("signal_pos")
 		local signal = meta:get_string("signal_data")
 		if dest_pos ~= "" and signal ~= "" then
-			local pos = P(dest_pos)
+			local pos = S2P(dest_pos)
 			local node = tubelib2.get_node_lvm(pos)
 			local ndef = minetest.registered_nodes[node.name]
 			if ndef	and ndef.signs_bot_on_signal then
diff --git a/signs_bot/signs.lua b/signs_bot/signs.lua
index 9eea5f4..def287c 100644
--- a/signs_bot/signs.lua
+++ b/signs_bot/signs.lua
@@ -3,7 +3,7 @@
 	Signs Bot
 	=========
 
-	Copyright (C) 2019 Joachim Stolberg
+	Copyright (C) 2019-2021 Joachim Stolberg
 
 	GPL v3
 	See LICENSE.txt for more information
@@ -12,14 +12,8 @@
 
 ]]--
 
--- for lazy programmers
-local S = function(pos) if pos then return minetest.pos_to_string(pos) end end
-local P = minetest.string_to_pos
-local M = minetest.get_meta
-
--- Load support for intllib.
-local MP = minetest.get_modpath("signs_bot")
-local I,_ = dofile(MP.."/intllib.lua")
+-- Load support for I18n.
+local S = signs_bot.S
 
 local function formspec(cmnd)
 	cmnd = minetest.formspec_escape(cmnd)
@@ -59,6 +53,7 @@ local function register_sign(def)
 		end,
 		on_rotate = screwdriver.disallow,
 		paramtype = "light",
+		use_texture_alpha = signs_bot.CLIP,
 		sunlight_propagates = true,
 		is_ground_content = false,
 		groups = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 2, sign_bot_sign = 1},
@@ -72,7 +67,7 @@ signs_bot.register_sign = register_sign
 
 register_sign({
 	name = "sign_right", 
-	description = I('Sign "turn right"'), 
+	description = S('Sign "turn right"'), 
 	commands = "turn_right", 
 	image = "signs_bot_sign_right.png",
 })
@@ -88,7 +83,7 @@ minetest.register_craft({
 
 register_sign({
 	name = "sign_left", 
-	description = I('Sign "turn left"'), 
+	description = S('Sign "turn left"'), 
 	commands = "turn_left", 
 	image = "signs_bot_sign_left.png",
 })
@@ -104,7 +99,7 @@ minetest.register_craft({
 
 register_sign({
 	name = "sign_take", 
-	description = I('Sign "take item"'), 
+	description = S('Sign "take item"'), 
 	commands = "take_item 99\nturn_around", 
 	image = "signs_bot_sign_take.png",
 })
@@ -120,7 +115,7 @@ minetest.register_craft({
 
 register_sign({
 	name = "sign_add", 
-	description = I('Sign "add item"'), 
+	description = S('Sign "add item"'), 
 	commands = "add_item 99\nturn_around", 
 	image = "signs_bot_sign_add.png",
 })
@@ -136,7 +131,7 @@ minetest.register_craft({
 
 register_sign({
 	name = "sign_stop", 
-	description = I('Sign "stop"'), 
+	description = S('Sign "stop"'), 
 	commands = "stop", 
 	image = "signs_bot_sign_stop.png",
 })
@@ -153,7 +148,7 @@ minetest.register_craft({
 if minetest.get_modpath("minecart") then
 	register_sign({
 		name = "sign_add_cart", 
-		description = I('Sign "add to cart"'), 
+		description = S('Sign "add to cart"'), 
 		commands = "drop_items 99 1\npunch_cart\nturn_around", 
 		image = "signs_bot_sign_add_cart.png",
 	})
@@ -169,7 +164,7 @@ if minetest.get_modpath("minecart") then
 
 	register_sign({
 		name = "sign_take_cart", 
-		description = I('Sign "take from cart"'), 
+		description = S('Sign "take from cart"'), 
 		commands = "pickup_items 1\npunch_cart\nturn_around", 
 		image = "signs_bot_sign_take_cart.png",
 	})
@@ -186,66 +181,66 @@ end
 
 if minetest.get_modpath("doc") then
 	doc.add_entry("signs_bot", "sign_right", {
-		name = I('Sign "turn right"'),
+		name = S('Sign "turn right"'),
 		data = {
 			item = "signs_bot:sign_right",
-			text = I("The Bot turns right when it detects this sign in front of it.")		
+			text = S("The Bot turns right when it detects this sign in front of it.")		
 		},
 	})
 	doc.add_entry("signs_bot", "sign_left", {
-		name = I('Sign "turn left"'),
+		name = S('Sign "turn left"'),
 		data = {
 			item = "signs_bot:sign_left",
-			text = I("The Bot turns left when it detects this sign in front of it.")		
+			text = S("The Bot turns left when it detects this sign in front of it.")		
 		},
 	})
 	doc.add_entry("signs_bot", "sign_take", {
-		name = I('Sign "take item"'),
+		name = S('Sign "take item"'),
 		data = {
 			item = "signs_bot:sign_take",
 			text = table.concat({
-				I("The Bot takes items out of a chest in front of it and then turns around."),
-				I("This sign has to be placed on top of the chest."), 
+				S("The Bot takes items out of a chest in front of it and then turns around."),
+				S("This sign has to be placed on top of the chest."), 
 			}, "\n")			
 		},
 	})
 	doc.add_entry("signs_bot", "sign_add", {
-		name = I('Sign "add item"'),
+		name = S('Sign "add item"'),
 		data = {
 			item = "signs_bot:sign_add",
 			text = table.concat({
-				I("The Bot puts items into a chest in front of it and then turns around."),
-				I("This sign has to be placed on top of the chest."), 
+				S("The Bot puts items into a chest in front of it and then turns around."),
+				S("This sign has to be placed on top of the chest."), 
 			}, "\n")			
 		},
 	})
 	doc.add_entry("signs_bot", "sign_stop", {
-		name = I('Sign "stop"'),
+		name = S('Sign "stop"'),
 		data = {
 			item = "signs_bot:sign_stop",
-			text = I("The Bot will stop in front of this sign until the sign is removed or the bot is turned off.")		
+			text = S("The Bot will stop in front of this sign until the sign is removed or the bot is turned off.")		
 		},
 	})
 end
 
 if minetest.get_modpath("doc") and minetest.get_modpath("minecart") then
 	doc.add_entry("signs_bot", "sign_add_cart", {
-		name = I('Sign "add to cart"'),
+		name = S('Sign "add to cart"'),
 		data = {
 			item = "signs_bot:sign_add_cart",
 			text = table.concat({
-				I("The Bot puts items into a minecart in front of it, pushes the cart and then turns around."),
-				I("This sign has to be placed on top of the rail at the cart end position."), 
+				S("The Bot puts items into a minecart in front of it, pushes the cart and then turns around."),
+				S("This sign has to be placed on top of the rail at the cart end position."), 
 			}, "\n")			
 		},
 	})
 	doc.add_entry("signs_bot", "sign_take_cart", {
-		name = I('Sign "take from cart"'),
+		name = S('Sign "take from cart"'),
 		data = {
 			item = "signs_bot:sign_take_cart",
 			text = table.concat({
-				I("The Bot takes items out of a minecart in front of it, pushes the cart and then turns around."),
-				I("This sign has to be placed on top of the rail at the cart end position."), 
+				S("The Bot takes items out of a minecart in front of it, pushes the cart and then turns around."),
+				S("This sign has to be placed on top of the rail at the cart end position."), 
 			}, "\n")			
 		},
 	})
diff --git a/signs_bot/techage.lua b/signs_bot/techage.lua
index a97021b..9283b45 100644
--- a/signs_bot/techage.lua
+++ b/signs_bot/techage.lua
@@ -1,6 +1,19 @@
--- Load support for intllib.
-local MP = minetest.get_modpath("signs_bot")
-local S, NS = dofile(MP.."/intllib.lua")
+--[[
+
+	Signs Bot
+	=========
+
+	Copyright (C) 2019-2021 Joachim Stolberg
+
+	GPLv3
+	See LICENSE.txt for more information
+	
+	Signs Bot: Bot Flap
+
+]]--
+
+-- Load support for I18n.
+local S = signs_bot.S
 
 local CYCLE_TIME = 4
 
@@ -10,7 +23,7 @@ if minetest.get_modpath("techage") then
 	local power = techage.power
 	
 	signs_bot.register_inventory({"techage:chest_ta2", "techage:chest_ta3", "techage:chest_ta4",
-			"techage:ta3_silo", "techage:ta4_silo"}, {
+			"techage:ta3_silo", "techage:ta4_silo", "techage:ta4_sensor_chest"}, {
 		allow_inventory_put = function(pos, stack, player_name)
 			return not minetest.is_protected(pos, player_name)
 		end, 
@@ -38,6 +51,40 @@ if minetest.get_modpath("techage") then
 			listname = "dst",
 		},
 	})
+	signs_bot.register_inventory({
+			"techage:ta2_autocrafter_pas", "techage:ta2_autocrafter_act",
+			"techage:ta3_autocrafter_pas", "techage:ta3_autocrafter_act"}, {
+		allow_inventory_put = function(pos, stack, player_name)
+			return not minetest.is_protected(pos, player_name)
+		end, 
+		allow_inventory_take = function(pos, stack, player_name)
+			return not minetest.is_protected(pos, player_name)
+		end, 
+		put = {
+			listname = "src",
+		},
+		take = {
+			listname = "dst",
+		},
+	})
+	signs_bot.register_inventory({
+			"techage:ta2_distributor_pas", "techage:ta2_distributor_act",
+			"techage:ta3_distributor_pas", "techage:ta3_distributor_act",
+			"techage:ta4_distributor_pas", "techage:ta4_distributor_act",
+			"techage:ta4_high_performance_distributor_pas", "techage:ta4_high_performance_distributor_act"}, {
+		allow_inventory_put = function(pos, stack, player_name)
+			return not minetest.is_protected(pos, player_name)
+		end, 
+		allow_inventory_take = function(pos, stack, player_name)
+			return not minetest.is_protected(pos, player_name)
+		end, 
+		put = {
+			listname = "src",
+		},
+		take = {
+			listname = "src",
+		},
+	})
 
 	local function percent_value(max_val, curr_val)
 		return math.min(math.ceil(((curr_val or 0) * 100.0) / (max_val or 1.0)), 100)
@@ -90,16 +137,25 @@ if minetest.get_modpath("techage") then
 		mod = "techage",
 		params = "<receiver> <command>",
 		num_param = 2,
-		description = S("Sends a techage command\nto a given node.\nReceiver is addressed by\nthe techage node number."),
+		description = S([[Sends a techage command
+to a given node. 
+Receiver is addressed by
+the techage node number.
+For commands with two or more 
+words, use the '*' character 
+instead of spaces, e.g.: 
+send_cmnd 3465 pull*default:dirt*2]]),
 		check = function(address, command)
 			address = tonumber(address)
 			return address ~= nil and command ~= nil and command ~= ""
 		end,
 		cmnd = function(base_pos, mem, address, command)
+			command = command:gsub("*", " ")
 			address = tostring(tonumber(address))
 			local meta = minetest.get_meta(base_pos)
 			local number = meta:get_int("number") or 0
-			techage.send_multi(number, address, command)
+			local topic, payload = unpack(string.split(command, " ", false, 1))
+			techage.send_multi(number, address, topic, payload)
 			return signs_bot.DONE
 		end,
 	})
@@ -130,6 +186,10 @@ if minetest.get_modpath("techage") then
 	Cable:add_secondary_node_names({"signs_bot:box"})
 
 	techage.register_node({"signs_bot:box"}, {
+		on_inv_request = function(pos, in_dir, access_type)
+			local meta = minetest.get_meta(pos)
+			return meta:get_inventory(), "main"
+		end,
 		on_pull_item = function(pos, in_dir, num)
 			local meta = minetest.get_meta(pos)
 			local inv = meta:get_inventory()
@@ -165,7 +225,7 @@ if minetest.get_modpath("techage") then
 					elseif mem.capa >= signs_bot.MAX_CAPA then
 						return "stopped"
 					else
-						return "loading"
+						return "charging"
 					end
 				else
 					return "stopped"
@@ -186,6 +246,10 @@ if minetest.get_modpath("techage") then
 		end,
 	})	
 	techage.register_node({"signs_bot:chest"}, {
+		on_inv_request = function(pos, in_dir, access_type)
+			local meta = minetest.get_meta(pos)
+			return meta:get_inventory(), "main"
+		end,
 		on_pull_item = function(pos, in_dir, num)
 			local meta = minetest.get_meta(pos)
 			local inv = meta:get_inventory()
diff --git a/signs_bot/timer.lua b/signs_bot/timer.lua
index db0368f..7a09888 100644
--- a/signs_bot/timer.lua
+++ b/signs_bot/timer.lua
@@ -3,7 +3,7 @@
 	Signs Bot
 	=========
 
-	Copyright (C) 2019 Joachim Stolberg
+	Copyright (C) 2019-2021 Joachim Stolberg
 
 	GPL v3
 	See LICENSE.txt for more information
@@ -13,18 +13,15 @@
 ]]--
 
 -- for lazy programmers
-local S = function(pos) if pos then return minetest.pos_to_string(pos) end end
-local P = minetest.string_to_pos
+local P2S = function(pos) if pos then return minetest.pos_to_string(pos) end end
+local S2P = minetest.string_to_pos
 local M = minetest.get_meta
 
--- Load support for intllib.
-local MP = minetest.get_modpath("signs_bot")
-local I,_ = dofile(MP.."/intllib.lua")
+-- Load support for I18n.
+local S = signs_bot.S
 
 local CYCLE_TIME = 4
 
-local lib = signs_bot.lib
-
 local function update_infotext(pos, dest_pos, cmnd)
 	local meta = M(pos)
 	local mem = tubelib2.get_mem(pos)
@@ -32,11 +29,11 @@ local function update_infotext(pos, dest_pos, cmnd)
 	local cycle_time = meta:get_int("cycle_time")
 	local text
 	if cycle_time > 0 then
-		text = I("Bot Timer").." ("..rest.."/"..cycle_time.." min): "..I("Connected with")
+		text = S("Bot Timer").." ("..rest.."/"..cycle_time.." min): "..S("Connected with")
 	else
-		text = I("Bot Timer").." (-- min): "..I("Connected with")
+		text = S("Bot Timer").." (-- min): "..S("Connected with")
 	end
-	meta:set_string("infotext", text.." "..S(dest_pos).." / "..(cmnd or "none").."    ")
+	meta:set_string("infotext", text.." "..P2S(dest_pos).." / "..(cmnd or "none").."    ")
 end	
 
 local function update_infotext_local(pos)
@@ -50,7 +47,7 @@ local function update_infotext_local(pos)
 	local text2 = "Not connected"
 	
 	if dest_pos ~= "" and signal ~= "" then
-		text2 = I("Connected with").." "..dest_pos.." / "..signal
+		text2 = S("Connected with").." "..dest_pos.." / "..signal
 	end
 	if cycle_time > 0 then
 		text1 = " ("..rest.."/"..cycle_time.." min): "
@@ -59,19 +56,19 @@ local function update_infotext_local(pos)
 		mem.running = true
 		minetest.get_node_timer(pos):start(CYCLE_TIME)
 	end
-	meta:set_string("infotext", I("Bot Timer")..text1..text2.."    ")
+	meta:set_string("infotext", S("Bot Timer")..text1..text2.."    ")
 end	
 
 
 local function formspec(meta)
-	local label = minetest.formspec_escape(I("Cycle time [min]:"))
+	local label = minetest.formspec_escape(S("Cycle time [min]:"))
 	local value = minetest.formspec_escape(meta:get_int("cycle_time"))
 	return "size[4,3]"..
 	default.gui_bg..
 	default.gui_bg_img..
 	default.gui_slots..
 	"field[0.3,1;4,1;time;"..label..";"..value.."]"..
-	"button_exit[1,2.2;2,1;start;"..I("Start").."]"
+	"button_exit[1,2.2;2,1;start;"..S("Start").."]"
 end
 
 -- switch to normal texture
@@ -91,7 +88,7 @@ local function node_timer(pos)
 			local dest_pos = meta:get_string("signal_pos")
 			local signal = meta:get_string("signal_data")
 			if dest_pos ~= "" and signal ~= "" then
-				update_infotext(pos, P(dest_pos), signal)
+				update_infotext(pos, S2P(dest_pos), signal)
 			end
 		end
 	else
@@ -106,7 +103,7 @@ local function node_timer(pos)
 		local dest_pos = meta:get_string("signal_pos")
 		local signal = meta:get_string("signal_data")
 		if dest_pos ~= "" and signal ~= "" then
-			update_infotext(pos, P(dest_pos), signal)
+			update_infotext(pos, S2P(dest_pos), signal)
 		end
 	end
 	return mem.time > 0
@@ -134,7 +131,7 @@ local function on_receive_fields(pos, formname, fields, player)
 end
 
 minetest.register_node("signs_bot:timer", {
-	description = I("Bot Timer"),
+	description = S("Bot Timer"),
 	inventory_image = "signs_bot_timer_inv.png",
 	drawtype = "nodebox",
 	node_box = {
@@ -151,7 +148,7 @@ minetest.register_node("signs_bot:timer", {
 	
 	after_place_node = function(pos, placer)
 		local meta = M(pos)
-		meta:set_string("infotext", "Bot Timer: Not connected")
+		meta:set_string("infotext", S("Bot Timer: Not connected"))
 		meta:set_string("formspec", formspec(meta))
 	end,
 	
@@ -160,6 +157,7 @@ minetest.register_node("signs_bot:timer", {
 	update_infotext = update_infotext,
 	on_rotate = screwdriver.disallow,
 	paramtype = "light",
+	use_texture_alpha = signs_bot.CLIP,
 	sunlight_propagates = true,
 	paramtype2 = "facedir",
 	is_ground_content = false,
@@ -168,7 +166,7 @@ minetest.register_node("signs_bot:timer", {
 })
 
 minetest.register_node("signs_bot:timer_on", {
-	description = I("Bot Timer"),
+	description = S("Bot Timer"),
 	drawtype = "nodebox",
 	node_box = {
 		type = "fixed",
@@ -186,6 +184,7 @@ minetest.register_node("signs_bot:timer_on", {
 	update_infotext = update_infotext,
 	on_rotate = screwdriver.disallow,
 	paramtype = "light",
+	use_texture_alpha = signs_bot.CLIP,
 	sunlight_propagates = true,
 	paramtype2 = "facedir",
 	is_ground_content = false,
@@ -218,12 +217,12 @@ minetest.register_lbm({
 
 if minetest.get_modpath("doc") then
 	doc.add_entry("signs_bot", "timer", {
-		name = I("Bot Timer"),
+		name = S("Bot Timer"),
 		data = {
 			item = "signs_bot:timer",
 			text = table.concat({
-				I("Special kind of sensor."),
-				I("Can be programmed with a time in seconds, e.g. to start the bot cyclically."), 
+				S("Special kind of sensor."),
+				S("Can be programmed with a time in seconds, e.g. to start the bot cyclically."), 
 			}, "\n")		
 		},
 	})
diff --git a/signs_bot/tool.lua b/signs_bot/tool.lua
index 92161be..6a75214 100644
--- a/signs_bot/tool.lua
+++ b/signs_bot/tool.lua
@@ -3,7 +3,7 @@
 	Signs Bot
 	=========
 
-	Copyright (C) 2019 Joachim Stolberg
+	Copyright (C) 2019-2021 Joachim Stolberg
 
 	GPL v3
 	See LICENSE.txt for more information
@@ -12,14 +12,8 @@
 
 ]]--
 
--- for lazy programmers
-local S = function(pos) if pos then return minetest.pos_to_string(pos) end end
-local P = minetest.string_to_pos
-local M = minetest.get_meta
-
--- Load support for intllib.
-local MP = minetest.get_modpath("signs_bot")
-local I,_ = dofile(MP.."/intllib.lua")
+-- Load support for I18n.
+local S = signs_bot.S
 
 local lib = signs_bot.lib
 
@@ -30,21 +24,23 @@ local function get_current_data(pointed_thing)
 end
 
 local function get_stored_data(placer)
-	local spos = placer:get_attribute("signs_bot_spos")
-	local name = placer:get_attribute("signs_bot_name")
+	local meta = placer:get_meta()
+	local spos = meta:get_string("signs_bot_spos")
+	local name = meta:get_string("signs_bot_name")
 	if spos ~= "" then
 		return minetest.string_to_pos(spos), name
 	end
 end
 	
 local function store_data(placer, pos, name)
+	local meta = placer:get_meta()
 	if pos then
 		local spos = minetest.pos_to_string(pos)
-		placer:set_attribute("signs_bot_spos", spos)
-		placer:set_attribute("signs_bot_name", name)
+		meta:set_string("signs_bot_spos", spos)
+		meta:set_string("signs_bot_name", name)
 	else
-		placer:set_attribute("signs_bot_spos", nil)
-		placer:set_attribute("signs_bot_name", nil)
+		meta:set_string("signs_bot_spos", nil)
+		meta:set_string("signs_bot_name", nil)
 	end
 end
 
@@ -95,7 +91,7 @@ end
 			
 
 minetest.register_node("signs_bot:connector", {
-	description = I("Sensor Connection Tool"),
+	description = S("Sensor Connection Tool"),
 	inventory_image = "signs_bot_tool.png",
 	wield_image = "signs_bot_tool.png",
 	groups = {cracky=1, book=1},
diff --git a/techage/README.md b/techage/README.md
index bcd12ac..bc6eef2 100644
--- a/techage/README.md
+++ b/techage/README.md
@@ -27,7 +27,7 @@ In contrast to TechPack, the resources are more limited and it is much more diff
 
 
 ### License
-Copyright (C) 2019-2020 Joachim Stolberg  
+Copyright (C) 2019-2021 Joachim Stolberg
 Code: Licensed under the GNU AGPL version 3 or later. See LICENSE.txt  
 Textures: CC BY-SA 3.0
 
@@ -77,6 +77,16 @@ Available worlds will be converted to 'lsqlite3', but there is no way back, so:
 
 ### History
 
+**2021-05-14  V0.25**
+- Add concentrator tubes
+- Add ta4 cable wall entry
+- Pull request #57: Distributor improvements (from Thomas-S)
+- Add new power terminal commands
+- Add new door controller
+- Add laser beam nodes for energy transfer
+- Add TA4 recycle machine
+- Many improvements and bug fixes
+
 **2020-11-01  V0.25**
 - Pull request #37: Trowel: Add protection support (from Thomas-S)
 - Pull request #38: Charcoal Pile: Ignore "ignore" nodes (from Thomas-S)
diff --git a/techage/basic_machines/autocrafter.lua b/techage/basic_machines/autocrafter.lua
index 9bfc575..b8d29ee 100644
--- a/techage/basic_machines/autocrafter.lua
+++ b/techage/basic_machines/autocrafter.lua
@@ -347,6 +347,14 @@ tiles.act = {
 }
 
 local tubing = {
+	on_inv_request = function(pos, in_dir, access_type)
+		if access_type == "push" then
+			local meta = minetest.get_meta(pos)
+			if meta:get_int("push_dir") == in_dir or in_dir == 5 then
+				return meta:get_inventory(), "src"
+			end
+		end
+	end,
 	on_pull_item = function(pos, in_dir, num)
 		local meta = minetest.get_meta(pos)
 		if meta:get_int("pull_dir") == in_dir then
@@ -372,6 +380,9 @@ local tubing = {
 	on_recv_message = function(pos, src, topic, payload)
 		return CRD(pos).State:on_receive_message(pos, topic, payload)
 	end,
+	on_node_load = function(pos)
+		CRD(pos).State:on_node_load(pos)
+	end,
 }
 
 local node_name_ta2, node_name_ta3, node_name_ta4 = 
diff --git a/techage/basic_machines/chest.lua b/techage/basic_machines/chest.lua
index 6d5837f..fd1882c 100644
--- a/techage/basic_machines/chest.lua
+++ b/techage/basic_machines/chest.lua
@@ -149,6 +149,10 @@ minetest.register_node("techage:chest_ta3", {
 })
 
 techage.register_node({"techage:chest_ta2", "techage:chest_ta3"}, {
+	on_inv_request = function(pos, in_dir, access_type)
+		local meta = minetest.get_meta(pos)
+		return meta:get_inventory(), "main"
+	end,
 	on_pull_item = function(pos, in_dir, num, item_name)
 		local meta = minetest.get_meta(pos)
 		local inv = meta:get_inventory()
@@ -332,6 +336,10 @@ minetest.register_node("techage:chest_ta4", {
 
 
 techage.register_node({"techage:chest_ta4"}, {
+	on_inv_request = function(pos, in_dir, access_type)
+		local meta = minetest.get_meta(pos)
+		return meta:get_inventory(), "main"
+	end,
 	on_pull_item = function(pos, in_dir, num, item_name)
 		local meta = minetest.get_meta(pos)
 		local inv = meta:get_inventory()
diff --git a/techage/basic_machines/concentrator.lua b/techage/basic_machines/concentrator.lua
new file mode 100644
index 0000000..2843c57
--- /dev/null
+++ b/techage/basic_machines/concentrator.lua
@@ -0,0 +1,125 @@
+--[[
+
+	TechAge
+	=======
+
+	Copyright (C) 2019-2021 Joachim Stolberg
+
+	AGPL v3
+	See LICENSE.txt for more information
+
+	Tube Concentrator
+
+]]--
+
+-- for lazy programmers
+local M = minetest.get_meta
+local S = techage.S
+
+local networks = techage.networks
+local Tube = techage.Tube
+
+local size = 2/8
+local Boxes = {
+	{{-size, -size,  size, size, size, 0.5 }}, -- z+
+	{{-size, -size, -size, 0.5,  size, size}}, -- x+
+	{{-size, -size, -0.5,  size, size, size}}, -- z-
+	{{-0.5,  -size, -size, size, size, size}}, -- x-
+	{{-size, -0.5,  -size, size, size, size}}, -- y-
+	{{-size, -size, -size, size, 0.5,  size}}, -- y+
+}
+
+local names = techage.register_junction("techage:concentrator", 2/8, Boxes, Tube, {
+	description = S("Tube Concentrator"),
+	tiles = {
+		"techage_tube_junction.png^techage_appl_arrow2.png^[transformR270",
+		"techage_tube_junction.png^techage_appl_arrow2.png^[transformR270",
+		"techage_tube_junction.png^techage_tube_hole.png",
+		"techage_tube_junction.png",
+		"techage_tube_junction.png^techage_appl_arrow2.png^[transformR90",
+		"techage_tube_junction.png^techage_appl_arrow2.png^[transformR270",
+	},
+	paramtype2 = "facedir", -- important!
+	groups = {snappy = 2, choppy = 2, oddly_breakable_by_hand = 3, techage_trowel = 1},
+	sounds = default.node_sound_defaults(),
+
+	after_place_node = function(pos, placer, itemstack, pointed_thing)
+		local node = minetest.get_node(pos)
+		local name = "techage:concentrator"..techage.junction_type(pos, Tube, "R", node.param2)
+		minetest.swap_node(pos, {name = name, param2 = node.param2})
+		M(pos):set_int("push_dir", techage.side_to_outdir("R", node.param2))
+		Tube:after_place_node(pos)
+	end,
+	tubelib2_on_update2 = function(pos, dir1, tlib2, node)
+		local name = "techage:concentrator"..techage.junction_type(pos, Tube, "R", node.param2)
+		minetest.swap_node(pos, {name = name, param2 = node.param2})
+	end,
+	after_dig_node = function(pos, oldnode, oldmetadata, digger)
+		Tube:after_dig_node(pos)
+	end,
+}, 27)
+
+techage.register_node(names, {
+	on_push_item = function(pos, in_dir, stack)
+		local push_dir = M(pos):get_int("push_dir")
+		return techage.push_items(pos, push_dir, stack)
+	end,
+	is_pusher = true,  -- is a pulling/pushing node
+})	
+
+names = techage.register_junction("techage:ta4_concentrator", 2/8, Boxes, Tube, {
+	description = S("TA4 Tube Concentrator"),
+	tiles = {
+		"techage_tubeta4_junction.png^techage_appl_arrow2.png^[transformR270",
+		"techage_tubeta4_junction.png^techage_appl_arrow2.png^[transformR270",
+		"techage_tubeta4_junction.png^techage_tube_hole.png",
+		"techage_tubeta4_junction.png",
+		"techage_tubeta4_junction.png^techage_appl_arrow2.png^[transformR90",
+		"techage_tubeta4_junction.png^techage_appl_arrow2.png^[transformR270",
+	},
+	paramtype2 = "facedir", -- important!
+	groups = {snappy = 2, choppy = 2, oddly_breakable_by_hand = 3, techage_trowel = 1},
+	sounds = default.node_sound_defaults(),
+
+	after_place_node = function(pos, placer, itemstack, pointed_thing)
+		local node = minetest.get_node(pos)
+		local name = "techage:ta4_concentrator"..techage.junction_type(pos, Tube, "R", node.param2)
+		minetest.swap_node(pos, {name = name, param2 = node.param2})
+		M(pos):set_int("push_dir", techage.side_to_outdir("R", node.param2))
+		Tube:after_place_node(pos)
+	end,
+	tubelib2_on_update2 = function(pos, dir1, tlib2, node)
+		local name = "techage:ta4_concentrator"..techage.junction_type(pos, Tube, "R", node.param2)
+		minetest.swap_node(pos, {name = name, param2 = node.param2})
+	end,
+	after_dig_node = function(pos, oldnode, oldmetadata, digger)
+		Tube:after_dig_node(pos)
+	end,
+}, 27)
+
+techage.register_node(names, {
+	on_push_item = function(pos, in_dir, stack)
+		local push_dir = M(pos):get_int("push_dir")
+		return techage.push_items(pos, push_dir, stack)
+	end,
+	is_pusher = true,  -- is a pulling/pushing node
+})	
+
+
+minetest.register_craft({
+	output = "techage:concentrator27",
+	recipe = {
+		{"", "techage:tubeS", ""},
+		{"techage:tubeS", "", "techage:tubeS"},
+		{"", "techage:tubeS", ""},
+	},
+})
+
+minetest.register_craft({
+	output = "techage:ta4_concentrator27",
+	recipe = {
+		{"", "techage:ta4_tubeS", ""},
+		{"techage:ta4_tubeS", "", "techage:ta4_tubeS"},
+		{"", "techage:ta4_tubeS", ""},
+	},
+})
diff --git a/techage/basic_machines/consumer.lua b/techage/basic_machines/consumer.lua
index 0953017..eb6a623 100644
--- a/techage/basic_machines/consumer.lua
+++ b/techage/basic_machines/consumer.lua
@@ -89,23 +89,19 @@ end
 
 -- 'validStates' is optional and can be used to e.g. enable 
 -- only one TA2 node {false, true, false, false}
-function techage.register_consumer(base_name, inv_name, tiles, tNode, validStates)
+function techage.register_consumer(base_name, inv_name, tiles, tNode, validStates, node_name_prefix)
 	local names = {}
 	validStates = validStates or {true, true, true, true}
+	if not node_name_prefix then
+		node_name_prefix = "techage:ta"
+	end
 	for stage = 2,4 do
-		local name_pas = "techage:ta"..stage.."_"..base_name.."_pas"
-		local name_act = "techage:ta"..stage.."_"..base_name.."_act"
+		local name_pas = node_name_prefix..stage.."_"..base_name.."_pas"
+		local name_act = node_name_prefix..stage.."_"..base_name.."_act"
 		local name_inv = "TA"..stage.." "..inv_name
 		names[#names+1] = name_pas
 
 		if validStates[stage] then
-			local on_recv_message = tNode.tubing.on_recv_message
-			if stage > 2 then
-				on_recv_message = function(pos, src, topic, payload)
-					return "unsupported"
-				end
-			end
-
 			local power_network
 			local power_png = 'techage_axle_clutch.png'
 			local power_used = tNode.power_consumption ~= nil
@@ -215,7 +211,7 @@ function techage.register_consumer(base_name, inv_name, tiles, tNode, validState
 			
 			tNode.groups.not_in_creative_inventory = 0
 
-			minetest.register_node(name_pas, {
+			local def_pas = {
 				description = name_inv,
 				tiles = prepare_tiles(tiles.pas, stage, power_png),
 				consumer = tConsumer,
@@ -246,18 +242,27 @@ function techage.register_consumer(base_name, inv_name, tiles, tNode, validState
 				groups = table.copy(tNode.groups),
 				is_ground_content = false,
 				sounds = tNode.sounds,
-			})
+			}
+
+			-- Copy custom properties (starting with an underscore)
+			for k,v in pairs(tNode) do
+				if string.sub(k, 1, 1) == "_" then
+					def_pas[k] = v
+				end
+			end
+
+			minetest.register_node(name_pas, def_pas)
 
 			tNode.groups.not_in_creative_inventory = 1
-			
-			minetest.register_node(name_act, {
+
+			local def_act = {
 				description = name_inv,
 				tiles = prepare_tiles(tiles.act, stage, power_png),
 				consumer = tConsumer,
 				drawtype = tNode.drawtype,
 				node_box = tNode.node_box,
 				selection_box = tNode.selection_box,
-				
+
 				on_rotate = tNode.on_rotate or screwdriver.disallow,
 				on_timer = node_timer,
 				on_receive_fields = tNode.on_receive_fields,
@@ -280,7 +285,16 @@ function techage.register_consumer(base_name, inv_name, tiles, tNode, validState
 				groups = table.copy(tNode.groups),
 				is_ground_content = false,
 				sounds = tNode.sounds,
-			})
+			}
+
+			-- Copy custom properties (starting with an underscore)
+			for k,v in pairs(tNode) do
+				if string.sub(k, 1, 1) == "_" then
+					def_act[k] = v
+				end
+			end
+			
+			minetest.register_node(name_act, def_act)
 
 			if power_used then
 				power_network:add_secondary_node_names({name_pas, name_act})
diff --git a/techage/basic_machines/distributor.lua b/techage/basic_machines/distributor.lua
index 3db44c3..339dd0a 100644
--- a/techage/basic_machines/distributor.lua
+++ b/techage/basic_machines/distributor.lua
@@ -26,6 +26,8 @@ local SRC_INV_SIZE = 8
 local STANDBY_TICKS = 3
 local COUNTDOWN_TICKS = 4
 local CYCLE_TIME = 4
+local FILTER_ITEM_LIMIT_PER_STACK = 12
+local FILTER_ITEM_LIMIT = 36
 
 local INFO = [[Turn port on/off or read its state: command = 'port', payload = red/green/blue/yellow{=on/off}]]
 
@@ -35,19 +37,6 @@ local SlotColors = {"red", "green", "blue", "yellow"}
 local Num2Ascii = {"B", "L", "F", "R"} 
 local FilterCache = {} -- local cache for filter settings
 
--- Permutation table to improve distribution between ports (number of ports: 1-4)
--- Usage: permIdx[num_ports][math.random(1, #permIdx[num_ports])][idx]
-local permIdx = {
-	{ { 1 } },
-	{ { 1, 2 }, { 2, 1 } },
-	{ { 1, 2, 3 }, { 1, 3, 2 }, { 2, 1, 3 }, { 2, 3, 1 }, { 3, 1, 2 }, { 3, 2, 1 } },
-	{ { 1, 2, 3, 4 }, { 1, 2, 4, 3 }, { 1, 3, 2, 4 }, { 1, 3, 4, 2 }, { 1, 4, 2, 3 },
-	  { 1, 4, 3, 2 }, { 2, 1, 3, 4 }, { 2, 1, 4, 3 }, { 2, 3, 1, 4 }, { 2, 3, 4, 1 },
-	  { 2, 4, 1, 3 }, { 2, 4, 3, 1 }, { 3, 1, 2, 4 }, { 3, 1, 4, 2 }, { 3, 2, 1, 4 },
-	  { 3, 2, 4, 1 }, { 3, 4, 1, 2 }, { 3, 4, 2, 1 }, { 4, 1, 2, 3 }, { 4, 1, 3, 2 },
-	  { 4, 2, 1, 3 }, { 4, 2, 3, 1 }, { 4, 3, 1, 2 }, { 4, 3, 2, 1 }, }
-}
-
 local function filter_settings(pos)
 	local meta = M(pos)
 	local param2 = techage.get_node_lvm(pos).param2
@@ -55,6 +44,8 @@ local function filter_settings(pos)
 	local filter = minetest.deserialize(meta:get_string("filter")) or {false,false,false,false}
 	local ItemFilter = {}  -- {<item:name> = {dir,...}]
 	local OpenPorts = {}  -- {dir, ...}
+	local counter = 0 -- counts total item number in filter configuration
+
 	-- collect all filter settings
 	for idx,slot in ipairs(SlotColors) do
 		if filter[idx] == true then
@@ -69,7 +60,13 @@ local function filter_settings(pos)
 						if not ItemFilter[name] then
 							ItemFilter[name] = {}
 						end
-						table.insert(ItemFilter[name], out_dir)
+						for _ = 1, math.min(FILTER_ITEM_LIMIT_PER_STACK, stack:get_count()) do
+							if counter > FILTER_ITEM_LIMIT then
+								break
+							end
+							table.insert(ItemFilter[name], out_dir)
+							counter = counter + 1
+						end
 					end
 				end
 			end
@@ -171,6 +168,20 @@ local function formspec(self, pos, nvm)
 	end
 end
 
+local function get_total_filter_items_number(pos, except_listname, except_index)
+	local inv = M(pos):get_inventory()
+	local total = 0
+	for _, listname in ipairs(SlotColors) do
+		local list = inv:get_list(listname)
+		for idx, stack in ipairs(list) do
+			if not (listname == except_listname and idx == except_index) then
+				total = total + stack:get_count()
+			end
+		end
+	end
+	return total
+end
+
 local function allow_metadata_inventory_put(pos, listname, index, stack, player)
 	local inv = M(pos):get_inventory()
 	local list = inv:get_list(listname)
@@ -181,8 +192,10 @@ local function allow_metadata_inventory_put(pos, listname, index, stack, player)
 	if listname == "src" then
 		CRD(pos).State:start_if_standby(pos)
 		return stack:get_count()
-	elseif list[index]:get_count() == 0 then
-		stack:set_count(1)
+	else
+		stack:add_item(list[index])
+		local max_items_to_limit = FILTER_ITEM_LIMIT - get_total_filter_items_number(pos, listname, index)
+		stack:set_count(math.min(FILTER_ITEM_LIMIT_PER_STACK, stack:get_count(), max_items_to_limit))
 		inv:set_stack(listname, index, stack)
 		return 0
 	end
@@ -197,7 +210,9 @@ local function allow_metadata_inventory_take(pos, listname, index, stack, player
 		return stack:get_count()
 	else
 		local inv = M(pos):get_inventory()
-		inv:set_stack(listname, index, nil)
+		local list = inv:get_list(listname)
+		list[index]:take_item(stack:get_count())
+		inv:set_stack(listname, index, list[index])
 		return 0
 	end
 end
@@ -209,17 +224,19 @@ local function allow_metadata_inventory_move(pos, from_list, from_index, to_list
 	local inv = minetest.get_meta(pos):get_inventory()
 	local stack = inv:get_stack(from_list, from_index)
 
-	if from_list == "src" and to_list ~= "src" and not inv:contains_item(to_list, {name = stack:get_name()}) then
-		stack:set_count(1)
+	if from_list == "src" and to_list ~= "src" then
+		stack:add_item(inv:get_stack(to_list, to_index))
+		local max_items_to_limit = FILTER_ITEM_LIMIT - get_total_filter_items_number(pos, to_list, to_index)
+		stack:set_count(math.min(FILTER_ITEM_LIMIT_PER_STACK, stack:get_count(), max_items_to_limit))
 		inv:set_stack(to_list, to_index, stack)
 		return 0
 	elseif from_list ~= "src" and to_list == "src" then
 		inv:set_stack(from_list, from_index, nil)
 		return 0
-	elseif not inv:contains_item(to_list, {name = stack:get_name()}) then
-		return 1
+	elseif from_list ~= "src" and to_list ~= "src" then
+		return math.min(stack:get_count(), FILTER_ITEM_LIMIT_PER_STACK - inv:get_stack(to_list, to_index):get_count())
 	else
-		return 0
+		return stack:get_count()
 	end
 end
 
@@ -240,17 +257,24 @@ local function tubelib2_on_update2(pos, outdir, tlib2, node)
 	end
 end
 
-local function push_item(pos, filter, itemstack, num_items, nvm)
+local function shuffle(list)
+	for i = #list, 2, -1 do
+		local j = math.random(i)
+		list[i], list[j] = list[j], list[i]
+	end
+	return list
+end
+
+local function push_item(pos, base_filter, itemstack, num_items, nvm)
+	local filter = shuffle(table.copy(base_filter))
 	local idx = 1
 	local num_pushed = 0
 	local num_ports = #filter
-	num_ports = techage.in_range(num_ports, 1, 4)
-	local randidx = permIdx[num_ports][math.random(1, #permIdx[num_ports])]
 	local amount = math.floor(math.max((num_items + 1) / num_ports, 1))
 	local num_of_trials = 0
 	while num_pushed < num_items and num_of_trials <= 8 do
 		num_of_trials = num_of_trials + 1
-		local push_dir = filter[randidx[idx]]
+		local push_dir = filter[idx]
 		local num_to_push = math.min(amount, num_items - num_pushed)
 		if techage.push_items(pos, push_dir, itemstack:peek_item(num_to_push)) then
 			num_pushed = num_pushed + num_to_push
@@ -282,11 +306,12 @@ local function distributing(pos, inv, crd, nvm)
 		local num_items = stack:get_count()
 		local num_to_push = math.min((nvm.num_items or crd.num_items) - sum_num_pushed, num_items)
 		local stack_to_push = stack:peek_item(num_to_push)
+		local filter = item_filter[item_name]
 		num_pushed = 0
 		
-		if item_filter[item_name] then
+		if filter and #filter > 0 then
 			-- Push items based on filter
-			num_pushed = push_item(pos, item_filter[item_name], stack_to_push, num_to_push, nvm)
+			num_pushed = push_item(pos, filter, stack_to_push, num_to_push, nvm)
 		elseif blocking_mode and #open_ports > 0 then
 			-- Push items based on open ports
 			num_pushed = push_item(pos, open_ports, stack_to_push, num_to_push, nvm)
@@ -453,7 +478,6 @@ local tubing = {
 			return CRD(pos).State:on_receive_message(pos, topic, payload)
 		end
 	end,
-	
 	on_node_load = function(pos)
 		CRD(pos).State:on_node_load(pos)
 	end,
diff --git a/techage/basic_machines/electronic_fab.lua b/techage/basic_machines/electronic_fab.lua
index d5f962d..b73318f 100644
--- a/techage/basic_machines/electronic_fab.lua
+++ b/techage/basic_machines/electronic_fab.lua
@@ -171,6 +171,14 @@ tiles.act = {
 }
 
 local tubing = {
+	on_inv_request = function(pos, in_dir, access_type)
+		if access_type == "push" then
+			local meta = minetest.get_meta(pos)
+			if meta:get_int("push_dir") == in_dir or in_dir == 5 then
+				return meta:get_inventory(), "src"
+			end
+		end
+	end,
 	on_pull_item = function(pos, in_dir, num)
 		local meta = minetest.get_meta(pos)
 		if meta:get_int("pull_dir") == in_dir then
@@ -196,6 +204,9 @@ local tubing = {
 	on_recv_message = function(pos, src, topic, payload)
 		return CRD(pos).State:on_receive_message(pos, topic, payload)
 	end,
+	on_node_load = function(pos)
+		CRD(pos).State:on_node_load(pos)
+	end,
 }
 
 local node_name_ta2, node_name_ta3, node_name_ta4 = 
diff --git a/techage/basic_machines/forceload.lua b/techage/basic_machines/forceload.lua
index fe1b7bf..fdbde0c 100644
--- a/techage/basic_machines/forceload.lua
+++ b/techage/basic_machines/forceload.lua
@@ -61,29 +61,34 @@ local function postload_area(pos)
 end
 	
 local function add_pos(pos, player)
-	local lPos = minetest.deserialize(player:get_attribute("techage_forceload_blocks")) or {}
+	local meta = player:get_meta()
+	local lPos = minetest.deserialize(meta:get_string("techage_forceload_blocks")) or {}
 	if not in_list(lPos, pos) and (#lPos < techage.max_num_forceload_blocks or
 				creative and creative.is_enabled_for and 
 				creative.is_enabled_for(player:get_player_name())) then
 		lPos[#lPos+1] = pos
-		player:set_attribute("techage_forceload_blocks", minetest.serialize(lPos))
+		local meta = player:get_meta()
+		meta:set_string("techage_forceload_blocks", minetest.serialize(lPos))
 		return true
 	end
 	return false
 end
 	
 local function del_pos(pos, player)
-	local lPos = minetest.deserialize(player:get_attribute("techage_forceload_blocks")) or {}
+	local meta = player:get_meta()
+	local lPos = minetest.deserialize(meta:get_string("techage_forceload_blocks")) or {}
 	lPos = remove_list_elem(lPos, pos)
-	player:set_attribute("techage_forceload_blocks", minetest.serialize(lPos))
+	meta:set_string("techage_forceload_blocks", minetest.serialize(lPos))
 end
 
 local function get_pos_list(player)
-	return minetest.deserialize(player:get_attribute("techage_forceload_blocks")) or {}
+	local meta = player:get_meta()
+	return minetest.deserialize(meta:get_string("techage_forceload_blocks")) or {}
 end
 
 local function set_pos_list(player, lPos)
-	player:set_attribute("techage_forceload_blocks", minetest.serialize(lPos))
+	local meta = player:get_meta()
+	meta:set_string("techage_forceload_blocks", minetest.serialize(lPos))
 end
 
 local function shoe_flbs(pos, name, range)
@@ -98,7 +103,8 @@ end
 
 local function get_data(pos, player)
 	local pos1, pos2 = calc_area(pos)
-	local num = #minetest.deserialize(player:get_attribute("techage_forceload_blocks")) or 0
+	local meta = player:get_meta()
+	local num = #minetest.deserialize(meta:get_string("techage_forceload_blocks")) or 0
 	local max = techage.max_num_forceload_blocks
 	return pos1, pos2, num, max
 end
@@ -200,6 +206,7 @@ minetest.register_node("techage:forceload", {
 	paramtype = "light",
 	sunlight_propagates = true,
 	groups = {choppy=2, cracky=2, crumbly=2, 
+		digtron_protected = 1,
 		not_in_creative_inventory = techage.max_num_forceload_blocks == 0 and 1 or 0},
 	is_ground_content = false,
 	sounds = default.node_sound_wood_defaults(),
diff --git a/techage/basic_machines/gravelrinser.lua b/techage/basic_machines/gravelrinser.lua
index e8786e3..77b853f 100644
--- a/techage/basic_machines/gravelrinser.lua
+++ b/techage/basic_machines/gravelrinser.lua
@@ -129,6 +129,15 @@ local function get_random_gravel_ore()
 	end
 end
 
+local function remove_objects(pos)
+	for _, object in pairs(minetest.get_objects_inside_radius(pos, 1)) do
+		local lua_entity = object:get_luaentity()
+		if not object:is_player() and lua_entity and lua_entity.name == "__builtin:item" then
+			object:remove()
+		end
+	end
+end
+
 local function washing(pos, crd, nvm, inv)
 	-- for testing purposes
 	if inv:contains_item("src", ItemStack("default:stick")) then
@@ -163,7 +172,6 @@ local function keep_running(pos, elapsed)
 	local crd = CRD(pos)
 	local inv = M(pos):get_inventory()
 	washing(pos, crd, nvm, inv)
-	return crd.State:is_active(nvm)
 end
 
 local function on_receive_fields(pos, formname, fields, player)
@@ -240,6 +248,10 @@ local tubing = {
 	on_recv_message = function(pos, src, topic, payload)
 		return CRD(pos).State:on_receive_message(pos, topic, payload)
 	end,
+	on_node_load = function(pos)
+		remove_objects({x=pos.x, y=pos.y+1, z=pos.z})
+		CRD(pos).State:on_node_load(pos)
+	end,
 }
 
 local node_name_ta2, node_name_ta3, node_name_ta4 = 
@@ -321,26 +333,6 @@ function techage.add_rinser_recipe(recipe)
 	end
 end	
 
-local function remove_objects(pos)
-	for _, object in pairs(minetest.get_objects_inside_radius(pos, 1)) do
-		local lua_entity = object:get_luaentity()
-		if not object:is_player() and lua_entity and lua_entity.name == "__builtin:item" then
-			object:remove()
-		end
-	end
-end
-
-minetest.register_lbm({
-	label = "[techage] Rinser update",
-	name = "techage:rinser_update",
-	nodenames = {"techage:ta2_rinser_act", "techage:ta3_rinser_act"},
-	run_at_every_load = true,
-	action = function(pos, node)
-		remove_objects({x=pos.x, y=pos.y+1, z=pos.z})
-	end
-})
-
-
 techage.add_rinser_recipe({input="techage:sieved_gravel", output="techage:usmium_nuggets", probability=30})
 techage.add_rinser_recipe({input="techage:sieved_gravel", output="default:copper_lump", probability=15})
 
diff --git a/techage/basic_machines/gravelsieve.lua b/techage/basic_machines/gravelsieve.lua
index 6f307c5..6c2a340 100644
--- a/techage/basic_machines/gravelsieve.lua
+++ b/techage/basic_machines/gravelsieve.lua
@@ -175,6 +175,9 @@ local tubing = {
 	on_recv_message = function(pos, src, topic, payload)
 		return CRD(pos).State:on_receive_message(pos, topic, payload)
 	end,
+	on_node_load = function(pos)
+		CRD(pos).State:on_node_load(pos)
+	end,
 }
 
 local node_name_ta2, node_name_ta3, node_name_ta4 = 
diff --git a/techage/basic_machines/grinder.lua b/techage/basic_machines/grinder.lua
index c406ba2..53a3b7b 100644
--- a/techage/basic_machines/grinder.lua
+++ b/techage/basic_machines/grinder.lua
@@ -73,10 +73,22 @@ local function allow_metadata_inventory_take(pos, listname, index, stack, player
 	return stack:get_count()
 end
 
-local function src_to_dst(src_stack, idx, num_items, inv, dst_name) 
-	local taken = src_stack:take_item(num_items)
-	local output = ItemStack(dst_name)
-	output:set_count(output:get_count() * taken:get_count())
+-- Grinder normaly handles 'num_items' per cycle. 'num_items' is node stage dependent.
+-- But if 'inp_num' > 1 (wheat recipes), use 'inp_num'  and produce one output item.
+local function src_to_dst(src_stack, idx, num_items, inp_num, inv, dst_name, num_input)
+	local taken, output
+	if inp_num > 1 then
+		if src_stack:get_count() >= inp_num then
+			taken = src_stack:take_item(inp_num)
+			output = ItemStack(dst_name)
+		else
+			return false
+		end
+	else
+		taken = src_stack:take_item(num_items)
+		output = ItemStack(dst_name)
+		output:set_count(output:get_count() * taken:get_count())
+	end
 	if inv:room_for_item("dst", output) then
 		inv:set_stack("src", idx, src_stack)
 		inv:add_item("dst", output)
@@ -91,7 +103,8 @@ local function grinding(pos, crd, nvm, inv)
 		if not stack:is_empty() then
 			local name = stack:get_name()
 			if Recipes[name] then
-				if src_to_dst(stack, idx, crd.num_items, inv, Recipes[name]) then
+				local recipe = Recipes[name]
+				if src_to_dst(stack, idx, crd.num_items, recipe.inp_num, inv, recipe.output) then
 					crd.State:keep_running(pos, nvm, COUNTDOWN_TICKS)
 				else
 					crd.State:blocked(pos, nvm)
@@ -186,6 +199,9 @@ local tubing = {
 	on_recv_message = function(pos, src, topic, payload)
 		return CRD(pos).State:on_receive_message(pos, topic, payload)
 	end,
+	on_node_load = function(pos)
+		CRD(pos).State:on_node_load(pos)
+	end,
 }
 
 local node_name_ta2, node_name_ta3, node_name_ta4 = 
@@ -264,7 +280,9 @@ if minetest.global_exists("unified_inventory") then
 end
 
 function techage.add_grinder_recipe(recipe)
-	Recipes[recipe.input] =  recipe.output
+	local name, num = unpack(string.split(recipe.input, " ", false, 1))
+	Recipes[name] = {input = name,inp_num = tonumber(num) or 1, output = recipe.output}
+	
 	if minetest.global_exists("unified_inventory") then
 		recipe.items = {recipe.input}
 		recipe.type = "grinding"
@@ -299,3 +317,16 @@ techage.add_grinder_recipe({input="default:jungletree", output="default:junglele
 techage.add_grinder_recipe({input="default:pine_tree", output="default:pine_needles 8"})
 techage.add_grinder_recipe({input="default:acacia_tree", output="default:acacia_leaves 8"})
 techage.add_grinder_recipe({input="default:aspen_tree", output="default:aspen_leaves 8"})
+
+if minetest.global_exists("farming") then
+	techage.add_grinder_recipe({input="farming:wheat 3", output="farming:flour"})
+	techage.add_grinder_recipe({input="farming:seed_wheat 6", output="farming:flour"})
+	techage.add_grinder_recipe({input="farming:barley 3", output="farming:flour"})
+	techage.add_grinder_recipe({input="farming:seed_barley 6", output="farming:flour"})
+	techage.add_grinder_recipe({input="farming:rye 3", output="farming:flour"})
+	techage.add_grinder_recipe({input="farming:seed_rye 6", output="farming:flour"})
+	techage.add_grinder_recipe({input="farming:rice 3", output="farming:rice_flour"})
+	techage.add_grinder_recipe({input="farming:seed_rice 6", output="farming:rice_flour"})
+	techage.add_grinder_recipe({input="farming:oat 3", output="farming:flour"})
+	techage.add_grinder_recipe({input="farming:seed_oat 6", output="farming:flour"})
+end
diff --git a/techage/basic_machines/legacy_nodes.lua b/techage/basic_machines/legacy_nodes.lua
index 7187257..b87ebf3 100644
--- a/techage/basic_machines/legacy_nodes.lua
+++ b/techage/basic_machines/legacy_nodes.lua
@@ -30,6 +30,10 @@ end
 		
 
 techage.register_node({"default:chest", "default:chest_open"}, {
+	on_inv_request = function(pos, in_dir, access_type)
+		local meta = minetest.get_meta(pos)
+		return meta:get_inventory(), "main"
+	end,
 	on_pull_item = function(pos, in_dir, num)
 		local meta = minetest.get_meta(pos)
 		local inv = meta:get_inventory()
@@ -48,6 +52,12 @@ techage.register_node({"default:chest", "default:chest_open"}, {
 })	
 
 techage.register_node({"default:chest_locked", "default:chest_locked_open"}, {
+	on_inv_request = function(pos, in_dir, access_type)
+		local meta = minetest.get_meta(pos)
+		if is_owner(pos, meta) then
+			return meta:get_inventory(), "main"
+		end
+	end,
 	on_pull_item = function(pos, in_dir, num)
 		local meta = minetest.get_meta(pos)
 		if is_owner(pos, meta) then
@@ -67,6 +77,32 @@ techage.register_node({"default:chest_locked", "default:chest_locked_open"}, {
 	end,
 })	
 
+techage.register_node({"shop:shop"}, {
+	on_inv_request = function(pos, in_dir, access_type)
+		local meta = minetest.get_meta(pos)
+		if is_owner(pos, meta) then
+			return meta:get_inventory(), "main"
+		end
+	end,
+	on_pull_item = function(pos, in_dir, num)
+		local meta = minetest.get_meta(pos)
+		if is_owner(pos, meta) then
+			local inv = meta:get_inventory()
+			return techage.get_items(pos, inv, "register", num)
+		end
+	end,
+	on_push_item = function(pos, in_dir, stack)
+		local meta = minetest.get_meta(pos)
+		local inv = meta:get_inventory()
+		return techage.put_items(inv, "stock", stack)
+	end,
+	on_unpull_item = function(pos, in_dir, stack)
+		local meta = minetest.get_meta(pos)
+		local inv = meta:get_inventory()
+		return techage.put_items(inv, "register", stack)
+	end,
+})	
+
 techage.register_node({"default:furnace", "default:furnace_active"}, {
 	on_pull_item = function(pos, in_dir, num)
 		local meta = minetest.get_meta(pos)
@@ -89,3 +125,29 @@ techage.register_node({"default:furnace", "default:furnace_active"}, {
 		return techage.put_items(inv, "dst", stack)
 	end,
 })	
+
+techage.register_node({"mobs:beehive"}, {
+	on_pull_item = function(pos, in_dir, num)
+		local meta = minetest.get_meta(pos)
+		local inv = meta:get_inventory()
+		return techage.get_items(pos, inv, "beehive", num)
+	end,
+	on_unpull_item = function(pos, in_dir, stack)
+		local meta = minetest.get_meta(pos)
+		local inv = meta:get_inventory()
+		return techage.put_items(inv, "beehive", stack)
+	end,
+})	
+
+techage.register_node({"xdecor:hive"}, {
+	on_pull_item = function(pos, in_dir, num)
+		local meta = minetest.get_meta(pos)
+		local inv = meta:get_inventory()
+		return techage.get_items(pos, inv, "honey", num)
+	end,
+	on_unpull_item = function(pos, in_dir, stack)
+		local meta = minetest.get_meta(pos)
+		local inv = meta:get_inventory()
+		return techage.put_items(inv, "honey", stack)
+	end,
+})	
diff --git a/techage/basic_machines/mods_support.lua b/techage/basic_machines/mods_support.lua
index 3c1e2bc..bebf06b 100644
--- a/techage/basic_machines/mods_support.lua
+++ b/techage/basic_machines/mods_support.lua
@@ -34,6 +34,10 @@ end
 ------------------------------------------------------------------------------
 
 techage.register_node({"digtron:inventory"}, {
+	on_inv_request = function(pos, in_dir, access_type)
+		local meta = minetest.get_meta(pos)
+		return meta:get_inventory(), "main"
+	end,
 	on_pull_item = function(pos, in_dir, num)
 		local meta = minetest.get_meta(pos)
 		local inv = meta:get_inventory()
@@ -52,6 +56,10 @@ techage.register_node({"digtron:inventory"}, {
 })	
 
 techage.register_node({"digtron:fuelstore"}, {
+	on_inv_request = function(pos, in_dir, access_type)
+		local meta = minetest.get_meta(pos)
+		return meta:get_inventory(), "fuel"
+	end,
 	on_pull_item = function(pos, in_dir, num)
 		local meta = minetest.get_meta(pos)
 		local inv = meta:get_inventory()
@@ -70,6 +78,10 @@ techage.register_node({"digtron:fuelstore"}, {
 })	
 
 techage.register_node({"digtron:combined_storage"}, {
+	on_inv_request = function(pos, in_dir, access_type)
+		local meta = minetest.get_meta(pos)
+		return meta:get_inventory(), "main"
+	end,
 	on_pull_item = function(pos, in_dir, num)
 		local meta = minetest.get_meta(pos)
 		local inv = meta:get_inventory()
@@ -97,6 +109,10 @@ techage.register_node({"digtron:combined_storage"}, {
 ------------------------------------------------------------------------------
 
 techage.register_node({"protector:chest"}, {
+	on_inv_request = function(pos, in_dir, access_type)
+		local meta = minetest.get_meta(pos)
+		return meta:get_inventory(), "main"
+	end,
 	on_pull_item = function(pos, in_dir, num)
 		local meta = minetest.get_meta(pos)
 		local inv = meta:get_inventory()
diff --git a/techage/basic_machines/quarry.lua b/techage/basic_machines/quarry.lua
index ee938e3..d87200a 100644
--- a/techage/basic_machines/quarry.lua
+++ b/techage/basic_machines/quarry.lua
@@ -347,7 +347,7 @@ local tubing = {
 	end,
 	on_push_item = function(pos, in_dir, stack)
 		local meta = minetest.get_meta(pos)
-		if meta:get_int("push_dir") == in_dir  or in_dir == 5 then
+		if meta:get_int("push_dir") == in_dir or in_dir == 5 then
 			local inv = M(pos):get_inventory()
 			--CRD(pos).State:start_if_standby(pos) -- would need power!
 			return techage.put_items(inv, "main", stack)
@@ -368,13 +368,8 @@ local tubing = {
 			return CRD(pos).State:on_receive_message(pos, topic, payload)
 		end
 	end,
-	on_node_load = function(pos, node)
-		local nvm = techage.get_nvm(pos)
-		if nvm.techage_state == techage.RUNNING then
-			play_sound(pos)
-		else
-			stop_sound(pos)
-		end
+	on_node_load = function(pos)
+		CRD(pos).State:on_node_load(pos)
 	end,
 }
 
diff --git a/techage/basic_machines/recycler.lua b/techage/basic_machines/recycler.lua
index 59271cf..ce85b3f 100644
--- a/techage/basic_machines/recycler.lua
+++ b/techage/basic_machines/recycler.lua
@@ -231,6 +231,9 @@ local tubing = {
 	on_recv_message = function(pos, src, topic, payload)
 		return CRD(pos).State:on_receive_message(pos, topic, payload)
 	end,
+	on_node_load = function(pos)
+		CRD(pos).State:on_node_load(pos)
+	end,
 }
 
 local _, _, node_name_ta4 = 
diff --git a/techage/basic_machines/ta4_chest.lua b/techage/basic_machines/ta4_chest.lua
index 3eacd0e..6ae2d34 100644
--- a/techage/basic_machines/ta4_chest.lua
+++ b/techage/basic_machines/ta4_chest.lua
@@ -276,7 +276,12 @@ local function formspec_container(x, y, nvm, inv)
 				count = stack.count,
 				wear = stack.wear,
 			})
-			itemstack:get_meta():from_table(minetest.deserialize(stack.meta))
+			local stack_meta_table = (minetest.deserialize(stack.meta) or {}).fields or {}
+			for _, key in ipairs({"description", "short_description", "color", "palette_index"}) do
+				if stack_meta_table[key] then
+					itemstack:get_meta():set_string(key, stack_meta_table[key])
+				end
+			end
 			local itemname = itemstack:to_string()
 			--tbl[#tbl+1] = "item_image["..xpos..",1;1,1;"..itemname.."]"
 			tbl[#tbl+1] = techage.item_image(xpos, 0, itemname, stack.count)
diff --git a/techage/basic_machines/ta4_injector.lua b/techage/basic_machines/ta4_injector.lua
index 39435ca..86cca3d 100644
--- a/techage/basic_machines/ta4_injector.lua
+++ b/techage/basic_machines/ta4_injector.lua
@@ -18,27 +18,29 @@ local S = techage.S
 
 -- Consumer Related Data
 local CRD = function(pos) return (minetest.registered_nodes[techage.get_node_lvm(pos).name] or {}).consumer end
+local tooltip = S("Switch to pull mode \nto pull items out of inventory slots \naccording the injector configuration")
 
 local STANDBY_TICKS = 2
-local COUNTDOWN_TICKS = 4
-local CYCLE_TIME = 3
+local COUNTDOWN_TICKS = 3
+local CYCLE_TIME = 4
 
 local function formspec(self, pos, nvm)
-	if CRD(pos).stage == 4 then -- TA4 node?
-		return "size[8,7.2]"..
-			default.gui_bg..
-			default.gui_bg_img..
-			default.gui_slots..
-			"box[0,-0.1;7.8,0.5;#c6e8ff]"..
-			"label[3,-0.1;"..minetest.colorize("#000000", S("Injector")).."]"..
-			techage.question_mark_help(8, S("Configure up to 8 items \nto be pushed by the injector"))..
-			"list[context;filter;0,0.8;8,1;]"..
-			"image_button[3.5,2;1,1;".. self:get_state_button_image(nvm) ..";state_button;]"..
-			"tooltip[3.5,2;1,1;"..self:get_state_tooltip(nvm).."]"..
-			"list[current_player;main;0,3.5;8,4;]"..
-			"listring[context;filter]"..
-			"listring[current_player;main]"
-	end
+	local pull_mode = dump(nvm.pull_mode or false)
+	return "size[8,7.2]"..
+		default.gui_bg..
+		default.gui_bg_img..
+		default.gui_slots..
+		"box[0,-0.1;7.8,0.5;#c6e8ff]"..
+		"label[3,-0.1;"..minetest.colorize("#000000", S("Injector")).."]"..
+		techage.question_mark_help(8, S("Configure up to 8 items \nto be pushed by the injector"))..
+		"list[context;filter;0,0.8;8,1;]"..
+		"image_button[2,2;1,1;".. self:get_state_button_image(nvm) ..";state_button;]"..
+		"tooltip[2,2;1,1;"..self:get_state_tooltip(nvm).."]"..
+		"checkbox[3.5,1.9;pull_mode;"..S("pull mode")..";"..pull_mode.."]"..
+		"tooltip[3.5,1.9;2,0.8;"..tooltip..";#0C3D32;#FFFFFF]"..
+		"list[current_player;main;0,3.5;8,4;]"..
+		"listring[context;filter]"..
+		"listring[current_player;main]"
 end
 
 local function allow_metadata_inventory_put(pos, listname, index, stack, player)
@@ -53,8 +55,10 @@ local function allow_metadata_inventory_put(pos, listname, index, stack, player)
 	
 	local inv = M(pos):get_inventory()
 	local list = inv:get_list(listname)
-	if list[index]:get_count() == 0 then
-		stack:set_count(1)
+	local cdr = CRD(pos)
+	if list[index]:get_count() < cdr.num_items then
+		local num = math.min(cdr.num_items - list[index]:get_count(), stack:get_count()) + list[index]:get_count()
+		stack:set_count(num)
 		inv:set_stack(listname, index, stack)
 		return 0
 	end
@@ -76,6 +80,67 @@ local function allow_metadata_inventory_take(pos, listname, index, stack, player
 	return 0
 end
 
+local function pull_items(pos, out_dir, idx, name, num)
+	local inv, listname = techage.get_inv_access(pos, out_dir, "pull")
+	if inv and listname then
+		if idx and idx ~= 0 then
+			local stack = inv:get_stack(listname, idx)
+			if stack and not stack:is_empty() and stack:get_name() == name then
+				local taken = stack:take_item(num)
+				inv:set_stack(listname, idx, stack)
+				return (taken:get_count() > 0) and taken or nil
+			end
+		else
+			local taken = inv:remove_item(listname, {name = name, count = num})
+			return (taken:get_count() > 0) and taken or nil
+		end
+	else
+		return techage.pull_items(pos, out_dir, num, name)
+	end
+end
+
+local function push_items(pos, out_dir, idx, items)
+	local inv, listname, callafter, dpos = techage.get_inv_access(pos, out_dir, "push")
+	if inv and listname then
+		if idx and idx ~= 0 then
+			local stack = inv:get_stack(listname, idx)
+			if stack:item_fits(items) then
+				stack:add_item(items)
+				inv:set_stack(listname, idx, stack)
+				if callafter then
+					callafter(dpos)
+				end
+				return true
+			end
+		else
+			if inv:room_for_item(listname, items) then
+				inv:add_item(listname, items)
+				if callafter then
+					callafter(dpos)
+				end
+				return true
+			end
+		end
+	else
+		return techage.push_items(pos, out_dir, items, idx)
+	end
+end
+
+local function unpull_items(pos, out_dir, idx, items)
+	local inv, listname = techage.get_inv_access(pos, out_dir, "unpull")
+	if inv and listname then
+		if idx and idx ~= 0 then
+			local stack = inv:get_stack(listname, idx)
+			stack:add_item(items)
+			inv:set_stack(listname, idx, stack)
+		else
+			inv:add_item(listname, items)
+		end
+	else
+		techage.unpull_items(pos, out_dir, items)
+	end
+end
+
 local function pushing(pos, crd, meta, nvm)
 	local pull_dir = meta:get_int("pull_dir")
 	local push_dir = meta:get_int("push_dir")
@@ -86,14 +151,16 @@ local function pushing(pos, crd, meta, nvm)
 	
 	for idx, item in ipairs(filter) do
 		local name = item:get_name()
-		if name ~= "" then
-			local items = techage.pull_items(pos, pull_dir, 1, name)
+		local num = math.min(item:get_count(), crd.num_items)
+		if name ~= "" and num > 0 then
+			local items = pull_items(pos, pull_dir, nvm.pull_mode and idx, name, num)
 			if items ~= nil then
 				pulled = true
-				if techage.push_items(pos, push_dir, items, idx) then
+				if push_items(pos, push_dir, not nvm.pull_mode and idx, items) then
 					pushed = true
 				else -- place item back
-					techage.unpull_items(pos, pull_dir, items)
+					unpull_items(pos, pull_dir, nvm.pull_mode and idx, items)
+					pulled = false
 				end
 			end
 		end
@@ -119,6 +186,9 @@ local function on_receive_fields(pos, formname, fields, player)
 		return
 	end
 	local nvm = techage.get_nvm(pos)
+	if fields.pull_mode then
+		nvm.pull_mode = fields.pull_mode == "true"
+	end	
 	CRD(pos).State:state_button_event(pos, nvm, fields)
 	M(pos):set_string("formspec", formspec(CRD(pos).State, pos, nvm))
 end
@@ -172,9 +242,12 @@ local tubing = {
 	on_recv_message = function(pos, src, topic, payload)
 		return CRD(pos).State:on_receive_message(pos, topic, payload)
 	end,
+	on_node_load = function(pos)
+		CRD(pos).State:on_node_load(pos)
+	end,
 }
 	
-local _, _, node_name_ta4 = 
+local _, node_name_ta3, node_name_ta4 = 
 	techage.register_consumer("injector", S("Injector"), tiles, {
 		cycle_time = CYCLE_TIME,
 		standby_ticks = STANDBY_TICKS,
@@ -193,6 +266,7 @@ local _, _, node_name_ta4 =
 
 		allow_metadata_inventory_put = allow_metadata_inventory_put,
 		allow_metadata_inventory_take = allow_metadata_inventory_take,
+		allow_metadata_inventory_move = function() return 0 end,
 		on_receive_fields = on_receive_fields,
 		node_timer = keep_running,
 		on_rotate = screwdriver.disallow,
@@ -200,8 +274,17 @@ local _, _, node_name_ta4 =
 		groups = {choppy=2, cracky=2, crumbly=2},
 		is_ground_content = false,
 		sounds = default.node_sound_wood_defaults(),
-		num_items = {0,2,6,12},
-	}, {false, false, false, true})
+		num_items = {0,0,1,4},
+	}, {false, false, true, true})
+
+minetest.register_craft({
+	output = node_name_ta3,
+	recipe = {
+		{"", "default:steel_ingot", ""},
+		{"", "techage:ta3_pusher_pas", ""},
+		{"", "basic_materials:ic", ""},
+	},
+})
 
 minetest.register_craft({
 	output = node_name_ta4,
@@ -211,4 +294,3 @@ minetest.register_craft({
 		{"", "basic_materials:ic", ""},
 	},
 })
-
diff --git a/techage/basis/command.lua b/techage/basis/command.lua
index 3f54027..230ccd5 100644
--- a/techage/basis/command.lua
+++ b/techage/basis/command.lua
@@ -26,7 +26,7 @@ local techage_use_sqlite = minetest.settings:get_bool('techage_use_sqlite', fals
 local string_split = string.split
 local NodeDef = techage.NodeDef
 local Tube = techage.Tube
-local check_cart_for_loading = minecart.check_cart_for_loading
+local is_cart_available = minecart.is_cart_available
 
 -------------------------------------------------------------------
 -- Database
@@ -250,6 +250,7 @@ end
 -- Param names: List of node names like {"techage:pusher_off", "techage:pusher_on"}
 -- Param node_definition: A table according to:
 --    {
+--        on_inv_request = func(pos, in_dir, access_type)
 --        on_pull_item = func(pos, in_dir, num, (opt.) item_name),
 --        on_push_item = func(pos, in_dir, item),
 --        on_unpull_item = func(pos, in_dir, item),
@@ -366,6 +367,13 @@ end
 -- Client side Push/Pull item functions
 -------------------------------------------------------------------
 
+function techage.get_inv_access(pos, out_dir, access_type)
+	local npos, in_dir, name = get_dest_node(pos, out_dir)
+	if npos and NodeDef[name] and NodeDef[name].on_inv_request then
+		return NodeDef[name].on_inv_request(npos, in_dir, access_type)
+	end
+end
+
 function techage.pull_items(pos, out_dir, num, item_name)
 	local npos, in_dir, name = get_dest_node(pos, out_dir)
 	if npos and NodeDef[name] and NodeDef[name].on_pull_item then
@@ -377,7 +385,7 @@ function techage.push_items(pos, out_dir, stack, idx)
 	local npos, in_dir, name = get_dest_node(pos, out_dir)
 	if npos and NodeDef[name] and NodeDef[name].on_push_item then
 		return NodeDef[name].on_push_item(npos, in_dir, stack, idx)	
-	elseif is_air_like(name) or check_cart_for_loading(npos) then
+	elseif is_air_like(name) or is_cart_available(npos) then
 		minetest.add_item(npos, stack)
 		return true 
 	end
@@ -436,7 +444,7 @@ function techage.get_items(pos, inv, listname, num)
 	end
 	local size = inv:get_size(listname)
 	local mem = techage.get_mem(pos)
-	mem.ta_startpos = mem.ta_startpos or 1
+	mem.ta_startpos = mem.ta_startpos or 0
 	for idx = mem.ta_startpos, mem.ta_startpos+size do
 		idx = (idx % size) + 1
 		local items = inv:get_stack(listname, idx)
diff --git a/techage/basis/fuel_lib.lua b/techage/basis/fuel_lib.lua
index 69b438e..d86bcb3 100644
--- a/techage/basis/fuel_lib.lua
+++ b/techage/basis/fuel_lib.lua
@@ -71,7 +71,7 @@ function techage.fuel.formspec(nvm)
 end
 
 function techage.fuel.can_dig(pos, player)
-	if minetest.is_protected(pos, player:get_player_name()) then
+	if not player or minetest.is_protected(pos, player:get_player_name()) then
 		return false
 	end
 	local nvm = techage.get_nvm(pos)
diff --git a/techage/basis/laser_lib.lua b/techage/basis/laser_lib.lua
new file mode 100644
index 0000000..802b3c3
--- /dev/null
+++ b/techage/basis/laser_lib.lua
@@ -0,0 +1,137 @@
+--[[
+
+	TechAge
+	=======
+
+	Copyright (C) 2019-2021 Joachim Stolberg
+
+	GPL v3
+	See LICENSE.txt for more information
+
+	Laser basis functions
+
+]]--
+
+local Entities = {}
+local SIZES = {1, 2, 3, 6, 12, 24, 48}  -- for laser entities
+local GAP_MIN = 1                       -- between 2 blocks
+local GAP_MAX = 2 * 48                  -- between 2 blocks
+
+-- Return the area (pos1,pos2) for a destination node
+local function get_pos_range(pos, dir)
+	local pos1 = vector.add(pos, vector.multiply(dir, GAP_MIN + 1))  -- min
+	local pos2 = vector.add(pos, vector.multiply(dir, GAP_MAX + 1))  -- max
+	return pos1, pos2
+end
+
+-- Return first pos after start pos and the destination pos
+local function get_positions(pos, mem, dir)
+	local pos1 = vector.add(pos, dir)  -- start pos
+	local _, pos2 = get_pos_range(pos, dir)  -- last pos
+	local _, pos3 = minetest.line_of_sight(pos1, pos2)
+	pos3 = pos3 or pos2  -- destination node pos
+	if not mem.peer_node_pos or not vector.equals(pos3, mem.peer_node_pos) then
+		mem.peer_node_pos = pos3
+		local dist = vector.distance(pos1, pos3)
+		if dist > GAP_MIN and dist <= GAP_MAX then
+			return true, pos1, pos3  -- new values
+		else
+			return false -- invalid values
+		end
+	end
+	return true  -- no new values
+end
+
+-- return both both laser entities the pos and length
+local function get_laser_length_and_pos(pos1, pos2, dir)
+	local dist = vector.distance(pos1, pos2)
+
+	for _, size in ipairs(SIZES) do
+		if dist <= (size * 2) then
+			pos1 = vector.add     (pos1, vector.multiply(dir, (size / 2) - 0.5))
+			pos2 = vector.subtract(pos2, vector.multiply(dir, (size / 2) + 0.5))
+			return size, pos1, pos2
+		end
+	end
+end
+
+local function del_laser(pos)
+	local key = minetest.hash_node_position(pos)
+	local items = Entities[key]
+	if items then
+		local laser1, laser2 = items[1], items[2]
+		laser1:remove()
+		laser2:remove()
+		Entities[key] = nil
+	end
+	return key
+end
+
+local function add_laser(pos, pos1, pos2, size, param2)
+	local key = del_laser(pos)
+
+	local laser1 = minetest.add_entity(pos1, "techage:laser" .. size)
+	if laser1 then
+		local yaw = math.pi / 2 * (param2 + 1)
+		laser1:set_rotation({x = 0, y = yaw, z = 0})
+	end
+
+	local laser2 = minetest.add_entity(pos2, "techage:laser" .. size)
+	if laser2 then
+		param2 = (param2 + 2) % 4  -- flip dir
+		local yaw = math.pi / 2 * (param2 + 1)
+		laser2:set_rotation({x = 0, y = yaw, z = 0})
+	end
+
+	Entities[key] = {laser1, laser2}
+end
+
+for _, size in ipairs(SIZES) do
+	minetest.register_entity("techage:laser" .. size, {
+		initial_properties = {
+			visual = "cube",
+			textures = {
+				"techage_laser.png",
+				"techage_laser.png",
+				"techage_laser.png",
+				"techage_laser.png",
+				"techage_laser.png",
+				"techage_laser.png",
+			},
+			use_texture_alpha = true,
+			physical = false,
+			collide_with_objects = false,
+			pointable = false,
+			static_save = false,
+			visual_size = {x = size, y = 0.05, z = 0.05},
+			glow = 14,
+			shaded = true,
+		},
+	})
+end
+
+-------------------------------------------------------------------------------
+-- API functions
+-------------------------------------------------------------------------------
+-- if force is not true, do not redraw the laser if nothing has changed
+function techage.renew_laser(pos, force)
+	local mem = techage.get_mem(pos)
+	if force then
+		mem.peer_node_pos = nil
+		mem.param2 = nil
+	end
+	mem.param2 = mem.param2 or minetest.get_node(pos).param2
+	local dir = minetest.facedir_to_dir(mem.param2)
+	local res, pos1, pos2 = get_positions(pos, mem, dir)
+	if pos1 then
+		local size, pos3, pos4 = get_laser_length_and_pos(pos1, pos2, dir)
+		if size then
+			add_laser(pos, pos3, pos4, size, mem.param2)
+			return res, pos1, pos2
+		end
+	end
+	return res
+end
+
+-- techage.del_laser(pos)
+techage.del_laser = del_laser
diff --git a/techage/basis/lib.lua b/techage/basis/lib.lua
index e5b1b08..217afa2 100644
--- a/techage/basis/lib.lua
+++ b/techage/basis/lib.lua
@@ -235,7 +235,7 @@ determine_ocean_ids()
 
 -- check if natural water is on given position (water placed by player has param2 = 1)
 function techage.is_ocean(pos)
-	if pos.y ~= 1 then return false end
+	if pos.y > 1 then return false end
 	local node = techage.get_node_lvm(pos)
 	if node.name ~= "default:water_source" then return false end
 	if node.param2 == 1 then return false end
diff --git a/techage/basis/liquid_lib.lua b/techage/basis/liquid_lib.lua
index cb9c044..5b51440 100644
--- a/techage/basis/liquid_lib.lua
+++ b/techage/basis/liquid_lib.lua
@@ -62,7 +62,7 @@ end
 
 function techage.liquid.is_empty(pos)
 	local nvm = techage.get_nvm(pos)
-	return not nvm.liquid or (nvm.liquid.amount or 0) == 0
+	return not nvm.liquid or (nvm.liquid.amount or 0) <= 0
 end
 
 techage.liquid.recv_message = {
diff --git a/techage/basis/mark2.lua b/techage/basis/mark2.lua
index 99ac668..7ea7e12 100644
--- a/techage/basis/mark2.lua
+++ b/techage/basis/mark2.lua
@@ -70,7 +70,7 @@ minetest.register_entity(":techage:position_cube", {
 			"techage_cube_mark.png",
 			"techage_cube_mark.png",
 		},
-		--use_texture_alpha = true,
+		use_texture_alpha = true,
 		physical = false,
 		visual_size = {x = 1.1, y = 1.1},
 		collisionbox = {-0.55,-0.55,-0.55, 0.55,0.55,0.55},
diff --git a/techage/basis/networks.lua b/techage/basis/networks.lua
index ddc16b4..6b30c46 100644
--- a/techage/basis/networks.lua
+++ b/techage/basis/networks.lua
@@ -243,7 +243,7 @@ local function collect_network_nodes(pos, outdir, tlib2)
 		end
 		for _,ntype in ipairs(ntypes) do
 			if not netw[ntype] then netw[ntype] = {} end
-			netw[ntype][#netw[ntype] + 1] = {pos = pos, indir = indir, nominal = ndef.nominal}
+			netw[ntype][#netw[ntype] + 1] = {pos = pos, indir = indir, nominal = ndef.nominal, regenerative = ndef.regenerative}
 		end
 	end)
 	netw.best_before = minetest.get_gametime() + BEST_BEFORE
@@ -332,6 +332,10 @@ function techage.networks.build_network(pos, outdir, tlib2, netID)
 	Networks[tlib2.tube_type] = Networks[tlib2.tube_type] or {}
 	Networks[tlib2.tube_type][netID] = netw
 	netw.alive = 3
+	-- sort generating1 nodes, so that regenerative ones will be used first
+	if netw.gen1 then
+		table.sort(netw.gen1, function(a,b) return a.regenerative and not b.regenerative end)
+	end
 	techage.schedule.start(tlib2.tube_type, netID)
 end
 	
diff --git a/techage/basis/node_states.lua b/techage/basis/node_states.lua
index e44c4fb..4614481 100644
--- a/techage/basis/node_states.lua
+++ b/techage/basis/node_states.lua
@@ -408,6 +408,11 @@ function NodeStates:keep_running(pos, nvm, val)
 		self:start(pos, nvm)
 	end
 	nvm.techage_countdown = val or 4
+	nvm.last_active = minetest.get_gametime()
+end
+
+function NodeStates:trigger_state(pos, nvm)
+	nvm.last_active = minetest.get_gametime()
 end
 
 -- Start/stop node based on button events.
@@ -450,6 +455,11 @@ function NodeStates:on_receive_message(pos, topic, payload)
 		local node = minetest.get_node(pos)
 		if node.name == "ignore" then  -- unloaded node?
 			return "unloaded"
+		elseif nvm.techage_state == RUNNING then
+			local ttl = (nvm.last_active or 0) + 2 * (self.cycle_time or 0)
+			if ttl < minetest.get_gametime() then
+				return "inactive"
+			end
 		end
 		return techage.get_state_string(techage.get_nvm(pos))
 	elseif topic == "fuel" then
@@ -461,9 +471,15 @@ function NodeStates:on_receive_message(pos, topic, payload)
 	end
 end
 	
--- repair corrupt node data
+-- restart timer
 function NodeStates:on_node_load(pos)
-	-- tbd
+	local nvm = techage.get_nvm(pos)
+	local state = nvm.techage_state or STOPPED
+	if state == RUNNING then
+		minetest.get_node_timer(pos):start(self.cycle_time)
+	elseif state < FAULT then
+		minetest.get_node_timer(pos):start(self.cycle_time * self.standby_ticks)
+	end
 end
 
 minetest.register_node("techage:defect_dummy", {
diff --git a/techage/basis/nodedata_meta.lua b/techage/basis/nodedata_meta.lua
index f5a2c43..e179e7e 100644
--- a/techage/basis/nodedata_meta.lua
+++ b/techage/basis/nodedata_meta.lua
@@ -99,4 +99,4 @@ function api.restore_at_startup()
 	return {}
 end
 
-return api
\ No newline at end of file
+return api
diff --git a/techage/basis/recipe_lib.lua b/techage/basis/recipe_lib.lua
index 46f2dd0..309a3b4 100644
--- a/techage/basis/recipe_lib.lua
+++ b/techage/basis/recipe_lib.lua
@@ -70,7 +70,6 @@ function techage.recipes.add(rtype, recipe)
 		local inp = recipe.input[idx] or ""
 		name, num = unpack(string.split(inp, " "))
 		item.input[idx] = {name = name or "", num = tonumber(num) or 0}
-		name2 = name
 	end
 	if recipe.waste then 
 		name, num = unpack(string.split(recipe.waste, " "))
diff --git a/techage/basis/tubes.lua b/techage/basis/tubes.lua
index a62986b..5f3d440 100644
--- a/techage/basis/tubes.lua
+++ b/techage/basis/tubes.lua
@@ -12,6 +12,7 @@
 
 ]]--
 
+local S = techage.S
 
 
 -- used for registered nodes
@@ -48,7 +49,7 @@ local Tube = tubelib2.Tube:new({
 techage.Tube = Tube
 
 minetest.register_node("techage:tubeS", {
-	description = "TechAge Tube",
+	description = S("TechAge Tube"),
 	tiles = { -- Top, base, right, left, front, back
 		"techage_tube_tube.png^[transformR90",
 		"techage_tube_tube.png^[transformR90",
@@ -88,6 +89,7 @@ minetest.register_node("techage:tubeS", {
 	},
 	on_rotate = screwdriver.disallow,
 	paramtype = "light",
+	use_texture_alpha = techage.CLIP,
 	sunlight_propagates = true,
 	is_ground_content = false,
 	groups = {choppy=2, cracky=3},
@@ -95,7 +97,7 @@ minetest.register_node("techage:tubeS", {
 })
 
 minetest.register_node("techage:tubeA", {
-	description = "TechAge Tube",
+	description = S("TechAge Tube"),
 	tiles = { -- Top, base, right, left, front, back
 		"techage_tube_knee2.png",
 		"techage_tube_hole2.png^[transformR180",
@@ -128,6 +130,7 @@ minetest.register_node("techage:tubeA", {
 	},
 	on_rotate = screwdriver.disallow,
 	paramtype = "light",
+	use_texture_alpha = techage.CLIP,
 	sunlight_propagates = true,
 	is_ground_content = false,
 	groups = {choppy=2, cracky=3, not_in_creative_inventory=1},
diff --git a/techage/basis/tubes_ta4.lua b/techage/basis/tubes_ta4.lua
index d7dbfb6..0902a31 100644
--- a/techage/basis/tubes_ta4.lua
+++ b/techage/basis/tubes_ta4.lua
@@ -13,9 +13,10 @@
 ]]--
 
 local Tube = techage.Tube
+local S = techage.S
 
 minetest.register_node("techage:ta4_tubeS", {
-	description = "TA4 Tube",
+	description = S("TA4 Tube"),
 	tiles = { -- Top, base, right, left, front, back
 		"techage_tubeta4_tube.png^[transformR90",
 		"techage_tubeta4_tube.png^[transformR90",
@@ -55,6 +56,7 @@ minetest.register_node("techage:ta4_tubeS", {
 	},
 	on_rotate = screwdriver.disallow,
 	paramtype = "light",
+	use_texture_alpha = techage.CLIP,
 	sunlight_propagates = true,
 	is_ground_content = false,
 	groups = {choppy=2, cracky=3},
@@ -62,7 +64,7 @@ minetest.register_node("techage:ta4_tubeS", {
 })
 
 minetest.register_node("techage:ta4_tubeA", {
-	description = "TA4 Tube",
+	description = S("TA4 Tube"),
 	tiles = { -- Top, base, right, left, front, back
 		"techage_tubeta4_knee2.png",
 		"techage_tubeta4_hole2.png^[transformR180",
@@ -95,6 +97,7 @@ minetest.register_node("techage:ta4_tubeA", {
 	},
 	on_rotate = screwdriver.disallow,
 	paramtype = "light",
+	use_texture_alpha = techage.CLIP,
 	sunlight_propagates = true,
 	is_ground_content = false,
 	groups = {choppy=2, cracky=3, not_in_creative_inventory=1},
diff --git a/techage/basis/windturbine_lib.lua b/techage/basis/windturbine_lib.lua
index 31a30b6..5299bd6 100644
--- a/techage/basis/windturbine_lib.lua
+++ b/techage/basis/windturbine_lib.lua
@@ -20,6 +20,7 @@ local function chat_message(player_name, msg)
 	if player_name then
 		minetest.chat_send_player(player_name, S("[TA4 Wind Turbine]").." "..msg)
 	end
+	return false, msg
 end
 
 -- num_turbines is the mx number of valid wind turbines. In the case of a tool
@@ -29,20 +30,17 @@ function techage.valid_place_for_windturbine(pos, player_name, num_turbines)
 
 	-- Check if occean (only for tool)
 	if num_turbines == 0 and pos.y ~= 1 then
-		chat_message(player_name, S("This is not the surface of the ocean!"))
-		return false
+		return chat_message(player_name, S("This is not the surface of the ocean!"))
 	end
 	local node = minetest.get_node(pos)
 	if num_turbines == 0 and node.name ~= "default:water_source" then
-		chat_message(player_name, S("This is no ocean water!"))
-		return false
+		return chat_message(player_name, S("This is no ocean water!"))
 	end
 	local data = minetest.get_biome_data({x=pos.x, y=-2, z=pos.z})
 	if data then
 		local name = minetest.get_biome_name(data.biome)
 		if not string.find(name, "ocean") then
-			chat_message(player_name, S("This is a").." "..name.." "..S("biome and no ocean!"))
-			return false
+			return chat_message(player_name, S("This is a").." "..name.." "..S("biome and no ocean!"))
 		end
 	end
 	-- check the space over ocean
@@ -51,9 +49,8 @@ function techage.valid_place_for_windturbine(pos, player_name, num_turbines)
 	num = #minetest.find_nodes_in_area(pos1, pos2, {"air", "ignore"})
 	if num < (41 * 41 * 21 * 0.9) then
 		techage.mark_region(player_name, pos1, pos2, "")
-		chat_message(player_name, 
-				S("Here is not enough wind (A free air space of 41x41x21 m is necessary)!"))
-		return false
+		return chat_message(player_name, 
+				S("Here is not enough wind\n(A free air space of 41x41x21 m is necessary)!"))
 	end
 	-- Check for water surface (occean)
 	pos1 = {x=pos.x-20, y=1, z=pos.z-20}
@@ -63,8 +60,7 @@ function techage.valid_place_for_windturbine(pos, player_name, num_turbines)
 	
 	if num < (41*41 * 0.8) then
 		techage.mark_region(player_name, pos1, pos2, "")
-		chat_message(player_name, S("Here is not enough water (41x41 m)!"))
-		return false
+		return chat_message(player_name, S("Here is not enough water (41x41 m)!"))
 	end
 	-- Check for next wind turbine
 	pos1 = {x=pos.x-13, y=2, z=pos.z-13}
@@ -73,13 +69,12 @@ function techage.valid_place_for_windturbine(pos, player_name, num_turbines)
 	num = #minetest.find_nodes_in_area(pos1, pos2, {"techage:ta4_wind_turbine"})
 	if num > num_turbines then
 		techage.mark_region(player_name, pos1, pos2, "")
-		chat_message(player_name, S("The next wind turbines is too close!"))
-		return false
+		return chat_message(player_name, S("The next wind turbines is too close!"))
 	end
 	
 	if num_turbines == 0 then
 		chat_message(player_name,  minetest.pos_to_string(pos).." "..
 				S("is a suitable place for a wind turbine!"))
 	end
-	return true
+	return true, "ok"
 end
diff --git a/techage/carts/chest_cart.lua b/techage/carts/chest_cart.lua
index 702f73e..b225448 100644
--- a/techage/carts/chest_cart.lua
+++ b/techage/carts/chest_cart.lua
@@ -18,9 +18,6 @@ local S = techage.S
 local P2S = function(pos) if pos then return minetest.pos_to_string(pos) end end
 local S2P = minetest.string_to_pos
 local MP = minetest.get_modpath("minecart")
-local cart = dofile(MP.."/cart_lib1.lua")
-
-cart:init(true)
 
 local function formspec()
 	return "size[8,6]"..
@@ -33,16 +30,6 @@ local function formspec()
 	"listring[current_player;main]"
 end
 
-local function can_dig(pos, player)
-	local owner = M(pos):get_string("owner")
-	if owner ~= "" and (owner ~= player:get_player_name() or
-			not minetest.check_player_privs(player:get_player_name(), "minecart")) then
-		return false
-	end
-	local inv = minetest.get_meta(pos):get_inventory()
-	return inv:is_empty("main")
-end
-
 local function allow_metadata_inventory_put(pos, listname, index, stack, player)
 	local owner = M(pos):get_string("owner")
 	if owner ~= "" and owner ~= player:get_player_name() then
@@ -80,31 +67,29 @@ minetest.register_node("techage:chest_cart", {
 	},
 	paramtype2 = "facedir",
 	paramtype = "light",
+	use_texture_alpha = techage.CLIP,
 	sunlight_propagates = true,
 	is_ground_content = false,
 	groups = {cracky = 2, crumbly = 2, choppy = 2},
 	node_placement_prediction = "",
+	diggable = false,
 	
-	can_dig = can_dig,
+	on_place = minecart.on_nodecart_place,
+	on_punch = minecart.on_nodecart_punch,
 	allow_metadata_inventory_put = allow_metadata_inventory_put,
 	allow_metadata_inventory_take = allow_metadata_inventory_take,
 	
-	after_place_node = function(pos)
+	after_place_node = function(pos, placer)
 		local inv = M(pos):get_inventory()
 		inv:set_size('main', 4)
-		M(pos):set_string("formspec", formspec())
-	end,
-	
-	on_place = function(itemstack, placer, pointed_thing)
-		return cart.add_cart(itemstack, placer, pointed_thing, "techage:chest_cart")
-	end,
-	
-	on_punch = function(pos, node, puncher, pointed_thing)
-		cart.node_on_punch(pos, node, puncher, pointed_thing, "techage:chest_cart_entity")
+		if placer and placer:is_player() then
+			minecart.show_formspec(pos, placer)
+		else
+			M(pos):set_string("formspec", formspec())
+		end
 	end,
 	
 	set_cargo = function(pos, data)
-		--print("set_cargo", P2S(pos), #data)
 		local inv = M(pos):get_inventory()
 		for idx, stack in ipairs(data) do
 			inv:set_stack("main", idx, stack)
@@ -118,17 +103,16 @@ minetest.register_node("techage:chest_cart", {
 			local stack = inv:get_stack("main", idx)
 			data[idx] = {name = stack:get_name(), count = stack:get_count()}
 		end
-		--print("get_cargo", P2S(pos), #data)
 		return data
 	end,
 
-	after_dig_node = function(pos, oldnode, oldmetadata, digger)
-		local name = oldmetadata.fields.removed_rail or "carts:rail"
-		minetest.add_node(pos, {name = name})
-	end,
+	has_cargo = function(pos)
+		local inv = minetest.get_meta(pos):get_inventory()
+		return not inv:is_empty("main")
+	end
 })
 
-minecart.register_cart_entity("techage:chest_cart_entity", "techage:chest_cart", {
+minecart.register_cart_entity("techage:chest_cart_entity", "techage:chest_cart", "chest", {
 	initial_properties = {
 		physical = false,
 		collisionbox = {-0.5, -0.5, -0.5, 0.5, 0.5, 0.5},
@@ -137,9 +121,6 @@ minecart.register_cart_entity("techage:chest_cart_entity", "techage:chest_cart",
 		visual_size = {x=0.66, y=0.66, z=0.66},
 		static_save = false,
 	},
-	on_activate = cart.on_activate,
-	on_punch = cart.on_punch,
-	on_step = cart.on_step,
 })
 
 techage.register_node({"techage:chest_cart"}, {
diff --git a/techage/carts/tank_cart.lua b/techage/carts/tank_cart.lua
index 6749a76..2488f43 100644
--- a/techage/carts/tank_cart.lua
+++ b/techage/carts/tank_cart.lua
@@ -20,17 +20,20 @@ local S2P = minetest.string_to_pos
 local Pipe = techage.LiquidPipe
 local liquid = techage.liquid
 local MP = minetest.get_modpath("minecart")
-local cart = dofile(MP.."/cart_lib1.lua")
-
-cart:init(true)
 
 local CAPACITY = 100
 
 local function on_rightclick(pos, node, clicker)
-	local nvm = techage.get_nvm(pos)
-	techage.set_activeformspec(pos, clicker)
-	M(pos):set_string("formspec", liquid.formspec(pos, nvm))
-	minetest.get_node_timer(pos):start(2)
+	if clicker and clicker:is_player() then
+		if M(pos):get_int("userID") == 0 then
+			minecart.show_formspec(pos, clicker)
+		else
+			local nvm = techage.get_nvm(pos)
+			techage.set_activeformspec(pos, clicker)
+			M(pos):set_string("formspec", liquid.formspec(pos, nvm))
+			minetest.get_node_timer(pos):start(2)
+		end
+	end
 end
 
 local function node_timer(pos, elapsed)
@@ -42,14 +45,6 @@ local function node_timer(pos, elapsed)
 	return false
 end
 
-local function can_dig(pos, player)
-	local owner = M(pos):get_string("owner")
-	if owner ~= "" and owner ~= player:get_player_name() then
-		return false
-	end
-	return liquid.is_empty(pos)
-end
-
 local function take_liquid(pos, indir, name, amount)
 	amount, name = liquid.srv_take(pos, indir, name, amount)
 	if techage.is_activeformspec(pos) then
@@ -111,34 +106,22 @@ minetest.register_node("techage:tank_cart", {
 	},
 	paramtype2 = "facedir",
 	paramtype = "light",
+	use_texture_alpha = techage.CLIP,
 	sunlight_propagates = true,
 	is_ground_content = false,
 	groups = {cracky = 2, crumbly = 2, choppy = 2},
 	node_placement_prediction = "",
+	diggable = false,
 	
+	on_place = minecart.on_nodecart_place,
+	on_punch = minecart.on_nodecart_punch,
+
 	after_place_node = function(pos)
 		local nvm = techage.get_nvm(pos)
-		nvm.liquid = {}
-		M(pos):set_string("formspec", liquid.formspec(pos, nvm))
-	end,
-	
-	on_place = function(itemstack, placer, pointed_thing)
-		return cart.add_cart(itemstack, placer, pointed_thing, "techage:tank_cart")
-	end,
-	
-	on_punch = function(pos, node, puncher, pointed_thing)
-		--print("on_punch")
-		local wielded_item = puncher:get_wielded_item():get_name()
-		
-		if techage.liquid.is_container_empty(wielded_item) then
-			liquid.on_punch(pos, node, puncher, pointed_thing)
-		else
-			cart.node_on_punch(pos, node, puncher, pointed_thing, "techage:tank_cart_entity")
-		end
+		nvm.liquid = nvm.liquid or {}
 	end,
 	
 	set_cargo = function(pos, data)
-		--print("set_cargo", P2S(pos), #data)
 		local nvm = techage.get_nvm(pos)
 		nvm.liquid = data
 	end,
@@ -147,16 +130,15 @@ minetest.register_node("techage:tank_cart", {
 		local nvm = techage.get_nvm(pos)
 		local data = nvm.liquid
 		nvm.liquid = {}
-		--print("get_cargo", P2S(pos), #data)
 		return data
 	end,
-	on_timer = node_timer,
 	
-	after_dig_node = function(pos, oldnode, oldmetadata, digger)
-		local name = oldmetadata.fields.removed_rail or "carts:rail"
-		minetest.add_node(pos, {name = name})
+	has_cargo = function(pos)
+		return not liquid.is_empty(pos)
 	end,
 	
+	on_timer = node_timer,
+	
 	liquid = {
 		capa = CAPACITY,
 		peek = liquid.srv_peek,
@@ -166,7 +148,6 @@ minetest.register_node("techage:tank_cart", {
 	},
 	networks = networks_def,
 	on_rightclick = on_rightclick,
-	can_dig = can_dig,
 })
 
 techage.register_node({"techage:tank_cart"}, liquid.recv_message)	
@@ -174,7 +155,7 @@ techage.register_node({"techage:tank_cart"}, liquid.recv_message)
 Pipe:add_secondary_node_names({"techage:tank_cart"})
 
 
-minecart.register_cart_entity("techage:tank_cart_entity", "techage:tank_cart", {
+minecart.register_cart_entity("techage:tank_cart_entity", "techage:tank_cart", "tank", {
 	initial_properties = {
 		physical = false,
 		collisionbox = {-0.5, -0.5, -0.5, 0.5, 0.5, 0.5},
@@ -183,9 +164,7 @@ minecart.register_cart_entity("techage:tank_cart_entity", "techage:tank_cart", {
 		visual_size = {x=0.66, y=0.66, z=0.66},
 		static_save = false,
 	},
-	on_activate = cart.on_activate,
-	on_punch = cart.on_punch,
-	on_step = cart.on_step,
+	only_dig_if_empty  = 1,
 })
 
 minetest.register_craft({
diff --git a/techage/chemistry/ta4_doser.lua b/techage/chemistry/ta4_doser.lua
index 09fb175..e9df68d 100644
--- a/techage/chemistry/ta4_doser.lua
+++ b/techage/chemistry/ta4_doser.lua
@@ -153,14 +153,9 @@ local State = techage.NodeStates:new({
 	stop_node = stop_node,
 })
 
-local function untake(recipe, pos, liquids)
-	for _,item in pairs(recipe.input) do
-		if item.name ~= "" then
-			local outdir = liquids[item.name] or reload_liquids(pos)[item.name]
-			if outdir then
-				liquid.untake(pos, outdir, item.name, item.num)
-			end
-		end
+local function untake(pos, taken)
+	for _,item in pairs(taken) do
+		liquid.untake(pos, item.outdir, item.name, item.num)
 	end
 end	
 
@@ -205,43 +200,50 @@ local function dosing(pos, nvm, elapsed)
 	end
 	-- inputs
 	local starter = get_starter_name(pos)
+	local taken = {}
 	for _,item in pairs(recipe.input) do
 		if item.name ~= "" then
 			local outdir = liquids[item.name] or reload_liquids(pos)[item.name]
 			if not outdir then
 				State:standby(pos, nvm)
 				reactor_cmnd(pos, "stop")
+				untake(pos, taken)
 				return
 			end
-			if liquid.take(pos, outdir, item.name, item.num, starter) < item.num then
+			local num = liquid.take(pos, outdir, item.name, item.num, starter)
+			if num < item.num then
+				taken[#taken + 1] = {outdir = outdir, name = item.name, num = num}
 				State:standby(pos, nvm)
 				reactor_cmnd(pos, "stop")
+				untake(pos, taken)
 				return
 			end
+			taken[#taken + 1] = {outdir = outdir, name = item.name, num = item.num}
 		end
 	end
-	-- output
+	-- waste
 	local leftover
-	leftover = reactor_cmnd(pos, "output", {
-			name = recipe.output.name, 
-			amount = recipe.output.num})
-	if not leftover or (tonumber(leftover) or 1) > 0 then
-		untake(recipe, pos, liquids)
-		State:blocked(pos, nvm)
-		reactor_cmnd(pos, "stop")
-		return
-	end
 	if recipe.waste.name ~= "" then
 		leftover = reactor_cmnd(pos, "waste", {
 				name = recipe.waste.name, 
 				amount = recipe.waste.num})
 		if not leftover or (tonumber(leftover) or 1) > 0 then
-			untake(recipe, pos, liquids)
+			untake(pos, taken)
 			State:blocked(pos, nvm)
 			reactor_cmnd(pos, "stop")
 			return
 		end
 	end
+	-- output
+	leftover = reactor_cmnd(pos, "output", {
+			name = recipe.output.name, 
+			amount = recipe.output.num})
+	if not leftover or (tonumber(leftover) or 1) > 0 then
+		untake(pos, taken)
+		State:blocked(pos, nvm)
+		reactor_cmnd(pos, "stop")
+		return
+	end
 	State:keep_running(pos, nvm, COUNTDOWN_TICKS)
 end	
 
diff --git a/techage/chemistry/ta4_liquid_filter.lua b/techage/chemistry/ta4_liquid_filter.lua
index 50d713f..47db659 100644
--- a/techage/chemistry/ta4_liquid_filter.lua
+++ b/techage/chemistry/ta4_liquid_filter.lua
@@ -111,6 +111,7 @@ minetest.register_node("techage:ta4_liquid_filter_filler", {
 
 	paramtype = "light",
 	paramtype2 = "facedir",
+	use_texture_alpha = techage.CLIP,
 	on_rotate = screwdriver.disallow,
 	groups = {cracky=2},
 	is_ground_content = false,
@@ -189,6 +190,7 @@ minetest.register_node("techage:ta4_liquid_filter_sink", {
 	end,
 
 	paramtype = "light",
+	use_texture_alpha = techage.CLIP,
 	paramtype2 = "facedir",
 	on_rotate = screwdriver.disallow,
 	groups = {cracky=2},
diff --git a/techage/chemistry/ta4_reactor.lua b/techage/chemistry/ta4_reactor.lua
index e373db7..6443a4c 100644
--- a/techage/chemistry/ta4_reactor.lua
+++ b/techage/chemistry/ta4_reactor.lua
@@ -56,6 +56,7 @@ minetest.register_node("techage:ta4_reactor_fillerpipe", {
 	end,
 	
 	paramtype = "light",
+	use_texture_alpha = techage.CLIP,
 	sunlight_propagates = true,	
 	paramtype2 = "facedir",
 	on_rotate = screwdriver.disallow,
@@ -167,6 +168,7 @@ minetest.register_node("techage:ta4_reactor", {
 	allow_metadata_inventory_take = allow_metadata_inventory_take,
 	
 	paramtype = "light",
+	use_texture_alpha = techage.CLIP,
 	paramtype2 = "facedir",
 	on_rotate = screwdriver.disallow,
 	groups = {cracky=2},
diff --git a/techage/chemistry/ta4_stand.lua b/techage/chemistry/ta4_stand.lua
index 616d2c7..bbe5330 100644
--- a/techage/chemistry/ta4_stand.lua
+++ b/techage/chemistry/ta4_stand.lua
@@ -122,6 +122,7 @@ minetest.register_node("techage:ta4_reactor_stand", {
 	end,
 	
 	paramtype = "light",
+	use_texture_alpha = techage.CLIP,
 	paramtype2 = "facedir",
 	on_rotate = screwdriver.disallow,
 	groups = {cracky=2},
diff --git a/techage/doc/guide.lua b/techage/doc/guide.lua
index 3767760..cae14aa 100644
--- a/techage/doc/guide.lua
+++ b/techage/doc/guide.lua
@@ -81,14 +81,13 @@ local function formspec_help(meta, manual)
 	default.gui_bg_img..
 	default.gui_slots..
 	"item_image[9.6,0;1,1;techage:construction_board]"..
+	"tablecolumns[tree,width=1;text,width=10,align=inline]"..
+	"tableoptions[opendepth=1]"..
+	"table[0.1,0;9,5;page;"..table.concat(aTitel, ",")..";"..idx.."]"..
 	bttn..
 	"style_type[textarea;textcolor=#FFFFFF]"..
 	"textarea[0.3,5.7;11,5.3;;"..(aText[idx] or "")..";]"..
-
-	"box[0,5.75;10.775,4.45;#000000]"..
-	"tablecolumns[tree,width=1;text,width=10,align=inline]"..
-	"tableoptions[opendepth=1]"..
-	"table[0.1,0;9,5;page;"..table.concat(aTitel, ",")..";"..idx.."]"
+	"box[0,5.75;10.775,4.45;#000000]"
 end
 
 local function formspec_plan(meta, manual)
@@ -148,6 +147,7 @@ minetest.register_node("techage:construction_board", {
 	
 	paramtype2 = "wallmounted",
 	paramtype = "light",
+	use_texture_alpha = techage.CLIP,
 	sunlight_propagates = true,
 	is_ground_content = false,
 	groups = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 2},
@@ -199,6 +199,7 @@ minetest.register_node("techage:construction_board_EN", {
 	
 	paramtype2 = "wallmounted",
 	paramtype = "light",
+	use_texture_alpha = techage.CLIP,
 	sunlight_propagates = true,
 	is_ground_content = false,
 	groups = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 2},
diff --git a/techage/doc/items.lua b/techage/doc/items.lua
index acf28f2..a0a29d4 100644
--- a/techage/doc/items.lua
+++ b/techage/doc/items.lua
@@ -28,6 +28,7 @@ techage.Items = {
 	ta1_hopper = "techage:hopper_ta1",
 	wlanchip = "techage:ta4_wlanchip",
 	tube = "techage:tubeS",
+	concentrator = "techage:concentrator27",
 	----------------
 	techage_ta2 = "techage_ta2.png",
 	ta2_firebox = "techage:firebox",
@@ -48,7 +49,7 @@ techage.Items = {
 	ta2_chest = "techage:chest_ta2",
 	ta2_forceload = "techage:forceload",
 	ta2_driveaxle = "techage:axle",
-        ta2_generator = "techage:ta2_generator_off",
+	ta2_generator = "techage:ta2_generator_off",
 	---------------------
 	techage_ta3 = "techage_ta3.png",
 	techage_ta31 = "techage_ta3b.png",
@@ -115,7 +116,8 @@ techage.Items = {
 	ta3_pipe_wall_entry = "techage:ta3_pipe_wall_entry",
 	ta3_mesecons_converter = "techage:ta3_mesecons_converter",
 	ta3_valve = "techage:ta3_valve_closed",
-        ta3_motor = "techage:ta3_motor_off",
+	ta3_motor = "techage:ta3_motor_off",
+	ta3_injector = "techage:ta3_injector_pas",
 	----------------------------
 	techage_ta4 = "techage_ta4.png",
 	ta4_windturbine = "techage:ta4_wind_turbine",
@@ -177,7 +179,10 @@ techage.Items = {
 	ta4_injector = "techage:ta4_injector_pas",
 	ta4_liquid_filter = "techage_ta4_filter.png",
 	ta4_recycler = "techage:ta4_recycler_pas",
-	
+	ta4_waterinlet = "techage:ta4_waterinlet",
+	ta4_laser = "techage:ta4_laser_emitter",
+	ta4_concentrator = "techage:ta4_concentrator27",
+
 	--ta4_ "", 
 }
 
diff --git a/techage/doc/manual_DE.lua b/techage/doc/manual_DE.lua
index 6d0e458..983829f 100644
--- a/techage/doc/manual_DE.lua
+++ b/techage/doc/manual_DE.lua
@@ -31,6 +31,7 @@ techage.manual_DE.aTitel = {
   "3,TA2 Stromgenerator / TA2 Power Generator",
   "2,Items schieben und sortieren",
   "3,Röhren / TechAge Tube",
+  "3,Röhren Konzentrator / Tube Concentrator",
   "3,TA2 Schieber / Pusher",
   "3,TA2 Verteiler / Distributor",
   "2,Kieswaschanlage",
@@ -120,7 +121,7 @@ techage.manual_DE.aTitel = {
   "3,TA3 Kiessieb / Gravel Sieve",
   "3,TA3 Kieswaschanlage / Gravel Rinser",
   "3,TA3 Mühle / Grinder",
-  "3,TA3 Flüssigkeitensammler / Liquid Sampler",
+  "3,TA3 Injektor / Injector",
   "2,Werkzeuge",
   "3,Techage Info Tool",
   "3,TechAge Programmer",
@@ -182,7 +183,8 @@ techage.manual_DE.aTitel = {
   "3,TA4 Tank / TA4 Tank",
   "3,TA4 Pumpe / TA4 Pump",
   "3,TA4 Ofenheizung / furnace heater",
-  "3,TA4 Wasserpumpe / Water Pump",
+  "3,TA4 Wasserpumpe / Water Pump (veraltet)",
+  "3,TA4 Wassereinlass / TA4 Water Inlet",
   "3,TA4 Röhren / TA4 Tube",
   "3,TA4 Schieber / Pusher",
   "3,TA4 Kiste / TA4 Chest",
@@ -195,6 +197,7 @@ techage.manual_DE.aTitel = {
   "3,TA4 Elektronikfabrik / Electronic Fab",
   "3,TA4 Injektor / Injector",
   "3,TA4 Recycler",
+  "3,TA4 Laser",
 }
 
 techage.manual_DE.aText = {
@@ -424,6 +427,10 @@ techage.manual_DE.aText = {
   "\n"..
   "\n"..
   "\n",
+  "Über den Konzentrator können mehrere Röhren zu einer Röhre zusammengeführt werden. Die Richtung\\, in der alle Items weitergegeben werden\\, ist mit einem Pfeil markiert.\n"..
+  "\n"..
+  "\n"..
+  "\n",
   "Ein Schieber ist in der Lage\\, Items aus Kisten oder Maschinen zu ziehen und in andere Kisten oder Maschinen zu schieben. Oder anders gesagt: Zwischen zwei Blöcken mit Inventar muss ein und genau ein Schieber sein. Mehrere Schieber in Reihe sind nicht möglich.\n"..
   "In die Gegenrichtung ist ein Schieber für Items aber durchlässig\\, so dass eine Kiste über eine Röhre gefüllt und ebenso geleert werden kann. \n"..
   "\n"..
@@ -451,6 +458,12 @@ techage.manual_DE.aText = {
   "\n"..
   "Der Verarbeitungsleistung eines TA2 Verteilers beträgt 4 Items alle 2 s\\, wobei der Verteiler dabei versucht\\, die 4 Items auf die offenen Ausgänge zu verteilen.\n"..
   "\n"..
+  "Wird dasselbe Item in einem Filter mehrfach hinterlegt\\, so beeinflusst dies das langfristige Verteilungsverhältnis entsprechend.\n"..
+  "\n"..
+  "Bitte beachte\\, dass die Verteilung ein probabilistischer Vorgang ist\\, d.h. die Verhältnisse werden nicht exakt\\, sondern nur langfristig eingehalten.\n"..
+  "\n"..
+  "In den Filtern beträgt die maximale Stackgröße 12\\; insgesamt können höchstens 36 Items konfiguriert werden.\n"..
+  "\n"..
   "\n"..
   "\n",
   "Die Kieswaschanlage ist eine komplexere Maschine mit dem Ziel\\, Usmium Nuggets aus gesiebtem Kies auszuwaschen. Für den Aufbau wird ein TA2 Kiesspüler mit Achsenantrieb\\, ein Trichter\\, eine Kiste\\, sowie fließendes Wasser benötigt. \n"..
@@ -690,7 +703,7 @@ techage.manual_DE.aText = {
   "\n",
   "Ist Teil des TA3 Industrieofen.\n"..
   "\n"..
-  "Der Ölbrenner kann mit Schweröl\\, Naphtha oder Benzin betrieben werden. Die Brennzeit beträgt für Schweröl 80 s\\, Naphtha 90 s und Benzin 100 s.\n"..
+  "Der Ölbrenner kann mit Erdöl\\, Schweröl\\, Naphtha oder Benzin betrieben werden. Die Brennzeit beträgt für Erdöl 65 s\\, Schweröl 80 s\\, Naphtha 90 s und Benzin 100 s.\n"..
   "\n"..
   "Der Ölbrenner kann nur 50 Einheiten Kraftstoff aufnehmen. Ein zusätzlicher Tank und eine Pumpe sind daher ratsam.\n"..
   "\n"..
@@ -906,32 +919,43 @@ techage.manual_DE.aText = {
   "\n"..
   "\n"..
   "\n",
-  "Den TA3 Logikblock kann man so programmieren\\, dass ein oder mehrere Eingangssignale zu einem Ausgangssignal verknüpft und gesendet werden. Dieser Block kann daher diverse Logik-Elemente wie AND\\, OR\\, NOT\\, XOR usw. ersetzen.\n"..
-  "Eingangssignale für den Logikblock sind 'on'/'off' Kommandos. Ein 'on' ist ein logisches 'true'\\, ein 'off' entspricht dem 'false'.\n"..
-  "Eingangssignale werden über die Nummer referenziert\\, also bspw. 'n123' für das Signal vom Sender mit der Nummer 123.\n"..
+  "Den TA3 Logikblock kann man so programmieren\\, dass ein oder mehrere Eingangskommandos zu einem Ausgangskommando verknüpft und gesendet werden. Dieser Block kann daher diverse Logik-Elemente wie AND\\, OR\\, NOT\\, XOR usw. ersetzen.\n"..
+  "Eingangkommandos für den Logikblock sind 'on'/'off' Kommandos.\n"..
+  "Eingangskommandos werden über die Nummer referenziert\\, also bspw. '1234' für das Kommando vom Sender mit der Nummer 1234.\n"..
+  "Das gleiche gilt für Ausgangskommandos.\n"..
   "\n"..
-  "*Beispiele für den IF Ausdruck*\n"..
+  "Eine Regel ist wie folgt aufgebaut:\n"..
+  "\n"..
+  "    <output> = on/off if <input-expression> is true\n"..
+  "\n"..
+  "'<output>' ist die Nummer des Blocks\\, zu dem das Kommando gesendet werden soll.\n"..
+  "'<input-expression>' ist ein boolescher Ausdruck\\, bei dem Eingabenummern ausgewertet werden. \n"..
+  "\n"..
+  "*Beispiele für den Input Ausdruck*\n"..
   "\n"..
   "Signal negieren (NOT):\n"..
   "\n"..
-  "    not n123\n"..
+  "    1234 == off\n"..
   "\n"..
   "Logisches UND (AND):\n"..
   "\n"..
-  "    n123 and n345\n"..
+  "    1234 == on and 2345 == on\n"..
   "\n"..
   "Logisches ODER (OR):\n"..
   "\n"..
-  "    n123 or n345\n"..
+  "    1234 == on or 2345 == on\n"..
   "\n"..
-  "Ist der 'if'-Ausdruck wahr (true)\\, wird der 'then' Zweig ausgeführt\\, anderenfalls der 'else' Zweig.\n"..
-  "Bei 'then' und 'else' kann entweder 'true'\\, 'false'\\, oder nichts eingegeben werden:\n"..
+  "Folgende Operatoren sind zulässig:  'and'   'or'   'on'   'off'   'me'   '=='   '~='   '('   ')'\n"..
   "\n"..
-  "  - bei 'true' wird 'on' gesendet\n"..
-  "  - bei 'false' wird 'off' gesendet\n"..
-  "  - wird nichts eingegeben\\, wird auch nichts gesendet\n"..
+  "Ist der Ausdruck wahr (true)\\, wird ein Kommando an den Block mit der '<output>' Nummer gesendet.\n"..
   "\n"..
-  "Den oder die Ziel-Blöcke für das Ausgangssignal muss man im Zielnummern-Feld eingeben.\n"..
+  "Es können bis zu vier Regeln definiert werden\\, wobei immer alle Regeln geprüft werden\\, wenn ein Kommando empfangen wird.\n"..
+  "\n"..
+  "Die interne Durchlaufzeit aller Kommandos beträgt 100 ms.\n"..
+  "\n"..
+  "Über das Schlüsselwort 'me' kann die eigene Knotennummer referenziert werden. Damit ist es möglich\\, dass sich der Block selbst ein Kommando sendet (Flip-Flop Funktion).\n"..
+  "\n"..
+  "Die Sperrzeit definiert eine Pause nach einem Kommando\\, in der der Logikblock kein weiteres Kommando von extern annimmt.  Empfangene Kommandos in der Sperrzeit werden damit verworfen. Die Sperrzeit kann in Sekunden definiert werden.\n"..
   "\n"..
   "\n"..
   "\n",
@@ -985,10 +1009,18 @@ techage.manual_DE.aText = {
   "\n"..
   "\n"..
   "\n",
-  "Der Tür Controller II kann alle Arten von Blöcken entfernen und wieder setzen. Um den Tür Controller II anzulernen\\, muss der \"Aufzeichnen\" Button gedrückt werden. Dann müssen alle Blöcke angeklickt werden\\, die Teil der Tür / des Tores sein sollen. Danach muss der \"Fertig\" Button gedrückt werden.  Es können bis zu 16 Blöcke ausgewählt werden. Die entfernten Blöcke werden im Inventar des Controllers gespeichert. Über die Tasten \"Entfernen\" bzw. \"Setzen\" kann die Funktion des Controllers von Hand getestet werden.\n"..
+  "Der Tür Controller II kann alle Arten von Blöcken entfernen und wieder setzen. Um den Tür Controller II anzulernen\\, muss der \"Aufzeichnen\" Button gedrückt werden. Dann müssen alle Blöcke angeklickt werden\\, die Teil der Tür / des Tores sein sollen. Danach muss der \"Fertig\" Button gedrückt werden.  Es können bis zu 16 Blöcke ausgewählt werden. Die entfernten Blöcke werden im Inventar des Controllers gespeichert.\n"..
+  "\n"..
+  " Über die Tasten \"Entfernen\" bzw. \"Setzen\" kann die Funktion des Controllers von Hand getestet werden.\n"..
   "\n"..
   "Wird ein  'on' / 'off' Kommando an den Tür Controller II gesendet\\, entfernt bzw. setzt er die Blöcke ebenfalls.\n"..
   "\n"..
+  "Über ein 'exchange' Kommando können einzelne Böcke gesetzt\\, entfernt\\, bzw. durch andere Blöcke ersetzt werden. Die Slot-Nummer des Inventars (1 .. 16) muss als payload übergeben werden\\, also:\n"..
+  "\n"..
+  "    $send_cmnd(node_number\\, \"exchange\"\\, 2)\n"..
+  "\n"..
+  "Damit lassen sich auch ausfahrbare Treppen und ähnliches simulieren.\n"..
+  "\n"..
   "\n"..
   "\n",
   "Der Mesecons Umsetzer dient zur Umwandlung von Techage on/off Kommandos in Mesecons Signale und umgekehrt.\n"..
@@ -1035,15 +1067,7 @@ techage.manual_DE.aText = {
   "\n"..
   "\n"..
   "\n",
-  "Die Funktion des TA3 Verteilers entspricht der von TA2 mit einer weiteren Betriebart.\n"..
-  "\n"..
-  "*1:1 Bestückungsfunktion*\n"..
-  "\n"..
-  "Wird nur ein Ausgang aktiviert und mit mehreren Items konfiguriert\\, so kann die 1:1 Checkbox angeklickt werden. In diesem Falle werden nur Items gemäß der Filtereinstellung angenommen und in der Reihenfolge\\, wie die Items im Filter eingetragen sind\\, in definierte Positionen im Ziel-Inventar abgelegt. Damit kann weder das Inventar des Verteilers noch des Zielblocks volllaufen. Dies funktioniert für Autocrafter\\, Industrieofen und Elektronikfabrik.\n"..
-  "Mit dieser Betriebsart lassen sich andere Maschinen wie bspw. der Autocrafter exakt gemäß dem eingestellten Rezept bestücken. \n"..
-  "\n"..
-  "Dies funktioniert nur nur\\, wenn die Inventare des Verteilers und des Zielblocks zuvor frei sind.\n"..
-  "\n"..
+  "Die Funktion des TA3 Verteilers entspricht der von TA2.\n"..
   "Die Verarbeitungsleistung beträgt 12 Items alle 4 s.\n"..
   "\n"..
   "\n"..
@@ -1079,8 +1103,13 @@ techage.manual_DE.aText = {
   "\n"..
   "\n"..
   "\n",
-  "Die Funktion entspricht der von TA2.\n"..
-  "Die Verarbeitungsleistung ist 2 Items alle 8 s. Der Block benötigt 5 ku Strom.\n"..
+  "Der Injektor ist ein TA3 Schieber mit speziellen Eigenschaften. Er besitzt ein Menü zur Konfiguration. Hier können bis zu 8 Items konfiguriert werden. Er entnimmt nur diese Items einer Kiste um sie an Maschinen mit Rezepturen weiterzugeben (Autocrafter\\, Industrieofen und Elektronikfabrik).\n"..
+  "\n"..
+  "Beim Weitergeben wird in der Zielmaschine pro Item nur eine Position im Inventar genutzt. Sind bspw. nur die ersten drei Einträge im Injektor konfiguriert\\, so werden auch nur die ersten drei Speicherplätze im Inventar der Maschine belegt. Damit wir ein Überlauf im Inventar der Maschine verhindert.\n"..
+  "\n"..
+  "Der Injektor kann auch auf \"Ziehe-Modus\" umgeschaltet werden. Dann zieht er nur Items von den Positionen aus der Kiste\\, die in der Konfiguration des Injektors definiert sind. Hier müssen also Item-Typ und Position überein stimmen. Damit können geziehlt Speicherplätze im Inventar einer Kiste geleert werden.\n"..
+  "\n"..
+  "Die Verarbeitungsleistung beträgt bis zu 8 mal ein Item alle 4 Sekunden.\n"..
   "\n"..
   "\n"..
   "\n",
@@ -1121,7 +1150,9 @@ techage.manual_DE.aText = {
   "\n"..
   "\n",
   "Der Windkraftanlagenblock (Rotor) ist das Herzstück der Windkraftanlage. Dieser Block muss oben auf den Mast gesetzt werden. Idealerweise auf Y = 15\\, dann bleibst du noch gerade innerhalb eines Map-/Forceload-Blocks.\n"..
-  "Sofern alle Bedingungen erfüllt sind\\, erscheinen beim Setzen dieses Blocks auch automatisch die Rotorblätter (Flügel). Anderenfalls wird dir eine Fehlermeldung angezeigt.\n"..
+  "Nach dem Setzen des Blocks wird ein Check durchgeführt\\, ob alle Bedingungen für den Betrieb der Windkraftanlage erfüllt sind. Sofern alle Bedingungen erfüllt sind\\, erscheinen beim Setzen dieses Blocks auch automatisch die Rotorblätter (Flügel). Anderenfalls wird dir eine Fehlermeldung angezeigt. \n"..
+  "\n"..
+  "Durch Schlagen auf den Block kann der Check wiederholt werden.\n"..
   "\n"..
   "\n"..
   "\n",
@@ -1207,12 +1238,12 @@ techage.manual_DE.aText = {
   "Im Prinzip arbeitet das das Wärmespeichersystem genau gleich wie die Akkus\\, nur mit viel mehr Speicherkapazität. \n"..
   "Der Wärmespeicher kann 60 ku aufnehmen und abgeben.\n"..
   "\n"..
-  "Damit das Wärmespeichersystem funktioniert\\, müssen alle Blöcke (außer Betonhülle und Gravel) mit Hilfe eines Forceloadblockes geladen sein.\n"..
+  "Damit das Wärmespeichersystem funktioniert\\, müssen alle Blöcke (auch Betonhülle und Gravel) mit Hilfe eines Forceloadblockes geladen sein.\n"..
   "\n"..
   "\n"..
   "\n",
   "Der Wärmetauscher besteht aus 3 Teilen\\, die aufeinander gesetzt werden müssen\\, wobei der Pfeil des ersten Blockes Richtung Turbine zeigen muss. Die Rohrleitungen müssen mit den gelben TA4 Röhren aufgebaut werden.\n"..
-  "Der Wärmetauscher muss am Stromnetz angeschlossen werden. Der Wärmetauscher kann 60 ku aufnehmen.\n"..
+  "Der Wärmetauscher muss am Stromnetz angeschlossen werden. Der Wärmetauscher lädt den Energiespeicher wieder auf\\, wenn ausreichend Strom zur Verfügung steht und der Energiespeicher weniger als 95 % geladen ist. Der Wärmetauscher nimmt dabei 60 ku auf.\n"..
   "\n"..
   "\n"..
   "\n",
@@ -1241,16 +1272,16 @@ techage.manual_DE.aText = {
   "Damit können Stromspitzen oder ein Überangebot an Strom in Wasserstoff umgewandelt und so gespeichert werden.\n"..
   "\n"..
   "Im Spiel kann Strom mit Hilfe des Elektrolyseurs in Wasserstoff und Wasserstoff über die Brennstoffzelle wieder in Strom umgewandelt werden.\n"..
-  "Damit kann Strom (in Form von Wasserstoff) nicht nur in Tanks gelagert\\, sonder mit Hilfe von Gasflaschen auch mit Wagen (carts) transportiert werden.\n"..
+  "Damit kann Strom (in Form von Wasserstoff) nicht nur in Tanks gelagert\\, sonder mit dem Tankwagen auch transportiert werden.\n"..
   "\n"..
-  "Die Umwandlung von Strom in Wasserstoff und zurück ist aber verlustbehaftet. Von 100 Einheiten Strom kommen nach der Umwandlung in Wasserstoff und zurück nur 83 Einheiten Strom wieder raus.\n"..
+  "Die Umwandlung von Strom in Wasserstoff und zurück ist aber verlustbehaftet. Von 100 Einheiten Strom kommen nach der Umwandlung in Wasserstoff und zurück nur 95 Einheiten Strom wieder raus.\n"..
   "\n"..
   "\n"..
   "\n",
   "Der Elektrolyseur wandelt Strom in Wasserstoff um.\n"..
   "Es muss von links mit Strom versorgt werden. Rechts kann Wasserstoff über Röhren und Pumpen entnommen werden.\n"..
   "\n"..
-  "Der Elektrolyseur kann bis zu 30 ku an Strom aufnehmen und generiert dann alle 4 s ein Wasserstoff Item.\n"..
+  "Der Elektrolyseur kann bis zu 35 ku an Strom aufnehmen und generiert dann alle 4 s ein Wasserstoff Item.\n"..
   "In den Elektrolyseur passen 200 Einheiten Wasserstoff.\n"..
   "\n"..
   "\n"..
@@ -1258,7 +1289,11 @@ techage.manual_DE.aText = {
   "Die Brennstoffzelle wandelt Wasserstoff in Strom um.\n"..
   "Sie muss von links per Pumpe mit Wasserstoff versorgt werden. Rechts ist der Stromanschluss.\n"..
   "\n"..
-  "Die Brennstoffzelle kann bis zu 25 ku an Strom abgeben und benötigt dazu alle 4 s ein Wasserstoff Item.\n"..
+  "Die Brennstoffzelle kann bis zu 34 ku an Strom abgeben und benötigt dazu alle 4 s ein Wasserstoff Item.\n"..
+  "\n"..
+  "Normalerweise arbeitet die Brennstoffzelle als Generator der Kategorie 2 (wie auch anderen Speichersystemen).\n"..
+  "In diesem Fall können keine anderen Blöcke der Kategorie 2 wie der Akku-Block geladen werden.\n"..
+  "Über das Kontrollkästchen kann die Brennstoffzelle jedoch auch als Generator der Kategorie 1 eingesetzt werden.\n"..
   "\n"..
   "\n"..
   "\n",
@@ -1273,7 +1308,7 @@ techage.manual_DE.aText = {
   "  - dem Einfüllstutzen der auf den Reaktorbehälter gesetzt werden muss\n"..
   "  - dem Dosierer\\, welcher über Leitungen mit den Tanks oder Silos sowie dem Einfüllstutzen verbunden werden muss\n"..
   "\n"..
-  "Hinweis 1: Flüssigkeiten werden nur in Tanks gelagert\\, Stoffe in Pulverform nur in Silos. Dies gilt für Zutaten und Ausgangsstoffe.\n"..
+  "Hinweis 1: Flüssigkeiten werden nur in Tanks gelagert\\, feste Stoffe und Stoffe in Pulverform nur in Silos. Dies gilt für Zutaten und Ausgangsstoffe.\n"..
   "\n"..
   "Hinweis 2: Tanks oder Silos mit verschiedenen Inhalten dürfen nicht zu einem Leitungssystem verbunden werden. Mehrere Tanks oder Silos mit gleichem Inhalt dürfen dagegen parallel an einer Leitung hängen.\n"..
   "\n"..
@@ -1490,7 +1525,11 @@ techage.manual_DE.aText = {
   "\n"..
   "\n"..
   "\n",
-  "Mit der Wasserpumpe kann Wasser über Flüssigkeitsleitungen in Tanks gepumpt und so für Rezepte genutzt werden. Die Wasserpumpe muss dazu ins Meer gesetzt werden Ein \"Pool\" aus ein paar Wasserblöcken geht nicht!\n"..
+  "Dieser Block kann nicht mehr gecraftet werden und wird durch den TA4 Wassereinlass Block ersetzt.\n"..
+  "\n",
+  "Für manche Rezepte wird Wasser benötigt. Das Wasser muss mit einer Pumpe aus dem Meer (Wasser auf y = 1) gepumpt werden. Ein \"Pool\" aus ein paar Wasserblöcken ist dafür nicht ausreichend!\n"..
+  "\n"..
+  "Dazu muss der Wassereinlass-Block ins Wasser gesetzt und über Röhren mit der Pumpe verbunden werden. Wird der Block ins Wasser gesetzt\\, so muss darauf geachtet werden\\, dass sich unter dem Block Wasser befindet (Wasser muss mindestens 2 Blöcke tief sein). \n"..
   "\n"..
   "\n"..
   "\n",
@@ -1573,16 +1612,14 @@ techage.manual_DE.aText = {
   "\n"..
   "\n"..
   "\n",
-  "Der Injektor ist ein TA4 Schieber mit speziellen Eigenschaften. Er besitzt ein Menü zur Konfiguration. Hier können bis zu 8 Items konfiguriert werden. Er entnimmt nur diese Items einer Kiste (TA4 Kiste oder TA4 8x2000 Kiste) um sie an Maschinen mit Rezepturen weiterzugeben (Autocrafter\\, Industrieofen und Elektronikfabrik). \n"..
+  "Die Funktion entspricht der von TA3.  \n"..
   "\n"..
-  "Beim Weitergeben wird in der Zielmaschine pro Item nur eine Position im Inventar genutzt. Sind bspw. nur die ersten drei Einträge im Injektor konfiguriert\\, so werden auch nur die ersten drei Speicherplätze im Inventar der Maschine belegt. Damit wir ein Überlauf im Inventar der Maschine verhindert. \n"..
-  "\n"..
-  "Die Verarbeitungsleistung beträgt bis zu 8 Items alle 3 Sekunden.\n"..
+  "Die Verarbeitungsleistung beträgt bis zu 8 mal vier Items alle 4 Sekunden.\n"..
   "\n"..
   "\n"..
   "\n",
   "Der Recycler ist eine Maschine\\, die alle Techage Rezepte rückwärts abarbeitet\\, also Maschinen und Blöcke wieder in die Bestandteile zerlegen kann. Die Maschine kann so ziemlich alle Techage und Hyperloop Blöcke zerlegen.\n"..
-  "Aber nicht alle Materialen lassen sich recyclen:\n"..
+  "Aber nicht alle Zutaten/Materialien der Rezepte lassen sich recyclen:\n"..
   "\n"..
   "  - Holz wird zu Sticks\n"..
   "  - Stein wird zu Sand oder Kies\n"..
@@ -1593,6 +1630,16 @@ techage.manual_DE.aText = {
   "\n"..
   "\n"..
   "\n",
+  "Der TA4 Laser dient zur kabellosen Stromübertagung. Dazu sind zwei Blöcke notwendig: TA4 Laserstrahl Sender und TA4 Laserstrahl Empfänger. Zwischen beiden Blöcken muss sich eine Luftstrecke befinden\\, so dass der Laserstrahl vom Sender bis zum Empfänger aufgebaut werden kann.\n"..
+  "\n"..
+  "Zuerst muss der Sender platziert werden. Dieser schaltet sofort den Laserstahls ein und zeigt damit mögliche Positionen des Empfängers an. Mögliche Positionen für den Empfänger werden auch über eine Chat-Nachricht ausgegeben. Mit dem Laser lassen sich Strecken bis 96 Blöcke überbrücken.\n"..
+  "\n"..
+  "Ist die Verbindung aufgebaut (es muss dazu noch kein Strom fließen)\\, wird dies über den Info-Text des Senders und auch des Empfängers angezeigt.\n"..
+  "\n"..
+  "Die Laserblöcke selbst benötigen keinen Strom.\n"..
+  "\n"..
+  "t\n"..
+  "\n",
 }
 
 techage.manual_DE.aItemName = {
@@ -1626,6 +1673,7 @@ techage.manual_DE.aItemName = {
   "ta2_generator",
   "",
   "tube",
+  "concentrator",
   "ta2_pusher",
   "ta2_distributor",
   "",
@@ -1715,7 +1763,7 @@ techage.manual_DE.aItemName = {
   "ta3_gravelsieve",
   "ta3_gravelrinser",
   "ta3_grinder",
-  "ta3_liquidsampler",
+  "ta3_injector",
   "",
   "ta3_end_wrench",
   "ta3_programmer",
@@ -1777,7 +1825,8 @@ techage.manual_DE.aItemName = {
   "ta4_tank",
   "ta4_pump",
   "ta4_furnaceheater",
-  "ta4_waterpump",
+  "",
+  "ta4_waterinlet",
   "ta4_tube",
   "ta4_pusher",
   "ta4_chest",
@@ -1790,6 +1839,7 @@ techage.manual_DE.aItemName = {
   "ta4_electronicfab",
   "ta4_injector",
   "ta4_recycler",
+  "ta4_laser",
 }
 
 techage.manual_DE.aPlanTable = {
@@ -1825,6 +1875,7 @@ techage.manual_DE.aPlanTable = {
   "",
   "",
   "",
+  "",
   "gravelrinser",
   "",
   "",
@@ -1987,5 +2038,7 @@ techage.manual_DE.aPlanTable = {
   "",
   "",
   "",
+  "",
+  "",
 }
 
diff --git a/techage/doc/manual_EN.lua b/techage/doc/manual_EN.lua
index d2a05ec..929623c 100644
--- a/techage/doc/manual_EN.lua
+++ b/techage/doc/manual_EN.lua
@@ -31,6 +31,7 @@ techage.manual_EN.aTitel = {
   "3,TA2 Power Generator",
   "2,Push and sort items",
   "3,TechAge Tube",
+  "3,Tube Concentrator",
   "3,TA2 Pusher",
   "3,TA2 Distributor",
   "2,Gravel washer",
@@ -119,7 +120,7 @@ techage.manual_EN.aTitel = {
   "3,TA3 Gravel Sieve",
   "3,TA3 Gravel Rinser",
   "3,TA3 Grinder",
-  "3,TA3 Liquid Sampler",
+  "3,TA3 Injector",
   "2,Tools",
   "3,Techage Info Tool",
   "3,TechAge Programmer",
@@ -181,7 +182,8 @@ techage.manual_EN.aTitel = {
   "3,TA4 Tank",
   "3,TA4 Pump",
   "3,TA4 Furnace Heater",
-  "3,TA4 water Pump",
+  "3,TA4 Water Pump (deprecated)",
+  "3,TA4 Water Inlet",
   "3,TA4 Tube",
   "3,TA4 Pusher",
   "3,TA4 Chest",
@@ -193,7 +195,8 @@ techage.manual_EN.aTitel = {
   "3,TA4 Quarry",
   "3,TA4 Electronic Fab",
   "3,TA4 Injector",
-  "3,TA4 recycler",
+  "3,TA4 Recycler",
+  "3,TA4 Laser",
 }
 
 techage.manual_EN.aText = {
@@ -423,6 +426,10 @@ techage.manual_EN.aText = {
   "\n"..
   "\n"..
   "\n",
+  "Several tubes can be combined into one tube via the concentrator. The direction in which all items are passed on is marked with an arrow. \n"..
+  "\n"..
+  "\n"..
+  "\n",
   "A pusher is able to pull items out of boxes or machines and push them into other boxes or machines. In other words\\, there must be one and exactly one pusher between two blocks with inventory. Multiple pushers in a row are not possible.\n"..
   "In the opposite direction\\, however\\, a pusher is permeable for items\\, so that a box can be filled via a tube and also taught.\n"..
   "\n"..
@@ -450,6 +457,12 @@ techage.manual_EN.aText = {
   "\n"..
   "The processing power of a TA2 distributor is 4 items every 2 s\\, whereby the distributor tries to distribute the 4 items to the open outputs.\n"..
   "\n"..
+  "If the same item is configured multiple times in one filter\\, the long term distribution ratio will be influenced accordingly.\n"..
+  "\n"..
+  "Please note that the distribution is a probabilistic process. This means that the distribution rations won't be matched exactly\\, but only in the long term.\n"..
+  "\n"..
+  "The maximum stack size in the filters is 12\\; in total\\, not more than 36 items can be configured.\n"..
+  "\n"..
   "\n"..
   "\n",
   "The gravel washer is a more complex machine with the goal of washing Usmium nuggets out of sieved gravel. A TA2 rinser with axis drive\\, a hopper\\, a chest and running water are required for the installation.\n"..
@@ -681,7 +694,7 @@ techage.manual_EN.aText = {
   "\n",
   "Is part of the TA3 industrial furnace.\n"..
   "\n"..
-  "The oil burner can be operated with fuel oil\\, naphtha or gasoline. The burning time is 80 s for fuel oil\\, 90 s for naphtha and 100 s for gasoline.\n"..
+  "The oil burner can be operated with crude oil\\, fuel oil\\, naphtha or gasoline. The burning time is 64 s for crude oil\\, 80 s for fuel oil\\, 90 s for naphtha and 100 s for gasoline.\n"..
   "\n"..
   "The oil burner can only hold 50 units of fuel. An additional tank and a pump are therefore advisable.\n"..
   "\n"..
@@ -895,32 +908,41 @@ techage.manual_EN.aText = {
   "\n"..
   "\n"..
   "\n",
-  "The TA3 logic block can be programmed so that one or more input signals are linked to one output signal and sent. This block can therefore replace various logic elements such as AND\\, OR\\, NOT\\, XOR etc.\n"..
-  "Input signals for the logic block are 'on' / 'off' commands. An 'on' is a logical 'true'\\, an 'off' corresponds to the 'false'.\n"..
-  "Input signals are referenced by the number\\, e.g. 'n123' for the signal from the transmitter with the number 123.\n"..
+  "The TA3 logic block can be programmed in such a way that one or more input commands are linked to one output command and sent. This block can therefore replace various logic elements such as AND\\, OR\\, NOT\\, XOR etc. \n"..
+  "Input commands for the logic block are 'on' /'off' commands.\n"..
+  "Input commands are referenced via the number\\, e.g. '1234' for the command from the sender with the number 1234. \n"..
+  "The same applies to output commands.\n"..
   "\n"..
-  "* Examples for the IF expression *\n"..
+  "A rule is structured as follows: \n"..
+  "\n"..
+  "    <output> = on/off if <input-expression> is true\n"..
+  "\n"..
+  "'<output>' is the block number to which the command should be sent.\n"..
+  "'<input-expression>' is a boolean expression where input numbers are evaluated.\n"..
+  "\n"..
+  "*Examples for the input expression*\n"..
   "\n"..
   "Negate signal (NOT):\n"..
   "\n"..
-  "    not n123\n"..
+  "    1234 == off\n"..
   "\n"..
   "Logical AND:\n"..
   "\n"..
-  "    n123 and n345\n"..
+  "    1234 == on and 2345 == on\n"..
   "\n"..
   "Logical OR:\n"..
   "\n"..
-  "    n123 or n345\n"..
+  "    1234 == on or 2345 == on\n"..
   "\n"..
-  "If the 'if' expression is true\\, the 'then' branch is executed\\, otherwise the 'else' branch.\n"..
-  "With 'then' and 'else' you can either enter 'true'\\, 'false'\\, or nothing:\n"..
+  "The following operators are allowed:  'and'   'or'   'on'   'off'   'me'   '=='   '~='   '('   ')'\n"..
   "\n"..
-  "  - 'true' will lead to a 'on' command\n"..
-  "  - 'false' will lead to a 'off' command\n"..
-  "  - if nothing is entered\\, nothing is sent\n"..
+  "If the expression is true\\, a command is sent to the block with the '<output>' number. \n"..
+  "Up to four rules can be defined\\, whereby all rules are always checked when a command is received. \n"..
+  "The internal processing time for all commands is 100 ms. \n"..
   "\n"..
-  "The target block or blocks for the output signal must be entered in the target number field.\n"..
+  "Your own node number can be referenced using the keyword 'me'. This makes it possible for the block to send itself a command (flip-flop function). \n"..
+  "\n"..
+  "The blocking time defines a pause after a command\\, during which the logic block does not accept any further external commands. Commands received during the blocking period are thus discarded. The blocking time can be defined in seconds. \n"..
   "\n"..
   "\n"..
   "\n",
@@ -978,6 +1000,12 @@ techage.manual_EN.aText = {
   "\n",
   "The Door Controller II can remove and set all types of blocks. To teach in the Door Controller II\\, the \"Record\" button must be pressed. Then all blocks that should be part of the door / gate must be clicked. Then the \"Done\" button must be pressed. Up to 16 blocks can be selected. The removed blocks are saved in the controller's inventory. The function of the controller can be tested manually using the \"Remove\" or \"Set\" buttons. If an 'on' /'off' command is sent to the Door Controller II\\, it removes or sets the blocks as well.\n"..
   "\n"..
+  "Individual blocks can be set\\, removed or replaced by other blocks via an 'exchange' command. The slot number of the inventory (1 .. 16) must be transferred as payload\\, i.e.:\n"..
+  "\n"..
+  "    $send_cmnd(node_number\\, \"exchange\"\\, 2)\n"..
+  "\n"..
+  "This can also be used to simulate extendable stairs and the like. \n"..
+  "\n"..
   "\n"..
   "\n",
   "The Mesecons converter is used to convert Techage on/off commands into Mesecons signals and vice versa.\n"..
@@ -1024,7 +1052,7 @@ techage.manual_EN.aText = {
   "\n"..
   "\n"..
   "\n",
-  "The function of the TA3 distributor corresponds to that of TA2 with another operating mode.\n"..
+  "The function of the TA3 distributor corresponds to that of TA2.\n"..
   "The processing power is 12 items every 4 s.\n"..
   "\n"..
   "\n"..
@@ -1060,8 +1088,13 @@ techage.manual_EN.aText = {
   "\n"..
   "\n"..
   "\n",
-  "The function corresponds to that of TA2.\n"..
-  "The processing power is 2 items every 8 s. The block requires 5 ku of electricity.\n"..
+  "The injector is a TA3 pusher with special properties. It has a menu for configuration. Up to 8 items can be configured here. He only takes these items from a chest to pass them on to machines with recipes (autocrafter\\, industrial furnace and electronic fab).\n"..
+  "\n"..
+  "When passing on\\, only one position in the inventory is used in the target machine. If\\, for example\\, only the first three entries are configured in the injector\\, only the first three storage locations in the machine's inventory are used. So that an overflow in the machine inventory is prevented.\n"..
+  "\n"..
+  "The injector can also be switched to \"pull mode\". Then he only pulls items out of the chest from the positions that are defined in the configuration of the injector. In this case\\, item type and position must match. This allows to empty specific inventory entries of a chest. \n"..
+  "\n"..
+  "The processing power is up to 8 times one item every 4 seconds.\n"..
   "\n"..
   "\n"..
   "\n",
@@ -1102,7 +1135,9 @@ techage.manual_EN.aText = {
   "\n"..
   "\n",
   "The wind turbine block (rotor) is the heart of the wind turbine. This block must be placed on top of the mast. Ideally at Y = 15\\, then you just stay within a map / forceload block.\n"..
-  "If all conditions are met\\, the rotor blades appear automatically when this block is set. Otherwise you will see an error message.\n"..
+  "After the block has been set\\, a check is carried out to determine whether all conditions for the operation of the wind turbine have been met. If all conditions are met\\, the rotor blades (wings) appear automatically when this block is set. Otherwise you will get an error message.\n"..
+  "\n"..
+  "The check can be repeated by hitting the block. \n"..
   "\n"..
   "\n"..
   "\n",
@@ -1188,12 +1223,12 @@ techage.manual_EN.aText = {
   "In principle\\, the heat storage system works exactly the same as the batteries\\, only with much more storage capacity.\n"..
   "The heat accumulator can hold and deliver 60 ku.\n"..
   "\n"..
-  "In order for the heat storage system to work\\, all blocks (except the concrete shell and gravel) must be loaded using a forceload block.\n"..
+  "In order for the heat storage system to work\\, all blocks (also the concrete shell and gravel) must be loaded using a forceload block.\n"..
   "\n"..
   "\n"..
   "\n",
   "The heat exchanger consists of 3 parts that must be placed on top of each other\\, with the arrow of the first block pointing towards the turbine. The pipes must be built with the yellow TA4 pipes.\n"..
-  "The heat exchanger must be connected to the power grid. The heat exchanger can consume 60 ku.\n"..
+  "The heat exchanger must be connected to the power grid. The heat exchanger charges the energy store again when sufficient electricity is available and the energy storage is less than 95% charged. The heat exchanger takes up 60 ku. \n"..
   "\n"..
   "\n"..
   "\n",
@@ -1222,16 +1257,16 @@ techage.manual_EN.aText = {
   "This enables current peaks or an excess supply of electricity to be converted into hydrogen and thus stored.\n"..
   "\n"..
   "In the game\\, electricity can be converted back into electricity via the fuel cell using the electrolyzer in hydrogen and hydrogen.\n"..
-  "This means that electricity (in the form of hydrogen) can not only be stored in tanks\\, but can also be transported with carts using gas cylinders.\n"..
+  "This means that electricity (in the form of hydrogen) can not only be stored in tanks\\, but also transported by means of the tank cart.\n"..
   "\n"..
-  "However\\, the conversion of electricity into hydrogen and back is lossy. Out of 100 units of electricity\\, only 83 units of electricity come out after the conversion to hydrogen and back.\n"..
+  "However\\, the conversion of electricity into hydrogen and back is lossy. Out of 100 units of electricity\\, only 95 units of electricity come out after the conversion to hydrogen and back.\n"..
   "\n"..
   "\n"..
   "\n",
   "The electrolyzer converts electricity into hydrogen.\n"..
   "It must be powered from the left. On the right\\, hydrogen can be extracted via pipes and pumps.\n"..
   "\n"..
-  "The electrolyzer can draw up to 30 ku of electricity and then generates a hydrogen item every 4 s.\n"..
+  "The electrolyzer can draw up to 35 ku of electricity and then generates a hydrogen item every 4 s.\n"..
   "200 units of hydrogen fit into the electrolyzer.\n"..
   "\n"..
   "\n"..
@@ -1239,7 +1274,10 @@ techage.manual_EN.aText = {
   "The fuel cell converts hydrogen into electricity.\n"..
   "It must be supplied with hydrogen from the left by a pump. The power connection is on the right.\n"..
   "\n"..
-  "The fuel cell can deliver up to 25 ku of electricity and needs a hydrogen item every 4 s.\n"..
+  "The fuel cell can deliver up to 34 ku of electricity and needs a hydrogen item every 4 s.\n"..
+  "\n"..
+  "Usually the fuel cell works as a category 2 generator (like other storage systems). \n"..
+  "In this case\\, no other category 2 blocks such as the battery block can be charged. However\\, the fuel cell can also be used as a category 1 generator via the check box.\n"..
   "\n"..
   "\n"..
   "\n",
@@ -1255,7 +1293,7 @@ techage.manual_EN.aText = {
   "  - The filler pipe that must be placed on the reactor vessel\n"..
   "  - The dosing device\\, which has to be connected to the tanks or silos and the filler pipe via pipes\n"..
   "\n"..
-  "Note 1: Liquids are only stored in tanks\\, substances in powder form only in silos. This applies to ingredients and raw materials.\n"..
+  "Note 1: Liquids are only stored in tanks\\, solids and substances in powder form only in silos. This applies to ingredients and raw materials.\n"..
   "\n"..
   "Note 2: Tanks or silos with different contents must not be connected to a pipe system. In contrast\\, several tanks or silos with the same content may hang in parallel on one line.\n"..
   "\n"..
@@ -1472,7 +1510,11 @@ techage.manual_EN.aText = {
   "\n"..
   "\n"..
   "\n",
-  "With the water pump\\, water can be pumped through liquid lines in tanks and thus used for recipes. The water pump has to be placed in the sea. A \"pool\" consisting of a few blocks of water is not possible!\n"..
+  "This block can no longer be crafted and will be replaced by the TA4 water inlet block. \n"..
+  "\n",
+  "Some recipes require water. The water must be pumped from the sea with a pump (water at y = 1). A \"pool\" made up of a few water blocks is not sufficient for this! \n"..
+  "\n"..
+  "To do this\\, the water inlet block must be placed in the water and connected to the pump via pipes. If the block is placed in the water\\, it must be ensured that there is water under the block (water must be at least 2 blocks deep). \n"..
   "\n"..
   "\n"..
   "\n",
@@ -1555,17 +1597,15 @@ techage.manual_EN.aText = {
   "\n"..
   "\n"..
   "\n",
-  "The injector is a TA4 pusher with special properties. It has a menu for configuration. Up to 8 items can be configured here. He only takes these items from a chest (TA4 chest or TA4 8x2000 chest) to pass them on to machines with recipes (autocrafter\\, industrial furnace and electronic fab).\n"..
+  "The function corresponds to that of TA3.\n"..
   "\n"..
-  "When passing on\\, only one position in the inventory is used in the target machine. If\\, for example\\, only the first three entries are configured in the injector\\, only the first three storage locations in the machine's inventory are used. So that an overflow in the machine inventory is prevented.\n"..
-  "\n"..
-  "The processing power is up to 8 items every 3 seconds.\n"..
+  "The processing power is up to 8 times four items every 4 seconds.\n"..
   "\n"..
   "\n"..
   "\n",
   "The recycler is a machine that processes all Techage recipes backwards\\, i.e. it can dismantle machines and blocks back into their components. \n"..
   "\n"..
-  "The machine can disassemble pretty much any Techage and Hyperloop blocks. But not all materials can be recycled:\n"..
+  "The machine can disassemble pretty much any Techage and Hyperloop blocks. But not all recipe items/materials can be recycled:\n"..
   "\n"..
   "  - Wood turns into sticks\n"..
   "  - Stone turns into sand or gravel\n"..
@@ -1576,6 +1616,14 @@ techage.manual_EN.aText = {
   "\n"..
   " \n"..
   "\n",
+  "The TA4 laser is used for wireless power transmission. Two blocks are required for this: TA4 Laser Beam Emitter and TA4 Laser Beam Receiver. There must be an air gap between the two blocks so that the laser beam can be built up from the emitter to the receiver. First the emitter must be placed. This immediately switches on the laser beam and shows possible positions of the receiver. Possible positions for the receiver are also output via a chat message. \n"..
+  "\n"..
+  "With the laser\\, distances of up to 96 blocks can be bridged. Once the connection has been established (no current has to flow)\\, this is indicated via the info text of the emitter and also of the receiver. \n"..
+  "\n"..
+  "The laser blocks themselves do not require any electricity.\n"..
+  "\n"..
+  "\n"..
+  "\n",
 }
 
 techage.manual_EN.aItemName = {
@@ -1609,6 +1657,7 @@ techage.manual_EN.aItemName = {
   "ta2_generator",
   "",
   "tube",
+  "concentrator",
   "ta2_pusher",
   "ta2_distributor",
   "",
@@ -1697,7 +1746,7 @@ techage.manual_EN.aItemName = {
   "ta3_gravelsieve",
   "ta3_gravelrinser",
   "ta3_grinder",
-  "ta3_liquidsampler",
+  "ta3_injector",
   "",
   "ta3_end_wrench",
   "ta3_programmer",
@@ -1759,7 +1808,8 @@ techage.manual_EN.aItemName = {
   "ta4_tank",
   "ta4_pump",
   "ta4_furnaceheater",
-  "ta4_waterpump",
+  "",
+  "ta4_waterinlet",
   "ta4_tube",
   "ta4_pusher",
   "ta4_chest",
@@ -1772,6 +1822,7 @@ techage.manual_EN.aItemName = {
   "ta4_electronicfab",
   "ta4_injector",
   "ta4_recycler",
+  "ta4_laser",
 }
 
 techage.manual_EN.aPlanTable = {
@@ -1807,6 +1858,7 @@ techage.manual_EN.aPlanTable = {
   "",
   "",
   "",
+  "",
   "gravelrinser",
   "",
   "",
@@ -1968,5 +2020,7 @@ techage.manual_EN.aPlanTable = {
   "",
   "",
   "",
+  "",
+  "",
 }
 
diff --git a/techage/energy_storage/generator.lua b/techage/energy_storage/generator.lua
index cd36b3a..7e38079 100644
--- a/techage/energy_storage/generator.lua
+++ b/techage/energy_storage/generator.lua
@@ -228,6 +228,9 @@ techage.register_node({"techage:ta4_generator", "techage:ta4_generator_on"}, {
 		local nvm = techage.get_nvm(pos)
 		if topic == "delivered" then
 			return math.floor((nvm.provided or 0) + 0.5)
+		elseif topic == "load" then
+			local capa_max, capa = transfer_turbine(pos, "state")
+			return techage.power.percent(capa_max, capa)
 		else
 			return State:on_receive_message(pos, topic, payload)
 		end
diff --git a/techage/energy_storage/heatexchanger1.lua b/techage/energy_storage/heatexchanger1.lua
index 512e64e..2bb016b 100644
--- a/techage/energy_storage/heatexchanger1.lua
+++ b/techage/energy_storage/heatexchanger1.lua
@@ -22,9 +22,9 @@ local CYCLE_TIME = 2
 local PWR_PERF = 60
 local GRVL_CAPA = 700
 local PWR_CAPA = {
-	[3] = GRVL_CAPA * 3 * 3 * 3,  -- 18900 Cyc = 630 min = 31.5 Tage bei einem ku, oder 31,5 * 24 kuh = 756 kuh = 12,6 h bei 60 ku
-	[5] = GRVL_CAPA * 5 * 5 * 5,  -- ~2.5 days
-	[7] = GRVL_CAPA * 7 * 7 * 7,  --   ~6 days
+	[5] = GRVL_CAPA * 3 * 3 * 3,  -- 18900 Cyc = 630 min = 31.5 Tage bei einem ku, oder 31,5 * 24 kuh = 756 kuh = 12,6 h bei 60 ku
+	[7] = GRVL_CAPA * 5 * 5 * 5,  -- ~2.5 days
+	[9] = GRVL_CAPA * 7 * 7 * 7,  --   ~6 days
 }
 
 local Cable = techage.ElectricCable
@@ -171,7 +171,7 @@ local function node_timer(pos, elapsed)
 	local taken = 0
 	local given = 0
 	
-	if nvm.capa < (nvm.capa_max * 0.9) and not nvm.charging then
+	if nvm.capa < (nvm.capa_max * 0.95) and not nvm.charging then
 		taken = power.consumer_alive(pos, Cable, CYCLE_TIME)
 	elseif nvm.capa < nvm.capa_max and nvm.charging then
 		taken = power.consumer_alive(pos, Cable, CYCLE_TIME)
diff --git a/techage/energy_storage/inlet.lua b/techage/energy_storage/inlet.lua
index 9511510..f0050dd 100644
--- a/techage/energy_storage/inlet.lua
+++ b/techage/energy_storage/inlet.lua
@@ -112,8 +112,9 @@ local function get_diameter(pos, in_dir)
 end
 
 local function check_volume(pos, in_dir, owner)
-	local radius = (get_diameter(pos, in_dir) - 1) / 2
-	if radius then
+	local diameter = get_diameter(pos, in_dir)
+	if diameter then
+		local radius = (diameter - 1) / 2
 		local dir = tubelib2.Dir6dToVector[in_dir]
 		local cpos = vector.add(pos, vector.multiply(dir, radius))
 		-- calculate size
@@ -138,8 +139,9 @@ end
 
 -- provide position behind the obsidian_glass
 local function check_window(pos, in_dir)
-	local radius = (get_diameter(pos, in_dir) - 1) / 2
-	if radius then
+	local diameter = get_diameter(pos, in_dir)
+	if diameter then
+		local radius = (diameter - 1) / 2
 		local dir = tubelib2.Dir6dToVector[in_dir]
 		local cpos = vector.add(pos, vector.multiply(dir, radius))
 		-- calculate size
diff --git a/techage/energy_storage/turbine.lua b/techage/energy_storage/turbine.lua
index 1116d54..4e540b2 100644
--- a/techage/energy_storage/turbine.lua
+++ b/techage/energy_storage/turbine.lua
@@ -23,6 +23,11 @@ local function transfer_heatexchanger3(pos, topic, payload)
 		{"techage:heatexchanger3"})
 end
 
+local function transfer_heatexchanger1(pos, topic, payload)
+	return techage.transfer(pos, "L", topic, payload, Pipe, 
+		{"techage:heatexchanger1"})
+end
+
 local function transfer_generator(pos, topic, payload)
 	return techage.transfer(pos, "R", topic, payload, nil, 
 		{"techage:ta4_generator", "techage:ta4_generator_on"})
@@ -156,6 +161,8 @@ techage.register_node({"techage:ta4_turbine", "techage:ta4_turbine_on"}, {
 			stop_sound(pos)
 			nvm.running = false
 			return true
+		elseif topic == "state" then
+			return transfer_heatexchanger1(pos, topic, payload)
 		end
 	end,
 	on_node_load = function(pos, node)
diff --git a/techage/furnace/firebox.lua b/techage/furnace/firebox.lua
index 614e913..a6f2ca5 100644
--- a/techage/furnace/firebox.lua
+++ b/techage/furnace/firebox.lua
@@ -82,10 +82,10 @@ end
 
 local _liquid = {
 	capa = fuel.CAPACITY,
-	fuel_cat = fuel.BT_OIL,
+	fuel_cat = fuel.BT_BITUMEN,
 	peek = liquid.srv_peek,
 	put = function(pos, indir, name, amount)
-		if fuel.valid_fuel(name, fuel.BT_OIL) then
+		if fuel.valid_fuel(name, fuel.BT_BITUMEN) then
 			local res = liquid.srv_put(pos, indir, name, amount)
 			if techage.is_activeformspec(pos) then
 				local nvm = techage.get_nvm(pos)
diff --git a/techage/furnace/furnace_top.lua b/techage/furnace/furnace_top.lua
index 6e0dafc..52e7642 100644
--- a/techage/furnace/furnace_top.lua
+++ b/techage/furnace/furnace_top.lua
@@ -212,14 +212,22 @@ tiles.pas = {
 	-- up, down, right, left, back, front
 	"techage_concrete.png^techage_frame_ta#_top.png",
 	"techage_concrete.png^techage_frame_ta#_top.png",
-	"techage_concrete.png^techage_frame_ta#.png",
-	"techage_concrete.png^techage_frame_ta#.png",
+	"techage_concrete.png^techage_frame_ta#.png^techage_appl_outp.png",
+	"techage_concrete.png^techage_frame_ta#.png^techage_appl_inp.png",
 	"techage_concrete.png^techage_frame_ta#.png",
 	"techage_concrete.png^techage_appl_furnace.png^techage_frame_ta#.png",
 }
 tiles.act = tiles.pas
 
 local tubing = {
+	on_inv_request = function(pos, in_dir, access_type)
+		if access_type == "push" then
+			local meta = minetest.get_meta(pos)
+			if meta:get_int("push_dir") == in_dir  or in_dir == 5 then
+				return meta:get_inventory(), "src"
+			end
+		end
+	end,
 	on_pull_item = function(pos, in_dir, num)
 		local meta = minetest.get_meta(pos)
 		if meta:get_int("pull_dir") == in_dir then
diff --git a/techage/furnace/heater.lua b/techage/furnace/heater.lua
index ac77f72..98cde08 100644
--- a/techage/furnace/heater.lua
+++ b/techage/furnace/heater.lua
@@ -131,9 +131,9 @@ Cable:add_secondary_node_names({"techage:furnace_heater", "techage:furnace_heate
 minetest.register_craft({
 	output = "techage:furnace_heater",
 	recipe = {
-		{'techage:basalt_stone', 'default:steel_ingot', 'techage:basalt_stone'},
-		{'default:steel_ingot', 'basic_materials:heating_element', 'default:steel_ingot'},
-		{'techage:basalt_stone', 'techage:basalt_stone', 'techage:basalt_stone'},
+		{'techage:aluminum', 'default:steel_ingot', 'techage:aluminum'},
+		{'techage:basalt_stone', 'basic_materials:heating_element', 'techage:basalt_stone'},
+		{'techage:aluminum', 'techage:ta4_furnace_ceramic', 'techage:aluminum'},
 	},
 })
 
diff --git a/techage/hydrogen/electrolyzer.lua b/techage/hydrogen/electrolyzer.lua
index 13890c5..48bea97 100644
--- a/techage/hydrogen/electrolyzer.lua
+++ b/techage/hydrogen/electrolyzer.lua
@@ -24,7 +24,7 @@ local networks = techage.networks
 
 local CYCLE_TIME = 2
 local STANDBY_TICKS = 3
-local PWR_NEEDED = 30
+local PWR_NEEDED = 35
 local PWR_UNITS_PER_HYDROGEN_ITEM = 80
 local CAPACITY = 200
 
@@ -304,7 +304,7 @@ minetest.register_craft({
 	output = "techage:ta4_electrolyzer",
 	recipe = {
 		{'default:steel_ingot', 'dye:blue', 'default:steel_ingot'},
-		{'techage:electric_cableS', 'default:glass', 'techage:tubeS'},
+		{'techage:electric_cableS', 'default:glass', 'techage:ta3_pipeS'},
 		{'default:steel_ingot', "techage:ta4_wlanchip", 'default:steel_ingot'},
 	},
 })
diff --git a/techage/hydrogen/fuelcell.lua b/techage/hydrogen/fuelcell.lua
index 1c1e040..b7822f9 100644
--- a/techage/hydrogen/fuelcell.lua
+++ b/techage/hydrogen/fuelcell.lua
@@ -24,10 +24,26 @@ local networks = techage.networks
 
 local CYCLE_TIME = 2
 local STANDBY_TICKS = 4
-local PWR_CAPA = 25
-local PWR_UNITS_PER_HYDROGEN_ITEM = 80
+local PWR_CAPA = 34
+local PWR_UNITS_PER_HYDROGEN_ITEM = 75
 local CAPACITY = 100
 
+local States = {}
+local STATE = function(pos) return States[techage.get_node_lvm(pos).name] end
+
+local function is_gen1(nvm)
+	if not nvm.running then
+		local is_gen1 = dump(nvm.is_gen1 or false)
+		return "checkbox[0.3,0.5;is_gen1;"..S("Cat. 1 generator")..";"..is_gen1.."]"..
+			"tooltip[0.3,0.5;1,1;"..S("If set, fuelcell will work\nas cat. 1 generator")..";#0C3D32;#FFFFFF]"
+	end
+	if nvm.is_gen1 then
+		return "label[0.5,0.7;"..S("Cat. 1 generator").."]"
+	else
+		return "label[0.5,0.7;"..S("Cat. 2 generator").."]"
+	end
+end
+
 local function formspec(self, pos, nvm)
 	local amount = (nvm.liquid and nvm.liquid.amount) or 0
 	local lqd_name = (nvm.liquid and nvm.liquid.name) or "techage:liquid"
@@ -46,6 +62,7 @@ local function formspec(self, pos, nvm)
 		"label[2.5,-0.1;"..minetest.colorize( "#000000", S("Fuel Cell")).."]"..
 		techage.item_image(0.5,2, lqd_name)..
 		arrow..
+		is_gen1(nvm)..
 		"image_button[2,2.5;1,1;".. self:get_state_button_image(nvm) ..";state_button;]"..
 		"tooltip[2,2.5;1,1;"..self:get_state_tooltip(nvm).."]"..
 		techage.power.formspec_label_bar(pos, 3.5, 0.8, S("Electricity"), PWR_CAPA, nvm.given)
@@ -71,7 +88,7 @@ local State = techage.NodeStates:new({
 	cycle_time = CYCLE_TIME,
 	standby_ticks = STANDBY_TICKS,
 	formspec_func = formspec,
-	infotext_name = S("TA4 Fuel Cell"),
+	infotext_name = S("TA4 Fuel Cell Gen2"),
 	start_node = start_node,
 	stop_node = stop_node,
 })
@@ -94,18 +111,19 @@ end
 -- converts hydrogen into power
 local function node_timer(pos, elapsed)
 	local nvm = techage.get_nvm(pos)
+	local state = STATE(pos)
 	--print("fuelcell", nvm.running, nvm.given, nvm.num_pwr_units)
 	if has_hydrogen(nvm) then
 		local outdir = M(pos):get_int("outdir")
 		nvm.given = power.generator_alive(pos, Cable, CYCLE_TIME, outdir)
 		consuming(pos, nvm)
-		State:keep_running(pos, nvm, 1) -- TODO warum hier 1 und nicht COUNTDOWN_TICKS?
+		state:keep_running(pos, nvm, 1) -- TODO warum hier 1 und nicht COUNTDOWN_TICKS?
 	else
-		State:standby(pos, nvm)
+		state:standby(pos, nvm)
 		nvm.given = 0
 	end
 	if techage.is_activeformspec(pos) then
-		M(pos):set_string("formspec", formspec(State, pos, nvm))
+		M(pos):set_string("formspec", formspec(state, pos, nvm))
 	end
 	return true
 end
@@ -115,14 +133,26 @@ local function on_receive_fields(pos, formname, fields, player)
 		return
 	end
 	local nvm = techage.get_nvm(pos)
-	State:state_button_event(pos, nvm, fields)
-	M(pos):set_string("formspec", formspec(State, pos, nvm))
+	if fields.is_gen1 then
+		nvm.is_gen1 = fields.is_gen1 == "true"
+		local node = minetest.get_node(pos)
+		if nvm.is_gen1 then
+			node.name = "techage:ta4_fuelcell2"
+		else
+			node.name = "techage:ta4_fuelcell"
+		end
+		minetest.swap_node(pos, node)
+		local outdir = M(pos):get_int("outdir")
+		techage.power.update_network(pos, outdir, Cable)
+	end
+	STATE(pos):state_button_event(pos, nvm, fields)
+	M(pos):set_string("formspec", formspec(STATE(pos), pos, nvm))
 end
 
 local function on_rightclick(pos, node, clicker)
 	local nvm = techage.get_nvm(pos)
 	techage.set_activeformspec(pos, clicker)
-	M(pos):set_string("formspec", formspec(State, pos, nvm))
+	M(pos):set_string("formspec", formspec(STATE(pos), pos, nvm))
 end
 
 local function after_place_node(pos)
@@ -130,7 +160,7 @@ local function after_place_node(pos)
 	nvm.running = false
 	nvm.num_pwr_units = 0
 	local number = techage.add_node(pos, "techage:ta4_fuelcell")
-	State:node_init(pos, nvm, number)
+	STATE(pos):node_init(pos, nvm, number)
 	local node = minetest.get_node(pos)
 	M(pos):set_int("outdir", networks.side_to_outdir(pos, "R"))
 	Pipe:after_place_node(pos)
@@ -173,7 +203,7 @@ local liquid_def = {
 		local leftover = liquid.srv_put(pos, indir, name, amount)
 		if techage.is_activeformspec(pos) then
 			local nvm = techage.get_nvm(pos)
-			M(pos):set_string("formspec", formspec(State, pos, nvm))
+			M(pos):set_string("formspec", formspec(STATE(pos), pos, nvm))
 		end
 		return leftover
 	end,
@@ -181,7 +211,7 @@ local liquid_def = {
 		amount, name = liquid.srv_take(pos, indir, name, amount)
 		if techage.is_activeformspec(pos) then
 			local nvm = techage.get_nvm(pos)
-			M(pos):set_string("formspec", formspec(State, pos, nvm))
+			M(pos):set_string("formspec", formspec(STATE(pos), pos, nvm))
 		end
 		return amount, name
 	end
@@ -269,9 +299,126 @@ minetest.register_node("techage:ta4_fuelcell_on", {
 	light_source = 6,
 })
 
-Cable:add_secondary_node_names({"techage:ta4_fuelcell", "techage:ta4_fuelcell_on"})
-Pipe:add_secondary_node_names({"techage:ta4_fuelcell", "techage:ta4_fuelcell_on"})
-techage.register_node({"techage:ta4_fuelcell", "techage:ta4_fuelcell_on"}, {
+-------------------------------------------------------------------------------
+-- Gen1 fuellcell
+-------------------------------------------------------------------------------
+local State2 = techage.NodeStates:new({
+	node_name_passive = "techage:ta4_fuelcell2",
+	node_name_active = "techage:ta4_fuelcell2_on",
+	cycle_time = CYCLE_TIME,
+	standby_ticks = STANDBY_TICKS,
+	formspec_func = formspec,
+	infotext_name = S("TA4 Fuel Cell Gen1"),
+	start_node = start_node,
+	stop_node = stop_node,
+})
+
+local netw_def2 = {
+	pipe2 = {
+		sides = {L = 1}, -- Pipe connection sides
+		ntype = "tank",
+	},
+	ele1 = {
+		sides = {R = 1}, -- Cable connection sides
+		ntype = "gen1",
+		nominal = PWR_CAPA - 1, -- to be able to distiguish between cat1 and 2
+	},
+}
+
+minetest.register_node("techage:ta4_fuelcell2", {
+	description = S("TA4 Fuel Cell"),
+	tiles = {
+		-- up, down, right, left, back, front
+		"techage_filling_ta4.png^techage_frame_ta4_top.png^techage_appl_arrow.png",
+		"techage_filling_ta4.png^techage_frame_ta4.png",
+		"techage_filling_ta4.png^techage_frame_ta4.png^techage_appl_hole_electric.png",
+		"techage_filling_ta4.png^techage_frame_ta4.png^techage_appl_hole_pipe.png",
+		"techage_filling_ta4.png^techage_frame_ta4.png^techage_appl_fuelcell.png^techage_appl_ctrl_unit.png^[transformFX",
+		"techage_filling_ta4.png^techage_frame_ta4.png^techage_appl_fuelcell.png^techage_appl_ctrl_unit.png",
+	},
+
+	can_dig = function(pos, player)
+		if minetest.is_protected(pos, player:get_player_name()) then
+			return false
+		end
+		return liquid.is_empty(pos)
+	end,
+	
+	after_place_node = after_place_node,
+	after_dig_node = after_dig_node,
+	tubelib2_on_update2 = tubelib2_on_update2,
+	on_punch = liquid.on_punch,
+	networks = netw_def2,
+	liquid = liquid_def,
+	on_receive_fields = on_receive_fields,
+	on_timer = node_timer,
+	on_rightclick = on_rightclick,
+	
+	paramtype2 = "facedir",
+	groups = {cracky=2, crumbly=2, choppy=2, not_in_creative_inventory=1},
+	on_rotate = screwdriver.disallow,
+	is_ground_content = false,
+	drop = "techage:ta4_fuelcell",
+})
+
+minetest.register_node("techage:ta4_fuelcell2_on", {
+	description = S("TA4 Fuel Cell"),
+	tiles = {
+		-- up, down, right, left, back, front
+		"techage_filling_ta4.png^techage_frame_ta4_top.png^techage_appl_arrow.png",
+		"techage_filling_ta4.png^techage_frame_ta4.png",
+		"techage_filling_ta4.png^techage_frame_ta4.png^techage_appl_hole_electric.png",
+		"techage_filling_ta4.png^techage_frame_ta4.png^techage_appl_hole_pipe.png",
+		{
+			image = "techage_filling4_ta4.png^techage_frame4_ta4.png^techage_appl_fuelcell4.png^techage_appl_ctrl_unit4.png^[transformFX",
+			backface_culling = false,
+			animation = {
+				type = "vertical_frames",
+				aspect_w = 32,
+				aspect_h = 32,
+				length = 0.8,
+			},
+		},
+		{
+			image = "techage_filling4_ta4.png^techage_frame4_ta4.png^techage_appl_fuelcell4.png^techage_appl_ctrl_unit4.png",
+			backface_culling = false,
+			animation = {
+				type = "vertical_frames",
+				aspect_w = 32,
+				aspect_h = 32,
+				length = 0.8,
+			},
+		},
+	},
+
+	tubelib2_on_update2 = tubelib2_on_update2,
+	networks = netw_def2,
+	liquid = liquid_def,
+	on_receive_fields = on_receive_fields,
+	on_punch = liquid.on_punch,
+	on_timer = node_timer,
+	on_rightclick = on_rightclick,
+
+	paramtype2 = "facedir",
+	groups = {not_in_creative_inventory=1},
+	on_rotate = screwdriver.disallow,
+	is_ground_content = false,
+	diggable = false,
+	paramtype = "light",
+	light_source = 6,
+})
+
+States["techage:ta4_fuelcell"] = State
+States["techage:ta4_fuelcell_on"] = State
+States["techage:ta4_fuelcell2"] = State2
+States["techage:ta4_fuelcell2_on"] = State2
+
+Cable:add_secondary_node_names({"techage:ta4_fuelcell", "techage:ta4_fuelcell_on", 
+		"techage:ta4_fuelcell2", "techage:ta4_fuelcell2_on"})
+Pipe:add_secondary_node_names({"techage:ta4_fuelcell", "techage:ta4_fuelcell_on", 
+		"techage:ta4_fuelcell2", "techage:ta4_fuelcell2_on"})
+techage.register_node({"techage:ta4_fuelcell", "techage:ta4_fuelcell_on", 
+		"techage:ta4_fuelcell2", "techage:ta4_fuelcell2_on"}, {
 	on_recv_message = function(pos, src, topic, payload)
 		local nvm = techage.get_nvm(pos)
 		if topic == "load" then
@@ -279,7 +426,7 @@ techage.register_node({"techage:ta4_fuelcell", "techage:ta4_fuelcell_on"}, {
 		elseif topic == "delivered" then
 			return math.floor((nvm.given or 0) + 0.5)
 		else
-			return State:on_receive_message(pos, topic, payload)
+			return STATE(pos):on_receive_message(pos, topic, payload)
 		end
 	end,
 })	
@@ -288,8 +435,7 @@ minetest.register_craft({
 	output = "techage:ta4_fuelcell",
 	recipe = {
 		{'default:steel_ingot', 'dye:blue', 'default:steel_ingot'},
-		{'techage:tubeS', 'techage:ta4_fuelcellstack', 'techage:electric_cableS'},
+		{'techage:ta3_pipeS', 'techage:ta4_fuelcellstack', 'techage:electric_cableS'},
 		{'default:steel_ingot', "techage:ta4_wlanchip", 'default:steel_ingot'},
 	},
 })
-
diff --git a/techage/i18n.py b/techage/i18n.py
index 335716f..e66de31 100755
--- a/techage/i18n.py
+++ b/techage/i18n.py
@@ -21,20 +21,24 @@ params = {"recursive": False,
     "mods": False,
     "verbose": False,
     "folders": [],
-    "no-old-file": False
+    "no-old-file": False,
+    "break-long-lines": False,
+    "sort": False
 }
 # Available CLI options
 options = {"recursive": ['--recursive', '-r'],
     "help": ['--help', '-h'],
-    "mods": ['--installed-mods'],
+    "mods": ['--installed-mods', '-m'],
     "verbose": ['--verbose', '-v'],
-    "no-old-file": ['--no-old-file']
+    "no-old-file": ['--no-old-file', '-O'],
+    "break-long-lines": ['--break-long-lines', '-b'],
+    "sort": ['--sort', '-s']
 }
 
 # Strings longer than this will have extra space added between
 # them in the translation files to make it easier to distinguish their
 # beginnings and endings at a glance
-doublespace_threshold = 60
+doublespace_threshold = 80
 
 def set_params_folders(tab: list):
     '''Initialize params["folders"] from CLI arguments.'''
@@ -69,6 +73,10 @@ DESCRIPTION
         run on locally installed modules
     {', '.join(options["no-old-file"])}
         do not create *.old files
+    {', '.join(options["sort"])}
+        sort output strings alphabetically
+    {', '.join(options["break-long-lines"])}
+        add extra line breaks before and after long strings
     {', '.join(options["verbose"])}
         add output information
 ''')
@@ -216,22 +224,24 @@ def strings_to_text(dkeyStrings, dOld, mod_name, header_comments):
     lOut = [f"# textdomain: {mod_name}\n"]
     if header_comments is not None:
         lOut.append(header_comments)
-    
+
     dGroupedBySource = {}
 
     for key in dkeyStrings:
         sourceList = list(dkeyStrings[key])
-        sourceList.sort()
+        if params["sort"]:
+            sourceList.sort()
         sourceString = "\n".join(sourceList)
         listForSource = dGroupedBySource.get(sourceString, [])
         listForSource.append(key)
         dGroupedBySource[sourceString] = listForSource
-    
+
     lSourceKeys = list(dGroupedBySource.keys())
     lSourceKeys.sort()
     for source in lSourceKeys:
         localizedStrings = dGroupedBySource[source]
-        localizedStrings.sort()
+        if params["sort"]:
+            localizedStrings.sort()
         lOut.append("")
         lOut.append(source)
         lOut.append("")
@@ -239,12 +249,12 @@ def strings_to_text(dkeyStrings, dOld, mod_name, header_comments):
             val = dOld.get(localizedString, {})
             translation = val.get("translation", "")
             comment = val.get("comment")
-            if len(localizedString) > doublespace_threshold and not lOut[-1] == "":
+            if params["break-long-lines"] and len(localizedString) > doublespace_threshold and not lOut[-1] == "":
                 lOut.append("")
             if comment != None:
                 lOut.append(comment)
             lOut.append(f"{localizedString}={translation}")
-            if len(localizedString) > doublespace_threshold:
+            if params["break-long-lines"] and len(localizedString) > doublespace_threshold:
                 lOut.append("")
 
 
@@ -260,12 +270,12 @@ def strings_to_text(dkeyStrings, dOld, mod_name, header_comments):
                 if not unusedExist:
                     unusedExist = True
                     lOut.append("\n\n##### not used anymore #####\n")
-                if len(key) > doublespace_threshold and not lOut[-1] == "":
+                if params["break-long-lines"] and len(key) > doublespace_threshold and not lOut[-1] == "":
                     lOut.append("")
                 if comment != None:
                     lOut.append(comment)
                 lOut.append(f"{key}={translation}")
-                if len(key) > doublespace_threshold:
+                if params["break-long-lines"] and len(key) > doublespace_threshold:
                     lOut.append("")
     return "\n".join(lOut) + '\n'
 
@@ -274,7 +284,7 @@ def strings_to_text(dkeyStrings, dOld, mod_name, header_comments):
 def write_template(templ_file, dkeyStrings, mod_name):
     # read existing template file to preserve comments
     existing_template = import_tr_file(templ_file)
-    
+
     text = strings_to_text(dkeyStrings, existing_template[0], mod_name, existing_template[2])
     mkdir_p(os.path.dirname(templ_file))
     with open(templ_file, "wt", encoding='utf-8') as template_file:
@@ -299,7 +309,7 @@ def read_lua_file_strings(lua_file):
             strings.append(s[1])
         for s in pattern_lua_bracketed_fs.findall(text):
             strings.append(s)
-                
+
         for s in strings:
             s = re.sub(r'"\.\.\s+"', "", s)
             s = re.sub("@[^@=0-9]", "@@", s)
@@ -335,7 +345,7 @@ def import_tr_file(tr_file):
                 if line[:3] == "###":
                     if header_comment is None:
                         # Save header comments
-                        header_comment = latest_comment_block or ""
+                        header_comment = latest_comment_block
                         # Stip textdomain line
                         tmp_h_c = ""
                         for l in header_comment.split('\n'):
@@ -383,7 +393,7 @@ def generate_template(folder, mod_name):
                     sources = dOut.get(s, set())
                     sources.add(f"### {os.path.basename(fname)} ###")
                     dOut[s] = sources
-                    
+
     if len(dOut) == 0:
         return None
     templ_file = os.path.join(folder, "locale/template.txt")
@@ -445,4 +455,5 @@ def run_all_subfolders(folder):
         update_folder(modfolder + "/")
 
 
+_argv.append("--sort")
 main()
diff --git a/techage/icta_controller/battery.lua b/techage/icta_controller/battery.lua
index 7a3e185..2d84c7d 100644
--- a/techage/icta_controller/battery.lua
+++ b/techage/icta_controller/battery.lua
@@ -94,11 +94,12 @@ minetest.register_node("techage:ta4_battery", {
 		local meta = drops[1]:get_meta()
 		meta:set_int("content", content)
 		local percent = calc_percent(content)
-		local text = S("Digtron Battery").." ("..percent.." %)"
+		local text = S("Battery").." ("..percent.." %)"
 		meta:set_string("description", text)
 	end,
 
 	paramtype = "light",
+	use_texture_alpha = techage.CLIP,
 	sunlight_propagates = true,
 	paramtype2 = "facedir",
 	groups = {choppy=1, cracky=1, crumbly=1},
@@ -132,6 +133,7 @@ minetest.register_node("techage:ta4_battery_empty", {
 	end,
 	
 	paramtype = "light",
+	use_texture_alpha = techage.CLIP,
 	sunlight_propagates = true,
 	paramtype2 = "facedir",
 	groups = {choppy=1, cracky=1, crumbly=1, not_in_creative_inventory=1},
diff --git a/techage/icta_controller/commands.lua b/techage/icta_controller/commands.lua
index feb9cd0..d5b5522 100644
--- a/techage/icta_controller/commands.lua
+++ b/techage/icta_controller/commands.lua
@@ -179,7 +179,7 @@ techage.icta_register_condition("state", {
 			type = "textlist",
 			name = "value",
 			label = "",
-			choices = "stopped,running,standby,blocked,nopower,fault,unloaded,invalid,on,off",
+			choices = "stopped,running,standby,blocked,nopower,fault,unloaded,invalid,on,off,empty,loaded,loading,full",
 			default = "stopped",
 		},
 		{
@@ -793,3 +793,36 @@ techage.icta_register_condition("get_filter", {
 		return condition, result
 	end,
 })
+
+techage.icta_register_action("exchange", {
+	title = "place/remove a block via the Door Controller II",
+	formspec = {
+		{
+			type = "number", 
+			name = "number", 
+			label = "number", 
+			default = "",
+		},
+		{
+			type = "number", 
+			name = "slot", 
+			label = "slot no", 
+			default = "1",
+		},
+		{
+			type = "label", 
+			name = "lbl", 
+			label = "place/remove a block via\nthe Door Controller II\n", 
+		},
+	},
+	button = function(data, environ) 
+		return 'exch('..techage.fmt_number(data.number)..","..data.slot..')'
+	end,
+	code = function(data, environ)
+		return function(env, output, idx)
+			local payload = data.slot
+			techage.send_single(environ.number, data.number, "exchange", payload)
+		end
+	end,
+})
+
diff --git a/techage/icta_controller/controller.lua b/techage/icta_controller/controller.lua
index a1e6253..998ed82 100644
--- a/techage/icta_controller/controller.lua
+++ b/techage/icta_controller/controller.lua
@@ -395,6 +395,7 @@ minetest.register_node("techage:ta4_icta_controller", {
 	paramtype = "light",
 	sunlight_propagates = true,
 	paramtype2 = "facedir",
+	use_texture_alpha = techage.CLIP,
 	groups = {choppy=1, cracky=1, crumbly=1},
 	is_ground_content = false,
 	sounds = default.node_sound_stone_defaults(),
diff --git a/techage/icta_controller/display.lua b/techage/icta_controller/display.lua
index eda52e9..adbeabb 100644
--- a/techage/icta_controller/display.lua
+++ b/techage/icta_controller/display.lua
@@ -66,6 +66,7 @@ function techage.display.on_timer(pos)
 		-- check if display is loaded and a player in front of the display
 		if node.name ~= "ignore" then
 			local dir = minetest.facedir_to_dir(Param2ToFacedir[node.param2 % 6])
+			dir.y = 0
 			local pos2 = vector.add(pos, vector.multiply(dir, RADIUS))
 			for _, obj in pairs(minetest.get_objects_inside_radius(pos2, RADIUS)) do
 				if obj:is_player() then
@@ -90,6 +91,7 @@ minetest.register_node("techage:ta4_display", {
 	tiles = {"techage_display.png"},
 	drawtype = "nodebox",
 	paramtype = "light",
+	use_texture_alpha = techage.CLIP,
 	sunlight_propagates = true,
 	paramtype2 = "wallmounted",
 	node_box = techage.display.lcd_box,
@@ -137,6 +139,7 @@ minetest.register_node("techage:ta4_displayXL", {
 	tiles = {"techage_displayXL.png"},
 	drawtype = "nodebox",
 	paramtype = "light",
+	use_texture_alpha = techage.CLIP,
 	sunlight_propagates = true,
 	paramtype2 = "wallmounted",
 	node_box = techage.display.lcd_boxXL,
diff --git a/techage/icta_controller/signaltower.lua b/techage/icta_controller/signaltower.lua
index dddb1df..cf3f723 100644
--- a/techage/icta_controller/signaltower.lua
+++ b/techage/icta_controller/signaltower.lua
@@ -61,6 +61,7 @@ minetest.register_node("techage:ta4_signaltower", {
 	end,
 
 	paramtype = "light",
+	use_texture_alpha = techage.CLIP,
 	light_source = 0,	
 	sunlight_propagates = true,
 	paramtype2 = "facedir",
@@ -92,6 +93,7 @@ for _,color in ipairs({"green", "amber", "red"}) do
 		end,
 
 		paramtype = "light",
+		use_texture_alpha = techage.CLIP,
 		light_source = 10,	
 		sunlight_propagates = true,
 		paramtype2 = "facedir",
diff --git a/techage/init.lua b/techage/init.lua
index 42cbdb5..9b5ffeb 100644
--- a/techage/init.lua
+++ b/techage/init.lua
@@ -13,7 +13,7 @@
 techage = {}
 
 -- Version for compatibility checks, see readme.md/history
-techage.version = 0.25
+techage.version = 0.26
 
 if minetest.global_exists("tubelib") then
 	minetest.log("error", "[techage] Techage can't be used together with the mod tubelib!")
@@ -38,6 +38,10 @@ elseif minetest.global_exists("safer_lua") and safer_lua.version < 1.0 then
 	return
 end
 
+-- Test MT 5.4 new string mode
+techage.CLIP  = minetest.features.use_texture_alpha_string_modes and "clip" or false
+techage.BLEND = minetest.features.use_texture_alpha_string_modes and "blend" or true
+
 techage.NodeDef = {}		-- node registration info
 
 techage.max_num_forceload_blocks = tonumber(minetest.settings:get("techage_max_num_forceload_blocks")) or 24
@@ -85,6 +89,7 @@ dofile(MP.."/basis/networks.lua")
 dofile(MP.."/basis/recipe_lib.lua")
 dofile(MP.."/basis/formspec_update.lua")
 dofile(MP.."/basis/windturbine_lib.lua")
+dofile(MP.."/basis/laser_lib.lua")
 
 -- Main doc
 dofile(MP.."/doc/manual_DE.lua")
@@ -112,6 +117,8 @@ dofile(MP.."/power/powerswitch.lua")
 dofile(MP.."/power/protection.lua")
 dofile(MP.."/power/power_line.lua")
 dofile(MP.."/power/ta4_cable.lua")
+dofile(MP.."/power/ta4_cable_wall_entry.lua")
+dofile(MP.."/power/laser.lua")
 
 -- Iron Age
 dofile(MP.."/iron_age/main.lua")
@@ -161,6 +168,7 @@ dofile(MP.."/basic_machines/ta4_chest.lua")
 dofile(MP.."/basic_machines/ta4_injector.lua")
 dofile(MP.."/basic_machines/itemsource.lua")
 dofile(MP.."/basic_machines/recycler.lua")
+dofile(MP.."/basic_machines/concentrator.lua")
 
 -- Liquids II
 dofile(MP.."/liquids/tank.lua")
@@ -168,6 +176,7 @@ dofile(MP.."/liquids/filler.lua")
 dofile(MP.."/liquids/silo.lua")
 dofile(MP.."/liquids/pump.lua")
 dofile(MP.."/liquids/waterpump.lua")
+dofile(MP.."/liquids/waterinlet.lua")
 
 -- Coal power station
 dofile(MP.."/coal_power_station/firebox.lua")
@@ -214,7 +223,7 @@ dofile(MP.."/oil/drillbox.lua")
 dofile(MP.."/oil/pumpjack.lua")
 dofile(MP.."/oil/distiller.lua")
 dofile(MP.."/oil/reboiler.lua")
---	dofile(MP.."/oil/gasflare.lua")
+--  dofile(MP.."/oil/gasflare.lua")
 
 -- TA3 power based
 dofile(MP.."/ta3_power/tiny_generator.lua")
@@ -237,14 +246,15 @@ dofile(MP.."/logic/programmer.lua")
 dofile(MP.."/logic/signallamp.lua")
 dofile(MP.."/logic/sequencer.lua")
 dofile(MP.."/logic/timer.lua")
-dofile(MP.."/logic/lua_logic.lua")
+dofile(MP.."/logic/lua_logic.lua")  -- old
+dofile(MP.."/logic/logic_block.lua")  -- new
 dofile(MP.."/logic/node_detector.lua")
 dofile(MP.."/logic/player_detector.lua")
 dofile(MP.."/logic/cart_detector.lua")
 dofile(MP.."/logic/gateblock.lua")
 dofile(MP.."/logic/doorblock.lua")
-dofile(MP.."/logic/doorcontroller.lua")
-dofile(MP.."/logic/doorcontroller2.lua")
+dofile(MP.."/logic/doorcontroller.lua")  -- old
+dofile(MP.."/logic/doorcontroller2.lua")  -- new
 dofile(MP.."/logic/collector.lua")
 if minetest.global_exists("mesecon") then
 	dofile(MP.."/logic/mesecons_converter.lua")
@@ -324,6 +334,7 @@ dofile(MP.."/items/electronic.lua")
 dofile(MP.."/items/redstone.lua")
 dofile(MP.."/items/cement.lua")
 dofile(MP.."/items/cracking.lua")
+dofile(MP.."/items/ceramic.lua")
 
 if techage.basalt_stone_enabled then
 	dofile(MP.."/items/basalt.lua")
diff --git a/techage/iron_age/coalburner.lua b/techage/iron_age/coalburner.lua
index 25ba0b0..bd2db0d 100644
--- a/techage/iron_age/coalburner.lua
+++ b/techage/iron_age/coalburner.lua
@@ -133,7 +133,7 @@ for idx,ratio in ipairs(lRatio) do
 		end,
 		
 		drawtype = "glasslike",
-		use_texture_alpha = true,
+		use_texture_alpha = techage.BLEND,
 		inventory_image = "techage_flame.png",
 		paramtype = "light",
 		light_source = 13,
diff --git a/techage/iron_age/gravelsieve.lua b/techage/iron_age/gravelsieve.lua
index e39f1a0..e2b6fc7 100644
--- a/techage/iron_age/gravelsieve.lua
+++ b/techage/iron_age/gravelsieve.lua
@@ -147,6 +147,7 @@ for idx = 0,3 do
 		minecart_hopper_untakeitem = minecart_hopper_untakeitem,
 
 		paramtype = "light",
+		use_texture_alpha = techage.CLIP,
 		sounds = default.node_sound_wood_defaults(),
 		paramtype2 = "facedir",
 		sunlight_propagates = true,
diff --git a/techage/iron_age/hammer.lua b/techage/iron_age/hammer.lua
index 42ee57b..5c5a360 100644
--- a/techage/iron_age/hammer.lua
+++ b/techage/iron_age/hammer.lua
@@ -29,7 +29,7 @@ local function handler(player_name, node, itemstack, digparams)
 		if ndef then
 			local item = ItemStack(ndef.drop or node.name)
 			local inv = minetest.get_inventory({type="player", name=player_name})
-			if inv:room_for_item("main", item) then
+			if inv and inv:room_for_item("main", item) then
 				local taken = inv:remove_item("main", item)
 			else
 				for _,obj in ipairs(minetest.get_objects_inside_radius(pos, 1)) do
diff --git a/techage/iron_age/recipes.lua b/techage/iron_age/recipes.lua
index 1b411e7..af1e1ec 100644
--- a/techage/iron_age/recipes.lua
+++ b/techage/iron_age/recipes.lua
@@ -35,7 +35,7 @@ techage.ironage_register_recipe({
 minetest.register_craftitem("techage:iron_ingot", {
 	description = S("TA1 Iron Ingot"),
 	inventory_image = "techage_iron_ingot.png",
-	use_texture_alpha = true,
+	use_texture_alpha = techage.CLIP,
 })
 
 local function check_protection(pos, name, text)
diff --git a/techage/items/basalt.lua b/techage/items/basalt.lua
index 319d5ed..e65d9a7 100644
--- a/techage/items/basalt.lua
+++ b/techage/items/basalt.lua
@@ -131,7 +131,7 @@ minetest.register_node("techage:basalt_glass", {
 	description = S("Basalt Glass"),
 	drawtype = "glasslike_framed_optional",
 	tiles = {"techage_basalt_glass.png"},
-	use_texture_alpha = true,
+	use_texture_alpha = techage.BLEND,
 	paramtype = "light",
 	paramtype2 = "glasslikeliquidlevel",
 	sunlight_propagates = true,
@@ -155,7 +155,7 @@ minetest.register_node("techage:basalt_glass2", {
 	description = S("Basalt Glass 2"),
 	drawtype = "glasslike_framed_optional",
 	tiles = {"techage_basalt_glass2.png"},
-	use_texture_alpha = true,
+	use_texture_alpha = techage.BLEND,
 	paramtype = "light",
 	paramtype2 = "glasslikeliquidlevel",
 	sunlight_propagates = true,
@@ -185,7 +185,7 @@ minetest.register_node("techage:basalt_glass_thin", {
 		},
 	},
 	tiles = {"techage_basalt_glass.png"},
-	use_texture_alpha = true,
+	use_texture_alpha = techage.BLEND,
 	paramtype = "light",
 	paramtype2 = "facedir",
 	sunlight_propagates = true,
@@ -204,7 +204,7 @@ minetest.register_node("techage:basalt_glass_thin2", {
 		},
 	},
 	tiles = {"techage_basalt_glass2.png"},
-	use_texture_alpha = true,
+	use_texture_alpha = techage.BLEND,
 	paramtype = "light",
 	paramtype2 = "facedir",
 	sunlight_propagates = true,
@@ -223,7 +223,7 @@ minetest.register_node("techage:basalt_glass_thin_xl", {
 		},
 	},
 	tiles = {"techage_basalt_glass.png"},
-	use_texture_alpha = true,
+	use_texture_alpha = techage.BLEND,
 	paramtype = "light",
 	paramtype2 = "facedir",
 	sunlight_propagates = true,
@@ -242,7 +242,7 @@ minetest.register_node("techage:basalt_glass_thin_xl2", {
 		},
 	},
 	tiles = {"techage_basalt_glass2.png"},
-	use_texture_alpha = true,
+	use_texture_alpha = techage.BLEND,
 	paramtype = "light",
 	paramtype2 = "facedir",
 	sunlight_propagates = true,
diff --git a/techage/items/cement.lua b/techage/items/cement.lua
index ce7e62e..899678d 100644
--- a/techage/items/cement.lua
+++ b/techage/items/cement.lua
@@ -16,7 +16,7 @@
 local S = techage.S
 
 
-if not minetest.global_exists("bakedclay") then
+if not  minetest.get_modpath("bakedclay") then
 	minetest.register_node("techage:cement_block", {
 		description = S("Cement Block"),
 		tiles = {"default_clay.png^[colorize:#FFFFFF:160"},
@@ -33,6 +33,17 @@ if not minetest.global_exists("bakedclay") then
 
 	techage.add_grinder_recipe({input="techage:cement_block", output="techage:cement_powder"})
 else
+	-- The block should not exist when the mod baked clay is loaded. 
+	-- But this block was active due to an error and can therefore no longer be deleted.
+	minetest.register_node("techage:cement_block", {
+		description = S("Cement Block"),
+		tiles = {"default_clay.png^[colorize:#FFFFFF:160"},
+		is_ground_content = false,
+		groups = {cracky = 2, stone = 1},
+		sounds = default.node_sound_stone_defaults(),
+	})
+	
+	techage.add_grinder_recipe({input="techage:cement_block", output="techage:cement_powder"})
 	techage.add_grinder_recipe({input="bakedclay:white", output="techage:cement_powder"})
 end
 
diff --git a/techage/items/ceramic.lua b/techage/items/ceramic.lua
new file mode 100644
index 0000000..62aa79b
--- /dev/null
+++ b/techage/items/ceramic.lua
@@ -0,0 +1,55 @@
+--[[
+
+	TechAge
+	=======
+
+	Copyright (C) 2021 Joachim Stolberg
+
+	AGPL v3
+	See LICENSE.txt for more information
+	
+	TA4 Ceramic
+	
+]]--
+
+local S = techage.S
+
+minetest.register_craftitem("techage:ta4_ceramic_material", {
+	description = S("TA4 Ceramic Material"),
+	inventory_image = "techage_ceramic_material.png",
+	groups = {powder = 1},
+})
+
+techage.recipes.add("ta4_doser", {
+	output = "techage:ta4_ceramic_material 2",
+	input = {
+		"techage:clay_powder 1",
+		"techage:aluminum_powder 1",
+		"techage:silver_sandstone_powder 1",
+		"techage:water 1",
+	}
+})
+
+minetest.register_craft({
+	output = "techage:ta4_ceramic_material 2",
+	recipe = {
+		{"techage:clay_powder", "techage:aluminum_powder", ""},
+		{"techage:silver_sandstone_powder", "bucket:bucket_water", ""},
+		{"", "", ""},
+	},
+	replacements = {{"bucket:bucket_water", "bucket:bucket_empty"}},
+})
+
+minetest.register_craftitem("techage:ta4_furnace_ceramic", {
+	description = S("TA4 Furnace Ceramic"),
+	inventory_image = "techage_furnace_ceramic.png",
+})
+
+techage.furnace.register_recipe({
+	output = "techage:ta4_furnace_ceramic",
+	recipe = {
+		"techage:ta4_ceramic_material", 
+		"techage:ta4_ceramic_material", 
+	},
+	time = 16,
+})
\ No newline at end of file
diff --git a/techage/items/powder.lua b/techage/items/powder.lua
index 0811f72..c53cfa6 100644
--- a/techage/items/powder.lua
+++ b/techage/items/powder.lua
@@ -32,6 +32,24 @@ minetest.register_craftitem("techage:iron_powder", {
 	groups = {powder = 1},
 })
 
+minetest.register_craftitem("techage:clay_powder", {
+	description = S("Clay Powder"),
+	inventory_image = "techage_powder_inv.png^[colorize:#F9DE80:160",
+	groups = {powder = 1},
+})
+
+minetest.register_craftitem("techage:aluminum_powder", {
+	description = S("Aluminum Powder"),
+	inventory_image = "techage_powder_inv.png^[colorize:#A1BDC4:160",
+	groups = {powder = 1},
+})
+
+minetest.register_craftitem("techage:silver_sandstone_powder", {
+	description = S("Silver Sandstone Powder"),
+	inventory_image = "techage_powder_inv.png^[colorize:#FFFFFF:160",
+	groups = {powder = 1},
+})
+
 techage.add_grinder_recipe({input="default:acacia_bush_leaves", output="techage:leave_powder"})
 techage.add_grinder_recipe({input="default:acacia_leaves", output="techage:leave_powder"})
 techage.add_grinder_recipe({input="default:aspen_leaves", output="techage:leave_powder"})
@@ -41,4 +59,9 @@ techage.add_grinder_recipe({input="default:jungleleaves", output="techage:leave_
 techage.add_grinder_recipe({input="default:leaves", output="techage:leave_powder"})
 techage.add_grinder_recipe({input="default:pine_needles", output="techage:needle_powder"})
 techage.add_grinder_recipe({input="default:iron_lump", output="techage:iron_powder"})
+techage.add_grinder_recipe({input="default:clay", output="techage:clay_powder"})
+techage.add_grinder_recipe({input="techage:aluminum", output="techage:aluminum_powder"})
+techage.add_grinder_recipe({input="default:silver_sandstone", output="techage:silver_sandstone_powder"})
+
+
 
diff --git a/techage/lamps/lib.lua b/techage/lamps/lib.lua
index c52345f..aa7147b 100644
--- a/techage/lamps/lib.lua
+++ b/techage/lamps/lib.lua
@@ -146,6 +146,7 @@ function techage.register_lamp(basename, ndef_off, ndef_on)
 	ndef_off.on_rotate = ndef_off.on_rotate or on_rotate
 	ndef_off.on_timer = node_timer
 	ndef_off.paramtype = "light"
+	ndef_off.use_texture_alpha = techage.CLIP
 	ndef_off.light_source = 0
 	ndef_off.sunlight_propagates = true
 	ndef_off.paramtype2 = "facedir"
@@ -165,6 +166,7 @@ function techage.register_lamp(basename, ndef_off, ndef_on)
 	ndef_on.on_rotate = ndef_on.on_rotate or on_rotate
 	ndef_on.on_timer = ndef_on.on_timer or node_timer
 	ndef_on.paramtype = "light"
+	ndef_on.use_texture_alpha = techage.CLIP
 	ndef_on.light_source = minetest.LIGHT_MAX
 	ndef_on.sunlight_propagates = true
 	ndef_on.paramtype2 = "facedir"
diff --git a/techage/liquids/liquid_pipe.lua b/techage/liquids/liquid_pipe.lua
index 6956129..ea4ff11 100644
--- a/techage/liquids/liquid_pipe.lua
+++ b/techage/liquids/liquid_pipe.lua
@@ -25,7 +25,7 @@ local Pipe = tubelib2.Tube:new({
 	dirs_to_check = {1,2,3,4,5,6},
 	max_tube_length = MAX_PIPE_LENGHT, 
 	show_infotext = false,
-	force_to_use_tubes = true,
+	force_to_use_tubes = false,
 	tube_type = "pipe2",
 	primary_node_names = {
 		"techage:ta3_pipeS", "techage:ta3_pipeA", 
@@ -77,6 +77,7 @@ minetest.register_node("techage:ta3_pipeS", {
 	},
 	on_rotate = screwdriver.disallow, -- important!
 	paramtype = "light",
+	use_texture_alpha = techage.CLIP,
 	sunlight_propagates = true,
 	is_ground_content = false,
 	groups = {crumbly = 2, cracky = 2, snappy = 2},
@@ -111,6 +112,7 @@ minetest.register_node("techage:ta3_pipeA", {
 	},
 	on_rotate = screwdriver.disallow, -- important!
 	paramtype = "light",
+	use_texture_alpha = techage.CLIP,
 	sunlight_propagates = true,
 	is_ground_content = false,
 	groups = {crumbly = 2, cracky = 2, snappy = 2, not_in_creative_inventory=1},
diff --git a/techage/liquids/node_api.lua b/techage/liquids/node_api.lua
index b9735c7..87e9874 100644
--- a/techage/liquids/node_api.lua
+++ b/techage/liquids/node_api.lua
@@ -112,9 +112,9 @@ end
 -- remote inventory.
 function liquid.peek(pos, outdir)
 	for _,item in ipairs(get_network_table(pos, outdir, "tank")) do
-		local liquid = LQD(item.pos)
-		if liquid and liquid.peek then
-			return liquid.peek(item.pos, item.indir)
+		local liq = LQD(item.pos)
+		if liq and liq.peek then
+			return liq.peek(item.pos, item.indir)
 		end
 	end
 end
@@ -123,16 +123,16 @@ end
 -- return leftover amount
 function liquid.put(pos, outdir, name, amount, player_name)
 	for _,item in ipairs(get_network_table(pos, outdir, "tank")) do
-		local liquid = LQD(item.pos)
-		if liquid and liquid.put and liquid.peek then
+		local liq = LQD(item.pos)
+		if liq and liq.put and liq.peek then
 			-- wrong items?
-			local peek = liquid.peek(item.pos, item.indir)
+			local peek = liq.peek(item.pos, item.indir)
 			if peek and peek ~= name then return amount or 0 end
 			if player_name then
 				local num = techage.get_node_number(pos) or "000"
 				techage.mark_position(player_name, item.pos, "("..num..") put", "", 1)
 			end
-			amount = liquid.put(item.pos, item.indir, name, amount)
+			amount = liq.put(item.pos, item.indir, name, amount)
 			if not amount or amount == 0 then break end
 		end
 	end
@@ -143,30 +143,27 @@ end
 -- return taken amount and item name
 function liquid.take(pos, outdir, name, amount, player_name)
 	local taken = 0
-	local item_name = nil
 	for _,item in ipairs(get_network_table(pos, outdir, "tank")) do
-		local liquid = LQD(item.pos)
-		if liquid and liquid.take then
+		local liq = LQD(item.pos)
+		if liq and liq.take then
 			if player_name then
 				local num = techage.get_node_number(pos)
 				techage.mark_position(player_name, item.pos, "("..num..") take", "", 1)
 			end
-			local val, name = liquid.take(item.pos, item.indir, name, amount - taken)
-			if val and name then
-				taken = taken + val
-				item_name = name
-				if amount - taken == 0 then break end
+			taken, name = liq.take(item.pos, item.indir, name, amount)
+			if taken and name and taken > 0 then
+				break 
 			end
 		end
 	end
-	return taken, item_name
+	return taken, name
 end
 
 function liquid.untake(pos, outdir, name, amount)
 	for _,item in ipairs(get_network_table(pos, outdir, "tank")) do
-		local liquid = LQD(item.pos)
-		if liquid and liquid.untake then
-			amount = liquid.untake(item.pos, item.indir, name, amount)
+		local liq = LQD(item.pos)
+		if liq and liq.untake then
+			amount = liq.untake(item.pos, item.indir, name, amount)
 			if not amount or amount == 0 then break end
 		end
 	end
diff --git a/techage/liquids/tank.lua b/techage/liquids/tank.lua
index b2e522e..0e53d05 100644
--- a/techage/liquids/tank.lua
+++ b/techage/liquids/tank.lua
@@ -289,7 +289,7 @@ minetest.register_lbm({
 		if mem.liquid and mem.liquid.amount then
 			local nvm = techage.get_nvm(pos)
 			nvm.liquid = nvm.liquid or {}
-			nvm.liquid.amount = mem.liquid.amount
+			nvm.liquid.amount = math.max(mem.liquid.amount, 0)
 			nvm.liquid.name = mem.liquid.name
 			--tubelib2.del_mem(pos)
 		end
diff --git a/techage/liquids/valve.lua b/techage/liquids/valve.lua
index 6b2b76ef..a3ccc68 100644
--- a/techage/liquids/valve.lua
+++ b/techage/liquids/valve.lua
@@ -128,6 +128,7 @@ minetest.register_node("techage:ta3_valve_open", {
 	},
 	on_rotate = screwdriver.disallow, -- important!
 	paramtype = "light",
+	use_texture_alpha = techage.CLIP,
 	sunlight_propagates = true,
 	is_ground_content = false,
 	groups = {crumbly = 2, cracky = 2, snappy = 2},
@@ -167,6 +168,7 @@ minetest.register_node("techage:ta3_valve_closed", {
 	},
 	on_rotate = screwdriver.disallow, -- important!
 	paramtype = "light",
+	use_texture_alpha = techage.CLIP,
 	sunlight_propagates = true,
 	is_ground_content = false,
 	groups = {crumbly = 2, cracky = 2, snappy = 2, not_in_creative_inventory = 1},
diff --git a/techage/liquids/waterinlet.lua b/techage/liquids/waterinlet.lua
new file mode 100644
index 0000000..dd87391
--- /dev/null
+++ b/techage/liquids/waterinlet.lua
@@ -0,0 +1,120 @@
+--[[
+
+	TechAge
+	=======
+
+	Copyright (C) 2019-2021 Joachim Stolberg
+
+	AGPL v3
+	See LICENSE.txt for more information
+	
+	TA4 Water Inlet (replacement for the water pump)
+	
+]]--
+
+-- for lazy programmers
+local M = minetest.get_meta
+local S = techage.S
+
+local Pipe = techage.LiquidPipe
+local liquid = techage.liquid
+
+local function is_ocean(pos)
+	if pos.y > 1 then 
+		M(pos):set_string("infotext", S("Error: Not on sea level!"))
+		return false 
+	end
+	local node = techage.get_node_lvm({x = pos.x, y = pos.y - 1, z = pos.z})
+	if node.name ~= "default:water_source" then 
+		M(pos):set_string("infotext", S("Error: No water available!"))
+		return false 
+	end
+	if node.param2 == 1 then 
+		M(pos):set_string("infotext", S("Error: No natural water!"))
+		return false
+	end
+	return true
+end
+
+local function srv_peek(pos)
+	local nvm = techage.get_nvm(pos)
+	if is_ocean(pos) then
+		nvm.liquid.name = "techage:water"
+		nvm.liquid.amount = 1
+	else
+		nvm.liquid.name = nil
+		nvm.liquid.amount = 0
+	end
+	return nvm.liquid.name
+end
+
+local function take_liquid(pos, indir, name, amount)
+	local nvm = techage.get_nvm(pos)
+	return nvm.liquid.amount, nvm.liquid.name
+end
+	
+local function untake_liquid(pos, indir, name, amount)
+	return 0
+end
+
+local netw_def = {
+	pipe2 = {
+		sides = {U = 1}, -- Pipe connection sides
+		ntype = "tank",
+	},
+}
+
+minetest.register_node("techage:ta4_waterinlet", {
+	description = S("TA4 Water Inlet"),
+	tiles = {
+		-- up, down, right, left, back, front
+		"techage_filling_ta4.png^techage_frame_waterpump_top.png^techage_appl_hole_pipe.png",
+		"techage_filling_ta4.png^techage_frame_ta4.png",
+		"techage_filling_ta4.png^techage_frame_waterpump.png",
+		"techage_filling_ta4.png^techage_frame_waterpump.png",
+		"techage_filling_ta4.png^techage_frame_waterpump.png",
+		"techage_filling_ta4.png^techage_frame_waterpump.png",
+	},
+
+	after_place_node = function(pos, placer)
+		local meta = M(pos)
+		local nvm = techage.get_nvm(pos)
+		nvm.liquid = {}
+		Pipe:after_place_node(pos)
+		srv_peek(pos)
+	end,
+	tubelib2_on_update2 = function(pos, outdir, tlib2, node)
+		liquid.update_network(pos, outdir)
+	end,
+	--on_timer = node_timer,
+	--on_punch = liquid.on_punch,
+	after_dig_node = function(pos, oldnode, oldmetadata, digger)
+		Pipe:after_dig_node(pos)
+		techage.remove_node(pos, oldnode, oldmetadata)
+	end,
+	liquid = {
+		capa = 1,
+		peek = liquid.srv_peek,
+		take = take_liquid,
+		untake = untake_liquid, 
+	},
+	networks = netw_def,
+	--on_rightclick = on_rightclick,
+	--can_dig = can_dig,
+	paramtype2 = "facedir",
+	on_rotate = screwdriver.disallow,
+	groups = {cracky=2},
+	is_ground_content = false,
+	sounds = default.node_sound_metal_defaults(),
+})
+
+Pipe:add_secondary_node_names({"techage:ta4_waterinlet"})
+
+minetest.register_craft({
+	output = "techage:ta4_waterinlet",
+	recipe = {
+		{"techage:ta4_carbon_fiber", "techage:ta3_pipeS", "techage:ta4_carbon_fiber"},
+		{"techage:iron_ingot", "techage:ta3_barrel_empty", "techage:iron_ingot"},
+	},
+})
+
diff --git a/techage/liquids/waterpump.lua b/techage/liquids/waterpump.lua
index 524eb92..4d69f73 100644
--- a/techage/liquids/waterpump.lua
+++ b/techage/liquids/waterpump.lua
@@ -172,7 +172,7 @@ minetest.register_node("techage:t4_waterpump", {
 	on_timer = node_timer,
 	
 	paramtype2 = "facedir",
-	groups = {cracky=2, crumbly=2, choppy=2},
+	groups = {cracky=2, crumbly=2, choppy=2, not_in_creative_inventory = 1},
 	on_rotate = screwdriver.disallow,
 	is_ground_content = false,
 })
@@ -186,12 +186,12 @@ techage.register_node({"techage:t4_waterpump"}, {
 	end,
 })	
 
-minetest.register_craft({
-	output = "techage:t4_waterpump",
-	recipe = {
-		{"", "default:mese_crystal", ""},
-		{"", "techage:ta3_liquidsampler_pas", ""},
-		{"", "techage:ta4_wlanchip", ""},
-	},
-})
+--minetest.register_craft({
+--	output = "techage:t4_waterpump",
+--	recipe = {
+--		{"", "default:mese_crystal", ""},
+--		{"", "techage:ta3_liquidsampler_pas", ""},
+--		{"", "techage:ta4_wlanchip", ""},
+--	},
+--})
 
diff --git a/techage/locale/techage.de.tr b/techage/locale/techage.de.tr
index 2217280..212d9db 100644
--- a/techage/locale/techage.de.tr
+++ b/techage/locale/techage.de.tr
@@ -42,10 +42,8 @@ Autocrafter=Autocrafter
 ### axle2power.lua ###
 
 TA2 Power Generator=TA2 Stromgenerator
-
 TA2 Power Generator: Overload fault?@n(restart with right-click)=TA2 Stromgenerator: Überlastfehler?@n(Neustart mit Rechtsklick)
 
-
 ### baborium.lua ###
 
 Baborium Ingot=Baboriumbarren
@@ -167,6 +165,11 @@ TA Ceiling Lamp=TA Deckenlampe
 Cement Block=Zement Block
 Cement Powder=Zement Pulver
 
+### ceramic.lua ###
+
+TA4 Ceramic Material=TA4 Keramik Material
+TA4 Furnace Ceramic=TA4 Ofen Keramik
+
 ### charcoalpile.lua ###
 
 Dirt with Ash=Erde mit Asche
@@ -176,7 +179,7 @@ TA1 Charcoal=TA1 Holzkohle
 
 Allow public access to the chest=Erlaube öffentlichen Zugriff auf die Kiste
 Inventory,Pre-Assignment,Config=Inventar,Vorbelegung,Konfiguration
-Node label:= Blockbeschriftung:
+Node label:=Blockbeschriftung:
 TA2 Protected Chest=TA2 Gesicherte Kiste
 TA3 Protected Chest=TA3 Gesicherte Kiste
 TA4 Protected Chest=TA4 Gesicherte Kiste
@@ -196,6 +199,11 @@ Node numbers to read the states from=Knotennummern zum Lesen der Zustände
 Send an event if state is equal or larger than=Senden ein Event wenn Status größer oder gleich als
 TA4 State Collector=TA4 Zuständesammler
 
+### concentrator.lua ###
+
+TA4 Tube Concentrator=TA4 Röhren Konzentrator
+Tube Concentrator=Röhren Konzentrator
+
 ### cooking.lua ###
 
 TA3 Melting=TA3 Schmelzen
@@ -215,7 +223,7 @@ TA4 Detector=TA4 Detektor
 
 ### display.lua ###
 
-Display no: = Display Nr.
+Display no: =Display Nr.
 TA4 Display=TA4 Display
 TA4 Display XL=TA4 Display XL
 
@@ -251,13 +259,13 @@ Blocks are disappeared=Blöcke sind verschwunden
 Click on all the blocks that are part of the door/gate=Klicke auf alle Blöcke, die Teil des Tores sind
 Ctrl,Inv=Ctrl,Inv
 Done=Fertig
-Error: Inventory already in use=Fehler: Inventar wird bereits genutzt
 Record=Aufzeichnen
 Recording...=Aufzeichnung...
 Remove=Entfernen
 Set=Setzen
 TA3 Door Controller II=TA3 Tür Controller II
 block positions are stored.=Block Positionen gespeichert.
+with door sound=mit Türgeräusch
 
 ### drillbox.lua ###
 
@@ -347,7 +355,6 @@ power=Energie
 ### forceload.lua ###
 
 Area already loaded or max. number of Forceload Blocks reached!=Bereich bereits geladen oder maximale Anzahl von Forceload Blöcken erreicht!
-
 List of your Forceload Blocks:=Liste der Forceload Blöcke
 Priv missing=Rechte fehlen
 Punch the block to make the area visible.=Schlage auf den Bock um den Bereich anzuzeigen.
@@ -363,8 +370,13 @@ To add fuel punch@nthis block@nwith a fuel container=Um Brennstoff nachzufüllen
 
 ### fuelcell.lua ###
 
+Cat. 1 generator=Kat. 1 Generator
+Cat. 2 generator=Kat. 2 Generator
 Fuel Cell=Brennstoffzelle
+If set, fuelcell will work@nas cat. 1 generator=Wenn gesetzt, Brennstoffzelle@narbeitet als  Kat. 1 Generator
 TA4 Fuel Cell=TA4 Brennstoffzelle
+TA4 Fuel Cell Gen1=TA4 Brennstoffzelle Gen1
+TA4 Fuel Cell Gen2=TA4 Brennstoffzelle Gen2
 
 ### fuelcellstack.lua ###
 
@@ -503,6 +515,14 @@ TA Lamp Holder Copper=TA Lampenhalter Kupfer
 TA Lamp Holder Gold=TA Lampenhalter Gold
 TA Lamp Holder White=TA Lampenhalter Weiß
 
+### laser.lua ###
+
+Laser beam error!=Laserstrahl Fehler!
+TA4 Laser Beam Emitter=TA4 Laserstrahl Sender
+TA4 Laser Beam Receiver=TA4 Laserstrahl Empfänger
+Valid destination positions:=Gültige Zielpositionen
+to=bis
+
 ### lib.lua ###
 ### sensorchest.lua ###
 
@@ -532,11 +552,32 @@ Liquid Sampler=Flüssigkeitensammler
 
 no usable water=Kein brauchbares Wasser
 
+### logic_block.lua ###
+
+'me' has to be used for the own block number.@n='me' wird für die eigene Blocknummer verwendet.@n
+'~@=' means: not equal@n='~@=' bedeutet: ungleich@n
+@n<input-expression> is a boolean expression@nwhere input numbers are evaluated.@n=@n<input-expression> ist ein boolescher Ausdruck,@nbei dem Eingabenummern ausgewertet werden.@n
+@n<output> is the block number to which the@ncommand should be sent.@n=@n<output> ist die Blocknummer, an die der Befehl@ngesendet werden soll.@n
+@nAll rules are checked with each received@ncommand.=@nAlle Regeln werden mit jedem empfangenen@nBefehl überprüft. 
+@nExamples:@n1234 @=@= on@n1234 @=@= off@n1234 @=@= on and 2345 @=@= off@n2345 ~@= 3456@n=@nBeispiele:@n1234 @=@= on@n1234 @=@= off@n1234 @=@= on and 2345 @=@= off@n2345 ~@= 3456@n
+@nRule:@n<output> @= on/off if <input-expression> is true@n=@nRegel:@n<output> @= on/off if <input-expression> is true@n
+@nThe internal processing time for all@ncommands is 100 ms.=@nDie interne Durchlaufzeit für alle@nKommandos beträgt 100 ms.
+@nValid operators:@nand   or   on   off   me   @=@=   ~@=   (   )@n=@nGültige Operatoren:@nand   or   on   off   @=@=   ~@=   (   )@n
+Blocking Time=Sperrzeit
+Help=Hilfe
+Inputs=Eingänge
+Outputs=Ausgänge
+Rules=Regeln
+Send an 'on'/'off' command if the@nexpression becomes true.@n=Sende ein 'on'/'off' Kommando, wenn der @nAusdruck wahr wird.@n
+Syntax=Syntax
+
+### logic_block.lua ###
 ### lua_logic.lua ###
 
 TA3 Logic Block=TA3 Logikblock
 Update=Update
 
+### logic_block.lua ###
 ### lua_logic.lua ###
 ### power_terminal2.lua ###
 
@@ -644,17 +685,18 @@ TA4 Player Detector=TA4 Spieler Detektor
 
 ### powder.lua ###
 
+Aluminum Powder=Aluminium Pulver
+Clay Powder=Ton Pulver
 Iron Powder=Eisen Pulver
 Leave Powder=Laub Pulver
 Needle Powder=Nadel Pulver
+Silver Sandstone Powder=Silbersandstein Pulver
 
 ### power2axle.lua ###
 
 TA3 Electric Motor=TA3 Elektromotor
-
 TA3 Electric Motor: Overload fault?@n(restart with right-click)=TA3 Elektromotor: Überlastfehler?@n(Neustart mit Rechtsklick)
 
-
 ### power_line.lua ###
 
 TA Power Line=TA Stromleitung
@@ -677,10 +719,8 @@ TA3 Power Terminal Old=TA3 Strom Terminal Alt
 The network is overloaded!=Das Stromnetz ist überlastet!
 The network load is almost at the limit!=Das Stromnetz ist ziemlich am Limit!
 Turned on:=Eingeschaltet:
-
 With %u of a maximum of %u blocks you are almost at the limit!=Mit %u von maximal %u Blöcken bist du fast am Limit!
 
-
 ### power_terminal.lua ###
 ### power_terminal2.lua ###
 
@@ -692,7 +732,8 @@ Accu Box=Akkublock
 Current power:=Strom aktuell:
 Energy storage=Engergiespeicher
 Energy stored:=Energie gespeichert
-Fuel cell=Brennstoffzelle
+Fuel cell cat. 1=Brennstoffzelle Kat. 1
+Fuel cell cat. 2=Brennstoffzelle Kat. 2
 Generators=Generatoren
 Intake=Stromaufnahme
 Max. needed power=Max. benötigter Strom
@@ -715,6 +756,11 @@ Type=Typ
 Wind turbine=Windkraftanlage
 ku is needed=ku wird benötigt
 
+### power_terminal2.lua ###
+### terminal.lua ###
+
+Enter=Eingeben
+
 ### powerswitch.lua ###
 
 TA Power Switch=TA Stromschalter
@@ -727,7 +773,6 @@ TA Power Switch Box=TA Stromschalterbox
 ### programmer.lua ###
 
 TechAge Programmer (right @= read number, left @= write numbers)=TechAge Programmer (rechts @= lese Nummer, links @= schreibe Nummern)
-
 [TechAge Programmer] Error: invalid numbers!=[TechAge Programmer] Fehler: ungültige Nummern!
 [TechAge Programmer] Error: programmer not supported!=[TechAge Programmer] Fehler: Programmer wird nicht unterstützt!
 [TechAge Programmer] Unknown node on=[TechAge Programmer]  Unbekannter Block bei
@@ -764,9 +809,7 @@ Digging depth=Grabungstiefe
 Hole size=Lochgröße
 Quarry=Steinbrecher
 Start level=Startebene
-
 Start level @= 0@nmeans the same level@nas the quarry is placed=Startebene @= 0@nbedeutet gleiche Ebene@nwie der Steinbrecher
-
 area is protected=Bereich ist geschützt
 finished=fertig
 inventory full=Inventar ist voll
@@ -791,6 +834,10 @@ Flint and Iron=Flint and Iron
 TA1 Iron Ingot=TA1 Eisenbarren
 [Bucket] Lava can only be placed below sea level!=Lava kann nur unterhalb der Meerehöhe platziert werden!
 
+### recycler.lua ###
+
+Recycler=Recycler
+
 ### redstone.lua ###
 
 Red Stone=Rotstein
@@ -814,7 +861,6 @@ TA3 Repeater=TA3 Wiederholer
 ### rotor.lua ###
 
 Nacelle is missing=Die Gondel fehlt
-Not suitable position!=Ungeeignete Position!
 TA4 Carbon Fiber=TA4 Kohlefaser
 TA4 Rotor Blade=TA4 Rotorblatt
 TA4 Wind Turbine=TA4 Windkraftanlage
@@ -888,12 +934,14 @@ TA4 LED Street Lamp Pole=TA4 LED Lampenmast
 TA4 Low Power Box=TA4 Niederspannungsverteilerbox
 TA4 Low Power Cable=TA4 Niederspannungskabel
 
+### ta4_cable_wall_entry.lua ###
+
+TA4 Cable Wall Entry=TA4 Kabel/Wanddurchbruch
+
 ### ta4_chest.lua ###
 
 Empty the slots always @nfrom right to left=Speicherplätze von rechts nach links leeren
-
 Never completely empty the slots@nwith the pusher to keep the item assignment=Speicherplätze mit dem Schieber nie ganz@nleeren, um die Item-Zuordnung beizubehalten
-
 Size=Größe
 TA4 8x2000 Chest=TA4 8x2000 Kiste
 Unlock=Entsperren
@@ -920,6 +968,8 @@ TA4 Reactor=TA4 Reaktor
 
 Configure up to 8 items @nto be pushed by the injector=Konfiguriere bis zu 8 Gegenstände \n die vom Injektor weitergegeben werden sollen
 Injector=Injektor
+Switch to pull mode @nto pull items out of inventory slots @naccording the injector configuration=Wechsle in den "Ziehe-Modus",@num Items gemäß der Injektor-Konfiguration@naus einem Inventar zu ziehen
+pull mode= Ziehe-Modus
 
 ### ta4_liquid_filter.lua ###
 
@@ -954,7 +1004,6 @@ TA Tank Cart=TA Tankwagen
 
 ### terminal.lua ###
 
-Enter=Eingeben
 Switched to private use!=Zur privaten Nutzung umgeschaltet
 Switched to public use!=Zur öffentlichen Nutzung umgeschaltet
 Syntax error, try help=Syntax Fehler, nutze help
@@ -988,6 +1037,14 @@ Use a trowel to remove the node.=Verwende eine Kelle, um den Block zu entfernen.
 
 Tube Wall Entry=Tube Wanddurchbruch
 
+### tubes.lua ###
+
+TechAge Tube=TechAge Röhre
+
+### tubes_ta4.lua ###
+
+TA4 Tube=TA4 Röhre
+
 ### turbine.lua ###
 
 TA3 Turbine=TA3 Turbine
@@ -1004,6 +1061,13 @@ TA Valve=TA Ventil
 TA3 Valve closed=TA3 Ventil zu
 TA3 Valve open=TA3 Ventil offen
 
+### waterinlet.lua ###
+
+Error: No natural water!=Fehler: Kein natürliches Wasser!
+Error: No water available!=Fehler: Kein Wasser verfügbar!
+Error: Not on sea level!=Fehler: Nicht auf Meereshöhe!
+TA4 Water Inlet=TA4 Wasssereinlass
+
 ### waterpump.lua ###
 
 TA4 Water Pump=Wasserpumpe
@@ -1012,9 +1076,7 @@ Water Pump=Wasserpumpe
 ### windturbine_lib.lua ###
 
 Here is not enough water (41x41 m)!=Hier ist nicht genug Wasser (41x41 m)!
-
-Here is not enough wind (A free air space of 41x41x21 m is necessary)!=Hier ist nicht genug Wind (Ein freier Luftraum von 41x41x21 m ist notwendig)!
-
+Here is not enough wind@n(A free air space of 41x41x21 m is necessary)!=Hier ist nicht genug Wind@n(Ein freier Luftraum von 41x41x21 m ist notwendig)!
 The next wind turbines is too close!= Die nächste Windkraftanlagen iat zu nahe!
 This is a=Dies ist ein
 This is no ocean water!= Dies ist kein Meerwasser!
@@ -1022,3 +1084,9 @@ This is not the surface of the ocean!=Das ist nicht die Meeresoberfläche!
 [TA4 Wind Turbine]=[TA4 Windkraftanlage]
 biome and no ocean!=Biom und keine Meer (ocean)!
 is a suitable place for a wind turbine!=ist ein geeigneter Ort für eine Windkraftanlage!
+
+
+##### not used anymore #####
+
+Fuel cell=Brennstoffzelle
+Not suitable position!=Ungeeignete Position!
diff --git a/techage/locale/template.txt b/techage/locale/template.txt
index 1370963..888e603 100644
--- a/techage/locale/template.txt
+++ b/techage/locale/template.txt
@@ -42,10 +42,8 @@ Autocrafter=
 ### axle2power.lua ###
 
 TA2 Power Generator=
-
 TA2 Power Generator: Overload fault?@n(restart with right-click)=
 
-
 ### baborium.lua ###
 
 Baborium Ingot=
@@ -167,6 +165,11 @@ TA Ceiling Lamp=
 Cement Block=
 Cement Powder=
 
+### ceramic.lua ###
+
+TA4 Ceramic Material=
+TA4 Furnace Ceramic=
+
 ### charcoalpile.lua ###
 
 Dirt with Ash=
@@ -196,6 +199,11 @@ Node numbers to read the states from=
 Send an event if state is equal or larger than=
 TA4 State Collector=
 
+### concentrator.lua ###
+
+TA4 Tube Concentrator=
+Tube Concentrator=
+
 ### cooking.lua ###
 
 TA3 Melting=
@@ -251,13 +259,13 @@ Blocks are disappeared=
 Click on all the blocks that are part of the door/gate=
 Ctrl,Inv=
 Done=
-Error: Inventory already in use=
 Record=
 Recording...=
 Remove=
 Set=
 TA3 Door Controller II=
 block positions are stored.=
+with door sound=
 
 ### drillbox.lua ###
 
@@ -347,7 +355,6 @@ power=
 ### forceload.lua ###
 
 Area already loaded or max. number of Forceload Blocks reached!=
-
 List of your Forceload Blocks:=
 Priv missing=
 Punch the block to make the area visible.=
@@ -363,8 +370,13 @@ To add fuel punch@nthis block@nwith a fuel container=
 
 ### fuelcell.lua ###
 
+Cat. 1 generator=
+Cat. 2 generator=
 Fuel Cell=
+If set, fuelcell will work@nas cat. 1 generator=
 TA4 Fuel Cell=
+TA4 Fuel Cell Gen1=
+TA4 Fuel Cell Gen2=
 
 ### fuelcellstack.lua ###
 
@@ -503,6 +515,14 @@ TA Lamp Holder Copper=
 TA Lamp Holder Gold=
 TA Lamp Holder White=
 
+### laser.lua ###
+
+Laser beam error!=
+TA4 Laser Beam Emitter=
+TA4 Laser Beam Receiver=
+Valid destination positions:=
+to=
+
 ### lib.lua ###
 ### sensorchest.lua ###
 
@@ -532,11 +552,32 @@ Liquid Sampler=
 
 no usable water=
 
+### logic_block.lua ###
+
+'me' has to be used for the own block number.@n=
+'~@=' means: not equal@n=
+@n<input-expression> is a boolean expression@nwhere input numbers are evaluated.@n=
+@n<output> is the block number to which the@ncommand should be sent.@n=
+@nAll rules are checked with each received@ncommand.=
+@nExamples:@n1234 @=@= on@n1234 @=@= off@n1234 @=@= on and 2345 @=@= off@n2345 ~@= 3456@n=
+@nRule:@n<output> @= on/off if <input-expression> is true@n=
+@nThe internal processing time for all@ncommands is 100 ms.=
+@nValid operators:@nand   or   on   off   me   @=@=   ~@=   (   )@n=
+Blocking Time=
+Help=
+Inputs=
+Outputs=
+Rules=
+Send an 'on'/'off' command if the@nexpression becomes true.@n=
+Syntax=
+
+### logic_block.lua ###
 ### lua_logic.lua ###
 
 TA3 Logic Block=
 Update=
 
+### logic_block.lua ###
 ### lua_logic.lua ###
 ### power_terminal2.lua ###
 
@@ -644,17 +685,18 @@ TA4 Player Detector=
 
 ### powder.lua ###
 
+Aluminum Powder=
+Clay Powder=
 Iron Powder=
 Leave Powder=
 Needle Powder=
+Silver Sandstone Powder=
 
 ### power2axle.lua ###
 
 TA3 Electric Motor=
-
 TA3 Electric Motor: Overload fault?@n(restart with right-click)=
 
-
 ### power_line.lua ###
 
 TA Power Line=
@@ -677,10 +719,8 @@ TA3 Power Terminal Old=
 The network is overloaded!=
 The network load is almost at the limit!=
 Turned on:=
-
 With %u of a maximum of %u blocks you are almost at the limit!=
 
-
 ### power_terminal.lua ###
 ### power_terminal2.lua ###
 
@@ -692,7 +732,8 @@ Accu Box=
 Current power:=
 Energy storage=
 Energy stored:=
-Fuel cell=
+Fuel cell cat. 1=
+Fuel cell cat. 2=
 Generators=
 Intake=
 Max. needed power=
@@ -715,6 +756,11 @@ Type=
 Wind turbine=
 ku is needed=
 
+### power_terminal2.lua ###
+### terminal.lua ###
+
+Enter=
+
 ### powerswitch.lua ###
 
 TA Power Switch=
@@ -727,7 +773,6 @@ TA Power Switch Box=
 ### programmer.lua ###
 
 TechAge Programmer (right @= read number, left @= write numbers)=
-
 [TechAge Programmer] Error: invalid numbers!=
 [TechAge Programmer] Error: programmer not supported!=
 [TechAge Programmer] Unknown node on=
@@ -764,9 +809,7 @@ Digging depth=
 Hole size=
 Quarry=
 Start level=
-
 Start level @= 0@nmeans the same level@nas the quarry is placed=
-
 area is protected=
 finished=
 inventory full=
@@ -791,6 +834,10 @@ Flint and Iron=
 TA1 Iron Ingot=
 [Bucket] Lava can only be placed below sea level!=
 
+### recycler.lua ###
+
+Recycler=
+
 ### redstone.lua ###
 
 Red Stone=
@@ -814,7 +861,6 @@ TA3 Repeater=
 ### rotor.lua ###
 
 Nacelle is missing=
-Not suitable position!=
 TA4 Carbon Fiber=
 TA4 Rotor Blade=
 TA4 Wind Turbine=
@@ -888,12 +934,14 @@ TA4 LED Street Lamp Pole=
 TA4 Low Power Box=
 TA4 Low Power Cable=
 
+### ta4_cable_wall_entry.lua ###
+
+TA4 Cable Wall Entry=
+
 ### ta4_chest.lua ###
 
 Empty the slots always @nfrom right to left=
-
 Never completely empty the slots@nwith the pusher to keep the item assignment=
-
 Size=
 TA4 8x2000 Chest=
 Unlock=
@@ -920,6 +968,8 @@ TA4 Reactor=
 
 Configure up to 8 items @nto be pushed by the injector=
 Injector=
+Switch to pull mode @nto pull items out of inventory slots @naccording the injector configuration=
+pull mode=
 
 ### ta4_liquid_filter.lua ###
 
@@ -954,7 +1004,6 @@ TA Tank Cart=
 
 ### terminal.lua ###
 
-Enter=
 Switched to private use!=
 Switched to public use!=
 Syntax error, try help=
@@ -988,6 +1037,14 @@ Use a trowel to remove the node.=
 
 Tube Wall Entry=
 
+### tubes.lua ###
+
+TechAge Tube=
+
+### tubes_ta4.lua ###
+
+TA4 Tube=
+
 ### turbine.lua ###
 
 TA3 Turbine=
@@ -1004,6 +1061,13 @@ TA Valve=
 TA3 Valve closed=
 TA3 Valve open=
 
+### waterinlet.lua ###
+
+Error: No natural water!=
+Error: No water available!=
+Error: Not on sea level!=
+TA4 Water Inlet=
+
 ### waterpump.lua ###
 
 TA4 Water Pump=
@@ -1012,9 +1076,7 @@ Water Pump=
 ### windturbine_lib.lua ###
 
 Here is not enough water (41x41 m)!=
-
-Here is not enough wind (A free air space of 41x41x21 m is necessary)!=
-
+Here is not enough wind@n(A free air space of 41x41x21 m is necessary)!=
 The next wind turbines is too close!=
 This is a=
 This is no ocean water!=
diff --git a/techage/logic/button.lua b/techage/logic/button.lua
index fbae4c8..b08a0a1 100644
--- a/techage/logic/button.lua
+++ b/techage/logic/button.lua
@@ -124,7 +124,8 @@ end
 local function on_rightclick_off(pos, node, clicker)
 	local meta = M(pos)
 	local numbers = meta:get_string("numbers")
-	if numbers ~= "" and numbers ~= nil then
+	local cycle_time = meta:get_int("cycle_time") or 0
+	if numbers ~= "" and numbers ~= nil and cycle_time == 0 then
 		if meta:get_string("public") == "true" or 
 				clicker:get_player_name() == meta:get_string("owner") then
 			switch_off(pos)
@@ -236,6 +237,9 @@ minetest.register_node("techage:ta4_button_off", {
 	after_dig_node = after_dig_node,
 	
 	on_rotate = screwdriver.disallow,
+	paramtype = "light",
+	use_texture_alpha = techage.CLIP,
+	sunlight_propagates = true,
 	paramtype2 = "facedir",
 	groups = {choppy=2, cracky=2, crumbly=2},
 	is_ground_content = false,
@@ -268,7 +272,9 @@ minetest.register_node("techage:ta4_button_on", {
 	on_rotate = screwdriver.disallow,
 	techage_set_numbers = techage_set_numbers,
 
-	
+	paramtype = "light",
+	use_texture_alpha = techage.CLIP,
+	sunlight_propagates = true,
 	paramtype2 = "facedir",
 	groups = {choppy=2, cracky=2, crumbly=2, not_in_creative_inventory=1},
 	is_ground_content = false,
diff --git a/techage/logic/cart_detector.lua b/techage/logic/cart_detector.lua
index 950cfa1..4457374 100644
--- a/techage/logic/cart_detector.lua
+++ b/techage/logic/cart_detector.lua
@@ -21,18 +21,22 @@ local logic = techage.logic
 local CYCLE_TIME = 2
 
 local function switch_off(pos)
-	logic.swap_node(pos, "techage:ta3_cartdetector_off")
-	logic.send_off(pos, M(pos))
+	local node = minetest.get_node(pos)
+	if node.name == "techage:ta3_cartdetector_on" then
+		logic.swap_node(pos, "techage:ta3_cartdetector_off")
+		logic.send_off(pos, M(pos))
+	end
 end
 
 local function switch_on(pos)
 	logic.swap_node(pos, "techage:ta3_cartdetector_on")
-	logic.send_on(pos, M(pos))
-	minetest.after(1, switch_off, pos)
+	if logic.send_on(pos, M(pos)) then
+		minetest.after(1, switch_off, pos)
+	end
 end
 
 local function node_timer(pos)
-	if minecart.check_cart_for_pushing(pos, nil, 1.5) then
+	if minecart.is_cart_available(pos, nil, 1.5) then
 		switch_on(pos)
 	else
 		switch_off(pos)
@@ -135,7 +139,7 @@ techage.register_node({"techage:ta3_cartdetector_off", "techage:ta3_cartdetector
 		if topic == "on" then
 			local node = minetest.get_node(pos)
 			local dir = minetest.facedir_to_dir(node.param2)
-			minecart.punch_cart(pos, nil, 1.5, dir)
+			minecart.punch_cart(pos, nil, 1.6, dir)
 		elseif topic == "state" then
 			local node = techage.get_node_lvm(pos)
 			if node.name == "techage:ta3_cartdetector_on" then
@@ -152,3 +156,5 @@ techage.register_node({"techage:ta3_cartdetector_off", "techage:ta3_cartdetector
 	end,
 })		
 
+-- Register default cart in addition
+minecart.tEntityNames["carts:cart"] = true
\ No newline at end of file
diff --git a/techage/logic/doorblock.lua b/techage/logic/doorblock.lua
index db72f09..b231a1b 100644
--- a/techage/logic/doorblock.lua
+++ b/techage/logic/doorblock.lua
@@ -87,10 +87,11 @@ for idx,pgn in ipairs(tPgns) do
 
 		paramtype = "light",
 		paramtype2 = "facedir",
-		use_texture_alpha = true,
+		use_texture_alpha = techage.BLEND,
 		sunlight_propagates = true,
 		sounds = default.node_sound_stone_defaults(),
-		groups = {cracky=2, choppy=2, crumbly=2, not_in_creative_inventory = idx==NUM_TEXTURES and 0 or 1},
+		groups = {cracky=2, choppy=2, crumbly=2, techage_door = 1, 
+				not_in_creative_inventory = idx==NUM_TEXTURES and 0 or 1},
 		is_ground_content = false,
 		drop = "techage:doorblock"..NUM_TEXTURES,
 	},
diff --git a/techage/logic/doorcontroller2.lua b/techage/logic/doorcontroller2.lua
index 1f0060e..d8409a7 100644
--- a/techage/logic/doorcontroller2.lua
+++ b/techage/logic/doorcontroller2.lua
@@ -3,7 +3,7 @@
 	TechAge
 	=======
 
-	Copyright (C) 2020 Joachim Stolberg
+	Copyright (C) 2020-2021 Joachim Stolberg
 
 	AGPL v3
 	See LICENSE.txt for more information
@@ -19,23 +19,43 @@ local S = techage.S
 
 local logic = techage.logic
 
-local MarkedNodes = {} -- t[player][hash] = entity 
+local MarkedNodes = {} -- t[player] = {{entity, pos},...} 
 local CurrentPos  -- to mark punched entities
+local RegisteredNodes = {}  -- to be checked before removed/placed
+
+local function is_simple_node(name)
+	-- special handling
+	if RegisteredNodes[name] ~= nil then 
+		return RegisteredNodes[name] 
+	end
+	
+	local ndef = minetest.registered_nodes[name]
+	if not ndef or name == "air" then return true end
+	if ndef.groups and ndef.groups.techage_door == 1 then return true end
+	
+	-- don't remove nodes with some intelligence or undiggable nodes
+	if ndef.drop == "" then return false end
+	if ndef.diggable == false then return false end
+	if ndef.after_dig_node then return false end
+	
+	return true
+end	
 
 local function unmark_position(name, pos)
-	MarkedNodes[name] = MarkedNodes[name] or {}
 	pos = vector.round(pos)
-	local hash = minetest.hash_node_position(pos)
-	if MarkedNodes[name][hash] then
-		MarkedNodes[name][hash]:remove()
-		MarkedNodes[name][hash] = nil
-		CurrentPos = hash
+	for idx,item in ipairs(MarkedNodes[name] or {}) do
+		if vector.equals(pos, item.pos) then
+			item.entity:remove()
+			table.remove(MarkedNodes[name], idx)
+			CurrentPos = pos
+			return
+		end
 	end
 end
 
 local function unmark_all(name)
-	for _,entity in pairs(MarkedNodes[name] or {}) do
-		entity:remove()
+	for _,item in ipairs(MarkedNodes[name] or {}) do
+		item.entity:remove()
 	end
 	MarkedNodes[name] = nil
 end
@@ -43,12 +63,11 @@ end
 local function mark_position(name, pos)
 	MarkedNodes[name] = MarkedNodes[name] or {}
 	pos = vector.round(pos)
-	local hash = minetest.hash_node_position(pos)
-	if hash ~= CurrentPos then -- entity not punched?
+	if not CurrentPos or not vector.equals(pos, CurrentPos) then -- entity not punched?
 		local entity = minetest.add_entity(pos, "techage:marker")
 		if entity ~= nil then
 			entity:get_luaentity().player_name = name
-			MarkedNodes[name][hash] = entity
+			table.insert(MarkedNodes[name], {pos = pos, entity = entity})
 		end
 		CurrentPos = nil
 		return true
@@ -56,11 +75,10 @@ local function mark_position(name, pos)
 	CurrentPos = nil
 end
 
-local function table_to_poslist(name)
+local function get_poslist(name)
 	local lst = {}
-	for hash,_ in pairs(MarkedNodes[name] or {}) do
-		local pos = minetest.get_position_from_hash(hash)
-		table.insert(lst, pos)
+	for _,item in ipairs(MarkedNodes[name] or {}) do
+		table.insert(lst, item.pos)
 	end
 	return lst
 end
@@ -83,7 +101,7 @@ minetest.register_entity(":techage:marker", {
 		glow = 8,
 	},
 	on_step = function(self, dtime)
-		self.ttl = (self.ttl or 600) - 1
+		self.ttl = (self.ttl or 2400) - 1
 		if self.ttl <= 0 then
 			local pos = self.object:get_pos()
 			unmark_position(self.player_name, pos)
@@ -98,23 +116,29 @@ minetest.register_entity(":techage:marker", {
 	end,
 })
 
-local function formspec1(meta)
+local function formspec1(nvm, meta)
 	local status = meta:get_string("status")
-	return "size[8,6.5]"..
+	local play_sound = dump(nvm.play_sound or false)
+	return "size[8,7]"..
 		"tabheader[0,0;tab;"..S("Ctrl,Inv")..";1;;true]"..
-		"button[0.7,0;3,1;record;"..S("Record").."]"..
-		"button[4.3,0;3,1;ready;"..S("Done").."]"..
-		"button[0.7,1;3,1;show;"..S("Set").."]"..
-		"button[4.3,1;3,1;hide;"..S("Remove").."]"..
-		"label[0.5,2;"..status.."]"..
-		"list[current_player;main;0,2.8;8,4;]"
+		"button[0.7,0.2;3,1;record;"..S("Record").."]"..
+		"button[4.3,0.2;3,1;ready;"..S("Done").."]"..
+		"button[0.7,1.2;3,1;show;"..S("Set").."]"..
+		"button[4.3,1.2;3,1;hide;"..S("Remove").."]"..
+		"checkbox[4.3,2.1;play_sound;"..S("with door sound")..";"..play_sound.."]"..
+		"label[0.5,2.3;"..status.."]"..
+		"list[current_player;main;0,3.3;8,4;]"
 end
 
 local function formspec2()
-	return "size[8,6.5]"..
+	return "size[8,7]"..
 		"tabheader[0,0;tab;"..S("Ctrl,Inv")..";2;;true]"..
-		"list[context;main;0,0;8,2;]"..
-		"list[current_player;main;0,2.8;8,4;]"..
+		"label[0.3,0.0;1]"..
+		"label[7.3,0.0;8]"..
+		"label[0.3,2.4;9]"..
+		"label[7.3,2.4;16]"..
+		"list[context;main;0,0.5;8,2;]"..
+		"list[current_player;main;0,3.3;8,4;]"..
 		"listring[context;main]"..
 		"listring[current_player;main]"
 end
@@ -126,82 +150,71 @@ local function play_sound(pos)
 		max_hear_distance = 15})
 end
 
-local function show_nodes(pos)
+local function exchange_node(pos, item, param2)
+	local node = minetest.get_node_or_nil(pos)
+	if node and is_simple_node(node.name) then
+		if item and item:get_name() ~= "" then
+			minetest.swap_node(pos, {name = item:get_name(), param2 = param2})
+		else
+			minetest.remove_node(pos)
+		end
+		if node.name ~= "air" then
+			return ItemStack(node.name), node.param2
+		else
+			return ItemStack(), nil
+		end
+	end
+	return item, param2
+end
+
+local function exchange_nodes(pos, nvm, slot)
 	local meta = M(pos)
 	local inv = meta:get_inventory()
 	
-	if not inv:is_empty("main") then
-		local item_list = inv:get_list("main")
-		local pos_list = minetest.deserialize(meta:get_string("pos_list")) or {}
-		local param2_list = minetest.deserialize(meta:get_string("param2_list")) or {}
-		local owner = meta:get_string("owner")
-		local res = false
-	
-		for idx = 1, 16 do
-			local pos = pos_list[idx]
-			local name = item_list[idx]:get_name()
-			local param2 = param2_list[idx]
-			if pos and param2 and name ~= "" then
-				if not minetest.is_protected(pos, owner) then
-					local node = minetest.get_node(pos)
-					if node.name == "air" then
-						minetest.add_node(pos, {name = name, param2 = param2})
-					end
-					res = true
-					item_list[idx]:set_count(0)
-				end
-			end
+	local item_list = inv:get_list("main")
+	local owner = meta:get_string("owner")
+	local res = false
+	nvm.pos_list = nvm.pos_list or {}
+	nvm.param2_list = nvm.param2_list or {}
+
+	for idx = (slot or 1), (slot or 16) do
+		local pos = nvm.pos_list[idx]
+		if pos and not minetest.is_protected(pos, owner) then
+			item_list[idx], nvm.param2_list[idx] = exchange_node(pos, item_list[idx], nvm.param2_list[idx])
+			res = true
 		end
-		
-		inv:set_list("main", item_list)
-		return res
 	end
-	return false
+	
+	inv:set_list("main", item_list)
+	return res
+end
+
+local function show_nodes(pos)
+	local nvm = techage.get_nvm(pos)
+	if not nvm.is_on then
+		nvm.is_on = true
+		if nvm.play_sound then
+			minetest.sound_play("doors_door_close", {
+				pos = pos, 
+				gain = 1,
+				max_hear_distance = 15})
+		end
+		return exchange_nodes(pos, nvm)
+	end
 end
 
 local function hide_nodes(pos)
-	local meta = M(pos)
-	local inv = meta:get_inventory()
-	
-	if inv:is_empty("main") then
-		local item_list = inv:get_list("main")
-		local pos_list = minetest.deserialize(meta:get_string("pos_list")) or {}
-		local param2_list = minetest.deserialize(meta:get_string("param2_list")) or {}
-		local owner = meta:get_string("owner")
-		local res = false
-		
-		for idx = 1, 16 do
-			local pos = pos_list[idx]
-			if pos then
-				if not minetest.is_protected(pos, owner) then
-					local node = minetest.get_node_or_nil(pos)
-					local meta = minetest.get_meta(pos)
-					if node and (not meta or not next((meta:to_table()).fields)) then
-						minetest.remove_node(pos)
-						if node.name ~= "air" then
-							item_list[idx] = ItemStack({name = node.name, count = 1})
-							param2_list[idx] = node.param2
-						end
-					else
-						item_list[idx] = nil
-						param2_list[idx] = 0
-					end
-					res = true
-				else
-					item_list[idx] = nil
-					param2_list[idx] = 0
-				end
-			else
-				item_list[idx] = nil
-				param2_list[idx] = 0
-			end
+	local nvm = techage.get_nvm(pos)
+	if nvm.is_on then
+		nvm.is_on = false
+		if nvm.play_sound then
+			minetest.sound_play("doors_door_open", {
+				pos = pos, 
+				gain = 1,
+				max_hear_distance = 15})
 		end
-		
-		meta:set_string("param2_list", minetest.serialize(param2_list))
-		inv:set_list("main", item_list)
-		return res
+		return exchange_nodes(pos, nvm)
 	end
-	return false
 end
 
 minetest.register_node("techage:ta3_doorcontroller2", {
@@ -219,7 +232,8 @@ minetest.register_node("techage:ta3_doorcontroller2", {
 		inv:set_size('main', 16)
 		logic.after_place_node(pos, placer, "techage:ta3_doorcontroller", S("TA3 Door Controller II"))
 		logic.infotext(meta, S("TA3 Door Controller II"))
-		meta:set_string("formspec", formspec1(meta))
+		local nvm = techage.get_nvm(pos)
+		meta:set_string("formspec", formspec1(nvm, meta))
 	end,
 
 	on_receive_fields = function(pos, formname, fields, player)
@@ -228,37 +242,37 @@ minetest.register_node("techage:ta3_doorcontroller2", {
 		end
 
 		local meta = M(pos)
+		local nvm = techage.get_nvm(pos)
+		
 		if fields.tab == "2" then
 			meta:set_string("formspec", formspec2(meta))
 			return
 		elseif fields.tab == "1" then
-			meta:set_string("formspec", formspec1(meta))
+			meta:set_string("formspec", formspec1(nvm, meta))
 			return
 		elseif fields.record then
 			local inv = meta:get_inventory()
-			if not inv:is_empty("main") then			
-				meta:set_string("status", S("Error: Inventory already in use"))
-			else
-				meta:set_string("status", S("Recording..."))
-				local name = player:get_player_name()
-				minetest.chat_send_player(name, S("Click on all the blocks that are part of the door/gate"))
-				MarkedNodes[name] = {}
-			end
-			meta:set_string("formspec", formspec1(meta))
+			nvm.pos_list = nil
+			nvm.is_on = false
+			meta:set_string("status", S("Recording..."))
+			local name = player:get_player_name()
+			minetest.chat_send_player(name, S("Click on all the blocks that are part of the door/gate"))
+			MarkedNodes[name] = {}
+			meta:set_string("formspec", formspec1(nvm, meta))
 		elseif fields.ready then
 			local name = player:get_player_name()
-			local pos_list = table_to_poslist(name)
+			local pos_list = get_poslist(name)
 			local text = #pos_list.." "..S("block positions are stored.")
 			meta:set_string("status", text)
-			local s = minetest.serialize(pos_list)
-			meta:set_string("pos_list", s)
+			nvm.pos_list = pos_list
+			nvm.is_on = true
 			unmark_all(name)
-			meta:set_string("formspec", formspec1(meta))
+			meta:set_string("formspec", formspec1(nvm, meta))
 		elseif fields.show then
 			if show_nodes(pos) then
 				play_sound(pos)
 				meta:set_string("status", S("Blocks are back"))
-				meta:set_string("formspec", formspec1(meta))
+				meta:set_string("formspec", formspec1(nvm, meta))
 				local name = player:get_player_name()
 				MarkedNodes[name] = nil
 			end
@@ -266,10 +280,13 @@ minetest.register_node("techage:ta3_doorcontroller2", {
 			if hide_nodes(pos) then
 				play_sound(pos)
 				meta:set_string("status", S("Blocks are disappeared"))
-				meta:set_string("formspec", formspec1(meta))
+				meta:set_string("formspec", formspec1(nvm, meta))
 				local name = player:get_player_name()
 				MarkedNodes[name] = nil
 			end
+		elseif fields.play_sound then
+			nvm.play_sound = fields.play_sound == "true"
+			meta:set_string("formspec", formspec1(nvm, meta))
 		end
 	end,
 	
@@ -277,7 +294,7 @@ minetest.register_node("techage:ta3_doorcontroller2", {
 		if minetest.is_protected(pos, player:get_player_name()) then
 			return 0
 		end
-		return 0
+		return 1
 	end,
 	allow_metadata_inventory_take = function(pos, listname, index, stack, player)
 		if minetest.is_protected(pos, player:get_player_name()) then
@@ -289,10 +306,7 @@ minetest.register_node("techage:ta3_doorcontroller2", {
 		if minetest.is_protected(pos, player:get_player_name()) then
 			return 0
 		end
-		
-		local inv = minetest.get_inventory({type="node", pos=pos})
-		local pos_list = minetest.deserialize(M(pos):get_string("pos_list")) or {}
-		if pos_list[index] and inv:get_stack(listname, index):get_count() == 0 then
+		if is_simple_node(stack:get_name()) then
 			return 1
 		end
 		return 0
@@ -320,16 +334,34 @@ minetest.register_node("techage:ta3_doorcontroller2", {
 techage.register_node({"techage:ta3_doorcontroller2"}, {
 	on_recv_message = function(pos, src, topic, payload)
 		if topic == "on" then
-			return hide_nodes(pos, nil)
+			return hide_nodes(pos)
 		elseif topic == "off" then
 			return show_nodes(pos)
+		elseif topic == "exchange" then
+			local nvm = techage.get_nvm(pos)
+			return exchange_nodes(pos, nvm, tonumber(payload))
 		end
 		return false
 	end,
 	on_node_load = function(pos)
 		local meta = M(pos)
+		local nvm = techage.get_nvm(pos)
 		meta:set_string("status", "")
-		meta:set_string("formspec", formspec1(meta))		
+		meta:set_string("formspec", formspec1(nvm, meta))
+		local pos_list = minetest.deserialize(meta:get_string("pos_list"))
+		if pos_list then
+			nvm.pos_list = pos_list
+			meta:set_string("pos_list", "")
+			local inv = meta:get_inventory()
+			if inv:is_empty("main") then
+				nvm.is_on = true
+			end
+		end
+		local param2_list = minetest.deserialize(meta:get_string("param2_list"))
+		if param2_list then
+			nvm.param2_list = param2_list
+			meta:set_string("param2_list", "")
+		end
 	end,
 })		
 
@@ -349,4 +381,45 @@ minetest.register_on_punchnode(function(pos, node, puncher, pointed_thing)
 		
 		mark_position(name, pointed_thing.under)
 	end
-end)
\ No newline at end of file
+end)
+
+function logic.register_doorcontroller_nodes(node_names)
+	for _,name in ipairs(node_names or {}) do
+		RegisteredNodes[name] = true
+	end
+end
+
+local Doors = {
+	"doors:door_steel",
+	"doors:prison_door",
+	"doors:rusty_prison_door",
+	"doors:trapdoor_steel",
+	"doors:door_glass",
+	"doors:door_obsidian_glass",
+	"doors:japanese_door",
+	"doors:screen_door",
+	"doors:slide_door",
+	"doors:trapdoor",
+	"doors:woodglass_door",
+	"xpanes:door_steel_bar",
+	"xpanes:trapdoor_steel_bar",
+}
+
+for _, name in ipairs(Doors) do
+	for _, postfix in ipairs({"a", "b", "c", "d"}) do
+		logic.register_doorcontroller_nodes({name .. "_" .. postfix})
+	end
+end
+
+local ProtectorDoors = {
+	"protector:door_steel",
+	"protector:door_wood",
+	"protector:trapdoor",
+	"protector:trapdoor_steel",
+}
+
+for _, name in ipairs(ProtectorDoors) do
+	for _, postfix in ipairs({"b_1", "b_2", "t_1", "t_2"}) do
+		logic.register_doorcontroller_nodes({name .. "_" .. postfix})
+	end
+end
diff --git a/techage/logic/gateblock.lua b/techage/logic/gateblock.lua
index f0d7c7b..c93955e 100644
--- a/techage/logic/gateblock.lua
+++ b/techage/logic/gateblock.lua
@@ -73,10 +73,11 @@ for idx,pgn in ipairs(tPgns) do
 
 		paramtype = "light",
 		paramtype2 = "facedir",
-		use_texture_alpha = true,
+		use_texture_alpha = techage.BLEND,
 		sunlight_propagates = true,
 		sounds = default.node_sound_stone_defaults(),
-		groups = {cracky=2, choppy=2, crumbly=2, not_in_creative_inventory = idx==NUM_TEXTURES and 0 or 1},
+		groups = {cracky=2, choppy=2, crumbly=2, techage_door = 1, 
+				not_in_creative_inventory = idx==NUM_TEXTURES and 0 or 1},
 		is_ground_content = false,
 		drop = "techage:gateblock"..NUM_TEXTURES,
 	},
diff --git a/techage/logic/lib.lua b/techage/logic/lib.lua
index 6e45767..7feb550 100644
--- a/techage/logic/lib.lua
+++ b/techage/logic/lib.lua
@@ -64,6 +64,7 @@ function techage.logic.send_on(pos, meta, time)
 		minetest.get_node_timer(pos):start(time)
 	end
 	techage.send_multi(own_num, numbers, "on")
+	return own_num == numbers
 end
 
 function techage.logic.send_off(pos, meta)
diff --git a/techage/logic/logic_block.lua b/techage/logic/logic_block.lua
new file mode 100644
index 0000000..942a410
--- /dev/null
+++ b/techage/logic/logic_block.lua
@@ -0,0 +1,372 @@
+--[[
+
+	TechAge
+	=======
+
+	Copyright (C) 2017-2021 Joachim Stolberg
+
+	AGPL v3
+	See LICENSE.txt for more information
+
+	Logic Block 2
+
+]]--
+
+-- for lazy programmers
+local M = minetest.get_meta
+local S = techage.S
+local logic = techage.logic
+local NUM_RULES = 4
+
+local HELP = S("Send an 'on'/'off' command if the\nexpression becomes true.\n") ..
+	S("\nRule:\n<output> = on/off if <input-expression> is true\n") ..
+	S("\n<output> is the block number to which the\ncommand should be sent.\n") ..
+	S("\n<input-expression> is a boolean expression\nwhere input numbers are evaluated.\n") ..
+	S("\nExamples:\n1234 == on\n1234 == off\n1234 == on and 2345 == off\n2345 ~= 3456\n") ..
+	S("\nValid operators:\nand   or   on   off   me   ==   ~=   (   )\n") ..
+	S("'~=' means: not equal\n") ..
+	S("'me' has to be used for the own block number.\n") ..
+	S("\nAll rules are checked with each received\ncommand.") ..
+	S("\nThe internal processing time for all\ncommands is 100 ms.")
+
+local ValidSymbols = {
+	["me"] = true,
+	["and"] = true,
+	["or"] = true,
+	["on"] = true,
+	["off"] = true,
+	["=="] = true,
+	["~="] = true,
+	["("] = true,
+	[")"] = true,
+}
+
+local Dropdown = {
+	[""] = 1, 
+	["on"] = 2, 
+	["off"] = 3
+}
+
+local function check_expr(pos, expr)
+	local nvm = techage.get_nvm(pos)
+	local origin = expr
+	-- Add blanks for the syntax check
+	expr = expr:gsub("==", " == ")
+	expr = expr:gsub("~=", " ~= ")
+	expr = expr:gsub("%(", " ( ")
+	expr = expr:gsub("%)", " ) ")
+	
+	-- First syntax check
+	local old_sym = "or"  -- valid default value
+	for sym in expr:gmatch("[^%s]+") do
+		if not ValidSymbols[sym] and string.find(sym, '^[0-9]+$') == nil then
+			return "Unexpected symbol '"..sym.."'"
+		end
+		if string.find(sym, '^[0-9]+$') and sym == nvm.own_num then
+			return "Invalid node number '"..sym.."'"
+		end
+		-- function call check
+		if sym == "(" and (old_sym ~= "and" and old_sym ~= "or") then
+			return "Syntax error at '" .. sym .. "'"
+		end
+		old_sym = sym
+	end
+	-- Second syntax check
+	local code, _ = loadstring("return " .. expr)
+	if not code then
+		return "Syntax error in '" .. origin .. "'"
+	end
+end
+
+local function check_num(pos, num, player_name)
+	local nvm = techage.get_nvm(pos)
+	
+	if num ~= "me" and (num == nvm.own_num or
+			not techage.check_numbers(num, player_name)) then
+		return "Invalid node number '"..num.."'"
+	end
+end
+
+local function send(pos, num, val)
+	local nvm = techage.get_nvm(pos)
+	
+	if num == "me" then
+		nvm.outp_tbl = nvm.outp_tbl or {}
+		nvm.outp_tbl.me = val
+		-- set the input directly
+		nvm.inp_tbl = nvm.inp_tbl or {}
+		nvm.inp_tbl.me = val
+	else
+		nvm.outp_tbl = nvm.outp_tbl or {}
+		nvm.outp_tbl[num] = val
+		nvm.own_num = nvm.own_num or M(pos):get_string("node_number")
+		techage.send_single(nvm.own_num, num, val)
+	end
+end
+
+local function get_inputs(pos)
+	local nvm = techage.get_nvm(pos)
+	-- old data is needed for formspec 'input' values
+	nvm.old_inp_tbl = table.copy(nvm.inp_tbl or {})
+	return nvm.old_inp_tbl
+end
+		
+local function check_syntax(pos, line, owner, outp, expr)
+	local err = check_num(pos, outp, owner)
+	if not err then
+		err = check_expr(pos, expr)
+		if not err then
+			return true, "ok"
+		end
+	end
+	return false, "Error(" .. line .. "): " .. err
+end	
+
+local function compile(nvm, str)
+    if str then
+        local code, _ = loadstring(str)
+		if code then
+			nvm.error = "ok"
+			return code
+		else
+			nvm.error = "Unknown compile error"
+		end
+    end
+end
+
+local function data(nvm)
+	local inp = {}
+	local outp = {}
+	for num, val in pairs(nvm.old_inp_tbl or {}) do
+		if num == nvm.own_num then num = "me" end
+		inp[#inp+1] = num .. " = " .. tostring(val)
+	end
+	for num, val in pairs(nvm.outp_tbl or {}) do
+		if num == nvm.own_num then num = "me" end
+		outp[#outp+1] = num .. " = " .. tostring(val)
+	end
+	return table.concat(inp, ",  "), table.concat(outp, ",  ")
+end
+
+local function get_code(pos, nvm)
+	local meta = M(pos)
+	local tbl = {"local inputs = get_inputs(pos) or {}"}
+	local owner = M(pos):get_string("owner")
+	nvm.own_num = nvm.own_num or M(pos):get_string("node_number")
+	
+	for i = 1,NUM_RULES do
+		local outp = meta:get_string("outp" .. i)
+		local val  = meta:get_string("val"  .. i)
+		local expr = meta:get_string("expr" .. i)
+		
+		if outp ~= "" and val ~= "" and expr ~= "" then
+			local res, err = check_syntax(pos, i, owner, outp, expr)
+			if res then
+				expr = string.gsub(expr, '([0-9]+)', 'inputs["%1"]')
+				expr = string.gsub(expr, 'me', 'inputs["me"]')
+				expr = string.gsub(expr, 'on', '"on"')
+				expr = string.gsub(expr, 'off', '"off"')
+				tbl[#tbl + 1]  = "if "..expr.." then send(pos, '"..outp.."', '"..val.."') end"
+			else
+				nvm.error = err
+				return
+			end
+		end
+	end
+	
+	local str = table.concat(tbl, "\n")
+	local code = compile(nvm, str)
+	if code then
+		local env = {}	
+		env.send = send
+		env.pos = pos
+		env.get_inputs = get_inputs
+		setfenv(code, env)
+		
+		return code
+	end
+end
+
+local function execute(pos)
+	local nvm = techage.get_nvm(pos)
+	local mem = techage.get_mem(pos)
+	mem.code = mem.code or get_code(pos, nvm)
+	if mem.code then
+		local res, _ = pcall(mem.code)
+		if not res then
+			nvm.error = "Unknown runtime error"
+			mem.code = nil
+		end
+	end
+end
+
+local function rules(meta)
+	local tbl = {}
+	
+	tbl[#tbl + 1] = "label[-0.2,0;<outp>]"
+	tbl[#tbl + 1] = "label[1.4,0;=]"
+	tbl[#tbl + 1] = "label[1.8,0;<cmnd>]"
+	tbl[#tbl + 1] = "label[3.5,0;if]"
+	tbl[#tbl + 1] = "label[4.2,0;<inp expression> is true]"
+	
+	
+	for i = 1,NUM_RULES do
+		local y1 = (i * 0.9) - 0.1
+		local y2 = (i * 0.9) - 0.2
+		local y3 = (i * 0.9) - 0.3
+		local outp = meta:get_string("outp" .. i)
+		local val  = meta:get_string("val"  .. i)
+		local expr = meta:get_string("expr" .. i)
+		val = Dropdown[val] or 1
+		
+		tbl[#tbl + 1] = "field[0," .. y1 .. ";1.6,1;outp" .. i ..";;" .. outp .. "]"
+		tbl[#tbl + 1] = "label[1.4," .. y2 .. ";=]"
+		tbl[#tbl + 1] = "dropdown[1.8," .. y3 .. ";1.6,1;val" .. i ..";,on,off;" .. val .. "]"
+		tbl[#tbl + 1] = "label[3.5," .. y2 .. ";if]"
+		tbl[#tbl + 1] = "field[4.2," .. y1 .. ";5.6,1;expr" .. i ..";;" .. expr .. "]"
+	end
+	return table.concat(tbl, "")
+end
+
+local function formspec(pos, meta)
+	local nvm = techage.get_nvm(pos)
+	local err = nvm.error or "ok"
+	err = minetest.formspec_escape(err)
+	nvm.io_tbl = nvm.io_tbl or {}
+	local inputs, outputs = data(nvm)
+	local bt = nvm.blocking_time or 1
+	return "size[10,8.2]" ..
+		"tabheader[0,0;tab;"..S("Rules") .. "," .. S("Help")..";1;;true]" ..
+		"container[0.4,0.1]" ..
+		rules(meta) ..
+		"container_end[]" ..
+		
+		"label[0.2,4.4;" .. S("Blocking Time") .. "]"..
+		"field[4.6,4.5;2,1;bt;;" .. bt .. "]"..
+		"label[6.3,4.4;s]"..
+		
+		"label[0,5.3;" .. S("Inputs") .. ":]" ..
+		"label[2,5.3;" .. inputs .."]" ..
+		"label[0,5.9;" .. S("Outputs") .. ":]" ..
+		"label[2,5.9;" .. outputs .."]" ..
+		"label[0,6.5;" .. S("Syntax") .. ":]" ..
+		"label[2,6.5;" .. err .. "]" ..
+		"button[1.5,7.5;3,1;update;" .. S("Update") .. "]" ..
+		"button[5.6,7.5;3,1;store;" .. S("Store") .. "]"
+end
+
+local function formspec_help()
+	return "size[10,8.2]" ..
+		"tabheader[0,0;tab;"..S("Rules") .. "," .. S("Help")..";2;;true]" ..
+		"textarea[0.3,0.3;9.9,8.5;;;"..minetest.formspec_escape(HELP).."]"
+end
+
+minetest.register_node("techage:ta3_logic2", {
+	description = S("TA3 Logic Block"),
+	tiles = {
+		-- up, down, right, left, back, front
+		"techage_filling_ta3.png^techage_frame_ta3_top.png",
+		"techage_filling_ta3.png^techage_frame_ta3_top.png",
+		"techage_filling_ta3.png^techage_frame_ta3.png^techage_appl_logic.png",
+	},
+
+	after_place_node = function(pos, placer)
+		local meta = M(pos)
+		local nvm = techage.get_nvm(pos)
+		logic.after_place_node(pos, placer, "techage:ta3_logic2", S("TA3 Logic Block"))
+		logic.infotext(meta, S("TA3 Logic Block"))
+		meta:set_string("formspec", formspec(pos, meta))
+		meta:set_string("owner", placer:get_player_name())
+	end,
+
+	on_receive_fields = function(pos, formname, fields, player)
+		if minetest.is_protected(pos, player:get_player_name()) then
+			return
+		end
+		
+		local meta = M(pos)
+		
+		if fields.store then
+			for i = 1,NUM_RULES do
+				meta:set_string("outp" .. i, fields["outp" .. i] or "")
+				meta:set_string("val"  .. i, fields["val"  .. i] or "")
+				meta:set_string("expr" .. i, fields["expr" .. i] or "")
+			end
+			local nvm = techage.get_nvm(pos)
+			nvm.blocking_time = tonumber(fields.bt) or 0.1
+			nvm.inp_tbl = {me = "off"}
+			nvm.outp_tbl = {}
+		end
+		
+		if fields.tab == "2" then
+			meta:set_string("formspec", formspec_help())
+		else
+			local nvm = techage.get_nvm(pos)
+			local mem = techage.get_mem(pos)
+			mem.code = nil
+			get_code(pos, nvm)
+			meta:set_string("formspec", formspec(pos, meta))
+		end
+	end,
+	
+	on_timer = function(pos)
+		execute(pos)
+		return false
+	end,
+	
+	on_rightclick = function(pos, node, clicker)
+		if minetest.is_protected(pos, clicker:get_player_name()) then
+			return
+		end
+		
+		local meta = M(pos)
+		local nvm = techage.get_nvm(pos)
+		meta:set_string("formspec", formspec(pos, meta))
+	end,
+	
+	after_dig_node = function(pos, oldnode, oldmetadata)
+		techage.remove_node(pos, oldnode, oldmetadata)
+		techage.del_mem(pos)
+	end,
+	
+	paramtype2 = "facedir",
+	groups = {choppy=2, cracky=2, crumbly=2},
+	is_ground_content = false,
+	sounds = default.node_sound_wood_defaults(),
+})
+
+
+minetest.register_craft({
+	output = "techage:ta3_logic2",
+	recipe = {
+		{"", "group:wood", ""},
+		{"techage:vacuum_tube", "default:copper_ingot", "techage:vacuum_tube"},
+		{"", "group:wood", ""},
+	},
+})
+
+techage.register_node({"techage:ta3_logic2"}, {
+	on_recv_message = function(pos, src, topic, payload)
+		local nvm = techage.get_nvm(pos)
+		local mem = techage.get_mem(pos)
+		nvm.own_num = nvm.own_num or M(pos):get_string("node_number")
+		nvm.blocking_time = nvm.blocking_time or M(pos):get_float("blocking_time")
+		nvm.inp_tbl = nvm.inp_tbl or {}
+		
+		if src ~= nvm.own_num then
+			if topic == "on" then
+				nvm.inp_tbl[src] = "on"
+			elseif topic == "off" then
+				nvm.inp_tbl[src] = "off"
+			else
+				return "unsupported"
+			end
+			
+			local t = math.max((mem.ttl or 0) - techage.SystemTime, 0.1)
+			minetest.get_node_timer(pos):start(t)
+			mem.ttl = techage.SystemTime + (nvm.blocking_time or 0)
+		end
+	end,
+})		
+
+
diff --git a/techage/logic/lua_logic.lua b/techage/logic/lua_logic.lua
index 9f7e1cd..f8b0ab7 100644
--- a/techage/logic/lua_logic.lua
+++ b/techage/logic/lua_logic.lua
@@ -8,7 +8,7 @@
 	AGPL v3
 	See LICENSE.txt for more information
 
-	Lua Logic Block
+	Lua Logic Block (Deprecated and replaced by "techage:ta3_logic2")
 
 ]]--
 
@@ -215,18 +215,20 @@ minetest.register_node("techage:ta3_logic", {
 	paramtype2 = "facedir",
 	groups = {choppy=2, cracky=2, crumbly=2},
 	is_ground_content = false,
+	drop = "techage:ta3_logic2",
 	sounds = default.node_sound_wood_defaults(),
 })
 
 
-minetest.register_craft({
-	output = "techage:ta3_logic",
-	recipe = {
-		{"", "group:wood", ""},
-		{"", "default:copper_ingot", "techage:vacuum_tube"},
-		{"", "group:wood", ""},
-	},
-})
+-- Deprecated and replaced by "techage:ta3_logic2"
+--minetest.register_craft({
+--	output = "techage:ta3_logic",
+--	recipe = {
+--		{"", "group:wood", ""},
+--		{"", "default:copper_ingot", "techage:vacuum_tube"},
+--		{"", "group:wood", ""},
+--	},
+--})
 
 techage.register_node({"techage:ta3_logic"}, {
 	on_recv_message = function(pos, src, topic, payload)
diff --git a/techage/logic/sequencer.lua b/techage/logic/sequencer.lua
index 06c9e41..b5abfb7 100644
--- a/techage/logic/sequencer.lua
+++ b/techage/logic/sequencer.lua
@@ -44,8 +44,9 @@ local function formspec(state, rules, endless)
 		tbl[#tbl+1] = "field[6.2,"..(-0.2+idx)..";2,1;offs"..idx..";;"..(rule.offs or "").."]"
 	end
 	tbl[#tbl+1] = "checkbox[0,8.5;endless;Run endless;"..dump(endless).."]"
-	tbl[#tbl+1] = "image_button[5,8.5;1,1;".. techage.state_button(state) ..";button;]"
-	tbl[#tbl+1] = "button[6.2,8.5;1.5,1;help;help]"
+	tbl[#tbl+1] = "button[2.2,8.5;1.5,1;help;help]"
+	tbl[#tbl+1] = "button[4.2,8.5;1.5,1;save;Save]"
+	tbl[#tbl+1] = "image_button[6.2,8.5;1,1;".. techage.state_button(state) ..";button;]"
 	
 	return table.concat(tbl)
 end
@@ -93,7 +94,7 @@ local function restart_timer(pos, time)
 		timer:stop()
 	end
 	if type(time) == "number" then
-		time = math.max(time, 0.5)
+		time = math.max(time, 0.2)
 		timer:start(time)
 	end
 end	
@@ -262,7 +263,11 @@ techage.register_node({"techage:ta3_sequencer"}, {
 		elseif topic == "off" then
 			-- do not stop immediately
 			local nvm = techage.get_nvm(pos)
-			nvm.endless = false
+			if not nvm.running then
+				nvm.endless = not (nvm.endless or false)
+			else
+				nvm.endless = false
+			end
 		else
 			return "unsupported"
 		end
diff --git a/techage/logic/terminal.lua b/techage/logic/terminal.lua
index 436eb7b..bae261c 100644
--- a/techage/logic/terminal.lua
+++ b/techage/logic/terminal.lua
@@ -224,6 +224,7 @@ local function register_terminal(num, tiles, node_box, selection_box)
 		end,
 		
 		paramtype = "light",
+		use_texture_alpha = techage.CLIP,
 		sunlight_propagates = true,
 		paramtype2 = "facedir",
 		groups = {choppy=2, cracky=2, crumbly=2},
diff --git a/techage/lua_controller/commands.lua b/techage/lua_controller/commands.lua
index db1ed3f..ef3bd0e 100644
--- a/techage/lua_controller/commands.lua
+++ b/techage/lua_controller/commands.lua
@@ -38,6 +38,18 @@ techage.lua_ctlr.register_function("get_input", {
 		" The device has to be connected with the controller."
 })
 
+techage.lua_ctlr.register_function("get_next_input", {
+	cmnd = function(self)
+		return techage.lua_ctlr.get_next_input(self.meta.number)
+	end,
+	help = ' $get_next_input()  --> number and state\n'..
+		' Similar to $get_input(), but provides the\n'..
+		' input node number in addition.\n'..
+		' example: num, state = $get_next_input()\n'..
+		' This function deletes the input and returns\n'..
+		' nil if no further input value is available.'
+})
+
 techage.lua_ctlr.register_function("read_data", {
 	cmnd = function(self, num, cmnd, data)
 		num = tostring(num or "")
diff --git a/techage/lua_controller/controller.lua b/techage/lua_controller/controller.lua
index 70eb1dc..6c6cd43 100644
--- a/techage/lua_controller/controller.lua
+++ b/techage/lua_controller/controller.lua
@@ -87,6 +87,7 @@ techage.lua_ctlr.register_action("print", {
 		local pos = self.meta.pos
 		text = tostring(text or "")
 		output(pos, text)
+		--print("Lua: "..text)
 	end,
 	help = " $print(text)\n"..
 		" Send a text line to the output window.\n"..
@@ -553,6 +554,7 @@ minetest.register_node("techage:ta4_lua_controller", {
 	on_timer = on_timer,
 	
 	paramtype = "light",
+	use_texture_alpha = techage.CLIP,
 	sunlight_propagates = true,
 	paramtype2 = "facedir",
 	groups = {choppy=1, cracky=1, crumbly=1},
@@ -603,6 +605,18 @@ function techage.lua_ctlr.get_input(number, input)
 	return "off"
 end	
 
+function techage.lua_ctlr.get_next_input(number)
+	if Cache[number] and Cache[number].inputs then
+		local num, state = next(Cache[number].inputs or {})
+		if num ~= "msg" and num ~= "term" then
+			if num then
+				Cache[number].inputs[num] = nil
+			end
+			return num, state
+		end
+	end
+end	
+
 -- used for Terminal commands
 function techage.lua_ctlr.get_command(number)
 	if Cache[number] and Cache[number].inputs then
diff --git a/techage/lua_controller/server.lua b/techage/lua_controller/server.lua
index e59fcb8..eeff021 100644
--- a/techage/lua_controller/server.lua
+++ b/techage/lua_controller/server.lua
@@ -93,7 +93,7 @@ minetest.register_node("techage:ta4_server", {
 		techage.remove_node(pos, oldnode, oldmetadata)
 	end,
 
-on_timer = function(pos, elasped)
+	on_timer = function(pos, elasped)
 		local meta = M(pos)
 		local nvm = techage.get_nvm(pos)
 		nvm.size = nvm.size or 0
@@ -104,6 +104,7 @@ on_timer = function(pos, elasped)
 	
 	paramtype = "light",
 	sunlight_propagates = true,
+	use_texture_alpha = techage.CLIP,
 	paramtype2 = "facedir",
 	groups = {choppy=1, cracky=1, crumbly=1},
 	is_ground_content = false,
@@ -119,6 +120,111 @@ minetest.register_craft({
 	},
 })
 
+minetest.register_node("techage:ta4_server2", {
+	description = "TA4 Lua Rack Server",
+	tiles = {
+		-- up, down, right, left, back, front
+		"techage_server2_top.png",
+		"techage_server2_top.png",
+		"techage_server2_side.png",
+		"techage_server2_side.png^[transformFX",
+		"techage_server2_back.png",
+		{
+			image = "techage_server2_front.png",
+			backface_culling = false,
+			animation = {
+				type = "vertical_frames",
+				aspect_w = 32,
+				aspect_h = 32,
+				length = 1,
+			},
+		},
+	},
+
+	drawtype = "nodebox",
+	node_box = {
+        type = "fixed",
+        fixed = {
+            {-0.5, -0.5, -0.5, -0.4375, -0.4375, 0.5},
+            {-0.5, 0.4375, -0.5, -0.4375, 0.5, 0.5},
+            {0.4375, -0.5, -0.5, 0.5, -0.4375, 0.5},
+            {0.4375, 0.4375, -0.5, 0.5, 0.5, 0.5},
+            {-0.5, -0.5, -0.375, -0.4375, 0.5, -0.3125},
+            {-0.5, -0.5, 0.3125, -0.4375, 0.5, 0.375},
+            {0.4375, -0.5, 0.3125, 0.5, 0.5, 0.375},
+            {0.4375, -0.5, -0.375, 0.5, 0.5, -0.3125},
+            {-0.4375, -0.3125, -0.4375, 0.4375, 0.3125, 0.4375},
+            {0.4375, -0.0625, -0.4375, 0.5, 0, 0.4375},
+            {-0.5, -0.0625, -0.4375, -0.4375, 0, 0.4375},
+        }
+    },
+	
+	after_place_node = function(pos, placer)
+		local meta = M(pos)
+		local nvm = techage.get_nvm(pos)
+		local number = techage.add_node(pos, "techage:ta4_server2")
+		meta:set_string("owner", placer:get_player_name())
+		meta:set_string("number", number)
+		meta:set_string("formspec", formspec(nvm))
+		nvm.size = 0
+		meta:set_string("infotext", "Server "..number..": ("..nvm.size.."/"..SERVER_CAPA..")")
+		minetest.get_node_timer(pos):start(20)
+	end,
+	
+	on_receive_fields = function(pos, formname, fields, player)
+		local meta = M(pos)
+		local nvm = techage.get_nvm(pos)
+		local owner = meta:get_string("owner")
+		if player:get_player_name() == owner then
+			if fields.names and fields.names ~= "" then
+				nvm.names = string.split(fields.names, " ")
+				meta:set_string("formspec", formspec(nvm))
+			end
+		end
+	end,
+	
+	on_dig = function(pos, node, puncher, pointed_thing)
+		if minetest.is_protected(pos, puncher:get_player_name()) then
+			return
+		end
+		techage.del_mem(pos)
+		minetest.node_dig(pos, node, puncher, pointed_thing)
+	end,
+		
+	after_dig_node = function(pos, oldnode, oldmetadata)
+		techage.remove_node(pos, oldnode, oldmetadata)
+	end,
+
+	on_timer = function(pos, elasped)
+		local meta = M(pos)
+		local nvm = techage.get_nvm(pos)
+		nvm.size = nvm.size or 0
+		local number = meta:get_string("number")
+		meta:set_string("infotext", "Server "..number..": ("..nvm.size.."/"..SERVER_CAPA..")")
+		return true
+	end,
+	
+	paramtype = "light",
+	sunlight_propagates = true,
+	use_texture_alpha = techage.CLIP,
+	paramtype2 = "facedir",
+	groups = {choppy=1, cracky=1, crumbly=1},
+	is_ground_content = false,
+	sounds = default.node_sound_stone_defaults(),
+})
+
+minetest.register_craft({
+	type = "shapeless",
+	output = "techage:ta4_server2",
+	recipe = {"techage:ta4_server"},
+})
+
+minetest.register_craft({
+	type = "shapeless",
+	output = "techage:ta4_server",
+	recipe = {"techage:ta4_server2"},
+})
+
 local function calc_size(v)
 	if type(v) == "number" then
 		return 1
@@ -172,7 +278,7 @@ local function read_value(nvm, key)
 	return item
 end	
 
-techage.register_node({"techage:ta4_server"}, {
+techage.register_node({"techage:ta4_server", "techage:ta4_server2"}, {
 	on_recv_message = function(pos, src, topic, payload)
 		return "unsupported"
 	end,
diff --git a/techage/lua_controller/terminal.lua b/techage/lua_controller/terminal.lua
index 04c8b6a..26bc63b 100644
--- a/techage/lua_controller/terminal.lua
+++ b/techage/lua_controller/terminal.lua
@@ -179,6 +179,7 @@ minetest.register_node("techage:ta4_terminal", {
 	end,
 	
 	paramtype = "light",
+	use_texture_alpha = techage.CLIP,
 	sunlight_propagates = true,
 	paramtype2 = "facedir",
 	groups = {choppy=2, cracky=2, crumbly=2},
diff --git a/techage/manuals/QSG.md b/techage/manuals/QSG.md
index 3278939..4c28014 100644
--- a/techage/manuals/QSG.md
+++ b/techage/manuals/QSG.md
@@ -88,8 +88,8 @@ Since the levels build on each other, all ages have to be run through one after
 | Oil Drill Box                  |          | 16       |           |
 | Oil Pumpjack                   |          | 16       |           |
 | TA3 Oil Reboiler               |          | 14       |           |
-| TA4 Electrolyzer               |          |          | 30        |
-| TA4 Fuel Cell                  |          |          | 25        |
+| TA4 Electrolyzer               |          |          | 35        |
+| TA4 Fuel Cell                  |          |          | 34        |
 | TA4 Reactor                    | -        | -        | 8         |
 | Steam Engine                   | 25       |          |           |
 | Coal Power Station             |          | 80       |           |
diff --git a/techage/manuals/manual_ta2_DE.md b/techage/manuals/manual_ta2_DE.md
index 39bc18c..d6dc310 100644
--- a/techage/manuals/manual_ta2_DE.md
+++ b/techage/manuals/manual_ta2_DE.md
@@ -99,6 +99,12 @@ Die Transportkapazität einer Röhre ist unbegrenzt und nur durch die Schieber b
 
 [tube|image]
 
+### Röhren Konzentrator / Tube Concentrator
+
+Über den Konzentrator können mehrere Röhren zu einer Röhre zusammengeführt werden. Die Richtung, in der alle Items weitergegeben werden, ist mit einem Pfeil markiert.
+
+[concentrator|image]
+
 
 ### TA2 Schieber / Pusher
 
@@ -132,6 +138,12 @@ Einstellbar ist die Betriebsart über die "blockiere" Checkbox.
 
 Der Verarbeitungsleistung eines TA2 Verteilers beträgt 4 Items alle 2 s, wobei der Verteiler dabei versucht, die 4 Items auf die offenen Ausgänge zu verteilen.
 
+Wird dasselbe Item in einem Filter mehrfach hinterlegt, so beeinflusst dies das langfristige Verteilungsverhältnis entsprechend.
+
+Bitte beachte, dass die Verteilung ein probabilistischer Vorgang ist, d.h. die Verhältnisse werden nicht exakt, sondern nur langfristig eingehalten.
+
+In den Filtern beträgt die maximale Stackgröße 12; insgesamt können höchstens 36 Items konfiguriert werden.
+
 [ta2_distributor|image]
 
 
diff --git a/techage/manuals/manual_ta2_EN.md b/techage/manuals/manual_ta2_EN.md
index c607ddd..0d4c30c 100644
--- a/techage/manuals/manual_ta2_EN.md
+++ b/techage/manuals/manual_ta2_EN.md
@@ -100,6 +100,11 @@ The transport capacity of a tube is unlimited and only limited by the pusher.
 
 [tube|image]
 
+### Tube Concentrator
+
+Several tubes can be combined into one tube via the concentrator. The direction in which all items are passed on is marked with an arrow. 
+
+[concentrator|image]
 
 ### TA2 Pusher
 
@@ -133,6 +138,12 @@ The operating mode can be set using the "blocking mode" checkbox.
 
 The processing power of a TA2 distributor is 4 items every 2 s, whereby the distributor tries to distribute the 4 items to the open outputs.
 
+If the same item is configured multiple times in one filter, the long term distribution ratio will be influenced accordingly.
+
+Please note that the distribution is a probabilistic process. This means that the distribution rations won't be matched exactly, but only in the long term.
+
+The maximum stack size in the filters is 12; in total, not more than 36 items can be configured.
+
 [ta2_distributor|image]
 
 
diff --git a/techage/manuals/manual_ta3_DE.md b/techage/manuals/manual_ta3_DE.md
index d3972df..7f8dfae 100644
--- a/techage/manuals/manual_ta3_DE.md
+++ b/techage/manuals/manual_ta3_DE.md
@@ -235,7 +235,7 @@ Siehe auch TA4 Ofenheizung.
 
 Ist Teil des TA3 Industrieofen.
 
-Der Ölbrenner kann mit Schweröl, Naphtha oder Benzin betrieben werden. Die Brennzeit beträgt für Schweröl 80 s, Naphtha 90 s und Benzin 100 s.
+Der Ölbrenner kann mit Erdöl, Schweröl, Naphtha oder Benzin betrieben werden. Die Brennzeit beträgt für Erdöl 65 s, Schweröl 80 s, Naphtha 90 s und Benzin 100 s.
 
 Der Ölbrenner kann nur 50 Einheiten Kraftstoff aufnehmen. Ein zusätzlicher Tank und eine Pumpe sind daher ratsam.
 
@@ -327,6 +327,7 @@ Das Ventil kann auch über on/off Kommandos angesteuert werden.
 [ta3_valve|image]
 
 
+
 ## Öl-Förderung
 
 Um deine Generatoren und Öfen mit Öl betreiben zu können, muss du zuerst nach Öl suchen und einen Bohrturm errichten und danach das Öl fördern.
@@ -521,31 +522,47 @@ Hinweis: Mit dem Programmer können Blocknummern sehr einfach eingesammelt und k
 
 ### TA3 Logikblock / Logic Block
 
-Den TA3 Logikblock kann man so programmieren, dass ein oder mehrere Eingangssignale zu einem Ausgangssignal verknüpft und gesendet werden. Dieser Block kann daher diverse Logik-Elemente wie AND, OR, NOT, XOR usw. ersetzen.
-Eingangssignale für den Logikblock sind `on`/`off` Kommandos. Ein `on` ist ein logisches `true`, ein `off` entspricht dem `false`.
-Eingangssignale werden über die Nummer referenziert, also bspw. `n123` für das Signal vom Sender mit der Nummer 123.
+Den TA3 Logikblock kann man so programmieren, dass ein oder mehrere Eingangskommandos zu einem Ausgangskommando verknüpft und gesendet werden. Dieser Block kann daher diverse Logik-Elemente wie AND, OR, NOT, XOR usw. ersetzen.
+Eingangkommandos für den Logikblock sind `on`/`off` Kommandos.
+Eingangskommandos werden über die Nummer referenziert, also bspw. `1234` für das Kommando vom Sender mit der Nummer 1234.
+Das gleiche gilt für Ausgangskommandos.
 
-**Beispiele für den IF Ausdruck**
+Eine Regel ist wie folgt aufgebaut:
+
+```
+<output> = on/off if <input-expression> is true
+```
+
+`<output>` ist die Nummer des Blocks, zu dem das Kommando gesendet werden soll.
+`<input-expression>` ist ein boolescher Ausdruck, bei dem Eingabenummern ausgewertet werden. 
+
+
+
+**Beispiele für den Input Ausdruck**
 
 Signal negieren (NOT):
 
-    not n123
+    1234 == off
 
 Logisches UND (AND):
 
-    n123 and n345
+    1234 == on and 2345 == on
 
 Logisches ODER (OR):
 
-    n123 or n345
+    1234 == on or 2345 == on
 
-Ist der `if`-Ausdruck wahr (true), wird der `then` Zweig ausgeführt, anderenfalls der `else` Zweig.
-Bei `then` und `else` kann entweder `true`, `false`, oder nichts eingegeben werden:
-- bei `true` wird `on` gesendet
-- bei `false` wird `off` gesendet
-- wird nichts eingegeben, wird auch nichts gesendet
+Folgende Operatoren sind zulässig:  `and`   `or`   `on`   `off`   `me`   `==`   `~=`   `(`   `)`
 
-Den oder die Ziel-Blöcke für das Ausgangssignal muss man im Zielnummern-Feld eingeben.
+Ist der Ausdruck wahr (true), wird ein Kommando an den Block mit der `<output>` Nummer gesendet.
+
+Es können bis zu vier Regeln definiert werden, wobei immer alle Regeln geprüft werden, wenn ein Kommando empfangen wird.
+
+Die interne Durchlaufzeit aller Kommandos beträgt 100 ms.
+
+Über das Schlüsselwort `me` kann die eigene Knotennummer referenziert werden. Damit ist es möglich, dass sich der Block selbst ein Kommando sendet (Flip-Flop Funktion).
+
+Die Sperrzeit definiert eine Pause nach einem Kommando, in der der Logikblock kein weiteres Kommando von extern annimmt.  Empfangene Kommandos in der Sperrzeit werden damit verworfen. Die Sperrzeit kann in Sekunden definiert werden.
 
 [ta3_logic|image]
 
@@ -622,10 +639,20 @@ Der Tür Controller dient zur Ansteuerung der TA3 Tür/Tor Blöcke. Beim Tür Co
 
 ### TA3 Tür Controller II / Door Controller II
 
-Der Tür Controller II kann alle Arten von Blöcken entfernen und wieder setzen. Um den Tür Controller II anzulernen, muss der "Aufzeichnen" Button gedrückt werden. Dann müssen alle Blöcke angeklickt werden, die Teil der Tür / des Tores sein sollen. Danach muss der "Fertig" Button gedrückt werden.  Es können bis zu 16 Blöcke ausgewählt werden. Die entfernten Blöcke werden im Inventar des Controllers gespeichert. Über die Tasten "Entfernen" bzw. "Setzen" kann die Funktion des Controllers von Hand getestet werden.
+Der Tür Controller II kann alle Arten von Blöcken entfernen und wieder setzen. Um den Tür Controller II anzulernen, muss der "Aufzeichnen" Button gedrückt werden. Dann müssen alle Blöcke angeklickt werden, die Teil der Tür / des Tores sein sollen. Danach muss der "Fertig" Button gedrückt werden.  Es können bis zu 16 Blöcke ausgewählt werden. Die entfernten Blöcke werden im Inventar des Controllers gespeichert.
+
+ Über die Tasten "Entfernen" bzw. "Setzen" kann die Funktion des Controllers von Hand getestet werden.
 
 Wird ein  `on` / `off` Kommando an den Tür Controller II gesendet, entfernt bzw. setzt er die Blöcke ebenfalls.
 
+Über ein `exchange` Kommando können einzelne Böcke gesetzt, entfernt, bzw. durch andere Blöcke ersetzt werden. Die Slot-Nummer des Inventars (1 .. 16) muss als payload übergeben werden, also:
+
+```
+$send_cmnd(node_number, "exchange", 2)
+```
+
+Damit lassen sich auch ausfahrbare Treppen und ähnliches simulieren.
+
 [ta3_doorcontroller|image]
 
 ### TA3 Mesecons Umsetzer / TA3 Mesecons Converter
@@ -699,15 +726,7 @@ Die Verarbeitungsleistung beträgt 6 Items alle 2 s.
 
 ### TA3 Verteiler / Distributor
 
-Die Funktion des TA3 Verteilers entspricht der von TA2 mit einer weiteren Betriebart.
-
-**1:1 Bestückungsfunktion**
-
-Wird nur ein Ausgang aktiviert und mit mehreren Items konfiguriert, so kann die 1:1 Checkbox angeklickt werden. In diesem Falle werden nur Items gemäß der Filtereinstellung angenommen und in der Reihenfolge, wie die Items im Filter eingetragen sind, in definierte Positionen im Ziel-Inventar abgelegt. Damit kann weder das Inventar des Verteilers noch des Zielblocks volllaufen. Dies funktioniert für Autocrafter, Industrieofen und Elektronikfabrik.
-Mit dieser Betriebsart lassen sich andere Maschinen wie bspw. der Autocrafter exakt gemäß dem eingestellten Rezept bestücken. 
-
-Dies funktioniert nur nur, wenn die Inventare des Verteilers und des Zielblocks zuvor frei sind.
-
+Die Funktion des TA3 Verteilers entspricht der von TA2.
 Die Verarbeitungsleistung beträgt 12 Items alle 4 s.
 
 [ta3_distributor|image]
@@ -761,13 +780,19 @@ Die Verarbeitungsleistung beträgt 2 Items alle 4 s. Der Block benötigt 6 ku St
 
 [ta3_grinder|image]
 
+### TA3 Injektor / Injector
 
-### TA3 Flüssigkeitensammler / Liquid Sampler
+Der Injektor ist ein TA3 Schieber mit speziellen Eigenschaften. Er besitzt ein Menü zur Konfiguration. Hier können bis zu 8 Items konfiguriert werden. Er entnimmt nur diese Items einer Kiste um sie an Maschinen mit Rezepturen weiterzugeben (Autocrafter, Industrieofen und Elektronikfabrik).
+
+Beim Weitergeben wird in der Zielmaschine pro Item nur eine Position im Inventar genutzt. Sind bspw. nur die ersten drei Einträge im Injektor konfiguriert, so werden auch nur die ersten drei Speicherplätze im Inventar der Maschine belegt. Damit wir ein Überlauf im Inventar der Maschine verhindert.
+
+Der Injektor kann auch auf "Ziehe-Modus" umgeschaltet werden. Dann zieht er nur Items von den Positionen aus der Kiste, die in der Konfiguration des Injektors definiert sind. Hier müssen also Item-Typ und Position überein stimmen. Damit können geziehlt Speicherplätze im Inventar einer Kiste geleert werden.
+
+Die Verarbeitungsleistung beträgt bis zu 8 mal ein Item alle 4 Sekunden.
+
+[ta3_injector|image]
 
-Die Funktion entspricht der von TA2.  
-Die Verarbeitungsleistung ist 2 Items alle 8 s. Der Block benötigt 5 ku Strom.
 
-[ta3_liquidsampler|image]
 
 
 ## Werkzeuge
diff --git a/techage/manuals/manual_ta3_EN.md b/techage/manuals/manual_ta3_EN.md
index 7dbafee..c1f2fb2 100644
--- a/techage/manuals/manual_ta3_EN.md
+++ b/techage/manuals/manual_ta3_EN.md
@@ -226,7 +226,7 @@ See also TA4 heater.
 
 Is part of the TA3 industrial furnace.
 
-The oil burner can be operated with fuel oil, naphtha or gasoline. The burning time is 80 s for fuel oil, 90 s for naphtha and 100 s for gasoline.
+The oil burner can be operated with crude oil, fuel oil, naphtha or gasoline. The burning time is 64 s for crude oil, 80 s for fuel oil, 90 s for naphtha and 100 s for gasoline.
 
 The oil burner can only hold 50 units of fuel. An additional tank and a pump are therefore advisable.
 
@@ -308,7 +308,6 @@ The blocks serve as wall openings for tubes, so that no holes remain open.
 
 [ta3_pipe_wall_entry|image]
 
-
 ### TA Valve
 
 There is a valve for the yellow pipes, which can be opened and closed with a click of the mouse.
@@ -510,31 +509,45 @@ Note: With the programmer, block numbers can be easily collected and configured.
 
 ### TA3 Logic Block
 
-The TA3 logic block can be programmed so that one or more input signals are linked to one output signal and sent. This block can therefore replace various logic elements such as AND, OR, NOT, XOR etc.
-Input signals for the logic block are `on` / `off` commands. An `on` is a logical `true`, an `off` corresponds to the `false`.
-Input signals are referenced by the number, e.g. `n123` for the signal from the transmitter with the number 123.
+The TA3 logic block can be programmed in such a way that one or more input commands are linked to one output command and sent. This block can therefore replace various logic elements such as AND, OR, NOT, XOR etc. 
+Input commands for the logic block are `on` /` off` commands.
+Input commands are referenced via the number, e.g. `1234` for the command from the sender with the number 1234. 
+The same applies to output commands.
 
-** Examples for the IF expression **
+A rule is structured as follows: 
+
+```
+<output> = on/off if <input-expression> is true
+```
+
+`<output>` is the block number to which the command should be sent.
+`<input-expression>` is a boolean expression where input numbers are evaluated.
+
+
+
+**Examples for the input expression**
 
 Negate signal (NOT):
 
-    not n123
+    1234 == off
 
 Logical AND:
 
-    n123 and n345
+    1234 == on and 2345 == on
 
 Logical OR:
 
-    n123 or n345
+    1234 == on or 2345 == on
 
-If the `if` expression is true, the `then` branch is executed, otherwise the `else` branch.
-With `then` and `else` you can either enter `true`, `false`, or nothing:
-- `true` will lead to a `on` command
-- `false` will lead to a `off` command
-- if nothing is entered, nothing is sent
+The following operators are allowed:  `and`   `or`   `on`   `off`   `me`   `==`   `~=`   `(`   `)`
 
-The target block or blocks for the output signal must be entered in the target number field.
+If the expression is true, a command is sent to the block with the `<output>` number. 
+Up to four rules can be defined, whereby all rules are always checked when a command is received. 
+The internal processing time for all commands is 100 ms. 
+
+Your own node number can be referenced using the keyword `me`. This makes it possible for the block to send itself a command (flip-flop function). 
+
+The blocking time defines a pause after a command, during which the logic block does not accept any further external commands. Commands received during the blocking period are thus discarded. The blocking time can be defined in seconds. 
 
 [ta3_logic|image]
 
@@ -611,7 +624,15 @@ The door controller is used to control the TA3 door/gate blocks. With the door c
 
 ### TA3 Door Controller II
 
-The Door Controller II can remove and set all types of blocks. To teach in the Door Controller II, the "Record" button must be pressed. Then all blocks that should be part of the door / gate must be clicked. Then the "Done" button must be pressed. Up to 16 blocks can be selected. The removed blocks are saved in the controller's inventory. The function of the controller can be tested manually using the "Remove" or "Set" buttons. If an `on` /` off` command is sent to the Door Controller II, it removes or sets the blocks as well.
+The Door Controller II can remove and set all types of blocks. To teach in the Door Controller II, the "Record" button must be pressed. Then all blocks that should be part of the door / gate must be clicked. Then the "Done" button must be pressed. Up to 16 blocks can be selected. The removed blocks are saved in the controller's inventory. The function of the controller can be tested manually using the "Remove" or "Set" buttons. If an `on` /`off` command is sent to the Door Controller II, it removes or sets the blocks as well.
+
+Individual blocks can be set, removed or replaced by other blocks via an `exchange` command. The slot number of the inventory (1 .. 16) must be transferred as payload, i.e.:
+
+```
+$send_cmnd(node_number, "exchange", 2)
+```
+
+This can also be used to simulate extendable stairs and the like. 
 
 [ta3_doorcontroller|image]
 
@@ -688,7 +709,7 @@ The processing power is 6 items every 2 s.
 
 ### TA3 Distributor
 
-The function of the TA3 distributor corresponds to that of TA2 with another operating mode.
+The function of the TA3 distributor corresponds to that of TA2.
 The processing power is 12 items every 4 s.
 
 [ta3_distributor|image]
@@ -742,13 +763,19 @@ The processing power is 2 items every 4 s. The block requires 6 ku of electricit
 
 [ta3_grinder|image]
 
+### TA3 Injector
 
-### TA3 Liquid Sampler
+The injector is a TA3 pusher with special properties. It has a menu for configuration. Up to 8 items can be configured here. He only takes these items from a chest to pass them on to machines with recipes (autocrafter, industrial furnace and electronic fab).
+
+When passing on, only one position in the inventory is used in the target machine. If, for example, only the first three entries are configured in the injector, only the first three storage locations in the machine's inventory are used. So that an overflow in the machine inventory is prevented.
+
+The injector can also be switched to "pull mode". Then he only pulls items out of the chest from the positions that are defined in the configuration of the injector. In this case, item type and position must match. This allows to empty specific inventory entries of a chest. 
+
+The processing power is up to 8 times one item every 4 seconds.
+
+[ta3_injector|image]
 
-The function corresponds to that of TA2.
-The processing power is 2 items every 8 s. The block requires 5 ku of electricity.
 
-[ta3_liquidsampler|image]
 
 
 ## Tools
diff --git a/techage/manuals/manual_ta4_DE.md b/techage/manuals/manual_ta4_DE.md
index cbb9fb9..5f1ae5f 100644
--- a/techage/manuals/manual_ta4_DE.md
+++ b/techage/manuals/manual_ta4_DE.md
@@ -23,7 +23,9 @@ Die Windkraftanlage liefert eine Leistung von 70 ku, aber dies nur 8 Stunden am
 ### TA4 Windkraftanlage / Wind Turbine
 
 Der Windkraftanlagenblock (Rotor) ist das Herzstück der Windkraftanlage. Dieser Block muss oben auf den Mast gesetzt werden. Idealerweise auf Y = 15, dann bleibst du noch gerade innerhalb eines Map-/Forceload-Blocks.
-Sofern alle Bedingungen erfüllt sind, erscheinen beim Setzen dieses Blocks auch automatisch die Rotorblätter (Flügel). Anderenfalls wird dir eine Fehlermeldung angezeigt.
+Nach dem Setzen des Blocks wird ein Check durchgeführt, ob alle Bedingungen für den Betrieb der Windkraftanlage erfüllt sind. Sofern alle Bedingungen erfüllt sind, erscheinen beim Setzen dieses Blocks auch automatisch die Rotorblätter (Flügel). Anderenfalls wird dir eine Fehlermeldung angezeigt. 
+
+Durch Schlagen auf den Block kann der Check wiederholt werden.
 
 [ta4_windturbine|image]
 
@@ -143,7 +145,7 @@ Sowohl der Generator als auch der Wärmetauscher haben einen Stromanschluss und
 Im Prinzip arbeitet das das Wärmespeichersystem genau gleich wie die Akkus, nur mit viel mehr Speicherkapazität. 
 Der Wärmespeicher kann 60 ku aufnehmen und abgeben.
 
-Damit das Wärmespeichersystem funktioniert, müssen alle Blöcke (außer Betonhülle und Gravel) mit Hilfe eines Forceloadblockes geladen sein.
+Damit das Wärmespeichersystem funktioniert, müssen alle Blöcke (auch Betonhülle und Gravel) mit Hilfe eines Forceloadblockes geladen sein.
 
 [ta4_storagesystem|plan]
 
@@ -151,7 +153,7 @@ Damit das Wärmespeichersystem funktioniert, müssen alle Blöcke (außer Betonh
 ### TA4 Wärmetauscher / Heat Exchanger
 
 Der Wärmetauscher besteht aus 3 Teilen, die aufeinander gesetzt werden müssen, wobei der Pfeil des ersten Blockes Richtung Turbine zeigen muss. Die Rohrleitungen müssen mit den gelben TA4 Röhren aufgebaut werden.
-Der Wärmetauscher muss am Stromnetz angeschlossen werden. Der Wärmetauscher kann 60 ku aufnehmen.
+Der Wärmetauscher muss am Stromnetz angeschlossen werden. Der Wärmetauscher lädt den Energiespeicher wieder auf, wenn ausreichend Strom zur Verfügung steht und der Energiespeicher weniger als 95 % geladen ist. Der Wärmetauscher nimmt dabei 60 ku auf.
 
 [ta4_heatexchanger|image]
 
@@ -194,9 +196,9 @@ Strom kann mittels Elektrolyse in Wasserstoff und Sauerstoff aufgespalten werden
 Damit können Stromspitzen oder ein Überangebot an Strom in Wasserstoff umgewandelt und so gespeichert werden.
 
 Im Spiel kann Strom mit Hilfe des Elektrolyseurs in Wasserstoff und Wasserstoff über die Brennstoffzelle wieder in Strom umgewandelt werden.
-Damit kann Strom (in Form von Wasserstoff) nicht nur in Tanks gelagert, sonder mit Hilfe von Gasflaschen auch mit Wagen (carts) transportiert werden.
+Damit kann Strom (in Form von Wasserstoff) nicht nur in Tanks gelagert, sonder mit dem Tankwagen auch transportiert werden.
 
-Die Umwandlung von Strom in Wasserstoff und zurück ist aber verlustbehaftet. Von 100 Einheiten Strom kommen nach der Umwandlung in Wasserstoff und zurück nur 83 Einheiten Strom wieder raus.
+Die Umwandlung von Strom in Wasserstoff und zurück ist aber verlustbehaftet. Von 100 Einheiten Strom kommen nach der Umwandlung in Wasserstoff und zurück nur 95 Einheiten Strom wieder raus.
 
 [ta4_hydrogen|image]
 
@@ -206,7 +208,7 @@ Die Umwandlung von Strom in Wasserstoff und zurück ist aber verlustbehaftet. Vo
 Der Elektrolyseur wandelt Strom in Wasserstoff um.  
 Es muss von links mit Strom versorgt werden. Rechts kann Wasserstoff über Röhren und Pumpen entnommen werden.
 
-Der Elektrolyseur kann bis zu 30 ku an Strom aufnehmen und generiert dann alle 4 s ein Wasserstoff Item.
+Der Elektrolyseur kann bis zu 35 ku an Strom aufnehmen und generiert dann alle 4 s ein Wasserstoff Item.
 In den Elektrolyseur passen 200 Einheiten Wasserstoff.
 
 [ta4_electrolyzer|image]
@@ -217,7 +219,11 @@ In den Elektrolyseur passen 200 Einheiten Wasserstoff.
 Die Brennstoffzelle wandelt Wasserstoff in Strom um.  
 Sie muss von links per Pumpe mit Wasserstoff versorgt werden. Rechts ist der Stromanschluss.
 
-Die Brennstoffzelle kann bis zu 25 ku an Strom abgeben und benötigt dazu alle 4 s ein Wasserstoff Item.
+Die Brennstoffzelle kann bis zu 34 ku an Strom abgeben und benötigt dazu alle 4 s ein Wasserstoff Item.
+
+Normalerweise arbeitet die Brennstoffzelle als Generator der Kategorie 2 (wie auch anderen Speichersystemen).
+In diesem Fall können keine anderen Blöcke der Kategorie 2 wie der Akku-Block geladen werden.
+Über das Kontrollkästchen kann die Brennstoffzelle jedoch auch als Generator der Kategorie 1 eingesetzt werden.
 
 [ta4_fuelcell|image]
 
@@ -234,7 +240,7 @@ Ein Reaktor besteht aus:
 - dem Einfüllstutzen der auf den Reaktorbehälter gesetzt werden muss
 - dem Dosierer, welcher über Leitungen mit den Tanks oder Silos sowie dem Einfüllstutzen verbunden werden muss
 
-Hinweis 1: Flüssigkeiten werden nur in Tanks gelagert, Stoffe in Pulverform nur in Silos. Dies gilt für Zutaten und Ausgangsstoffe.
+Hinweis 1: Flüssigkeiten werden nur in Tanks gelagert, feste Stoffe und Stoffe in Pulverform nur in Silos. Dies gilt für Zutaten und Ausgangsstoffe.
 
 Hinweis 2: Tanks oder Silos mit verschiedenen Inhalten dürfen nicht zu einem Leitungssystem verbunden werden. Mehrere Tanks oder Silos mit gleichem Inhalt dürfen dagegen parallel an einer Leitung hängen.
 
@@ -537,11 +543,17 @@ Die Ofenheizung benötigt 14 ku Strom.
 
 [ta4_furnaceheater|image]
 
-### TA4 Wasserpumpe / Water Pump
+### TA4 Wasserpumpe / Water Pump (veraltet)
 
-Mit der Wasserpumpe kann Wasser über Flüssigkeitsleitungen in Tanks gepumpt und so für Rezepte genutzt werden. Die Wasserpumpe muss dazu ins Meer gesetzt werden Ein "Pool" aus ein paar Wasserblöcken geht nicht!
+Dieser Block kann nicht mehr gecraftet werden und wird durch den TA4 Wassereinlass Block ersetzt.
 
-[ta4_waterpump|image]
+### TA4 Wassereinlass / TA4 Water Inlet
+
+Für manche Rezepte wird Wasser benötigt. Das Wasser muss mit einer Pumpe aus dem Meer (Wasser auf y = 1) gepumpt werden. Ein "Pool" aus ein paar Wasserblöcken ist dafür nicht ausreichend!
+
+Dazu muss der Wassereinlass-Block ins Wasser gesetzt und über Röhren mit der Pumpe verbunden werden. Wird der Block ins Wasser gesetzt, so muss darauf geachtet werden, dass sich unter dem Block Wasser befindet (Wasser muss mindestens 2 Blöcke tief sein). 
+
+[ta4_waterinlet|image]
 
 ### TA4 Röhren / TA4 Tube
 
@@ -651,18 +663,16 @@ Die Verarbeitungsleistung beträgt ein Chip alle 6 s. Der Block benötigt hierf
 
 ### TA4 Injektor / Injector
 
-Der Injektor ist ein TA4 Schieber mit speziellen Eigenschaften. Er besitzt ein Menü zur Konfiguration. Hier können bis zu 8 Items konfiguriert werden. Er entnimmt nur diese Items einer Kiste (TA4 Kiste oder TA4 8x2000 Kiste) um sie an Maschinen mit Rezepturen weiterzugeben (Autocrafter, Industrieofen und Elektronikfabrik). 
+Die Funktion entspricht der von TA3.  
 
-Beim Weitergeben wird in der Zielmaschine pro Item nur eine Position im Inventar genutzt. Sind bspw. nur die ersten drei Einträge im Injektor konfiguriert, so werden auch nur die ersten drei Speicherplätze im Inventar der Maschine belegt. Damit wir ein Überlauf im Inventar der Maschine verhindert. 
-
-Die Verarbeitungsleistung beträgt bis zu 8 Items alle 3 Sekunden.
+Die Verarbeitungsleistung beträgt bis zu 8 mal vier Items alle 4 Sekunden.
 
 [ta4_injector|image]
 
 ### TA4 Recycler
 
 Der Recycler ist eine Maschine, die alle Techage Rezepte rückwärts abarbeitet, also Maschinen und Blöcke wieder in die Bestandteile zerlegen kann. Die Maschine kann so ziemlich alle Techage und Hyperloop Blöcke zerlegen.
-Aber nicht alle Materialen lassen sich recyclen:
+Aber nicht alle Zutaten/Materialien der Rezepte lassen sich recyclen:
 
 - Holz wird zu Sticks
 - Stein wird zu Sand oder Kies
@@ -671,4 +681,16 @@ Aber nicht alle Materialen lassen sich recyclen:
 
 Die Verarbeitungsleistung beträgt ein Item alle 8 s. Der Block benötigt hierfür 16 ku Strom.
 
-[ta4_recycler|image]
\ No newline at end of file
+[ta4_recycler|image]
+
+### TA4 Laser
+
+Der TA4 Laser dient zur kabellosen Stromübertagung. Dazu sind zwei Blöcke notwendig: TA4 Laserstrahl Sender und TA4 Laserstrahl Empfänger. Zwischen beiden Blöcken muss sich eine Luftstrecke befinden, so dass der Laserstrahl vom Sender bis zum Empfänger aufgebaut werden kann.
+
+Zuerst muss der Sender platziert werden. Dieser schaltet sofort den Laserstahls ein und zeigt damit mögliche Positionen des Empfängers an. Mögliche Positionen für den Empfänger werden auch über eine Chat-Nachricht ausgegeben. Mit dem Laser lassen sich Strecken bis 96 Blöcke überbrücken.
+
+Ist die Verbindung aufgebaut (es muss dazu noch kein Strom fließen), wird dies über den Info-Text des Senders und auch des Empfängers angezeigt.
+
+Die Laserblöcke selbst benötigen keinen Strom.
+
+[ta4_laser|image]t
\ No newline at end of file
diff --git a/techage/manuals/manual_ta4_EN.md b/techage/manuals/manual_ta4_EN.md
index e58e030..eebab93 100644
--- a/techage/manuals/manual_ta4_EN.md
+++ b/techage/manuals/manual_ta4_EN.md
@@ -23,7 +23,9 @@ The wind turbine delivers 70 ku, but only 8 hours a day (see above).
 ### TA4 Wind Turbine
 
 The wind turbine block (rotor) is the heart of the wind turbine. This block must be placed on top of the mast. Ideally at Y = 15, then you just stay within a map / forceload block.
-If all conditions are met, the rotor blades appear automatically when this block is set. Otherwise you will see an error message.
+After the block has been set, a check is carried out to determine whether all conditions for the operation of the wind turbine have been met. If all conditions are met, the rotor blades (wings) appear automatically when this block is set. Otherwise you will get an error message.
+
+The check can be repeated by hitting the block. 
 
 [ta4_windturbine|image]
 
@@ -143,7 +145,7 @@ Both the generator and the heat exchanger have a power connection and must be co
 In principle, the heat storage system works exactly the same as the batteries, only with much more storage capacity.
 The heat accumulator can hold and deliver 60 ku.
 
-In order for the heat storage system to work, all blocks (except the concrete shell and gravel) must be loaded using a forceload block.
+In order for the heat storage system to work, all blocks (also the concrete shell and gravel) must be loaded using a forceload block.
 
 [ta4_storagesystem|plan]
 
@@ -151,7 +153,7 @@ In order for the heat storage system to work, all blocks (except the concrete sh
 ### TA4 Heat Exchanger
 
 The heat exchanger consists of 3 parts that must be placed on top of each other, with the arrow of the first block pointing towards the turbine. The pipes must be built with the yellow TA4 pipes.
-The heat exchanger must be connected to the power grid. The heat exchanger can consume 60 ku.
+The heat exchanger must be connected to the power grid. The heat exchanger charges the energy store again when sufficient electricity is available and the energy storage is less than 95% charged. The heat exchanger takes up 60 ku. 
 
 [ta4_heatexchanger|image]
 
@@ -194,9 +196,9 @@ Electrolysis can be used to split electricity into hydrogen and oxygen. On the o
 This enables current peaks or an excess supply of electricity to be converted into hydrogen and thus stored.
 
 In the game, electricity can be converted back into electricity via the fuel cell using the electrolyzer in hydrogen and hydrogen.
-This means that electricity (in the form of hydrogen) can not only be stored in tanks, but can also be transported with carts using gas cylinders.
+This means that electricity (in the form of hydrogen) can not only be stored in tanks, but also transported by means of the tank cart.
 
-However, the conversion of electricity into hydrogen and back is lossy. Out of 100 units of electricity, only 83 units of electricity come out after the conversion to hydrogen and back.
+However, the conversion of electricity into hydrogen and back is lossy. Out of 100 units of electricity, only 95 units of electricity come out after the conversion to hydrogen and back.
 
 [ta4_hydrogen|image]
 
@@ -206,7 +208,7 @@ However, the conversion of electricity into hydrogen and back is lossy. Out of 1
 The electrolyzer converts electricity into hydrogen.
 It must be powered from the left. On the right, hydrogen can be extracted via pipes and pumps.
 
-The electrolyzer can draw up to 30 ku of electricity and then generates a hydrogen item every 4 s.
+The electrolyzer can draw up to 35 ku of electricity and then generates a hydrogen item every 4 s.
 200 units of hydrogen fit into the electrolyzer.
 
 [ta4_electrolyzer|image]
@@ -217,7 +219,10 @@ The electrolyzer can draw up to 30 ku of electricity and then generates a hydrog
 The fuel cell converts hydrogen into electricity.
 It must be supplied with hydrogen from the left by a pump. The power connection is on the right.
 
-The fuel cell can deliver up to 25 ku of electricity and needs a hydrogen item every 4 s.
+The fuel cell can deliver up to 34 ku of electricity and needs a hydrogen item every 4 s.
+
+Usually the fuel cell works as a category 2 generator (like other storage systems). 
+In this case, no other category 2 blocks such as the battery block can be charged. However, the fuel cell can also be used as a category 1 generator via the check box.
 
 [ta4_fuelcell|image]
 
@@ -235,7 +240,7 @@ A reactor consists of:
 - The filler pipe that must be placed on the reactor vessel
 - The dosing device, which has to be connected to the tanks or silos and the filler pipe via pipes
 
-Note 1: Liquids are only stored in tanks, substances in powder form only in silos. This applies to ingredients and raw materials.
+Note 1: Liquids are only stored in tanks, solids and substances in powder form only in silos. This applies to ingredients and raw materials.
 
 Note 2: Tanks or silos with different contents must not be connected to a pipe system. In contrast, several tanks or silos with the same content may hang in parallel on one line.
 
@@ -538,11 +543,17 @@ The heater requires 14 ku of electricity.
 
 [ta4_furnaceheater|image]
 
-### TA4 water Pump
+### TA4 Water Pump (deprecated)
 
-With the water pump, water can be pumped through liquid lines in tanks and thus used for recipes. The water pump has to be placed in the sea. A "pool" consisting of a few blocks of water is not possible!
+This block can no longer be crafted and will be replaced by the TA4 water inlet block. 
 
-[ta4_waterpump|image]
+### TA4 Water Inlet
+
+Some recipes require water. The water must be pumped from the sea with a pump (water at y = 1). A "pool" made up of a few water blocks is not sufficient for this! 
+
+To do this, the water inlet block must be placed in the water and connected to the pump via pipes. If the block is placed in the water, it must be ensured that there is water under the block (water must be at least 2 blocks deep). 
+
+[ta4_waterinlet|image]
 
 ### TA4 Tube
 
@@ -652,19 +663,17 @@ The processing power is one chip every 6 s. The block requires 12 ku of electric
 
 ### TA4 Injector
 
-The injector is a TA4 pusher with special properties. It has a menu for configuration. Up to 8 items can be configured here. He only takes these items from a chest (TA4 chest or TA4 8x2000 chest) to pass them on to machines with recipes (autocrafter, industrial furnace and electronic fab).
+The function corresponds to that of TA3.
 
-When passing on, only one position in the inventory is used in the target machine. If, for example, only the first three entries are configured in the injector, only the first three storage locations in the machine's inventory are used. So that an overflow in the machine inventory is prevented.
-
-The processing power is up to 8 items every 3 seconds.
+The processing power is up to 8 times four items every 4 seconds.
 
 [ta4_injector|image]
 
-### TA4 recycler
+### TA4 Recycler
 
 The recycler is a machine that processes all Techage recipes backwards, i.e. it can dismantle machines and blocks back into their components. 
 
-The machine can disassemble pretty much any Techage and Hyperloop blocks. But not all materials can be recycled:
+The machine can disassemble pretty much any Techage and Hyperloop blocks. But not all recipe items/materials can be recycled:
 
 - Wood turns into sticks
 - Stone turns into sand or gravel
@@ -675,3 +684,12 @@ The processing power is one item every 8 s.  The block requires 16 ku of electri
 
 [ta4_recycler|image] 
 
+### TA4 Laser
+
+The TA4 laser is used for wireless power transmission. Two blocks are required for this: TA4 Laser Beam Emitter and TA4 Laser Beam Receiver. There must be an air gap between the two blocks so that the laser beam can be built up from the emitter to the receiver. First the emitter must be placed. This immediately switches on the laser beam and shows possible positions of the receiver. Possible positions for the receiver are also output via a chat message. 
+
+With the laser, distances of up to 96 blocks can be bridged. Once the connection has been established (no current has to flow), this is indicated via the info text of the emitter and also of the receiver. 
+
+The laser blocks themselves do not require any electricity.
+
+[ta4_laser|image]
\ No newline at end of file
diff --git a/techage/manuals/ta4_lua_controller_EN.md b/techage/manuals/ta4_lua_controller_EN.md
index 52a247b..b50b953 100644
--- a/techage/manuals/ta4_lua_controller_EN.md
+++ b/techage/manuals/ta4_lua_controller_EN.md
@@ -390,6 +390,7 @@ Please note, that this is not a technical distinction, only a logical.
 | "reset"                          | nil          | Reset the item counter of the TA4 Item Detector block        |
 | "pull"                           | item  string | Start the TA4 pusher to pull/push items.<br /> Example: `default:dirt 8` |
 | "config"                         | item  string | Configure the TA4 pusher.<br />Example: `wool:blue`          |
+| "exchange" | inventory slot number | place/remove/exchange an block by means of the TA3 Door Controller II (techage:ta3_doorcontroller2) |
 
 
 
diff --git a/techage/manuals/ta4_lua_controller_EN.pdf b/techage/manuals/ta4_lua_controller_EN.pdf
index 0f9e6fd..73fca67 100644
Binary files a/techage/manuals/ta4_lua_controller_EN.pdf and b/techage/manuals/ta4_lua_controller_EN.pdf differ
diff --git a/techage/manuals/toc_DE.md b/techage/manuals/toc_DE.md
index 55e2323..cbc8c7a 100644
--- a/techage/manuals/toc_DE.md
+++ b/techage/manuals/toc_DE.md
@@ -30,6 +30,7 @@
         - [TA2 Stromgenerator / TA2 Power Generator](./manual_ta2_DE.md#ta2-stromgenerator--ta2-power-generator)
     - [Items schieben und sortieren](./manual_ta2_DE.md#items-schieben-und-sortieren)
         - [Röhren / TechAge Tube](./manual_ta2_DE.md#röhren--techage-tube)
+        - [Röhren Konzentrator / Tube Concentrator](./manual_ta2_DE.md#röhren-konzentrator--tube-concentrator)
         - [TA2 Schieber / Pusher](./manual_ta2_DE.md#ta2-schieber--pusher)
         - [TA2 Verteiler / Distributor](./manual_ta2_DE.md#ta2-verteiler--distributor)
     - [Kieswaschanlage](./manual_ta2_DE.md#kieswaschanlage)
@@ -119,7 +120,7 @@
         - [TA3 Kiessieb / Gravel Sieve](./manual_ta3_DE.md#ta3-kiessieb--gravel-sieve)
         - [TA3 Kieswaschanlage / Gravel Rinser](./manual_ta3_DE.md#ta3-kieswaschanlage--gravel-rinser)
         - [TA3 Mühle / Grinder](./manual_ta3_DE.md#ta3-mühle--grinder)
-        - [TA3 Flüssigkeitensammler / Liquid Sampler](./manual_ta3_DE.md#ta3-flüssigkeitensammler--liquid-sampler)
+        - [TA3 Injektor / Injector](./manual_ta3_DE.md#ta3-injektor--injector)
     - [Werkzeuge](./manual_ta3_DE.md#werkzeuge)
         - [Techage Info Tool](./manual_ta3_DE.md#techage-info-tool)
         - [TechAge Programmer](./manual_ta3_DE.md#techage-programmer)
@@ -181,7 +182,8 @@
         - [TA4 Tank / TA4 Tank](./manual_ta4_DE.md#ta4-tank--ta4-tank)
         - [TA4 Pumpe / TA4 Pump](./manual_ta4_DE.md#ta4-pumpe--ta4-pump)
         - [TA4 Ofenheizung / furnace heater](./manual_ta4_DE.md#ta4-ofenheizung--furnace-heater)
-        - [TA4 Wasserpumpe / Water Pump](./manual_ta4_DE.md#ta4-wasserpumpe--water-pump)
+        - [TA4 Wasserpumpe / Water Pump (veraltet)](./manual_ta4_DE.md#ta4-wasserpumpe--water-pump-(veraltet))
+        - [TA4 Wassereinlass / TA4 Water Inlet](./manual_ta4_DE.md#ta4-wassereinlass--ta4-water-inlet)
         - [TA4 Röhren / TA4 Tube](./manual_ta4_DE.md#ta4-röhren--ta4-tube)
         - [TA4 Schieber / Pusher](./manual_ta4_DE.md#ta4-schieber--pusher)
         - [TA4 Kiste / TA4 Chest](./manual_ta4_DE.md#ta4-kiste--ta4-chest)
@@ -193,4 +195,5 @@
         - [TA4 Steinbrecher / Quarry](./manual_ta4_DE.md#ta4-steinbrecher--quarry)
         - [TA4 Elektronikfabrik / Electronic Fab](./manual_ta4_DE.md#ta4-elektronikfabrik--electronic-fab)
         - [TA4 Injektor / Injector](./manual_ta4_DE.md#ta4-injektor--injector)
-        - [TA4 Recycler](./manual_ta4_DE.md#ta4-recycler)
\ No newline at end of file
+        - [TA4 Recycler](./manual_ta4_DE.md#ta4-recycler)
+        - [TA4 Laser](./manual_ta4_DE.md#ta4-laser)
\ No newline at end of file
diff --git a/techage/manuals/toc_EN.md b/techage/manuals/toc_EN.md
index 655e62d..d3f880f 100644
--- a/techage/manuals/toc_EN.md
+++ b/techage/manuals/toc_EN.md
@@ -30,6 +30,7 @@
         - [TA2 Power Generator](./manual_ta2_EN.md#ta2-power-generator)
     - [Push and sort items](./manual_ta2_EN.md#push-and-sort-items)
         - [TechAge Tube](./manual_ta2_EN.md#techage-tube)
+        - [Tube Concentrator](./manual_ta2_EN.md#tube-concentrator)
         - [TA2 Pusher](./manual_ta2_EN.md#ta2-pusher)
         - [TA2 Distributor](./manual_ta2_EN.md#ta2-distributor)
     - [Gravel washer](./manual_ta2_EN.md#gravel-washer)
@@ -118,7 +119,7 @@
         - [TA3 Gravel Sieve](./manual_ta3_EN.md#ta3-gravel-sieve)
         - [TA3 Gravel Rinser](./manual_ta3_EN.md#ta3-gravel-rinser)
         - [TA3 Grinder](./manual_ta3_EN.md#ta3-grinder)
-        - [TA3 Liquid Sampler](./manual_ta3_EN.md#ta3-liquid-sampler)
+        - [TA3 Injector](./manual_ta3_EN.md#ta3-injector)
     - [Tools](./manual_ta3_EN.md#tools)
         - [Techage Info Tool](./manual_ta3_EN.md#techage-info-tool)
         - [TechAge Programmer](./manual_ta3_EN.md#techage-programmer)
@@ -180,7 +181,8 @@
         - [TA4 Tank](./manual_ta4_EN.md#ta4-tank)
         - [TA4 Pump](./manual_ta4_EN.md#ta4-pump)
         - [TA4 Furnace Heater](./manual_ta4_EN.md#ta4-furnace-heater)
-        - [TA4 water Pump](./manual_ta4_EN.md#ta4-water-pump)
+        - [TA4 Water Pump (deprecated)](./manual_ta4_EN.md#ta4-water-pump-(deprecated))
+        - [TA4 Water Inlet](./manual_ta4_EN.md#ta4-water-inlet)
         - [TA4 Tube](./manual_ta4_EN.md#ta4-tube)
         - [TA4 Pusher](./manual_ta4_EN.md#ta4-pusher)
         - [TA4 Chest](./manual_ta4_EN.md#ta4-chest)
@@ -192,4 +194,5 @@
         - [TA4 Quarry](./manual_ta4_EN.md#ta4-quarry)
         - [TA4 Electronic Fab](./manual_ta4_EN.md#ta4-electronic-fab)
         - [TA4 Injector](./manual_ta4_EN.md#ta4-injector)
-        - [TA4 recycler](./manual_ta4_EN.md#ta4-recycler)
\ No newline at end of file
+        - [TA4 Recycler](./manual_ta4_EN.md#ta4-recycler)
+        - [TA4 Laser](./manual_ta4_EN.md#ta4-laser)
\ No newline at end of file
diff --git a/techage/mod.conf b/techage/mod.conf
index 517295f..ea1e24d 100644
--- a/techage/mod.conf
+++ b/techage/mod.conf
@@ -1,4 +1,4 @@
 name = techage
 depends = default,doors,flowers,tubelib2,basic_materials,bucket,stairs,screwdriver,minecart,lcdlib,safer_lua
-optional_depends = unified_inventory,wielded_light,unifieddyes,moreores,ethereal,mesecon,digtron
+optional_depends = unified_inventory,wielded_light,unifieddyes,moreores,ethereal,mesecon,digtron,bakedclay
 description = Techage, go through 4 tech ages in search of wealth and power!
diff --git a/techage/oil/explore.lua b/techage/oil/explore.lua
index b854257..c4d4180 100644
--- a/techage/oil/explore.lua
+++ b/techage/oil/explore.lua
@@ -171,7 +171,7 @@ end
 local function marker(player_name, pos)
 	local posC = {x = center(pos.x), y = pos.y, z = center(pos.z)}
 	local pos1 = {x = posC.x - 2, y = posC.y - 2, z = posC.z - 2}
-	local pos2 = {x = posC.x + 2, y = posC.y + 5, z = posC.z + 2}
+	local pos2 = {x = posC.x + 2, y = posC.y + 7, z = posC.z + 2}
 	techage.switch_region(player_name, pos1, pos2)
 end
 
diff --git a/techage/oil/gasflare.lua b/techage/oil/gasflare.lua
index 7df4fad..b8e0b0b 100644
--- a/techage/oil/gasflare.lua
+++ b/techage/oil/gasflare.lua
@@ -74,7 +74,7 @@ for idx,ratio in ipairs(lRatio) do
 			end
 		end,
 		
-		use_texture_alpha = true,
+		use_texture_alpha = techage.BLEND,
 		inventory_image = "techage_flame.png",
 		paramtype = "light",
 		light_source = 13,
diff --git a/techage/oil/pumpjack.lua b/techage/oil/pumpjack.lua
index 81200ab..eb70012 100644
--- a/techage/oil/pumpjack.lua
+++ b/techage/oil/pumpjack.lua
@@ -174,7 +174,17 @@ tiles.act = {
 	
 local tubing = {
 	on_recv_message = function(pos, src, topic, payload)
-		return CRD(pos).State:on_receive_message(pos, topic, payload)
+		if topic == "load" then
+			local storage_pos = M(pos):get_string("storage_pos")
+			if storage_pos ~= "" then
+				local amount, capa = techage.explore.get_oil_amount(P(storage_pos))
+				if amount and capa and capa > 0 then
+					return techage.power.percent(capa or 0, amount or 0), amount or 0
+				end
+			end
+		else		
+			return CRD(pos).State:on_receive_message(pos, topic, payload)
+		end
 	end,
 	on_node_load = function(pos, node)
 		CRD(pos).State:on_node_load(pos)
diff --git a/techage/oil/tower.lua b/techage/oil/tower.lua
index 9a0991e..cfade41 100644
--- a/techage/oil/tower.lua
+++ b/techage/oil/tower.lua
@@ -38,6 +38,7 @@ minetest.register_node("techage:oiltower1", {
 	diggable = false,
 	paramtype2 = "facedir",
 	paramtype = "light",
+	use_texture_alpha = techage.CLIP,
 	sunlight_propagates = true,
 	groups = {not_in_creative_inventory = 1},
 	is_ground_content = false,
@@ -70,6 +71,7 @@ minetest.register_node("techage:oiltower2", {
 	diggable = false,
 	paramtype2 = "facedir",
 	paramtype = "light",
+	use_texture_alpha = techage.CLIP,
 	sunlight_propagates = true,
 	groups = {not_in_creative_inventory = 1},
 	is_ground_content = false,
@@ -102,6 +104,7 @@ minetest.register_node("techage:oiltower3", {
 	diggable = false,
 	paramtype2 = "facedir",
 	paramtype = "light",
+	use_texture_alpha = techage.CLIP,
 	sunlight_propagates = true,
 	groups = {not_in_creative_inventory = 1},
 	is_ground_content = false,
@@ -134,6 +137,7 @@ minetest.register_node("techage:oiltower4", {
 	diggable = false,
 	paramtype2 = "facedir",
 	paramtype = "light",
+	use_texture_alpha = techage.CLIP,
 	sunlight_propagates = true,
 	groups = {not_in_creative_inventory = 1},
 	is_ground_content = false,
@@ -156,6 +160,7 @@ minetest.register_node("techage:oiltower5", {
 	diggable = false,
 	paramtype2 = "facedir",
 	paramtype = "light",
+	use_texture_alpha = techage.CLIP,
 	sunlight_propagates = true,
 	groups = {not_in_creative_inventory = 1},
 	is_ground_content = false,
@@ -169,6 +174,7 @@ minetest.register_node("techage:oil_drillbit", {
 	wield_image = "techage_oil_drillbit_inv.png",
 	visual_scale = 1,
 	paramtype = "light",
+	use_texture_alpha = techage.CLIP,
 	sunlight_propagates = true,
 	groups = {cracky = 1},
 	is_ground_content = false,
@@ -182,6 +188,7 @@ minetest.register_node("techage:oil_drillbit2", {
 	wield_image = "techage_oil_drillbit_inv.png",
 	visual_scale = 1,
 	paramtype = "light",
+	use_texture_alpha = techage.CLIP,
 	drop = "",
 	diggable = false,
 	sunlight_propagates = true,
diff --git a/techage/power/drive_axle.lua b/techage/power/drive_axle.lua
index ba41084..a1a0105 100644
--- a/techage/power/drive_axle.lua
+++ b/techage/power/drive_axle.lua
@@ -67,6 +67,7 @@ minetest.register_node("techage:axle", {
 	},
 	on_rotate = screwdriver.disallow, -- important!
 	paramtype = "light",
+	use_texture_alpha = techage.CLIP,
 	sunlight_propagates = true,
 	is_ground_content = false,
 	groups = {crumbly = 3, cracky = 3, snappy = 3},
@@ -160,6 +161,7 @@ minetest.register_node("techage:axle_on", {
 	},
 	on_rotate = screwdriver.disallow, -- important!
 	paramtype = "light",
+	use_texture_alpha = techage.CLIP,
 	sunlight_propagates = true,
 	is_ground_content = false,
 	diggable = false,
diff --git a/techage/power/electric_cable.lua b/techage/power/electric_cable.lua
index 472f3b2..3799a62 100644
--- a/techage/power/electric_cable.lua
+++ b/techage/power/electric_cable.lua
@@ -117,6 +117,7 @@ minetest.register_node("techage:electric_cableS", {
 	},
 	on_rotate = screwdriver.disallow, -- important!
 	paramtype = "light",
+	use_texture_alpha = techage.CLIP,
 	sunlight_propagates = true,
 	is_ground_content = false,
 	groups = {snappy = 2, choppy = 2, oddly_breakable_by_hand = 3, techage_trowel = 1},
@@ -153,6 +154,7 @@ minetest.register_node("techage:electric_cableA", {
 	},
 	on_rotate = screwdriver.disallow, -- important!
 	paramtype = "light",
+	use_texture_alpha = techage.CLIP,
 	sunlight_propagates = true,
 	is_ground_content = false,
 	groups = {snappy = 2, choppy = 2, oddly_breakable_by_hand = 3, 
diff --git a/techage/power/junction.lua b/techage/power/junction.lua
index 9da7fdb..e14c3ef 100644
--- a/techage/power/junction.lua
+++ b/techage/power/junction.lua
@@ -52,6 +52,7 @@ end
 -- 'node' is the node definition with tiles, callback functions, and so on
 -- 'index' number for the inventory node (default 0)
 function techage.register_junction(name, size, boxes, tlib2, node, index)
+	local names = {}
 	for idx = 0,63 do
 		local ndef = table.copy(node)
 		if idx == (index or 0) then
@@ -65,6 +66,7 @@ function techage.register_junction(name, size, boxes, tlib2, node, index)
 		ndef.paramtype2 = "facedir"
 		ndef.on_rotate = screwdriver.disallow
 		ndef.paramtype = "light" 
+		ndef.use_texture_alpha = techage.CLIP
 		ndef.sunlight_propagates = true 
 		ndef.is_ground_content = false 
 		ndef.drop = name..(index or "0")
@@ -72,21 +74,41 @@ function techage.register_junction(name, size, boxes, tlib2, node, index)
 		tlib2:add_secondary_node_names({name..idx})
 		-- for the case that 'tlib2.force_to_use_tubes' is set
 		tlib2:add_special_node_names({name..idx}) 
+		names[#names + 1] = name..idx
 	end
+	return names
 end
 
-function techage.junction_type(pos, network)
+local SideToDir = {B=1, R=2, F=3, L=4}
+local function dir_to_dir2(dir, param2)
+	if param2 == 0 then
+		return dir
+	elseif param2 == 1 then
+		return ({4,1,2,3,5,6})[dir]
+	elseif param2 == 2 then
+		return ({3,4,1,2,5,6})[dir]
+	elseif param2 == 3 then
+		return ({2,3,4,1,5,6})[dir]
+	end
+	return dir
+end
+
+function techage.junction_type(pos, network, default_side, param2)
 	local val = 0
+	if default_side then
+		val = setbit(val, bit(SideToDir[default_side]))
+	end
 	for dir = 1,6 do
+		local dir2 = dir_to_dir2(dir, param2)
 		if network.force_to_use_tubes then
 			if network:friendly_primary_node(pos, dir) then
-				val = setbit(val, bit(dir))
+				val = setbit(val, bit(dir2))
 			elseif network:is_special_node(pos, dir) then
-				val = setbit(val, bit(dir))
+				val = setbit(val, bit(dir2))
 			end
 		else
 			if network:connected(pos, dir) then
-				val = setbit(val, bit(dir))
+				val = setbit(val, bit(dir2))
 			end
 		end
 	end
diff --git a/techage/power/laser.lua b/techage/power/laser.lua
new file mode 100644
index 0000000..7a0b359
--- /dev/null
+++ b/techage/power/laser.lua
@@ -0,0 +1,146 @@
+--[[
+
+	TechAge
+	=======
+
+	Copyright (C) 2019-2021 Joachim Stolberg
+
+	GPL v3
+	See LICENSE.txt for more information
+	
+	TA4 Laser beam emitter and receiver 
+	
+]]--
+
+-- for lazy programmers
+local P2S = function(pos) if pos then return minetest.pos_to_string(pos) end end
+local S2P = minetest.string_to_pos
+local M = minetest.get_meta
+local S = techage.S
+
+local Cable = techage.ElectricCable
+local power = techage.power
+local networks = techage.networks
+
+minetest.register_node("techage:ta4_laser_emitter", {
+	description = S("TA4 Laser Beam Emitter"),
+	tiles = {
+		-- up, down, right, left, back, front
+		"techage_filling_ta4.png^techage_frame_ta4_top.png",
+		"techage_filling_ta4.png^techage_frame_ta4.png",
+		"techage_filling_ta4.png^techage_frame_ta4.png^techage_appl_laser.png",
+		"techage_filling_ta4.png^techage_frame_ta4.png^techage_appl_laser.png",
+		"techage_filling_ta4.png^techage_frame_ta4.png^techage_appl_laser_hole.png",
+		"techage_filling_ta4.png^techage_frame_ta4.png^techage_appl_hole_electric.png",
+	},
+
+	after_place_node = function(pos, placer)
+		local tube_dir = networks.side_to_outdir(pos, "F")
+		Cable:prepare_pairing(pos, tube_dir, "")
+		Cable:after_place_node(pos, {tube_dir})
+		
+		local res, pos1, pos2 = techage.renew_laser(pos, true)
+		if pos1 then
+			local node = techage.get_node_lvm(pos2)
+			if node.name == "techage:ta4_laser_receiver" then
+				Cable:pairing(pos2, "laser")
+				Cable:pairing(pos, "laser")
+			else
+				minetest.chat_send_player(placer:get_player_name(), 
+					S("Valid destination positions:") .. " " .. 
+					P2S(pos1) .. " " .. S("to") .. " " .. P2S(pos2))
+			end
+		else
+			minetest.chat_send_player(placer:get_player_name(), S("Laser beam error!"))
+		end
+		minetest.get_node_timer(pos):start(2)
+	end,
+
+	on_timer = function(pos, elapsed)
+		local res, pos1, pos2 = techage.renew_laser(pos)
+		if pos1 then
+			local node = techage.get_node_lvm(pos2)
+			if node.name == "techage:ta4_laser_receiver" then
+				Cable:pairing(pos2, "laser")
+				Cable:pairing(pos, "laser")
+			else
+				local metadata = M(pos):to_table()
+				Cable:stop_pairing(pos, metadata, "")
+				local tube_dir = tonumber(metadata.fields.tube_dir or 0)
+				Cable:after_dig_node(pos, {tube_dir})
+			end
+		elseif not res then
+			techage.del_laser(pos)
+			local metadata = M(pos):to_table()
+			Cable:stop_pairing(pos, metadata, "")
+			local tube_dir = tonumber(metadata.fields.tube_dir or 0)
+			Cable:after_dig_node(pos, {tube_dir})
+		end
+		return true
+	end,
+	
+	after_dig_node = function(pos, oldnode, oldmetadata, digger)
+		techage.del_laser(pos)
+		Cable:stop_pairing(pos, oldmetadata, "")
+		local tube_dir = tonumber(oldmetadata.fields.tube_dir or 0)
+		Cable:after_dig_node(pos, {tube_dir})
+	end,
+	
+	paramtype2 = "facedir",
+	groups = {choppy=2, cracky=2, crumbly=2},
+	is_ground_content = false,
+	sounds = default.node_sound_wood_defaults(),
+})
+
+minetest.register_node("techage:ta4_laser_receiver", {
+	description = S("TA4 Laser Beam Receiver"),
+	tiles = {
+		-- up, down, right, left, back, front
+		"techage_filling_ta4.png^techage_frame_ta4_top.png",
+		"techage_filling_ta4.png^techage_frame_ta4.png",
+		"techage_filling_ta4.png^techage_frame_ta4.png^techage_appl_laser.png",
+		"techage_filling_ta4.png^techage_frame_ta4.png^techage_appl_laser.png",
+		"techage_filling_ta4.png^techage_frame_ta4.png^techage_appl_laser_hole.png",
+		"techage_filling_ta4.png^techage_frame_ta4.png^techage_appl_hole_electric.png",
+	},
+
+	after_place_node = function(pos, placer)
+		local tube_dir = networks.side_to_outdir(pos, "F")
+		Cable:prepare_pairing(pos, tube_dir, "")
+		Cable:after_place_node(pos, {tube_dir})
+	end,
+
+	after_dig_node = function(pos, oldnode, oldmetadata, digger)
+		Cable:stop_pairing(pos, oldmetadata, "")
+		local tube_dir = tonumber(oldmetadata.fields.tube_dir or 0)
+		Cable:after_dig_node(pos, {tube_dir})
+	end,
+	
+	paramtype2 = "facedir",
+	groups = {choppy=2, cracky=2, crumbly=2},
+	is_ground_content = false,
+	sounds = default.node_sound_wood_defaults(),
+})
+
+Cable:add_secondary_node_names({"techage:ta4_laser_emitter", "techage:ta4_laser_receiver"})
+Cable:set_valid_sides("techage:ta4_laser_emitter", {"F"})
+Cable:set_valid_sides("techage:ta4_laser_receiver", {"F"})
+
+minetest.register_craft({
+	output = "techage:ta4_laser_emitter",
+	recipe = {
+		{"techage:ta4_carbon_fiber", "dye:blue", "techage:ta4_carbon_fiber"},
+		{"techage:electric_cableS", "basic_materials:energy_crystal_simple", "techage:ta4_leds"},
+		{"default:steel_ingot", "techage:ta4_wlanchip", "default:steel_ingot"},
+	},
+})
+
+minetest.register_craft({
+	output = "techage:ta4_laser_receiver",
+	recipe = {
+		{"techage:ta4_carbon_fiber", "dye:blue", "techage:ta4_carbon_fiber"},
+		{"techage:electric_cableS", "basic_materials:gold_wire", "default:obsidian_glass"},
+		{"default:steel_ingot", "techage:ta4_wlanchip", "default:steel_ingot"},
+	},
+})
+
diff --git a/techage/power/power_line.lua b/techage/power/power_line.lua
index 02c6d32..1b63162 100644
--- a/techage/power/power_line.lua
+++ b/techage/power/power_line.lua
@@ -64,6 +64,7 @@ minetest.register_node("techage:power_line", {
 	},
 	on_rotate = screwdriver.disallow, -- important!
 	paramtype = "light",
+	use_texture_alpha = techage.CLIP,
 	sunlight_propagates = true,
 	is_ground_content = false,
 	drop = "techage:power_lineS",
@@ -105,6 +106,7 @@ minetest.register_node("techage:power_lineS", {
 	},
 	on_rotate = screwdriver.disallow, -- important!
 	paramtype = "light",
+	use_texture_alpha = techage.CLIP,
 	sunlight_propagates = true,
 	is_ground_content = false,
 	drop = "techage:power_lineS",
@@ -168,6 +170,7 @@ minetest.register_node("techage:power_lineA", {
 	},
 	on_rotate = screwdriver.disallow, -- important!
 	paramtype = "light",
+	use_texture_alpha = techage.CLIP,
 	sunlight_propagates = true,
 	is_ground_content = false,
 	drop = "techage:power_lineS",
@@ -222,6 +225,7 @@ minetest.register_node("techage:power_pole2", {
 	
 	on_rotate = screwdriver.disallow, -- important!
 	paramtype = "light",
+	use_texture_alpha = techage.CLIP,
 	sunlight_propagates = true,
 	is_ground_content = false,
 	groups = {cracky=2, crumbly=2, choppy=2},
@@ -267,6 +271,7 @@ minetest.register_node("techage:power_pole", {
 	
 	on_rotate = screwdriver.disallow, -- important!
 	paramtype = "light",
+	use_texture_alpha = techage.CLIP,
 	sunlight_propagates = true,
 	is_ground_content = false,
 	groups = {cracky=2, crumbly=2, choppy=2},
@@ -317,6 +322,7 @@ minetest.register_node("techage:power_pole_conn", {
 	drop = "techage:power_pole",
 	on_rotate = screwdriver.disallow, -- important!
 	paramtype = "light",
+	use_texture_alpha = techage.CLIP,
 	sunlight_propagates = true,
 	is_ground_content = false,
 	groups = {cracky=2, crumbly=2, choppy=2, not_in_creative_inventory = 1},
@@ -344,6 +350,7 @@ minetest.register_node("techage:power_pole3", {
 	},
 	on_rotate = screwdriver.disallow, -- important!
 	paramtype = "light",
+	use_texture_alpha = techage.CLIP,
 	sunlight_propagates = true,
 	is_ground_content = false,
 	groups = {cracky=2, crumbly=2, choppy=2},
diff --git a/techage/power/power_terminal.lua b/techage/power/power_terminal.lua
index a20852c..50b24b6 100644
--- a/techage/power/power_terminal.lua
+++ b/techage/power/power_terminal.lua
@@ -209,6 +209,7 @@ minetest.register_node("techage:power_terminal", {
 	
 	paramtype2 = "facedir",
 	paramtype = "light",
+	use_texture_alpha = techage.CLIP,
 	on_rotate = screwdriver.disallow,
 	sunlight_propagates = true,
 	is_ground_content = false,
diff --git a/techage/power/power_terminal2.lua b/techage/power/power_terminal2.lua
index 2c5d691..cbd142d 100644
--- a/techage/power/power_terminal2.lua
+++ b/techage/power/power_terminal2.lua
@@ -28,6 +28,16 @@ local STOPPED = techage.power.STOPPED
 local NOPOWER = techage.power.NOPOWER
 local RUNNING = techage.power.RUNNING
 
+local HELP = [[Commands
+help   print this text
+cls    clear screen
+gen1   print all cat. 1 generators
+gen2   print all cat. 2 generators
+con2   print all cat. 2 consumers
+num    print number of network blocks
+pow    print provided and needed power]]
+
+
 local Generators = {
 	S("Power station"),
 	S("Tiny generator"),
@@ -35,7 +45,8 @@ local Generators = {
 	S("Wind turbine"),
 	S("Accu Box"),
 	S("Energy storage"),
-	S("Fuel cell"),
+	S("Fuel cell cat. 1"),
+	S("Fuel cell cat. 2"),
 	S("Electrolyzer"),
 	S("TA2 Generator"),
 }
@@ -43,7 +54,8 @@ local Generators = {
 local Storage = {
 	[S("Accu Box")] = true,
 	[S("Energy storage")] = true,
-	[S("Fuel cell")] = true,
+	[S("Fuel cell cat. 1")] = true,
+	[S("Fuel cell cat. 2")] = true,
 	[S("Electrolyzer")] = true,
 }
 
@@ -54,8 +66,9 @@ local GeneratorPerformances = {
 	70,   -- S("Wind turbine")
 	10,   -- S("Accu Box")
 	60,   -- S("Energy storage")
-	25,   -- S("Fuel cell")
-	30,   -- S("Electrolyzer")
+	33,   -- S("Fuel cell cat. 1")
+	34,   -- S("Fuel cell cat. 2")
+	35,   -- S("Electrolyzer")
 	24,   -- S("TA2 Generator")
 }
 
@@ -65,10 +78,16 @@ local GeneratorPerformances = {
 local Gentypes = table.concat(Generators, ",")
 local Gentype2Idx = {}
 local Gentype2Maxvalue = {}
+local Gentype = {}
 
 for idx,name in ipairs(Generators) do
 	Gentype2Idx[name] = idx
 	Gentype2Maxvalue[name] = GeneratorPerformances[idx]
+	Gentype[GeneratorPerformances[idx]] = name
+end
+
+local function short_node_name(nominal)
+	return Gentype[nominal or 1] or "unknown"
 end
 
 local function generator_data(gen_tbl, nominal)
@@ -94,6 +113,40 @@ local function generator_data(gen_tbl, nominal)
 	return pow_max, pow_curr, num_nodes
 end
 
+local function get_generator_data(gen)
+	local nvm = techage.get_nvm(gen.pos)
+	local pow_max = 0
+	local pow_curr = 0
+	if nvm.ele1 and nvm.ele1.gstate and nvm.ele1.galive and nvm.ele1.given then
+		if nvm.ele1.gstate == RUNNING then
+			if nvm.ele1.curr_power and nvm.ele1.curr_power > 0 then
+				pow_max = nvm.ele1.curr_power
+			else
+				pow_max = gen.nominal
+			end
+			if nvm.ele1.galive > 0 and nvm.ele1.given > 0 then
+				pow_curr = nvm.ele1.given
+			end
+		end
+	end
+	return pow_curr, pow_max
+end
+
+local function get_consumer_data(gen)
+	local nvm = techage.get_nvm(gen.pos)
+	local pow_max = 0
+	local pow_curr = 0
+	if nvm.ele1 and nvm.ele1.cstate and nvm.ele1.calive and nvm.ele1.taken then
+		if nvm.ele1.cstate == RUNNING then
+			pow_max = gen.nominal
+			if nvm.ele1.calive > 0 and nvm.ele1.taken > 0 then
+				pow_curr = nvm.ele1.taken
+			end
+		end
+	end
+	return pow_curr, pow_max
+end
+
 local function consumer_data(gen_tbl, nominal)
 	local pow_max = 0
 	local pow_curr = 0
@@ -125,7 +178,7 @@ local function storage_load(gen_tbl, nominal)
 		if gen.nominal == nominal then
 			local ndef = techage.NodeDef[techage.get_node_lvm(gen.pos).name]
 			if ndef and ndef.on_recv_message then
-				local resp = ndef.on_recv_message(gen.pos, "0", "load")
+				local resp, _ = ndef.on_recv_message(gen.pos, "0", "load")
 				if type(resp) == "number" then
 					load_curr = load_curr + resp
 					num = num + 1
@@ -152,11 +205,16 @@ local function calc_network_data_type(pos, nvm, gentype)
 		pow_max2, pow_curr2, num_nodes2 = consumer_data(netw.con2, nominal)
 		pow_stored1 = storage_load(netw.con2, Gentype2Maxvalue[gentype]).." %"
 		pow_stored2 = pow_stored1
-	elseif gentype == S("Fuel cell") then
+	elseif gentype == S("Fuel cell cat. 2") then
 		pow_max1, pow_curr1, num_nodes1 = generator_data(netw.gen2, nominal)
 		pow_max2, pow_curr2, num_nodes2 = 0, 0, 0
 		pow_stored1 = storage_load(netw.gen2, Gentype2Maxvalue[gentype]).." %"
 		pow_stored2 = "-"
+	elseif gentype == S("Fuel cell cat. 1") then
+		pow_max1, pow_curr1, num_nodes1 = generator_data(netw.gen1, nominal)
+		pow_max2, pow_curr2, num_nodes2 = 0, 0, 0
+		pow_stored1 = storage_load(netw.gen1, Gentype2Maxvalue[gentype]).." %"
+		pow_stored2 = "-"
 	elseif gentype == S("Electrolyzer") then
 		pow_max1, pow_curr1, num_nodes1 = 0, 0, 0
 		pow_max2, pow_curr2, num_nodes2 = consumer_data(netw.con2, nominal)
@@ -231,7 +289,7 @@ local function formspec_type(pos, nvm)
 		"button[0,2.4;5,1;set;"..S("Store").."]"
 end
 
-local function formspec(pos, nvm)
+local function formspec1(pos, nvm)
 	local gentype = nvm.gentype or S("Power station")
 	local netw, gen1, gen2 = calc_network_data_type(pos, nvm, gentype)
 	local _, sum1, sum2 = calc_network_data_total(pos, nvm)
@@ -239,49 +297,181 @@ local function formspec(pos, nvm)
 	local star = netw.prop == 1 and "*" or ""
 	local state = get_state(netw)
 	
-	return "size[9,7]"..
+	return "size[11,9]"..
+		"tabheader[0,0;tab;status,console;1;;true]".. 
 		default.gui_bg..
 		default.gui_bg_img..
 		default.gui_slots..
-		"box[0,-0.1;8.8,0.5;#c6e8ff]"..
-		"label[3.5,-0.1;"..minetest.colorize( "#000000", S("Network Data")).."]"..
-		"label[8.5,-0.1;"..minetest.colorize( "#000000", star).."]"..
+		"box[0,-0.1;10.8,0.5;#c6e8ff]"..
+		"label[4.5,-0.1;"..minetest.colorize( "#000000", S("Network Data")).."]"..
+		"label[10.5,-0.1;"..minetest.colorize( "#000000", star).."]"..
 		
 		"style_type[button;bgcolor=#395c74]"..
 		"button[0,0.7;3,1;config;"..S("Type").."]"..
 		
-		"box[0,1.6;8.8,0.4;#c6e8ff]"..
-		"box[0,2.15;8.8,0.4;#395c74]"..
-		"box[0,2.65;8.8,0.4;#395c74]"..
-		"box[0,3.15;8.8,0.4;#395c74]"..
-		"box[0,3.65;8.8,0.4;#395c74]"..
+		"box[0,1.6;10.8,0.4;#c6e8ff]"..
+		"box[0,2.15;10.8,0.4;#395c74]"..
+		"box[0,2.65;10.8,0.4;#395c74]"..
+		"box[0,3.15;10.8,0.4;#395c74]"..
+		"box[0,3.65;10.8,0.4;#395c74]"..
 		"label[0.1,1.55;"..minetest.colorize( "#000000", gentype).."]"..
-		"label[3.7,1.55;"..minetest.colorize( "#000000", S("Output")).."]"..
-		"label[6.2,1.55;"..minetest.colorize( "#000000", S("Intake")).."]"..
+		"label[5.7,1.55;"..minetest.colorize( "#000000", S("Output")).."]"..
+		"label[8.2,1.55;"..minetest.colorize( "#000000", S("Intake")).."]"..
 		"label[0.1,2.1;"..S("Number blocks:").."]"..
 		"label[0.1,2.6;"..S("Maximum power:").."]"..
 		"label[0.1,3.1;"..S("Current power:").."]"..
 		"label[0.1,3.6;"..S("Energy stored:").."]"..
-		column(3.7, 2.1, gen1)..
-		column(6.2, 2.1, gen2)..
+		column(5.7, 2.1, gen1)..
+		column(8.2, 2.1, gen2)..
 
 		--"box[0,5.3;8.8,0.4;#c6e8ff]"..
-		"box[0,4.5;8.8,0.4;#c6e8ff]"..
-		"box[0,5.05;8.8,0.4;#395c74]"..
-		"box[0,5.55;8.8,0.4;#395c74]"..
-		"box[0,6.05;8.8,0.4;#395c74]"..
+		"box[0,4.5;10.8,0.4;#c6e8ff]"..
+		"box[0,5.05;10.8,0.4;#395c74]"..
+		"box[0,5.55;10.8,0.4;#395c74]"..
+		"box[0,6.05;10.8,0.4;#395c74]"..
 		"label[0.1,4.45;"..minetest.colorize( "#000000", S("Power grid total")).."]"..
-		"label[3.7,4.45;"..minetest.colorize( "#000000", S("Generators")).."]"..
-		"label[6.2,4.45;"..minetest.colorize( "#000000", S("Storage systems")).."]"..
+		"label[5.7,4.45;"..minetest.colorize( "#000000", S("Generators")).."]"..
+		"label[8.2,4.45;"..minetest.colorize( "#000000", S("Storage systems")).."]"..
 		"label[0.1,5.0;"..S("Number blocks:").."]"..
 		"label[0.1,5.5;"..S("Maximum power:").."]"..
 		"label[0.1,6.0;"..S("Current power:").."]"..
-		column(3.7, 5.0, sum1)..
-		column(6.2, 5.0, sum2)..
-		"box[0,6.75;8.8,0.4;#000000]"..
-		"label[0.1,6.7;"..state.."]"
+		column(5.7, 5.0, sum1)..
+		column(8.2, 5.0, sum2)..
+		"box[0,7.75;10.8,0.4;#000000]"..
+		"label[0.1,7.7;"..state.."]"
 end
 
+local function formspec2(pos, mem)
+	local meta = M(pos)
+	local output = meta:get_string("output")
+	local command = mem.cmnd or "help"
+	output = minetest.formspec_escape(output)
+	output = output:gsub("\n", ",")
+	
+	return "size[11,9]"..
+		"tabheader[0,0;tab;status,console;2;;true]".. 
+		default.gui_bg..
+		default.gui_bg_img..
+		default.gui_slots..
+		"box[0,-0.1;10.8,0.5;#c6e8ff]"..
+		"label[4.5,-0.1;"..minetest.colorize( "#000000", S("Network Data")).."]"..
+		"style_type[table,field;font=mono]"..
+		"table[0,0.5;10.8,7.8;output;"..output..";200]"..
+		"field[0.4,8.7;8.6,1;cmnd;;"..command.."]" ..
+		"field_close_on_enter[cmnd;false]"..
+		"button[8.9,8.4;2,1;enter;"..S("Enter").."]"
+end
+
+local function generators(pos, gen_tbl)
+	local tbl = {}
+	for _, item in ipairs(gen_tbl) do
+		if item and item.pos then
+			local node = techage.get_node_lvm(item.pos)
+			local ndef = minetest.registered_nodes[node.name]
+			local name = short_node_name(item.nominal)
+			local spos = P2S(item.pos)
+			local pow_curr, pow_max = get_generator_data(item, ndef)
+			if Storage[name] then
+				local load_percent = 0
+				local tdef = techage.NodeDef[node.name]
+				if tdef and tdef.on_recv_message then
+					load_percent = tdef.on_recv_message(item.pos, "0", "load") or 0
+				end
+				local s = string.format("%-16s %s = %u/%u ku (%u %%)", 
+						spos, name, pow_curr, pow_max, load_percent)
+				tbl[#tbl + 1] = s
+			else
+				local s = string.format("%-16s %s = %u/%u ku", spos, name, pow_curr, pow_max)
+				tbl[#tbl + 1] = s
+			end
+		end
+	end
+	return table.concat(tbl, "\n")
+end
+
+local function consumers(pos, gen_tbl)
+	local tbl = {}
+	for _, item in ipairs(gen_tbl) do
+		if item and item.pos then
+			local node = techage.get_node_lvm(item.pos)
+			local ndef = minetest.registered_nodes[node.name]
+			local name = short_node_name(item.nominal)
+			local spos = P2S(item.pos)
+			local pow_curr, pow_max = get_consumer_data(item, ndef)
+			if Storage[name] then
+				local load_percent = 0
+				local tdef = techage.NodeDef[node.name]
+				if tdef and tdef.on_recv_message then
+					load_percent = tdef.on_recv_message(item.pos, "0", "load") or 0
+				end
+				local s = string.format("%-16s %s = %u/%u ku (%u %%)", 
+						spos, name, pow_curr, pow_max, load_percent)
+				tbl[#tbl + 1] = s
+			else
+				local s = string.format("%-16s %s = %u/%u ku", spos, name, pow_curr, pow_max)
+				tbl[#tbl + 1] = s
+			end
+		end
+	end
+	return table.concat(tbl, "\n")
+end
+
+local function number_nodes(pos, netw)
+	return
+		"num. generators cat. 1: " .. #(netw.gen1 or {}) .. "\n" ..
+		"num. generators cat. 2: " .. #(netw.gen2 or {}) .. "\n" ..
+		"num. consumers  cat. 1: " .. #(netw.con1 or {}) .. "\n" ..
+		"num. consumers  cat. 2: " .. #(netw.con2 or {})
+end	
+
+local function power_network(pos, netw)
+	return
+		"pow. generators cat. 1: " .. (netw.available1 or 0) .. " ku\n" ..
+		"pow. generators cat. 2: " .. (netw.available2 or 0) .. " ku\n" ..
+		"pow. consumers  cat. 1: " .. (netw.needed1 or 0) .. " ku\n" ..
+		"pow. consumers  cat. 2: " .. (netw.needed2 or 0) .. " ku"
+end	
+
+
+local function output(pos, command, text)
+	local meta = M(pos)
+	text = meta:get_string("output") .. "\n$ " .. command .. "\n" .. (text or "")
+	text = text:sub(-2000,-1)
+	meta:set_string("output", text)
+end
+
+local function command(pos, nvm, command)
+	local meta = M(pos)
+	
+	if command then
+		command = command:sub(1,80)
+		command = string.trim(command)
+		
+		if command == "cls" then
+			meta:set_string("output", "")
+		elseif command == "help" then
+			output(pos, command, HELP)
+		elseif command == "gen1" then
+			local netw = techage.networks.has_network("ele1", nvm.ele1 and nvm.ele1.netID) or {}
+			output(pos, command, generators(pos, netw.gen1 or {}))
+		elseif command == "gen2" then
+			local netw = techage.networks.has_network("ele1", nvm.ele1 and nvm.ele1.netID) or {}
+			output(pos, command, generators(pos, netw.gen2 or {}))
+		elseif command == "con2" then
+			local netw = techage.networks.has_network("ele1", nvm.ele1 and nvm.ele1.netID) or {}
+			output(pos, command, consumers(pos, netw.con2 or {}))
+		elseif command == "num" then
+			local netw = techage.networks.has_network("ele1", nvm.ele1 and nvm.ele1.netID) or {}
+			output(pos, command, number_nodes(pos, netw))
+		elseif command == "pow" then
+			local netw = techage.networks.has_network("ele1", nvm.ele1 and nvm.ele1.netID) or {}
+			output(pos, command, power_network(pos, netw))
+		elseif command ~= "" then
+			output(pos, command, "")
+		end
+	end
+end	
+
 minetest.register_node("techage:ta3_power_terminal", {
 	description = S("TA3 Power Terminal"),
 	inventory_image = "techage_power_terminal_front.png",
@@ -305,7 +495,7 @@ minetest.register_node("techage:ta3_power_terminal", {
 		local nvm = techage.get_nvm(pos)
 		M(pos):set_int("outdir", networks.side_to_outdir(pos, "B"))
 		Cable:after_place_node(pos)
-		M(pos):set_string("formspec", formspec(pos, nvm))
+		M(pos):set_string("formspec", formspec1(pos, nvm))
 	end,
 	after_dig_node = function(pos)
 		Cable:after_dig_node(pos)
@@ -315,15 +505,18 @@ minetest.register_node("techage:ta3_power_terminal", {
 		power.update_network(pos, outdir, tlib2)
 	end,
 	on_rightclick = function(pos, node, clicker)
-		techage.set_activeformspec(pos, clicker)
-		minetest.get_node_timer(pos):start(CYCLE_TIME)
-		local nvm = techage.get_nvm(pos)
-		M(pos):set_string("formspec", formspec(pos, nvm))
+		local mem = techage.get_mem(pos)
+		if mem.active_formspec == 2 then
+			M(pos):set_string("formspec", formspec2(pos, mem))
+		else
+			local nvm = techage.get_nvm(pos)
+			M(pos):set_string("formspec", formspec1(pos, nvm))
+		end
 	end,
 	on_timer = function(pos, elapsed)
 		local nvm = techage.get_nvm(pos)
 		if techage.is_activeformspec(pos) then
-			M(pos):set_string("formspec", formspec(pos, nvm))
+			M(pos):set_string("formspec", formspec1(pos, nvm))
 		end
 		return true
 	end,
@@ -333,15 +526,31 @@ minetest.register_node("techage:ta3_power_terminal", {
 			return
 		end
 		local nvm = techage.get_nvm(pos)
+		local mem = techage.get_mem(pos)
 		
-		if fields.config then
+		if fields.key_enter_field or fields.enter then
+			command(pos, nvm, fields.cmnd)
+			mem.cmnd = ""
+			M(pos):set_string("formspec", formspec2(pos, mem))
+			mem.cmnd = fields.cmnd
+		elseif fields.config then
 			techage.reset_activeformspec(pos, player)
 			M(pos):set_string("formspec", formspec_type(pos, nvm))
 		elseif fields.set then
 			nvm.gentype = fields.gentype
 			nvm.gentype_idx = Gentype2Idx[fields.gentype] or 1
 			techage.set_activeformspec(pos, player)
-			M(pos):set_string("formspec", formspec(pos, nvm))
+			M(pos):set_string("formspec", formspec1(pos, nvm))
+		elseif fields.tab == "1" then
+			M(pos):set_string("formspec", formspec1(pos, nvm))
+			techage.set_activeformspec(pos, player)
+			mem.active_formspec = 1
+		elseif fields.tab == "2" then
+			M(pos):set_string("formspec", formspec2(pos, mem))
+			techage.reset_activeformspec(pos, player)
+			mem.active_formspec = 2
+		elseif fields.key_up and mem.cmnd then
+			M(pos):set_string("formspec", formspec2(pos, mem))
 		end
 	end,
 	
@@ -354,6 +563,7 @@ minetest.register_node("techage:ta3_power_terminal", {
 	
 	paramtype2 = "facedir",
 	paramtype = "light",
+	use_texture_alpha = techage.CLIP,
 	on_rotate = screwdriver.disallow,
 	sunlight_propagates = true,
 	is_ground_content = false,
diff --git a/techage/power/powerswitch.lua b/techage/power/powerswitch.lua
index e1cd5ce..0b55363 100644
--- a/techage/power/powerswitch.lua
+++ b/techage/power/powerswitch.lua
@@ -114,6 +114,7 @@ minetest.register_node("techage:powerswitch", {
 
 	on_rotate = screwdriver.disallow,
 	paramtype = "light",
+	use_texture_alpha = techage.CLIP,
 	sunlight_propagates = true,
 	paramtype2 = "wallmounted",
 	groups = {choppy=2, cracky=2, crumbly=2},
@@ -145,6 +146,7 @@ minetest.register_node("techage:powerswitch_on", {
 	drop = "techage:powerswitch",
 	on_rotate = screwdriver.disallow,
 	paramtype = "light",
+	use_texture_alpha = techage.CLIP,
 	sunlight_propagates = true,
 	paramtype2 = "wallmounted",
 	groups = {choppy=2, cracky=2, crumbly=2, not_in_creative_inventory = 1},
@@ -184,6 +186,7 @@ minetest.register_node("techage:powerswitchsmall", {
 
 	on_rotate = screwdriver.disallow,
 	paramtype = "light",
+	use_texture_alpha = techage.CLIP,
 	sunlight_propagates = true,
 	paramtype2 = "wallmounted",
 	groups = {choppy=2, cracky=2, crumbly=2},
@@ -215,6 +218,7 @@ minetest.register_node("techage:powerswitchsmall_on", {
 	drop = "techage:powerswitchsmall",
 	on_rotate = screwdriver.disallow,
 	paramtype = "light",
+	use_texture_alpha = techage.CLIP,
 	sunlight_propagates = true,
 	paramtype2 = "wallmounted",
 	groups = {choppy=2, cracky=2, crumbly=2, not_in_creative_inventory = 1},
diff --git a/techage/power/powerswitchbox.lua b/techage/power/powerswitchbox.lua
index f29f0e0..1d63318 100644
--- a/techage/power/powerswitchbox.lua
+++ b/techage/power/powerswitchbox.lua
@@ -54,6 +54,7 @@ minetest.register_node("techage:powerswitch_box", {
 	end,
 	
 	paramtype = "light",
+	use_texture_alpha = techage.CLIP,
 	sunlight_propagates = true,
 	on_rotate = screwdriver.disallow, -- important!
 	paramtype2 = "facedir",
diff --git a/techage/power/steam_pipe.lua b/techage/power/steam_pipe.lua
index d834ead..e667255 100644
--- a/techage/power/steam_pipe.lua
+++ b/techage/power/steam_pipe.lua
@@ -63,6 +63,7 @@ minetest.register_node("techage:steam_pipeS", {
 	},
 	on_rotate = screwdriver.disallow, -- important!
 	paramtype = "light",
+	use_texture_alpha = techage.CLIP,
 	sunlight_propagates = true,
 	is_ground_content = false,
 	groups = {crumbly=3, cracky=3, snappy=3},
@@ -95,6 +96,7 @@ minetest.register_node("techage:steam_pipeA", {
 	},
 	on_rotate = screwdriver.disallow, -- important!
 	paramtype = "light",
+	use_texture_alpha = techage.CLIP,
 	sunlight_propagates = true,
 	is_ground_content = false,
 	groups = {crumbly=3, cracky=3, snappy=3, not_in_creative_inventory=1},
diff --git a/techage/power/ta4_cable.lua b/techage/power/ta4_cable.lua
index 1e169bc..cbd2760 100644
--- a/techage/power/ta4_cable.lua
+++ b/techage/power/ta4_cable.lua
@@ -27,10 +27,16 @@ local Cable = tubelib2.Tube:new({
 	max_tube_length = ELE2_MAX_CABLE_LENGHT, 
 	show_infotext = false,
 	tube_type = "ele2",
-	primary_node_names = {"techage:ta4_power_cableS", "techage:ta4_power_cableA"},
+	primary_node_names = {"techage:ta4_power_cableS", "techage:ta4_power_cableA",
+		"techage:ta4_cable_wall_entry"},
 	secondary_node_names = {},
 	after_place_tube = function(pos, param2, tube_type, num_tubes)
-		minetest.swap_node(pos, {name = "techage:ta4_power_cable"..tube_type, param2 = param2})
+		local name = minetest.get_node(pos).name
+		if name == "techage:ta4_cable_wall_entry" then
+			minetest.swap_node(pos, {name = "techage:ta4_cable_wall_entry", param2 = param2})
+		else
+			minetest.swap_node(pos, {name = "techage:ta4_power_cable"..tube_type, param2 = param2})
+		end
 	end,
 })
 
@@ -76,6 +82,7 @@ minetest.register_node("techage:ta4_power_cableS", {
 	},
 	on_rotate = screwdriver.disallow, -- important!
 	paramtype = "light",
+	use_texture_alpha = techage.CLIP,
 	sunlight_propagates = true,
 	is_ground_content = false,
 	groups = {snappy = 2, choppy = 2, oddly_breakable_by_hand = 3},
@@ -109,6 +116,7 @@ minetest.register_node("techage:ta4_power_cableA", {
 	},
 	on_rotate = screwdriver.disallow, -- important!
 	paramtype = "light",
+	use_texture_alpha = techage.CLIP,
 	sunlight_propagates = true,
 	is_ground_content = false,
 	groups = {snappy = 2, choppy = 2, oddly_breakable_by_hand = 3, not_in_creative_inventory = 1},
@@ -139,7 +147,9 @@ minetest.register_node("techage:ta4_power_box", {
 		connect_back  = {{-1/16, -1/16,    0, 1/16, 1/16, 1/2}},
 		connect_front = {{-1/16, -1/16, -1/2, 1/16, 1/16,   0}},
 	},
-	connects_to = {"techage:ta4_power_cableA", "techage:ta4_power_cableS"},
+	connects_to = {"techage:ta4_power_cableA", "techage:ta4_power_cableS", 
+		"techage:ta4_solar_inverter", "techage:ta4_solar_carrier",
+		"techage:ta4_solar_carrierB", "techage:ta4_cable_wall_entry"},
 
 	after_place_node = function(pos, placer, itemstack, pointed_thing)
 		Cable:after_place_node(pos)
@@ -159,6 +169,7 @@ minetest.register_node("techage:ta4_power_box", {
 	
 	on_rotate = screwdriver.disallow, -- important!
 	paramtype = "light",
+	use_texture_alpha = techage.CLIP,
 	sunlight_propagates = true,
 	is_ground_content = false,
 	groups = {cracky=2, crumbly=2, choppy=2},
diff --git a/techage/power/ta4_cable_wall_entry.lua b/techage/power/ta4_cable_wall_entry.lua
new file mode 100644
index 0000000..d83d3b7
--- /dev/null
+++ b/techage/power/ta4_cable_wall_entry.lua
@@ -0,0 +1,57 @@
+--[[
+
+	TechAge
+	=======
+
+	Copyright (C) 2019-2020 Joachim Stolberg
+
+	AGPL v3
+	See LICENSE.txt for more information
+
+	TA4 cable wall entry
+
+]]--
+
+local S = techage.S
+
+local TA4_Cable = techage.TA4_Cable
+
+minetest.register_node("techage:ta4_cable_wall_entry", {
+	description = S("TA4 Cable Wall Entry"),
+	tiles = {
+		-- up, down, right, left, back, front
+		"basic_materials_concrete_block.png",
+		"basic_materials_concrete_block.png",
+		"basic_materials_concrete_block.png",
+		"basic_materials_concrete_block.png",
+		"basic_materials_concrete_block.png^techage_ta4_cable_hole.png",
+		"basic_materials_concrete_block.png^techage_ta4_cable_hole.png",
+	},
+
+	after_place_node = function(pos, placer, itemstack, pointed_thing)
+		if not TA4_Cable:after_place_tube(pos, placer, pointed_thing) then
+			minetest.remove_node(pos)
+			return true
+		end
+		return false
+	end,
+	
+	after_dig_node = function(pos, oldnode, oldmetadata, digger)
+		TA4_Cable:after_dig_tube(pos, oldnode)
+	end,
+	
+	paramtype2 = "facedir", -- important!
+	on_rotate = screwdriver.disallow, -- important!
+	groups = {crumbly = 2, cracky = 2, snappy = 2},
+	is_ground_content = false,
+	sounds = default.node_sound_stone_defaults(),
+})
+
+minetest.register_craft({
+	output = "techage:ta4_cable_wall_entry",
+	recipe = {
+		{"", "techage:ta4_power_cableS", ""},
+		{"", "basic_materials:concrete_block", ""},
+		{"", "",""},
+	},
+})
diff --git a/techage/solar/inverter.lua b/techage/solar/inverter.lua
index 9b877f8..9930e31 100644
--- a/techage/solar/inverter.lua
+++ b/techage/solar/inverter.lua
@@ -119,6 +119,7 @@ local function node_timer(pos, elapsed)
 	if techage.is_activeformspec(pos) then
 		M(pos):set_string("formspec", formspec(State, pos, nvm))
 	end
+	State:trigger_state(pos, nvm)
 	return true
 end
 
@@ -187,6 +188,7 @@ minetest.register_node("techage:ta4_solar_inverter", {
 			sides = {R = 1},
 			ntype = "gen1",
 			nominal = PWR_PERF,
+			regenerative = true,
 		},
 		ele2 = {
 			sides = {L = 1},
diff --git a/techage/solar/minicell.lua b/techage/solar/minicell.lua
index 0f6c10b..bd3713f 100644
--- a/techage/solar/minicell.lua
+++ b/techage/solar/minicell.lua
@@ -109,6 +109,7 @@ minetest.register_node("techage:ta4_solar_minicell", {
 	paramtype2 = "facedir",
 	groups = {cracky=2, crumbly=2, choppy=2},
 	is_ground_content = false,
+	use_texture_alpha = techage.CLIP,
 	
 	after_place_node = after_place_node,
 	after_dig_node = after_dig_node,
diff --git a/techage/solar/solarcell.lua b/techage/solar/solarcell.lua
index ebb00f8..e303f90 100644
--- a/techage/solar/solarcell.lua
+++ b/techage/solar/solarcell.lua
@@ -133,6 +133,7 @@ minetest.register_node("techage:ta4_solar_module", {
 		return S("power").." = "..power..", "..S("light").." = "..light
 	end,
 	paramtype = "light",
+	use_texture_alpha = techage.CLIP,
 	paramtype2 = "facedir",
 	on_rotate = screwdriver.disallow,
 	groups = {cracky=2, crumbly=2, choppy=2},
@@ -172,6 +173,7 @@ minetest.register_node("techage:ta4_solar_carrier", {
 	networks = net_def1,
 	
 	paramtype = "light",
+	use_texture_alpha = techage.CLIP,
 	paramtype2 = "facedir",
 	on_rotate = screwdriver.disallow,
 	groups = {cracky=2, crumbly=2, choppy=2},
@@ -211,6 +213,7 @@ minetest.register_node("techage:ta4_solar_carrierB", {
 	networks = net_def2,
 	
 	paramtype = "light",
+	use_texture_alpha = techage.CLIP,
 	paramtype2 = "facedir",
 	on_rotate = screwdriver.disallow,
 	groups = {cracky=2, crumbly=2, choppy=2},
@@ -239,6 +242,7 @@ minetest.register_node("techage:ta4_solar_carrierT", {
 	},
 	
 	paramtype = "light",
+	use_texture_alpha = techage.CLIP,
 	paramtype2 = "facedir",
 	groups = {cracky=2, crumbly=2, choppy=2},
 	is_ground_content = false,
diff --git a/techage/ta3_power/akkubox.lua b/techage/ta3_power/akkubox.lua
index f5efc7a..3d7b662 100644
--- a/techage/ta3_power/akkubox.lua
+++ b/techage/ta3_power/akkubox.lua
@@ -167,7 +167,7 @@ minetest.register_node("techage:ta3_akku", {
 	description = S("TA3 Accu Box"),
 	tiles = {
 		-- up, down, right, left, back, front
-		"techage_filling_ta3.png^techage_frame_ta3_top.png",
+		"techage_filling_ta3.png^techage_frame_ta3_top.png^techage_appl_arrow.png",
 		"techage_filling_ta3.png^techage_frame_ta3.png",
 		"techage_filling_ta3.png^techage_frame_ta3.png^techage_appl_hole_electric.png",
 		"techage_filling_ta3.png^techage_frame_ta3.png^techage_appl_source.png",
diff --git a/techage/textures/shrink.py b/techage/textures/shrink.py
index 45b41a4..0cf29b8 100644
--- a/techage/textures/shrink.py
+++ b/techage/textures/shrink.py
@@ -5,7 +5,7 @@ print(">>> Convert")
 for filename in os.listdir("./"):
     if fnmatch.fnmatch(filename, "*.png"):
         print(filename)
-        os.system("pngquant --skip-if-larger --quality=60-80 --strip --output ./%s.new  ./%s" % (filename, filename))
+        os.system("pngquant --skip-if-larger --quality=80 --strip --output ./%s.new  ./%s" % (filename, filename))
 
 print("\n>>> Copy")
 for filename in os.listdir("./"):
diff --git a/techage/textures/shrink.sh b/techage/textures/shrink.sh
new file mode 100755
index 0000000..36036c5
--- /dev/null
+++ b/techage/textures/shrink.sh
@@ -0,0 +1,2 @@
+#!/bin/bash
+pngquant --skip-if-larger --quality=80 --strip *.png --ext .png --force
\ No newline at end of file
diff --git a/techage/textures/techage_aluminum_inv.png b/techage/textures/techage_aluminum_inv.png
index 1127c25..26f5e62 100644
Binary files a/techage/textures/techage_aluminum_inv.png and b/techage/textures/techage_aluminum_inv.png differ
diff --git a/techage/textures/techage_appl_arrow2.png b/techage/textures/techage_appl_arrow2.png
new file mode 100644
index 0000000..e86ad35
Binary files /dev/null and b/techage/textures/techage_appl_arrow2.png differ
diff --git a/techage/textures/techage_appl_chest_front_ta4.png b/techage/textures/techage_appl_chest_front_ta4.png
index 6e2322e..bbb2400 100644
Binary files a/techage/textures/techage_appl_chest_front_ta4.png and b/techage/textures/techage_appl_chest_front_ta4.png differ
diff --git a/techage/textures/techage_appl_cooler4.png b/techage/textures/techage_appl_cooler4.png
index 4258335..952cf55 100644
Binary files a/techage/textures/techage_appl_cooler4.png and b/techage/textures/techage_appl_cooler4.png differ
diff --git a/techage/textures/techage_appl_filler.png b/techage/textures/techage_appl_filler.png
index 64e340d..92205d6 100644
Binary files a/techage/textures/techage_appl_filler.png and b/techage/textures/techage_appl_filler.png differ
diff --git a/techage/textures/techage_appl_hole_electric.png b/techage/textures/techage_appl_hole_electric.png
index da19107..6dfbaec 100644
Binary files a/techage/textures/techage_appl_hole_electric.png and b/techage/textures/techage_appl_hole_electric.png differ
diff --git a/techage/textures/techage_appl_laser.png b/techage/textures/techage_appl_laser.png
new file mode 100644
index 0000000..70f7062
Binary files /dev/null and b/techage/textures/techage_appl_laser.png differ
diff --git a/techage/textures/techage_appl_laser_hole.png b/techage/textures/techage_appl_laser_hole.png
new file mode 100644
index 0000000..c445434
Binary files /dev/null and b/techage/textures/techage_appl_laser_hole.png differ
diff --git a/techage/textures/techage_appl_pumpjack.png b/techage/textures/techage_appl_pumpjack.png
index cafabd2..d6a34db 100644
Binary files a/techage/textures/techage_appl_pumpjack.png and b/techage/textures/techage_appl_pumpjack.png differ
diff --git a/techage/textures/techage_appl_recycler.png b/techage/textures/techage_appl_recycler.png
index 9be40e7..ddfa0cc 100644
Binary files a/techage/textures/techage_appl_recycler.png and b/techage/textures/techage_appl_recycler.png differ
diff --git a/techage/textures/techage_appl_rinser_top.png b/techage/textures/techage_appl_rinser_top.png
index 5b7a009..4abb220 100644
Binary files a/techage/textures/techage_appl_rinser_top.png and b/techage/textures/techage_appl_rinser_top.png differ
diff --git a/techage/textures/techage_appl_sieve4_top.png b/techage/textures/techage_appl_sieve4_top.png
index edcf126..10ec29e 100644
Binary files a/techage/textures/techage_appl_sieve4_top.png and b/techage/textures/techage_appl_sieve4_top.png differ
diff --git a/techage/textures/techage_appl_switch_inv.png b/techage/textures/techage_appl_switch_inv.png
index 153eae2..7437493 100644
Binary files a/techage/textures/techage_appl_switch_inv.png and b/techage/textures/techage_appl_switch_inv.png differ
diff --git a/techage/textures/techage_ash_side.png b/techage/textures/techage_ash_side.png
index 5dc5361..f382e26 100644
Binary files a/techage/textures/techage_ash_side.png and b/techage/textures/techage_ash_side.png differ
diff --git a/techage/textures/techage_axle4.png b/techage/textures/techage_axle4.png
index 2e2b716..e7998ec 100644
Binary files a/techage/textures/techage_axle4.png and b/techage/textures/techage_axle4.png differ
diff --git a/techage/textures/techage_basalt_glass2.png b/techage/textures/techage_basalt_glass2.png
index f22db4a..e7a7b9c 100644
Binary files a/techage/textures/techage_basalt_glass2.png and b/techage/textures/techage_basalt_glass2.png differ
diff --git a/techage/textures/techage_ceilinglamp.png b/techage/textures/techage_ceilinglamp.png
index f8656fc..7545650 100644
Binary files a/techage/textures/techage_ceilinglamp.png and b/techage/textures/techage_ceilinglamp.png differ
diff --git a/techage/textures/techage_ceilinglamp_bottom.png b/techage/textures/techage_ceilinglamp_bottom.png
index 8f92f5e..3bd03fe 100644
Binary files a/techage/textures/techage_ceilinglamp_bottom.png and b/techage/textures/techage_ceilinglamp_bottom.png differ
diff --git a/techage/textures/techage_ceramic_material.png b/techage/textures/techage_ceramic_material.png
new file mode 100644
index 0000000..ce9fcf8
Binary files /dev/null and b/techage/textures/techage_ceramic_material.png differ
diff --git a/techage/textures/techage_charcoal_burn.png b/techage/textures/techage_charcoal_burn.png
index 7fbb0e2..5ef408e 100644
Binary files a/techage/textures/techage_charcoal_burn.png and b/techage/textures/techage_charcoal_burn.png differ
diff --git a/techage/textures/techage_concrete.png b/techage/textures/techage_concrete.png
index 94eff2e..2bead6b 100644
Binary files a/techage/textures/techage_concrete.png and b/techage/textures/techage_concrete.png differ
diff --git a/techage/textures/techage_concrete4.png b/techage/textures/techage_concrete4.png
index c9c84da..26ab946 100644
Binary files a/techage/textures/techage_concrete4.png and b/techage/textures/techage_concrete4.png differ
diff --git a/techage/textures/techage_electric_junction.png b/techage/textures/techage_electric_junction.png
index e0464b1..1dc02d5 100644
Binary files a/techage/textures/techage_electric_junction.png and b/techage/textures/techage_electric_junction.png differ
diff --git a/techage/textures/techage_electric_trowel.png b/techage/textures/techage_electric_trowel.png
index 87b90bd..11d7941 100644
Binary files a/techage/textures/techage_electric_trowel.png and b/techage/textures/techage_electric_trowel.png differ
diff --git a/techage/textures/techage_end_wrench.png b/techage/textures/techage_end_wrench.png
index 60d23f5..a66c537 100644
Binary files a/techage/textures/techage_end_wrench.png and b/techage/textures/techage_end_wrench.png differ
diff --git a/techage/textures/techage_filling4_ta4.png b/techage/textures/techage_filling4_ta4.png
index 7f03588..48987fe 100644
Binary files a/techage/textures/techage_filling4_ta4.png and b/techage/textures/techage_filling4_ta4.png differ
diff --git a/techage/textures/techage_filling8_ta4.png b/techage/textures/techage_filling8_ta4.png
index e43a955..b9d6311 100644
Binary files a/techage/textures/techage_filling8_ta4.png and b/techage/textures/techage_filling8_ta4.png differ
diff --git a/techage/textures/techage_filling_metal.png b/techage/textures/techage_filling_metal.png
index 2d7021e..43f0734 100644
Binary files a/techage/textures/techage_filling_metal.png and b/techage/textures/techage_filling_metal.png differ
diff --git a/techage/textures/techage_firebox.png b/techage/textures/techage_firebox.png
index 7bf2040..6267f3d 100644
Binary files a/techage/textures/techage_firebox.png and b/techage/textures/techage_firebox.png differ
diff --git a/techage/textures/techage_flame_animated.png b/techage/textures/techage_flame_animated.png
index baca69b..7418550 100644
Binary files a/techage/textures/techage_flame_animated.png and b/techage/textures/techage_flame_animated.png differ
diff --git a/techage/textures/techage_form_tank.png b/techage/textures/techage_form_tank.png
index ce3e807..71c6b27 100644
Binary files a/techage/textures/techage_form_tank.png and b/techage/textures/techage_form_tank.png differ
diff --git a/techage/textures/techage_form_temp_fg.png b/techage/textures/techage_form_temp_fg.png
index 74d61ff..b7e4f4e 100644
Binary files a/techage/textures/techage_form_temp_fg.png and b/techage/textures/techage_form_temp_fg.png differ
diff --git a/techage/textures/techage_frame14_ta2.png b/techage/textures/techage_frame14_ta2.png
index 356da59..b7a119a 100644
Binary files a/techage/textures/techage_frame14_ta2.png and b/techage/textures/techage_frame14_ta2.png differ
diff --git a/techage/textures/techage_frame4_ta2.png b/techage/textures/techage_frame4_ta2.png
index 52f3a95..98bb0e6 100644
Binary files a/techage/textures/techage_frame4_ta2.png and b/techage/textures/techage_frame4_ta2.png differ
diff --git a/techage/textures/techage_frame4_ta2_top.png b/techage/textures/techage_frame4_ta2_top.png
index 52f3a95..98bb0e6 100644
Binary files a/techage/textures/techage_frame4_ta2_top.png and b/techage/textures/techage_frame4_ta2_top.png differ
diff --git a/techage/textures/techage_frame8_ta3.png b/techage/textures/techage_frame8_ta3.png
index 406f303..c30737d 100644
Binary files a/techage/textures/techage_frame8_ta3.png and b/techage/textures/techage_frame8_ta3.png differ
diff --git a/techage/textures/techage_frame_ta3.png b/techage/textures/techage_frame_ta3.png
index bc2bb49..e744bc5 100644
Binary files a/techage/textures/techage_frame_ta3.png and b/techage/textures/techage_frame_ta3.png differ
diff --git a/techage/textures/techage_frame_ta3_top.png b/techage/textures/techage_frame_ta3_top.png
index bc2bb49..e744bc5 100644
Binary files a/techage/textures/techage_frame_ta3_top.png and b/techage/textures/techage_frame_ta3_top.png differ
diff --git a/techage/textures/techage_furnace_ceramic.png b/techage/textures/techage_furnace_ceramic.png
new file mode 100644
index 0000000..4b0a82b
Binary files /dev/null and b/techage/textures/techage_furnace_ceramic.png differ
diff --git a/techage/textures/techage_gasflare.png b/techage/textures/techage_gasflare.png
index 562c5eb..4530dcc 100644
Binary files a/techage/textures/techage_gasflare.png and b/techage/textures/techage_gasflare.png differ
diff --git a/techage/textures/techage_gate.png b/techage/textures/techage_gate.png
index 4d424f7..ac51f19 100644
Binary files a/techage/textures/techage_gate.png and b/techage/textures/techage_gate.png differ
diff --git a/techage/textures/techage_inv_button_error.png b/techage/textures/techage_inv_button_error.png
index e4b0d1d..c01e36a 100644
Binary files a/techage/textures/techage_inv_button_error.png and b/techage/textures/techage_inv_button_error.png differ
diff --git a/techage/textures/techage_inv_button_standby.png b/techage/textures/techage_inv_button_standby.png
index a13b201..8e23989 100644
Binary files a/techage/textures/techage_inv_button_standby.png and b/techage/textures/techage_inv_button_standby.png differ
diff --git a/techage/textures/techage_laser.png b/techage/textures/techage_laser.png
new file mode 100644
index 0000000..43e14f6
Binary files /dev/null and b/techage/textures/techage_laser.png differ
diff --git a/techage/textures/techage_lighter_burn.png b/techage/textures/techage_lighter_burn.png
index 52c435b..2950f59 100644
Binary files a/techage/textures/techage_lighter_burn.png and b/techage/textures/techage_lighter_burn.png differ
diff --git a/techage/textures/techage_liquid_filter_filler_bottom.png b/techage/textures/techage_liquid_filter_filler_bottom.png
index e26174c..5c7df5d 100644
Binary files a/techage/textures/techage_liquid_filter_filler_bottom.png and b/techage/textures/techage_liquid_filter_filler_bottom.png differ
diff --git a/techage/textures/techage_liquidsampler4.png b/techage/textures/techage_liquidsampler4.png
index 1d79431..7e81196 100644
Binary files a/techage/textures/techage_liquidsampler4.png and b/techage/textures/techage_liquidsampler4.png differ
diff --git a/techage/textures/techage_lua_controller.png b/techage/textures/techage_lua_controller.png
index b55cc4e..450dc9d 100644
Binary files a/techage/textures/techage_lua_controller.png and b/techage/textures/techage_lua_controller.png differ
diff --git a/techage/textures/techage_meridiumaxe.png b/techage/textures/techage_meridiumaxe.png
index 0ab3981..830410e 100644
Binary files a/techage/textures/techage_meridiumaxe.png and b/techage/textures/techage_meridiumaxe.png differ
diff --git a/techage/textures/techage_oil_drill.png b/techage/textures/techage_oil_drill.png
index 7d05c22..95a9aa6 100644
Binary files a/techage/textures/techage_oil_drill.png and b/techage/textures/techage_oil_drill.png differ
diff --git a/techage/textures/techage_oil_tower_top.png b/techage/textures/techage_oil_tower_top.png
index d28377c..f99daad 100644
Binary files a/techage/textures/techage_oil_tower_top.png and b/techage/textures/techage_oil_tower_top.png differ
diff --git a/techage/textures/techage_powder_inv.png b/techage/textures/techage_powder_inv.png
index 976a790..4ec099a 100644
Binary files a/techage/textures/techage_powder_inv.png and b/techage/textures/techage_powder_inv.png differ
diff --git a/techage/textures/techage_power_terminal_front.png b/techage/textures/techage_power_terminal_front.png
index 609c270..6ece161 100644
Binary files a/techage/textures/techage_power_terminal_front.png and b/techage/textures/techage_power_terminal_front.png differ
diff --git a/techage/textures/techage_power_terminal_side.png b/techage/textures/techage_power_terminal_side.png
index ada1b1a..6102404 100644
Binary files a/techage/textures/techage_power_terminal_side.png and b/techage/textures/techage_power_terminal_side.png differ
diff --git a/techage/textures/techage_programmer.png b/techage/textures/techage_programmer.png
index 03a08d7..6618e54 100644
Binary files a/techage/textures/techage_programmer.png and b/techage/textures/techage_programmer.png differ
diff --git a/techage/textures/techage_ramchip.png b/techage/textures/techage_ramchip.png
index bbc5194..efb064e 100644
Binary files a/techage/textures/techage_ramchip.png and b/techage/textures/techage_ramchip.png differ
diff --git a/techage/textures/techage_reactor_filler_plan.png b/techage/textures/techage_reactor_filler_plan.png
index f60cfac..2fb7a6e 100644
Binary files a/techage/textures/techage_reactor_filler_plan.png and b/techage/textures/techage_reactor_filler_plan.png differ
diff --git a/techage/textures/techage_reactor_side.png b/techage/textures/techage_reactor_side.png
index 21ddebf..9ac7a53 100644
Binary files a/techage/textures/techage_reactor_side.png and b/techage/textures/techage_reactor_side.png differ
diff --git a/techage/textures/techage_server2_back.png b/techage/textures/techage_server2_back.png
new file mode 100644
index 0000000..c91583d
Binary files /dev/null and b/techage/textures/techage_server2_back.png differ
diff --git a/techage/textures/techage_server2_front.png b/techage/textures/techage_server2_front.png
new file mode 100644
index 0000000..973849e
Binary files /dev/null and b/techage/textures/techage_server2_front.png differ
diff --git a/techage/textures/techage_server2_side.png b/techage/textures/techage_server2_side.png
new file mode 100644
index 0000000..0887f4b
Binary files /dev/null and b/techage/textures/techage_server2_side.png differ
diff --git a/techage/textures/techage_server2_top.png b/techage/textures/techage_server2_top.png
new file mode 100644
index 0000000..46004c0
Binary files /dev/null and b/techage/textures/techage_server2_top.png differ
diff --git a/techage/textures/techage_smoke.png b/techage/textures/techage_smoke.png
index 58a1648..344982c 100644
Binary files a/techage/textures/techage_smoke.png and b/techage/textures/techage_smoke.png differ
diff --git a/techage/textures/techage_solar_cell_mini_side.png b/techage/textures/techage_solar_cell_mini_side.png
index 43eef9e..5cd0274 100644
Binary files a/techage/textures/techage_solar_cell_mini_side.png and b/techage/textures/techage_solar_cell_mini_side.png differ
diff --git a/techage/textures/techage_steam_knee.png b/techage/textures/techage_steam_knee.png
index 5d2e9d8..27b2738 100644
Binary files a/techage/textures/techage_steam_knee.png and b/techage/textures/techage_steam_knee.png differ
diff --git a/techage/textures/techage_steam_knee2.png b/techage/textures/techage_steam_knee2.png
index d471a05..5dcd9d9 100644
Binary files a/techage/textures/techage_steam_knee2.png and b/techage/textures/techage_steam_knee2.png differ
diff --git a/techage/textures/techage_ta3b.png b/techage/textures/techage_ta3b.png
index 4fcb2b0..24cf11e 100644
Binary files a/techage/textures/techage_ta3b.png and b/techage/textures/techage_ta3b.png differ
diff --git a/techage/textures/techage_ta4_cable_hole.png b/techage/textures/techage_ta4_cable_hole.png
new file mode 100644
index 0000000..f936c9c
Binary files /dev/null and b/techage/textures/techage_ta4_cable_hole.png differ
diff --git a/techage/textures/techage_trowel.png b/techage/textures/techage_trowel.png
index 87b90bd..11d7941 100644
Binary files a/techage/textures/techage_trowel.png and b/techage/textures/techage_trowel.png differ
diff --git a/techage/textures/techage_tube_junction.png b/techage/textures/techage_tube_junction.png
new file mode 100644
index 0000000..8d44956
Binary files /dev/null and b/techage/textures/techage_tube_junction.png differ
diff --git a/techage/textures/techage_tubeta4_junction.png b/techage/textures/techage_tubeta4_junction.png
new file mode 100644
index 0000000..0c27a9d
Binary files /dev/null and b/techage/textures/techage_tubeta4_junction.png differ
diff --git a/techage/textures/techage_vacuum_tube.png b/techage/textures/techage_vacuum_tube.png
index 38309d0..146e9be 100644
Binary files a/techage/textures/techage_vacuum_tube.png and b/techage/textures/techage_vacuum_tube.png differ
diff --git a/techage/textures/techage_wlanchip.png b/techage/textures/techage_wlanchip.png
index c4ddb93..9ebe01c 100644
Binary files a/techage/textures/techage_wlanchip.png and b/techage/textures/techage_wlanchip.png differ
diff --git a/techage/tools/trowel.lua b/techage/tools/trowel.lua
index a44e590..6e895fe 100644
--- a/techage/tools/trowel.lua
+++ b/techage/tools/trowel.lua
@@ -89,7 +89,7 @@ minetest.register_tool("techage:trowel", {
 	description = S("TechAge Trowel"),
 	inventory_image = "techage_trowel.png",
 	wield_image = "techage_trowel.png",
-	use_texture_alpha = true,
+	use_texture_alpha = techage.CLIP,
 	groups = {cracky=1},
 	on_use = replace_node,
 	on_place = replace_node,
diff --git a/techage/wind_turbine/rotor.lua b/techage/wind_turbine/rotor.lua
index 83f6aa7..60cdaf6 100644
--- a/techage/wind_turbine/rotor.lua
+++ b/techage/wind_turbine/rotor.lua
@@ -29,8 +29,6 @@ local power = techage.power
 
 local Rotors = {}
 
-local MAX_NUM_FOREIGN_NODES = 50
-
 local Face2Dir = {[0]=
 	{x=0,  y=0,  z=1},
 	{x=1,  y=0,  z=0},
@@ -48,44 +46,51 @@ local function pos_and_yaw(pos, param2)
 	return pos, {x=0, y=yaw, z=0}
 end
 
-local function add_rotor(pos, nvm, player_name)
-	nvm.error = false
-	
-	if not techage.valid_place_for_windturbine(pos, nil, 1) then
+local function check_rotor(pos, nvm)
+	local resp, err = techage.valid_place_for_windturbine(pos, nil, 1)
+	if not resp then
+		M(pos):set_string("infotext", S("TA4 Wind Turbine")..": "..err)
 		nvm.error = true
-		M(pos):set_string("infotext", S("TA4 Wind Turbine")..": "..S("Not suitable position!"))
-		return
+		return false
 	end
 	
-	local hash = minetest.hash_node_position(pos)
-	if not Rotors[hash] then
-		local node = minetest.get_node(pos)
-		local npos, yaw = pos_and_yaw(pos, node.param2)
-		local obj = minetest.add_entity(npos, "techage:rotor_ent")
-		obj:set_animation({x = 0, y = 119}, 0, 0, true)
-		obj:set_rotation(yaw)
-		Rotors[hash] = obj
-	end
-	
-	local own_num = M(pos):get_string("node_number") or ""
-	M(pos):set_string("infotext", S("TA4 Wind Turbine").." "..own_num)
-end	
-
-local function start_rotor(pos, nvm)
 	local npos = techage.get_pos(pos, "F")
 	local node = techage.get_node_lvm(npos)
 	if node.name ~= "techage:ta4_wind_turbine_nacelle" then
 		M(pos):set_string("infotext", S("TA4 Wind Turbine").." "..S("Nacelle is missing"))
 		nvm.error = true
-		return
+		return false
 	end
 	
-	nvm.providing = true
-	nvm.delivered = 0
-	power.generator_start(pos, Cable, CYCLE_TIME, 5)
-	local hash = minetest.hash_node_position(pos)
-	if Rotors[hash] then
-		Rotors[hash]:set_animation_frame_speed(50)
+	local own_num = M(pos):get_string("node_number") or ""
+	M(pos):set_string("infotext", S("TA4 Wind Turbine").." "..own_num)
+	nvm.error = false
+	return true
+end
+	
+local function add_rotor(pos, nvm)
+	if check_rotor(pos, nvm) then
+		local hash = minetest.hash_node_position(pos)
+		if not Rotors[hash] then
+			local node = minetest.get_node(pos)
+			local npos, yaw = pos_and_yaw(pos, node.param2)
+			local obj = minetest.add_entity(npos, "techage:rotor_ent")
+			obj:set_animation({x = 0, y = 119}, 0, 0, true)
+			obj:set_rotation(yaw)
+			Rotors[hash] = obj
+		end
+	end
+end	
+
+local function start_rotor(pos, nvm)
+	if not nvm.error then
+		nvm.providing = true
+		nvm.delivered = 0
+		power.generator_start(pos, Cable, CYCLE_TIME, 5)
+		local hash = minetest.hash_node_position(pos)
+		if Rotors[hash] then
+			Rotors[hash]:set_animation_frame_speed(50)
+		end
 	end
 end
 
@@ -126,14 +131,22 @@ local function after_place_node(pos, placer)
 	local own_num = techage.add_node(pos, "techage:ta4_wind_turbine")
 	meta:set_string("node_number", own_num)
 	meta:set_string("owner", placer:get_player_name())
-	meta:set_string("infotext", S("TA4 Wind Turbine").." "..own_num)
 	nvm.providing = false
 	nvm.running = true
-	add_rotor(pos, nvm, placer:get_player_name())
+	add_rotor(pos, nvm)
 	minetest.get_node_timer(pos):start(CYCLE_TIME)
 	Cable:after_place_node(pos)
 end
 
+local function on_punch(pos, node, puncher, pointed_thing)
+	if minetest.is_protected(pos, puncher:get_player_name()) then
+		return
+	end
+	
+	local nvm = techage.get_nvm(pos)
+	add_rotor(pos, nvm)
+end
+	
 local function after_dig_node(pos, oldnode, oldmetadata)
 	local hash = minetest.hash_node_position(pos)
 	if Rotors[hash] and Rotors[hash]:get_luaentity() then
@@ -167,12 +180,14 @@ minetest.register_node("techage:ta4_wind_turbine", {
 			sides = {D = 1},
 			ntype = "gen1",
 			nominal = PWR_PERF,
+			regenerative = true,
 		},
 	},
 	after_place_node = after_place_node,
 	after_dig_node = after_dig_node,
 	tubelib2_on_update2 = tubelib2_on_update2,
 	on_timer = node_timer,
+	on_punch = on_punch,
 	paramtype2 = "facedir",
 	groups = {cracky=2, crumbly=2, choppy=2},
 	is_ground_content = false,
diff --git a/techage/wind_turbine/signallamp.lua b/techage/wind_turbine/signallamp.lua
index 8bd29d3..a1be480 100644
--- a/techage/wind_turbine/signallamp.lua
+++ b/techage/wind_turbine/signallamp.lua
@@ -52,6 +52,7 @@ minetest.register_node("techage:rotor_signal_lamp_off", {
 	end,
 
 	paramtype = "light",
+	use_texture_alpha = techage.CLIP,
 	paramtype2 = "glasslikeliquidlevel",
 	sunlight_propagates = true,
 	sounds = default.node_sound_glass_defaults(),
@@ -77,6 +78,7 @@ minetest.register_node("techage:rotor_signal_lamp_on", {
 	end,
 	
 	paramtype = "light",
+	use_texture_alpha = techage.CLIP,
 	light_source = 8,
 	paramtype2 = "glasslikeliquidlevel",
 	sunlight_propagates = true,
diff --git a/techpack_stairway/COPYING.txt b/techpack_stairway/COPYING.txt
index a0c8d14..ac8785d 100644
--- a/techpack_stairway/COPYING.txt
+++ b/techpack_stairway/COPYING.txt
@@ -1,6 +1,6 @@
 The stairway mod for Minetest is
 
-Copyright (C) 2017-2018 Joachim Stolberg  
+Copyright (C) 2017-2021 Joachim Stolberg
 
 License of source code
 ----------------------
diff --git a/techpack_stairway/init.lua b/techpack_stairway/init.lua
index 91c7716..c995e72 100644
--- a/techpack_stairway/init.lua
+++ b/techpack_stairway/init.lua
@@ -12,7 +12,11 @@
 
 ]]--
 
-S = minetest.get_translator("techpack_stairway")
+local S = minetest.get_translator("techpack_stairway")
+
+-- Test MT 5.4 new string mode
+local CLIP = minetest.features.use_texture_alpha_string_modes and "clip" or false
+
 
 minetest.register_node("techpack_stairway:grating", {
 	description = S("TechPack Grating"),
@@ -39,6 +43,7 @@ minetest.register_node("techpack_stairway:grating", {
 	--climbable = true,
 	paramtype2 = "facedir",
 	paramtype = "light",
+	use_texture_alpha = CLIP,
 	sunlight_propagates = true,
 	is_ground_content = false,
 	groups = {cracky = 2},
@@ -70,6 +75,7 @@ minetest.register_node("techpack_stairway:handrail1", {
 	--climbable = true,
 	paramtype2 = "facedir",
 	paramtype = "light",
+	use_texture_alpha = CLIP,
 	sunlight_propagates = true,
 	is_ground_content = false,
 	groups = {cracky = 2},
@@ -103,6 +109,7 @@ minetest.register_node("techpack_stairway:handrail2", {
 	--climbable = true,
 	paramtype2 = "facedir",
 	paramtype = "light",
+	use_texture_alpha = CLIP,
 	sunlight_propagates = true,
 	is_ground_content = false,
 	groups = {cracky = 2},
@@ -136,6 +143,7 @@ minetest.register_node("techpack_stairway:handrail3", {
 	--climbable = true,
 	paramtype2 = "facedir",
 	paramtype = "light",
+	use_texture_alpha = CLIP,
 	sunlight_propagates = true,
 	is_ground_content = false,
 	groups = {cracky = 2},
@@ -171,6 +179,7 @@ minetest.register_node("techpack_stairway:handrail4", {
 	--climbable = true,
 	paramtype2 = "facedir",
 	paramtype = "light",
+	use_texture_alpha = CLIP,
 	sunlight_propagates = true,
 	is_ground_content = false,
 	groups = {cracky = 2},
@@ -203,6 +212,7 @@ minetest.register_node("techpack_stairway:bridge1", {
 	--climbable = true,
 	paramtype2 = "facedir",
 	paramtype = "light",
+	use_texture_alpha = CLIP,
 	sunlight_propagates = true,
 	is_ground_content = false,
 	groups = {cracky = 2},
@@ -236,6 +246,7 @@ minetest.register_node("techpack_stairway:bridge2", {
 	--climbable = true,
 	paramtype2 = "facedir",
 	paramtype = "light",
+	use_texture_alpha = CLIP,
 	sunlight_propagates = true,
 	is_ground_content = false,
 	groups = {cracky = 2},
@@ -269,6 +280,7 @@ minetest.register_node("techpack_stairway:bridge3", {
 	--climbable = true,
 	paramtype2 = "facedir",
 	paramtype = "light",
+	use_texture_alpha = CLIP,
 	sunlight_propagates = true,
 	is_ground_content = false,
 	groups = {cracky = 2},
@@ -303,6 +315,7 @@ minetest.register_node("techpack_stairway:bridge4", {
 	--climbable = true,
 	paramtype2 = "facedir",
 	paramtype = "light",
+	use_texture_alpha = CLIP,
 	sunlight_propagates = true,
 	is_ground_content = false,
 	groups = {cracky = 2},
@@ -341,6 +354,7 @@ minetest.register_node("techpack_stairway:stairway", {
 	--climbable = true,
 	paramtype2 = "facedir",
 	paramtype = "light",
+	use_texture_alpha = CLIP,
 	sunlight_propagates = true,
 	is_ground_content = false,
 	groups = {cracky = 2},
@@ -372,6 +386,7 @@ minetest.register_node("techpack_stairway:ladder1", {
 	climbable = true,
 	paramtype2 = "facedir",
 	paramtype = "light",
+	use_texture_alpha = CLIP,
 	sunlight_propagates = true,
 	is_ground_content = false,
 	groups = {cracky = 2},
@@ -404,6 +419,7 @@ minetest.register_node("techpack_stairway:ladder2", {
 	climbable = true,
 	paramtype2 = "facedir",
 	paramtype = "light",
+	use_texture_alpha = CLIP,
 	sunlight_propagates = true,
 	is_ground_content = false,
 	groups = {cracky = 2},
@@ -436,6 +452,7 @@ minetest.register_node("techpack_stairway:ladder3", {
     climbable = true,
     paramtype2 = "facedir",
     paramtype = "light",
+	use_texture_alpha = CLIP,
     sunlight_propagates = true,
     is_ground_content = false,
     groups = {cracky = 2},
@@ -466,6 +483,7 @@ minetest.register_node("techpack_stairway:ladder4", {
 	climbable = true,
 	paramtype2 = "facedir",
 	paramtype = "light",
+	use_texture_alpha = CLIP,
 	sunlight_propagates = true,
 	is_ground_content = false,
 	groups = {cracky = 2},
@@ -498,6 +516,7 @@ minetest.register_node("techpack_stairway:lattice", {
 	
 	paramtype2 = "facedir",
 	paramtype = "light",
+	use_texture_alpha = CLIP,
 	sunlight_propagates = true,
 	is_ground_content = false,
 	groups = {cracky = 2},
@@ -546,6 +565,7 @@ minetest.register_node("techpack_stairway:lattice_slop", {
 		
 	paramtype2 = "facedir",
 	paramtype = "light",
+	use_texture_alpha = CLIP,
 	sunlight_propagates = true,
 	is_ground_content = false,
 	groups = {cracky = 2},
@@ -553,7 +573,7 @@ minetest.register_node("techpack_stairway:lattice_slop", {
 })
 
 minetest.register_craft({
-	output = "techpack_stairway:grating 4",
+	output = "techpack_stairway:grating 6",
 	recipe = {
 		{"", "", ""},
 		{"dye:dark_grey", "", "default:coal_lump"},
@@ -562,7 +582,7 @@ minetest.register_craft({
 })
 
 minetest.register_craft({
-	output = "techpack_stairway:handrail1 4",
+	output = "techpack_stairway:handrail1 6",
 	recipe = {
 		{"default:steel_ingot", "default:coal_lump", ""},
 		{"default:tin_ingot", "", ""},
@@ -571,7 +591,7 @@ minetest.register_craft({
 })
 
 minetest.register_craft({
-	output = "techpack_stairway:stairway 2",
+	output = "techpack_stairway:stairway 3",
 	recipe = {
 		{"", "", "default:steel_ingot"},
 		{"dye:dark_grey", "default:tin_ingot", "default:coal_lump"},
@@ -580,7 +600,7 @@ minetest.register_craft({
 })
 
 minetest.register_craft({
-	output = "techpack_stairway:ladder1 2",
+	output = "techpack_stairway:ladder1 3",
 	recipe = {
 		{"", "default:steel_ingot", ""},
 		{"dye:dark_grey", "default:tin_ingot", "default:coal_lump"},
@@ -589,7 +609,7 @@ minetest.register_craft({
 })
 
 minetest.register_craft({
-	output = "techpack_stairway:ladder3 4",
+	output = "techpack_stairway:ladder3 6",
 	recipe = {
 		{"", "", "default:steel_ingot"},
 		{"dye:dark_grey", "default:tin_ingot", "default:coal_lump"},
@@ -598,7 +618,7 @@ minetest.register_craft({
 })
 
 minetest.register_craft({
-	output = "techpack_stairway:ladder4 8",
+	output = "techpack_stairway:ladder4 12",
 	recipe = {
 		{"dye:dark_grey", "default:tin_ingot", "default:coal_lump"},
 		{"", "default:steel_ingot", ""},
@@ -607,7 +627,7 @@ minetest.register_craft({
 })
 
 minetest.register_craft({
-	output = "techpack_stairway:lattice 2",
+	output = "techpack_stairway:lattice 4",
 	recipe = {
 		{"default:steel_ingot", "", "default:steel_ingot"},
 		{"dye:dark_grey", "default:tin_ingot", "default:coal_lump"},
diff --git a/techpack_stairway/readme.md b/techpack_stairway/readme.md
index 929bce9..e5cb43b 100644
--- a/techpack_stairway/readme.md
+++ b/techpack_stairway/readme.md
@@ -7,7 +7,7 @@ Ladders, stairways, and bridges for your machines
 
 
 ### License
-Copyright (C) 2018-2020 Joachim Stolberg  
+Copyright (C) 2018-2021 Joachim Stolberg
 Code: Licensed under the GNU LGPL version 2.1 or later. See LICENSE.txt  
 
 
@@ -19,3 +19,4 @@ none
 - 2020-04-26  v1.00  * extracted from TechPack and released
 - 2020-10-08  v1.01  * Lattice Slope node added 
 - 2020-10-10  v1.02  * German translation added 
+- 2021-03-20  v1.03  * Adapted for MT 5.4
diff --git a/towercrane/README.md b/towercrane/README.md
index 3a50dd9..a25e487 100644
--- a/towercrane/README.md
+++ b/towercrane/README.md
@@ -33,8 +33,9 @@ default
 # License
 Copyright (C) 2017-2020 Joachim Stolberg  
 Code: Licensed under the GNU LGPL version 2.1 or later. See LICENSE.txt and http://www.gnu.org/licenses/lgpl-2.1.txt  
-Textures: CC0 (by Ammoth)
+Textures: Mostly CC0 (by Ammoth)
 
+ * `morelights_extras_blocklight.png`: CC BY-SA 4.0 (by random-geek)
 
 # History:
 * 2017-06-04  v0.01  first version
diff --git a/towercrane/config.lua b/towercrane/config.lua
index 0ee5296..1c756f0 100644
--- a/towercrane/config.lua
+++ b/towercrane/config.lua
@@ -11,13 +11,13 @@
 
 
 -- Maximum crane height in blocks (8..n)
-towercrane.max_height = tonumber(minetest.setting_get("towercrane_max_height")) or 32
+towercrane.max_height = tonumber(minetest.settings:get("towercrane_max_height")) or 32
 
 -- Maximum crane width in blocks (8..n)
-towercrane.max_width = tonumber(minetest.setting_get("towercrane_max_width")) or 32
+towercrane.max_width = tonumber(minetest.settings:get("towercrane_max_width")) or 32
 
 -- Crane rope lenght in block (max_height .. max_height+x)
-towercrane.rope_length = tonumber(minetest.setting_get("towercrane_rope_length")) or 40
+towercrane.rope_length = tonumber(minetest.settings:get("towercrane_rope_length")) or 40
 
 -- Recipe available (true/false)
-towercrane.recipe = tonumber(minetest.setting_get("towercrane_recipe")) or true
+towercrane.recipe = tonumber(minetest.settings:get("towercrane_recipe")) or true
diff --git a/towercrane/init.lua b/towercrane/init.lua
index 6cc0ae6..71f20fb 100644
--- a/towercrane/init.lua
+++ b/towercrane/init.lua
@@ -9,7 +9,7 @@
 
 
 	   Nodes      Meta data
-	+--------+ 
+	+--------+
 	|        |  - last_known_pos as "(x,y,z)"
 	| switch |  - last_used
 	|        |  - running
@@ -26,7 +26,7 @@ local P2S = function(pos) if pos then return minetest.pos_to_string(pos) end end
 local S2P = minetest.string_to_pos
 
 -- crane minimum size
-local MIN_SIZE = 8		
+local MIN_SIZE = 8
 
 towercrane = {}
 
@@ -53,7 +53,7 @@ local function formspec(height, width)
 	return "size[5,4]"..
 		"label[0,0;"..S("Construction area size").."]" ..
 		"field[1,1.5;3,1;size;height,width;"..text.."]" ..
-		"button_exit[1,2;2,1;exit;"..S("Build").."]"	
+		"button_exit[1,2;2,1;exit;"..S("Build").."]"
 end
 
 local function get_node_lvm(pos)
@@ -154,7 +154,7 @@ end
 local function construct_crane(pos, dir, height, width)
 	local add = function(pos, node_name, tArg)
 		minetest.add_node(pos, {
-				name = node_name, 
+				name = node_name,
 				param2 = minetest.dir_to_facedir(tArg.dir)})
 	end
 	local tArg = {dir = dir}
@@ -292,7 +292,7 @@ minetest.register_node("towercrane:base", {
 		return true
 	end,
 
-	-- evaluate user input (height, width), 
+	-- evaluate user input (height, width),
 	-- destroy old crane and build a new one with
 	-- the given size
 	on_receive_fields = function(pos, formname, fields, player)
@@ -324,7 +324,7 @@ minetest.register_node("towercrane:base", {
 		end
 		return true
 	end,
-	
+
 	on_destruct = function(pos)
 		towercrane.get_crane_down(pos)
 	end,
@@ -333,10 +333,11 @@ minetest.register_node("towercrane:base", {
 minetest.register_node("towercrane:balance", {
 	description = S("Tower Crane Balance"),
 	tiles = {
-		"towercrane_base.png^towercrane_screws.png",
+		"towercrane_base.png^towercrane_screws.png^morelights_extras_blocklight.png",
 	},
 	paramtype = "light",
 	paramtype2 = "facedir",
+	light_source = 12,
 	sunlight_propagates = true,
 	is_ground_content = false,
 	groups = {crumbly=0, not_in_creative_inventory=1},
@@ -411,4 +412,3 @@ towercrane.turnright = turnright
 towercrane.turnleft = turnleft
 towercrane.is_my_crane = is_my_crane
 towercrane.get_crane_data = get_crane_data
-
diff --git a/towercrane/textures/morelights_extras_blocklight.png b/towercrane/textures/morelights_extras_blocklight.png
new file mode 100644
index 0000000..953c2a9
Binary files /dev/null and b/towercrane/textures/morelights_extras_blocklight.png differ
diff --git a/unified_inventory/.luacheckrc b/unified_inventory/.luacheckrc
index 9fb6a7c..e6fec97 100644
--- a/unified_inventory/.luacheckrc
+++ b/unified_inventory/.luacheckrc
@@ -14,6 +14,7 @@ read_globals = {
 	"ItemStack", "datastorage",
 
 	"hb",
+	"doors",
 }
 
 files["callbacks.lua"].ignore = { "player", "draw_lite_mode" }
diff --git a/unified_inventory/README.md b/unified_inventory/README.md
index 8c917ec..d159c02 100644
--- a/unified_inventory/README.md
+++ b/unified_inventory/README.md
@@ -24,7 +24,7 @@ Unified Inventory replaces the default survival and creative inventory.
 
 ## Requirements
 
- * Minetest 5.0.0+
+ * Minetest 5.4.0+
 
 # Licenses
 
@@ -96,4 +96,4 @@ Other files from Wikimedia Commons:
 
 RealBadAngel: (CC-BY-4.0)
 
-  * Everything else.
\ No newline at end of file
+  * Everything else.
diff --git a/unified_inventory/api.lua b/unified_inventory/api.lua
index 81dd8f3..22788ae 100644
--- a/unified_inventory/api.lua
+++ b/unified_inventory/api.lua
@@ -1,5 +1,6 @@
 local S = minetest.get_translator("unified_inventory")
 local F = minetest.formspec_escape
+local ui = unified_inventory
 
 -- Create detached creative inventory after loading all mods
 minetest.after(0.01, function()
@@ -8,12 +9,12 @@ minetest.after(0.01, function()
 		if not rev_aliases[target] then rev_aliases[target] = {} end
 		table.insert(rev_aliases[target], source)
 	end
-	unified_inventory.items_list = {}
+	ui.items_list = {}
 	for name, def in pairs(minetest.registered_items) do
 		if (not def.groups.not_in_creative_inventory or
 		   def.groups.not_in_creative_inventory == 0) and
 		   def.description and def.description ~= "" then
-			table.insert(unified_inventory.items_list, name)
+			table.insert(ui.items_list, name)
 			local all_names = rev_aliases[name] or {}
 			table.insert(all_names, name)
 			for _, player_name in ipairs(all_names) do
@@ -26,30 +27,30 @@ minetest.after(0.01, function()
 						for _,chk in pairs(recipe.items) do
 							local groupchk = string.find(chk, "group:")
 							if (not groupchk and not minetest.registered_items[chk])
-							  or (groupchk and not unified_inventory.get_group_item(string.gsub(chk, "group:", "")).item)
+							  or (groupchk and not ui.get_group_item(string.gsub(chk, "group:", "")).item)
 							  or minetest.get_item_group(chk, "not_in_craft_guide") ~= 0 then
 								unknowns = true
 							end
 						end
 
 						if not unknowns then
-							unified_inventory.register_craft(recipe)
+							ui.register_craft(recipe)
 						end
 					end
 				end
 			end
 		end
 	end
-	table.sort(unified_inventory.items_list)
-	unified_inventory.items_list_size = #unified_inventory.items_list
-	print("Unified Inventory. inventory size: "..unified_inventory.items_list_size)
-	for _, name in ipairs(unified_inventory.items_list) do
+	table.sort(ui.items_list)
+	ui.items_list_size = #ui.items_list
+	print("Unified Inventory. inventory size: "..ui.items_list_size)
+	for _, name in ipairs(ui.items_list) do
 		local def = minetest.registered_items[name]
 		-- Simple drops
 		if type(def.drop) == "string" then
 			local dstack = ItemStack(def.drop)
 			if not dstack:is_empty() and dstack:get_name() ~= name then
-				unified_inventory.register_craft({
+				ui.register_craft({
 					type = "digging",
 					items = {name},
 					output = def.drop,
@@ -115,7 +116,7 @@ minetest.after(0.01, function()
 				end
 			end
 			for itemstring, count in pairs(drop_guaranteed) do
-				unified_inventory.register_craft({
+				ui.register_craft({
 					type = "digging",
 					items = {name},
 					output = itemstring .. " " .. count,
@@ -123,7 +124,7 @@ minetest.after(0.01, function()
 				})
 			end
 			for itemstring, count in pairs(drop_maybe) do
-				unified_inventory.register_craft({
+				ui.register_craft({
 					type = "digging_chance",
 					items = {name},
 					output = itemstring .. " " .. count,
@@ -132,22 +133,22 @@ minetest.after(0.01, function()
 			end
 		end
 	end
-	for _, recipes in pairs(unified_inventory.crafts_for.recipe) do
+	for _, recipes in pairs(ui.crafts_for.recipe) do
 		for _, recipe in ipairs(recipes) do
 			local ingredient_items = {}
 			for _, spec in pairs(recipe.items) do
-				local matches_spec = unified_inventory.canonical_item_spec_matcher(spec)
-				for _, name in ipairs(unified_inventory.items_list) do
+				local matches_spec = ui.canonical_item_spec_matcher(spec)
+				for _, name in ipairs(ui.items_list) do
 					if matches_spec(name) then
 						ingredient_items[name] = true
 					end
 				end
 			end
 			for name, _ in pairs(ingredient_items) do
-				if unified_inventory.crafts_for.usage[name] == nil then
-					unified_inventory.crafts_for.usage[name] = {}
+				if ui.crafts_for.usage[name] == nil then
+					ui.crafts_for.usage[name] = {}
 				end
-				table.insert(unified_inventory.crafts_for.usage[name], recipe)
+				table.insert(ui.crafts_for.usage[name], recipe)
 			end
 		end
 	end
@@ -156,9 +157,9 @@ end)
 
 -- load_home
 local function load_home()
-	local input = io.open(unified_inventory.home_filename, "r")
+	local input = io.open(ui.home_filename, "r")
 	if not input then
-		unified_inventory.home_pos = {}
+		ui.home_pos = {}
 		return
 	end
 	while true do
@@ -167,25 +168,31 @@ local function load_home()
 		local y = input:read("*n")
 		local z = input:read("*n")
 		local name = input:read("*l")
-		unified_inventory.home_pos[name:sub(2)] = {x = x, y = y, z = z}
+		ui.home_pos[name:sub(2)] = {x = x, y = y, z = z}
 	end
 	io.close(input)
 end
 load_home()
 
-function unified_inventory.set_home(player, pos)
+function ui.set_home(player, pos)
 	local player_name = player:get_player_name()
-	unified_inventory.home_pos[player_name] = vector.round(pos)
+	ui.home_pos[player_name] = vector.round(pos)
+
 	-- save the home data from the table to the file
-	local output = io.open(unified_inventory.home_filename, "w")
-	for k, v in pairs(unified_inventory.home_pos) do
+	local output = io.open(ui.home_filename, "w")
+	if not output then
+		minetest.log("warning", "[unified_inventory] Failed to save file: "
+			.. ui.home_filename)
+		return
+	end
+	for k, v in pairs(ui.home_pos) do
 		output:write(v.x.." "..v.y.." "..v.z.." "..k.."\n")
 	end
 	io.close(output)
 end
 
-function unified_inventory.go_home(player)
-	local pos = unified_inventory.home_pos[player:get_player_name()]
+function ui.go_home(player)
+	local pos = ui.home_pos[player:get_player_name()]
 	if pos then
 		player:set_pos(pos)
 		return true
@@ -194,7 +201,7 @@ function unified_inventory.go_home(player)
 end
 
 -- register_craft
-function unified_inventory.register_craft(options)
+function ui.register_craft(options)
 	if not options.output then
 		return
 	end
@@ -205,10 +212,10 @@ function unified_inventory.register_craft(options)
 	if options.type == "normal" and options.width == 0 then
 		options = { type = "shapeless", items = options.items, output = options.output, width = 0 }
 	end
-	if not unified_inventory.crafts_for.recipe[itemstack:get_name()] then
-		unified_inventory.crafts_for.recipe[itemstack:get_name()] = {}
+	if not ui.crafts_for.recipe[itemstack:get_name()] then
+		ui.crafts_for.recipe[itemstack:get_name()] = {}
 	end
-	table.insert(unified_inventory.crafts_for.recipe[itemstack:get_name()],options)
+	table.insert(ui.crafts_for.recipe[itemstack:get_name()],options)
 end
 
 
@@ -219,7 +226,7 @@ local craft_type_defaults = {
 }
 
 
-function unified_inventory.craft_type_defaults(name, options)
+function ui.craft_type_defaults(name, options)
 	if not options.description then
 		options.description = name
 	end
@@ -228,13 +235,13 @@ function unified_inventory.craft_type_defaults(name, options)
 end
 
 
-function unified_inventory.register_craft_type(name, options)
-	unified_inventory.registered_craft_types[name] =
-			unified_inventory.craft_type_defaults(name, options)
+function ui.register_craft_type(name, options)
+	ui.registered_craft_types[name] =
+			ui.craft_type_defaults(name, options)
 end
 
 
-unified_inventory.register_craft_type("normal", {
+ui.register_craft_type("normal", {
 	description = F(S("Crafting")),
 	icon = "ui_craftgrid_icon.png",
 	width = 3,
@@ -250,7 +257,7 @@ unified_inventory.register_craft_type("normal", {
 })
 
 
-unified_inventory.register_craft_type("shapeless", {
+ui.register_craft_type("shapeless", {
 	description = F(S("Mixing")),
 	icon = "ui_craftgrid_icon.png",
 	width = 3,
@@ -265,7 +272,7 @@ unified_inventory.register_craft_type("shapeless", {
 })
 
 
-unified_inventory.register_craft_type("cooking", {
+ui.register_craft_type("cooking", {
 	description = F(S("Cooking")),
 	icon = "default_furnace_front.png",
 	width = 1,
@@ -273,37 +280,60 @@ unified_inventory.register_craft_type("cooking", {
 })
 
 
-unified_inventory.register_craft_type("digging", {
+ui.register_craft_type("digging", {
 	description = F(S("Digging")),
 	icon = "default_tool_steelpick.png",
 	width = 1,
 	height = 1,
 })
 
-unified_inventory.register_craft_type("digging_chance", {
+ui.register_craft_type("digging_chance", {
 	description = "Digging (by chance)",
 	icon = "default_tool_steelpick.png^[transformFY.png",
 	width = 1,
 	height = 1,
 })
 
-function unified_inventory.register_page(name, def)
-	unified_inventory.pages[name] = def
+function ui.register_page(name, def)
+	ui.pages[name] = def
 end
 
 
-function unified_inventory.register_button(name, def)
+function ui.register_button(name, def)
 	if not def.action then
 		def.action = function(player)
-			unified_inventory.set_inventory_formspec(player, name)
+			ui.set_inventory_formspec(player, name)
 		end
 	end
 	def.name = name
-	table.insert(unified_inventory.buttons, def)
+	table.insert(ui.buttons, def)
 end
 
-
-function unified_inventory.is_creative(playername)
+function ui.is_creative(playername)
 	return minetest.check_player_privs(playername, {creative=true})
 		or minetest.settings:get_bool("creative_mode")
 end
+
+function ui.single_slot(xpos, ypos, bright)
+	return string.format("background9[%f,%f;%f,%f;ui_single_slot%s.png;false;16]",
+	xpos, ypos, ui.imgscale, ui.imgscale, (bright and "_bright" or "") )
+end
+
+function ui.make_trash_slot(xpos, ypos)
+	return
+		ui.single_slot(xpos, ypos)..
+		"image["..xpos..","..ypos..";1.25,1.25;ui_trash_slot_icon.png]"..
+		"list[detached:trash;main;"..(xpos + ui.list_img_offset)..","..(ypos + ui.list_img_offset)..";1,1;]"
+end
+
+function ui.make_inv_img_grid(xpos, ypos, width, height, bright)
+	local tiled = {}
+	local n=1
+	for y = 0, (height - 1) do
+		for x = 0, (width -1) do
+			tiled[n] = ui.single_slot(xpos + (ui.imgscale * x), ypos + (ui.imgscale * y), bright)
+			n = n + 1
+		end
+	end
+	return table.concat(tiled)
+end
diff --git a/unified_inventory/bags.lua b/unified_inventory/bags.lua
index c61c982..14ac875 100644
--- a/unified_inventory/bags.lua
+++ b/unified_inventory/bags.lua
@@ -7,27 +7,32 @@ License: GPLv3
 
 local S = minetest.get_translator("unified_inventory")
 local F = minetest.formspec_escape
+local ui = unified_inventory
 
-unified_inventory.register_page("bags", {
+ui.register_page("bags", {
 	get_formspec = function(player)
 		local player_name = player:get_player_name()
 		return { formspec = table.concat({
-			"background[0.06,0.99;7.92,7.52;ui_bags_main_form.png]",
-			"label[0,0;" .. F(S("Bags")) .. "]",
-			"button[0,2;2,0.5;bag1;" .. F(S("Bag @1", 1)) .. "]",
-			"button[2,2;2,0.5;bag2;" .. F(S("Bag @1", 2)) .. "]",
-			"button[4,2;2,0.5;bag3;" .. F(S("Bag @1", 3)) .. "]",
-			"button[6,2;2,0.5;bag4;" .. F(S("Bag @1", 4)) .. "]",
+			ui.style_full.standard_inv_bg,
+			ui.single_slot(0.925, 1.5),
+			ui.single_slot(3.425, 1.5),
+			ui.single_slot(5.925, 1.5),
+			ui.single_slot(8.425, 1.5),
+			"label["..ui.style_full.form_header_x..","..ui.style_full.form_header_y..";" .. F(S("Bags")) .. "]",
+			"button[0.6125,2.75;1.875,0.75;bag1;" .. F(S("Bag @1", 1)) .. "]",
+			"button[3.1125,2.75;1.875,0.75;bag2;" .. F(S("Bag @1", 2)) .. "]",
+			"button[5.6125,2.75;1.875,0.75;bag3;" .. F(S("Bag @1", 3)) .. "]",
+			"button[8.1125,2.75;1.875,0.75;bag4;" .. F(S("Bag @1", 4)) .. "]",
 			"listcolors[#00000000;#00000000]",
-			"list[detached:" .. F(player_name) .. "_bags;bag1;0.5,1;1,1;]",
-			"list[detached:" .. F(player_name) .. "_bags;bag2;2.5,1;1,1;]",
-			"list[detached:" .. F(player_name) .. "_bags;bag3;4.5,1;1,1;]",
-			"list[detached:" .. F(player_name) .. "_bags;bag4;6.5,1;1,1;]"
+			"list[detached:" .. F(player_name) .. "_bags;bag1;1.075,1.65;1,1;]",
+			"list[detached:" .. F(player_name) .. "_bags;bag2;3.575,1.65;1,1;]",
+			"list[detached:" .. F(player_name) .. "_bags;bag3;6.075,1.65;1,1;]",
+			"list[detached:" .. F(player_name) .. "_bags;bag4;8.575,1.65;1,1;]"
 		}) }
 	end,
 })
 
-unified_inventory.register_button("bags", {
+ui.register_button("bags", {
 	type = "image",
 	image = "ui_bags_icon.png",
 	tooltip = S("Bags"),
@@ -42,32 +47,31 @@ local function get_player_bag_stack(player, i)
 end
 
 for bag_i = 1, 4 do
-	unified_inventory.register_page("bag" .. bag_i, {
+	ui.register_page("bag" .. bag_i, {
 		get_formspec = function(player)
 			local stack = get_player_bag_stack(player, bag_i)
 			local image = stack:get_definition().inventory_image
-			local fs = {
-				"image[7,0;1,1;" .. image .. "]",
-				"label[0,0;" .. F(S("Bag @1", bag_i)) .. "]",
-				"listcolors[#00000000;#00000000]",
-				"list[current_player;bag" .. bag_i .. "contents;0,1;8,3;]",
-				"listring[current_name;bag" .. bag_i .. "contents]",
-				"listring[current_player;main]"
-			}
 			local slots = stack:get_definition().groups.bagslots
-			if slots == 8 then
-					fs[#fs + 1] = "background[0.06,0.99;7.92,7.52;ui_bags_sm_form.png]"
-			elseif slots == 16 then
-					fs[#fs + 1] = "background[0.06,0.99;7.92,7.52;ui_bags_med_form.png]"
-			elseif slots == 24 then
-					fs[#fs + 1] = "background[0.06,0.99;7.92,7.52;ui_bags_lg_form.png]"
-			end
+
+			local formspec = {
+				ui.style_full.standard_inv_bg,
+				ui.make_inv_img_grid(0.3, 1.5, 8, slots/8),
+				"image[9.2,0.4;1,1;" .. image .. "]",
+				"label[0.3,0.65;" .. F(S("Bag @1", bag_i)) .. "]",
+				"listcolors[#00000000;#00000000]",
+				"listring[current_player;main]",
+				string.format("list[current_player;bag%icontents;%f,%f;8,3;]",
+				    bag_i, 0.3 + ui.list_img_offset, 1.5 + ui.list_img_offset),
+				"listring[current_name;bag" .. bag_i .. "contents]",
+			}
+			local n = #formspec + 1
+
 			local player_name = player:get_player_name() -- For if statement.
-			if unified_inventory.trash_enabled
-					or unified_inventory.is_creative(player_name)
-					or minetest.get_player_privs(player_name).give then
-				fs[#fs + 1] = "background[6.06,0;0.92,0.92;ui_bags_trash.png]"
-						.. "list[detached:trash;main;6,0.1;1,1;]"
+			if ui.trash_enabled
+				or ui.is_creative(player_name)
+				or minetest.get_player_privs(player_name).give then
+					formspec[n] = ui.make_trash_slot(7.8, 0.25)
+					n = n + 1
 			end
 			local inv = player:get_inventory()
 			for i = 1, 4 do
@@ -84,11 +88,12 @@ for bag_i = 1, 4 do
 					end
 					local img = def.inventory_image
 					local label = F(S("Bag @1", i)) .. "\n" .. used .. "/" .. size
-					fs[#fs + 1] = string.format("image_button[%i,0;1,1;%s;bag%i;%s]",
-							i + 1, img, i, label)
+					formspec[n] = string.format("image_button[%f,0.4;1,1;%s;bag%i;%s]",
+							(i + 1.35)*1.25, img, i, label)
+					n = n + 1
 				end
 			end
-			return { formspec = table.concat(fs) }
+			return { formspec = table.concat(formspec) }
 		end,
 	})
 end
@@ -103,7 +108,7 @@ minetest.register_on_player_receive_fields(function(player, formname, fields)
 			if not stack:get_definition().groups.bagslots then
 				return
 			end
-			unified_inventory.set_inventory_formspec(player, "bag" .. i)
+			ui.set_inventory_formspec(player, "bag" .. i)
 			return
 		end
 	end
@@ -132,7 +137,7 @@ end
 local function load_bags_metadata(player, bags_inv)
 	local player_inv = player:get_inventory()
 	local meta = player:get_meta()
-	local bags_meta = meta:get_string("unified_inventory:bags")
+	local bags_meta = meta:get("unified_inventory:bags")
 	local bags = bags_meta and minetest.deserialize(bags_meta) or {}
 	local dirty_meta = false
 	if not bags_meta then
diff --git a/unified_inventory/callbacks.lua b/unified_inventory/callbacks.lua
index bc90237..1f43e39 100644
--- a/unified_inventory/callbacks.lua
+++ b/unified_inventory/callbacks.lua
@@ -19,6 +19,8 @@ minetest.register_on_joinplayer(function(player)
 	unified_inventory.active_search_direction[player_name] = "nochange"
 	unified_inventory.apply_filter(player, "", "nochange")
 	unified_inventory.current_searchbox[player_name] = ""
+	unified_inventory.current_category[player_name] = "all"
+	unified_inventory.current_category_scroll[player_name] = 0
 	unified_inventory.alternate[player_name] = 1
 	unified_inventory.current_item[player_name] = nil
 	unified_inventory.current_craft_direction[player_name] = "recipe"
@@ -69,6 +71,41 @@ minetest.register_on_player_receive_fields(function(player, formname, fields)
 		unified_inventory.current_searchbox[player_name] = fields.searchbox
 	end
 
+
+	local clicked_category
+	for name, value in pairs(fields) do
+		local category_name = string.match(name, "^category_(.+)$")
+		if category_name then
+			clicked_category = category_name
+			break
+		end
+	end
+
+	if clicked_category
+	and clicked_category ~= unified_inventory.current_category[player_name] then
+		unified_inventory.current_category[player_name] = clicked_category
+		unified_inventory.apply_filter(player, unified_inventory.current_searchbox[player_name], "nochange")
+		unified_inventory.set_inventory_formspec(player,
+				unified_inventory.current_page[player_name])
+	end
+
+	if fields.next_category then
+		local scroll = math.min(#unified_inventory.category_list-ui_peruser.pagecols, unified_inventory.current_category_scroll[player_name] + 1)
+		if scroll ~= unified_inventory.current_category_scroll[player_name] then
+			unified_inventory.current_category_scroll[player_name] = scroll
+			unified_inventory.set_inventory_formspec(player,
+					unified_inventory.current_page[player_name])
+		end
+	end
+	if fields.prev_category then
+		local scroll = math.max(0, unified_inventory.current_category_scroll[player_name] - 1)
+		if scroll ~= unified_inventory.current_category_scroll[player_name] then
+			unified_inventory.current_category_scroll[player_name] = scroll
+			unified_inventory.set_inventory_formspec(player,
+					unified_inventory.current_page[player_name])
+		end
+	end
+
 	for i, def in pairs(unified_inventory.buttons) do
 		if fields[def.name] then
 			def.action(player)
@@ -126,6 +163,7 @@ minetest.register_on_player_receive_fields(function(player, formname, fields)
 			clicked_item = unified_inventory.demangle_for_formspec(mangled_item)
 			if string.sub(clicked_item, 1, 6) == "group:" then
 				-- Change search filter to this group
+				unified_inventory.current_category[player_name] = "all"
 				apply_new_filter(player, clicked_item, new_dir)
 				return
 			end
diff --git a/unified_inventory/category.lua b/unified_inventory/category.lua
new file mode 100644
index 0000000..72e4038
--- /dev/null
+++ b/unified_inventory/category.lua
@@ -0,0 +1,149 @@
+local S = minetest.get_translator("unified_inventory")
+
+unified_inventory.registered_categories = {}
+unified_inventory.registered_category_items = {}
+unified_inventory.category_list = {}
+
+local function char_to_sort_index(char_code)
+	if char_code <= 32 then
+		-- Command codes, no thanks
+		return 0
+	end
+	if char_code <= 64 then
+		-- Sorts numbers, and some punctuation, after letters
+		return char_code
+	end
+	if char_code >= 158 then
+		-- Out of sortable range
+		return 0
+	end
+	if char_code > 122 then
+		-- Avoids overlap with {, |, } and ~
+		return char_code - 58
+	end
+	if char_code > 96 then
+		-- Normalises lowercase with uppercase
+		return char_code - 96
+	end
+	return char_code - 64
+end
+
+local function string_to_sort_index(str)
+	local max_chars = 5
+	local power = 100
+	local index = 0
+	for i=1,math.min(#str, max_chars) do
+		index = index + (char_to_sort_index(string.byte(str, i))/(power^i))
+	end
+	return index
+end
+
+function update_category_list()
+	local category_list = {}
+	table.insert(category_list, {
+		name = "all",
+		label = S("All Items"),
+		symbol = "ui_category_all.png",
+		index = -2,
+	})
+	table.insert(category_list, {
+		name = "uncategorized",
+		label = S("Misc. Items"),
+		symbol = "ui_category_none.png",
+		index = -1,
+	})
+	for category, def in pairs(unified_inventory.registered_categories) do
+		table.insert(category_list, {
+			name = category,
+			label = def.label or category,
+			symbol = def.symbol,
+			index = def.index or                    -- sortby defined order
+					string_to_sort_index(category)  -- or do a rudimentary alphabetical sort
+		})
+	end
+	table.sort(category_list, function (a,b)
+		return a.index < b.index
+	end)
+	unified_inventory.category_list = category_list
+end
+
+local function ensure_category_exists(category_name)
+	if not unified_inventory.registered_categories[category_name] then
+		unified_inventory.registered_categories[category_name] = {
+			symbol = "default:stick",
+			label = category_name
+		}
+	end
+	if not unified_inventory.registered_category_items[category_name] then
+		unified_inventory.registered_category_items[category_name] = {}
+	end
+end
+
+function unified_inventory.register_category(category_name, config)
+	ensure_category_exists(category_name)
+	if config and config.symbol then
+		unified_inventory.set_category_symbol(category_name, config.symbol)
+	end
+	if config and config.label then
+		unified_inventory.set_category_label(category_name, config.label)
+	end
+	if config and config.index then
+		unified_inventory.set_category_index(category_name, config.index)
+	end
+	if config and config.items then
+		unified_inventory.add_category_items(category_name, config.items)
+	end
+	update_category_list()
+end
+function unified_inventory.set_category_symbol(category_name, symbol)
+	ensure_category_exists(category_name)
+	unified_inventory.registered_categories[category_name].symbol = symbol
+	update_category_list()
+end
+function unified_inventory.set_category_label(category_name, label)
+	ensure_category_exists(category_name)
+	unified_inventory.registered_categories[category_name].label = label
+	update_category_list()
+end
+function unified_inventory.set_category_index(category_name, index)
+	ensure_category_exists(category_name)
+	unified_inventory.registered_categories[category_name].index = index
+	update_category_list()
+end
+function unified_inventory.add_category_item(category_name, item)
+	ensure_category_exists(category_name)
+	unified_inventory.registered_category_items[category_name][item] = true
+end
+function unified_inventory.add_category_items(category_name, items)
+	for _,item in ipairs(items) do
+		unified_inventory.add_category_item(category_name, item)
+	end
+end
+
+function unified_inventory.remove_category_item(category_name, item)
+	unified_inventory.registered_category_items[category_name][item] = nil
+end
+function unified_inventory.remove_category(category_name)
+	unified_inventory.registered_categories[category_name] = nil
+	unified_inventory.registered_category_items[category_name] = nil
+	update_category_list()
+end
+
+function unified_inventory.find_category(item)
+	-- Returns the first category the item exists in
+	-- Best for checking if an item has any category at all
+	for category, items in pairs(unified_inventory.registered_category_items) do
+		if items[item] then return category end
+	end
+end
+function unified_inventory.find_categories(item)
+	-- Returns all the categories the item exists in
+	-- Best for listing all categories
+	local categories = {}
+	for category, items in pairs(unified_inventory.registered_category_items) do
+		if items[item] then
+			table.insert(categories, category)
+		end
+	end
+	return categories
+end
diff --git a/unified_inventory/default-categories.lua b/unified_inventory/default-categories.lua
new file mode 100644
index 0000000..57d3e88
--- /dev/null
+++ b/unified_inventory/default-categories.lua
@@ -0,0 +1,704 @@
+local S = minetest.get_translator("unified_inventory")
+
+unified_inventory.register_category('plants', {
+	symbol = "flowers:tulip",
+	label = S("Plant Life")
+})
+unified_inventory.register_category('building', {
+	symbol = "default:brick",
+	label = S("Building Materials")
+})
+unified_inventory.register_category('tools', {
+	symbol = "default:pick_diamond",
+	label = S("Tools")
+})
+unified_inventory.register_category('minerals', {
+	symbol = "default:iron_lump",
+	label = S("Minerals and Metals")
+})
+unified_inventory.register_category('environment', {
+	symbol = "default:dirt_with_grass",
+	label = S("Environment and Worldgen")
+})
+unified_inventory.register_category('lighting', {
+	symbol = "default:torch",
+	label = S("Lighting")
+})
+
+
+if unified_inventory.automatic_categorization then
+	minetest.register_on_mods_loaded(function()
+
+		-- Add biome nodes to environment category
+		for _,def in pairs(minetest.registered_biomes) do
+			local env_nodes = {
+				def.node_riverbed, def.node_top, def.node_filler, def.node_dust,
+			}
+			for i,node in pairs(env_nodes) do
+				if node then
+					unified_inventory.add_category_item('environment', node)
+				end
+			end
+		end
+
+		-- Add minable ores to minerals and everything else (pockets of stone & sand variations) to environment
+		for _,item in  pairs(minetest.registered_ores) do
+			if item.ore_type == "scatter" then
+				local drop = minetest.registered_nodes[item.ore].drop
+				if drop and drop ~= "" then
+					unified_inventory.add_category_item('minerals', item.ore)
+					unified_inventory.add_category_item('minerals', drop)
+				else
+					unified_inventory.add_category_item('environment', item.ore)
+				end
+			else
+				unified_inventory.add_category_item('environment', item.ore)
+			end
+		end
+
+		-- Add items by item definition
+		for name, def in pairs(minetest.registered_items) do
+			local group = def.groups or {}
+			if not group.not_in_creative_inventory then
+				if group.stair or
+				   group.slab or
+				   group.wall or
+				   group.fence then
+					unified_inventory.add_category_item('building', name)
+				elseif group.flora or
+					   group.flower or
+					   group.seed or
+					   group.leaves or
+					   group.sapling or
+					   group.tree then
+					unified_inventory.add_category_item('plants', name)
+				elseif def.type == 'tool' then
+					unified_inventory.add_category_item('tools', name)
+				elseif def.liquidtype == 'source' then
+					unified_inventory.add_category_item('environment', name)
+				elseif def.light_source and def.light_source > 0 then
+					unified_inventory.add_category_item('lighting', name)
+				elseif group.door or
+					   minetest.global_exists("doors") and (
+					     doors.registered_doors and doors.registered_doors[name..'_a'] or
+					     doors.registered_trapdoors and doors.registered_trapdoors[name]
+					   ) then
+					unified_inventory.add_category_item('building', name)
+				end
+			end
+		end
+	end)
+end
+
+-- [[
+unified_inventory.add_category_items('plants', {
+	"default:dry_grass_5",
+	"default:acacia_sapling",
+	"default:blueberry_bush_sapling",
+	"default:grass_2",
+	"default:pine_bush_stem",
+	"default:leaves",
+	"default:pine_needles",
+	"default:cactus",
+	"default:junglegrass",
+	"default:pine_sapling",
+	"default:sapling",
+	"default:bush_stem",
+	"default:dry_grass_2",
+	"default:fern_1",
+	"default:grass_3",
+	"default:marram_grass_1",
+	"default:pine_tree",
+	"default:dry_grass_3",
+	"default:dry_shrub",
+	"default:grass_4",
+	"default:marram_grass_2",
+	"default:jungleleaves",
+	"default:apple",
+	"default:tree",
+	"default:aspen_tree",
+	"default:bush_sapling",
+	"default:grass_5",
+	"default:blueberry_bush_leaves_with_berries",
+	"default:acacia_bush_sapling",
+	"default:grass_1",
+	"default:aspen_leaves",
+	"default:marram_grass_3",
+	"default:large_cactus_seedling",
+	"default:junglesapling",
+	"default:dry_grass_4",
+	"default:acacia_bush_stem",
+	"default:papyrus",
+	"default:pine_bush_needles",
+	"default:bush_leaves",
+	"default:fern_3",
+	"default:aspen_sapling",
+	"default:acacia_tree",
+	"default:apple_mark",
+	"default:acacia_leaves",
+	"default:jungletree",
+	"default:dry_grass_1",
+	"default:acacia_bush_leaves",
+	"default:emergent_jungle_sapling",
+	"default:fern_2",
+	"default:blueberries",
+	"default:sand_with_kelp",
+	"default:blueberry_bush_leaves",
+	"default:pine_bush_sapling",
+
+	"farming:cotton",
+	"farming:cotton_1",
+	"farming:cotton_2",
+	"farming:cotton_3",
+	"farming:cotton_4",
+	"farming:cotton_5",
+	"farming:cotton_6",
+	"farming:cotton_7",
+	"farming:cotton_8",
+	"farming:cotton_wild",
+	"farming:seed_cotton",
+	"farming:seed_wheat",
+	"farming:straw",
+	"farming:wheat",
+	"farming:wheat_1",
+	"farming:wheat_2",
+	"farming:wheat_3",
+	"farming:wheat_4",
+	"farming:wheat_5",
+	"farming:wheat_6",
+	"farming:wheat_7",
+	"farming:wheat_8",
+
+	"flowers:chrysanthemum_green",
+	"flowers:dandelion_white",
+	"flowers:dandelion_yellow",
+	"flowers:geranium",
+	"flowers:mushroom_brown",
+	"flowers:mushroom_red",
+	"flowers:rose",
+	"flowers:tulip",
+	"flowers:tulip_black",
+	"flowers:viola",
+	"flowers:waterlily",
+	"flowers:waterlily_waving",
+})
+
+unified_inventory.add_category_items('tools', {
+	"default:sword_diamond",
+	"default:axe_diamond",
+	"default:shovel_diamond",
+	"default:axe_steel",
+	"default:shovel_mese",
+	"default:sword_wood",
+	"default:pick_bronze",
+	"default:axe_stone",
+	"default:sword_stone",
+	"default:pick_stone",
+	"default:shovel_stone",
+	"default:sword_mese",
+	"default:shovel_bronze",
+	"default:sword_bronze",
+	"default:axe_bronze",
+	"default:shovel_steel",
+	"default:sword_steel",
+	"default:axe_mese",
+	"default:shovel_wood",
+	"default:pick_mese",
+	"default:axe_wood",
+	"default:pick_diamond",
+	"default:pick_wood",
+	"default:pick_steel",
+
+	"farming:hoe_bronze",
+	"farming:hoe_diamond",
+	"farming:hoe_mese",
+	"farming:hoe_steel",
+	"farming:hoe_stone",
+	"farming:hoe_wood",
+
+	"fire:flint_and_steel",
+	"map:mapping_kit",
+	"screwdriver:screwdriver",
+
+	"fireflies:bug_net",
+	"bucket:bucket_empty",
+
+	"binoculars:binoculars",
+	"default:skeleton_key",
+})
+
+unified_inventory.add_category_items('minerals', {
+	"default:stone_with_copper",
+	"default:stone_with_gold",
+	"default:stone_with_iron",
+	"default:copper_ingot",
+	"default:copper_lump",
+	"default:gold_lump",
+	"default:diamondblock",
+	"default:stone_with_diamond",
+	"default:stone_with_mese",
+	"default:steel_ingot",
+	"default:gold_ingot",
+	"default:iron_lump",
+	"default:tinblock",
+	"default:tin_lump",
+	"default:stone_with_tin",
+	"default:mese_crystal",
+	"default:diamond",
+	"default:bronze_ingot",
+	"default:mese",
+	"default:mese_crystal_fragment",
+	"default:copperblock",
+	"default:stone_with_coal",
+	"default:steelblock",
+	"default:tin_ingot",
+	"default:coalblock",
+	"default:coal_lump",
+	"default:bronzeblock",
+	"default:goldblock",
+
+	"stairs:slab_bronzeblock",
+	"stairs:slab_copperblock",
+	"stairs:slab_steelblock",
+	"stairs:slab_tinblock",
+	"stairs:stair_bronzeblock",
+	"stairs:stair_copperblock",
+	"stairs:stair_inner_bronzeblock",
+	"stairs:stair_inner_copperblock",
+	"stairs:stair_inner_steelblock",
+	"stairs:stair_inner_tinblock",
+	"stairs:stair_outer_bronzeblock",
+	"stairs:stair_outer_copperblock",
+	"stairs:stair_outer_steelblock",
+	"stairs:stair_outer_tinblock",
+	"stairs:stair_steelblock",
+	"stairs:stair_tinblock",
+})
+
+unified_inventory.add_category_items('building', {
+	"default:fence_rail_aspen_wood",
+	"default:fence_rail_acacia_wood",
+	"default:fence_junglewood",
+	"default:fence_rail_junglewood",
+	"default:fence_aspen_wood",
+	"default:fence_pine_wood",
+	"default:fence_rail_wood",
+	"default:fence_rail_pine_wood",
+	"default:fence_acacia_wood",
+	"default:junglewood",
+	"default:acacia_wood",
+	"default:aspen_wood",
+	"default:fence_wood",
+	"default:pine_wood",
+	"default:silver_sandstone",
+	"default:desert_sandstone",
+	"default:sandstone_block",
+	"default:desert_sandstone_brick",
+	"default:stone_block",
+	"default:stonebrick",
+	"default:obsidian_glass",
+	"default:desert_sandstone_block",
+	"default:silver_sandstone_brick",
+	"default:brick",
+	"default:obsidianbrick",
+	"default:sandstonebrick",
+	"default:sandstone",
+	"default:desert_stone_block",
+	"default:silver_sandstone_block",
+	"default:wood",
+	"default:obsidian_block",
+	"default:glass",
+	"default:clay_brick",
+	"default:desert_stonebrick",
+	"default:desert_cobble",
+	"default:cobble",
+	"default:mossycobble",
+
+	"doors:door_glass",
+	"doors:door_glass_a",
+	"doors:door_glass_b",
+	"doors:door_glass_c",
+	"doors:door_glass_d",
+	"doors:door_obsidian_glass",
+	"doors:door_obsidian_glass_a",
+	"doors:door_obsidian_glass_b",
+	"doors:door_obsidian_glass_c",
+	"doors:door_obsidian_glass_d",
+	"doors:door_steel",
+	"doors:door_steel_a",
+	"doors:door_steel_b",
+	"doors:door_steel_c",
+	"doors:door_steel_d",
+	"doors:door_wood",
+	"doors:door_wood_a",
+	"doors:door_wood_b",
+	"doors:door_wood_c",
+	"doors:door_wood_d",
+	"doors:gate_acacia_wood_closed",
+	"doors:gate_acacia_wood_open",
+	"doors:gate_aspen_wood_closed",
+	"doors:gate_aspen_wood_open",
+	"doors:gate_junglewood_closed",
+	"doors:gate_junglewood_open",
+	"doors:gate_pine_wood_closed",
+	"doors:gate_pine_wood_open",
+	"doors:gate_wood_closed",
+	"doors:gate_wood_open",
+	"doors:hidden",
+	"doors:trapdoor",
+	"doors:trapdoor_open",
+	"doors:trapdoor_steel",
+	"doors:trapdoor_steel_open",
+
+	"stairs:slab_bronzeblock",
+	"stairs:slab_copperblock",
+	"stairs:slab_steelblock",
+	"stairs:slab_tinblock",
+	"stairs:stair_bronzeblock",
+	"stairs:stair_copperblock",
+	"stairs:stair_inner_bronzeblock",
+	"stairs:stair_inner_copperblock",
+	"stairs:stair_inner_steelblock",
+	"stairs:stair_inner_tinblock",
+	"stairs:stair_outer_bronzeblock",
+	"stairs:stair_outer_copperblock",
+	"stairs:stair_outer_steelblock",
+	"stairs:stair_outer_tinblock",
+	"stairs:stair_steelblock",
+	"stairs:stair_tinblock",
+
+	"stairs:slab_acacia_wood",
+	"stairs:slab_aspen_wood",
+	"stairs:slab_brick",
+	"stairs:slab_cobble",
+	"stairs:slab_desert_cobble",
+	"stairs:slab_desert_sandstone",
+	"stairs:slab_desert_sandstone_block",
+	"stairs:slab_desert_sandstone_brick",
+	"stairs:slab_desert_stone",
+	"stairs:slab_desert_stone_block",
+	"stairs:slab_desert_stonebrick",
+	"stairs:slab_glass",
+	"stairs:slab_goldblock",
+	"stairs:slab_ice",
+	"stairs:slab_junglewood",
+	"stairs:slab_mossycobble",
+	"stairs:slab_obsidian",
+	"stairs:slab_obsidian_block",
+	"stairs:slab_obsidian_glass",
+	"stairs:slab_obsidianbrick",
+	"stairs:slab_pine_wood",
+	"stairs:slab_sandstone",
+	"stairs:slab_sandstone_block",
+	"stairs:slab_sandstonebrick",
+	"stairs:slab_silver_sandstone",
+	"stairs:slab_silver_sandstone_block",
+	"stairs:slab_silver_sandstone_brick",
+	"stairs:slab_snowblock",
+	"stairs:slab_stone",
+	"stairs:slab_stone_block",
+	"stairs:slab_stonebrick",
+	"stairs:slab_straw",
+	"stairs:slab_wood",
+	"stairs:stair_acacia_wood",
+	"stairs:stair_aspen_wood",
+	"stairs:stair_brick",
+	"stairs:stair_cobble",
+	"stairs:stair_desert_cobble",
+	"stairs:stair_desert_sandstone",
+	"stairs:stair_desert_sandstone_block",
+	"stairs:stair_desert_sandstone_brick",
+	"stairs:stair_desert_stone",
+	"stairs:stair_desert_stone_block",
+	"stairs:stair_desert_stonebrick",
+	"stairs:stair_glass",
+	"stairs:stair_goldblock",
+	"stairs:stair_ice",
+	"stairs:stair_inner_acacia_wood",
+	"stairs:stair_inner_aspen_wood",
+	"stairs:stair_inner_brick",
+	"stairs:stair_inner_cobble",
+	"stairs:stair_inner_desert_cobble",
+	"stairs:stair_inner_desert_sandstone",
+	"stairs:stair_inner_desert_sandstone_block",
+	"stairs:stair_inner_desert_sandstone_brick",
+	"stairs:stair_inner_desert_stone",
+	"stairs:stair_inner_desert_stone_block",
+	"stairs:stair_inner_desert_stonebrick",
+	"stairs:stair_inner_glass",
+	"stairs:stair_inner_goldblock",
+	"stairs:stair_inner_ice",
+	"stairs:stair_inner_junglewood",
+	"stairs:stair_inner_mossycobble",
+	"stairs:stair_inner_obsidian",
+	"stairs:stair_inner_obsidian_block",
+	"stairs:stair_inner_obsidian_glass",
+	"stairs:stair_inner_obsidianbrick",
+	"stairs:stair_inner_pine_wood",
+	"stairs:stair_inner_sandstone",
+	"stairs:stair_inner_sandstone_block",
+	"stairs:stair_inner_sandstonebrick",
+	"stairs:stair_inner_silver_sandstone",
+	"stairs:stair_inner_silver_sandstone_block",
+	"stairs:stair_inner_silver_sandstone_brick",
+	"stairs:stair_inner_snowblock",
+	"stairs:stair_inner_stone",
+	"stairs:stair_inner_stone_block",
+	"stairs:stair_inner_stonebrick",
+	"stairs:stair_inner_straw",
+	"stairs:stair_inner_wood",
+	"stairs:stair_junglewood",
+	"stairs:stair_mossycobble",
+	"stairs:stair_obsidian",
+	"stairs:stair_obsidian_block",
+	"stairs:stair_obsidian_glass",
+	"stairs:stair_obsidianbrick",
+	"stairs:stair_outer_acacia_wood",
+	"stairs:stair_outer_aspen_wood",
+	"stairs:stair_outer_brick",
+	"stairs:stair_outer_cobble",
+	"stairs:stair_outer_desert_cobble",
+	"stairs:stair_outer_desert_sandstone",
+	"stairs:stair_outer_desert_sandstone_block",
+	"stairs:stair_outer_desert_sandstone_brick",
+	"stairs:stair_outer_desert_stone",
+	"stairs:stair_outer_desert_stone_block",
+	"stairs:stair_outer_desert_stonebrick",
+	"stairs:stair_outer_glass",
+	"stairs:stair_outer_goldblock",
+	"stairs:stair_outer_ice",
+	"stairs:stair_outer_junglewood",
+	"stairs:stair_outer_mossycobble",
+	"stairs:stair_outer_obsidian",
+	"stairs:stair_outer_obsidian_block",
+	"stairs:stair_outer_obsidian_glass",
+	"stairs:stair_outer_obsidianbrick",
+	"stairs:stair_outer_pine_wood",
+	"stairs:stair_outer_sandstone",
+	"stairs:stair_outer_sandstone_block",
+	"stairs:stair_outer_sandstonebrick",
+	"stairs:stair_outer_silver_sandstone",
+	"stairs:stair_outer_silver_sandstone_block",
+	"stairs:stair_outer_silver_sandstone_brick",
+	"stairs:stair_outer_snowblock",
+	"stairs:stair_outer_stone",
+	"stairs:stair_outer_stone_block",
+	"stairs:stair_outer_stonebrick",
+	"stairs:stair_outer_straw",
+	"stairs:stair_outer_wood",
+	"stairs:stair_pine_wood",
+	"stairs:stair_sandstone",
+	"stairs:stair_sandstone_block",
+	"stairs:stair_sandstonebrick",
+	"stairs:stair_silver_sandstone",
+	"stairs:stair_silver_sandstone_block",
+	"stairs:stair_silver_sandstone_brick",
+	"stairs:stair_snowblock",
+	"stairs:stair_stone",
+	"stairs:stair_stone_block",
+	"stairs:stair_stonebrick",
+	"stairs:stair_straw",
+	"stairs:stair_wood",
+
+	"xpanes:bar",
+	"xpanes:bar_flat",
+	"xpanes:door_steel_bar",
+	"xpanes:door_steel_bar_a",
+	"xpanes:door_steel_bar_b",
+	"xpanes:door_steel_bar_c",
+	"xpanes:door_steel_bar_d",
+	"xpanes:obsidian_pane",
+	"xpanes:obsidian_pane_flat",
+	"xpanes:pane",
+	"xpanes:pane_flat",
+	"xpanes:trapdoor_steel_bar",
+	"xpanes:trapdoor_steel_bar_open",
+
+	"walls:cobble",
+	"walls:desertcobble",
+	"walls:mossycobble",
+})
+
+unified_inventory.add_category_items('environment', {
+	"air",
+	"default:cave_ice",
+	"default:dirt_with_rainforest_litter",
+	"default:gravel",
+	"default:dry_dirt_with_dry_grass",
+	"default:permafrost",
+	"default:desert_stone",
+	"default:ice",
+	"default:dry_dirt",
+	"default:obsidian",
+	"default:sand",
+	"default:river_water_source",
+	"default:dirt_with_snow",
+	"default:dirt_with_grass",
+	"default:water_flowing",
+	"default:dirt",
+	"default:desert_sand",
+	"default:permafrost_with_moss",
+	"default:dirt_with_coniferous_litter",
+	"default:water_source",
+	"default:dirt_with_dry_grass",
+	"default:river_water_flowing",
+	"default:stone",
+	"default:snow",
+	"default:lava_flowing",
+	"default:lava_source",
+	"default:permafrost_with_stones",
+	"default:dirt_with_grass_footsteps",
+	"default:silver_sand",
+	"default:snowblock",
+	"default:clay",
+
+	"farming:desert_sand_soil",
+	"farming:desert_sand_soil_wet",
+	"farming:dry_soil",
+	"farming:dry_soil_wet",
+	"farming:soil",
+	"farming:soil_wet",
+})
+
+unified_inventory.add_category_items('lighting', {
+	"default:mese_post_light_junglewood",
+	"default:torch_ceiling",
+	"default:meselamp",
+	"default:torch",
+	"default:mese_post_light_acacia_wood",
+	"default:mese_post_light",
+	"default:torch_wall",
+	"default:mese_post_light_pine_wood",
+	"default:mese_post_light_aspen_wood"
+})
+--]]
+
+
+--[[ UNCATEGORISED
+
+	"farming:string",
+
+	"beds:bed_bottom",
+	"beds:bed_top",
+	"beds:fancy_bed_bottom",
+	"beds:fancy_bed_top",
+	"boats:boat",
+	"bones:bones",
+
+	"bucket:bucket_lava",
+	"bucket:bucket_river_water",
+	"bucket:bucket_water",
+
+	"butterflies:butterfly_red",
+	"butterflies:butterfly_violet",
+	"butterflies:butterfly_white",
+	"butterflies:hidden_butterfly_red",
+	"butterflies:hidden_butterfly_violet",
+	"butterflies:hidden_butterfly_white",
+
+	"carts:brakerail",
+	"carts:cart",
+	"carts:powerrail",
+	"carts:rail",
+
+	"default:book",
+	"default:book_written",
+	"default:bookshelf",
+	"default:chest",
+	"default:chest_locked",
+	"default:chest_locked_open",
+	"default:chest_open",
+	"default:clay_lump",
+	"default:cloud",
+	"default:coral_brown",
+	"default:coral_cyan",
+	"default:coral_green",
+	"default:coral_orange",
+	"default:coral_pink",
+	"default:coral_skeleton",
+	"default:flint",
+	"default:furnace",
+	"default:furnace_active",
+	"default:key",
+	"default:ladder_steel",
+	"default:ladder_wood",
+	"default:obsidian_shard",
+	"default:paper",
+	"default:sign_wall_steel",
+	"default:sign_wall_wood",
+	"default:stick",
+
+	"fire:basic_flame",
+	"fire:permanent_flame",
+	"fireflies:firefly",
+	"fireflies:firefly_bottle",
+	"fireflies:hidden_firefly",
+
+	"ignore",
+	"unknown",
+
+	"tnt:boom",
+	"tnt:gunpowder",
+	"tnt:gunpowder_burning",
+	"tnt:tnt",
+	"tnt:tnt_burning",
+	"tnt:tnt_stick",
+
+	"vessels:drinking_glass",
+	"vessels:glass_bottle",
+	"vessels:glass_fragments",
+	"vessels:shelf",
+	"vessels:steel_bottle",
+
+	"dye:black",
+	"dye:blue",
+	"dye:brown",
+	"dye:cyan",
+	"dye:dark_green",
+	"dye:dark_grey",
+	"dye:green",
+	"dye:grey",
+	"dye:magenta",
+	"dye:orange",
+	"dye:pink",
+	"dye:red",
+	"dye:violet",
+	"dye:white",
+	"dye:yellow",
+
+	"wool:black",
+	"wool:blue",
+	"wool:brown",
+	"wool:cyan",
+	"wool:dark_green",
+	"wool:dark_grey",
+	"wool:green",
+	"wool:grey",
+	"wool:magenta",
+	"wool:orange",
+	"wool:pink",
+	"wool:red",
+	"wool:violet",
+	"wool:white",
+	"wool:yellow",
+
+	"unified_inventory:bag_large",
+	"unified_inventory:bag_medium",
+	"unified_inventory:bag_small",
+--]]
+
+--[[ LIST UNCATEGORIZED AFTER LOAD
+minetest.register_on_mods_loaded(function()
+	minetest.after(1, function ( )
+		local l = {}
+		for name,_ in pairs(minetest.registered_items) do
+			if not unified_inventory.find_category(name) then
+				-- minetest.log("error", minetest.serialize(minetest.registered_items[name]))
+				table.insert(l, name)
+			end
+		end
+		table.sort(l)
+		minetest.log(table.concat(l, '",'.."\n"..'"'))
+	end)
+end)
+--]]
\ No newline at end of file
diff --git a/unified_inventory/doc/mod_api.txt b/unified_inventory/doc/mod_api.txt
index c0be129..ff52792 100644
--- a/unified_inventory/doc/mod_api.txt
+++ b/unified_inventory/doc/mod_api.txt
@@ -3,6 +3,14 @@ unified_inventory API
 
 This file provides information about the API of unified_inventory.
 
+API revisions within unified_inventory can be checked using:
+
+	(unified_inventory.version or 1)
+
+**Revision history**
+
+* Version `1`: Classic formspec layout (no real_coordinates)
+* Version `2`: Force formspec version 4 (includes real_coordinates)
 
 Misc functions
 --------------
@@ -93,3 +101,72 @@ Register a non-standard craft recipe:
 		-- ^ Same as `minetest.register_recipe`
 	})
 
+
+Categories
+----------
+
+Register a new category:
+	The config table (second argument) is optional, and all its members are optional
+	See the unified_inventory.set_category_* functions for more details on the members of the config table
+
+	unified_inventory.register_category("category_name", {
+		symbol = "mod_name:item_name" or "texture.png",
+		label = "Human Readable Label",
+		index = 5,
+		items = {
+			"mod_name:item_name",
+			"another_mod:different_item"
+		}
+	})
+
+Add / override the symbol for a category:
+	The category does not need to exist first
+	The symbol can be an item name or a texture image
+	If unset this will default to "default:stick"
+
+	unified_inventory.set_category_symbol("category_name", "mod_name:item_name" or "texture.png")
+
+Add / override the human readable label for a category:
+	If unset this will default to the category name
+
+	unified_inventory.set_category_label("category_name", "Human Readable Label")
+
+Add / override the sorting index of the category:
+	Must be a number, can also be negative (-5) or fractional (2.345)
+	This determines the position the category appears in the list of categories
+	The "all" meta-category has index -2, the "misc"/"uncategorized" meta-category has index -1, use a negative number smaller than these to make a category appear before these in the list
+	By default categories are sorted alphabetically with an index between 0.0101(AA) and 0.2626(ZZ)
+
+	unified_inventory.set_category_index("category_name", 5)
+
+Add a single item to a category:
+
+	unified_inventory.add_category_item("category_name", "mod_name:item_name")
+
+Add multiple items to a category:
+
+	unified_inventory.add_category_items("category_name", {
+		"mod_name:item_name",
+		"another_mod:different_item"
+	})
+
+Remove an item from a category:
+
+	unified_inventory.remove_category_item("category_name", "mod_name:item_name")
+
+Remove a category entirely:
+
+	unified_inventory.remove_category("category_name")
+
+Finding existing items in categories:
+	This will find the first category an item exists in
+	It should be used for checking if an item is catgorised
+	Returns "category_name" or nil
+
+	unified_inventory.find_category("mod_name:item_name")
+
+
+	This will find all the categories an item exists in
+	Returns a number indexed table (list) of category names
+
+	unified_inventory.find_categories("mod_name:item_name")
diff --git a/unified_inventory/init.lua b/unified_inventory/init.lua
index 1a80abb..391eb3c 100644
--- a/unified_inventory/init.lua
+++ b/unified_inventory/init.lua
@@ -10,6 +10,8 @@ unified_inventory = {
 	alternate = {},
 	current_page = {},
 	current_searchbox = {},
+	current_category = {},
+	current_category_scroll = {},
 	current_index = {},
 	current_item = {},
 	current_craft_direction = {},
@@ -33,20 +35,110 @@ unified_inventory = {
 	-- "Lite" mode
 	lite_mode = minetest.settings:get_bool("unified_inventory_lite"),
 
+	-- Items automatically added to categories based on item definitions
+	automatic_categorization = (minetest.settings:get_bool("unified_inventory_automatic_categorization") ~= false),
+
 	-- Trash enabled
 	trash_enabled = (minetest.settings:get_bool("unified_inventory_trash") ~= false),
-
-	pagecols = 8,
-	pagerows = 10,
-	page_y = 0,
-	formspec_y = 1,
-	main_button_x = 0,
-	main_button_y = 9,
-	craft_result_x = 0.3,
-	craft_result_y = 0.5,
-	form_header_y = 0
+	imgscale = 1.25,
+	list_img_offset = 0.13,
+	standard_background = "background9[0,0;1,1;ui_formbg_9_sliced.png;true;16]",
+	version = 2
 }
 
+local ui = unified_inventory
+
+-- These tables establish position and layout for the two UI styles.
+-- UI doesn't use formspec_[xy] anymore, but other mods may need them.
+
+ui.style_full = {
+	formspec_x = 1,
+	formspec_y = 1,
+	formw = 17.75,
+	formh = 12.25,
+	pagecols = 8,
+	pagerows = 9,
+	page_x = 10.75,
+	page_y = 2.30,
+	craft_x = 2.8,
+	craft_y = 1.15,
+	craftresult_x = 7.8,
+	craft_arrow_x = 6.55,
+	craft_guide_x = 3.3,
+	craft_guide_y = 1.15,
+	craft_guide_arrow_x = 7.05,
+	craft_guide_result_x = 8.3,
+	craft_guide_resultstr_x = 0.3,
+	craft_guide_resultstr_y = 0.6,
+	give_btn_x = 0.25,
+	main_button_x = 0.4,
+	main_button_y = 11.0,
+	page_buttons_x = 11.60,
+	page_buttons_y = 10.15,
+	searchwidth = 3.4,
+	form_header_x = 0.4,
+	form_header_y = 0.4,
+	btn_spc = 0.85,
+	btn_size = 0.75,
+	std_inv_x = 0.3,
+	std_inv_y = 5.75,
+}
+
+ui.style_lite = {
+	formspec_x =  0.6,
+	formspec_y =  0.6,
+	formw = 14,
+	formh = 9.75,
+	pagecols = 4,
+	pagerows = 5,
+	page_x = 10.5,
+	page_y = 2.15,
+	craft_x = 2.6,
+	craft_y = 0.75,
+	craftresult_x = 5.75,
+	craft_arrow_x = 6.35,
+	craft_guide_x = 3.1,
+	craft_guide_y = 0.75,
+	craft_guide_arrow_x = 7.05,
+	craft_guide_result_x = 8.3,
+	craft_guide_resultstr_x = 0.15,
+	craft_guide_resultstr_y = 0.35,
+	give_btn_x = 0.15,
+	main_button_x = 10.5,
+	main_button_y = 8.15,
+	page_buttons_x = 10.5,
+	page_buttons_y = 6.15,
+	searchwidth = 1.6,
+	form_header_x =  0.2,
+	form_header_y =  0.2,
+	btn_spc = 0.8,
+	btn_size = 0.7,
+	std_inv_x = 0.1,
+	std_inv_y = 4.6,
+}
+
+dofile(modpath.."/api.lua")
+
+for _, style in ipairs({ui.style_full, ui.style_lite}) do
+	style.items_per_page =  style.pagecols * style.pagerows
+	style.standard_inv = string.format("list[current_player;main;%f,%f;8,4;]",
+							style.std_inv_x + ui.list_img_offset, style.std_inv_y + ui.list_img_offset)
+
+	style.standard_inv_bg = ui.make_inv_img_grid(style.std_inv_x, style.std_inv_y, 8, 1, true)..
+							ui.make_inv_img_grid(style.std_inv_x, style.std_inv_y + ui.imgscale, 8, 3)
+
+	style.craft_grid =	table.concat({
+							ui.make_inv_img_grid(style.craft_x, style.craft_y, 3, 3),
+							ui.single_slot(style.craft_x + ui.imgscale*4, style.craft_y), -- the craft result slot
+							string.format("image[%f,%f;%f,%f;ui_crafting_arrow.png]",
+							style.craft_arrow_x, style.craft_y, ui.imgscale, ui.imgscale),
+							string.format("list[current_player;craft;%f,%f;3,3;]",
+								style.craft_x + ui.list_img_offset, style.craft_y + ui.list_img_offset),
+							string.format("list[current_player;craftpreview;%f,%f;1,1;]",
+								style.craftresult_x + ui.list_img_offset, style.craft_y + ui.list_img_offset)
+						})
+end
+
 -- Disable default creative inventory
 local creative = rawget(_G, "creative") or rawget(_G, "creative_inventory")
 if creative then
@@ -62,7 +154,8 @@ if sfinv then
 end
 
 dofile(modpath.."/group.lua")
-dofile(modpath.."/api.lua")
+dofile(modpath.."/category.lua")
+dofile(modpath.."/default-categories.lua")
 dofile(modpath.."/internal.lua")
 dofile(modpath.."/callbacks.lua")
 dofile(modpath.."/match_craft.lua")
diff --git a/unified_inventory/internal.lua b/unified_inventory/internal.lua
index eeab695..6113300 100644
--- a/unified_inventory/internal.lua
+++ b/unified_inventory/internal.lua
@@ -1,5 +1,6 @@
 local S = minetest.get_translator("unified_inventory")
 local F = minetest.formspec_escape
+local ui = unified_inventory
 
 -- This pair of encoding functions is used where variable text must go in
 -- button names, where the text might contain formspec metacharacters.
@@ -9,78 +10,61 @@ local F = minetest.formspec_escape
 -- This is a game engine bug, and in the anticipation that it might be
 -- fixed some day we don't want to rely on it.  So for safety we apply
 -- an encoding that avoids all formspec metacharacters.
-function unified_inventory.mangle_for_formspec(str)
+
+function ui.mangle_for_formspec(str)
 	return string.gsub(str, "([^A-Za-z0-9])", function (c) return string.format("_%d_", string.byte(c)) end)
 end
-function unified_inventory.demangle_for_formspec(str)
+function ui.demangle_for_formspec(str)
 	return string.gsub(str, "_([0-9]+)_", function (v) return string.char(v) end)
 end
 
-function unified_inventory.get_per_player_formspec(player_name)
-	local lite = unified_inventory.lite_mode and not minetest.check_player_privs(player_name, {ui_full=true})
 
-	local ui = {}
-	ui.pagecols = unified_inventory.pagecols
-	ui.pagerows = unified_inventory.pagerows
-	ui.page_y = unified_inventory.page_y
-	ui.formspec_y = unified_inventory.formspec_y
-	ui.main_button_x = unified_inventory.main_button_x
-	ui.main_button_y = unified_inventory.main_button_y
-	ui.craft_result_x = unified_inventory.craft_result_x
-	ui.craft_result_y = unified_inventory.craft_result_y
-	ui.form_header_y = unified_inventory.form_header_y
+function ui.get_per_player_formspec(player_name)
+	local draw_lite_mode = ui.lite_mode and not minetest.check_player_privs(player_name, {ui_full=true})
 
-	if lite then
-		ui.pagecols = 4
-		ui.pagerows = 6
-		ui.page_y = 0.25
-		ui.formspec_y = 0.47
-		ui.main_button_x = 8.2
-		ui.main_button_y = 6.5
-		ui.craft_result_x = 2.8
-		ui.craft_result_y = 3.4
-		ui.form_header_y = -0.1
-	end
-
-	ui.items_per_page = ui.pagecols * ui.pagerows
-	return ui, lite
+	return table.copy(draw_lite_mode and ui.style_lite or ui.style_full), draw_lite_mode
 end
 
-function unified_inventory.get_formspec(player, page)
+local function formspec_button(ui_peruser, name, image, offset, pos, scale, label)
+	local element = 'image_button'
+	if minetest.registered_items[image] then
+		element = 'item_image_button'
+	end
+	local spc = (1-scale)*ui_peruser.btn_size/2
+	local size = ui_peruser.btn_size*scale
+	return string.format("%s[%f,%f;%f,%f;%s;%s;]", element,
+		(offset.x or offset[1]) + ( ui_peruser.btn_spc * (pos.x or pos[1]) ) + spc,
+		(offset.y or offset[2]) + ( ui_peruser.btn_spc * (pos.y or pos[2]) ) + spc,
+		size, size, image, name) ..
+		string.format("tooltip[%s;%s]", name, F(label or name))
+end
+
+function ui.get_formspec(player, page)
 
 	if not player then
 		return ""
 	end
 
 	local player_name = player:get_player_name()
-	local ui_peruser,draw_lite_mode = unified_inventory.get_per_player_formspec(player_name)
+	local ui_peruser,draw_lite_mode = ui.get_per_player_formspec(player_name)
 
-	unified_inventory.current_page[player_name] = page
-	local pagedef = unified_inventory.pages[page]
+	ui.current_page[player_name] = page
+	local pagedef = ui.pages[page]
 
 	if not pagedef then
 		return "" -- Invalid page name
 	end
-
+	
 	local formspec = {
-		"size[14,10]",
+		"formspec_version[4]",
+		"size["..ui_peruser.formw..","..ui_peruser.formh.."]",
 		pagedef.formspec_prepend and "" or "no_prepend[]",
-		"background[-0.19,-0.25;14.4,10.75;ui_form_bg.png]" -- Background
+		ui.standard_background
 	}
-	local n = 4
 
-	if draw_lite_mode then
-		formspec[1] = "size[11,7.7]"
-		formspec[3] = "background[-0.19,-0.2;11.4,8.4;ui_form_bg.png]"
-	end
+	local n = 5
 
-	if unified_inventory.is_creative(player_name)
-	and page == "craft" then
-		formspec[n] = "background[0,"..(ui_peruser.formspec_y + 2)..";1,1;ui_single_slot.png]"
-		n = n+1
-	end
-
-	local perplayer_formspec = unified_inventory.get_per_player_formspec(player_name)
+	local perplayer_formspec = ui.get_per_player_formspec(player_name)
 	local fsdata = pagedef.get_formspec(player, perplayer_formspec)
 
 	formspec[n] = fsdata.formspec
@@ -93,7 +77,7 @@ function unified_inventory.get_formspec(player, page)
 
 	local filtered_inv_buttons = {}
 
-	for i, def in pairs(unified_inventory.buttons) do
+	for i, def in pairs(ui.buttons) do
 		if not (draw_lite_mode and def.hide_lite) then
 			table.insert(filtered_inv_buttons, def)
 		end
@@ -108,21 +92,20 @@ function unified_inventory.get_formspec(player, page)
 
 		if def.type == "image" then
 			if (def.condition == nil or def.condition(player) == true) then
-				formspec[n] = "image_button["
-				formspec[n+1] = ( ui_peruser.main_button_x + 0.65 * (i - 1) - button_col * 0.65 * 4)
-				formspec[n+2] = ","..(ui_peruser.main_button_y + button_row * 0.7)..";0.8,0.8;"
-				formspec[n+3] = F(def.image)..";"
-				formspec[n+4] = F(def.name)..";]"
-				formspec[n+5] = "tooltip["..F(def.name)
-				formspec[n+6] = ";"..(def.tooltip or "").."]"
-				n = n+7
+				formspec[n] = string.format("image_button[%f,%f;%f,%f;%s;%s;]",
+					ui_peruser.main_button_x + ui_peruser.btn_spc * (i - 1) - button_col * ui_peruser.btn_spc * 4,
+					ui_peruser.main_button_y + button_row * ui_peruser.btn_spc,
+					ui_peruser.btn_size,ui_peruser.btn_size,
+					F(def.image),
+					F(def.name))
+				formspec[n+1] = "tooltip["..F(def.name)..";"..(def.tooltip or "").."]"
+				n = n+2
 			else
-				formspec[n] = "image["
-				formspec[n+1] = ( ui_peruser.main_button_x + 0.65 * (i - 1) - button_col * 0.65 * 4)
-				formspec[n+2] = ","..(ui_peruser.main_button_y + button_row * 0.7)..";0.8,0.8;"
-				formspec[n+3] = F(def.image).."^[colorize:#808080:alpha]"
-				n = n+4
-
+				formspec[n] = string.format("image[%f,%f;%f,%f;%s^[colorize:#808080:alpha]",
+				ui_peruser.main_button_x + ui_peruser.btn_spc * (i - 1) - button_col * ui_peruser.btn_spc * 4,
+				ui_peruser.main_button_y + button_row * ui_peruser.btn_spc,
+				ui_peruser.btn_size,ui_peruser.btn_size,def.image)
+				n = n+1
 			end
 		end
 	end
@@ -130,7 +113,7 @@ function unified_inventory.get_formspec(player, page)
 	if fsdata.draw_inventory ~= false then
 		-- Player inventory
 		formspec[n] = "listcolors[#00000000;#00000000]"
-		formspec[n+1] = "list[current_player;main;0,"..(ui_peruser.formspec_y + 3.5)..";8,4;]"
+		formspec[n+1] = ui_peruser.standard_inv
 		n = n+2
 	end
 
@@ -138,71 +121,94 @@ function unified_inventory.get_formspec(player, page)
 		return table.concat(formspec, "")
 	end
 
-	-- Controls to flip items pages
-	local start_x = 9.2
+	-- Category filters
 
-	if not draw_lite_mode then
-		formspec[n] =
-			"image_button[" .. (start_x + 0.6 * 0)
-				.. ",9;.8,.8;ui_skip_backward_icon.png;start_list;]"
-			.. "tooltip[start_list;" .. F(S("First page")) .. "]"
+	local categories_pos = { ui_peruser.page_x, ui_peruser.page_y-ui_peruser.btn_spc-0.5 }
+	local categories_scroll_pos = { ui_peruser.page_x, ui_peruser.form_header_y-(draw_lite_mode and 0 or 0.2) }
 
-			.. "image_button[" .. (start_x + 0.6 * 1)
-				.. ",9;.8,.8;ui_doubleleft_icon.png;rewind3;]"
-			.. "tooltip[rewind3;" .. F(S("Back three pages")) .. "]"
-			.. "image_button[" .. (start_x + 0.6 * 2)
-				.. ",9;.8,.8;ui_left_icon.png;rewind1;]"
-			.. "tooltip[rewind1;" .. F(S("Back one page")) .. "]"
+	formspec[n] = string.format("background9[%f,%f;%f,%f;%s;false;3]",
+		ui_peruser.page_x-0.1, categories_scroll_pos[2],
+		(ui_peruser.btn_spc * ui_peruser.pagecols) + 0.13, 1.4+(draw_lite_mode and 0 or 0.2),
+		"ui_smallbg_9_sliced.png")
+	n = n + 1
 
-			.. "image_button[" .. (start_x + 0.6 * 3)
-				.. ",9;.8,.8;ui_right_icon.png;forward1;]"
-			.. "tooltip[forward1;" .. F(S("Forward one page")) .. "]"
-			.. "image_button[" .. (start_x + 0.6 * 4)
-				.. ",9;.8,.8;ui_doubleright_icon.png;forward3;]"
-			.. "tooltip[forward3;" .. F(S("Forward three pages")) .. "]"
+	formspec[n] = string.format("label[%f,%f;%s]", ui_peruser.page_x, ui_peruser.form_header_y+(draw_lite_mode and 0.3 or 0.2), "Category:")
+	n = n + 1
 
-			.. "image_button[" .. (start_x + 0.6 * 5)
-				.. ",9;.8,.8;ui_skip_forward_icon.png;end_list;]"
-			.. "tooltip[end_list;" .. F(S("Last page")) .. "]"
-	else
-		formspec[n] =
-			"image_button[" .. (8.2 + 0.65 * 0)
-				.. ",5.8;.8,.8;ui_skip_backward_icon.png;start_list;]"
-			.. "tooltip[start_list;" .. F(S("First page")) .. "]"
-			.. "image_button[" .. (8.2 + 0.65 * 1)
-				.. ",5.8;.8,.8;ui_left_icon.png;rewind1;]"
-			.. "tooltip[rewind1;" .. F(S("Back one page")) .. "]"
-			.. "image_button[" .. (8.2 + 0.65 * 2)
-				.. ",5.8;.8,.8;ui_right_icon.png;forward1;]"
-			.. "tooltip[forward1;" .. F(S("Forward one page")) .. "]"
-			.. "image_button[" .. (8.2 + 0.65 * 3)
-				.. ",5.8;.8,.8;ui_skip_forward_icon.png;end_list;]"
-			.. "tooltip[end_list;" .. F(S("Last page")) .. "]"
+	local scroll_offset = 0
+	local category_count = #unified_inventory.category_list
+	if category_count > ui_peruser.pagecols then
+		scroll_offset = unified_inventory.current_category_scroll[player_name]
+	end
+
+	for index, category in ipairs(unified_inventory.category_list) do
+		local column = index - scroll_offset
+		if column > 0 and column <= ui_peruser.pagecols then
+			local scale = 0.8
+			if unified_inventory.current_category[player_name] == category.name then
+				scale = 1
+			end
+			formspec[n] = formspec_button(ui_peruser, "category_"..category.name, category.symbol, categories_pos, {column-1, 0}, scale, category.label)
+			n = n + 1
+		end
+	end
+	if category_count > ui_peruser.pagecols and scroll_offset > 0 then
+		-- prev
+		formspec[n] = formspec_button(ui_peruser, "prev_category", "ui_left_icon.png", categories_scroll_pos, {ui_peruser.pagecols - 2, 0}, 0.8, S("Scroll categories left"))
+		n = n + 1
+	end
+	if category_count > ui_peruser.pagecols and category_count - scroll_offset > ui_peruser.pagecols then
+		-- next
+		formspec[n] = formspec_button(ui_peruser, "next_category", "ui_right_icon.png", categories_scroll_pos, {ui_peruser.pagecols - 1, 0}, 0.8, S("Scroll categories right"))
+		n = n + 1
 	end
-	n = n+1
 
 	-- Search box
 	formspec[n] = "field_close_on_enter[searchbox;false]"
-	n = n+1
 
-	if not draw_lite_mode then
-		formspec[n] = "field[9.5,8.325;3,1;searchbox;;"
-			.. F(unified_inventory.current_searchbox[player_name]) .. "]"
-		formspec[n+1] = "image_button[12.2,8.1;.8,.8;ui_search_icon.png;searchbutton;]"
-			.. "tooltip[searchbutton;" ..F(S("Search")) .. "]"
-		formspec[n+2] = "image_button[12.9,8.1;.8,.8;ui_reset_icon.png;searchresetbutton;]"
-			.. "tooltip[searchbutton;" ..F(S("Search")) .. "]"
-			.. "tooltip[searchresetbutton;" ..F(S("Reset search and display everything")) .. "]"
-	else
-		formspec[n] = "field[8.5,5.225;2.2,1;searchbox;;"
-			.. F(unified_inventory.current_searchbox[player_name]) .. "]"
-		formspec[n+1] = "image_button[10.3,5;.8,.8;ui_search_icon.png;searchbutton;]"
-			.. "tooltip[searchbutton;" ..F(S("Search")) .. "]"
-		formspec[n+2] = "image_button[11,5;.8,.8;ui_reset_icon.png;searchresetbutton;]"
-			.. "tooltip[searchbutton;" ..F(S("Search")) .. "]"
-			.. "tooltip[searchresetbutton;" ..F(S("Reset search and display everything")) .. "]"
+	formspec[n+1] = string.format("field[%f,%f;%f,%f;searchbox;;%s]",
+		ui_peruser.page_buttons_x, ui_peruser.page_buttons_y,
+		ui_peruser.searchwidth - 0.1, ui_peruser.btn_size,
+		F(ui.current_searchbox[player_name]))
+	formspec[n+2] = string.format("image_button[%f,%f;%f,%f;ui_search_icon.png;searchbutton;]",
+		ui_peruser.page_buttons_x + ui_peruser.searchwidth, ui_peruser.page_buttons_y,
+		ui_peruser.btn_size,ui_peruser.btn_size)
+	formspec[n+3] = "tooltip[searchbutton;" ..F(S("Search")) .. "]"
+	formspec[n+4] = string.format("image_button[%f,%f;%f,%f;ui_reset_icon.png;searchresetbutton;]",
+		ui_peruser.page_buttons_x + ui_peruser.searchwidth + ui_peruser.btn_spc,
+		ui_peruser.page_buttons_y,
+		ui_peruser.btn_size, ui_peruser.btn_size)
+	formspec[n+5] = "tooltip[searchresetbutton;"..F(S("Reset search and display everything")).."]"
+
+	n = n + 6
+
+	-- Controls to flip items pages
+
+	local btnlist = {
+		{ "ui_skip_backward_icon.png", "start_list", S("First page") },
+		{ "ui_doubleleft_icon.png",    "rewind3",    S("Back three pages") },
+		{ "ui_left_icon.png",          "rewind1",    S("Back one page") },
+		{ "ui_right_icon.png",         "forward1",   S("Forward one page") },
+		{ "ui_doubleright_icon.png",   "forward3",   S("Forward three pages") },
+		{ "ui_skip_forward_icon.png",  "end_list",   S("Last page") },
+	}
+
+	if draw_lite_mode then
+		btnlist[5] = nil
+		btnlist[2] = nil
+	end
+
+	local bn = 0
+	for _, b in pairs(btnlist) do
+		formspec[n] =  string.format("image_button[%f,%f;%f,%f;%s;%s;]",
+			ui_peruser.page_buttons_x + ui_peruser.btn_spc*bn,
+			ui_peruser.page_buttons_y + ui_peruser.btn_spc,
+			ui_peruser.btn_size, ui_peruser.btn_size,
+			b[1],b[2])
+		formspec[n+1] = "tooltip["..b[2]..";"..F(b[3]).."]"
+		bn = bn + 1
+		n = n + 2
 	end
-	n = n+3
 
 	local no_matches = S("No matching items")
 	if draw_lite_mode then
@@ -210,23 +216,23 @@ function unified_inventory.get_formspec(player, page)
 	end
 
 	-- Items list
-	if #unified_inventory.filtered_items_list[player_name] == 0 then
-		formspec[n] = "label[8.2,"..ui_peruser.form_header_y..";" .. F(no_matches) .. "]"
+	if #ui.filtered_items_list[player_name] == 0 then
+		formspec[n] = "label["..ui_peruser.page_x..","..(ui_peruser.page_y+0.15)..";" .. F(no_matches) .. "]"
 	else
-		local dir = unified_inventory.active_search_direction[player_name]
-		local list_index = unified_inventory.current_index[player_name]
+		local dir = ui.active_search_direction[player_name]
+		local list_index = ui.current_index[player_name]
 		local page2 = math.floor(list_index / (ui_peruser.items_per_page) + 1)
 		local pagemax = math.floor(
-			(#unified_inventory.filtered_items_list[player_name] - 1)
+			(#ui.filtered_items_list[player_name] - 1)
 				/ (ui_peruser.items_per_page) + 1)
 		for y = 0, ui_peruser.pagerows - 1 do
 			for x = 0, ui_peruser.pagecols - 1 do
-				local name = unified_inventory.filtered_items_list[player_name][list_index]
+				local name = ui.filtered_items_list[player_name][list_index]
 				local item = minetest.registered_items[name]
 				if item then
 					-- Clicked on current item: Flip crafting direction
-					if name == unified_inventory.current_item[player_name] then
-						local cdir = unified_inventory.current_craft_direction[player_name]
+					if name == ui.current_item[player_name] then
+						local cdir = ui.current_craft_direction[player_name]
 						if cdir == "recipe" then
 							dir = "usage"
 						elseif cdir == "usage" then
@@ -234,13 +240,15 @@ function unified_inventory.get_formspec(player, page)
 						end
 					else
 					-- Default: use active search direction by default
-						dir = unified_inventory.active_search_direction[player_name]
+						dir = ui.active_search_direction[player_name]
 					end
 
 					local button_name = "item_button_" .. dir .. "_"
-						.. unified_inventory.mangle_for_formspec(name)
-					formspec[n] = ("item_image_button[%f,%f;.81,.81;%s;%s;]"):format(
-						8.2 + x * 0.7, ui_peruser.formspec_y + ui_peruser.page_y + y * 0.7,
+						.. ui.mangle_for_formspec(name)
+					formspec[n] = ("item_image_button[%f,%f;%f,%f;%s;%s;]"):format(
+						ui_peruser.page_x + x * ui_peruser.btn_spc,
+						ui_peruser.page_y + y * ui_peruser.btn_spc,
+						ui_peruser.btn_size, ui_peruser.btn_size,
 						name, button_name
 					)
 					formspec[n + 1] = ("tooltip[%s;%s \\[%s\\]]"):format(
@@ -252,26 +260,36 @@ function unified_inventory.get_formspec(player, page)
 				end
 			end
 		end
-		formspec[n] = "label[8.2,"..ui_peruser.form_header_y..";"..F(S("Page")) .. ": "
-			.. S("@1 of @2",page2,pagemax).."]"
+		formspec[n] = string.format("label[%f,%f;%s: %s]",
+			ui_peruser.page_buttons_x + ui_peruser.btn_spc * (draw_lite_mode and 1 or 2),
+			ui_peruser.page_buttons_y + 0.1 + ui_peruser.btn_spc * 2,
+			F(S("Page")), S("@1 of @2",page2,pagemax))
 	end
 	n= n+1
 
-	if unified_inventory.activefilter[player_name] ~= "" then
-		formspec[n] = "label[8.2,"..(ui_peruser.form_header_y + 0.4)..";" .. F(S("Filter")) .. ":]"
-		formspec[n+1] = "label[9.1,"..(ui_peruser.form_header_y + 0.4)..";"..F(unified_inventory.activefilter[player_name]).."]"
+	if ui.activefilter[player_name] ~= "" then
+		formspec[n] = string.format("label[%f,%f;%s: %s]",
+			ui_peruser.page_x, ui_peruser.page_y - 0.25,
+			F(S("Filter")), F(ui.activefilter[player_name]))
 	end
 	return table.concat(formspec, "")
 end
 
-function unified_inventory.set_inventory_formspec(player, page)
+function ui.set_inventory_formspec(player, page)
 	if player then
-		player:set_inventory_formspec(unified_inventory.get_formspec(player, page))
+		player:set_inventory_formspec(ui.get_formspec(player, page))
 	end
 end
 
+local function valid_def(def)
+	return (not def.groups.not_in_creative_inventory
+			or def.groups.not_in_creative_inventory == 0)
+		and def.description
+		and def.description ~= ""
+end
+
 --apply filter to the inventory list (create filtered copy of full one)
-function unified_inventory.apply_filter(player, filter, search_dir)
+function ui.apply_filter(player, filter, search_dir)
 	if not player then
 		return false
 	end
@@ -300,26 +318,43 @@ function unified_inventory.apply_filter(player, filter, search_dir)
 				or llocaldesc and string.find(llocaldesc, lfilter, 1, true)
 		end
 	end
-	unified_inventory.filtered_items_list[player_name]={}
-	for name, def in pairs(minetest.registered_items) do
-		if (not def.groups.not_in_creative_inventory
-			or def.groups.not_in_creative_inventory == 0)
-		and def.description
-		and def.description ~= ""
-		and ffilter(name, def) then
-			table.insert(unified_inventory.filtered_items_list[player_name], name)
+	ui.filtered_items_list[player_name]={}
+	local category = ui.current_category[player_name] or 'all'
+	if category == 'all' then
+		for name, def in pairs(minetest.registered_items) do
+			if valid_def(def)
+			and ffilter(name, def) then
+				table.insert(ui.filtered_items_list[player_name], name)
+			end
+		end
+	elseif category == 'uncategorized' then
+		for name, def in pairs(minetest.registered_items) do
+			if (not ui.find_category(name))
+			and valid_def(def)
+			and ffilter(name, def) then
+				table.insert(ui.filtered_items_list[player_name], name)
+			end
+		end
+	else
+		for name,exists in pairs(ui.registered_category_items[category]) do
+			local def = minetest.registered_items[name]
+			if exists and def
+			and valid_def(def)
+			and ffilter(name, def) then
+				table.insert(ui.filtered_items_list[player_name], name)
+			end
 		end
 	end
-	table.sort(unified_inventory.filtered_items_list[player_name])
-	unified_inventory.filtered_items_list_size[player_name] = #unified_inventory.filtered_items_list[player_name]
-	unified_inventory.current_index[player_name] = 1
-	unified_inventory.activefilter[player_name] = filter
-	unified_inventory.active_search_direction[player_name] = search_dir
-	unified_inventory.set_inventory_formspec(player,
-	unified_inventory.current_page[player_name])
+	table.sort(ui.filtered_items_list[player_name])
+	ui.filtered_items_list_size[player_name] = #ui.filtered_items_list[player_name]
+	ui.current_index[player_name] = 1
+	ui.activefilter[player_name] = filter
+	ui.active_search_direction[player_name] = search_dir
+	ui.set_inventory_formspec(player,
+	ui.current_page[player_name])
 end
 
-function unified_inventory.items_in_group(groups)
+function ui.items_in_group(groups)
 	local items = {}
 	for name, item in pairs(minetest.registered_items) do
 		for _, group in pairs(groups:split(',')) do
@@ -331,7 +366,7 @@ function unified_inventory.items_in_group(groups)
 	return items
 end
 
-function unified_inventory.sort_inventory(inv)
+function ui.sort_inventory(inv)
 	local inlist = inv:get_list("main")
 	local typecnt = {}
 	local typekeys = {}
diff --git a/unified_inventory/mod.conf b/unified_inventory/mod.conf
index bca70ca..89be528 100644
--- a/unified_inventory/mod.conf
+++ b/unified_inventory/mod.conf
@@ -5,3 +5,4 @@ description = """
 Unified Inventory replaces the default survival and creative inventory.
 It adds a nicer interface and a number of features, such as a crafting guide.
 """
+min_minetest_version = 5.4.0
diff --git a/unified_inventory/register.lua b/unified_inventory/register.lua
index 017e4af..3cb5f59 100644
--- a/unified_inventory/register.lua
+++ b/unified_inventory/register.lua
@@ -1,6 +1,7 @@
 local S = minetest.get_translator("unified_inventory")
 local NS = function(s) return s end
 local F = minetest.formspec_escape
+local ui = unified_inventory
 
 minetest.register_privilege("creative", {
 	description = S("Can use the creative inventory"),
@@ -12,10 +13,9 @@ minetest.register_privilege("ui_full", {
 	give_to_singleplayer = false,
 })
 
-
 local trash = minetest.create_detached_inventory("trash", {
 	--allow_put = function(inv, listname, index, stack, player)
-	--	if unified_inventory.is_creative(player:get_player_name()) then
+	--	if ui.is_creative(player:get_player_name()) then
 	--		return stack:get_count()
 	--	else
 	--		return 0
@@ -29,19 +29,19 @@ local trash = minetest.create_detached_inventory("trash", {
 })
 trash:set_size("main", 1)
 
-unified_inventory.register_button("craft", {
+ui.register_button("craft", {
 	type = "image",
 	image = "ui_craft_icon.png",
 	tooltip = S("Crafting Grid")
 })
 
-unified_inventory.register_button("craftguide", {
+ui.register_button("craftguide", {
 	type = "image",
 	image = "ui_craftguide_icon.png",
 	tooltip = S("Crafting Guide")
 })
 
-unified_inventory.register_button("home_gui_set", {
+ui.register_button("home_gui_set", {
 	type = "image",
 	image = "ui_sethome_icon.png",
 	tooltip = S("Set home position"),
@@ -49,8 +49,8 @@ unified_inventory.register_button("home_gui_set", {
 	action = function(player)
 		local player_name = player:get_player_name()
 		if minetest.check_player_privs(player_name, {home=true}) then
-			unified_inventory.set_home(player, player:get_pos())
-			local home = unified_inventory.home_pos[player_name]
+			ui.set_home(player, player:get_pos())
+			local home = ui.home_pos[player_name]
 			if home ~= nil then
 				minetest.sound_play("dingdong",
 						{to_player=player_name, gain = 1.0})
@@ -60,7 +60,7 @@ unified_inventory.register_button("home_gui_set", {
 		else
 			minetest.chat_send_player(player_name,
 				S("You don't have the \"home\" privilege!"))
-			unified_inventory.set_inventory_formspec(player, unified_inventory.current_page[player_name])
+			ui.set_inventory_formspec(player, ui.current_page[player_name])
 		end
 	end,
 	condition = function(player)
@@ -68,7 +68,7 @@ unified_inventory.register_button("home_gui_set", {
 	end,
 })
 
-unified_inventory.register_button("home_gui_go", {
+ui.register_button("home_gui_go", {
 	type = "image",
 	image = "ui_gohome_icon.png",
 	tooltip = S("Go home"),
@@ -76,13 +76,13 @@ unified_inventory.register_button("home_gui_go", {
 	action = function(player)
 		local player_name = player:get_player_name()
 		if minetest.check_player_privs(player_name, {home=true}) then
-			if unified_inventory.go_home(player) then
+			if ui.go_home(player) then
 				minetest.sound_play("teleport", {to_player = player_name})
 			end
 		else
 			minetest.chat_send_player(player_name,
 				S("You don't have the \"home\" privilege!"))
-			unified_inventory.set_inventory_formspec(player, unified_inventory.current_page[player_name])
+			ui.set_inventory_formspec(player, ui.current_page[player_name])
 		end
 	end,
 	condition = function(player)
@@ -90,7 +90,7 @@ unified_inventory.register_button("home_gui_go", {
 	end,
 })
 
-unified_inventory.register_button("misc_set_day", {
+ui.register_button("misc_set_day", {
 	type = "image",
 	image = "ui_sun_icon.png",
 	tooltip = S("Set time to day"),
@@ -106,7 +106,7 @@ unified_inventory.register_button("misc_set_day", {
 		else
 			minetest.chat_send_player(player_name,
 				S("You don't have the settime privilege!"))
-			unified_inventory.set_inventory_formspec(player, unified_inventory.current_page[player_name])
+			ui.set_inventory_formspec(player, ui.current_page[player_name])
 		end
 	end,
 	condition = function(player)
@@ -114,7 +114,7 @@ unified_inventory.register_button("misc_set_day", {
 	end,
 })
 
-unified_inventory.register_button("misc_set_night", {
+ui.register_button("misc_set_night", {
 	type = "image",
 	image = "ui_moon_icon.png",
 	tooltip = S("Set time to night"),
@@ -130,7 +130,7 @@ unified_inventory.register_button("misc_set_night", {
 		else
 			minetest.chat_send_player(player_name,
 					S("You don't have the settime privilege!"))
-			unified_inventory.set_inventory_formspec(player, unified_inventory.current_page[player_name])
+			ui.set_inventory_formspec(player, ui.current_page[player_name])
 		end
 	end,
 	condition = function(player)
@@ -138,19 +138,19 @@ unified_inventory.register_button("misc_set_night", {
 	end,
 })
 
-unified_inventory.register_button("clear_inv", {
+ui.register_button("clear_inv", {
 	type = "image",
 	image = "ui_trash_icon.png",
 	tooltip = S("Clear inventory"),
 	action = function(player)
 		local player_name = player:get_player_name()
-		if not unified_inventory.is_creative(player_name) then
+		if not ui.is_creative(player_name) then
 			minetest.chat_send_player(player_name,
 					S("This button has been disabled outside"
 					.." of creative mode to prevent"
 					.." accidental inventory trashing."
 					.."\nUse the trash slot instead."))
-			unified_inventory.set_inventory_formspec(player, unified_inventory.current_page[player_name])
+			ui.set_inventory_formspec(player, ui.current_page[player_name])
 			return
 		end
 		player:get_inventory():set_list("main", {})
@@ -159,35 +159,42 @@ unified_inventory.register_button("clear_inv", {
 				{to_player=player_name, gain = 1.0})
 	end,
 	condition = function(player)
-		return unified_inventory.is_creative(player:get_player_name())
+		return ui.is_creative(player:get_player_name())
 	end,
 })
 
-unified_inventory.register_page("craft", {
+ui.register_page("craft", {
 	get_formspec = function(player, perplayer_formspec)
 
-		local formspecy = perplayer_formspec.formspec_y
-		local formheadery =  perplayer_formspec.form_header_y
+		local formheaderx = perplayer_formspec.form_header_x
+		local formheadery = perplayer_formspec.form_header_y
+		local craftx = perplayer_formspec.craft_x
+		local crafty = perplayer_formspec.craft_y
 
 		local player_name = player:get_player_name()
-		local formspec = "background[2,"..formspecy..";6,3;ui_crafting_form.png]"
-		formspec = formspec.."background[0,"..(formspecy + 3.5)..";8,4;ui_main_inventory.png]"
-		formspec = formspec.."label[0,"..formheadery..";" ..F(S("Crafting")).."]"
-		formspec = formspec.."listcolors[#00000000;#00000000]"
-		formspec = formspec.."list[current_player;craftpreview;6,"..formspecy..";1,1;]"
-		formspec = formspec.."list[current_player;craft;2,"..formspecy..";3,3;]"
-		if unified_inventory.trash_enabled or unified_inventory.is_creative(player_name) or minetest.get_player_privs(player_name).give then
-			formspec = formspec.."label[7,"..(formspecy + 1.5)..";" .. F(S("Trash:")) .. "]"
-			formspec = formspec.."background[7,"..(formspecy + 2)..";1,1;ui_single_slot.png]"
-			formspec = formspec.."list[detached:trash;main;7,"..(formspecy + 2)..";1,1;]"
+		local formspec = {
+			perplayer_formspec.standard_inv_bg,
+			perplayer_formspec.craft_grid,
+			"label["..formheaderx..","..formheadery..";" ..F(S("Crafting")).."]",
+			"listcolors[#00000000;#00000000]",
+			"listring[current_name;craft]",
+			"listring[current_player;main]"
+		}
+		local n=#formspec+1
+
+		if ui.trash_enabled or ui.is_creative(player_name) or minetest.get_player_privs(player_name).give then
+			formspec[n] = string.format("label[%f,%f;%s]", craftx + 6.45, crafty + 2.4, F(S("Trash:")))
+			formspec[n+1] = ui.make_trash_slot(craftx + 6.25, crafty + 2.5)
+			n=n + 2
 		end
-		formspec = formspec.."listring[current_name;craft]"
-		formspec = formspec.."listring[current_player;main]"
-		if unified_inventory.is_creative(player_name) then
-			formspec = formspec.."label[0,"..(formspecy + 1.5)..";" .. F(S("Refill:")) .. "]"
-			formspec = formspec.."list[detached:"..F(player_name).."refill;main;0,"..(formspecy +2)..";1,1;]"
+
+		if ui.is_creative(player_name) then
+			formspec[n] = ui.single_slot(craftx - 2.5, crafty + 2.5)
+			formspec[n+1] = string.format("label[%f,%f;%s]", craftx - 2.3, crafty + 2.4,F(S("Refill:")))
+			formspec[n+2] = string.format("list[detached:%srefill;main;%f,%f;1,1;]",
+				F(player_name), craftx - 2.5 + ui.list_img_offset, crafty + 2.5 + ui.list_img_offset)
 		end
-		return {formspec=formspec}
+		return {formspec=table.concat(formspec)}
 	end,
 })
 
@@ -206,18 +213,18 @@ local function stack_image_button(x, y, w, h, buttonname_prefix, item)
 	local selectitem = name
 	if name:sub(1, 6) == "group:" then
 		local group_name = name:sub(7)
-		local group_item = unified_inventory.get_group_item(group_name)
+		local group_item = ui.get_group_item(group_name)
 		show_is_group = not group_item.sole
 		displayitem = group_item.item or "unknown"
 		selectitem = group_item.sole and displayitem or name
 	end
 	local label = show_is_group and "G" or ""
-	local buttonname = F(buttonname_prefix..unified_inventory.mangle_for_formspec(selectitem))
+	local buttonname = F(buttonname_prefix..ui.mangle_for_formspec(selectitem))
 	local button = string.format("item_image_button[%f,%f;%f,%f;%s;%s;%s]",
 			x, y, w, h,
 			F(displayitem), buttonname, label)
 	if show_is_group then
-		local groupstring, andcount = unified_inventory.extract_groupnames(name)
+		local groupstring, andcount = ui.extract_groupnames(name)
 		local grouptip
 		if andcount == 1 then
 			grouptip = S("Any item belonging to the @1 group", groupstring)
@@ -257,26 +264,33 @@ local other_dir = {
 	usage = "recipe",
 }
 
-unified_inventory.register_page("craftguide", {
+ui.register_page("craftguide", {
 	get_formspec = function(player, perplayer_formspec)
 
-		local formspecy =    perplayer_formspec.formspec_y
-		local formheadery =  perplayer_formspec.form_header_y
-		local craftresultx = perplayer_formspec.craft_result_x
-		local craftresulty = perplayer_formspec.craft_result_y
+		local craftguidex =       perplayer_formspec.craft_guide_x
+		local craftguidey =       perplayer_formspec.craft_guide_y
+		local craftguidearrowx =  perplayer_formspec.craft_guide_arrow_x
+		local craftguideresultx = perplayer_formspec.craft_guide_result_x
+		local formheaderx =       perplayer_formspec.form_header_x
+		local formheadery =       perplayer_formspec.form_header_y
+		local give_x =            perplayer_formspec.give_btn_x
 
 		local player_name = player:get_player_name()
 		local player_privs = minetest.get_player_privs(player_name)
-		local fs = {
-			"background[0,"..(formspecy + 3.5)..";8,4;ui_main_inventory.png]",
-			"label[0,"..formheadery..";" .. F(S("Crafting Guide")) .. "]",
+
+		local formspec = {
+			perplayer_formspec.standard_inv_bg,
+			"label["..formheaderx..","..formheadery..";" .. F(S("Crafting Guide")) .. "]",
 			"listcolors[#00000000;#00000000]"
 		}
-		local item_name = unified_inventory.current_item[player_name]
+
+		local item_name = ui.current_item[player_name]
 		if not item_name then
-			return { formspec = table.concat(fs) }
+			return { formspec = table.concat(formspec) }
 		end
 
+		local n = 4
+
 		local item_name_shown
 		if minetest.registered_items[item_name]
 				and minetest.registered_items[item_name].description then
@@ -286,51 +300,60 @@ unified_inventory.register_page("craftguide", {
 			item_name_shown = item_name
 		end
 
-		local dir = unified_inventory.current_craft_direction[player_name]
+		local dir = ui.current_craft_direction[player_name]
 		local rdir = dir == "recipe" and "usage" or "recipe"
 
-		local crafts = unified_inventory.crafts_for[dir][item_name]
-		local alternate = unified_inventory.alternate[player_name]
+		local crafts = ui.crafts_for[dir][item_name]
+		local alternate = ui.alternate[player_name]
 		local alternates, craft
 		if crafts and #crafts > 0 then
 			alternates = #crafts
 			craft = crafts[alternate]
 		end
-		local has_give = player_privs.give or unified_inventory.is_creative(player_name)
+		local has_give = player_privs.give or ui.is_creative(player_name)
 
-		fs[#fs + 1] = "background[0.5,"..(formspecy + 0.2)..";8,3;ui_craftguide_form.png]"
-		fs[#fs + 1] = string.format("textarea[%f,%f;10,1;;%s: %s;]",
-				craftresultx, craftresulty, F(role_text[dir]), item_name_shown)
-		fs[#fs + 1] = stack_image_button(0, formspecy, 1.1, 1.1,
-				"item_button_" .. rdir .. "_", ItemStack(item_name))
+		formspec[n] = string.format("image[%f,%f;%f,%f;ui_crafting_arrow.png]",
+	                            craftguidearrowx, craftguidey, ui.imgscale, ui.imgscale)
+
+		formspec[n+1] = string.format("textarea[%f,%f;10,1;;%s: %s;]",
+				perplayer_formspec.craft_guide_resultstr_x, perplayer_formspec.craft_guide_resultstr_y,
+				F(role_text[dir]), item_name_shown)
+		n = n + 2
+
+		local giveme_form = table.concat({
+			"label[".. (give_x+0.1)..",".. (craftguidey + 2.7) .. ";" .. F(S("Give me:")) .. "]",
+			"button["..(give_x)..","..     (craftguidey + 2.9) .. ";0.75,0.5;craftguide_giveme_1;1]",
+			"button["..(give_x+0.8)..",".. (craftguidey + 2.9) .. ";0.75,0.5;craftguide_giveme_10;10]",
+			"button["..(give_x+1.6)..",".. (craftguidey + 2.9) .. ";0.75,0.5;craftguide_giveme_99;99]"
+		})
 
 		if not craft then
 			-- No craft recipes available for this item.
-			fs[#fs + 1] = "label[5.5,"..(formspecy + 2.35)..";"
-					.. F(no_recipe_text[dir]) .. "]"
-			local no_pos = dir == "recipe" and 4.5 or 6.5
-			local item_pos = dir == "recipe" and 6.5 or 4.5
-			fs[#fs + 1] = "image["..no_pos..","..formspecy..";1.1,1.1;ui_no.png]"
-			fs[#fs + 1] = stack_image_button(item_pos, formspecy, 1.1, 1.1,
+			formspec[n] = string.format("label[%f,%f;%s]", craftguidex+2.5, craftguidey+1.5, F(no_recipe_text[dir]))
+			local no_pos = dir == "recipe" and (craftguidex+2.5) or craftguideresultx
+			local item_pos = dir == "recipe" and craftguideresultx or (craftguidex+2.5)
+			formspec[n+1] = "image["..no_pos..","..craftguidey..";1.2,1.2;ui_no.png]"
+			formspec[n+2] = stack_image_button(item_pos, craftguidey, 1.2, 1.2,
 				"item_button_" .. other_dir[dir] .. "_", ItemStack(item_name))
 			if has_give then
-				fs[#fs + 1] = "label[0," .. (formspecy + 2.10) .. ";" .. F(S("Give me:")) .. "]"
-						.. "button[0,  " .. (formspecy + 2.7) .. ";0.6,0.5;craftguide_giveme_1;1]"
-						.. "button[0.6," .. (formspecy + 2.7) .. ";0.7,0.5;craftguide_giveme_10;10]"
-						.. "button[1.3," .. (formspecy + 2.7) .. ";0.8,0.5;craftguide_giveme_99;99]"
+				formspec[n+3] = giveme_form
 			end
-			return { formspec = table.concat(fs) }
+			return { formspec = table.concat(formspec) }
+		else
+			formspec[n] = stack_image_button(craftguideresultx, craftguidey, 1.2, 1.2,
+					"item_button_" .. rdir .. "_", ItemStack(craft.output))
+			n = n + 1
 		end
 
-		local craft_type = unified_inventory.registered_craft_types[craft.type] or
-				unified_inventory.craft_type_defaults(craft.type, {})
+		local craft_type = ui.registered_craft_types[craft.type] or
+				ui.craft_type_defaults(craft.type, {})
 		if craft_type.icon then
-			fs[#fs + 1] = string.format("image[%f,%f;%f,%f;%s]",
-					5.7, (formspecy + 0.05), 0.5, 0.5, craft_type.icon)
+			formspec[n] = string.format("image[%f,%f;%f,%f;%s]",
+					craftguidearrowx+0.35, craftguidey, 0.5, 0.5, craft_type.icon)
+			n = n + 1
 		end
-		fs[#fs + 1] = "label[5.5,"..(formspecy + 1)..";" .. F(craft_type.description).."]"
-		fs[#fs + 1] = stack_image_button(6.5, formspecy, 1.1, 1.1,
-				"item_button_usage_", ItemStack(craft.output))
+		formspec[n] = string.format("label[%f,%f;%s]", craftguidearrowx + 0.15, craftguidey + 1.4, F(craft_type.description))
+		n = n + 1
 
 		local display_size = craft_type.dynamic_display_size
 				and craft_type.dynamic_display_size(craft)
@@ -341,11 +364,12 @@ unified_inventory.register_page("craftguide", {
 
 		-- This keeps recipes aligned to the right,
 		-- so that they're close to the arrow.
-		local xoffset = 5.5
+		local xoffset = craftguidex+3.75
+		local bspc = 1.25
 		-- Offset factor for crafting grids with side length > 4
 		local of = (3/math.max(3, math.max(display_size.width, display_size.height)))
 		local od = 0
-		-- Minimum grid size at which size optimazation measures kick in
+		-- Minimum grid size at which size optimization measures kick in
 		local mini_craft_size = 6
 		if display_size.width >= mini_craft_size then
 			od = math.max(1, display_size.width - 2)
@@ -354,12 +378,12 @@ unified_inventory.register_page("craftguide", {
 		-- Size modifier factor
 		local sf = math.min(1, of * (1.05 + 0.05*od))
 		-- Button size
-		local bsize_h = 1.1 * sf
-		local bsize_w = bsize_h
-		if display_size.width >= mini_craft_size then
-			bsize_w = 1.175 * sf
+		local bsize = 1.2 * sf
+
+		if display_size.width >= mini_craft_size then  -- it's not a normal 3x3 grid
+			bsize = 0.8 * sf
 		end
-		if (bsize_h > 0.35 and display_size.width) then
+		if (bsize > 0.35 and display_size.width) then
 		for y = 1, display_size.height do
 		for x = 1, display_size.width do
 			local item
@@ -369,48 +393,53 @@ unified_inventory.register_page("craftguide", {
 			-- Flipped x, used to build formspec buttons from right to left
 			local fx = display_size.width - (x-1)
 			-- x offset, y offset
-			local xof = (fx-1) * of + of
-			local yof = (y-1) * of + 1
+			local xof = ((fx-1) * of + of) * bspc
+			local yof = ((y-1) * of + 1) * bspc
 			if item then
-				fs[#fs + 1] = stack_image_button(
-						xoffset - xof, formspecy - 1 + yof, bsize_w, bsize_h,
+				formspec[n] = stack_image_button(
+						xoffset - xof, craftguidey - 1.25 + yof, bsize, bsize,
 						"item_button_recipe_",
 						ItemStack(item))
 			else
 				-- Fake buttons just to make grid
-				fs[#fs + 1] = string.format("image_button[%f,%f;%f,%f;ui_blank_image.png;;]",
-						xoffset - xof, formspecy - 1 + yof, bsize_w, bsize_h)
+				formspec[n] = string.format("image_button[%f,%f;%f,%f;ui_blank_image.png;;]",
+						xoffset - xof, craftguidey - 1.25 + yof, bsize, bsize)
 			end
+			n = n + 1
 		end
 		end
 		else
 			-- Error
-			fs[#fs + 1] = string.format("label[2,%f;%s]",
-				formspecy, F(S("This recipe is too@nlarge to be displayed.")))
+			formspec[n] = string.format("label[2,%f;%s]",
+				craftguidey, F(S("This recipe is too@nlarge to be displayed.")))
+			n = n + 1
 		end
 
 		if craft_type.uses_crafting_grid and display_size.width <= 3 then
-			fs[#fs + 1] = "label[0," .. (formspecy + 0.9) .. ";" .. F(S("To craft grid:")) .. "]"
-					.. "button[0,  " .. (formspecy + 1.5) .. ";0.6,0.5;craftguide_craft_1;1]"
-					.. "button[0.6," .. (formspecy + 1.5) .. ";0.7,0.5;craftguide_craft_10;10]"
-					.. "button[1.3," .. (formspecy + 1.5) .. ";0.8,0.5;craftguide_craft_max;" .. F(S("All")) .. "]"
+			formspec[n]   = "label["..(give_x+0.1)..","..    (craftguidey + 1.7) .. ";" .. F(S("To craft grid:")) .. "]"
+			formspec[n+1] = "button["..  (give_x)..","..     (craftguidey + 1.9) .. ";0.75,0.5;craftguide_craft_1;1]"
+			formspec[n+2] = "button["..  (give_x+0.8)..",".. (craftguidey + 1.9) .. ";0.75,0.5;craftguide_craft_10;10]"
+			formspec[n+3] = "button["..  (give_x+1.6)..",".. (craftguidey + 1.9) .. ";0.75,0.5;craftguide_craft_max;" .. F(S("All")) .. "]"
+			n = n + 4
 		end
+
 		if has_give then
-			fs[#fs + 1] = "label[0," .. (formspecy + 2.1) .. ";" .. F(S("Give me:")) .. "]"
-					.. "button[0,  " .. (formspecy + 2.7) .. ";0.6,0.5;craftguide_giveme_1;1]"
-					.. "button[0.6," .. (formspecy + 2.7) .. ";0.7,0.5;craftguide_giveme_10;10]"
-					.. "button[1.3," .. (formspecy + 2.7) .. ";0.8,0.5;craftguide_giveme_99;99]"
+			formspec[n] = giveme_form
+			n = n + 1
 		end
 
 		if alternates and alternates > 1 then
-			fs[#fs + 1] = "label[5.5," .. (formspecy + 1.6) .. ";"
-					.. F(S(recipe_text[dir], alternate, alternates)) .. "]"
-					.. "image_button[5.5," .. (formspecy + 2) .. ";1,1;ui_left_icon.png;alternate_prev;]"
-					.. "image_button[6.5," .. (formspecy + 2) .. ";1,1;ui_right_icon.png;alternate;]"
-					.. "tooltip[alternate_prev;" .. F(prev_alt_text[dir]) .. "]"
-					.. "tooltip[alternate;" .. F(next_alt_text[dir]) .. "]"
+			formspec[n] = string.format("label[%f,%f;%s]",
+						craftguidex+4, craftguidey + 2.3, F(S(recipe_text[dir], alternate, alternates)))
+			formspec[n+1] = string.format("image_button[%f,%f;1.1,1.1;ui_left_icon.png;alternate_prev;]",
+						craftguidearrowx+0.2, craftguidey + 2.6)
+			formspec[n+2] = string.format("image_button[%f,%f;1.1,1.1;ui_right_icon.png;alternate;]",
+						craftguidearrowx+1.35, craftguidey + 2.6)
+			formspec[n+3] = "tooltip[alternate_prev;" .. F(prev_alt_text[dir]) .. "]"
+			formspec[n+4] = "tooltip[alternate;" .. F(next_alt_text[dir]) .. "]"
 		end
-		return { formspec = table.concat(fs) }
+
+		return { formspec = table.concat(formspec) }
 	end,
 })
 
@@ -418,7 +447,7 @@ local function craftguide_giveme(player, formname, fields)
 	local player_name = player:get_player_name()
 	local player_privs = minetest.get_player_privs(player_name)
 	if not player_privs.give and
-			not unified_inventory.is_creative(player_name) then
+			not ui.is_creative(player_name) then
 		minetest.log("action", "[unified_inventory] Denied give action to player " ..
 			player_name)
 		return
@@ -433,7 +462,7 @@ local function craftguide_giveme(player, formname, fields)
 	amount = tonumber(amount) or 0
 	if amount == 0 then return end
 
-	local output = unified_inventory.current_item[player_name]
+	local output = ui.current_item[player_name]
 	if (not output) or (output == "") then return end
 
 	local player_inv = player:get_inventory()
@@ -454,21 +483,21 @@ local function craftguide_craft(player, formname, fields)
 
 	local player_name = player:get_player_name()
 
-	local output = unified_inventory.current_item[player_name] or ""
+	local output = ui.current_item[player_name] or ""
 	if output == "" then return end
 
-	local crafts = unified_inventory.crafts_for[
-		unified_inventory.current_craft_direction[player_name]][output] or {}
+	local crafts = ui.crafts_for[
+		ui.current_craft_direction[player_name]][output] or {}
 	if #crafts == 0 then return end
 
-	local alternate = unified_inventory.alternate[player_name]
+	local alternate = ui.alternate[player_name]
 
 	local craft = crafts[alternate]
 	if craft.width > 3 then return end
 
-	unified_inventory.craftguide_match_craft(player, "main", "craft", craft, amount)
+	ui.craftguide_match_craft(player, "main", "craft", craft, amount)
 
-	unified_inventory.set_inventory_formspec(player, "craft")
+	ui.set_inventory_formspec(player, "craft")
 end
 
 minetest.register_on_player_receive_fields(function(player, formname, fields)
diff --git a/unified_inventory/settingtypes.txt b/unified_inventory/settingtypes.txt
index 910989f..27768ac 100644
--- a/unified_inventory/settingtypes.txt
+++ b/unified_inventory/settingtypes.txt
@@ -9,3 +9,6 @@ unified_inventory_bags (Enable bags) bool true
 #If enabled, the trash slot can be used by those without both creative
 #and the give privilege.
 unified_inventory_trash (Enable trash) bool true
+
+
+unified_inventory_automatic_categorization (Items automatically added to categories) bool true
\ No newline at end of file
diff --git a/unified_inventory/textures/ui_bags_lg_form.png b/unified_inventory/textures/ui_bags_lg_form.png
deleted file mode 100644
index 24dab30..0000000
Binary files a/unified_inventory/textures/ui_bags_lg_form.png and /dev/null differ
diff --git a/unified_inventory/textures/ui_bags_main_form.png b/unified_inventory/textures/ui_bags_main_form.png
deleted file mode 100644
index 8c168d2..0000000
Binary files a/unified_inventory/textures/ui_bags_main_form.png and /dev/null differ
diff --git a/unified_inventory/textures/ui_bags_med_form.png b/unified_inventory/textures/ui_bags_med_form.png
deleted file mode 100644
index 27a1591..0000000
Binary files a/unified_inventory/textures/ui_bags_med_form.png and /dev/null differ
diff --git a/unified_inventory/textures/ui_bags_sm_form.png b/unified_inventory/textures/ui_bags_sm_form.png
deleted file mode 100644
index 6234eb8..0000000
Binary files a/unified_inventory/textures/ui_bags_sm_form.png and /dev/null differ
diff --git a/unified_inventory/textures/ui_bags_trash.png b/unified_inventory/textures/ui_bags_trash.png
deleted file mode 100644
index 0bc11c5..0000000
Binary files a/unified_inventory/textures/ui_bags_trash.png and /dev/null differ
diff --git a/unified_inventory/textures/ui_category_all.png b/unified_inventory/textures/ui_category_all.png
new file mode 100644
index 0000000..0af7a53
Binary files /dev/null and b/unified_inventory/textures/ui_category_all.png differ
diff --git a/unified_inventory/textures/ui_category_none.png b/unified_inventory/textures/ui_category_none.png
new file mode 100644
index 0000000..8976fb0
Binary files /dev/null and b/unified_inventory/textures/ui_category_none.png differ
diff --git a/unified_inventory/textures/ui_craftguide_form.png b/unified_inventory/textures/ui_craftguide_form.png
deleted file mode 100644
index d9be53f..0000000
Binary files a/unified_inventory/textures/ui_craftguide_form.png and /dev/null differ
diff --git a/unified_inventory/textures/ui_crafting_arrow.png b/unified_inventory/textures/ui_crafting_arrow.png
new file mode 100644
index 0000000..6901c58
Binary files /dev/null and b/unified_inventory/textures/ui_crafting_arrow.png differ
diff --git a/unified_inventory/textures/ui_crafting_form.png b/unified_inventory/textures/ui_crafting_form.png
deleted file mode 100644
index 9043287..0000000
Binary files a/unified_inventory/textures/ui_crafting_form.png and /dev/null differ
diff --git a/unified_inventory/textures/ui_form_bg.png b/unified_inventory/textures/ui_form_bg.png
deleted file mode 100644
index d973b34..0000000
Binary files a/unified_inventory/textures/ui_form_bg.png and /dev/null differ
diff --git a/unified_inventory/textures/ui_formbg_9_sliced.png b/unified_inventory/textures/ui_formbg_9_sliced.png
new file mode 100644
index 0000000..0b8463c
Binary files /dev/null and b/unified_inventory/textures/ui_formbg_9_sliced.png differ
diff --git a/unified_inventory/textures/ui_main_inventory.png b/unified_inventory/textures/ui_main_inventory.png
deleted file mode 100644
index b7860ca..0000000
Binary files a/unified_inventory/textures/ui_main_inventory.png and /dev/null differ
diff --git a/unified_inventory/textures/ui_misc_form.png b/unified_inventory/textures/ui_misc_form.png
deleted file mode 100644
index 2d6ad01..0000000
Binary files a/unified_inventory/textures/ui_misc_form.png and /dev/null differ
diff --git a/unified_inventory/textures/ui_single_slot.png b/unified_inventory/textures/ui_single_slot.png
index 63da98d..2451623 100644
Binary files a/unified_inventory/textures/ui_single_slot.png and b/unified_inventory/textures/ui_single_slot.png differ
diff --git a/unified_inventory/textures/ui_single_slot_bright.png b/unified_inventory/textures/ui_single_slot_bright.png
new file mode 100644
index 0000000..c66365c
Binary files /dev/null and b/unified_inventory/textures/ui_single_slot_bright.png differ
diff --git a/unified_inventory/textures/ui_smallbg_9_sliced.png b/unified_inventory/textures/ui_smallbg_9_sliced.png
new file mode 100644
index 0000000..865e0c9
Binary files /dev/null and b/unified_inventory/textures/ui_smallbg_9_sliced.png differ
diff --git a/unified_inventory/textures/ui_trash_slot_icon.png b/unified_inventory/textures/ui_trash_slot_icon.png
new file mode 100644
index 0000000..5fc4de1
Binary files /dev/null and b/unified_inventory/textures/ui_trash_slot_icon.png differ
diff --git a/unified_inventory/textures/ui_xyz_off_icon.png b/unified_inventory/textures/ui_xyz_off_icon.png
deleted file mode 100644
index 3c1836e..0000000
Binary files a/unified_inventory/textures/ui_xyz_off_icon.png and /dev/null differ
diff --git a/unified_inventory/textures/ui_xyz_on_icon.png b/unified_inventory/textures/ui_xyz_on_icon.png
deleted file mode 100644
index 003ea63..0000000
Binary files a/unified_inventory/textures/ui_xyz_on_icon.png and /dev/null differ
diff --git a/unified_inventory/waypoints.lua b/unified_inventory/waypoints.lua
index e23ef4b..2a8ead4 100644
--- a/unified_inventory/waypoints.lua
+++ b/unified_inventory/waypoints.lua
@@ -1,5 +1,6 @@
 local S = minetest.get_translator("unified_inventory")
 local F = minetest.formspec_escape
+local ui = unified_inventory
 
 local hud_colors = {
 	{"#FFFFFF", 0xFFFFFF, S("White")},
@@ -14,28 +15,38 @@ local hud_colors_max = #hud_colors
 -- Stores temporary player data (persists until player leaves)
 local waypoints_temp = {}
 
-unified_inventory.register_page("waypoints", {
+ui.register_page("waypoints", {
 	get_formspec = function(player)
 		local player_name = player:get_player_name()
+		local wp_info_x = ui.style_full.form_header_x + 1.25
+		local wp_info_y = ui.style_full.form_header_y + 0.5
+		local wp_bottom_row = ui.style_full.std_inv_y - 1
+		local wp_buttons_rj = ui.style_full.std_inv_x + 10.1 - ui.style_full.btn_spc
+		local wp_edit_w = ui.style_full.btn_spc * 4 - 0.1
 
 		-- build a "fake" temp entry if the server took too long
 		-- during sign-on and returned an empty entry
 		if not waypoints_temp[player_name] then waypoints_temp[player_name] = {hud = 1} end
 
 		local waypoints = datastorage.get(player_name, "waypoints")
-		local formspec = "background[0,4.5;8,4;ui_main_inventory.png]" ..
-			"image[0,0;1,1;ui_waypoints_icon.png]" ..
-			"label[1,0;" .. F(S("Waypoints")) .. "]"
+		local formspec = { ui.style_full.standard_inv_bg,
+			string.format("label[%f,%f;%s]",
+				ui.style_full.form_header_x, ui.style_full.form_header_y,
+				F(S("Waypoints"))),
+			"image["..wp_info_x..","..wp_info_y..";1,1;ui_waypoints_icon.png]"
+		}
+		local n=4
 
 		-- Tabs buttons:
-		for i = 1, 5, 1 do
-			formspec = formspec ..
-				"image_button[0.0," .. 0.2 + i * 0.7 .. ";.8,.8;" ..
-				(i == waypoints.selected and "ui_blue_icon_background.png^" or "") ..
-				"ui_" .. i .. "_icon.png;" ..
-				"select_waypoint" .. i .. ";]" ..
-				"tooltip[select_waypoint" .. i .. ";"
-					.. S("Select Waypoint #@1", i).."]"
+		for i = 1, 5 do
+			local sw="select_waypoint"..i
+			formspec[n] = string.format("image_button[%f,%f;%f,%f;%sui_%i_icon.png;%s;]",
+				ui.style_full.main_button_x, wp_bottom_row - (5-i) * ui.style_full.btn_spc,
+				ui.style_full.btn_size, ui.style_full.btn_size,
+				(i == waypoints.selected) and "ui_blue_icon_background.png^" or "",
+				i, sw)
+			formspec[n+1] = "tooltip["..sw..";"..S("Select Waypoint #@1", i).."]"
+			n = n + 2
 		end
 
 		local i = waypoints.selected or 1
@@ -44,72 +55,58 @@ unified_inventory.register_page("waypoints", {
 		local default_name = S("Waypoint @1", i)
 
 		-- Main buttons:
-		formspec = formspec ..
-			"image_button[4.5,3.7;.8,.8;"..
-			"ui_waypoint_set_icon.png;"..
-			"set_waypoint"..i..";]"..
-			"tooltip[set_waypoint" .. i .. ";"
-				.. F(S("Set waypoint to current location")).."]"
+		local btnlist = {
+			{ "ui_waypoint_set_icon.png", "set_waypoint", S("Set waypoint to current location") },
+			{ waypoint.active and "ui_on_icon.png" or "ui_off_icon.png", "toggle_waypoint", S("Make waypoint @1", waypoint.active and "invisible" or "visible") },
+			{ waypoint.display_pos and "ui_green_icon_background.png^ui_xyz_icon.png" or "ui_red_icon_background.png^ui_xyz_icon.png^(ui_no.png^[transformR90)", "toggle_display_pos", S("@1 display of waypoint coordinates", waypoint.display_pos and "Disable" or "Enable") },
+			{ "ui_circular_arrows_icon.png", "toggle_color", S("Change color of waypoint display") },
+			{ "ui_pencil_icon.png", "rename_waypoint", S("Edit waypoint name") }
+		}
 
-		formspec = formspec ..
-			"image_button[5.2,3.7;.8,.8;"..
-			(waypoint.active and "ui_on_icon.png" or "ui_off_icon.png")..";"..
-			"toggle_waypoint"..i..";]"..
-			"tooltip[toggle_waypoint" .. i .. ";"
-				.. F(S("Make waypoint @1",
-					waypoint.active and S("invisible") or S("visible"))).."]"
-
-		formspec = formspec ..
-			"image_button[5.9,3.7;.8,.8;"..
-			(waypoint.display_pos and "ui_green_icon_background.png" or "ui_red_icon_background.png").."^ui_xyz_icon.png;"..
-			"toggle_display_pos" .. i .. ";]"..
-			"tooltip[toggle_display_pos" .. i .. ";"
-				.. F(S("@1 display of waypoint coordinates",
-					waypoint.display_pos and S("Disable") or S("Enable"))) .."]"
-
-		formspec = formspec ..
-			"image_button[6.6,3.7;.8,.8;"..
-			"ui_circular_arrows_icon.png;"..
-			"toggle_color"..i..";]"..
-			"tooltip[toggle_color" .. i .. ";"
-				.. F(S("Change color of waypoint display")).."]"
-
-		formspec = formspec ..
-			"image_button[7.3,3.7;.8,.8;"..
-			"ui_pencil_icon.png;"..
-			"rename_waypoint"..i..";]"..
-			"tooltip[rename_waypoint" .. i .. ";"
-				.. F(S("Edit waypoint name")).."]"
+		local x = 4
+		for _, b in pairs(btnlist) do
+			formspec[n] = string.format("image_button[%f,%f;%f,%f;%s;%s%i;]",
+				wp_buttons_rj - ui.style_full.btn_spc * x, wp_bottom_row,
+				ui.style_full.btn_size, ui.style_full.btn_size,
+				b[1], b[2], i)
+			formspec[n+1] = "tooltip["..b[2]..i..";"..F(b[3]).."]"
+			x = x - 1
+			n = n + 2
+		end
 
 		-- Waypoint's info:
+		formspec[n] = "label["..wp_info_x..","..(wp_info_y+1.1)..";"
 		if waypoint.active then
-			formspec = formspec .. 	"label[1,0.8;"..F(S("Waypoint active")).."]"
+			formspec[n+1] = F(S("Waypoint active")).."]"
 		else
-			formspec = formspec .. 	"label[1,0.8;"..F(S("Waypoint inactive")).."]"
+			formspec[n+1] = F(S("Waypoint inactive")).."]"
 		end
+		n = n + 2
 
 		if temp.edit then
-			formspec = formspec ..
-				"field[1.3,3.2;6,.8;rename_box" .. i .. ";;"
-				..(waypoint.name or default_name).."]" ..
-				"image_button[7.3,2.9;.8,.8;"..
-				"ui_ok_icon.png;"..
-				"confirm_rename"..i.. ";]"..
-				"tooltip[confirm_rename" .. i .. ";"
-					.. F(S("Finish editing")).."]"
+			formspec[n] = string.format("field[%f,%f;%f,%f;rename_box%i;;%s]",
+				wp_buttons_rj - wp_edit_w - 0.1, wp_bottom_row - ui.style_full.btn_spc,
+				wp_edit_w, ui.style_full.btn_size, i, (waypoint.name or default_name))
+			formspec[n+1] = string.format("image_button[%f,%f;%f,%f;ui_ok_icon.png;confirm_rename%i;]",
+				wp_buttons_rj, wp_bottom_row - ui.style_full.btn_spc,
+				ui.style_full.btn_size, ui.style_full.btn_size, i)
+			formspec[n+2] = "tooltip[confirm_rename"..i..";"..F(S("Finish editing")).."]"
+			n = n + 3
 		end
 
-		formspec = formspec .. "label[1,1.3;"..F(S("World position"))..": " ..
-			minetest.pos_to_string(waypoint.world_pos or vector.new()) .. "]" ..
-			"label[1,1.8;"..F(S("Name"))..": ".. (waypoint.name or default_name) .. "]" ..
-			"label[1,2.3;"..F(S("HUD text color"))..": " ..
-			hud_colors[waypoint.color or 1][3] .. "]"
+		formspec[n] = string.format("label[%f,%f;%s: %s]",
+			wp_info_x, wp_info_y+1.6, F(S("World position")),
+			minetest.pos_to_string(waypoint.world_pos or vector.new()))
+		formspec[n+1] = string.format("label[%f,%f;%s: %s]",
+			wp_info_x, wp_info_y+2.10, F(S("Name")), (waypoint.name or default_name))
+		formspec[n+2] = string.format("label[%f,%f;%s: %s]",
+			wp_info_x, wp_info_y+2.60, F(S("HUD text color")), hud_colors[waypoint.color or 1][3])
 
-		return {formspec=formspec}
+		return {formspec=table.concat(formspec)}
 	end,
 })
 
-unified_inventory.register_button("waypoints", {
+ui.register_button("waypoints", {
 	type = "image",
 	image = "ui_waypoints_icon.png",
 	tooltip = S("Waypoints"),
@@ -224,7 +221,7 @@ minetest.register_on_player_receive_fields(function(player, formname, fields)
 			update_hud(player, waypoints, temp, i)
 		end
 		if update_formspec then
-			unified_inventory.set_inventory_formspec(player, "waypoints")
+			ui.set_inventory_formspec(player, "waypoints")
 		end
 		if hit then return end
 	end