Merge remote-tracking branch 'upstream/master'

init.lua

@@ -57,8 +57,8 @@ nether.fogColor = {	           -- only used if climate_api is installed
 
 
 -- Settings
-nether.DEPTH_CEILING              =  -5000 -- The y location of the Nether's celing
+nether.DEPTH_CEILING              =  -25000 -- The y location of the Nether's celing
-nether.DEPTH_FLOOR                = -11000 -- The y location of the Nether's floor
+nether.DEPTH_FLOOR                = -31000 -- The y location of the Nether's floor
 nether.FASTTRAVEL_FACTOR          =      8 -- 10 could be better value for Minetest, since there's no sprint, but ex-Minecraft players will be mathing for 8
 nether.PORTAL_BOOK_LOOT_WEIGHTING =    0.9 -- Likelyhood of finding the Book of Portals (guide) in dungeon chests. Set to 0 to disable.
 nether.NETHER_REALM_ENABLED       =   true -- Setting to false disables the Nether and Nether portal

locale/nether.fr.tr

@@ -32,6 +32,8 @@ Unknown player position=
 
 ### nodes.lua ###
 
+A Deep Netherrack wall=
+A Netherrack wall=
 A finely finished block of solid Nether Basalt.=
 A rough cut solid block of Nether Basalt.=
 A thin crust of cooled lava with liquid lava beneath=
@@ -44,12 +46,18 @@ Columns of dark basalt found only in magma oceans deep within the Nether.=
 Compressed Netherbrick=
 Cracked Nether Brick=
 Deep Glowstone=
+Deep Nether Brick=
+Deep Nether Slab=
+Deep Nether Stair=
 Deep Netherrack=
+Deep Netherrack slab=
+Deep Netherrack stair=
 Fumarolic Chimney=
 Fumarolic Chimney Corner=
 Fumarolic Chimney Slab=
 Glowstone=Pierre lumineuse
 Hewn Basalt=
+Inner Deep Nether Stair=
 Inner Nether Stair=Escalier intérieur du Nether
 Lava Crust=
 
@@ -64,6 +72,7 @@ Netherrack=Roche du Nether
 Netherrack from deep in the mantle=
 Netherrack stair=
 Nethersand=Sable du Nether
+Outer Deep Nether Stair=
 Outer Nether Stair=Escalier extérieur du Nether
 Portal=
 
@@ -110,6 +119,13 @@ There is a floating land of hills and forests up there, over the edges of which
 Nether Axe=
 Nether Ingot=
 Nether Lump=
-Nether Pickaxe=
+Nether Pickaxe@nWell suited for mining netherrack=
 Nether Shovel=
 Nether Sword=
+
+Nether staff of Eternal Light@nCreates glowstone from netherrack=
+
+Nether staff of Light@nTemporarily transforms the netherrack into glowstone=
+
+Uniquely suited for mining netherrack, with minimal wear when doing so. Blunts quickly on other materials.=
+

locale/template.txt

@@ -31,6 +31,8 @@ Unknown player position=
 
 ### nodes.lua ###
 
+A Deep Netherrack wall=
+A Netherrack wall=
 A finely finished block of solid Nether Basalt.=
 A rough cut solid block of Nether Basalt.=
 A thin crust of cooled lava with liquid lava beneath=
@@ -43,12 +45,18 @@ Columns of dark basalt found only in magma oceans deep within the Nether.=
 Compressed Netherbrick=
 Cracked Nether Brick=
 Deep Glowstone=
+Deep Nether Brick=
+Deep Nether Slab=
+Deep Nether Stair=
 Deep Netherrack=
+Deep Netherrack slab=
+Deep Netherrack stair=
 Fumarolic Chimney=
 Fumarolic Chimney Corner=
 Fumarolic Chimney Slab=
 Glowstone=
 Hewn Basalt=
+Inner Deep Nether Stair=
 Inner Nether Stair=
 Lava Crust=
 
@@ -63,6 +71,7 @@ Netherrack=
 Netherrack from deep in the mantle=
 Netherrack stair=
 Nethersand=
+Outer Deep Nether Stair=
 Outer Nether Stair=
 Portal=
 
@@ -109,6 +118,13 @@ There is a floating land of hills and forests up there, over the edges of which
 Nether Axe=
 Nether Ingot=
 Nether Lump=
-Nether Pickaxe=
+Nether Pickaxe@nWell suited for mining netherrack=
 Nether Shovel=
 Nether Sword=
+
+Nether staff of Eternal Light@nCreates glowstone from netherrack=
+
+Nether staff of Light@nTemporarily transforms the netherrack into glowstone=
+
+Uniquely suited for mining netherrack, with minimal wear when doing so. Blunts quickly on other materials.=
+

nodes.lua

@@ -349,8 +349,8 @@ stairs.register_slab( -- register a slab without adding inner and outer stairs
 
 -- Connecting walls
 if minetest.get_modpath("walls") and minetest.global_exists("walls") and walls.register ~= nil then
-	walls.register("nether:rack_wall",      "A Netherrack wall",      "nether_rack.png",      "nether:rack",      minetest.registered_nodes["nether:rack"].sounds)
+	walls.register("nether:rack_wall",      S("A Netherrack wall"),      "nether_rack.png",      "nether:rack",      minetest.registered_nodes["nether:rack"].sounds)
-	walls.register("nether:rack_deep_wall", "A Deep Netherrack wall", "nether_rack_deep.png", "nether:rack_deep", minetest.registered_nodes["nether:rack_deep"].sounds)
+	walls.register("nether:rack_deep_wall", S("A Deep Netherrack wall"), "nether_rack_deep.png", "nether:rack_deep", minetest.registered_nodes["nether:rack_deep"].sounds)
 end
 
 -- StairsPlus

portal_api.lua

@@ -2169,18 +2169,23 @@ function nether.register_portal_ignition_item(item_name, ignition_failure_sound)
 
 	minetest.override_item(item_name, {
 		on_place = function(stack, placer, pt)
+			local node = minetest.get_node(pt.under)
+			local def = minetest.registered_nodes[node.name]
 			local done = false
-			if pt.under and nether.is_frame_node[minetest.get_node(pt.under).name] then
+
+			if pt.under and nether.is_frame_node[node.name] then
 				done = ignite_portal(pt.under, placer:get_player_name())
 				if done and not minetest.settings:get_bool("creative_mode") then
 					stack:take_item()
 				end
+			elseif def and def.on_rightclick then
+				def.on_rightclick(pt.under, node, placer, stack, pt)
 			end
+
 			if not done and ignition_failure_sound ~= nil then
 				minetest.sound_play(ignition_failure_sound, {pos = pt.under, max_hear_distance = 10})
 			end
 
-
 			return stack
 		end,
 	})