mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-13 16:54:22 +00:00
# Conflicts: # patches/minecraft/net/minecraft/client/renderer/texture/Stitcher.java.patch # patches/minecraft/net/minecraft/client/renderer/texture/TextureMap.java.patch # patches/minecraft/net/minecraft/entity/EntityList.java.patch # patches/minecraft/net/minecraft/tileentity/TileEntity.java.patch # src/main/java/net/minecraftforge/oredict/OreDictionary.java