8 Commits

Author	SHA1	Message	Date
Shane Freeder	804cb0dd79	Merge upstream	2018-03-14 14:55:00 +00:00
Jamie Mansfield	d4bcbb1140	Merge upstream	2018-03-05 21:07:50 +00:00
Shane Freeder	4ea50d7023	Merge upstream	2018-01-28 11:36:01 +00:00
Jamie Mansfield	035090d894	Resolve broken build	2018-01-07 17:27:31 +00:00
Jamie Mansfield	b477eba646	Merge upstream ... bungeecord-ref: dda0638869	2017-12-30 21:57:10 +00: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
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