From d78bd02d7b93c6ad6576ed867c72d421385cbd67 Mon Sep 17 00:00:00 2001 From: Sollace Date: Wed, 5 Sep 2018 17:09:26 +0200 Subject: [PATCH] Revert: Zombies should still have a race pixel for their skulls --- .../minelittlepony/pony/data/PonyRace.java | 2 +- .../textures/entity/zombie/zombie_pony.png | Bin 5421 -> 5421 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/minelittlepony/pony/data/PonyRace.java b/src/main/java/com/minelittlepony/pony/data/PonyRace.java index 35f9fe7a..72cc47eb 100644 --- a/src/main/java/com/minelittlepony/pony/data/PonyRace.java +++ b/src/main/java/com/minelittlepony/pony/data/PonyRace.java @@ -6,7 +6,7 @@ import com.minelittlepony.model.player.PlayerModels; public enum PonyRace implements ITriggerPixelMapped { HUMAN(0, PlayerModels.DEFAULT, false, false), - EARTH(0xf9b131, PlayerModels.EARTH,false, false), + EARTH(0xf9b131, PlayerModels.EARTH, false, false), PEGASUS(0x88caf0, PlayerModels.PEGASUS, true, false), UNICORN(0xd19fe4, PlayerModels.UNICORN, false, true), ALICORN(0xfef9fc, PlayerModels.ALICORN, true, true), diff --git a/src/main/resources/assets/minelittlepony/textures/entity/zombie/zombie_pony.png b/src/main/resources/assets/minelittlepony/textures/entity/zombie/zombie_pony.png index ea9865455e72d9000e75ab0d27230bd4a0036d46..892533c2f2220219b9fbbc9670f8f3f4a7aeac97 100644 GIT binary patch delta 5396 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