diff --git a/fml/conf/packages.csv b/fml/conf/packages.csv
index 8646209f41..d28add9b19 100644
--- a/fml/conf/packages.csv
+++ b/fml/conf/packages.csv
@@ -13,12 +13,13 @@ BlockButtonStone,net/minecraft/block
 BlockButtonWood,net/minecraft/block
 BlockCactus,net/minecraft/block
 BlockCake,net/minecraft/block
+BlockCarpet,net/minecraft/block
 BlockCarrot,net/minecraft/block
 BlockCauldron,net/minecraft/block
 BlockChest,net/minecraft/block
 BlockClay,net/minecraft/block
-BlockCloth,net/minecraft/block
 BlockCocoa,net/minecraft/block
+BlockColored,net/minecraft/block
 BlockCommandBlock,net/minecraft/block
 BlockComparator,net/minecraft/block
 BlockContainer,net/minecraft/block
@@ -51,6 +52,7 @@ BlockGlowStone,net/minecraft/block
 BlockGrass,net/minecraft/block
 BlockGravel,net/minecraft/block
 BlockHalfSlab,net/minecraft/block
+BlockHay,net/minecraft/block
 BlockHopper,net/minecraft/block
 BlockIce,net/minecraft/block
 BlockJukeBox,net/minecraft/block
@@ -93,6 +95,7 @@ BlockRedstoneRepeater,net/minecraft/block
 BlockRedstoneTorch,net/minecraft/block
 BlockRedstoneWire,net/minecraft/block
 BlockReed,net/minecraft/block
+BlockRotatedPillar,net/minecraft/block
 BlockSand,net/minecraft/block
 BlockSandStone,net/minecraft/block
 BlockSapling,net/minecraft/block
@@ -141,28 +144,23 @@ CallableClientMemoryStats,net/minecraft/client
 CallableClientProfiler,net/minecraft/client
 CallableGLInfo,net/minecraft/client
 CallableLWJGLVersion,net/minecraft/client
+CallableLaunchedVersion,net/minecraft/client
 CallableModded,net/minecraft/client
+CallableParticleScreenName,net/minecraft/client
 CallableTexturePack,net/minecraft/client
-CallableTickingScreenName,net/minecraft/client
 CallableType2,net/minecraft/client
 CallableUpdatingScreenName,net/minecraft/client
-CanvasCrashReport,net/minecraft/client
-CanvasMinecraftApplet,net/minecraft/client
-CanvasMojangLogo,net/minecraft/client
-EnumOSHelper,net/minecraft/client
-GameWindowListener,net/minecraft/client
-MinecraftAppletImpl,net/minecraft/client
-MinecraftFakeLauncher,net/minecraft/client
-PanelCrashReport,net/minecraft/client
+Minecraft,net/minecraft/client
 StatStringFormatKeyInv,net/minecraft/client
 ThreadClientSleep,net/minecraft/client
-ThreadShutdown,net/minecraft/client
-CodecMus,net/minecraft/client/audio
-MusInputStream,net/minecraft/client/audio
 ScheduledSound,net/minecraft/client/audio
 SoundManager,net/minecraft/client/audio
+SoundManagerINNER1,net/minecraft/client/audio
 SoundPool,net/minecraft/client/audio
 SoundPoolEntry,net/minecraft/client/audio
+SoundPoolProtocolHandler,net/minecraft/client/audio
+SoundPoolURLConnection,net/minecraft/client/audio
+AbstractClientPlayer,net/minecraft/client/entity
 EntityClientPlayerMP,net/minecraft/client/entity
 EntityOtherPlayerMP,net/minecraft/client/entity
 EntityPlayerSP,net/minecraft/client/entity
@@ -201,9 +199,7 @@ GuiMerchant,net/minecraft/client/gui
 GuiMultiplayer,net/minecraft/client/gui
 GuiNewChat,net/minecraft/client/gui
 GuiOptions,net/minecraft/client/gui
-GuiParticle,net/minecraft/client/gui
 GuiPlayerInfo,net/minecraft/client/gui
-GuiProgress,net/minecraft/client/gui
 GuiRenameWorld,net/minecraft/client/gui
 GuiRepair,net/minecraft/client/gui
 GuiScreen,net/minecraft/client/gui
@@ -211,7 +207,6 @@ GuiScreenAddServer,net/minecraft/client/gui
 GuiScreenBook,net/minecraft/client/gui
 GuiScreenConfigureWorld,net/minecraft/client/gui
 GuiScreenConfirmation,net/minecraft/client/gui
-GuiScreenCreateOnlineWorld,net/minecraft/client/gui
 GuiScreenDemo,net/minecraft/client/gui
 GuiScreenDisconnectedOnline,net/minecraft/client/gui
 GuiScreenEditOnlineWorld,net/minecraft/client/gui
@@ -219,7 +214,6 @@ GuiScreenInvite,net/minecraft/client/gui
 GuiScreenLongRunningTask,net/minecraft/client/gui
 GuiScreenOnlineServers,net/minecraft/client/gui
 GuiScreenOnlineServersSubscreen,net/minecraft/client/gui
-GuiScreenResetWorld,net/minecraft/client/gui
 GuiScreenSelectLocation,net/minecraft/client/gui
 GuiScreenServerList,net/minecraft/client/gui
 GuiScreenSubscription,net/minecraft/client/gui
