gnembon 5e3812e1f0 Merge branch 'master' into 1.17 ...

# Conflicts:
#	src/main/java/carpet/script/api/Auxiliary.java
#	src/main/java/carpet/script/api/Entities.java
#	src/main/java/carpet/script/api/Inventories.java
#	src/main/java/carpet/script/api/Scoreboards.java
#	src/main/java/carpet/script/api/WorldAccess.java
#	src/main/java/carpet/script/value/FunctionValue.java
#	src/main/java/carpet/script/value/NBTSerializableValue.java

2021-04-23 01:46:11 -03:00

..

CommandArgument.java

Merge branch 'master' into 1.17

2021-04-23 01:46:11 -03:00

CommandToken.java

docs and case fixes. fixes #221

2020-11-14 06:05:24 -04:00