# Conflicts: # Minecraft.Client/Windows64Media/strings.h # Minecraft.World/BiomeSource.cpp # Minecraft.World/BiomeSource.h