diff --git a/src/main/java/cpw/mods/fml/common/registry/LanguageRegistry.java b/src/main/java/cpw/mods/fml/common/registry/LanguageRegistry.java
index e5722a7..3a5b9a1 100644
--- a/src/main/java/cpw/mods/fml/common/registry/LanguageRegistry.java
+++ b/src/main/java/cpw/mods/fml/common/registry/LanguageRegistry.java
@@ -21,6 +21,7 @@
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Map.Entry;
 import java.util.Properties;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -153,19 +154,29 @@
 	 */
 	@SuppressWarnings("unchecked")
 	@Deprecated
-	public void loadLanguageTable(@SuppressWarnings("rawtypes") Map field_135032_a, String lang)
+	public void mergeLanguageTable(@SuppressWarnings("rawtypes") Map field_135032_a, String lang)
 	{
+		Properties langPack=modLanguageData.get(lang);
+		if (langPack!=null) {
+			mergeWithoutOverwrite(langPack, field_135032_a);
+		}
 		Properties usPack=modLanguageData.get("en_US");
 		if (usPack!=null) {
-			field_135032_a.putAll(usPack);
+			mergeWithoutOverwrite(usPack, field_135032_a);
 		}
-		Properties langPack=modLanguageData.get(lang);
-		if (langPack==null) {
-			return;
-		}
-		field_135032_a.putAll(langPack);
 	}
 
+	@Deprecated
+	private <K, V> void mergeWithoutOverwrite(Map<? extends K,? extends V> from, Map<K, V> to)
+	{
+		for (Entry<? extends K, ? extends V> e : from.entrySet())
+		{
+			if (!to.containsKey(e.getKey()))
+			{
+				to.put(e.getKey(),e.getValue());
+			}
+		}
+	}
 	/**
 	 * Deprecated for removal in 1.8. Use the assets lang system
 	 */
diff --git a/src/main/java/net/minecraft/client/resources/LanguageManager.java b/src/main/java/net/minecraft/client/resources/LanguageManager.java
index 74b7d12..0252a71 100644
--- a/src/main/java/net/minecraft/client/resources/LanguageManager.java
+++ b/src/main/java/net/minecraft/client/resources/LanguageManager.java
@@ -84,8 +84,8 @@
 			arraylist.add(this.currentLanguage);
 		}
 
-		LanguageRegistry.instance().loadLanguageTable(currentLocale.field_135032_a, this.currentLanguage);
 		currentLocale.loadLocaleDataFiles(p_110549_1_, arraylist);
+		LanguageRegistry.instance().mergeLanguageTable(currentLocale.field_135032_a, this.currentLanguage);
 		StringTranslate.replaceWith(currentLocale.field_135032_a);
 	}
 
diff --git a/src/main/java/net/minecraft/world/WorldServer.java b/src/main/java/net/minecraft/world/WorldServer.java
index 358af55..8325dfb 100644
--- a/src/main/java/net/minecraft/world/WorldServer.java
+++ b/src/main/java/net/minecraft/world/WorldServer.java
@@ -304,14 +304,6 @@
 		int j = 0;
 		Iterator iterator = this.activeChunkSet.iterator();
 
-		doneChunks.retainAll(activeChunkSet);
-		if (doneChunks.size() == activeChunkSet.size())
-		{
-			doneChunks.clear();
-		}
-
-		final long startTime = System.nanoTime();
-
 		while (iterator.hasNext())
 		{
 			ChunkCoordIntPair chunkcoordintpair = (ChunkCoordIntPair)iterator.next();
@@ -321,11 +313,7 @@
 			Chunk chunk = this.getChunkFromChunkCoords(chunkcoordintpair.chunkXPos, chunkcoordintpair.chunkZPos);
 			this.func_147467_a(k, l, chunk);
 			this.theProfiler.endStartSection("tickChunk");
-			//Limits and evenly distributes the lighting update time
-			if (System.nanoTime() - startTime <= 4000000 && doneChunks.add(chunkcoordintpair))
-			{
-				chunk.func_150804_b(false);
-			}
+			chunk.func_150804_b(false);
 			this.theProfiler.endStartSection("thunder");
 			int i1;
 			int j1;
diff --git a/src/main/resources/fmlversion.properties b/src/main/resources/fmlversion.properties
index aa1c981..958953b 100644
--- a/src/main/resources/fmlversion.properties
+++ b/src/main/resources/fmlversion.properties
@@ -1,6 +1,6 @@
 fmlbuild.major.number=7
 fmlbuild.minor.number=10
-fmlbuild.revision.number=24
-fmlbuild.build.number=63
+fmlbuild.revision.number=25
+fmlbuild.build.number=64
 fmlbuild.mcversion=1.7.10
 fmlbuild.mcpversion=9.05