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

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.
+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/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