Merge remote-tracking branch 'Clean_Forge/1.7.10'

Fork: 0

y.varenkov / ultramine_core

Browse code Merge remote-tracking branch 'Clean_Forge/1.7.10' Conflicts: src/main/java/cpw/mods/fml/common/LoadController.java master mfnd stable v0.1 v0.0
commit 474e76a33164dec04dac8016b9dc1dd469ab12c9 2 parents 2e36318 + 991247f vlad20012 authored on 8 May 2015

Patch

Unified Split

Showing 5 changed files

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

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

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

Ignore Space Show notes View src/main/resources/assets/fml/textures/gui/forge.gif 0 → 100644

Show line notes below