4 Commits

Author	SHA1	Message	Date
Spigot	9ab31295a9	Upstream merge, lots of conflicts ... By: md_5 <git@md-5.net>	2014-06-22 19:25:10 +10:00
Spigot	9f9133e482	Pop anti xray patch to top ... By: md_5 <git@md-5.net>	2013-12-13 11:10:33 +11:00
Spigot	130d646157	Bring bungee support back in line with what the protocol update had ... By: md_5 <md_5@live.com.au>	2013-12-11 11:25:32 +11:00
Spigot	a6e7c7a91e	Upstream merge ... By: md_5 <md_5@live.com.au>	2013-12-09 18:00:58 +11:00