5 commits

Author	SHA1	Message	Date
Christian Weeks	e35d31e50d	Update FML with recent mainline changes	2012-05-31 22:48:44 -04:00
Christian Weeks	c4ad78ab87	Update bukkit with new mod fixes	2012-05-31 22:48:44 -04:00
Christian Weeks	ac779739aa	Damn you bukkit with your same names for different classes!!!! EntityPlayer->EntityHuman	2012-05-31 22:48:44 -04:00
Christian Weeks	09d5bf95ae	Fix chunk generators for bukkit	2012-05-31 22:48:44 -04:00
Christian Weeks	b2e01d8f2a	Bukkit version	2012-05-31 22:48:44 -04:00