Merge branch 'main' into pr/win64-world-saves

# Conflicts:
#	Minecraft.Client/MinecraftServer.cpp
#	README.md

1 files changed, 7 insertions, 0 deletions

diff --git a/Minecraft.Client/CowRenderer.cpp b/Minecraft.Client/CowRenderer.cpp
index c4eaf261..ee0dd99f 100644
--- a/Minecraft.Client/CowRenderer.cpp
+++ b/Minecraft.Client/CowRenderer.cpp
@@ -1,6 +1,8 @@
 #include "stdafx.h"
 #include "CowRenderer.h"
 
+ResourceLocation CowRenderer::COW_LOCATION = ResourceLocation(TN_MOB_COW);
+
 CowRenderer::CowRenderer(Model *model, float shadow) : MobRenderer(model, shadow)
 {
 }
@@ -8,4 +10,9 @@ CowRenderer::CowRenderer(Model *model, float shadow) : MobRenderer(model, shadow
 void CowRenderer::render(shared_ptr<Entity> _mob, double x, double y, double z, float rot, float a)
 {
 	MobRenderer::render(_mob, x, y, z, rot, a);
+}
+
+ResourceLocation *CowRenderer::getTextureLocation(shared_ptr<Entity> mob)
+{
+    return &COW_LOCATION;
 }
\ No newline at end of file