4 Commits

Author	SHA1	Message	Date
Aikar	76e1e4d79f	Update Upstream ... Removed my ChunkLoadEvent patch as upstream fixed it	2018-07-30 01:08:59 -04:00
Aikar	1d28f62522	Rebuild patches for upstream merge	2018-07-21 16:43:00 -04:00
Aikar	6b63a88df0	Merge branch 'master' into pre/1.13 ... * master: Duplicate UUID Resolve Option Add more information to Entity.toString change LAST_EDIT to PAPER_LAST_EDIT for edit commands Add more information to Entity.toString() Add Debug Entities option to debug dupe uuid issues Guard the Entity.SHARED_RANDOM from seed changes Create a symlink on not-windows to current minecraft decompile dir	2018-07-21 16:25:36 -04:00
Shane Freeder	84c98c2ba8	NOT FINISHED! She compiles, and she... suffers the wrath of chunkgen...	2018-07-19 05:42:43 +01:00