@@ -241,7 +235,6 @@ GuiWorldSlot,net/minecraft/client/gui
 GuiYesNo,net/minecraft/client/gui
 LoadingScreenRenderer,net/minecraft/client/gui
 MapItemRenderer,net/minecraft/client/gui
-Particle,net/minecraft/client/gui
 RunnableTitleScreen,net/minecraft/client/gui
 ScaledResolution,net/minecraft/client/gui
 ScreenChatOptions,net/minecraft/client/gui
@@ -249,13 +242,10 @@ SelectionListBase,net/minecraft/client/gui
 SelectionListInvited,net/minecraft/client/gui
 TaskLongRunning,net/minecraft/client/gui
 TaskOnlineConnect,net/minecraft/client/gui
-TaskResetWorld,net/minecraft/client/gui
-TaskWorldCreation,net/minecraft/client/gui
 ThreadConnectToOnlineServer,net/minecraft/client/gui
 ThreadOnlineConnect,net/minecraft/client/gui
 ThreadOnlineScreen,net/minecraft/client/gui
 ThreadPollServers,net/minecraft/client/gui
-ThreadTitleScreen,net/minecraft/client/gui
 GuiAchievement,net/minecraft/client/gui/achievement
 GuiAchievements,net/minecraft/client/gui/achievement
 GuiSlotStats,net/minecraft/client/gui/achievement
@@ -281,28 +271,50 @@ GuiDispenser,net/minecraft/client/gui/inventory
 GuiEditSign,net/minecraft/client/gui/inventory
 GuiFurnace,net/minecraft/client/gui/inventory
 GuiInventory,net/minecraft/client/gui/inventory
+GuiScreenHorseInventory,net/minecraft/client/gui/inventory
 SlotCreativeInventory,net/minecraft/client/gui/inventory
+GuiScreenBackup,net/minecraft/client/gui/mco
+GuiScreenBackupDownloadThread,net/minecraft/client/gui/mco
+GuiScreenBackupRestoreTask,net/minecraft/client/gui/mco
+GuiScreenBackupSelectionList,net/minecraft/client/gui/mco
+GuiScreenCreateOnlineWorld,net/minecraft/client/gui/mco
+GuiScreenMcoWorldTemplate,net/minecraft/client/gui/mco
+GuiScreenMcoWorldTemplateDownloadThread,net/minecraft/client/gui/mco
+GuiScreenMcoWorldTemplateSelectionList,net/minecraft/client/gui/mco
+GuiScreenPendingInvitation,net/minecraft/client/gui/mco
+GuiScreenPendingInvitationINNER1,net/minecraft/client/gui/mco
+GuiScreenPendingInvitationINNER2,net/minecraft/client/gui/mco
+GuiScreenPendingInvitationINNER3,net/minecraft/client/gui/mco
+GuiScreenPendingInvitationList,net/minecraft/client/gui/mco
+GuiScreenResetWorld,net/minecraft/client/gui/mco
+ScreenWithCallback,net/minecraft/client/gui/mco
+TaskResetWorld,net/minecraft/client/gui/mco
+TaskWorldCreation,net/minecraft/client/gui/mco
+MainProxyAuthenticator,net/minecraft/client/main
+MainShutdownHook,net/minecraft/client/main
+Backup,net/minecraft/client/mco
+BackupList,net/minecraft/client/mco
 ExceptionMcoHttp,net/minecraft/client/mco
 ExceptionMcoService,net/minecraft/client/mco
 ExceptionRetryCall,net/minecraft/client/mco
 McoClient,net/minecraft/client/mco
-McoOption,net/minecraft/client/mco
-McoOptionNone,net/minecraft/client/mco
-McoOptionSome,net/minecraft/client/mco
-McoPair,net/minecraft/client/mco
 McoServer,net/minecraft/client/mco
 McoServerAddress,net/minecraft/client/mco
 McoServerList,net/minecraft/client/mco
-McoServerListINNER1,net/minecraft/client/mco
+McoServerListEmptyAnon,net/minecraft/client/mco
+McoServerListUpdateThread,net/minecraft/client/mco
+McoServerListUpdateThreadComparer,net/minecraft/client/mco
+PendingInvite,net/minecraft/client/mco
+PendingInvitesList,net/minecraft/client/mco
 Request,net/minecraft/client/mco
 RequestDelete,net/minecraft/client/mco
 RequestGet,net/minecraft/client/mco
 RequestPost,net/minecraft/client/mco
 RequestPut,net/minecraft/client/mco
-TimerTaskMcoServerListUpdate,net/minecraft/client/mco
-TimerTaskMcoServerListUpdateComparator,net/minecraft/client/mco
 ValueObjectList,net/minecraft/client/mco
 ValueObjectSubscription,net/minecraft/client/mco
+WorldTemplate,net/minecraft/client/mco
+WorldTemplateList,net/minecraft/client/mco
 ModelBase,net/minecraft/client/model
 ModelBat,net/minecraft/client/model
 ModelBiped,net/minecraft/client/model
@@ -318,8 +330,10 @@ ModelDragon,net/minecraft/client/model
 ModelEnderCrystal,net/minecraft/client/model
 ModelEnderman,net/minecraft/client/model
 ModelGhast,net/minecraft/client/model
