6 Commits

Author	SHA1	Message	Date
Jamie Mansfield	0366c3751a	Merge upstream. Closes #99	2016-11-06 10:17:17 +00: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