gnembon 4f77327b6c Merge branch 'master' into 1.17 ...

# Conflicts:
#	src/main/java/carpet/script/utils/AppStoreManager.java

2021-06-30 13:33:10 -03:00

..

java/carpet

Merge branch 'master' into 1.17

2021-06-30 13:33:10 -03:00

resources

reloading chunks is not needed when resetting, fixing entities removed.

2021-06-29 02:21:47 -03:00