Merge branch 'master' into api3/network

This commit is contained in:
Dylan K. Taylor
2017-03-25 21:26:46 +00:00
20 changed files with 128 additions and 46 deletions

View File

@ -185,6 +185,11 @@ timings:
#Choose the host to use for viewing your timings results.
host: mcpetimings.com
console:
#Choose whether to enable server stats reporting on the console title.
#NOTE: The title ticker will be disabled regardless if console colours are not enabled.
title-tick: true
aliases:
#Examples:
#showtheversion: version