10 Commits

Author	SHA1	Message	Date
Jamie Mansfield	f539c023a3	Merge upstream	2018-05-28 22:00:27 +01:00
Shane Freeder	58127189ff	Merge upstream	2018-04-02 10:21:24 +01:00
Jamie Mansfield	b477eba646	Merge upstream ... bungeecord-ref: dda0638869	2017-12-30 21:57:10 +00:00
Jamie Mansfield	b5d048b57a	Revert to BungeeCord behaviour for the 'not direct byte buf' business ... Not worth the time wasted on closing invalid bug reports.	2017-10-23 19:53:51 +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	cc7e494098	Merge upstream	2017-08-09 01:20:45 +01:00
Jamie Mansfield	2b302da76c	Merge upstream	2017-08-04 14:57:11 +01:00
Troy Frew	1c98857249	merge upstream daac8d85e20baed2ee0107ee637d0e82af8b2cd1	2017-07-04 16:06:59 -04:00
Jamie Mansfield	ea2c109864	Make waterfall-super the parent of waterfall-parent	2016-12-04 17:31:55 +00:00