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

 Conflicts:

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

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

..

src/main

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

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

pom.xml

Add support for Minecraft 1.15.2 and fix kick with villager (Fixes #138)

2020-01-22 20:28:08 -06:00