13 Commits

Author	SHA1	Message	Date
Jamie Mansfield	34068e62d8	Merge upstream. Closes #167	2017-08-13 16:08:33 +01:00
Jamie Mansfield	cc7e494098	Merge upstream	2017-08-09 01:20:45 +01:00
Jamie Mansfield	2b302da76c	Merge upstream	2017-08-04 14:57:11 +01:00
Troy Frew	1c98857249	merge upstream daac8d85e20baed2ee0107ee637d0e82af8b2cd1	2017-07-04 16:06:59 -04: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
Techcable	dd44f67c81	Merge upstream ... Fixes #101	2016-11-24 21:31:39 -07:00
Troy Frew	59f69a69c5	Upstream Merge	2016-10-30 10:46:05 -04: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
Techcable	05fc872738	Make the Netty 4.1 upgrade one of the first patches ... @aikar suggested this so patches don't have conflicts with netty 4.1	2016-05-31 12:49:57 -06:00
Techcable	c6ee5b53a7	Remove uneeded patch and call UUIDUtils.toMojangUUID() directly ... Closes #8 even more	2016-05-31 12:46:47 -06:00