Browse code Merge remote-tracking branch 'Clean_Forge/master' Conflicts: src/main/resources/log4j2.xml master mfnd stable v0.1 v0.0
commit b51ae74d8ddf84de69d6bae2c0784be0af5fbf34 2 parents eb29a52 + 229dd86 vlad20012 authored on 15 Jul 2014

Showing 71 changed files

• conf/build.gradle.forge
• src/main/java/cpw/mods/fml/client/config/GuiEditArray.java
• src/main/java/cpw/mods/fml/relauncher/Side.java
• src/main/java/cpw/mods/fml/relauncher/SideOnly.java
• src/main/java/net/minecraft/client/gui/inventory/GuiContainerCreative.java
• src/main/java/net/minecraft/client/renderer/EntityRenderer.java
• src/main/java/net/minecraft/client/renderer/InventoryEffectRenderer.java
• src/main/java/net/minecraft/client/renderer/ItemRenderer.java
• src/main/java/net/minecraft/client/renderer/entity/RenderItem.java
• src/main/java/net/minecraft/client/renderer/tileentity/RenderItemFrame.java
• src/main/java/net/minecraft/client/shader/Framebuffer.java
• src/main/java/net/minecraft/enchantment/Enchantment.java
• src/main/java/net/minecraft/entity/player/EntityPlayerMP.java
• src/main/java/net/minecraft/potion/Potion.java
• src/main/java/net/minecraft/server/management/ItemInWorldManager.java
• src/main/java/net/minecraft/world/WorldType.java
• src/main/java/net/minecraft/world/biome/BiomeGenHills.java
• src/main/java/net/minecraft/world/gen/ChunkProviderEnd.java
• src/main/java/net/minecraft/world/gen/ChunkProviderGenerate.java
• src/main/java/net/minecraft/world/gen/ChunkProviderHell.java
• src/main/java/net/minecraftforge/client/ForgeHooksClient.java
• src/main/java/net/minecraftforge/client/GuiIngameForge.java
• src/main/java/net/minecraftforge/client/event/RenderBlockOverlayEvent.java
• src/main/java/net/minecraftforge/client/event/RenderItemInFrameEvent.java
• src/main/java/net/minecraftforge/common/BiomeDictionary.java
• src/main/java/net/minecraftforge/common/ForgeModContainer.java
• src/main/java/net/minecraftforge/common/chunkio/ChunkIOProvider.java
• src/main/java/net/minecraftforge/common/util/EnumHelper.java
• src/main/java/net/minecraftforge/event/CommandEvent.java
• src/main/java/net/minecraftforge/event/ServerChatEvent.java
• src/main/java/net/minecraftforge/event/brewing/PotionBrewedEvent.java
• src/main/java/net/minecraftforge/event/entity/EntityEvent.java
• src/main/java/net/minecraftforge/event/entity/EntityJoinWorldEvent.java
• src/main/java/net/minecraftforge/event/entity/EntityStruckByLightningEvent.java
• src/main/java/net/minecraftforge/event/entity/PlaySoundAtEntityEvent.java
• src/main/java/net/minecraftforge/event/entity/living/LivingAttackEvent.java
• src/main/java/net/minecraftforge/event/entity/living/LivingDeathEvent.java
• src/main/java/net/minecraftforge/event/entity/living/LivingDropsEvent.java
• src/main/java/net/minecraftforge/event/entity/living/LivingEvent.java
• src/main/java/net/minecraftforge/event/entity/living/LivingFallEvent.java
• src/main/java/net/minecraftforge/event/entity/living/LivingHurtEvent.java
• src/main/java/net/minecraftforge/event/entity/living/LivingSetAttackTargetEvent.java
• src/main/java/net/minecraftforge/event/entity/living/LivingSpawnEvent.java
• src/main/java/net/minecraftforge/event/entity/living/ZombieEvent.java
• src/main/java/net/minecraftforge/event/entity/minecart/MinecartCollisionEvent.java
• src/main/java/net/minecraftforge/event/entity/minecart/MinecartEvent.java
• src/main/java/net/minecraftforge/event/entity/minecart/MinecartInteractEvent.java
• src/main/java/net/minecraftforge/event/entity/minecart/MinecartUpdateEvent.java
• src/main/java/net/minecraftforge/event/entity/player/AchievementEvent.java
• src/main/java/net/minecraftforge/event/entity/player/ArrowLooseEvent.java
• src/main/java/net/minecraftforge/event/entity/player/ArrowNockEvent.java
• src/main/java/net/minecraftforge/event/entity/player/AttackEntityEvent.java
• src/main/java/net/minecraftforge/event/entity/player/EntityInteractEvent.java
• src/main/java/net/minecraftforge/event/entity/player/PlayerDestroyItemEvent.java
• src/main/java/net/minecraftforge/event/entity/player/PlayerEvent.java
• src/main/java/net/minecraftforge/event/entity/player/PlayerInteractEvent.java
• src/main/java/net/minecraftforge/event/entity/player/PlayerSleepInBedEvent.java
• src/main/java/net/minecraftforge/event/terraingen/BiomeEvent.java
• src/main/java/net/minecraftforge/event/terraingen/ChunkProviderEvent.java
• src/main/java/net/minecraftforge/event/terraingen/DecorateBiomeEvent.java
• src/main/java/net/minecraftforge/event/terraingen/OreGenEvent.java
• src/main/java/net/minecraftforge/event/terraingen/PopulateChunkEvent.java
• src/main/java/net/minecraftforge/event/terraingen/SaplingGrowTreeEvent.java
• src/main/java/net/minecraftforge/event/terraingen/WorldTypeEvent.java
• src/main/java/net/minecraftforge/event/world/ChunkDataEvent.java
• src/main/java/net/minecraftforge/event/world/ChunkEvent.java
• src/main/java/net/minecraftforge/event/world/ChunkWatchEvent.java
• src/main/java/net/minecraftforge/event/world/WorldEvent.java
• src/main/java/net/minecraftforge/fluids/Fluid.java
• src/main/resources/assets/forge/lang/en_US.lang
• src/main/resources/fmlversion.properties

