4 Commits

Autor	SHA1	Nachricht	Datum
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