Merge remote-tracking branch 'upstream/master' into experimental

Co-authored-by: sfan5 <sfan5@live.de>

game.conf

@@ -1,3 +1,3 @@
-title       = Notre Ami Le Cube 1.6
-author      = Minetest and Sys4
-description = A basic exploration, mining, crafting, and building, sandbox game with no NPCs, monsters, or animals. Minetest Game is usually used with mods added, and many mods are available for this game. Reliably maintained by Minetest Engine core developers.
+title = Notre Ami Le Cube 1.6
+author = Minetest and Sys4
+description = Minetest game slightly modified by Sys4

minetest.conf

@@ -73,4 +73,4 @@ river_source_sounds = true
 
 # Enable cloud variation by the 'weather' mod.
 # Non-functional in V6 or Singlenode mapgens.
-enable_weather = false
+enable_weather = true

mods/creative/mod.conf

@@ -1,3 +1,4 @@
 name = creative
 description = Minetest Game mod: creative
-depends = default, sfinv
+depends = sfinv
+optional_depends = default

mods/stairs/init.lua

@@ -32,7 +32,13 @@ local function rotate_and_place(itemstack, placer, pointed_thing)
 	if placer then
 		local placer_pos = placer:get_pos()
 		if placer_pos then
-			param2 = minetest.dir_to_facedir(vector.subtract(p1, placer_pos))
+			local diff = vector.subtract(p1, placer_pos)
+			param2 = minetest.dir_to_facedir(diff)
+			-- The player places a node on the side face of the node he is standing on
+			if p0.y == p1.y and math.abs(diff.x) <= 0.5 and math.abs(diff.z) <= 0.5 and diff.y < 0 then
+				-- reverse node direction
+				param2 = (param2 + 2) % 4
+			end
 		end
 
 		local finepos = minetest.pointed_thing_to_face_pos(placer, pointed_thing)

mods/wool/init.lua

@@ -8,19 +8,21 @@ local dyes = dye.dyes
 for i = 1, #dyes do
 	local name, desc = unpack(dyes[i])
 
+	local color_group = "color_" .. name
+
 	minetest.register_node("wool:" .. name, {
 		description = S(desc .. " Wool"),
 		tiles = {"wool_" .. name .. ".png"},
 		is_ground_content = false,
 		groups = {snappy = 2, choppy = 2, oddly_breakable_by_hand = 3,
-				flammable = 3, wool = 1},
+				flammable = 3, wool = 1, [color_group] = 1},
 		sounds = default.node_sound_defaults(),
 	})
 
 	minetest.register_craft{
 		type = "shapeless",
 		output = "wool:" .. name,
-		recipe = {"group:dye,color_" .. name, "group:wool"},
+		recipe = {"group:dye," .. color_group, "group:wool"},
 	}
 end