Apple/Geyser
1
0
Fork 0
forked from GeyserMC/Geyser
Code Issues Pull requests Projects Releases Wiki Activity

Merge remote-tracking branch 'remotes/upstream/master' into inventory

Browse source 
# Conflicts:
#	connector/src/main/java/org/geysermc/connector/network/translators/TranslatorsInit.java
#	connector/src/main/java/org/geysermc/connector/utils/Toolbox.java
This commit is contained in:
AJ Ferguson 2020-02-12 21:58:09 -09:00
commit b1a0ed3e91
12 changed files with 267 additions and 177 deletions
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.

2
connector/src/main/resources/mappings

@ -1 +1 @@
Subproject commit 1ad8a19417391710d34d72214e3aa430f84740cd
Subproject commit 278c73449aeeb4064c7513a68f98a49a5f463f0a