Merge branch 'master' into nalc-1.2

building_blocks/alias.lua

@@ -1,4 +1,4 @@
-local S = homedecor_i18n.gettext
+local S = homedecor.gettext
 
 if minetest.get_modpath("moreblocks") or minetest.get_modpath("stairs") then
 	minetest.register_alias("building_blocks:slab_tar", "stairs:slab_Tar")
@@ -19,6 +19,10 @@ if minetest.get_modpath("moreblocks") then
 	minetest.unregister_item("moreblocks:tar")
 	minetest.register_alias("moreblocks:tar", "building_blocks:Tar")
 	stairsplus:register_alias_all("moreblocks", "tar", "building_blocks", "Tar")
+
+	if minetest.get_modpath("gloopblocks") then
+		minetest.register_alias("building_blocks:gravel_spread", "gloopblocks:slab_gravel_1")
+	end
 end
 
 minetest.register_alias("adobe", "building_blocks:Adobe")

building_blocks/depends.txt

@@ -1,4 +1,5 @@
 default
-homedecor_i18n
+homedecor_common
 moreblocks?
+gloopblocks?
 stairs?

building_blocks/init.lua

@@ -1,4 +1,4 @@
-local S = homedecor_i18n.gettext
+local S = homedecor.gettext
 local modpath = minetest.get_modpath("building_blocks")
 
 dofile(modpath.."/alias.lua")
@@ -7,3 +7,4 @@ dofile(modpath.."/others.lua")
 dofile(modpath.."/recipes.lua")
 
 minetest.log("action", "[building_blocks] loaded.")
+

building_blocks/node_stairs.lua

@@ -1,4 +1,4 @@
-local S = homedecor_i18n.gettext
+local S = homedecor.gettext
 
 local stairs_groups_names = {"cracky","choppy","flammable","crumbly","snappy"}
 
@@ -33,7 +33,7 @@ local function building_blocks_stairs(nodename, def)
 				("%s Slab"):format(def.description),
 				def.sounds
 			)
-		end	
+		end
 	end
 end
 
@@ -131,26 +131,30 @@ minetest.register_node("building_blocks:brobble_spread", {
 	is_ground_content = true,
 	groups = {crumbly=3},
 })
-minetest.register_node("building_blocks:gravel_spread", {
-	drawtype = "raillike",
-	description = S("Gravel Spread"),
-	tiles = {"default_gravel.png"},
-	inventory_image = "building_blocks_gravel_spread_inv.png",
-	paramtype = "light",
-	walkable = false,
-	selection_box = {
-		type = "fixed",
-                -- but how to specify the dimensions for curved and sideways rails?
-                fixed = {-1/2, -1/2, -1/2, 1/2, -1/2+1/16, 1/2},
-	},
-	sunlight_propagates = true,
-	is_ground_content = true,
-	groups = {crumbly=2},
-	sounds = default.node_sound_dirt_defaults({
-		footstep = {name="default_gravel_footstep", gain=0.5},
-		dug = {name="default_gravel_footstep", gain=1.0},
-	}),
-})
+
+if not minetest.get_modpath("moreblocks") or not minetest.get_modpath("gloopblocks") then
+	minetest.register_node("building_blocks:gravel_spread", {
+		drawtype = "raillike",
+		description = S("Gravel Spread"),
+		tiles = {"default_gravel.png"},
+		inventory_image = "building_blocks_gravel_spread_inv.png",
+		paramtype = "light",
+		walkable = false,
+		selection_box = {
+			type = "fixed",
+					-- but how to specify the dimensions for curved and sideways rails?
+					fixed = {-1/2, -1/2, -1/2, 1/2, -1/2+1/16, 1/2},
+		},
+		sunlight_propagates = true,
+		is_ground_content = true,
+		groups = {crumbly=2},
+		sounds = default.node_sound_dirt_defaults({
+			footstep = {name="default_gravel_footstep", gain=0.5},
+			dug = {name="default_gravel_footstep", gain=1.0},
+		}),
+	})
+end
+
 minetest.register_node("building_blocks:Tarmac_spread", {
 	drawtype = "raillike",
 	description = S("Tarmac Spread"),

building_blocks/others.lua

@@ -1,4 +1,4 @@
-local S = homedecor_i18n.gettext
+local S = homedecor.gettext
 
 minetest.register_craftitem("building_blocks:sticks", {
 	description = S("Small bundle of sticks"),
@@ -20,4 +20,4 @@ minetest.register_tool("building_blocks:knife", {
 			fleshy={times={[2]=5.50, [3]=2.80}, uses=100, maxlevel=1}
 		}
 	},
-})
+})

building_blocks/recipes.lua

@@ -1,4 +1,4 @@
-local S = homedecor_i18n.gettext
+local S = homedecor.gettext
 
 if minetest.get_modpath("moreblocks") then
 	minetest.register_craft({
@@ -60,12 +60,16 @@ minetest.register_craft({
 		{"default:glass", "default:glass"},
 	}
 })
-minetest.register_craft({
-	output = 'building_blocks:gravel_spread 4',
-	recipe = {
-		{"default:gravel", "default:gravel", "default:gravel"},
-	}
-})
+
+if not minetest.get_modpath("moreblocks") or not minetest.get_modpath("gloopblocks") then
+	minetest.register_craft({
+		output = 'building_blocks:gravel_spread 4',
+		recipe = {
+			{"default:gravel", "default:gravel", "default:gravel"},
+		}
+	})
+end
+
 minetest.register_craft({
 	output = 'building_blocks:hardwood 2',
 	recipe = {
@@ -167,4 +171,4 @@ minetest.register_craft({
 	type = "fuel",
 	recipe = "building_blocks:Tar",
 	burntime = 40,
-})
+})