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

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

1 files changed, 3 insertions, 2 deletions

diff --git a/Minecraft.Client/StitchedTexture.cpp b/Minecraft.Client/StitchedTexture.cpp
index d7e47b42..c17f3db5 100644
--- a/Minecraft.Client/StitchedTexture.cpp
+++ b/Minecraft.Client/StitchedTexture.cpp
@@ -19,11 +19,11 @@ StitchedTexture *StitchedTexture::create(const wstring &name)
 	}
 	else
 	{
-		return new StitchedTexture(name);
+		return new StitchedTexture(name,name);
 	}
 }
 
-StitchedTexture::StitchedTexture(const wstring &name) : name(name)
+StitchedTexture::StitchedTexture(const wstring &name, const wstring &filename) : name(name)
 {
 	// 4J Initialisers
 	source = NULL;
@@ -43,6 +43,7 @@ StitchedTexture::StitchedTexture(const wstring &name) : name(name)
 	frameOverride = NULL;
 	flags = 0;
 	frames = NULL;
+	m_fileName = filename;
 }
 
 void StitchedTexture::freeFrameTextures()