8 Commits

Author	SHA1	Message	Date
Jamie Mansfield	f7f3cfeb27	Merge upstream; remove fire-pit	2018-09-30 19:17:21 +01:00
Jamie Mansfield	f6788a0886	Disable Metrics	2018-07-22 17:45:31 +01:00
Mark Vainomaa	3d4d154926	Copy license files into jar ... Solves issue #201 with including the BungeeCord LICENSE file in binary distribution, as the license requires.	2018-07-18 18:47:50 +01:00
Minecrell	e1553a3f25	Drop redundant patches for JUL logger ... Since Waterfall is now using Log4J for logging, these patches no longer have any effect.	2017-10-09 08:15:44 +01:00
Jamie Mansfield	cc7e494098	Merge upstream	2017-08-09 01:20:45 +01:00
Jamie Mansfield	78a8edd2da	Resolve the import statements I reordered a while back	2017-04-08 15:26:20 +01:00
Jamie Mansfield	d1b744857b	Update upstream	2016-08-16 00:47:02 +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