gnembon 7fae5c92cf Merge branch 'master' into 1.15 ...

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

2019-10-13 02:55:19 -03:00

..

CarpetSettings.java

Merge branch 'master' into 1.15

2019-10-13 02:55:19 -03:00

ParsedRule.java

rule management and extensibility

2019-07-04 01:54:13 -03:00

Rule.java

extensions

2019-06-27 16:27:38 -03:00

RuleCategory.java

freekin egyptian braces

2019-06-12 01:03:34 -03:00

SettingsManager.java

fixed error when loading incorrect setting format.

2019-10-01 02:51:10 -03:00

Validator.java

update for extensions

2019-07-16 00:15:11 -03:00