Merge upstream update to minecraft 1.12-pre6

Fixes #141
This commit is contained in:
Techcable 2017-05-31 21:42:42 -07:00
parent 7f5b95d380
commit 4f5b91198a
No known key found for this signature in database
GPG Key ID: 091A03B91D7FCE68

@ -1 +1 @@
Subproject commit 4db53525bf617254a7e669916309b9bcc4cc0749
Subproject commit e26b93728c11bbeb73ae27e3184a7b8070f29247