- Merge upstream - Minecraft 1.12-pre5 support