Merge branch 'master' into cesky-hvozd

Throw away most of the changes in everything except line_automation.
Merge line_automation changes between CH and master

1 files changed, 8 insertions, 16 deletions

diff --git a/advtrains_trackmap/viewer.lua b/advtrains_trackmap/viewer.lua
index c21d5e1..2ea54ce 100644
--- a/advtrains_trackmap/viewer.lua
+++ b/advtrains_trackmap/viewer.lua
@@ -6,7 +6,7 @@ local tm = advtrains.trackmap
 local function node_left_click(pos, pname)

 	local node_ok, conns, rail_y=advtrains.get_rail_info_at(pos)

 	if not node_ok then

-		minetest.chat_send_player(pname, "Toto není kolej!")

+		minetest.chat_send_player(pname, "Node is not a track!")

 		return

 	end

 	

@@ -25,11 +25,10 @@ end
 

 

 minetest.register_craftitem("advtrains_trackmap:tool",{

-	description = "nástroj na mapování kolejí",

-	_ch_help = "levý klik na kolej pro zobrazení „mapy“",

+	description = "Trackmap Tool\nPunch: Show map",

 	groups = {cracky=1}, -- key=name, value=rating; rating=1..3.

-	inventory_image = "ch_core_white_pixel.png^[multiply:#dddddd^[resize:32x32^(at_il_tool.png^[resize:32x32)",

-	wield_image = "ch_core_white_pixel.png^[multiply:#dddddd^[resize:32x32^(at_il_tool.png^[resize:32x32)",

+	inventory_image = "at_il_tool.png",

+	wield_image = "at_il_tool.png",

 	stack_max = 1,

 	on_use = function(itemstack, player, pointed_thing)

 		local pname = player:get_player_name()

@@ -42,15 +41,8 @@ minetest.register_craftitem("advtrains_trackmap:tool",{
 		end

 	end

 })

-

-core.register_craft({

+minetest.register_craft({

 	output = "advtrains_trackmap:tool",

-	recipe = {

-		{"advtrains_interlocking:tool", "default:paper"},

-		{"default:paper", "default:paper"},

-	},

-})

-core.register_craft({

-	output = "advtrains_interlocking:tool",

-	recipe = {{"advtrains_trackmap:tool"}},

-})

+	type = "shapeless",

+	recipe = {"dye:green","advtrains:trackworker", "default:paper"}

+})
\ No newline at end of file