feat: TU19 (Dec 2014) Features & Content (#155)

* try to resolve merge conflict

* feat: TU19 (Dec 2014) Features & Content (#32)

* December 2014 files

* Working release build

* Fix compilation issues

* Add sound to Windows64Media

* Add DLC content and force Tutorial DLC

* Revert "Add DLC content and force Tutorial DLC"

This reverts commit 97a43994725008e35fceb984d5549df9c8cea470.

* Disable broken light packing

* Disable breakpoint during DLC texture map load

Allows DLC loading but the DLC textures are still broken

* Fix post build not working

* ...

* fix vs2022 build

* fix cmake build

---------

Co-authored-by: Loki <lokirautio@gmail.com>

Minecraft.World/ClientSideMerchant.cpp

@@ -3,7 +3,7 @@
 #include "net.minecraft.world.inventory.h"
 #include "ClientSideMerchant.h"
 
-ClientSideMerchant::ClientSideMerchant(shared_ptr<Player> source, int name)
+ClientSideMerchant::ClientSideMerchant(shared_ptr<Player> source, const wstring &name)
 {
 	this->source = source;
 	// 4J Stu - Need to do this after creating as a shared_ptr
@@ -58,7 +58,7 @@ void ClientSideMerchant::notifyTradeUpdated(shared_ptr<ItemInstance> item)
 {
 }
 
-int ClientSideMerchant::getDisplayName()
+wstring ClientSideMerchant::getDisplayName()
 {
 	return m_name;
 }