Merge remote-tracking branch 'upstream/master'

Default to not being ground content.
The few nodes that were registered as ground content shouldn't be considered ground content.

* cut nodes aren't ground content

By default make cut nodes non ground content but allow mods to register theirs as ground content if they want to.

circular_saw.lua

@@ -447,6 +447,7 @@ minetest.register_node("moreblocks:circular_saw",  {
 	sunlight_propagates = true,
 	paramtype2 = "facedir",
 	groups = {choppy = 2,oddly_breakable_by_hand = 2},
+	is_ground_content = false,
 	sounds = moreblocks.node_sound_wood_defaults(),
 	on_construct = circular_saw.on_construct,
 	can_dig = circular_saw.can_dig,

locale/moreblocks.uk.tr

@@ -0,0 +1,92 @@
+# textdomain: moreblocks
+
+More Blocks=Більше Блоків
+Adds various miscellaneous blocks to the game.=Додає різноманітні нові блоки до гри.
+Adds various miscellaneous blocks.=Додає різноманітні нові блоки до гри.
+
+#: circular_saw.lua
+
+Circular Saw=Циркулярна пила
+Input material=Вхідний@nматеріал
+Left-over=Залишки
+Max=Кільк.
+Recycle output=Пере-@nобробка
+Set=Гаразд
+owned by @1=належить @1
+Circular Saw is empty=Циркулярна пила пуста
+Circular Saw is working on @1=Циркулярна пила працює над @1
+
+#: init.lua
+
+[MOD] moreblocks loaded.=[MOD] moreblocks завантажено.
+
+#: nodes.lua
+
+Deprecated=застарілий
+All-faces Acacia Tree=Всебічна колода акації
+All-faces Aspen Tree=Всебічна колода осики
+All-faces Jungle Tree=Всебічна джунглева колода
+All-faces Pine Tree=Всебічна колода сосни
+All-faces Tree=Всебічна колода яблуні
+Cactus Brick=Кактусова цегла
+Cactus Checker=Кактусова мозаїка
+Centered Wooden Tile=Дерев'яна мозаїка (центр)
+Checker Stone Tile=Кам'яна мозаїка
+Circle Stone Bricks=Кільцевий камінь
+Clean Glass=Чисте скло
+Coal Checker=Вугілляна мозаїка
+Coal Glass=Вугілляне скло
+Clean Super Glow Glass=Чисте супер-сяюче скло
+Trap Clean Super Glow Glass=Trap чисте супер-сяюче скло
+Trap Clean Glass=Trap чисте скло
+Clean Glow Glass=Чисте сяюче скло
+Trap Clean Glow Glass=Trap чисте сяюче скло
+Coal Stone=Вугілляний камінь
+Coal Stone Bricks=Вуглекам'яна цегла
+Compressed Cobblestone=Пресований кругляк
+Compressed Desert Cobblestone=Пресований пустельний кругляк
+Compressed Dirt=Пресований ґрунт
+Copper Patina Block=Блок мідного патину
+Empty Shelf=Пусті полиці
+Full Wooden Tile=Дерев'яна мозаїка
+Glow Glass=Сяюче скло
+Iron Checker=Сталева мозаїка
+Iron Glass=Металізоване скло
+Iron Stone=Залізний камінь
+Iron Stone Bricks=Залізокам'яна цегла
+Plankstone=Деревокам'яна мозаїка
+Rope=Мотузка
+Split Stone Tile=Кам'яна мозаїка
+Stone Bricks=Кам'яна цегла
+Stone Tile=Кам'яна плитка
+Super Glow Glass=Супер-сяюче скло
+Sweeper=Підмітальник
+Tar=Смола
+Trap Desert Stone=Уявний пустельний камінь
+Trap Glass=Уявне скло
+Trap Glow Glass=Уявне сяюче скло
+Trap Obsidian=Уявний обсидіан
+Trap Obsidian Glass=Уявне обсидіанове скло
+Trap Sandstone=Уявний пісковик
+Trap Stone=Уявний камінь
+Trap Super Glow Glass=Уявне супер-сяюче скло
+Wooden Tile=Дерев'яна мозаїка
+Offset Wooden Tile=Дерев'яна мозаїка (зверзу)
+# @deprecated
+Downwards Wooden Tile=Дерев'яна мозаїка (знизу)
+# @deprecated
+Leftwards Wooden Tile=Дерев'яна мозаїка (ліворуч)
+# @deprecated
+Rightwards Wooden Tile=Дерев'яна мозаїка (праворуч)
+
+#: ownership.lua
+Sorry, @1 owns that spot.=Вибачте, це належить @1.
+someone=комусь
+
+#: stairsplus/common.lua
+
+@1 Microblock=@1 (мікроблок)
+@1 Slab=@1 (плита)
+@1 Slope=@1 (схил)
+@1 Panel=@1 (панель)
+@1 Stairs=@1 (сходи)

nodes.lua

@@ -41,7 +41,6 @@ local nodes = {
 	["wood_tile"] = {
 		description = S("Wooden Tile"),
 		groups = {wood = 1, choppy = 2, oddly_breakable_by_hand = 2, flammable = 3},
-		is_ground_content = false,
 		paramtype2 = "facedir",
 		place_param2 = 0,
 		tiles = {"default_wood.png^moreblocks_wood_tile.png",
@@ -66,14 +65,12 @@ local nodes = {
 	["wood_tile_center"] = {
 		description = S("Centered Wooden Tile"),
 		groups = {wood = 1, choppy = 2, oddly_breakable_by_hand = 2, flammable = 3},
-		is_ground_content = false,
 		tiles = {"default_wood.png^moreblocks_wood_tile_center.png"},
 		sounds = sound_wood,
 	},
 	["wood_tile_full"] = {
 		description = S("Full Wooden Tile"),
 		groups = {wood = 1, choppy = 2, oddly_breakable_by_hand = 2, flammable = 3},
-		is_ground_content = false,
 		tiles = tile_tiles("wood_tile_full"),
 		sounds = sound_wood,
 	},
@@ -82,7 +79,6 @@ local nodes = {
 		paramtype2 = "facedir",
 		place_param2 = 0,
 		groups = {wood = 1, choppy = 2, oddly_breakable_by_hand = 2, flammable = 3},
-		is_ground_content = false,
 		tiles = {"default_wood.png^moreblocks_wood_tile_offset.png"},
 		sounds = sound_wood,
 		no_stairs = true,
@@ -108,7 +104,6 @@ local nodes = {
 	["circle_stone_bricks"] = {
 		description = S("Circle Stone Bricks"),
 		groups = {stone = 1, cracky = 3},
-		is_ground_content = false,
 		sounds = sound_stone,
 	},
 	["grey_bricks"] = {
@@ -116,7 +111,6 @@ local nodes = {
 		paramtype2 = "facedir",
 		place_param2 = 0,
 		groups = {cracky = 3},
-		is_ground_content = false,
 		sounds = sound_stone,
 	},
 	["coal_stone_bricks"] = {
@@ -124,7 +118,6 @@ local nodes = {
 		paramtype2 = "facedir",
 		place_param2 = 0,
 		groups = {stone = 1, cracky = 3},
-		is_ground_content = false,
 		sounds = sound_stone,
 	},
 	["iron_stone_bricks"] = {
@@ -132,13 +125,11 @@ local nodes = {
 		paramtype2 = "facedir",
 		place_param2 = 0,
 		groups = {stone = 1, cracky = 3},
-		is_ground_content = false,
 		sounds = sound_stone,
 	},
 	["stone_tile"] = {
 		description = S("Stone Tile"),
 		groups = {stone = 1, cracky = 3},
-		is_ground_content = false,
 		sounds = sound_stone,
 	},
 	["split_stone_tile"] = {
@@ -148,37 +139,31 @@ local nodes = {
 		tiles = {"moreblocks_split_stone_tile_top.png",
 			"moreblocks_split_stone_tile.png"},
 		groups = {stone = 1, cracky = 3},
-		is_ground_content = false,
 		sounds = sound_stone,
 	},
 	["checker_stone_tile"] = {
 		description = S("Checker Stone Tile"),
 		groups = {stone = 1, cracky = 3},
-		is_ground_content = false,
 		sounds = sound_stone,
 	},
 	["tar"] = {
 		description = S("Tar"),
 		groups = {cracky=2, tar_block=1},
-		is_ground_content = false,
 		sounds = sound_stone,
 	},
 	["dirt_compressed"] = {
 		description = S("Compressed Dirt"),
 		groups = {crumbly=2, compressed = 1},
-		is_ground_content = false,
 		sounds = sound_dirt,
 	},
 	["cobble_compressed"] = {
 		description = S("Compressed Cobblestone"),
 		groups = {cracky = 1, compressed = 1},
-		is_ground_content = false,
 		sounds = sound_stone,
 	},
 	["desert_cobble_compressed"] = {
 		description = S("Compressed Desert Cobblestone"),
 		groups = {cracky = 1, compressed = 1},
-		is_ground_content = false,
 		sounds = sound_stone,
 	},
 	["plankstone"] = {
@@ -186,7 +171,6 @@ local nodes = {
 		paramtype2 = "facedir",
 		place_param2 = 0,
 		groups = {cracky = 3},
-		is_ground_content = false,
 		tiles = tile_tiles("plankstone"),
 		sounds = sound_stone,
 	},
@@ -197,7 +181,6 @@ local nodes = {
 		use_texture_alpha = "clip",
 		paramtype = "light",
 		sunlight_propagates = true,
-		is_ground_content = false,
 		groups = {cracky = 3, oddly_breakable_by_hand = 3},
 		sounds = sound_glass,
 	},
@@ -208,7 +191,6 @@ local nodes = {
 		use_texture_alpha = "clip",
 		paramtype = "light",
 		sunlight_propagates = true,
-		is_ground_content = false,
 		groups = {cracky = 3, oddly_breakable_by_hand = 3},
 		sounds = sound_glass,
 	},
@@ -219,7 +201,6 @@ local nodes = {
 		use_texture_alpha = "clip",
 		paramtype = "light",
 		sunlight_propagates = true,
-		is_ground_content = false,
 		groups = {cracky = 3, oddly_breakable_by_hand = 3},
 		sounds = sound_glass,
 	},
@@ -228,13 +209,11 @@ local nodes = {
 		paramtype2 = "facedir",
 		place_param2 = 0,
 		groups = {cracky = 3},
-		is_ground_content = false,
 		sounds = sound_stone,
 	},
 	["cactus_checker"] = {
 		description = S("Cactus Checker"),
 		groups = {stone = 1, cracky = 3},
-		is_ground_content = false,
 		tiles = {"default_stone.png^moreblocks_cactus_checker.png",
 		"default_stone.png^moreblocks_cactus_checker.png",
 		"default_stone.png^moreblocks_cactus_checker.png",
@@ -249,7 +228,6 @@ local nodes = {
 		tiles = {"default_wood.png", "default_wood.png", "default_wood.png",
 		"default_wood.png", "moreblocks_empty_shelf.png", "moreblocks_empty_shelf.png"},
 		groups = {choppy = 3, oddly_breakable_by_hand = 2, flammable = 3},
-		is_ground_content = false,
 		sounds = sound_wood,
 		furnace_burntime = 15,
 		no_stairs = true,
@@ -257,13 +235,11 @@ local nodes = {
 	["coal_stone"] = {
 		description = S("Coal Stone"),
 		groups = {stone = 1, cracky = 3},
-		is_ground_content = false,
 		sounds = sound_stone,
 	},
 	["iron_stone"] = {
 		description = S("Iron Stone"),
 		groups = {stone = 1, cracky = 3},
-		is_ground_content = false,
 		sounds = sound_stone,
 	},
 	["coal_checker"] = {
@@ -275,7 +251,6 @@ local nodes = {
 		"default_stone.png^moreblocks_coal_checker.png^[transformR90",
 		"default_stone.png^moreblocks_coal_checker.png^[transformR90"},
 		groups = {stone = 1, cracky = 3},
-		is_ground_content = false,
 		sounds = sound_stone,
 	},
 	["iron_checker"] = {
@@ -287,7 +262,6 @@ local nodes = {
 		"default_stone.png^moreblocks_iron_checker.png^[transformR90",
 		"default_stone.png^moreblocks_iron_checker.png^[transformR90"},
 		groups = {stone = 1, cracky = 3},
-		is_ground_content = false,
 		sounds = sound_stone,
 	},
 	["trap_stone"] = {
@@ -297,7 +271,6 @@ local nodes = {
 		walkable = false,
 		groups = {cracky = 3},
 		paramtype = "light",
-		is_ground_content = false,
 		sounds = sound_stone,
 		no_stairs = true,
 	},
@@ -308,7 +281,6 @@ local nodes = {
 		walkable = false,
 		groups = {cracky = 3},
 		paramtype = "light",
-		is_ground_content = false,
 		sounds = sound_stone,
 		no_stairs = true,
 	},
@@ -319,7 +291,6 @@ local nodes = {
 		use_texture_alpha = "clip",
 		paramtype = "light",
 		sunlight_propagates = true,
-		is_ground_content = false,
 		walkable = false,
 		groups = {cracky = 3, oddly_breakable_by_hand = 3},
 		sounds = sound_glass,
@@ -332,7 +303,6 @@ local nodes = {
 		use_texture_alpha = "clip",
 		paramtype = "light",
 		sunlight_propagates = true,
-		is_ground_content = false,
 		walkable = false,
 		groups = {cracky = 3, oddly_breakable_by_hand = 3},
 		sounds = sound_glass,
@@ -345,7 +315,6 @@ local nodes = {
 		walkable = false,
 		groups = {cracky = 1, level = 2},
 		paramtype = "light",
-		is_ground_content = false,
 		sounds = sound_stone,
 		no_stairs = true,
 	},
@@ -356,7 +325,6 @@ local nodes = {
 		use_texture_alpha = "clip",
 		paramtype = "light",
 		sunlight_propagates = true,
-		is_ground_content = false,
 		walkable = false,
 		groups = {cracky = 3, oddly_breakable_by_hand = 3},
 		sounds = sound_glass,
@@ -369,7 +337,6 @@ local nodes = {
 		walkable = false,
 		groups = {crumbly = 1, cracky = 3},
 		paramtype = "light",
-		is_ground_content = false,
 		sounds = sound_stone,
 		no_stairs = true,
 	},
@@ -415,7 +382,6 @@ local nodes = {
 		use_texture_alpha = "clip",
 		paramtype = "light",
 		sunlight_propagates = true,
-		is_ground_content = false,
 		light_source = 11,
 		groups = {cracky = 3, oddly_breakable_by_hand = 3},
 		sounds = sound_glass,
@@ -427,7 +393,6 @@ local nodes = {
 		use_texture_alpha = "clip",
 		paramtype = "light",
 		sunlight_propagates = true,
-		is_ground_content = false,
 		light_source = 11,
 		groups = {cracky = 3, oddly_breakable_by_hand = 3},
 		sounds = sound_glass,
@@ -439,7 +404,6 @@ local nodes = {
 		use_texture_alpha = "clip",
 		paramtype = "light",
 		sunlight_propagates = true,
-		is_ground_content = false,
 		light_source = 11,
 		walkable = false,
 		groups = {cracky = 3, oddly_breakable_by_hand = 3},
@@ -453,7 +417,6 @@ local nodes = {
 		use_texture_alpha = "clip",
 		paramtype = "light",
 		sunlight_propagates = true,
-		is_ground_content = false,
 		light_source = 11,
 		walkable = false,
 		groups = {cracky = 3, oddly_breakable_by_hand = 3},
@@ -467,7 +430,6 @@ local nodes = {
 		use_texture_alpha = "clip",
 		paramtype = "light",
 		sunlight_propagates = true,
-		is_ground_content = false,
 		light_source = default.LIGHT_MAX,
 		groups = {cracky = 3, oddly_breakable_by_hand = 3},
 		sounds = sound_glass,
@@ -479,7 +441,6 @@ local nodes = {
 		use_texture_alpha = "clip",
 		paramtype = "light",
 		sunlight_propagates = true,
-		is_ground_content = false,
 		light_source = default.LIGHT_MAX,
 		groups = {cracky = 3, oddly_breakable_by_hand = 3},
 		sounds = sound_glass,
@@ -491,7 +452,6 @@ local nodes = {
 		use_texture_alpha = "clip",
 		paramtype = "light",
 		sunlight_propagates = true,
-		is_ground_content = false,
 		light_source = default.LIGHT_MAX,
 		walkable = false,
 		groups = {cracky = 3, oddly_breakable_by_hand = 3},
@@ -505,7 +465,6 @@ local nodes = {
 		use_texture_alpha = "clip",
 		paramtype = "light",
 		sunlight_propagates = true,
-		is_ground_content = false,
 		light_source = default.LIGHT_MAX,
 		walkable = false,
 		groups = {cracky = 3, oddly_breakable_by_hand = 3},
@@ -519,7 +478,6 @@ local nodes = {
 		wield_image = "moreblocks_rope.png",
 		paramtype = "light",
 		sunlight_propagates = true,
-		is_ground_content = false,
 		paramtype2 = "wallmounted",
 		walkable = false,
 		climbable = true,
@@ -531,27 +489,27 @@ local nodes = {
 	["copperpatina"] = {
 		description = S("Copper Patina Block"),
 		groups = {cracky = 1, level = 2},
-		is_ground_content = false,
 		sounds = sound_metal,
 	},
 }
 
 for name, def in pairs(nodes) do
+	def.is_ground_content = def.is_ground_content == true
 	def.tiles = def.tiles or {"moreblocks_" ..name.. ".png"}
 	minetest.register_node("moreblocks:" ..name, def)
 	minetest.register_alias(name, "moreblocks:" ..name)
 
-	def_copy = table.copy(def)
+	local tiles = def.tiles
 
 	-- Use the primary tile for all sides of cut glasslike nodes.
 	-- This makes them easier to see
 	if
-		#def_copy.tiles > 1 and
-		def_copy.drawtype and
-		def_copy.drawtype == "glasslike_framed" or
-		def_copy.drawtype == "glasslike_framed_optional"
+		#tiles > 1 and
+		def.drawtype and
+		def.drawtype == "glasslike_framed" or
+		def.drawtype == "glasslike_framed_optional"
 	then
-		def.tiles = {def_copy.tiles[1]}
+		tiles = {def.tiles[1]}
 	end
 
 
@@ -561,7 +519,7 @@ for name, def in pairs(nodes) do
 		stairsplus:register_all("moreblocks", name, "moreblocks:" ..name, {
 			description = def.description,
 			groups = groups,
-			tiles = def.tiles,
+			tiles = tiles,
 			sunlight_propagates = def.sunlight_propagates,
 			light_source = def.light_source,
 			sounds = def.sounds,

stairsplus/common.lua

@@ -136,6 +136,7 @@ stairsplus.register_single = function(category, alternate, info, modname, subnam
 		def[k] = v
 	end
 
+	def.is_ground_content = def.is_ground_content == true
 	def.drawtype = "nodebox"
 	def.paramtype = "light"
 	def.paramtype2 = def.paramtype2 or "facedir"