resolving conflicts

This commit is contained in:
Juraj Vajda 2016-02-03 22:19:27 +01:00
commit b55be75c7f
2 changed files with 4 additions and 4 deletions

View File

@ -9,7 +9,7 @@ Currently it works with [Pyramids Mummy](https://forum.minetest.net/viewtopic.ph
![spawner_waiting_medium.gif](https://bitbucket.org/repo/y69Me7/images/246761582-spawner_waiting_medium.gif) ![spawner_animated_medium.gif](https://bitbucket.org/repo/y69Me7/images/1359872529-spawner_animated_medium.gif)
## YouTube video ##
[Minetest - spawners MOD](https://youtu.be/TlaMVl0ZDtw)
[Minetest - spawners MOD v0.1](https://youtu.be/TlaMVl0ZDtw)
## Mod dependencies ##
* default

View File

@ -53,12 +53,12 @@ MOBS_PROPS = {
sound_custom=""
},
{
name="warthog",
name="pumba",
egg_name_custom="",
dummy_size={x=0.62,y=0.62},
dummy_offset=-0.3,
dummy_mesh="mobs_warthog.x",
dummy_texture={"mobs_warthog.png"},
dummy_mesh="mobs_pumba.x",
dummy_texture={"mobs_pumba.png"},
night_only=false,
sound_custom="mobs_pig"
},