+ModelHorse,net/minecraft/client/model
 ModelIronGolem,net/minecraft/client/model
 ModelLargeChest,net/minecraft/client/model
+ModelLeashKnot,net/minecraft/client/model
 ModelMagmaCube,net/minecraft/client/model
 ModelMinecart,net/minecraft/client/model
 ModelOcelot,net/minecraft/client/model
@@ -352,7 +366,6 @@ GuiConnecting,net/minecraft/client/multiplayer
 LanServer,net/minecraft/client/multiplayer
 LanServerList,net/minecraft/client/multiplayer
 NetClientHandler,net/minecraft/client/multiplayer
-NetClientWebTextures,net/minecraft/client/multiplayer
 PlayerControllerMP,net/minecraft/client/multiplayer
 ServerAddress,net/minecraft/client/multiplayer
 ServerData,net/minecraft/client/multiplayer
@@ -392,10 +405,13 @@ EntitySnowShovelFX,net/minecraft/client/particle
 EntitySpellParticleFX,net/minecraft/client/particle
 EntitySplashFX,net/minecraft/client/particle
 EntitySuspendFX,net/minecraft/client/particle
+RenderCaveSpider,net/minecraft/client/render/entity
+RenderHorse,net/minecraft/client/render/entity
+RenderLeashKnot,net/minecraft/client/render/entity
+RendererLivingEntity,net/minecraft/client/render/entity
 ActiveRenderInfo,net/minecraft/client/renderer
 CallableMouseLocation,net/minecraft/client/renderer
 CallableParticlePositionInfo,net/minecraft/client/renderer
-CallableParticleScreenName,net/minecraft/client/renderer
 CallableScreenName,net/minecraft/client/renderer
 CallableScreenSize,net/minecraft/client/renderer
 ChestItemRenderHelper,net/minecraft/client/renderer
@@ -411,15 +427,14 @@ ItemRenderer,net/minecraft/client/renderer
 OpenGlCapsChecker,net/minecraft/client/renderer
 OpenGlHelper,net/minecraft/client/renderer
 RenderBlocks,net/minecraft/client/renderer
-RenderEngine,net/minecraft/client/renderer
 RenderGlobal,net/minecraft/client/renderer
 RenderHelper,net/minecraft/client/renderer
 RenderList,net/minecraft/client/renderer
 RenderSorter,net/minecraft/client/renderer
 StitcherException,net/minecraft/client/renderer
 Tessellator,net/minecraft/client/renderer
-ThreadDownloadImage,net/minecraft/client/renderer
 ThreadDownloadImageData,net/minecraft/client/renderer
+ThreadDownloadImageDataINNER1,net/minecraft/client/renderer
 WorldRenderer,net/minecraft/client/renderer
 ClippingHelper,net/minecraft/client/renderer/culling
 ClippingHelperImpl,net/minecraft/client/renderer/culling
@@ -471,17 +486,24 @@ RenderWither,net/minecraft/client/renderer/entity
 RenderWolf,net/minecraft/client/renderer/entity
 RenderXPOrb,net/minecraft/client/renderer/entity
 RenderZombie,net/minecraft/client/renderer/entity
+AbstractTexture,net/minecraft/client/renderer/texture
+DynamicTexture,net/minecraft/client/renderer/texture
 IconRegister,net/minecraft/client/renderer/texture
-Rect2i,net/minecraft/client/renderer/texture
+LayeredTexture,net/minecraft/client/renderer/texture
+SimpleTexture,net/minecraft/client/renderer/texture
 StitchHolder,net/minecraft/client/renderer/texture
 StitchSlot,net/minecraft/client/renderer/texture
 Stitcher,net/minecraft/client/renderer/texture
-Texture,net/minecraft/client/renderer/texture
+TextureAtlasSprite,net/minecraft/client/renderer/texture
 TextureClock,net/minecraft/client/renderer/texture
 TextureCompass,net/minecraft/client/renderer/texture
 TextureManager,net/minecraft/client/renderer/texture
+TextureManagerINNER1,net/minecraft/client/renderer/texture
 TextureMap,net/minecraft/client/renderer/texture
-TextureStitched,net/minecraft/client/renderer/texture
+TextureObject,net/minecraft/client/renderer/texture
+TextureUtil,net/minecraft/client/renderer/texture
+Tickable,net/minecraft/client/renderer/texture
+TickableTextureObject,net/minecraft/client/renderer/texture
 RenderEndPortal,net/minecraft/client/renderer/tileentity
 RenderEnderCrystal,net/minecraft/client/renderer/tileentity
 RenderItemFrame,net/minecraft/client/renderer/tileentity
@@ -495,20 +517,55 @@ TileEntityRendererPiston,net/minecraft/client/renderer/tileentity
 TileEntitySignRenderer,net/minecraft/client/renderer/tileentity
 TileEntitySkullRenderer,net/minecraft/client/renderer/tileentity
 TileEntitySpecialRenderer,net/minecraft/client/renderer/tileentity
