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

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

2020-07-01 14:54:04 -03:00

..

api

Merge branch 'master' into 1.16

2020-07-01 14:54:04 -03:00

language

added {} and [] notations, added new function of -> operator and retired element()

2020-06-28 23:04:14 -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-01 14:54:04 -03:00