8 Commits

Author	SHA1	Message	Date
Troy Frew	1c98857249	merge upstream daac8d85e20baed2ee0107ee637d0e82af8b2cd1	2017-07-04 16:06:59 -04:00
Jamie Mansfield	cb4d5effb9	Merge upstream - Minecraft 1.12 support	2017-06-08 16:58:07 +01:00
Jamie Mansfield	bfb622eb23	Merge upstream	2017-04-26 17:32:42 +01:00
Techcable	7e1c6381ee	Merge upstream	2017-01-17 08:05:13 -07:00
Mystiflow	4ddfe924e3	Migrate more micro-optimisations from Waterfall-Old	2016-12-09 13:36:42 +00:00
Jamie Mansfield	cbe6a1b3f5	Reinstate patch to prevent Kick during Handshake ... Remove redundant patch from fire-pit	2016-12-04 16:42:27 +00:00
Jamie Mansfield	51993973fc	Remove redundant patch. Fixes #98 ... Upstream resolved the issue 3a0b0aa116	2016-11-01 15:51:42 +00:00
Troy Frew	a1e3ee4799	Updated upstream. Moved our Disconnection patches to the fire-pit as there is some duplicate features from BungeeCord provided now.	2016-10-25 12:57:11 -04:00