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

get_animation does not return the data if called from outside without this change

game.conf

@@ -1,3 +1,3 @@
-title       = Minetest Game
+title = Notre Ami Le Cube 1.6
-author      = Minetest
+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

@@ -0,0 +1,76 @@
+# This file contains settings of Minetest Game that can be changed in
+# minetest.conf.
+# By default, all the settings are commented and not functional.
+# Uncomment settings by removing the preceding #.
+
+# Whether creative mode (fast digging of all blocks, unlimited resources) should
+# be enabled.
+creative_mode = false
+
+# Sets the behaviour of the inventory items when a player dies.
+#   bones: Store items in a bone node but drop items if inside protected area.
+#   drop: Drop items on the ground.
+#   keep: Player keeps items.
+bones_mode = bones
+
+# The time in seconds after which the bones of a dead player can be looted by
+# everyone.
+# 0 to disable.
+share_bones_time = 1200
+
+# How much earlier the bones of a dead player can be looted by
+# everyone if the player dies in a protected area they don't own.
+# 0 to disable. By default it is "share_bones_time" divide by four.
+share_bones_time_early = 300
+
+# Inform player of condition and location of new bones.
+bones_position_message = true
+
+# Whether fire should be enabled. If disabled, 'basic_flame' nodes will
+# disappear.
+# 'permanent_flame' nodes will remain with either setting.
+enable_fire = false
+
+# Enable flame sound.
+flame_sound = true
+
+# Whether lavacooling should be enabled.
+enable_lavacooling = true
+
+# Whether the stuff in initial_stuff should be given to new players.
+give_initial_stuff = true
+initial_stuff = default:axe_wood,default:torch 9,default:sapling 2,default:apple 5
+
+# Whether the TNT mod should be enabled.
+enable_tnt = true
+
+# The radius of a TNT explosion.
+tnt_radius = 3
+
+# Enable the stairs mod ABM that replaces the old 'upside down'
+# stair and slab nodes in old maps with the new param2 versions.
+enable_stairs_replace_abm = false
+
+# Whether to allow respawning in beds.
+# Default value is true.
+enable_bed_respawn = true
+
+# Whether players can skip night by sleeping.
+# Default value is true.
+enable_bed_night_skip = true
+
+# If enabled, fences and walls cannot be jumped over.
+enable_fence_tall = true
+
+# Whether the engine's spawn search, which does not check for a suitable
+# starting biome, is used.
+# Default value is false.
+engine_spawn = false
+
+# Whether river water source nodes create flowing sounds.
+# Helps rivers create more sound, especially on level sections.
+river_source_sounds = true
+
+# Enable cloud variation by the 'weather' mod.
+# Non-functional in V6 or Singlenode mapgens.
+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