December 2014 files

2026-03-01 11:00:23 -06:00
parent b691c43c44
commit 8fd3ac6e37
2049 changed files with 260190 additions and 134787 deletions
--- a/Minecraft.World/Merchant.h
+++ b/Minecraft.World/Merchant.h
@@ -13,5 +13,5 @@ public:
 	virtual void overrideOffers(MerchantRecipeList *recipeList) = 0;
 	virtual void notifyTrade(MerchantRecipe *activeRecipe) = 0;
 	virtual void notifyTradeUpdated(shared_ptr<ItemInstance> item) = 0;
-	virtual int getDisplayName() = 0;
+	virtual wstring getDisplayName() = 0;
 };