6 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
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	230b8d4258	Merge pull request #1256 ... bfbd24c5 Fix decompile error (Hugo Manrique) 1f5d23d9 Re-add Vanished players don't have rights patch (Hugo Manrique) * pull/1256/head: Fix decompile error Re-add Vanished players don't have rights patch	2018-07-25 19:41:35 -04:00
Aikar	4dd6ddb86b	Re-add block inlining - Closes #1229 ... Also reordered MC Utils to be higher up	2018-07-22 18:46:13 -04:00