Merge branch 'master' of github.com:Jeija/minetest-mod-mesecons

11 files changed, 45 insertions, 5 deletions

diff --git a/jeija/alias.lua b/jeija/alias.lua
index 091c534..90ed87b 100644
--- a/jeija/alias.lua
+++ b/jeija/alias.lua
@@ -11,3 +11,5 @@ minetest.register_alias("jeija:piston", "jeija:piston_normal")
 minetest.register_alias("jeija:blinky_plant", "jeija:blinky_plant_off")
 minetest.register_alias("jeija:mesecon_torch", "jeija:mesecon_torch_on")
 minetest.register_alias("jeija:hydro_turbine", "jeija:hydro_turbine_off")
+minetest.register_alias("jeija:pressure_plate_stone", "jeija:pressure_plate_stone_off")
+minetest.register_alias("jeija:pressure_plate_wood", "jeija:pressure_plate_wood_off")
diff --git a/jeija/button.lua b/jeija/button.lua
index e9f7128..13d2426 100644
--- a/jeija/button.lua
+++ b/jeija/button.lua
@@ -12,6 +12,7 @@ minetest.register_node("jeija:wall_button_off", {
         type = "wallmounted",
     },
     material = minetest.digprop_constanttime(0.3),
+    description="Button",
 })
 minetest.register_node("jeija:wall_button_on", {
     drawtype = "signlike",
@@ -26,6 +27,7 @@ minetest.register_node("jeija:wall_button_on", {
     },
     material = minetest.digprop_constanttime(0.3),
     drop = '"jeija:wall_button_off" 1',
+    description="Button",
 })
 
 minetest.register_on_dignode(
diff --git a/jeija/detector.lua b/jeija/detector.lua
index cd55388..e62e89c 100644
--- a/jeija/detector.lua
+++ b/jeija/detector.lua
@@ -4,6 +4,7 @@ minetest.register_node("jeija:object_detector_off", {
 	paramtype = "light",
 	walkable = true,
 	material = minetest.digprop_stonelike(4),
+	description="Player Detector",
 })
 
 minetest.register_node("jeija:object_detector_on", {
@@ -11,7 +12,8 @@ minetest.register_node("jeija:object_detector_on", {
 	paramtype = "light",
 	walkable = true,
 	material = minetest.digprop_stonelike(4),
-	drop = '"jeija:object_detector_off" 1'
+	drop = '"jeija:object_detector_off" 1',
+	description="Player Detector",
 })
 
 minetest.register_craft({
diff --git a/jeija/init.lua b/jeija/init.lua
index 2b74808..6324b9f 100644
--- a/jeija/init.lua
+++ b/jeija/init.lua
@@ -90,6 +90,7 @@ minetest.register_node("jeija:mesecon_off", {
 		type = "fixed",
 	},
 	material = minetest.digprop_constanttime(0.1),
+    	description="Mesecons",
 })
 
 minetest.register_node("jeija:mesecon_on", {
@@ -105,6 +106,7 @@ minetest.register_node("jeija:mesecon_on", {
 	material = minetest.digprop_constanttime(0.1),
 	drop = '"jeija:mesecon_off" 1',
 	light_source = LIGHT_MAX-11,
+    	description="Mesecons",
 })
 
 minetest.register_craft({
@@ -538,6 +540,7 @@ minetest.register_node("jeija:power_plant", {
 	walkable = false,
 	material = minetest.digprop_leaveslike(0.2),
 	light_source = LIGHT_MAX-9,
+    	description="Power Plant",
 })
 
 minetest.register_craft({
@@ -576,6 +579,7 @@ minetest.register_node("jeija:blinky_plant_off", {
 	paramtype = "light",
 	walkable = false,
 	material = minetest.digprop_leaveslike(0.2),
+    	description="Blinky Plant",
 })
 
 minetest.register_node("jeija:blinky_plant_on", {
@@ -588,6 +592,7 @@ minetest.register_node("jeija:blinky_plant_on", {
 	material = minetest.digprop_leaveslike(0.2),
 	drop='"jeija:blinky_plant_off" 1',
 	light_source = LIGHT_MAX-7,
+    	description="Blinky Plant",
 })
 
 minetest.register_craft({
@@ -640,6 +645,7 @@ minetest.register_on_dignode(
 minetest.register_craftitem("jeija:silicon", {
 	image = "jeija_silicon.png",
 	on_place_on_ground = minetest.craftitem_place_item,
+    	description="Silicon",
 })
 
 
@@ -656,6 +662,7 @@ minetest.register_node("jeija:solar_panel", {
 	},
 	furnace_burntime = 5,
 	material = minetest.digprop_dirtlike(0.1),
+    	description="Solar Panel",
 })
 
 minetest.register_craft({
@@ -708,6 +715,7 @@ minetest.register_node("jeija:meselamp_on", {
 	},
 	material = minetest.digprop_constanttime(0.1),
 	drop='"jeija:meselamp_off" 1',
+    	description="Meselamp",
 })
 
 minetest.register_node("jeija:meselamp_off", {
@@ -724,6 +732,7 @@ minetest.register_node("jeija:meselamp_off", {
 		fixed = {-0.38, -0.5, -0.1, 0.38, -0.2, 0.1},
 	},
 	material = minetest.digprop_constanttime(0.1),
+    	description="Meselamp",
 })
 
 minetest.register_craft({
@@ -739,6 +748,7 @@ minetest.register_craft({
 minetest.register_craftitem("jeija:glue", {
 	image = "jeija_glue.png",
 	on_place_on_ground = minetest.craftitem_place_item,
+    	description="Glue",
 })
 
 minetest.register_craft({
@@ -755,12 +765,14 @@ minetest.register_craft({
 minetest.register_node("jeija:hydro_turbine_off", {
 	tile_images = {"jeija_hydro_turbine_off.png", "jeija_hydro_turbine_off.png", "jeija_hydro_turbine_off.png", "jeija_hydro_turbine_off.png", "jeija_hydro_turbine_off.png", "jeija_hydro_turbine_off.png"},
 	material = minetest.digprop_constanttime(0.5),
+    	description="Water Turbine",
 })
 
 minetest.register_node("jeija:hydro_turbine_on", {
 	tile_images = {"jeija_hydro_turbine_on.png", "jeija_hydro_turbine_on.png", "jeija_hydro_turbine_on.png", "jeija_hydro_turbine_on.png", "jeija_hydro_turbine_on.png", "jeija_hydro_turbine_on.png"},
 	drop = '"jeija:hydro_turbine_off" 1',
 	material = minetest.digprop_constanttime(0.5),
+    	description="Water Turbine",
 })
 
 
@@ -822,6 +834,7 @@ minetest.register_node("jeija:removestone", {
 	tile_images = {"jeija_removestone.png"},
 	inventory_image = minetest.inventorycube("jeija_removestone_inv.png"),
 	material = minetest.digprop_stonelike(1.0),
+    	description="Removestone",
 })
 
 minetest.register_craft({
diff --git a/jeija/lightstone.lua b/jeija/lightstone.lua
index a5d2583..08e79dd 100644
--- a/jeija/lightstone.lua
+++ b/jeija/lightstone.lua
@@ -3,6 +3,7 @@ function mesecon:lightstone_add(name, base_item, texture_off, texture_on)
 	    tile_images = {texture_off},
 	    inventory_image = minetest.inventorycube(texture_off),
 	    material = minetest.digprop_stonelike(0.5),
+    	    description=name.." Lightstone",
     })
     minetest.register_node("jeija:lightstone_" .. name .. "_on", {
 	    tile_images = {texture_on},
@@ -10,6 +11,7 @@ function mesecon:lightstone_add(name, base_item, texture_off, texture_on)
 	    material = minetest.digprop_stonelike(0.5),
 	    dug_item = "node jeija:lightstone_" .. name .. "_off 1",
 	    light_source = LIGHT_MAX-2,
+    	    description=name.." Lightstone",
     })
     assert(loadstring('mesecon:register_on_signal_on(function(pos, node) \n \
                     if node.name == "jeija:lightstone_' .. name .. '_off" then \n \
diff --git a/jeija/movestone.lua b/jeija/movestone.lua
index ac742df..ec0cd9a 100644
--- a/jeija/movestone.lua
+++ b/jeija/movestone.lua
@@ -63,6 +63,7 @@ minetest.register_node("jeija:movestone", {
 	paramtype2 = "facedir",
 	legacy_facedir_simple = true,
 	material = minetest.digprop_stonelike(0.8),
+    	description="Movestone",
 })
 
 minetest.register_entity("jeija:movestone_entity", {
@@ -171,6 +172,7 @@ minetest.register_node("jeija:sticky_movestone", {
 	paramtype2 = "facedir",
 	legacy_facedir_simple = true,
 	material = minetest.digprop_stonelike(0.8),
+    	description="Sticky Movestone",
 })
 
 minetest.register_craft({
diff --git a/jeija/pistons.lua b/jeija/pistons.lua
index f287503..3ad7aac 100644
--- a/jeija/pistons.lua
+++ b/jeija/pistons.lua
@@ -4,6 +4,7 @@ minetest.register_node("jeija:piston_normal", {
 	tile_images = {"jeija_piston_tb.png", "jeija_piston_tb.png", "jeija_piston_tb.png", "jeija_piston_tb.png", "jeija_piston_tb.png", "jeija_piston_side.png"},
 	material = minetest.digprop_stonelike(0.5),
 	paramtype2="facedir",
+    	description="Piston",
 })
 
 minetest.register_craft({
@@ -20,6 +21,7 @@ minetest.register_node("jeija:piston_sticky", {
 	tile_images = {"jeija_piston_tb.png", "jeija_piston_tb.png", "jeija_piston_tb.png", "jeija_piston_tb.png", "jeija_piston_tb.png", "jeija_piston_sticky_side.png"},
 	material = minetest.digprop_stonelike(0.5),
 	paramtype2="facedir",
+    	description="Sticky Piston",
 })
 
 minetest.register_craft({
diff --git a/jeija/pressureplates.lua b/jeija/pressureplates.lua
index f882230..133715d 100644
--- a/jeija/pressureplates.lua
+++ b/jeija/pressureplates.lua
@@ -11,6 +11,7 @@ minetest.register_node("jeija:pressure_plate_wood_off", {
 		type = "fixed",
 	},
 	material = minetest.digprop_constanttime(0.3),
+    	description="Wood Pressure Plate",
 })
 
 minetest.register_node("jeija:pressure_plate_wood_on", {
@@ -24,7 +25,8 @@ minetest.register_node("jeija:pressure_plate_wood_on", {
 		type = "fixed",
 	},
 	material = minetest.digprop_constanttime(0.3),
-	drop='"jeija:pressure_plate_wood_off" 1'
+	drop='"jeija:pressure_plate_wood_off" 1',
+    	description="Wood Pressure Plate",
 })
 
 minetest.register_craft({
@@ -87,6 +89,7 @@ minetest.register_node("jeija:pressure_plate_stone_off", {
 		type = "fixed",
 	},
 	material = minetest.digprop_constanttime(0.3),
+    	description="Stone Pressure Plate",
 })
 
 minetest.register_node("jeija:pressure_plate_stone_on", {
@@ -100,7 +103,8 @@ minetest.register_node("jeija:pressure_plate_stone_on", {
 		type = "fixed",
 	},
 	material = minetest.digprop_constanttime(0.3),
-	drop='"jeija:pressure_plate_stone_off" 1'
+	drop='"jeija:pressure_plate_stone_off" 1',
+    	description="Stone Pressure Plate",
 })
 
 minetest.register_craft({
diff --git a/jeija/switch.lua b/jeija/switch.lua
index 553c95f..aca1c86 100644
--- a/jeija/switch.lua
+++ b/jeija/switch.lua
@@ -4,6 +4,7 @@ minetest.register_node("jeija:mesecon_switch_off", {
 	tile_images = {"jeija_mesecon_switch_side.png", "jeija_mesecon_switch_side.png", "jeija_mesecon_switch_side.png", "jeija_mesecon_switch_side.png", "jeija_mesecon_switch_side.png", "jeija_mesecon_switch_off.png"},
 	paramtype2="facedir",
 	material = minetest.digprop_constanttime(0.5),
+    	description="Switch",
 })
 
 minetest.register_node("jeija:mesecon_switch_on", {
@@ -11,6 +12,7 @@ minetest.register_node("jeija:mesecon_switch_on", {
 	paramtype2="facedir",
 	material = minetest.digprop_constanttime(0.5),
 	drop='"jeija:mesecon_switch_off" 1',
+    	description="Switch",
 })
 
 mesecon:add_receptor_node("jeija:mesecon_switch_on")
diff --git a/jeija/torches.lua b/jeija/torches.lua
index ce46436..3f92f1e 100644
--- a/jeija/torches.lua
+++ b/jeija/torches.lua
@@ -18,6 +18,7 @@ minetest.register_node("jeija:mesecon_torch_off", {
     legacy_wallmounted = true,
     material = minetest.digprop_constanttime(0.5),
     drop = '"jeija:mesecon_torch_on" 1',
+    description="Mesecon Torch",
 })
 
 minetest.register_node("jeija:mesecon_torch_on", {
@@ -32,6 +33,7 @@ minetest.register_node("jeija:mesecon_torch_on", {
     legacy_wallmounted = true,
     material = minetest.digprop_constanttime(0.5),
     light_source = LIGHT_MAX-5,
+    description="Mesecon Torch",
 })
 
 --[[minetest.register_on_placenode(function(pos, newnode, placer)
diff --git a/jeija/wireless.lua b/jeija/wireless.lua
index 3344d47..d067167 100644
--- a/jeija/wireless.lua
+++ b/jeija/wireless.lua
@@ -2,6 +2,7 @@
 minetest.register_craftitem("jeija:ic", {
 	image = "jeija_ic.png",
 	on_place_on_ground = minetest.craftitem_place_item,
+    	description="IC",
 })
 
 minetest.register_craft({
@@ -162,13 +163,15 @@ minetest.register_node("jeija:wireless_receiver_off", {
 	tile_images = {"jeija_wireless_receiver_tb_off.png", "jeija_wireless_receiver_tb_off.png", "jeija_wireless_receiver_off.png", "jeija_wireless_receiver_off.png", "jeija_wireless_receiver_off.png", "jeija_wireless_receiver_off.png"},
 	inventory_image = minetest.inventorycube("jeija_wireless_receiver_off.png"),
 	material = minetest.digprop_constanttime(0.8),
+    	description="Wireless Receiver",
 })
 
 minetest.register_node("jeija:wireless_receiver_on", {
 	tile_images = {"jeija_wireless_receiver_tb_on.png", "jeija_wireless_receiver_tb_on.png", "jeija_wireless_receiver_on.png", "jeija_wireless_receiver_on.png", "jeija_wireless_receiver_on.png", "jeija_wireless_receiver_on.png"},
 	inventory_image = minetest.inventorycube("jeija_wireless_receiver_on.png"),
 	material = minetest.digprop_constanttime(0.8),
-	dug_item = 'node "jeija:wireless_receiver_off" 1'
+	dug_item = 'node "jeija:wireless_receiver_off" 1',
+    	description="Wireless Receiver",
 })
 
 minetest.register_craft({
@@ -228,13 +231,15 @@ minetest.register_node("jeija:wireless_inverter_off", {
 	tile_images = {"jeija_wireless_inverter_tb.png", "jeija_wireless_inverter_tb.png", "jeija_wireless_inverter_off.png", "jeija_wireless_inverter_off.png", "jeija_wireless_inverter_off.png", "jeija_wireless_inverter_off.png"},
 	inventory_image = minetest.inventorycube("jeija_wireless_inverter_off.png"),
 	material = minetest.digprop_constanttime(0.8),
-	dug_item = 'node "jeija:wireless_inverter_on" 1'
+	dug_item = 'node "jeija:wireless_inverter_on" 1',
+    	description="Wireless Inverter",
 })
 
 minetest.register_node("jeija:wireless_inverter_on", {
 	tile_images = {"jeija_wireless_inverter_tb.png", "jeija_wireless_inverter_tb.png", "jeija_wireless_inverter_on.png", "jeija_wireless_inverter_on.png", "jeija_wireless_inverter_on.png", "jeija_wireless_inverter_on.png"},
 	inventory_image = minetest.inventorycube("jeija_wireless_inverter_on.png"),
 	material = minetest.digprop_constanttime(0.8),
+    	description="Wireless Inverter",
 })
 
 minetest.register_craft({
@@ -289,12 +294,14 @@ minetest.register_node("jeija:wireless_transmitter_on", {
 	inventory_image = minetest.inventorycube("jeija_wireless_transmitter_on.png"),
 	material = minetest.digprop_constanttime(0.8),
 	dug_item = 'node "jeija:wireless_transmitter_off" 1',
+    	description="Wireless Transmitter",
 })
 
 minetest.register_node("jeija:wireless_transmitter_off", {
 	tile_images = {"jeija_wireless_transmitter_tb.png", "jeija_wireless_transmitter_tb.png", "jeija_wireless_transmitter_off.png", "jeija_wireless_transmitter_off.png", "jeija_wireless_transmitter_off.png", "jeija_wireless_transmitter_off.png"},
 	inventory_image = minetest.inventorycube("jeija_wireless_transmitter_off.png"),
 	material = minetest.digprop_constanttime(0.8),
+    	description="Wireless Transmitter",
 })
 
 minetest.register_craft({