              int k1 = Item.itemsList[i].getColorFromDamage(j);
              float f = (float)(k1 >> 16 & 0xff) / 255F;
 diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/Tessellator.java ../src_work/minecraft/net/minecraft/src/Tessellator.java
---- ../src_base/minecraft/net/minecraft/src/Tessellator.java	2011-08-04 20:51:16.000000000 -0400
-+++ ../src_work/minecraft/net/minecraft/src/Tessellator.java	2011-08-05 07:07:18.000000000 -0400
+--- ../src_base/minecraft/net/minecraft/src/Tessellator.java	2011-08-11 17:02:11.000000000 -0400
++++ ../src_work/minecraft/net/minecraft/src/Tessellator.java	2011-08-11 17:02:12.000000000 -0400
 @@ -6,6 +6,7 @@
  
  import java.io.PrintStream;

         int k = i * j + damageRemainder;
         inventory.damageArmor(i);
diff -u -r --strip-trailing-cr ../src_base/minecraft_server/net/minecraft/src/Explosion.java ../src_work/minecraft_server/net/minecraft/src/Explosion.java
--- ../src_base/minecraft_server/net/minecraft/src/Explosion.java	2011-08-04 20:51:17.000000000 -0400
+++ ../src_work/minecraft_server/net/minecraft/src/Explosion.java	2011-08-05 07:07:18.000000000 -0400
@@ -3,6 +3,7 @@
 // Decompiler options: packimports(3) braces deadcode 
 

 
     public void writeEntityToNBT(NBTTagCompound nbttagcompound)
diff -u -r --strip-trailing-cr ../src_base/minecraft/net/minecraft/src/EntityPlayer.java ../src_work/minecraft/net/minecraft/src/EntityPlayer.java
--- ../src_base/minecraft/net/minecraft/src/EntityPlayer.java	2011-08-11 17:02:11.000000000 -0400
+++ ../src_work/minecraft/net/minecraft/src/EntityPlayer.java	2011-08-11 17:02:12.000000000 -0400
@@ -6,6 +6,8 @@
 
 import java.util.*;
