gnembon 973dd29739 Merge branch 'master' into 1.17 ...

# Conflicts:
#	gradle.properties
#	src/main/java/carpet/script/value/ValueConversions.java

2020-11-29 01:23:22 -04:00

..

scarpet

Merge branch 'master' into 1.17

2020-11-29 01:23:22 -04:00