Merge branch 'master' into 1.15

Browse Source

# Conflicts:
#	src/main/resources/fabric.mod.json

...

This commit is contained in:

gnembon committed 2019-11-20 01:07:33 -04:00

2 parents 3e93929bc7 122533a7e0

commit d2d3b2894e

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