2 files changed, 45 insertions, 15 deletions
diff --git a/VC2010/MCServer.vcxproj b/VC2010/MCServer.vcxproj
index 2317408a1..abaa6a623 100644
--- a/VC2010/MCServer.vcxproj
+++ b/VC2010/MCServer.vcxproj
@@ -257,11 +257,14 @@
     <ClCompile Include="..\source\cRedstone.cpp" />
     <ClCompile Include="..\Source\cReferenceManager.cpp" />
     <ClCompile Include="..\Source\cRoot.cpp" />
+    <ClCompile Include="..\source\cSandSimulator.cpp" />
     <ClCompile Include="..\Source\cSemaphore.cpp" />
     <ClCompile Include="..\source\cServer.cpp" />
     <ClCompile Include="..\source\cSheep.cpp" />
     <ClCompile Include="..\Source\cSignEntity.cpp" />
     <ClCompile Include="..\source\cSilverfish.cpp" />
+    <ClCompile Include="..\source\cSimulator.cpp" />
+    <ClCompile Include="..\source\cSimulatorManager.cpp" />
     <ClCompile Include="..\source\cSkeleton.cpp" />
     <ClCompile Include="..\source\cSleep.cpp" />
     <ClCompile Include="..\source\cSlime.cpp" />
@@ -399,12 +402,15 @@
     <ClInclude Include="..\source\cRedstone.h" />
     <ClInclude Include="..\Source\cReferenceManager.h" />
     <ClInclude Include="..\Source\cRoot.h" />
+    <ClInclude Include="..\source\cSandSimulator.h" />
     <ClInclude Include="..\Source\cSemaphore.h" />
     <ClInclude Include="..\source\cServer.h" />
     <ClInclude Include="..\source\cSheep.h" />
     <ClInclude Include="..\Source\cSign.h" />
     <ClInclude Include="..\Source\cSignEntity.h" />
     <ClInclude Include="..\source\cSilverfish.h" />
+    <ClInclude Include="..\source\cSimulator.h" />
+    <ClInclude Include="..\source\cSimulatorManager.h" />
     <ClInclude Include="..\source\cSkeleton.h" />
     <ClInclude Include="..\source\cSleep.h" />
     <ClInclude Include="..\source\cSlime.h" />
diff --git a/VC2010/MCServer.vcxproj.filters b/VC2010/MCServer.vcxproj.filters
index 1b3cb6ab9..f9d9a9e93 100644
--- a/VC2010/MCServer.vcxproj.filters
+++ b/VC2010/MCServer.vcxproj.filters
@@ -397,15 +397,6 @@
     <Filter Include="cChunkGenerator">
       <UniqueIdentifier>{0d6f822b-71eb-406f-b17a-d188c4924283}</UniqueIdentifier>
     </Filter>
-    <Filter Include="cFluidSimulator">
-      <UniqueIdentifier>{6f92474b-e2a5-4685-abf1-053b09dbc4f1}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="cFluidSimulator\cWaterSimulator">
-      <UniqueIdentifier>{02fd457d-3735-4f4b-aaf2-f7701a7ee7bc}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="cFluidSimulator\cLavaSimulator">
-      <UniqueIdentifier>{b0401fd9-4021-4ab7-bf61-c8de112b4196}</UniqueIdentifier>
-    </Filter>
     <Filter Include="cEntity\cPawn\cMonster\Personalities">
       <UniqueIdentifier>{b0f7c883-e2ca-4bba-89e3-c36656c3de39}</UniqueIdentifier>
     </Filter>
@@ -424,6 +415,21 @@
     <Filter Include="cWorldGenerator">
       <UniqueIdentifier>{72727ea7-779f-439e-8f30-53bd6985c9e7}</UniqueIdentifier>
     </Filter>
+    <Filter Include="cSimulator">
+      <UniqueIdentifier>{0c205a99-5597-4a79-81d1-5b2f882aecf2}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="cSimulator\cFluidSimulator">
+      <UniqueIdentifier>{6f92474b-e2a5-4685-abf1-053b09dbc4f1}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="cSimulator\cFluidSimulator\cWaterSimulator">
+      <UniqueIdentifier>{02fd457d-3735-4f4b-aaf2-f7701a7ee7bc}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="cSimulator\cFluidSimulator\cLavaSimulator">
+      <UniqueIdentifier>{b0401fd9-4021-4ab7-bf61-c8de112b4196}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="cSimulator\SandSimulator">
+      <UniqueIdentifier>{b3ebe846-5722-43f3-af56-e874e8fef7a5}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\source\cServer.cpp">
@@ -746,7 +752,7 @@
       <Filter>Packets\cPacket_EntityStatus</Filter>
     </ClCompile>
     <ClCompile Include="..\source\cWaterSimulator.cpp">
