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

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

1 files changed, 4 insertions, 4 deletions

diff --git a/Minecraft.Client/VillagerModel.h b/Minecraft.Client/VillagerModel.h
index 24c8b858..eaccddae 100644
--- a/Minecraft.Client/VillagerModel.h
+++ b/Minecraft.Client/VillagerModel.h
@@ -5,11 +5,11 @@
 class VillagerModel : public Model 
 {
 public:
-	ModelPart *head, *body, *arms, *leg0, *leg1;
+	ModelPart *head, *body, *arms, *leg0, *leg1, *nose;
 
-	void _init(float g, float yOffset); // 4J added
-    VillagerModel(float g, float yOffset);
+	void _init(float g, float yOffset, int xTexSize, int yTexSize); // 4J added
+    VillagerModel(float g, float yOffset, int xTexSize, int yTexSize);
     VillagerModel(float g);
     virtual void render(shared_ptr<Entity> entity, float time, float r, float bob, float yRot, float xRot, float scale, bool usecompiled) ;
-    virtual void setupAnim(float time, float r, float bob, float yRot, float xRot, float scale, unsigned int uiBitmaskOverrideAnim=0);
+    virtual void setupAnim(float time, float r, float bob, float yRot, float xRot, float scale, shared_ptr<Entity> entity, unsigned int uiBitmaskOverrideAnim=0);
 };