5 commits

Author	SHA1	Message	Date
Zach Brown	8e610af635	Merge branch 'master' into pre/1.12	2017-05-15 10:57:42 -05:00
Shane Freeder	a2459e30fd	Allow the watchdog to try sanely stopping the server	2017-05-15 16:36:15 +01:00
Zach Brown	491286def4	Update to MC 1.12-pre2	2017-05-14 16:06:27 -05:00
Zach Brown	2103c75247	Publicly execute the main thread at dawn ... GH-684 Better handles most true deadlock situations	2017-05-13 06:08:09 -05:00
Zach Brown	b0d78d461b	Properly handle async calls to restart the server ... GH-681	2017-05-12 23:49:59 -05:00