10 Commits

Author	SHA1	Message	Date
Jamie Mansfield	71b76653f2	Merge upstream	2017-10-28 20:51:33 +01:00
Troy Frew	1c98857249	merge upstream daac8d85e20baed2ee0107ee637d0e82af8b2cd1	2017-07-04 16:06:59 -04:00
Jamie Mansfield	0a0f6974f3	Implement changes proposed in #124	2017-06-10 20:57:00 +01:00
Jamie Mansfield	bfb622eb23	Merge upstream	2017-04-26 17:32:42 +01:00
Techcable	7e1c6381ee	Merge upstream	2017-01-17 08:05:13 -07:00
Jamie Mansfield	cbe6a1b3f5	Reinstate patch to prevent Kick during Handshake ... Remove redundant patch from fire-pit	2016-12-04 16:42:27 +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
fuzzybot	a7acead907	Fixed ci link	2016-06-29 19:54:36 -05: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