gnembon 224d30e951 Merge branch 'master' into 1.16 ...

# Conflicts:
#	src/main/java/carpet/script/value/EntityValue.java

2020-07-21 23:35:31 -03:00

..

api

Merge branch 'master' into 1.16

2020-07-21 23:35:31 -03:00

language

added label to displayed shapes

2020-07-18 13:20:49 -03:00

resources

player swaps hands event

2020-07-21 02:27:26 -03:00

Documentation.md

slash fixes #339

2020-06-21 23:06:41 -03:00

Full.md

Merge branch 'master' into 1.16

2020-07-21 05:07:22 -03:00