24 Commits

Author	SHA1	Message	Date
Shane Freeder	5955ede0cb	Merge upstream (Closes #282)	2018-09-04 03:12:52 +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	4fc076eefa	Merge upstream	2017-09-23 19:25:31 +01:00
Jamie Mansfield	c676a410b0	Merge upstream	2017-09-05 18:17:15 +01:00
kashike	178e989894	Merge upstream ... Resolves #170	2017-08-18 02:40:00 -07:00
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
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	c8fe40d640	I'm and idiot	2016-11-26 20:39:19 +00: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
Jamie Mansfield	9fb1a1f574	Merge upstream	2016-11-14 22:46:55 +00:00
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