gnembon f4f289b0ec Merge branch 'master' into 1.17 ...

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

2020-11-26 03:03:03 -04:00

..

api

Merge branch 'master' into 1.17

2020-11-26 03:03:03 -04:00

language

custom events, and low level event API

2020-11-11 02:06:45 -04:00

resources

Added scarpet team functions (#569)

2020-11-26 02:59:23 -04:00

Documentation.md

slash fixes #339

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

Full.md

Merge docs for 'Added scarpet team functions (#569)

2020-11-26 06:59:49 +00:00