diff --git a/changelog b/changelog
index 2d40670a6..9786bc247 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,9 @@
 ## Changed
+* Updated russian and chinese localization
 * The fine soot recipe in the pyrolysis oven now only needs 4 tar
-* Overdrive upgrades now use fullerite instead of lithium crystals
\ No newline at end of file
+* Overdrive upgrades now use fullerite instead of lithium crystals
+* Machines now only send their sync packets once a second instead of once per tick if the values haven't changed, reducing network traffic by a considerable amount
+* Tom's explosion no longer causes any block updates on the millions of blocks it deletes which hopefully fixes a majority of the lag caused by the crater
+
+## Fixed
+* The conveyor grabber should no longer skip over items when used in long lines
\ No newline at end of file
diff --git a/gradle.properties b/gradle.properties
index 4509b36fe..d0028d08c 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -20,6 +20,15 @@ credits=HbMinecraft,\
   \ Pashtet (russian localization),\
   \ Bismarck (chinese localization),\
   \ Creeper-banner (chinese localization),\
+  \ 5467864  (chinese localization),\
+  \ eeeeee0a (chinese localization),\
+  \ hz0909adc (chinese localization),\
+  \ LSKLW (chinese localization),\
+  \ R-Kaenbyou (chinese localization),\
+  \ scp-000000000 (chinese localization),\
+  \ UnnameTokiko (chinese localization),\
+  \ Herobrine 457985 (chinese localization),\
+  \ xxwinhere (chinese localization),\
   \ Maksymisio (polish localization)\
   \ el3ctro4ndre (italian localization),\
   \ Pu-238 (Tom impact effects),\
@@ -39,6 +48,7 @@ credits=HbMinecraft,\
   \ Voxelstice (OpenComputers integration, turbine spinup),\
   \ BallOfEnergy1 (OpenComputers integration),\
   \ sdddddf80 (recipe configs, chinese localization, custom machine holograms),\
+  \ Abel1502 (optimization, crate upgrade recipes),\
   \ SuperCraftAlex (tooltips)\
   \ Ice-Arrow (research reactor tweaks),\
   \ 245tt (anvil GUI improvements),\
diff --git a/src/main/java/com/hbm/explosion/ExplosionTom.java b/src/main/java/com/hbm/explosion/ExplosionTom.java
index bd049ed6e..21ae8f7cd 100644
--- a/src/main/java/com/hbm/explosion/ExplosionTom.java
+++ b/src/main/java/com/hbm/explosion/ExplosionTom.java
@@ -106,14 +106,14 @@ public class ExplosionTom {
 
 			while(y > threshold) {
 
-				if(y == 0)
-					break;
+				if(y == 0) break;
+				
 				if(y <= craterFloor) {
 
 					if(worldObj.rand.nextInt(499) < 1) {
-						worldObj.setBlock(pX, y, pZ, ModBlocks.ore_tektite_osmiridium);
+						worldObj.setBlock(pX, y, pZ, ModBlocks.ore_tektite_osmiridium, 0, 2);
 					} else {
-						worldObj.setBlock(pX, y, pZ, ModBlocks.tektite);
+						worldObj.setBlock(pX, y, pZ, ModBlocks.tektite, 0, 2);
 					}
 
 				} else {
@@ -130,7 +130,7 @@ public class ExplosionTom {
 									}
 								}
 							}
-							worldObj.setBlockToAir(pX, y, pZ);
+							worldObj.setBlock(pX, y, pZ, Blocks.air, 0, 2);
 						}
 					} else {
 						for(int i = -2; i < 3; i++) {
diff --git a/src/main/java/com/hbm/tileentity/network/TileEntityCraneGrabber.java b/src/main/java/com/hbm/tileentity/network/TileEntityCraneGrabber.java
index b5bf3c2d0..96af1dbc2 100644
--- a/src/main/java/com/hbm/tileentity/network/TileEntityCraneGrabber.java
+++ b/src/main/java/com/hbm/tileentity/network/TileEntityCraneGrabber.java
@@ -135,15 +135,17 @@ public class TileEntityCraneGrabber extends TileEntityCraneBase implements IGUIP
 			
 			
 			NBTTagCompound data = new NBTTagCompound();
-			this.writeToNBT(data);
+			data.setBoolean("isWhitelist", isWhitelist);
+			this.matcher.writeToNBT(data);
 			this.networkPack(data, 15);
 		}
 	}
 	
 	public void networkUnpack(NBTTagCompound nbt) {
 		super.networkUnpack(nbt);
-		
-		this.readFromNBT(nbt);
+		this.isWhitelist = nbt.getBoolean("isWhitelist");
+		this.matcher.modes = new String[matcher.modes.length];
+		this.matcher.readFromNBT(nbt);
 	}
 	
 	public boolean matchesFilter(ItemStack stack) {
diff --git a/src/main/java/com/hbm/util/EntityDamageUtil.java b/src/main/java/com/hbm/util/EntityDamageUtil.java
index 137256643..b6344e4e0 100644
--- a/src/main/java/com/hbm/util/EntityDamageUtil.java
+++ b/src/main/java/com/hbm/util/EntityDamageUtil.java
@@ -7,6 +7,7 @@ import net.minecraft.enchantment.EnchantmentHelper;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.SharedMonsterAttributes;
+import net.minecraft.entity.passive.EntityTameable;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.potion.Potion;
 import net.minecraft.util.DamageSource;
@@ -104,8 +105,8 @@ public class EntityDamageUtil {
 					if(entity instanceof EntityPlayer) {
 						living.recentlyHit = 100;
 						living.attackingPlayer = (EntityPlayer) entity;
-					} else if(entity instanceof net.minecraft.entity.passive.EntityTameable) {
-						net.minecraft.entity.passive.EntityTameable entitywolf = (net.minecraft.entity.passive.EntityTameable) entity;
+					} else if(entity instanceof EntityTameable) {
+						EntityTameable entitywolf = (EntityTameable) entity;
 
 						if(entitywolf.isTamed()) {
 							living.recentlyHit = 100;