Ignore Space Show notes View conf/build.gradle.forge 0 → 100644

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

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

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

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

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

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

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

Ignore Space Show notes View src/main/java/net/minecraft/client/renderer/entity/RenderItem.java

Ignore Space Show notes View src/main/java/net/minecraft/client/renderer/tileentity/RenderItemFrame.java

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

Ignore Space Show notes View src/main/java/net/minecraft/enchantment/Enchantment.java

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

Ignore Space Show notes View src/main/java/net/minecraft/potion/Potion.java

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

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

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

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

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

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

Ignore Space Show notes View src/main/java/net/minecraftforge/client/ForgeHooksClient.java

Ignore Space Show notes View src/main/java/net/minecraftforge/client/GuiIngameForge.java

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

Ignore Space Show notes View src/main/java/net/minecraftforge/client/event/RenderItemInFrameEvent.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/ForgeModContainer.java

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

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

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

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

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

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

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

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

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

Ignore Space Show notes View src/main/java/net/minecraftforge/event/entity/living/LivingAttackEvent.java

Ignore Space Show notes View src/main/java/net/minecraftforge/event/entity/living/LivingDeathEvent.java

Ignore Space Show notes View src/main/java/net/minecraftforge/event/entity/living/LivingDropsEvent.java

Ignore Space Show notes View src/main/java/net/minecraftforge/event/entity/living/LivingEvent.java

Ignore Space Show notes View src/main/java/net/minecraftforge/event/entity/living/LivingFallEvent.java

Ignore Space Show notes View src/main/java/net/minecraftforge/event/entity/living/LivingHurtEvent.java

Ignore Space Show notes View src/main/java/net/minecraftforge/event/entity/living/LivingSetAttackTargetEvent.java

Ignore Space Show notes View src/main/java/net/minecraftforge/event/entity/living/LivingSpawnEvent.java

Ignore Space Show notes View src/main/java/net/minecraftforge/event/entity/living/ZombieEvent.java

Ignore Space Show notes View src/main/java/net/minecraftforge/event/entity/minecart/MinecartCollisionEvent.java

Ignore Space Show notes View src/main/java/net/minecraftforge/event/entity/minecart/MinecartEvent.java

Ignore Space Show notes View src/main/java/net/minecraftforge/event/entity/minecart/MinecartInteractEvent.java

Ignore Space Show notes View src/main/java/net/minecraftforge/event/entity/minecart/MinecartUpdateEvent.java

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

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

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

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

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

Ignore Space Show notes View src/main/java/net/minecraftforge/event/entity/player/PlayerDestroyItemEvent.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/event/entity/player/PlayerInteractEvent.java

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

Show line notes below