- Merge upstream - Minecraft 1.12-pre2 support