+AbstractResourcePack,net/minecraft/client/resources
+DefaultResourcePack,net/minecraft/client/resources
+FallbackResourceManager,net/minecraft/client/resources
+FileResourcePack,net/minecraft/client/resources
+FolderResourcePack,net/minecraft/client/resources
+FolderResourcePackFilter,net/minecraft/client/resources
+FoliageColorReloadListener,net/minecraft/client/resources
+GrassColorReloadListener,net/minecraft/client/resources
+GuiScreenTemporaryResourcePackSelect,net/minecraft/client/resources
+GuiScreenTemporaryResourcePackSelectSelectionList,net/minecraft/client/resources
+I18n,net/minecraft/client/resources
+Language,net/minecraft/client/resources
+LanguageManager,net/minecraft/client/resources
+Locale,net/minecraft/client/resources
+ReloadableResourceManager,net/minecraft/client/resources
+Resource,net/minecraft/client/resources
+ResourceLocation,net/minecraft/client/resources
+ResourceManager,net/minecraft/client/resources
+ResourceManagerReloadListener,net/minecraft/client/resources
+ResourcePack,net/minecraft/client/resources
+ResourcePackFileNotFoundException,net/minecraft/client/resources
+ResourcePackRepository,net/minecraft/client/resources
+ResourcePackRepositoryEntry,net/minecraft/client/resources
+ResourcePackRepositoryFilter,net/minecraft/client/resources
+SimpleReloadableResourceManager,net/minecraft/client/resources
+SimpleReloadableResourceManagerINNER1,net/minecraft/client/resources
+SimpleResource,net/minecraft/client/resources
+AnimationFrame,net/minecraft/client/resources/data
+AnimationMetadataSection,net/minecraft/client/resources/data
+AnimationMetadataSectionSerializer,net/minecraft/client/resources/data
+BaseMetadataSectionSerializer,net/minecraft/client/resources/data
+FontMetadataSection,net/minecraft/client/resources/data
+FontMetadataSectionSerializer,net/minecraft/client/resources/data
+LanguageMetadataSection,net/minecraft/client/resources/data
+LanguageMetadataSectionSerializer,net/minecraft/client/resources/data
+MetadataSection,net/minecraft/client/resources/data
+MetadataSectionSerializer,net/minecraft/client/resources/data
+MetadataSerializer,net/minecraft/client/resources/data
+MetadataSerializerEmptyAnon,net/minecraft/client/resources/data
+MetadataSerializerRegistration,net/minecraft/client/resources/data
+PackMetadataSection,net/minecraft/client/resources/data
+PackMetadataSectionSerializer,net/minecraft/client/resources/data
+TextureMetadataSection,net/minecraft/client/resources/data
+TextureMetadataSectionSerializer,net/minecraft/client/resources/data
 EnumOptions,net/minecraft/client/settings
 EnumOptionsHelper,net/minecraft/client/settings
 GameSettings,net/minecraft/client/settings
 KeyBinding,net/minecraft/client/settings
 StatPlaceholder,net/minecraft/client/stats
-GuiTexturePackSlot,net/minecraft/client/texturepacks
-GuiTexturePacks,net/minecraft/client/texturepacks
-ITexturePack,net/minecraft/client/texturepacks
-TexturePackCustom,net/minecraft/client/texturepacks
-TexturePackDefault,net/minecraft/client/texturepacks
-TexturePackDownloadSuccess,net/minecraft/client/texturepacks
-TexturePackFolder,net/minecraft/client/texturepacks
-TexturePackImplementation,net/minecraft/client/texturepacks
-TexturePackList,net/minecraft/client/texturepacks
 CommandBase,net/minecraft/command
 CommandClearInventory,net/minecraft/command
 CommandDebug,net/minecraft/command
@@ -545,6 +602,8 @@ CommandServerTp,net/minecraft/command
 CommandServerWhitelist,net/minecraft/command
 CommandSetSpawnpoint,net/minecraft/command
 CommandShowSeed,net/minecraft/command
+CommandSpreadPlayers,net/minecraft/command
+CommandSpreadPlayersPosition,net/minecraft/command
 CommandTime,net/minecraft/command
 CommandToggleDownfall,net/minecraft/command
 CommandWeather,net/minecraft/command
@@ -643,12 +702,6 @@ EnchantmentUntouching,net/minecraft/enchantment
 EnchantmentWaterWorker,net/minecraft/enchantment
 EnumEnchantmentType,net/minecraft/enchantment
 IEnchantmentModifier,net/minecraft/enchantment
-CallableEffectAmplifier,net/minecraft/entity
-CallableEffectDuration,net/minecraft/entity
-CallableEffectID,net/minecraft/entity
-CallableEffectIsAmbient,net/minecraft/entity
-CallableEffectIsSplash,net/minecraft/entity
-CallableEffectName,net/minecraft/entity
 CallableEntityName,net/minecraft/entity
 CallableEntityTracker,net/minecraft/entity
 CallableEntityType,net/minecraft/entity
@@ -660,8 +713,12 @@ EntityCreature,net/minecraft/entity
 EntityEggInfo,net/minecraft/entity
 EntityFlying,net/minecraft/entity
 EntityHanging,net/minecraft/entity
+EntityLeashKnot,net/minecraft/entity
 EntityList,net/minecraft/entity
 EntityLiving,net/minecraft/entity
+EntityLivingBase,net/minecraft/entity
+EntityLivingData,net/minecraft/entity
+EntityOwnable,net/minecraft/entity
 EntitySelectorArmoredMob,net/minecraft/entity
 EntityTracker,net/minecraft/entity
 EntityTrackerEntry,net/minecraft/entity
