Commit Graph

2 Commits

Author SHA1 Message Date
Shane Freeder
039d6f2f75
Merge branch 'master' into pre/1.13 2018-08-17 05:10:45 +01:00
Aikar
5302850894
Merge branch 'master' into pre/1.13
* master:
  Fix bug in last patch
  Ensure chunks are always loaded on hard position sets
  Improve Watchdog Early Warning Feature - Closes #1319
  Allow disabling armour stand ticking
2018-08-16 18:25:44 -04:00