4 Commits

Author	SHA1	Message	Date
Zach Brown	1e1541a2e9	Update upstream S	2017-01-30 22:33:54 -06:00
Zach Brown	28c0441d02	Update upstream B/CB	2017-01-14 02:11:12 -06:00
Zach Brown	f099ddc99e	Fix a merge conflict that was resolved improperly	2016-12-20 18:01:37 -06:00
Zach Brown	0728696e06	Add ProjectileCollideEvent ... Base our vanish changes on top of that event.	2016-12-16 22:13:46 -06:00