@@ -675,6 +732,8 @@ INpc,net/minecraft/entity
 IProjectile,net/minecraft/entity
 IRangedAttackMob,net/minecraft/entity
 NpcMerchant,net/minecraft/entity
+SharedMonsterAttributes,net/minecraft/entity
+SpiderEffectsGroupData,net/minecraft/entity
 WatchableObject,net/minecraft/entity
 EntityAIArrowAttack,net/minecraft/entity/ai
 EntityAIAttackOnCollide,net/minecraft/entity/ai
@@ -703,6 +762,7 @@ EntityAIMoveThroughVillage,net/minecraft/entity/ai
 EntityAIMoveTowardsTarget,net/minecraft/entity/ai
 EntityAIMoveTwardsRestriction,net/minecraft/entity/ai
 EntityAINearestAttackableTarget,net/minecraft/entity/ai
+EntityAINearestAttackableTargetSelector,net/minecraft/entity/ai
 EntityAINearestAttackableTargetSorter,net/minecraft/entity/ai
 EntityAIOcelotAttack,net/minecraft/entity/ai
 EntityAIOcelotSit,net/minecraft/entity/ai
@@ -713,6 +773,7 @@ EntityAIPanic,net/minecraft/entity/ai
 EntityAIPlay,net/minecraft/entity/ai
 EntityAIRestrictOpenDoor,net/minecraft/entity/ai
 EntityAIRestrictSun,net/minecraft/entity/ai
+EntityAIRunAroundLikeCrazy,net/minecraft/entity/ai
 EntityAISit,net/minecraft/entity/ai
 EntityAISwimming,net/minecraft/entity/ai
 EntityAITarget,net/minecraft/entity/ai
@@ -732,6 +793,16 @@ EntityMinecartMobSpawnerLogic,net/minecraft/entity/ai
 EntityMoveHelper,net/minecraft/entity/ai
 EntitySenses,net/minecraft/entity/ai
 RandomPositionGenerator,net/minecraft/entity/ai
+Attribute,net/minecraft/entity/ai/attributes
+AttributeInstance,net/minecraft/entity/ai/attributes
+AttributeModifier,net/minecraft/entity/ai/attributes
+BaseAttribute,net/minecraft/entity/ai/attributes
+BaseAttributeMap,net/minecraft/entity/ai/attributes
+ClientsideAttributeMap,net/minecraft/entity/ai/attributes
+ModifiableAttributeInstance,net/minecraft/entity/ai/attributes
+RangedAttribute,net/minecraft/entity/ai/attributes
+ReadonlyAttributeInstance,net/minecraft/entity/ai/attributes
+ServersideAttributeMap,net/minecraft/entity/ai/attributes
 BossStatus,net/minecraft/entity/boss
 EntityDragon,net/minecraft/entity/boss
 EntityDragonPart,net/minecraft/entity/boss
@@ -786,6 +857,9 @@ EntityAnimal,net/minecraft/entity/passive
 EntityBat,net/minecraft/entity/passive
 EntityChicken,net/minecraft/entity/passive
 EntityCow,net/minecraft/entity/passive
+EntityHorse,net/minecraft/entity/passive
+EntityHorseBredSelector,net/minecraft/entity/passive
+EntityHorseGroupData,net/minecraft/entity/passive
 EntityMooshroom,net/minecraft/entity/passive
 EntityOcelot,net/minecraft/entity/passive
 EntityPig,net/minecraft/entity/passive
@@ -823,6 +897,8 @@ ContainerHopper,net/minecraft/inventory
 ContainerMerchant,net/minecraft/inventory
 ContainerPlayer,net/minecraft/inventory
 ContainerRepair,net/minecraft/inventory
+ContainerRepairINNER1,net/minecraft/inventory
+ContainerRepairINNER2,net/minecraft/inventory
 ContainerWorkbench,net/minecraft/inventory
 ICrafting,net/minecraft/inventory
 IInvBasic,net/minecraft/inventory
@@ -834,7 +910,6 @@ InventoryCrafting,net/minecraft/inventory
 InventoryEnderChest,net/minecraft/inventory
 InventoryLargeChest,net/minecraft/inventory
 InventoryMerchant,net/minecraft/inventory
-InventoryRepair,net/minecraft/inventory
 Slot,net/minecraft/inventory
 SlotArmor,net/minecraft/inventory
 SlotBeacon,net/minecraft/inventory
@@ -845,7 +920,10 @@ SlotEnchantment,net/minecraft/inventory
 SlotEnchantmentTable,net/minecraft/inventory
 SlotFurnace,net/minecraft/inventory
 SlotMerchantResult,net/minecraft/inventory
-SlotRepair,net/minecraft/inventory
+AnimalChest,net/minecraft/inventroy
+ContainerHorseInventory,net/minecraft/inventroy
+ContainerHorseInventorySlotArmor,net/minecraft/inventroy
+ContainerHorseInventorySlotSaddle,net/minecraft/inventroy
 BehaviorDispenseArmor,net/minecraft/item
 BehaviorDispenseMinecart,net/minecraft/item
 EnumAction,net/minecraft/item