-      <Filter>cFluidSimulator\cWaterSimulator</Filter>
+      <Filter>cSimulator\cFluidSimulator\cWaterSimulator</Filter>
     </ClCompile>
     <ClCompile Include="..\source\cSocket.cpp">
       <Filter>Threading\cSocket</Filter>
@@ -809,7 +815,7 @@
       <Filter>cPiston</Filter>
     </ClCompile>
     <ClCompile Include="..\source\cLavaSimulator.cpp">
-      <Filter>cFluidSimulator\cLavaSimulator</Filter>
+      <Filter>cSimulator\cFluidSimulator\cLavaSimulator</Filter>
     </ClCompile>
     <ClCompile Include="..\source\SquirrelBindings.cpp">
       <Filter>LuaBindings\SquirrelBindings</Filter>
@@ -830,7 +836,7 @@
       <Filter>cChunkGenerator</Filter>
     </ClCompile>
     <ClCompile Include="..\source\cFluidSimulator.cpp">
-      <Filter>cFluidSimulator</Filter>
+      <Filter>cSimulator\cFluidSimulator</Filter>
     </ClCompile>
     <ClCompile Include="..\source\cAggressiveMonster.cpp">
       <Filter>cEntity\cPawn\cMonster\Personalities\Aggressive</Filter>
@@ -847,6 +853,15 @@
     <ClCompile Include="..\source\cWorldGenerator.cpp">
       <Filter>cWorldGenerator</Filter>
     </ClCompile>
+    <ClCompile Include="..\source\cSimulator.cpp">
+      <Filter>cSimulator</Filter>
+    </ClCompile>
+    <ClCompile Include="..\source\cSandSimulator.cpp">
+      <Filter>cSimulator\SandSimulator</Filter>
+    </ClCompile>
+    <ClCompile Include="..\source\cSimulatorManager.cpp">
+      <Filter>cSimulator</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\source\cServer.h">
@@ -1201,7 +1216,7 @@
       <Filter>Packets\cPacket_EntityStatus</Filter>
     </ClInclude>
     <ClInclude Include="..\source\cWaterSimulator.h">
-      <Filter>cFluidSimulator\cWaterSimulator</Filter>
+      <Filter>cSimulator\cFluidSimulator\cWaterSimulator</Filter>
     </ClInclude>
     <ClInclude Include="..\source\cSocket.h">
       <Filter>Threading\cSocket</Filter>
@@ -1267,7 +1282,7 @@
       <Filter>cPiston</Filter>
     </ClInclude>
     <ClInclude Include="..\source\cLavaSimulator.h">
-      <Filter>cFluidSimulator\cLavaSimulator</Filter>
+      <Filter>cSimulator\cFluidSimulator\cLavaSimulator</Filter>
     </ClInclude>
     <ClInclude Include="..\source\SquirrelBindings.h">
       <Filter>LuaBindings\SquirrelBindings</Filter>
@@ -1288,7 +1303,7 @@
       <Filter>cChunkGenerator</Filter>
     </ClInclude>
     <ClInclude Include="..\source\cFluidSimulator.h">
-      <Filter>cFluidSimulator</Filter>
+      <Filter>cSimulator\cFluidSimulator</Filter>
     </ClInclude>
     <ClInclude Include="..\source\cAggressiveMonster.h">
       <Filter>cEntity\cPawn\cMonster\Personalities\Aggressive</Filter>
@@ -1305,6 +1320,15 @@
     <ClInclude Include="..\source\cWorldGenerator.h">
       <Filter>cWorldGenerator</Filter>
     </ClInclude>
+    <ClInclude Include="..\source\cSimulator.h">
+      <Filter>cSimulator</Filter>
+    </ClInclude>
+    <ClInclude Include="..\source\cSandSimulator.h">
+      <Filter>cSimulator\SandSimulator</Filter>
+    </ClInclude>
+    <ClInclude Include="..\source\cSimulatorManager.h">
+      <Filter>cSimulator</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\source\AllToLua.pkg">