gnembon 4616bf4333 Merge branch 'master' into 1.17 ...

# Conflicts:
#	src/main/java/carpet/script/bundled/FileModule.java

2021-03-21 02:35:43 -03:00

..

Auxiliary.java

Merge branch 'master' into 1.17

2021-03-21 02:35:43 -03:00

BlockIterators.java

refactor breaking up API and language defs

2020-09-09 15:37:03 -03:00

Entities.java

Merge branch 'master' into 1.17

2021-01-07 00:41:15 -04:00

Inventories.java

Merge branch 'master' into 1.17

2021-03-09 19:41:49 -04:00

Monitoring.java

added system_info, deprecated seed

2020-10-12 23:01:44 -03:00

Scoreboards.java

mapping

2021-03-17 10:42:31 -03:00

Threading.java

refactor

2020-09-09 16:19:12 -03:00

WorldAccess.java

Merge branch 'master' into 1.17

2021-03-09 19:41:49 -04:00