 diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Block.java ../src_work/minecraft/net/minecraft/src/Block.java
---- ../src_base/minecraft/net/minecraft/src/Block.java	2011-08-04 20:51:16.000000000 -0400
-+++ ../src_work/minecraft/net/minecraft/src/Block.java	2011-08-08 12:43:09.000000000 -0400
+--- ../src_base/minecraft/net/minecraft/src/Block.java	2011-08-11 17:02:11.000000000 -0400
++++ ../src_work/minecraft/net/minecraft/src/Block.java	2011-08-11 17:02:12.000000000 -0400
 @@ -600,6 +600,10 @@
          return blockMaterial.getMaterialMobility();
      }

                 }
             }
diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/World.java ../src_work/minecraft_server/net/minecraft/src/World.java
--- ../src_base/minecraft_server/net/minecraft/src/World.java	2011-08-04 20:51:17.000000000 -0400
+++ ../src_work/minecraft_server/net/minecraft/src/World.java	2011-08-07 17:35:51.000000000 -0400
@@ -7,6 +7,8 @@
 import java.io.PrintStream;
 import java.util.*;

         int k = i * j + damageRemainder;
         inventory.damageArmor(i);
diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Explosion.java ../src_work/minecraft/net/minecraft/src/Explosion.java
--- ../src_base/minecraft/net/minecraft/src/Explosion.java	2011-08-11 17:02:11.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/Explosion.java	2011-08-11 17:02:12.000000000 -0400
@@ -3,6 +3,7 @@
 // Decompiler options: packimports(3) braces deadcode 
 
