Merge remote-tracking branch 'upstream/master'

bunny.lua

@@ -161,7 +161,7 @@ minetest.register_craft({
 minetest.register_craftitem(":mobs:rabbit_hide", {
 	description = S("Rabbit Hide"),
 	inventory_image = "mobs_rabbit_hide.png",
-	groups = {flammable = 2},
+	groups = {flammable = 2, pelt = 1},
 })
 
 minetest.register_craft({

chicken.lua

@@ -302,7 +302,7 @@ minetest.register_craft({
 minetest.register_craftitem(":mobs:chicken_feather", {
 	description = S("Feather"),
 	inventory_image = "mobs_chicken_feather.png",
-	groups = {flammable = 2},
+	groups = {flammable = 2, feather = 1},
 })
 
 minetest.register_craft({

cow.lua

@@ -189,11 +189,13 @@ minetest.register_craft({
 	type = "shapeless",
 	output = "mobs:bucket_milk",
 	recipe = {
-		"mobs:glass_milk", "mobs:glass_milk",
+		"group:food_milk_glass", "group:food_milk_glass",
-		"mobs:glass_milk", "mobs:glass_milk",
+		"group:food_milk_glass", "group:food_milk_glass",
 		"bucket:bucket_empty"
 	},
-	replacements = { {"mobs:glass_milk", "vessels:drinking_glass 4"} }
+	replacements = {
+		{"group:food_milk_glass", "vessels:drinking_glass 4"},
+	}
 })
 
 

mod.conf

@@ -1 +1,4 @@
 name = mobs_animal
+depends = default, mobs
+optional_depends = lucky_block, intllib
+description = Adds farm animals.

sheep.lua

@@ -64,6 +64,12 @@ for _, col in ipairs(all_colours) do
 			stand_end = 80,
 			walk_start = 81,
 			walk_end = 100,
+
+			die_start = 1, -- we dont have a specific death animation so we will
+			die_end = 2, --   re-use 2 standing frames at a speed of 1 fps and
+			die_speed = 1, -- have mob rotate when dying.
+			die_loop = false,
+			die_rotate = true,
 		},
 		follow = {
 			"farming:wheat", "default:grass_1", "farming:barley",
@@ -97,7 +103,7 @@ for _, col in ipairs(all_colours) do
 			--are we feeding?
 			if mobs:feed_tame(self, clicker, 8, true, true) then
 
-				--if fed 7x grass or wheat then sheep regrows wool
+				--if fed 7 times then sheep regrows wool
 				if self.food and self.food > 6 then
 
 					self.gotten = false

warthog.lua

@@ -51,6 +51,12 @@ mobs:register_mob("mobs_animal:pumba", {
 		walk_end = 100,
 		punch_start = 70,
 		punch_end = 100,
+
+		die_start = 1, -- we dont have a specific death animation so we will
+		die_end = 2, --   re-use 2 standing frames at a speed of 1 fps and
+		die_speed = 1, -- have mob rotate when dying.
+		die_loop = false,
+		die_rotate = true,
 	},
 	on_rightclick = function(self, clicker)