mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-12 16:27:47 +00:00
Conflicts: fml/patches/minecraft/net/minecraft/client/Minecraft.java.patch fml/patches/minecraft/net/minecraft/client/renderer/texture/TextureMap.java.patch fml/patches/minecraft/net/minecraft/client/resources/SimpleReloadableResourceManager.java.patch fml/src/main/java/net/minecraftforge/fml/relauncher/CoreModManager.java patches/minecraft/net/minecraft/client/Minecraft.java.patch patches/minecraft/net/minecraft/client/network/NetHandlerPlayClient.java.patch patches/minecraft/net/minecraft/client/renderer/texture/TextureMap.java.patch src/main/java/net/minecraftforge/client/model/obj/WavefrontObject.java