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

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

1 files changed, 18 insertions, 3 deletions

diff --git a/Minecraft.World/CraftingContainer.cpp b/Minecraft.World/CraftingContainer.cpp
index fbcc5678..47a11eb4 100644
--- a/Minecraft.World/CraftingContainer.cpp
+++ b/Minecraft.World/CraftingContainer.cpp
@@ -41,9 +41,19 @@ shared_ptr<ItemInstance> CraftingContainer::getItem(unsigned int x, unsigned int
 	return getItem(pos);
 }
 
-int CraftingContainer::getName()
+wstring CraftingContainer::getName()
 {
-	return 0;
+	return L"";
+}
+
+wstring CraftingContainer::getCustomName()
+{
+	return L"";
+}
+
+bool CraftingContainer::hasCustomName()
+{
+	return false;
 }
 
 shared_ptr<ItemInstance> CraftingContainer::removeItemNoUpdate(int slot)
@@ -85,7 +95,7 @@ void CraftingContainer::setItem(unsigned int slot, shared_ptr<ItemInstance> item
 	if(menu) menu->slotsChanged();
 }
 
-int CraftingContainer::getMaxStackSize()
+int CraftingContainer::getMaxStackSize() const
 {
 	return Container::LARGE_MAX_STACK_SIZE;
 }
@@ -97,4 +107,9 @@ void CraftingContainer::setChanged()
 bool CraftingContainer::stillValid(shared_ptr<Player> player)
 {
 	return true;
+}
+
+bool CraftingContainer::canPlaceItem(int slot, shared_ptr<ItemInstance> item)
+{
+	return true;
 }
\ No newline at end of file