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

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