@@ -888,6 +966,7 @@ ItemGlassBottle,net/minecraft/item
 ItemHangingEntity,net/minecraft/item
 ItemHoe,net/minecraft/item
 ItemInWorldManager,net/minecraft/item
+ItemLeash,net/minecraft/item
 ItemLeaves,net/minecraft/item
 ItemLilyPad,net/minecraft/item
 ItemMap,net/minecraft/item
@@ -895,6 +974,7 @@ ItemMapBase,net/minecraft/item
 ItemMinecart,net/minecraft/item
 ItemMonsterPlacer,net/minecraft/item
 ItemMultiTextureTile,net/minecraft/item
+ItemNameTag,net/minecraft/item
 ItemPickaxe,net/minecraft/item
 ItemPiston,net/minecraft/item
 ItemPotion,net/minecraft/item
@@ -936,7 +1016,7 @@ ShapedRecipes,net/minecraft/item/crafting
 ShapelessRecipes,net/minecraft/item/crafting
 ILogAgent,net/minecraft/logging
 LogAgent,net/minecraft/logging
-LogAgentINNER1,net/minecraft/logging
+LogAgentEmptyAnon,net/minecraft/logging
 LogFormatter,net/minecraft/logging
 CallableTagCompound1,net/minecraft/nbt
 CallableTagCompound2,net/minecraft/nbt
@@ -954,6 +1034,7 @@ NBTTagList,net/minecraft/nbt
 NBTTagLong,net/minecraft/nbt
 NBTTagShort,net/minecraft/nbt
 NBTTagString,net/minecraft/nbt
+CallableConnectionName,net/minecraft/network
 CallablePacketClass,net/minecraft/network
 CallablePacketID,net/minecraft/network
 INetworkManager,net/minecraft/network
@@ -1014,6 +1095,7 @@ Packet254ServerPing,net/minecraft/network/packet
 Packet255KickDisconnect,net/minecraft/network/packet
 Packet25EntityPainting,net/minecraft/network/packet
 Packet26EntityExpOrb,net/minecraft/network/packet
+Packet27PlayerInput,net/minecraft/network/packet
 Packet28EntityVelocity,net/minecraft/network/packet
 Packet29DestroyEntity,net/minecraft/network/packet
 Packet2ClientProtocol,net/minecraft/network/packet
@@ -1030,6 +1112,7 @@ Packet40EntityMetadata,net/minecraft/network/packet
 Packet41EntityEffect,net/minecraft/network/packet
 Packet42RemoveEntityEffect,net/minecraft/network/packet
 Packet43Experience,net/minecraft/network/packet
+Packet44UpdateAttributes,net/minecraft/network/packet
 Packet4UpdateTime,net/minecraft/network/packet
 Packet51MapChunk,net/minecraft/network/packet
 Packet51MapChunkData,net/minecraft/network/packet
@@ -1065,8 +1148,11 @@ PathFinder,net/minecraft/pathfinding
 PathNavigate,net/minecraft/pathfinding
 PathPoint,net/minecraft/pathfinding
 Potion,net/minecraft/potion
+PotionAbsoption,net/minecraft/potion
+PotionAttackDamage,net/minecraft/potion
 PotionEffect,net/minecraft/potion
 PotionHealth,net/minecraft/potion
+PotionHealthBoost,net/minecraft/potion
 PotionHelper,net/minecraft/potion
 IPlayerUsage,net/minecraft/profiler
 PlayerUsageSnooper,net/minecraft/profiler
@@ -1100,16 +1186,16 @@ DedicatedServerCommandThread,net/minecraft/server/dedicated
 DedicatedServerListenThread,net/minecraft/server/dedicated
 DedicatedServerSleepThread,net/minecraft/server/dedicated
 PropertyManager,net/minecraft/server/dedicated
-GuiLogFormatter,net/minecraft/server/gui
-GuiLogOutputHandler,net/minecraft/server/gui
-GuiStatsComponent,net/minecraft/server/gui
-GuiStatsListener,net/minecraft/server/gui
 IUpdatePlayerListBox,net/minecraft/server/gui
-PlayerListBox,net/minecraft/server/gui
-ServerGUI,net/minecraft/server/gui
-ServerGuiCommandListener,net/minecraft/server/gui
-ServerGuiFocusAdapter,net/minecraft/server/gui
-ServerWindowAdapter,net/minecraft/server/gui
+MinecraftServerGui,net/minecraft/server/gui
+MinecraftServerGuiINNER1,net/minecraft/server/gui
+MinecraftServerGuiINNER2,net/minecraft/server/gui
+MinecraftServerGuiINNER3,net/minecraft/server/gui
+PlayerListComponent,net/minecraft/server/gui
+StatsComponent,net/minecraft/server/gui
+StatsComponentINNER1,net/minecraft/server/gui
+TextAreaLogHandler,net/minecraft/server/gui
+TextAreaLogHandlerINNER1,net/minecraft/server/gui
 CallableIsModded,net/minecraft/server/integrated
 CallableType3,net/minecraft/server/integrated
 IntegratedPlayerList,net/minecraft/server/integrated
@@ -1133,6 +1219,7 @@ StatCrafting,net/minecraft/stats
 StatFileWriter,net/minecraft/stats
 StatList,net/minecraft/stats
 StatTypeDistance,net/minecraft/stats
