Merge branch 'main' into pr/win64-world-saves

# Conflicts:
#	Minecraft.Client/MinecraftServer.cpp
#	README.md

1 files changed, 30 insertions, 30 deletions

diff --git a/Minecraft.Client/User.cpp b/Minecraft.Client/User.cpp
index a359bfd3..b8e2f2c0 100644
--- a/Minecraft.Client/User.cpp
+++ b/Minecraft.Client/User.cpp
@@ -6,40 +6,40 @@ vector<Tile *> User::allowedTiles;
 
 void User::staticCtor()
 {
-    allowedTiles.push_back(Tile::rock);
-    allowedTiles.push_back(Tile::stoneBrick);
-    allowedTiles.push_back(Tile::redBrick);
-    allowedTiles.push_back(Tile::dirt);
-    allowedTiles.push_back(Tile::wood);
-    allowedTiles.push_back(Tile::treeTrunk);
-    allowedTiles.push_back(Tile::leaves);
-    allowedTiles.push_back(Tile::torch);
-    allowedTiles.push_back(Tile::stoneSlabHalf);
+	allowedTiles.push_back(Tile::stone);
+	allowedTiles.push_back(Tile::cobblestone);
+	allowedTiles.push_back(Tile::redBrick);
+	allowedTiles.push_back(Tile::dirt);
+	allowedTiles.push_back(Tile::wood);
+	allowedTiles.push_back(Tile::treeTrunk);
+	allowedTiles.push_back(Tile::leaves);
+	allowedTiles.push_back(Tile::torch);
+	allowedTiles.push_back(Tile::stoneSlabHalf);
 
-    allowedTiles.push_back(Tile::glass);
-    allowedTiles.push_back(Tile::mossStone);
-    allowedTiles.push_back(Tile::sapling);
-    allowedTiles.push_back(Tile::flower);
-    allowedTiles.push_back(Tile::rose);
-    allowedTiles.push_back(Tile::mushroom1);
-    allowedTiles.push_back(Tile::mushroom2);
-    allowedTiles.push_back(Tile::sand);
-    allowedTiles.push_back(Tile::gravel);
-    allowedTiles.push_back(Tile::sponge);
+	allowedTiles.push_back(Tile::glass);
+	allowedTiles.push_back(Tile::mossyCobblestone);
+	allowedTiles.push_back(Tile::sapling);
+	allowedTiles.push_back(Tile::flower);
+	allowedTiles.push_back(Tile::rose);
+	allowedTiles.push_back(Tile::mushroom_brown);
+	allowedTiles.push_back(Tile::mushroom_red);
+	allowedTiles.push_back(Tile::sand);
+	allowedTiles.push_back(Tile::gravel);
+	allowedTiles.push_back(Tile::sponge);
 
-    allowedTiles.push_back(Tile::cloth);
-    allowedTiles.push_back(Tile::coalOre);
-    allowedTiles.push_back(Tile::ironOre);
-    allowedTiles.push_back(Tile::goldOre);
-    allowedTiles.push_back(Tile::ironBlock);
-    allowedTiles.push_back(Tile::goldBlock);
-    allowedTiles.push_back(Tile::bookshelf);
-    allowedTiles.push_back(Tile::tnt);
-    allowedTiles.push_back(Tile::obsidian);
+	allowedTiles.push_back(Tile::wool);
+	allowedTiles.push_back(Tile::coalOre);
+	allowedTiles.push_back(Tile::ironOre);
+	allowedTiles.push_back(Tile::goldOre);
+	allowedTiles.push_back(Tile::ironBlock);
+	allowedTiles.push_back(Tile::goldBlock);
+	allowedTiles.push_back(Tile::bookshelf);
+	allowedTiles.push_back(Tile::tnt);
+	allowedTiles.push_back(Tile::obsidian);
 }
 
 User::User(const wstring& name, const wstring& sessionId)
 {
-    this->name = name;
-    this->sessionId = sessionId;
+	this->name = name;
+	this->sessionId = sessionId;
 }