gnembon f50fa8cde2 Merge branch 'master' into 1.16 ...

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

2020-06-23 00:35:44 -03:00

..

api

explanation of biome changes, fixes #334

2020-06-20 20:54:43 -03:00

language

Corrected grammar and use of parentheses (#344)

2020-06-22 09:11:26 -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-06-22 01:39:51 -03:00