Browse code Merge remote-tracking branch 'Clean_Forge/master' Conflicts: src/main/resources/log4j2.xml master mfnd stable v0.1 v0.0
commit b52a8d02f5b67ad9efbaf39511ce0269f343d220 2 parents 1a9435d + b480385 vlad20012 authored on 26 Jun 2014

Showing 46 changed files

• build.gradle
• src/main/java/cpw/mods/fml/client/FMLConfigGuiFactory.java
• src/main/java/cpw/mods/fml/client/config/ConfigGuiType.java
• src/main/java/cpw/mods/fml/client/config/DummyConfigElement.java
• src/main/java/cpw/mods/fml/client/config/GuiButtonExt.java
• src/main/java/cpw/mods/fml/client/config/GuiCheckBox.java
• src/main/java/cpw/mods/fml/client/config/GuiConfig.java
• src/main/java/cpw/mods/fml/client/config/GuiConfigEntries.java
• src/main/java/cpw/mods/fml/client/config/GuiEditArray.java
• src/main/java/cpw/mods/fml/client/config/GuiEditArrayEntries.java
• src/main/java/cpw/mods/fml/client/config/GuiMessageDialog.java
• src/main/java/cpw/mods/fml/client/config/GuiSelectString.java
• src/main/java/cpw/mods/fml/client/config/GuiSelectStringEntries.java
• src/main/java/cpw/mods/fml/client/config/GuiUnicodeGlyphButton.java
• src/main/java/cpw/mods/fml/client/config/GuiUtils.java
• src/main/java/cpw/mods/fml/client/config/HoverChecker.java
• src/main/java/cpw/mods/fml/client/config/IConfigElement.java
• src/main/java/cpw/mods/fml/client/event/ConfigChangedEvent.java
• src/main/java/cpw/mods/fml/common/launcher/FMLTweaker.java
• src/main/java/cpw/mods/fml/relauncher/FMLSecurityManager.java
• src/main/java/net/minecraft/client/gui/GuiButton.java
• src/main/java/net/minecraft/client/gui/GuiSlot.java
• src/main/java/net/minecraft/client/gui/GuiTextField.java
• src/main/java/net/minecraft/network/rcon/RConThreadClient.java
• src/main/java/net/minecraft/server/management/ServerConfigurationManager.java
• src/main/java/net/minecraft/util/HttpUtil.java
• src/main/java/net/minecraft/world/ChunkCache.java
• src/main/java/net/minecraft/world/IBlockAccess.java
• src/main/java/net/minecraft/world/World.java
• src/main/java/net/minecraft/world/storage/SaveHandler.java
• src/main/java/net/minecraftforge/client/gui/ForgeGuiFactory.java
• src/main/java/net/minecraftforge/common/BiomeDictionary.java
• src/main/java/net/minecraftforge/common/ForgeChunkManager.java
• src/main/java/net/minecraftforge/common/ForgeModContainer.java
• src/main/java/net/minecraftforge/common/config/ConfigCategory.java
• src/main/java/net/minecraftforge/common/config/ConfigElement.java
• src/main/java/net/minecraftforge/common/config/Configuration.java
• src/main/java/net/minecraftforge/common/config/Property.java
• src/main/java/net/minecraftforge/event/ForgeEventFactory.java
• src/main/java/net/minecraftforge/event/entity/player/PlayerEvent.java
• src/main/java/net/minecraftforge/oredict/OreDictionary.java
• src/main/resources/assets/fml/lang/en_US.lang
• src/main/resources/assets/forge/lang/en_US.lang
• src/main/resources/assets/ultramine/lang/en_US.lang
• src/main/resources/fml_at.cfg
• src/main/resources/fmlversion.properties

Ignore Space Show notes View build.gradle

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

Ignore Space Show notes View src/main/java/cpw/mods/fml/client/config/ConfigGuiType.java 0 → 100644

Ignore Space Show notes View src/main/java/cpw/mods/fml/client/config/DummyConfigElement.java 0 → 100644

Ignore Space Show notes View src/main/java/cpw/mods/fml/client/config/GuiButtonExt.java 0 → 100644

Ignore Space Show notes View src/main/java/cpw/mods/fml/client/config/GuiCheckBox.java 0 → 100644

Ignore Space Show notes View src/main/java/cpw/mods/fml/client/config/GuiConfig.java 0 → 100644

Ignore Space Show notes View src/main/java/cpw/mods/fml/client/config/GuiConfigEntries.java 0 → 100644
Too large (Show diff)

Ignore Space Show notes View src/main/java/cpw/mods/fml/client/config/GuiEditArray.java 0 → 100644

Ignore Space Show notes View src/main/java/cpw/mods/fml/client/config/GuiEditArrayEntries.java 0 → 100644

Ignore Space Show notes View src/main/java/cpw/mods/fml/client/config/GuiMessageDialog.java 0 → 100644

Ignore Space Show notes View src/main/java/cpw/mods/fml/client/config/GuiSelectString.java 0 → 100644

Ignore Space Show notes View src/main/java/cpw/mods/fml/client/config/GuiSelectStringEntries.java 0 → 100644

Ignore Space Show notes View src/main/java/cpw/mods/fml/client/config/GuiUnicodeGlyphButton.java 0 → 100644

Ignore Space Show notes View src/main/java/cpw/mods/fml/client/config/GuiUtils.java 0 → 100644

Ignore Space Show notes View src/main/java/cpw/mods/fml/client/config/HoverChecker.java 0 → 100644

Ignore Space Show notes View src/main/java/cpw/mods/fml/client/config/IConfigElement.java 0 → 100644

Ignore Space Show notes View src/main/java/cpw/mods/fml/client/event/ConfigChangedEvent.java 0 → 100644

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

Ignore Space Show notes View src/main/java/cpw/mods/fml/relauncher/FMLSecurityManager.java 0 → 100644

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

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

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

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

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

Ignore Space Show notes View src/main/java/net/minecraft/util/HttpUtil.java

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

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

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

Ignore Space Show notes View src/main/java/net/minecraft/world/storage/SaveHandler.java

Ignore Space Show notes View src/main/java/net/minecraftforge/client/gui/ForgeGuiFactory.java 0 → 100644

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

Ignore Space Show notes View src/main/java/net/minecraftforge/common/ForgeChunkManager.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/config/ConfigCategory.java

Ignore Space Show notes View src/main/java/net/minecraftforge/common/config/ConfigElement.java 0 → 100644

Ignore Space Show notes View src/main/java/net/minecraftforge/common/config/Configuration.java
Too large (Show diff)

Ignore Space Show notes View src/main/java/net/minecraftforge/common/config/Property.java
Too large (Show diff)

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

Ignore Space Show notes View src/main/java/net/minecraftforge/event/entity/player/PlayerEvent.java

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

Ignore Space Show notes View src/main/resources/assets/fml/lang/en_US.lang 0 → 100644

Ignore Space Show notes View src/main/resources/assets/forge/lang/en_US.lang

Ignore Space Show notes View src/main/resources/assets/ultramine/lang/en_US.lang

Ignore Space Show notes View src/main/resources/fml_at.cfg

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

Show line notes below