3 commits

Author	SHA1	Message	Date
md_5	3c4481aa87	Fix conflicts	2014-03-24 17:12:40 +11:00
Thinkofdeath	6d22914df8	Re-add missed method to the Player Collision API	2014-03-23 18:16:32 +00:00
Thinkofdeath	58a6cb892b	Cap villagers' window name to prevent client disconnects	2014-03-23 10:54:53 +00:00