gnembon 02a25c0c99 Merge branch 'master' into 1.17 ...

# Conflicts:
#	src/main/java/carpet/script/api/Entities.java

2020-12-07 01:14:12 -04:00

..

api

Merge branch 'master' into 1.17

2020-12-07 01:14:12 -04:00

language

wording

2020-12-04 22:10:15 -04:00

resources

added item_list, item_tags to support item tags as well as options for entities to support entity type tags. fixes #382

2020-12-07 00:12:55 -04:00

Documentation.md

slash fixes #339

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

Full.md

Merge docs for 'added startup and shutdown events. fixes #586'

2020-12-07 05:12:40 +00:00