7 Commits

Author	SHA1	Message	Date
Zach Brown	96ce4bd9fd	Update upstream B/CB	2018-07-30 20:19:41 -05:00
Aikar	76e1e4d79f	Update Upstream ... Removed my ChunkLoadEvent patch as upstream fixed it	2018-07-30 01:08:59 -04:00
Aikar	b9b32ba7dc	Update upstream	2018-07-29 22:16:15 -04:00
Shane Freeder	f7d02b2518	Update CB/S	2018-07-28 03:38:13 +01:00
Aikar	857ed67709	Merge branch 'master' into pre/1.13 ... * master: Relookup Entity Save ID if was null during precache	2018-07-27 00:44:53 -04:00
Aikar	4f7a858bd6	Merge pull request #1248 ... c2d29a73 PlayerElytraBoostEvent (BillyGalbreath) * pull/1248/head: PlayerElytraBoostEvent Also merged paper config into parent	2018-07-23 20:29:55 -04:00
Shane Freeder	aad194a32e	Update B/CB/S	2018-07-23 09:44:57 +01:00