Zach Brown 210ef18495 Merge branch 'master' into pre/1.12

2017-05-17 17:53:13 -05:00

..

BuildData @ f4d4fd9c0f

Update API patches to MC 1.12pre2

2017-05-14 08:46:44 -05:00

Bukkit @ 211c15e446

Update upstream B/CB

2017-05-16 17:17:58 -05:00

CraftBukkit @ 3ecbb59cbb

Update upstream CB

2017-05-17 17:24:58 -05:00

Paperclip @ 6dcb3241ca

Workaround a jansi bug with Windows

2017-05-17 17:51:54 -05:00

Spigot @ 1ffab67d68

Update upstream B/CB/S

2017-05-15 11:25:20 -05:00