              for(l = -1; i1 > 0 && l == -1;)
              {
 diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/EffectRenderer.java ../src_work/minecraft/net/minecraft/src/EffectRenderer.java
---- ../src_base/minecraft/net/minecraft/src/EffectRenderer.java	2011-09-19 16:32:52.000000000 -0400
-+++ ../src_work/minecraft/net/minecraft/src/EffectRenderer.java	2011-09-19 16:36:34.000000000 -0400
+--- ../src_base/minecraft/net/minecraft/src/EffectRenderer.java	2011-09-21 22:59:07.000000000 -0400
++++ ../src_work/minecraft/net/minecraft/src/EffectRenderer.java	2011-09-21 22:59:09.000000000 -0400
 @@ -7,6 +7,9 @@
  import java.util.*;
  import org.lwjgl.opengl.GL11;

 
 }
diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/ItemBucket.java ../src_work/minecraft_server/net/minecraft/src/ItemBucket.java
--- ../src_base/minecraft_server/net/minecraft/src/ItemBucket.java	2011-09-19 16:32:53.000000000 -0400
+++ ../src_work/minecraft_server/net/minecraft/src/ItemBucket.java	2011-09-19 16:32:54.000000000 -0400
@@ -6,6 +6,8 @@
 
 import java.util.Random;

             return true;
         }
diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/BlockDoor.java ../src_work/minecraft_server/net/minecraft/src/BlockDoor.java
--- ../src_base/minecraft_server/net/minecraft/src/BlockDoor.java	2011-09-21 22:59:08.000000000 -0400
+++ ../src_work/minecraft_server/net/minecraft/src/BlockDoor.java	2011-09-21 22:59:09.000000000 -0400
@@ -167,7 +167,7 @@
                 world.setBlockWithNotify(i, j, k, 0);
                 flag = true;
