Merge branch 'stable-5' into nalc-dev

fixes #2228

game.conf

@@ -1,3 +1,3 @@
-name = Minetest Game
-author = minetest
-description = Bundled by default with Minetest, and aims to be lightweight, moddable, and fairly playable without mods.
+name = Notre Ami Le Cube 1.1
+author = minetest and sys4
+description = Minetest game modified by sys4

mods/default/craftitems.lua

@@ -343,5 +343,6 @@ minetest.register_craftitem("default:flint", {
 minetest.register_craftitem("default:blueberries", {
 	description = "Blueberries",
 	inventory_image = "default_blueberries.png",
+	groups = {food_blueberries = 1, food_berry = 1},
 	on_use = minetest.item_eat(2),
 })

mods/dungeon_loot/mapgen.lua

@@ -88,18 +88,20 @@ local function populate_chest(pos, rand, dungeontype)
 				amount = rand:next(loot.count[1], loot.count[2])
 			end
 
-			if itemdef.tool_capabilities then
-				for n = 1, amount do
-					local wear = rand:next(0.20 * 65535, 0.75 * 65535) -- 20% to 75% wear
-					table.insert(items, ItemStack({name = loot.name, wear = wear}))
+			if itemdef then
+				if itemdef.tool_capabilities then
+					for n = 1, amount do
+						local wear = rand:next(0.20 * 65535, 0.75 * 65535) -- 20% to 75% wear
+						table.insert(items, ItemStack({name = loot.name, wear = wear}))
+					end
+				elseif itemdef.stack_max == 1 then
+					-- not stackable, add separately
+					for n = 1, amount do
+						table.insert(items, loot.name)
+					end
+				else
+					table.insert(items, ItemStack({name = loot.name, count = amount}))
 				end
-			elseif itemdef.stack_max == 1 then
-				-- not stackable, add separately
-				for n = 1, amount do
-					table.insert(items, loot.name)
-				end
-			else
-				table.insert(items, ItemStack({name = loot.name, count = amount}))
 			end
 		end
 	end