Merge branch '1.7.10'

src/main/java/net/minecraftforge/common/MinecraftForge.java

@@ -12,6 +12,7 @@ import net.minecraftforge.fml.relauncher.Side;
 import net.minecraft.crash.CrashReport;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.common.ForgeHooks.SeedEntry;
+import net.minecraftforge.fluids.FluidRegistry;
 import net.minecraftforge.oredict.OreDictionary;
 
 public class MinecraftForge
@@ -162,6 +163,8 @@ public class MinecraftForge
        }
 
        UsernameCache.load();
+       // Load before all the mods, so MC owns the MC fluids
+       FluidRegistry.validateFluidRegistry();
    }
 
    public static String getBrandingVersion()

src/main/java/net/minecraftforge/fluids/FluidRegistry.java

@@ -114,7 +114,7 @@ public abstract class FluidRegistry
             Integer id = localFluidIDs.remove(oldFluid);
             localFluidIDs.put(fluid, id);
         }
-        BiMap<Integer, String> localFluidNames = fluidNames;
+        BiMap<Integer, String> localFluidNames = HashBiMap.create();
         for (Entry<Fluid, Integer> e : localFluidIDs.entrySet()) {
             localFluidNames.put(e.getValue(), e.getKey().getName());
         }