4 Commits

Author	SHA1	Message	Date
Jamie Mansfield	11f46ca049	Merge upstream	2017-04-28 21:22: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
Techcable	c6ee5b53a7	Remove uneeded patch and call UUIDUtils.toMojangUUID() directly ... Closes #8 even more	2016-05-31 12:46:47 -06:00
Techcable	3809083007	Turn waterfall into a patch-based fork like Spigot and Paper (WIP) ... Allows us to easily see and manage the diff with upstream. Makes fixing conflicts with upstream easier and shows a cleaner, more acurate commit history. All credits to scripts go to @md_5 @aikar @Zbob750 @Thinkofname @Byteflux @Techcable (GPL3 Licensed)	2016-05-30 14:51:51 -06:00