Conflicts:
	.gitignore
	build.xml
	cleanup_source.py
	client/cpw/mods/fml/client/FMLClientHandler.java
	client/cpw/mods/fml/client/FMLTextureFX.java
	client/cpw/mods/fml/client/GuiModList.java
	client/cpw/mods/fml/client/GuiScrollingList.java
	client/cpw/mods/fml/client/GuiSlotModList.java
	client/cpw/mods/fml/client/ITextureFX.java
	client/cpw/mods/fml/client/SpriteHelper.java
	client/net/minecraft/src/BaseMod.java
	client/net/minecraft/src/EntityRendererProxy.java
	client/net/minecraft/src/FMLRenderAccessLibrary.java
	client/net/minecraft/src/MLProp.java
	client/net/minecraft/src/ModLoader.java
	client/net/minecraft/src/ModTextureAnimation.java
	client/net/minecraft/src/ModTextureStatic.java
	common/cpw/mods/fml/common/FMLCommonHandler.java
	common/cpw/mods/fml/common/FMLModContainer.java
	common/cpw/mods/fml/common/IFMLSidedHandler.java
	common/cpw/mods/fml/common/IWorldGenerator.java
	common/cpw/mods/fml/common/Loader.java
	common/cpw/mods/fml/common/ModContainer.java
	common/cpw/mods/fml/common/ModMetadata.java
	common/cpw/mods/fml/common/ProxyInjector.java
	common/cpw/mods/fml/common/ReflectionHelper.java
	common/cpw/mods/fml/common/TickType.java
	common/cpw/mods/fml/common/modloader/BaseModTicker.java
	common/cpw/mods/fml/common/modloader/ModLoaderHelper.java
	common/cpw/mods/fml/common/modloader/ModLoaderModContainer.java
	common/cpw/mods/fml/common/modloader/ModProperty.java
	common/cpw/mods/fml/common/registry/FMLRegistry.java
	common/cpw/mods/fml/common/registry/IMinecraftRegistry.java
	common/cpw/mods/fml/common/toposort/ModSorter.java
	common/cpw/mods/fml/common/toposort/TopologicalSort.java
	download_fernflower.py
	eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/.gitignore
	eclipse/.metadata/.plugins/org.eclipse.debug.core/.launches/FML-Client.launch
	eclipse/.metadata/.plugins/org.eclipse.debug.core/.launches/FML-Server.launch
	eclipse/.metadata/.plugins/org.eclipse.debug.ui/.gitignore
	eclipse/Clean-Client/.classpath
	eclipse/FML-Client/.classpath
	eclipse/FML-Client/.project
	eclipse/simpletestmod/.classpath
	eclipse/simpletestmod/.settings/org.eclipse.jdt.core.prefs
	eclipse/simpletestmod/src/net/minecraft/src/mod_testMod.java
	generatechangedfilelist.py
	install/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.debug.ui.prefs
	install/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.ide.prefs
	patches/minecraft/net/minecraft/client/Minecraft.java.patch
	patches/minecraft/net/minecraft/src/GuiCreateWorld.java.patch
	patches/minecraft/net/minecraft/src/GuiMainMenu.java.patch
	patches/minecraft/net/minecraft/src/NetClientHandler.java.patch
	patches/minecraft/net/minecraft/src/RenderBlocks.java.patch
	patches/minecraft/net/minecraft/src/RenderEngine.java.patch
	patches/minecraft/net/minecraft/src/TextureCompassFX.java.patch
	patches/minecraft/net/minecraft/src/TextureFlamesFX.java.patch
	patches/minecraft/net/minecraft/src/TextureLavaFX.java.patch
	patches/minecraft/net/minecraft/src/TextureLavaFlowFX.java.patch
	patches/minecraft/net/minecraft/src/TexturePortalFX.java.patch
	patches/minecraft/net/minecraft/src/TextureWatchFX.java.patch
	patches/minecraft/net/minecraft/src/TextureWaterFX.java.patch
	patches/minecraft/net/minecraft/src/TextureWaterFlowFX.java.patch
	patches/minecraft_server/net/minecraft/server/MinecraftServer.java.patch
	patches/minecraft_server/net/minecraft/src/SlotCrafting.java.patch
	patches/minecraft_server/net/minecraft/src/TileEntityFurnace.java.patch
	server/net/minecraft/src/BaseMod.java
	server/net/minecraft/src/ModLoader.java
	server/net/minecraft/src/ServerRegistry.java
	setup.bat
	update_patches.py