Merge branch 'main' into networking

.gitignore

@@ -1,44 +1,35 @@
-/*Debug
-/*Release
-/*ContentPackage
-/*ContentPackage_NO_TU
-/*ContentPackage_SYMBOLS
-/*ReleaseForArt
+.vs
 /x64
 /ipch
-.vs/
+.vscode
+/*Debug
+/*Release*
+/*ContentPackage*
 
 # Minecraft.Client
-/Minecraft.Client/x64/
+/Minecraft.Client/x64
 /Minecraft.Client/x64_*
 /Minecraft.Client/*Debug
-/Minecraft.Client/*Release
-/Minecraft.Client/*ContentPackage
-/Minecraft.Client/*ContentPackage_NO_TU
-/Minecraft.Client/*ContentPackage_SYMBOLS
-/Minecraft.Client/*ReleaseForArt
+/Minecraft.Client/*Release*
+/Minecraft.Client/*ContentPackage*
 /Minecraft.Client/Windows64/GameHDD
 
 # Minecraft.world
-/Minecraft.World/x64/
+/Minecraft.World/x64
 /Minecraft.World/x64_*
 /Minecraft.World/*Debug
-/Minecraft.World/*Release
-/Minecraft.World/*ContentPackage
-/Minecraft.World/*ContentPackage_NO_TU
-/Minecraft.World/*ContentPackage_SYMBOLS
-/Minecraft.World/*ReleaseForArt
+/Minecraft.World/*Release*
+/Minecraft.World/*ContentPackage*
 
-# PS3 SPU
-/Minecraft.Client/PS3/SPU_Tasks/objFiles/
-/Minecraft.Client/PS3/SPU_Tasks/Texture_blit/PS3*
-/Minecraft.Client/PS3/SPU_Tasks/LevelRenderer_FindNearestChunk/PS3*
-/Minecraft.Client/PS3/SPU_Tasks/LevelRenderer_cull/PS3*
-/Minecraft.Client/PS3/SPU_Tasks/CompressedTileStorage_compress/PS3*
-/Minecraft.Client/PS3/SPU_Tasks/CompressedTile/PS3*
-/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/PS3*
+# PS3 SPU Tasks
+/Minecraft.Client/PS3/SPU_Tasks/objFiles
+/Minecraft.Client/PS3/SPU_Tasks/*/PS3*
+/Minecraft.Client/PS3/SPU_Tasks/*/Debug
+/Minecraft.Client/PS3/SPU_Tasks/*/Release
+/Minecraft.Client/PS3/SPU_Tasks/*/ContentPackage
 
 # Misc
+*.ppu.o
 *.pkg
 /*.gp4p
 /*.vpk
@@ -46,4 +37,5 @@
 *-app
 *.sdf
 *.opensdf
-*.v11.suo
+*.v11.suo
+*.vcxproj.user