gnembon e04a8be9e8 Merge branch 'master' into 1.15 ...

# Conflicts:
#	src/main/java/carpet/script/CarpetExpression.java

2020-02-03 10:58:17 -04:00

..

ParsedRule.java

mulitple counters in hud - not really needed but why not.

2020-02-02 00:03:38 -04:00

Rule.java

ops options for commands

2019-12-01 01:04:58 -04:00

RuleCategory.java

dispenser category

2019-11-30 19:45:07 -04:00

SettingsManager.java

Merge branch 'master' into 1.15

2020-01-06 21:28:07 -04:00

Validator.java

ops options for commands

2019-12-01 01:04:58 -04:00