4 commits

Author	SHA1	Message	Date
Aikar	566740114e	update upstream	2018-07-29 12:42:07 -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	c280d84172	Update upstream and remove hopper patch for #1270	2018-07-25 01:11:08 -04:00
Aikar	f51ad46686	Merge branch 'master' into pre/1.13 ... * master: Add some debug for entity slices Mark chunk dirty on entity changes Reduce and improve dupe uuid resolve message Add more entity debug info Bring some 1.13 authors to master Fixed more stuff Remove unsed method Extend player profile API to support skin changes Extend player profile API to support skin changes	2018-07-23 23:20:41 -04:00