Merge branch 'master' into plugin

2020-01-03 23:25:00 -06:00 · 2020-01-03 23:25:00 -06:00 · 0c24ffc629
commit 0c24ffc629
parent 7d14d079ef 97d8b8db68
19 changed files with 129 additions and 185 deletions
--- a/connector/src/main/resources/bedrock/runtime_block_states-1.14.dat
+++ b/connector/src/main/resources/bedrock/runtime_block_states-1.14.dat
--- a/connector/src/main/resources/bedrock/runtime_block_states.dat
+++ b/connector/src/main/resources/bedrock/runtime_block_states.dat
--- a/connector/src/main/resources/mappings
+++ b/connector/src/main/resources/mappings
@ -1 +1 @@
-Subproject commit 0f3d65b65076b16fc7dc9226230b31291b8f2cde
+Subproject commit b9308a64699fabb7510a05d3b270ccd6dd52b635