gnembon 86b6723b6a Merge branch 'master' into 1.16 ...

# Conflicts:
#	src/main/java/carpet/script/utils/ShapeDispatcher.java

2020-07-19 11:26:22 -03:00

..

api

Merge branch 'master' into 1.16

2020-07-19 11:26:22 -03:00

language

added label to displayed shapes

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

resources

marking final 1.7 scarpet API content

2020-06-21 23:17:49 -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-19 11:26:22 -03:00