Browse code Merge remote-tracking branch 'Clean_Forge/1.7.10' Conflicts: src/main/java/cpw/mods/fml/common/FMLCommonHandler.java src/main/java/cpw/mods/fml/common/registry/GameRegistry.java master mfnd stable v0.1 v0.0
commit 49672a0a9a3966922ead0bf6c0e1cae2e16996fe 2 parents fb5c91e + 8fbc53a vlad20012 authored on 23 Jun 2015

Showing 35 changed files

• conf/build.gradle.forge
• src/main/java/cpw/mods/fml/client/FMLClientHandler.java
• src/main/java/cpw/mods/fml/client/SplashProgress.java
• src/main/java/cpw/mods/fml/common/EnhancedRuntimeException.java
• src/main/java/cpw/mods/fml/common/FMLCommonHandler.java
• src/main/java/cpw/mods/fml/common/IFMLSidedHandler.java
• src/main/java/cpw/mods/fml/common/LoadController.java
• src/main/java/cpw/mods/fml/common/Loader.java
• src/main/java/cpw/mods/fml/common/LoaderState.java
• src/main/java/cpw/mods/fml/common/MinecraftDummyContainer.java
• src/main/java/cpw/mods/fml/common/ProgressManager.java
• src/main/java/cpw/mods/fml/common/asm/transformers/AccessTransformer.java
• src/main/java/cpw/mods/fml/common/asm/transformers/EventSubscriptionTransformer.java
• src/main/java/cpw/mods/fml/common/asm/transformers/ModAPITransformer.java
• src/main/java/cpw/mods/fml/common/patcher/ClassPatchManager.java
• src/main/java/cpw/mods/fml/common/registry/FMLControlledNamespacedRegistry.java
• src/main/java/cpw/mods/fml/common/registry/GameData.java
• src/main/java/cpw/mods/fml/common/registry/GameRegistry.java
• src/main/java/cpw/mods/fml/common/registry/ItemStackHolderInjector.java
• src/main/java/cpw/mods/fml/common/registry/ItemStackHolderRef.java
• src/main/java/cpw/mods/fml/common/registry/LanguageRegistry.java
• src/main/java/cpw/mods/fml/relauncher/CoreModManager.java
• src/main/java/cpw/mods/fml/server/FMLServerHandler.java
• src/main/java/net/minecraft/client/Minecraft.java
• src/main/java/net/minecraft/client/network/NetHandlerPlayClient.java
• src/main/java/net/minecraft/client/renderer/texture/Stitcher.java
• src/main/java/net/minecraft/client/renderer/texture/TextureManager.java
• src/main/java/net/minecraft/client/renderer/texture/TextureMap.java
• src/main/java/net/minecraft/client/resources/SimpleReloadableResourceManager.java
• src/main/java/net/minecraft/entity/EntityList.java
• src/main/java/net/minecraftforge/client/model/obj/WavefrontObject.java
• src/main/java/net/minecraftforge/common/ForgeModContainer.java
• src/main/java/net/minecraftforge/common/ForgeVersion.java
• src/main/java/net/minecraftforge/common/MinecraftForge.java
• src/main/java/net/minecraftforge/fluids/FluidRegistry.java

Ignore Space Show notes View conf/build.gradle.forge

Ignore Space Show notes View src/main/java/cpw/mods/fml/client/FMLClientHandler.java

Ignore Space Show notes View src/main/java/cpw/mods/fml/client/SplashProgress.java

Ignore Space Show notes View src/main/java/cpw/mods/fml/common/EnhancedRuntimeException.java

Ignore Space Show notes View src/main/java/cpw/mods/fml/common/FMLCommonHandler.java

Ignore Space Show notes View src/main/java/cpw/mods/fml/common/IFMLSidedHandler.java

Ignore Space Show notes View src/main/java/cpw/mods/fml/common/LoadController.java

Ignore Space Show notes View src/main/java/cpw/mods/fml/common/Loader.java

Ignore Space Show notes View src/main/java/cpw/mods/fml/common/LoaderState.java

Ignore Space Show notes View src/main/java/cpw/mods/fml/common/MinecraftDummyContainer.java

Ignore Space Show notes View src/main/java/cpw/mods/fml/common/ProgressManager.java

Ignore Space Show notes View src/main/java/cpw/mods/fml/common/asm/transformers/AccessTransformer.java

Ignore Space Show notes View src/main/java/cpw/mods/fml/common/asm/transformers/EventSubscriptionTransformer.java

Ignore Space Show notes View src/main/java/cpw/mods/fml/common/asm/transformers/ModAPITransformer.java

Ignore Space Show notes View src/main/java/cpw/mods/fml/common/patcher/ClassPatchManager.java

Ignore Space Show notes View src/main/java/cpw/mods/fml/common/registry/FMLControlledNamespacedRegistry.java

Ignore Space Show notes View src/main/java/cpw/mods/fml/common/registry/GameData.java

Ignore Space Show notes View src/main/java/cpw/mods/fml/common/registry/GameRegistry.java

Ignore Space Show notes View src/main/java/cpw/mods/fml/common/registry/ItemStackHolderInjector.java 0 → 100644

Ignore Space Show notes View src/main/java/cpw/mods/fml/common/registry/ItemStackHolderRef.java 0 → 100644

Ignore Space Show notes View src/main/java/cpw/mods/fml/common/registry/LanguageRegistry.java

Ignore Space Show notes View src/main/java/cpw/mods/fml/relauncher/CoreModManager.java

Ignore Space Show notes View src/main/java/cpw/mods/fml/server/FMLServerHandler.java

Ignore Space Show notes View src/main/java/net/minecraft/client/Minecraft.java

Ignore Space Show notes View src/main/java/net/minecraft/client/network/NetHandlerPlayClient.java

Ignore Space Show notes View src/main/java/net/minecraft/client/renderer/texture/Stitcher.java

Ignore Space Show notes View src/main/java/net/minecraft/client/renderer/texture/TextureManager.java

Ignore Space Show notes View src/main/java/net/minecraft/client/renderer/texture/TextureMap.java

Ignore Space Show notes View src/main/java/net/minecraft/client/resources/SimpleReloadableResourceManager.java

Ignore Space Show notes View src/main/java/net/minecraft/entity/EntityList.java

Ignore Space Show notes View src/main/java/net/minecraftforge/client/model/obj/WavefrontObject.java

Ignore Space Show notes View src/main/java/net/minecraftforge/common/ForgeModContainer.java

Ignore Space Show notes View src/main/java/net/minecraftforge/common/ForgeVersion.java

Ignore Space Show notes View src/main/java/net/minecraftforge/common/MinecraftForge.java

Ignore Space Show notes View src/main/java/net/minecraftforge/fluids/FluidRegistry.java

Show line notes below