gnembon 33500dde29 Merge branch 'master' into 1.17 ...

# Conflicts:
#	src/main/java/carpet/script/api/Auxiliary.java
#	src/main/java/carpet/script/api/Inventories.java
#	src/main/java/carpet/script/api/WorldAccess.java
#	src/main/java/carpet/script/value/EntityValue.java

2021-07-05 16:53:01 -03:00

..

java/carpet

Merge branch 'master' into 1.17

2021-07-05 16:53:01 -03:00

resources

shulker stacks can now be moved in 1.17, fixes #976

2021-07-05 16:28:59 -03:00