Merge remote-tracking branch 'origin/main' into exp/achievements

Minecraft.Client/Common/Consoles_App.cpp

@@ -96,7 +96,7 @@ CMinecraftApp::CMinecraftApp()
 		// 4J Stu - See comment for GAME_SETTINGS_PROFILE_DATA_BYTES in Xbox_App.h
 		DebugPrintf("WARNING: The size of the profile GAME_SETTINGS struct has changed, so all stat data is likely incorrect. Is: %d, Should be: %d\n",sizeof(GAME_SETTINGS),GAME_SETTINGS_PROFILE_DATA_BYTES);
 #ifndef _CONTENT_PACKAGE
-		__debugbreak();
+		DEBUG_BREAK();
 #endif
 	}
 
@@ -1417,9 +1417,6 @@ int CMinecraftApp::OldProfileVersionCallback(LPVOID pParam,unsigned char *pucDat
 		{
 			// This might be from a version during testing of new profile updates
 			app.DebugPrintf("Don't know what to do with this profile version!\n");
-#ifndef _CONTENT_PACKAGE
-			//		__debugbreak();
-#endif
 
 			GAME_SETTINGS *pGameSettings=(GAME_SETTINGS *)pucData;
 			pGameSettings->ucMenuSensitivity=100; //eGameSetting_Sensitivity_InMenu
@@ -6672,7 +6669,7 @@ void CMinecraftApp::InitialiseTips()
 		{
 			// the m_TriviaTipA or the m_GameTipA are out of sync
 #ifndef _CONTENT_PACKAGE
-			__debugbreak();
+			DEBUG_BREAK();
 #endif
 		}
 	}
@@ -6925,6 +6922,8 @@ wstring CMinecraftApp::FormatChatMessage(const wstring& desc, bool applyStyling)
 	results = replaceAll(results, L"§f", replacements);
 	results = replaceAll(results, L"§r", replacements); //we only support color so reset is the same as white color
 
+	results = replaceAll(results, L"'", L"\u2019");
+
 	if (applyStyling) {
 		std::wsmatch match;
 		while (std::regex_search(results, match, IDS_Pattern)) {