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
This commit is contained in:
AJ Ferguson 2020-01-30 12:08:39 -09:00
commit 5e5aeed578
158 changed files with 1053 additions and 192 deletions
Download patch file Download diff file Expand all files Collapse all files

2
connector/src/main/resources/config.yml
View file

@ -21,7 +21,7 @@ remote:
# The port of the remote (Java Edition) server
port: 25565
# Authentication type. Can be offline, online, or hybrid (see the wiki).
# Authentication type. Can be offline, online, or floodgate (see https://github.com/GeyserMC/Geyser/wiki/Floodgate).
auth-type: online
## the Xbox/MCPE username is the key for the Java server auth-info

2
connector/src/main/resources/mappings

@ -1 +1 @@
Subproject commit 582fb1609ffde735e514b99550362a9a533fc88a
Subproject commit 1ad8a19417391710d34d72214e3aa430f84740cd