57 commits

Author	SHA1	Message	Date
Zach Brown	8fb32efc40	Merge branch 'master' into pre/1.12	2017-05-18 18:43:21 -05:00
Shane Freeder	1695252805	Actually exit the JVM after stopping the server when /restart is ran	2017-05-18 21:15:47 +01:00
Zach Brown	b75e22ccb2	Merge branch 'master' into pre/1.12	2017-05-15 10:57:42 -05:00
Zach Brown	ab4ae72fd5	Update to MC 1.12-pre2	2017-05-14 13:05:01 -05:00
Shane Freeder	f3bc708389	Allow the watchdog to try sanely stopping the server	2017-05-14 14:49:56 +01:00
Zach Brown	54e5a2e4da	Publicly execute the main thread at dawn ... GH-684 Better handles most true deadlock situations	2017-05-13 05:51:09 -05:00
Zach Brown	302f743310	Properly handle async calls to restart the server ... GH-681	2017-05-12 23:49:59 -05:00