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.World/MerchantContainer.h b/Minecraft.World/MerchantContainer.h
index efba13d6..e2e63970 100644
--- a/Minecraft.World/MerchantContainer.h
+++ b/Minecraft.World/MerchantContainer.h
@@ -30,11 +30,14 @@ private:
 public:
 	shared_ptr<ItemInstance> removeItemNoUpdate(int slot);
 	void setItem(unsigned int slot, shared_ptr<ItemInstance> item);
-	int getName();
-	int getMaxStackSize();
+	wstring getName();
+	wstring getCustomName();
+	bool hasCustomName();
+	int getMaxStackSize() const;
 	bool stillValid(shared_ptr<Player> player);
 	void startOpen();
 	void stopOpen();
+	bool canPlaceItem(int slot, shared_ptr<ItemInstance> item);
 	void setChanged();
 	void updateSellItem();
 	MerchantRecipe *getActiveRecipe();