Merge branch 'feature/mcee-1.16' into bleeding

# Conflicts: # connector/src/main/java/org/geysermc/connector/network/translators/BiomeTranslator.java
bundabrg · Jul 2, 2020 · 6c78bac · 6c78bac
2 parents 4ed971b + 85ff9c7
commit 6c78bac
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/connector/src/main/resources/bedrock/mappings b/connector/src/main/resources/bedrock/mappings
diff --git a/connector/src/main/resources/education/mappings b/connector/src/main/resources/education/mappings