mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-17 02:55:17 +00:00
Conflicts: fml/src/main/java/net/minecraftforge/fml/common/MinecraftDummyContainer.java fml/src/main/java/net/minecraftforge/fml/common/registry/FMLControlledNamespacedRegistry.java fml/src/main/java/net/minecraftforge/fml/common/registry/LanguageRegistry.java