upstream/MinecraftForge
1
0 Fork 0
mirror of https://github.com/MinecraftForge/MinecraftForge.git synced 2026-11-13 16:54:22 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
5eafb7108338c6236001a0ad4fcd979bb5366885
MinecraftForge/client
T
History
Christian 5eafb71083 Merge branch 'master' into minecraft1.3 
Bring some of the ticking fixes in

Conflicts:
	client/cpw/mods/fml/client/FMLClientHandler.java
	patches/minecraft_server/net/minecraft/server/MinecraftServer.java.patch
2012-07-05 15:30:21 -04:00
..
cpw/mods/fml/client
Merge branch 'master' into minecraft1.3
2012-07-05 15:30:21 -04:00
net/minecraft/src
Merge branch 'master' into minecraft1.3
2012-07-05 15:30:21 -04:00