Merge origin/master

This commit is contained in:
LevelX2 2018-01-13 22:55:44 +01:00
commit ed3742b1e4
3 changed files with 128 additions and 0 deletions

View file

@ -77,6 +77,7 @@ public enum CounterType {
HOOFPRINT("hoofprint"),
HOUR("hour"),
HOURGLASS("hourglass"),
HUNGER("hunger"),
ICE("ice"),
INFECTION("infection"),
INTERVENTION("intervention"),