Merge remote-tracking branch 'upstream/master'

This commit is contained in:
bri cassa 2022-03-05 11:25:18 +01:00
commit 1df107ab94
3 changed files with 36 additions and 4 deletions

View File

@ -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.=

View File

@ -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.=

View File

@ -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_deep_wall", "A Deep Netherrack wall", "nether_rack_deep.png", "nether:rack_deep", minetest.registered_nodes["nether:rack_deep"].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", S("A Deep Netherrack wall"), "nether_rack_deep.png", "nether:rack_deep", minetest.registered_nodes["nether:rack_deep"].sounds)
end
-- StairsPlus