Merge remote-tracking branch 'origin/main' into networking

.gitignore

@@ -6,6 +6,14 @@
 /*Release*
 /*ContentPackage*
 
+# Minecraft.Server
+/Minecraft.Server/x64
+/Minecraft.Server/x64_*
+/Minecraft.Server/*Debug
+/Minecraft.Server/*Release*
+/Minecraft.Server/*Server*
+/Minecraft.Server/*ContentPackage*
+
 # Minecraft.Client
 /Minecraft.Client/x64
 /Minecraft.Client/x64_*
@@ -15,7 +23,7 @@
 /Minecraft.Client/*ContentPackage*
 /Minecraft.Client/Windows64/GameHDD
 
-# Minecraft.world
+# Minecraft.World
 /Minecraft.World/x64
 /Minecraft.World/x64_*
 /Minecraft.World/*Debug
@@ -29,13 +37,9 @@
 /Minecraft.Client/PS3/SPU_Tasks/*/Release
 /Minecraft.Client/PS3/SPU_Tasks/*/ContentPackage
 
-# Minecraft.Server
-/Minecraft.Server/x64
-/Minecraft.Server/x64_*
-/Minecraft.Server/*Debug
-/Minecraft.Server/*Release*
-/Minecraft.Server/*Server*
-/Minecraft.Server/*ContentPackage*
+# Xbox 360 XZP & XURs
+Minecraft.Client/XboxMedia/XZP
+Minecraft.Client/Common/Media/XURs
 
 # Misc
 *.ppu.o
@@ -47,4 +51,5 @@
 *.sdf
 *.opensdf
 *.v11.suo
-*.vcxproj.user
+*.vcxproj.user
+*.aps