+StatTypeFloat,net/minecraft/stats
 StatTypeSimple,net/minecraft/stats
 StatTypeTime,net/minecraft/stats
 StatsSyncher,net/minecraft/stats
@@ -1169,6 +1256,7 @@ AABBLocalPool,net/minecraft/util
 AABBPool,net/minecraft/util
 AxisAlignedBB,net/minecraft/util
 ChatAllowedCharacters,net/minecraft/util
+ChatMessageComponent,net/minecraft/util
 ChunkCoordinates,net/minecraft/util
 CombatEntry,net/minecraft/util
 CombatTracker,net/minecraft/util
@@ -1186,8 +1274,6 @@ EnumOS,net/minecraft/util
 Facing,net/minecraft/util
 FoodStats,net/minecraft/util
 HttpUtil,net/minecraft/util
-HttpUtilRunnable,net/minecraft/util
-IDownloadSuccess,net/minecraft/util
 IProgressUpdate,net/minecraft/util
 Icon,net/minecraft/util
 IntHashMap,net/minecraft/util
@@ -1196,6 +1282,7 @@ LongHashMap,net/minecraft/util
 LongHashMapEntry,net/minecraft/util
 MD5String,net/minecraft/util
 MathHelper,net/minecraft/util
+MessageComponentSerializer,net/minecraft/util
 MinecraftError,net/minecraft/util
 MouseFilter,net/minecraft/util
 MouseHelper,net/minecraft/util
@@ -1208,9 +1295,9 @@ Session,net/minecraft/util
 StatCollector,net/minecraft/util
 StringTranslate,net/minecraft/util
 StringUtils,net/minecraft/util
-ThreadDownloadResources,net/minecraft/util
 Timer,net/minecraft/util
 Tuple,net/minecraft/util
+Util,net/minecraft/util
 ValueObject,net/minecraft/util
 Vec3,net/minecraft/util
 Vec3Pool,net/minecraft/util
diff --git a/fml/eclipse-workspace-dev.zip b/fml/eclipse-workspace-dev.zip
index dd8d91bdd1..7fa77305b7 100644
Binary files a/fml/eclipse-workspace-dev.zip and b/fml/eclipse-workspace-dev.zip differ
diff --git a/fml/install/eclipse/Minecraft/.classpath b/fml/install/eclipse/Minecraft/.classpath
index eaf5060180..58c6bbd0fa 100644
--- a/fml/install/eclipse/Minecraft/.classpath
+++ b/fml/install/eclipse/Minecraft/.classpath
@@ -2,26 +2,35 @@
 <classpath>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-	<classpathentry kind="lib" path="jars/bin/jinput.jar">
-		<attributes>
-			<attribute name="org.eclipse.jdt.launching.CLASSPATH_ATTR_LIBRARY_PATH_ENTRY" value="Minecraft/jars/bin/natives"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="lib" path="jars/bin/lwjgl_util.jar">
-		<attributes>
-			<attribute name="org.eclipse.jdt.launching.CLASSPATH_ATTR_LIBRARY_PATH_ENTRY" value="Minecraft/jars/bin/natives"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="lib" path="jars/bin/lwjgl.jar">
-		<attributes>
-			<attribute name="org.eclipse.jdt.launching.CLASSPATH_ATTR_LIBRARY_PATH_ENTRY" value="Minecraft/jars/bin/natives"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="lib" path="jars/bin/minecraft.jar"/>
-	<classpathentry kind="lib" path="lib/argo-3.2-src.jar" sourcepath="lib/argo-3.2-src.jar"/>
-	<classpathentry kind="lib" path="lib/bcprov-debug-jdk15on-148.jar" sourcepath="lib/bcprov-jdk15on-148-src.zip"/>
-	<classpathentry kind="lib" path="lib/asm-debug-all-4.1.jar" sourcepath="lib/asm-4.1-bin.zip"/>
-	<classpathentry kind="lib" path="lib/guava-14.0-rc3.jar" sourcepath="lib/guava-14.0-rc3-sources.jar"/>
-	<classpathentry kind="lib" path="lib/scala-library.jar" sourcepath="lib/scala-library.jar"/>
-	<classpathentry kind="output" path="bin"/>
+    <classpathentry kind="lib" path="jars/libraries/org/ow2/asm/asm-all/4.1/asm-all-4.1.jar" />
+    <classpathentry kind="lib" path="jars/libraries/net/minecraft/launchwrapper/1.3/launchwrapper-1.3.jar" />
+    <classpathentry kind="lib" path="jars/versions/1.6/1.6.jar" />
+    <classpathentry kind="lib" path="jars/libraries/net/sf/jopt-simple/jopt-simple/4.5/jopt-simple-4.5.jar" />
+    <classpathentry kind="lib" path="jars/libraries/com/paulscode/codecjorbis/20101023/codecjorbis-20101023.jar" />
+    <classpathentry kind="lib" path="jars/libraries/com/paulscode/codecwav/20101023/codecwav-20101023.jar" />
+    <classpathentry kind="lib" path="jars/libraries/com/paulscode/libraryjavasound/20101123/libraryjavasound-20101123.jar" />
+    <classpathentry kind="lib" path="jars/libraries/com/paulscode/librarylwjglopenal/20100824/librarylwjglopenal-20100824.jar" />
+    <classpathentry kind="lib" path="jars/libraries/com/paulscode/soundsystem/20120107/soundsystem-20120107.jar" />
+    <classpathentry kind="lib" path="jars/libraries/argo/argo/2.25_fixed/argo-2.25_fixed.jar" />
+    <classpathentry kind="lib" path="jars/libraries/org/bouncycastle/bcprov-jdk15on/1.47/bcprov-jdk15on-1.47.jar" />
+    <classpathentry kind="lib" path="jars/libraries/com/google/guava/guava/14.0/guava-14.0.jar" />
+    <classpathentry kind="lib" path="jars/libraries/org/apache/commons/commons-lang3/3.1/commons-lang3-3.1.jar" />
+    <classpathentry kind="lib" path="jars/libraries/commons-io/commons-io/2.4/commons-io-2.4.jar" />
+    <classpathentry kind="lib" path="jars/libraries/net/java/jutils/jutils/1.0.0/jutils-1.0.0.jar" />
+    <classpathentry kind="lib" path="jars/libraries/com/google/code/gson/gson/2.2.2/gson-2.2.2.jar" />
+    <classpathentry kind="lib" path="jars/libraries/net/java/jinput/jinput/2.0.5/jinput-2.0.5.jar">
+        <attributes>
+            <attribute name="org.eclipse.jdt.launching.CLASSPATH_ATTR_LIBRARY_PATH_ENTRY" value="FML/libraries/natives"/>
+        </attributes>
+    </classpathentry>
+    <classpathentry kind="lib" path="jars/libraries/org/lwjgl/lwjgl/lwjgl/2.9.0/lwjgl-2.9.0.jar">
+        <attributes>
+            <attribute name="org.eclipse.jdt.launching.CLASSPATH_ATTR_LIBRARY_PATH_ENTRY" value="FML/libraries/natives"/>
+        </attributes>
+    </classpathentry>
+    <classpathentry kind="lib" path="jars/libraries/org/lwjgl/lwjgl/lwjgl_util/2.9.0/lwjgl_util-2.9.0.jar">
+        <attributes>
+            <attribute name="org.eclipse.jdt.launching.CLASSPATH_ATTR_LIBRARY_PATH_ENTRY" value="FML/libraries/natives"/>
+        </attributes>
+    </classpathentry>
 </classpath>
