Merge branch 'master' into 1.16

Browse Source

# Conflicts:
#	gradle.properties
#	src/main/java/carpet/utils/BlockInfo.java

...

This commit is contained in:

gnembon committed 2020-06-05 23:48:14 -03:00

2 parents c5841408a6 021e8a2bb7

commit 29726c8ee9

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available