Merge origin/master

This commit is contained in:
LevelX2 2018-01-07 18:05:23 +01:00
commit 86857e2e0f
7 changed files with 302 additions and 0 deletions

View file

@ -49,6 +49,7 @@ public enum CounterType {
CREDIT("credit"),
CRYSTAL("crystal"),
CUBE("cube"),
CURRENCY("currency"),
DELAY("delay"),
DEPLETION("depletion"),
DESPAIR("despair"),