Merge remote-tracking branch 'upstream/master'

init.lua

@@ -650,23 +650,24 @@ minetest.register_craft({
 	recipe = {{"bonemeal:bonemeal", "bonemeal:mulch"}}
 })
 
--- add bones to dirt
-if minetest.registered_items[a.dirt] then
-
-	minetest.override_item(a.dirt, {
-		drop = {
-			max_items = 1,
-			items = {
-				{
-					items = {"bonemeal:bone"},
-					rarity = 40
-				},
-				{
-					items = {a.dirt}
-				}
+-- NALC: add bones to dirt but without overriding a previous drop definition
+-- from other mods.
+local drop = minetest.registered_items["default:dirt"].drop
+if drop then
+	table.insert(drop.items, 1, {items = {"bonemeal:bone"}, rarity = 30})
+else
+	drop = {
+		max_items = 1,
+		items = {
+			{
+				items = {"bonemeal:bone"},
+				rarity = 40
+			},
+			{
+				items = {"default:dirt"}
 			}
 		}
-	})
+	}
 end
 
 -- add support for mods