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/TileEntityRenderer.cpp b/Minecraft.Client/TileEntityRenderer.cpp
index b5c83d71..94bdd39c 100644
--- a/Minecraft.Client/TileEntityRenderer.cpp
+++ b/Minecraft.Client/TileEntityRenderer.cpp
@@ -2,16 +2,16 @@
 #include "TileEntityRenderer.h"
 #include "TileEntityRenderDispatcher.h"
 
-void TileEntityRenderer::bindTexture(int resourceName)
+void TileEntityRenderer::bindTexture(ResourceLocation *location)
 {
     Textures *t = tileEntityRenderDispatcher->textures;
-    if(t != NULL) t->bind(t->loadTexture(resourceName));
+    if(t != NULL) t->bind(t->loadTexture(location->getTexture()));
 }
 
-void TileEntityRenderer::bindTexture(const wstring& urlTexture, int backupTexture)
+void TileEntityRenderer::bindTexture(const wstring& urlTexture, ResourceLocation *location)
 {
     Textures *t = tileEntityRenderDispatcher->textures;
-    if(t != NULL) t->bind(t->loadHttpTexture(urlTexture, backupTexture));
+    if(t != NULL) t->bind(t->loadHttpTexture(urlTexture, location->getTexture()));
 }
 
 Level *TileEntityRenderer::getLevel()