Commit Graph

5 Commits

Author SHA1 Message Date
Christian e5ffbd7fdf Merge branch 'master' of github.com:MinecraftForge/FML
Conflicts:
	install/build.gradle
	patches/minecraft/net/minecraft/client/multiplayer/NetClientHandler.java.patch
	patches/minecraft/net/minecraft/network/NetServerHandler.java.patch
2013-12-02 23:52:27 -05:00
Christian f10969e3aa Pass 1: Most patches are restored.
NOTES: 1. Network is completely broken. 2. GameRegistry is partially broken. 3. ID sync is not in.
2013-12-02 23:48:26 -05:00
Abrar Syed 75b64fe9b8 fix derp in example builscript 2013-11-26 14:23:31 -06:00
AbrarSyed af3e74d940 updated samples 2013-11-17 18:21:24 -06:00
AbrarSyed 923b2069ec added src distribution gradle file 2013-11-09 14:28:54 -05:00