fix

2015-12-06 14:29:07 -05:00 · 2015-12-06 14:29:07 -05:00 · fd5838d8e0
parent 6438d42828 4b12138f04
commit fd5838d8e0
3 changed files with 8 additions and 0 deletions
--- a/mods/esmobs/esanimal.lua
+++ b/mods/esmobs/esanimal.lua
@ -116,7 +116,11 @@ bp:register_mob("esmobs:sheep", {
 	end,
 })

+<<<<<<< HEAD
 bp:register_spawn("esmobs:sheep", {"default:dirt_with_grass","default:dirt_with_dry_grass", "default:dry:dirt", "ethereal:green_dirt"}, 18, -1, 6000, 2, 31000)
+=======
+bp:register_spawn("esmobs:sheep", {"default:dirt_with_grass","default:dry_grass",  "ethereal:green_dirt"}, 5, -1, 12000, 2, 31000)
+>>>>>>> origin/master

 --bp:register_egg("esmobs:sheep", "Sheep", "wool_white.png", 1)

--- a/mods/shooter/sounds/shooter_rifle.ogg
+++ b/mods/shooter/sounds/shooter_rifle.ogg
--- a/mods/thirsty/thirsty.default.conf
+++ b/mods/thirsty/thirsty.default.conf
@ -38,7 +38,11 @@ thirsty.config = {
    thirst_per_second = 1.0 / 20.0,

    -- Damage per second if completely thirsty / out of hydration
+<<<<<<< HEAD
    damage_per_second = 0.5 / 10.0,
+=======
+    damage_per_second = 1.0 / 10.0,
+>>>>>>> origin/master

    --[[ How long in seconds you have to remain still to drink
         from standing in water