diff --git a/fml/install/eclipse/Minecraft/.project b/fml/install/eclipse/Minecraft/.project
index 09eaf1ace8..06690cb49c 100644
--- a/fml/install/eclipse/Minecraft/.project
+++ b/fml/install/eclipse/Minecraft/.project
@@ -33,18 +33,36 @@
 	</linkedResources>
 	<filteredResources>
 		<filter>
-			<id>1307293455427</id>
+			<id>1372126392133</id>
 			<name>jars</name>
 			<type>13</type>
 			<matcher>
 				<id>org.eclipse.ui.ide.multiFilter</id>
-				<arguments>1.0-name-matches-false-false-bin</arguments>
+				<arguments>1.0-name-matches-false-false-libraries</arguments>
 			</matcher>
 		</filter>
 		<filter>
-			<id>1307293504507</id>
-			<name>jars/bin</name>
-			<type>5</type>
+			<id>1372126392135</id>
+			<name>jars</name>
+			<type>13</type>
+			<matcher>
+				<id>org.eclipse.ui.ide.multiFilter</id>
+				<arguments>1.0-name-matches-false-false-versions</arguments>
+			</matcher>
+		</filter>
+		<filter>
+			<id>1372126392137</id>
+			<name>jars</name>
+			<type>26</type>
+			<matcher>
+				<id>org.eclipse.ui.ide.multiFilter</id>
+				<arguments>1.0-name-matches-false-false-natives</arguments>
+			</matcher>
+		</filter>
+		<filter>
+			<id>1372126425043</id>
+			<name>jars/libraries</name>
+			<type>21</type>
 			<matcher>
 				<id>org.eclipse.ui.ide.multiFilter</id>
 				<arguments>1.0-name-matches-false-false-*.jar</arguments>
diff --git a/fml/mc_versions.cfg b/fml/mc_versions.cfg
index b9df0c229a..3deed1956e 100644
--- a/fml/mc_versions.cfg
+++ b/fml/mc_versions.cfg
@@ -97,6 +97,6 @@ mcp_md5    = a8c68db8736227c9e26cbcb0995e5b71
 [1.6]
 client_md5 = 6a64a2136e3a3fe4d29b0a0df30b25fc
 server_md5 = 7c03305c8bf97a8e8f3cdb147fc90607
-mcp_ver    = 7.98
+mcp_ver    = 8.01
 mcp_url    = 
-mcp_md5    = e2ecc18dc6907dcb63bf5506f9d137d9
+mcp_md5    = 39da81bbb4d73b3f5e2d1f8f5682cdb9
diff --git a/fml/mcp_merge.cfg b/fml/mcp_merge.cfg
index 3966cae0ed..5324af656a 100644
--- a/fml/mcp_merge.cfg
+++ b/fml/mcp_merge.cfg
@@ -1,4 +1,3 @@
-!bjy #net/minecraft/src/CodecMus
 ^org/bouncycastle
 ^org/apache
 ^com/google