Browse code Merge remote-tracking branch 'Clean_Forge/1.7.10' Conflicts: src/main/java/net/minecraftforge/oredict/OreDictionary.java master mfnd stable v0.1 v0.0
commit 84dedf5ac1c8ecccf2264e5e2752fc09bd3b3090 2 parents be5aa01 + 818edd7 vlad20012 authored on 21 Nov 2015

Showing 20 changed files

• conf/build.gradle.forge
• src/main/java/cpw/mods/fml/common/Loader.java
• src/main/java/cpw/mods/fml/common/discovery/DirectoryDiscoverer.java
• src/main/java/cpw/mods/fml/common/discovery/ITypeDiscoverer.java
• src/main/java/cpw/mods/fml/common/discovery/ModCandidate.java
• src/main/java/cpw/mods/fml/common/eventhandler/EventBus.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/ObjectHolderRef.java
• src/main/java/net/minecraft/item/ItemSkull.java
• src/main/java/net/minecraft/network/NetHandlerPlayServer.java
• src/main/java/net/minecraft/network/PingResponseHandler.java
• src/main/java/net/minecraft/tileentity/TileEntityFurnace.java
• src/main/java/net/minecraftforge/common/ForgeVersion.java
• src/main/java/net/minecraftforge/common/MinecraftForge.java
• src/main/java/net/minecraftforge/event/ForgeEventFactory.java
• src/main/java/net/minecraftforge/event/FuelBurnTimeEvent.java
• src/main/java/net/minecraftforge/fluids/FluidRegistry.java
• src/main/java/net/minecraftforge/oredict/OreDictionary.java
• src/main/resources/fmlversion.properties

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

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/discovery/DirectoryDiscoverer.java

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

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

Ignore Space Show notes View src/main/java/cpw/mods/fml/common/eventhandler/EventBus.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/ObjectHolderRef.java

Ignore Space Show notes View src/main/java/net/minecraft/item/ItemSkull.java

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

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

Ignore Space Show notes View src/main/java/net/minecraft/tileentity/TileEntityFurnace.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/event/ForgeEventFactory.java

Ignore Space Show notes View src/main/java/net/minecraftforge/event/FuelBurnTimeEvent.java 0 → 100644

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

Ignore Space Show notes View src/main/java/net/minecraftforge/oredict/OreDictionary.java

Ignore Space Show notes View src/main/resources/fmlversion.properties

Show line notes below