4 commits

Author	SHA1	Message	Date
Shane Freeder	0c14fc6ee6	Update B/CB/S	2018-07-23 09:39:55 +01:00
Aikar	1b778924c3	Rebuild patches for upstream merge	2018-07-21 16:43:00 -04:00
Shane Freeder	62511066e1	Merge branch 'master' into pre/1.13	2018-07-19 20:23:18 +01:00
Hugo Manrique	b90705d2ad	Avoid item merge if stack size above max stack size (#1217)	2018-07-19 17:51:55 +02:00