Merge branch 'master' into nalc-1.2

2019-06-02 17:28:21 +02:00
parent ad864bd1c8 9e2f3813b3
commit 7d86d7d8a5
23 changed files with 30 additions and 12754 deletions
--- a/textures/mobs_cow.png
+++ b/textures/mobs_cow.png
--- a/textures/mobs_cow2.png
+++ b/textures/mobs_cow2.png
--- a/textures/mobs_cow_inv.png
+++ b/textures/mobs_cow_inv.png
--- a/textures/mobs_panda_inv.png
+++ b/textures/mobs_panda_inv.png
--- a/textures/mobs_penguin_inv.png
+++ b/textures/mobs_penguin_inv.png
--- a/textures/mobs_pumba.png
+++ b/textures/mobs_pumba.png
--- a/textures/mobs_pumba_inv.png
+++ b/textures/mobs_pumba_inv.png
--- a/textures/mobs_rabbit_hide.png
+++ b/textures/mobs_rabbit_hide.png
--- a/textures/mobs_rat_inv.png
+++ b/textures/mobs_rat_inv.png
--- a/textures/mobs_rat_inventory.png
+++ b/textures/mobs_rat_inventory.png
--- a/textures/mobs_sheep_inv.png
+++ b/textures/mobs_sheep_inv.png