Browse code Merge remote-tracking branch 'Clean_Forge/master' Conflicts: src/main/java/net/minecraft/server/management/ServerConfigurationManager.java src/main/java/net/minecraft/world/WorldServer.java master mfnd stable v0.1 v0.0
commit 9737884cc5e47d5bb91eabf92dc6fcfd113035f0 2 parents 78edda1 + 3343967 vlad20012 authored on 26 Jan 2015

Showing 50 changed files

• conf/deobfuscateJar/deobfed.jar
• conf/mcp.exc
• conf/mcp2notch.srg
• conf/mcp2srg.srg
• conf/notch2mcp.srg
• conf/notch2srg.srg
• conf/srg.exc
• src/main/java/net/minecraft/block/Block.java
• src/main/java/net/minecraft/client/Minecraft.java
• src/main/java/net/minecraft/client/gui/GuiSleepMP.java
• src/main/java/net/minecraft/client/gui/inventory/GuiContainer.java
• src/main/java/net/minecraft/client/renderer/RenderBlocks.java
• src/main/java/net/minecraft/client/renderer/ThreadDownloadImageData.java
• src/main/java/net/minecraft/client/renderer/texture/Stitcher.java
• src/main/java/net/minecraft/command/CommandEnchant.java
• src/main/java/net/minecraft/enchantment/EnchantmentHelper.java
• src/main/java/net/minecraft/entity/EntityLivingBase.java
• src/main/java/net/minecraft/entity/item/EntityMinecart.java
• src/main/java/net/minecraft/entity/player/EntityPlayer.java
• src/main/java/net/minecraft/inventory/ContainerRepair.java
• src/main/java/net/minecraft/item/Item.java
• src/main/java/net/minecraft/item/ItemSword.java
• src/main/java/net/minecraft/item/ItemTool.java
• src/main/java/net/minecraft/network/NetHandlerPlayServer.java
• src/main/java/net/minecraft/network/PingResponseHandler.java
• src/main/java/net/minecraft/network/rcon/RConThreadClient.java
• src/main/java/net/minecraft/server/management/PlayerManager.java
• src/main/java/net/minecraft/server/management/ServerConfigurationManager.java
• src/main/java/net/minecraft/tileentity/TileEntityBrewingStand.java
• src/main/java/net/minecraft/util/HttpUtil.java
• src/main/java/net/minecraft/world/Explosion.java
• src/main/java/net/minecraft/world/World.java
• src/main/java/net/minecraft/world/WorldServer.java
• src/main/java/net/minecraft/world/chunk/Chunk.java
• src/main/java/net/minecraftforge/client/model/obj/WavefrontObject.java
• src/main/java/net/minecraftforge/common/ForgeHooks.java
• src/main/java/net/minecraftforge/common/ForgeModContainer.java
• src/main/java/net/minecraftforge/common/MinecraftForge.java
• src/main/java/net/minecraftforge/event/ForgeEventFactory.java
• src/main/java/net/minecraftforge/event/brewing/PotionBrewEvent.java
• src/main/java/net/minecraftforge/event/brewing/PotionBrewedEvent.java
• src/main/java/net/minecraftforge/event/entity/living/LivingHealEvent.java
• src/main/java/net/minecraftforge/event/entity/player/PlayerWakeUpEvent.java
• src/main/java/net/minecraftforge/event/world/ExplosionEvent.java
• src/main/java/net/minecraftforge/event/world/WorldEvent.java
• src/main/java/net/minecraftforge/fluids/FluidTank.java
• src/main/java/net/minecraftforge/fluids/RenderBlockFluid.java
• src/main/java/net/minecraftforge/oredict/OreDictionary.java
• src/main/resources/deobfuscation_data-1.7.10.lzma
• src/main/resources/fmlversion.properties

Ignore Space Show notes View conf/deobfuscateJar/deobfed.jar
Not supported

Ignore Space Show notes View conf/mcp.exc

Ignore Space Show notes View conf/mcp2notch.srg
Not supported

Ignore Space Show notes View conf/mcp2srg.srg
Not supported

Ignore Space Show notes View conf/notch2mcp.srg
Not supported

Ignore Space Show notes View conf/notch2srg.srg
Not supported

Ignore Space Show notes View conf/srg.exc

Ignore Space Show notes View src/main/java/net/minecraft/block/Block.java

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

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

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

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

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

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

Ignore Space Show notes View src/main/java/net/minecraft/command/CommandEnchant.java

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

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

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

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

Ignore Space Show notes View src/main/java/net/minecraft/inventory/ContainerRepair.java

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

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

Ignore Space Show notes View src/main/java/net/minecraft/item/ItemTool.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/network/rcon/RConThreadClient.java

Ignore Space Show notes View src/main/java/net/minecraft/server/management/PlayerManager.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/tileentity/TileEntityBrewingStand.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/Explosion.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/WorldServer.java

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

Ignore Space Show notes View src/main/java/net/minecraftforge/client/model/obj/WavefrontObject.java

Ignore Space Show notes View src/main/java/net/minecraftforge/common/ForgeHooks.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/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/brewing/PotionBrewEvent.java 0 → 100644

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/living/LivingHealEvent.java 0 → 100644

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

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

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

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

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

Ignore Space Show notes View src/main/resources/deobfuscation_data-1.7.10.lzma
Not supported

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

Show line notes below