cpw 16ff1be093 Merge branch '1.7.10' ... Conflicts: fml/patches/minecraft/net/minecraft/client/Minecraft.java.patch fml/patches/minecraft/net/minecraft/client/renderer/texture/TextureMap.java.patch fml/patches/minecraft/net/minecraft/client/resources/SimpleReloadableResourceManager.java.patch fml/src/main/java/net/minecraftforge/fml/relauncher/CoreModManager.java patches/minecraft/net/minecraft/client/Minecraft.java.patch patches/minecraft/net/minecraft/client/network/NetHandlerPlayClient.java.patch patches/minecraft/net/minecraft/client/renderer/texture/TextureMap.java.patch src/main/java/net/minecraftforge/client/model/obj/WavefrontObject.java		2015-06-21 21:59:51 -04:00
..
block	Automatically register BlockStates when block is initally registered, and clear the list when new snapshots are injected. Modders DO NOT touch the registry in Block directly. Closes #537	2014-10-09 05:05:43 -07:00
client	Merge branch '1.7.10'	2015-06-21 21:59:51 -04:00
crash	Added blaming of coremods and mods not targetting Java 6	2015-02-13 08:07:27 +03:00
entity	New system in EntityRegistry to allow modders to register spawn eggs.	2015-06-18 18:05:12 -07:00
inventory	Move FML to net.minecraft.fml package.	2014-09-22 22:50:54 -07:00
item	New system in EntityRegistry to allow modders to register spawn eggs.	2015-06-18 18:05:12 -07:00
network	Change custom payload lock to be buffer itself incase multiple packets use the same backend buffer. Closes #1908	2015-06-07 00:06:00 -07:00
realms	Move FML to net.minecraft.fml package.	2014-09-22 22:50:54 -07:00
server	Merge branch '1.7.10'	2015-05-10 23:55:11 -04:00
tileentity	Move FML to net.minecraft.fml package.	2014-09-22 22:50:54 -07:00
util	Added ability for language files to opt-in to loading using normal Java properties format.	2015-02-04 17:23:41 -08:00
world	Pull in a lot of the FML tweaks from 1.7 to 1.8	2015-04-01 17:06:12 -04:00