Merge branch 'master' of https://github.com/GeyserMC/Geyser into feature/direct-block-mapping

Browse source

 Conflicts:

	connector/src/main/java/org/geysermc/connector/utils/Toolbox.java

...

This commit is contained in:

SupremeMortal 2020-02-09 22:53:57 +00:00

parent 9594b42523 a6aef4ad42

commit f9cd88eaa2

No known key found for this signature in database

GPG key ID: DDBB25F8EE4FA29A

7 changed files with 68 additions and 6 deletions

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

BIN

connector/src/main/resources/bedrock/biome_definitions.dat

View file

Binary file not shown.