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

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

1 files changed, 17 insertions, 0 deletions

diff --git a/Minecraft.Client/WitchModel.h b/Minecraft.Client/WitchModel.h
new file mode 100644
index 00000000..a0824aa5
--- /dev/null
+++ b/Minecraft.Client/WitchModel.h
@@ -0,0 +1,17 @@
+#pragma once
+#include "VillagerModel.h"
+
+class WitchModel : public VillagerModel
+{
+public:
+	bool holdingItem;
+
+private:
+	ModelPart *mole;
+	ModelPart *hat;
+
+public:
+	WitchModel(float g);
+	virtual void setupAnim(float time, float r, float bob, float yRot, float xRot, float scale, shared_ptr<Entity> entity, unsigned int uiBitmaskOverrideAnim=0);
+	int getModelVersion();
+};
\ No newline at end of file