Merge branch 'master' into master

This commit is contained in:
theelk801 2017-08-22 09:31:16 -04:00 committed by GitHub
commit 4d5e8d4a91
3 changed files with 338 additions and 1 deletions

View file

@ -42,6 +42,7 @@ public enum CounterType {
BOUNTY("bounty"),
BRIBERY("bribery"),
BRICK("brick"),
CAGE("cage"),
CARRION("carrion"),
CHARGE("charge"),
CORPSE("corpse"),