Merge branch 'master' into upstream-merge-32096

This commit is contained in:
LetterJay
2017-10-29 01:49:22 -04:00
committed by GitHub
21 changed files with 1015 additions and 981 deletions
@@ -371,4 +371,4 @@ CONFIG_TWEAK(number/mc_tick_rate)
CONFIG_TWEAK(number/mc_tick_rate/ValidateAndSet(str_val))
. = ..()
if (.)
Master.UpdateTickRate()
Master.UpdateTickRate()