8 Commits

Author	SHA1	Message	Date
Jamie Mansfield	ec611c5d0a	Merge upstream	2017-05-10 18:54:46 +01:00
Jamie Mansfield	11f46ca049	Merge upstream	2017-04-28 21:22:02 +01:00
Techcable	7e1c6381ee	Merge upstream	2017-01-17 08:05:13 -07:00
Jamie Mansfield	d8d9dc852a	Remove newlines I didn't spot earlier	2016-12-09 23:54:35 +00: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
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
Jamie Mansfield	80bed7979d	Remove Event4J patch temporarily ... Its apparently the cause of many issues we are currently having	2016-08-28 21:23:49 +01:00