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

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

1 files changed, 5 insertions, 2 deletions

diff --git a/Minecraft.Client/PreStitchedTextureMap.h b/Minecraft.Client/PreStitchedTextureMap.h
index 40a755f8..882a7eae 100644
--- a/Minecraft.Client/PreStitchedTextureMap.h
+++ b/Minecraft.Client/PreStitchedTextureMap.h
@@ -30,13 +30,16 @@ private:
 	Texture *stitchResult;
 	vector<StitchedTexture *> animatedTextures; // = new ArrayList<StitchedTexture>();
 
-	vector<pair<wstring, wstring> > texturesToAnimate;
-
 	void loadUVs();
 public:
 	PreStitchedTextureMap(int type, const wstring &name, const wstring &path, BufferedImage *missingTexture, bool mipMap = false);
 
 	void stitch();
+
+private:
+	void makeTextureAnimated(TexturePack *texturePack, StitchedTexture *tex);
+
+public:
 	StitchedTexture *getTexture(const wstring &name);
 	void cycleAnimationFrames();
 	Texture *getStitchedTexture();