Merge branch '1.7.10'

This commit is contained in:
cpw committed 2015-08-01 20:30:22 -04:00
commit 5045d8df68
5 files changed
+8 -5

No files matched your search

@@ -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());
}