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
..
api	NOT FINISHED! She compiles, and she... suffers the wrath of chunkgen...	2018-07-19 05:42:43 +01:00
server	Merge branch 'master' into pre/1.13	2018-07-21 16:25:36 -04:00