8 Commits

Author	SHA1	Message	Date
Zach Brown	ae98591b8c	Update upstream B/CB/S	2017-02-17 20:03:38 -06:00
Zach Brown	1870320545	Update upstream CB ... Closes GH-556	2016-12-27 18:46:41 -06:00
Zach Brown	fe913c51c4	Update upstream CB	2016-12-22 15:06:59 -06:00
Zach Brown	748d86a540	Cleanup 'nerfed spawner mobs can float' patch	2016-12-20 21:57:07 -06:00
Zach Brown	f099ddc99e	Fix a merge conflict that was resolved improperly	2016-12-20 18:01:37 -06:00
Zach Brown	33163525f3	Update Paper to MC 1.11.1	2016-12-20 17:45:00 -06:00
Zach Brown	5ff732798d	Update upstream B/CB	2016-12-16 22:23:03 -06:00
Zach Brown	0728696e06	Add ProjectileCollideEvent ... Base our vanish changes on top of that event.	2016-12-16 22:13:46 -06:00