Merged in 1.0.6 changes, added autogenerated data for 1.1.0.3 (doesn't work yet) and deliberately made the same merge error as Mojang

This commit is contained in:
Dylan K. Taylor
2017-04-14 13:00:43 +01:00
parent cdf6d200ef
commit f3ab45e7d5
19 changed files with 251 additions and 93 deletions

View File

@ -183,7 +183,7 @@ auto-updater:
timings:
#Choose the host to use for viewing your timings results.
host: mcpetimings.com
host: timings.pmmp.io
console:
#Choose whether to enable server stats reporting on the console title.