Merge remote-tracking branch 'Clean_Forge/master'

Fork: 0

y.varenkov / ultramine_core

Browse code Merge remote-tracking branch 'Clean_Forge/master' Conflicts: src/main/java/net/minecraft/server/MinecraftServer.java master mfnd stable v0.1 v0.0
commit 4ece2fc48a721d8446ee0d5f297cd5ddd596539f 2 parents 8b5b82c + f969ebf vlad20012 authored on 7 May 2014

Patch

Unified Split

Showing 16 changed files

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/FMLContainer.java

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

Ignore Space Show notes View src/main/java/cpw/mods/fml/common/network/simpleimpl/SimpleChannelHandlerWrapper.java

Ignore Space Show notes View src/main/java/cpw/mods/fml/common/network/simpleimpl/SimpleNetworkWrapper.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/net/minecraft/block/BlockRailBase.java

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

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

Ignore Space Show notes View src/main/java/net/minecraft/server/MinecraftServer.java

Ignore Space Show notes View src/main/java/net/minecraft/world/gen/ChunkProviderGenerate.java

Ignore Space Show notes View src/main/java/net/minecraftforge/event/terraingen/ChunkProviderEvent.java

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

Ignore Space Show notes View src/main/resources/mcpmod.info

Show line notes below