fix mergeconflict

bee.lua

@@ -85,7 +85,7 @@ mobs:register_mob("mobs_animal:bee_angry", {
     end,
 })
 
-mobs:register_spawn("mobs_animal:bee", {"group:flower"}, 20, 10, 9000, 1, 31000, true)
+mobs:register_spawn("mobs_animal:bee", {"group:flower"}, 20, 10, 9000, 2, 31000, true)
 
 mobs:register_egg("mobs_animal:bee", S("Bee"), "mobs_bee_inv.png", 0)
 mobs:register_egg("mobs_animal:bee_angry", S("Angry Bee"), "mobs_bee_inv.png", 0)

chicken.lua

@@ -78,8 +78,17 @@ mobs:register_mob("mobs_animal:chicken", {
 	end,
 })
 
-mobs:register_spawn("mobs_animal:chicken",
-	{"default:dirt_with_grass", "ethereal:bamboo_dirt"}, 20, 10, 15000, 1, 31000, true)
+--mobs:register_spawn("mobs_animal:chicken",
+--	{"default:dirt_with_grass", "ethereal:bamboo_dirt"}, 20, 10, 15000, 2, 31000, true)
+
+mobs:spawn({
+	name = "mobs_animal:chicken",
+	nodes = {"default:dirt_with_grass", "ethereal:bamboo_dirt"},
+	interval = 1,
+	chance = 5000,
+	active_object_count = 2,
+	day_toggle = true,
+})
 
 mobs:register_egg("mobs_animal:chicken", S("Chicken"), "mobs_chicken_inv.png", 0)
 

cow.lua

@@ -96,7 +96,7 @@ mobs:register_mob("mobs_animal:cow", {
 })
 
 mobs:register_spawn("mobs_animal:cow",
-	{"default:dirt_with_grass", "ethereal:green_dirt"}, 20, 10, 15000, 1, 31000, true)
+	{"default:dirt_with_grass", "ethereal:green_dirt"}, 20, 10, 15000, 3, 31000, true)
 
 mobs:register_egg("mobs_animal:cow", S("Cow"), "default_grass.png", 1)
 

kitten.lua

@@ -53,7 +53,7 @@ mobs:register_mob("mobs_animal:kitten", {
 })
 
 mobs:register_spawn("mobs_animal:kitten",
-	{"default:dirt_with_grass", "ethereal:grove_dirt"}, 20, 12, 22000, 1, 31000, true)
+	{"default:dirt_with_grass", "ethereal:grove_dirt"}, 20, 12, 22000, 2, 31000, true)
 
 mobs:register_egg("mobs_animal:kitten", S("Kitten"), "mobs_kitten_inv.png", 0)
 

license.txt

+The MIT License (MIT)
+
+Copyright (c) 2014 Krupnov Pavel and 2016 TenPlus1
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

rat.lua

@@ -57,7 +57,18 @@ mobs:register_mob("mobs_animal:rat", {
 ]]
 })
 
-mobs:register_spawn("mobs_animal:rat", {"default:stone"}, 20, 5, 15000, 2, 0)
+--mobs:register_spawn("mobs_animal:rat", {"default:stone"}, 20, 5, 15000, 2, 0)
+
+local function rat_spawn(self, pos)
+	print (self:get_luaentity().name, pos.x, pos.y, pos.z)
+end
+
+mobs:spawn({
+	name = "mobs_animal:rat",
+	nodes = {"default:stone"},
+	max_height = 0,
+--	on_spawn = rat_spawn,
+})
 
 mobs:register_egg("mobs_animal:rat", S("Rat"), "mobs_rat_inventory.png", 0)
 

readme.md

@@ -27,7 +27,7 @@ Rat
 
 Sheep
 
-- Green grass and wheat munchers that can be clipped using shears to give 1-3 wool. Feed sheep 8x wheat to regrow wool, tame and breed. Will drop 1-3 meat when killed.
+- Green grass and wheat munchers that can be clipped using shears to give 1-3 wool. Feed sheep 8x wheat to regrow wool, tame and breed.  Right-click a tamed sheep with dye to change it's colour.  Will drop 1-3 meat when killed.
 
 Warthog
 

sheep.lua

@@ -178,7 +178,7 @@ for _, col in pairs(all_colours) do
 end
 
 mobs:register_spawn("mobs_animal:sheep_white",
-	{"default:dirt_with_grass", "ethereal:green_dirt"}, 20, 10, 15000, 1, 31000, true)
+	{"default:dirt_with_grass", "ethereal:green_dirt"}, 20, 10, 15000, 3, 31000, true)
 
 
 -- compatibility

warthog.lua

@@ -56,7 +56,7 @@ mobs:register_mob("mobs_animal:pumba", {
 })
 
 mobs:register_spawn("mobs_animal:pumba",
-	{"ethereal:mushroom_dirt", "default:dirt_with_dry_grass"}, 20, 10, 15000, 1, 31000, true)
+	{"ethereal:mushroom_dirt", "default:dirt_with_dry_grass"}, 20, 10, 15000, 3, 31000, true)
 
 mobs:register_egg("mobs_animal:pumba", S("Warthog"), "wool_pink.png", 1)