5 Commits

Author	SHA1	Message	Date
Jamie Mansfield	bfb622eb23	Merge upstream	2017-04-26 17:32:42 +01:00
Jamie Mansfield	bcad1e9b55	No need to relocate the metrics class ... Different version of Git were constantely changing the Metrics patch - it wasn't worth it	2016-11-26 20:34:59 +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
Troy Frew	f04680f98e	Update upstream. Fixup patch files for new log module and other changes from upstream. Update netty to 4.1.3.Final	2016-07-16 21:12:39 -04: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