Merge branch 'master' into upstream-merge-32093

This commit is contained in:
LetterJay
2017-10-29 02:27:52 -04:00
committed by GitHub
209 changed files with 2764 additions and 2305 deletions

View File

@@ -166,7 +166,7 @@ CONFIG_DEF(number/run_delay) //Used for modifying movement speed for mobs.
CONFIG_DEF(number/walk_delay)
CONFIG_DEF(number/human_delay) //Mob specific modifiers. NOTE: These will affect different mob types in different ways
CONFIG_DEF(number/robot_delay)
CONFIG_DEF(number/monkey_delay)