Fix for Block.getExplosionResistance getting passed the wrong parameters

It is being sent the x, x, y coordinates instead of x, y, z
Merge pull request #1060 from Azanor/master

Fix for Block.getExplosionResistance getting passed the wrong parameters
Updated FML:
MinecraftForge/FML@2c56c32c5aa8842cfadaf8c237396cdb75673909 Fix saving backups with the raw name. Fix air block not being assigned as the default.
MinecraftForge/FML@d0f8073fa51db7426d5ded373f3404fa60d722f0 Merge pull request #413 from sfPlayer1/master
MinecraftForge/FML@810b1f3075e6061ab189e1f6975bd77b20040d71 Clean some generic warnings up. Make a generic list handler. Helpful for others I think too.
MinecraftForge/FML@fff86ee9d35874bdf77a1eaabe77615441644064 Fix refreshResources not happening if an error occurs.
MinecraftForge/FML@76d8d0e870a4e389167634283984dc10abb08e84 Fix mod version checking
MinecraftForge/FML@b84d0760ae47832e5b1e4d50237b582b2d50d520 Fix display of mod status at the server
MinecraftForge/FML@251af1d09dfbf636e2fb3f323a5345c81cc07aea Fixed memory leak on the client caused by Netty holding references to the World.
Fixed hard references in WorldGenBigTree and ForgeCommand that caused worlds to leak in the client.
Merge branch 'master' of https://github.com/MinecraftForge/MinecraftForge

Conflicts:
	patches/minecraft/net/minecraft/client/Minecraft.java.patch
Moved GuiOpenEvent back to its original location and reverted related changes