Merge upstream - Minecraft 1.12.2 support

This commit is contained in:
MineTheCube 2017-09-18 15:44:18 +02:00
parent 29831c0399
commit fd02d88345
No known key found for this signature in database
GPG Key ID: 74811F76FBAE58B2

@ -1 +1 @@
Subproject commit 3db9fb1b6942a4ae8b1e9661404533a5f4982ff9
Subproject commit 0eaabdf5ca6dddd2bcdd57b77d3d02bc4967105e