Christian 78e192e28e Merge remote-tracking branch 'origin/master' into snapshot15 and fix patches ... Conflicts: fml-src-1.4.7-4.7.22.539-master.zip fml-src-1.4.7-4.7.4.520-master.zip fml-src-13w02b-4.99.16.541-snapshot15.zip patches/minecraft/net/minecraft/client/renderer/entity/RenderItem.java.patch patches/minecraft/net/minecraft/entity/item/EntityItem.java.patch patches/minecraft/net/minecraft/entity/item/EntityMinecart.java.patch patches/minecraft/net/minecraft/entity/player/EntityPlayerMP.java.patch patches/minecraft/net/minecraft/item/crafting/RecipeFireworks.java.patch patches/minecraft/net/minecraft/server/gui/GuiStatsComponent.java.patch patches/minecraft/net/minecraft/server/management/PlayerInstance.java.patch patches/minecraft/net/minecraft/server/management/ServerConfigurationManager.java.patch patches/minecraft/net/minecraft/world/World.java.patch patches/minecraft/net/minecraft/world/gen/feature/WorldGenDungeons.java.patch patches/minecraft/net/minecraft/world/gen/structure/ComponentMineshaftCorridor.java.patch patches/minecraft/net/minecraft/world/gen/structure/ComponentScatteredFeatureDesertPyramid.java.patch		2013-01-22 17:28:28 -05:00
..
net/minecraft	Merge remote-tracking branch 'origin/master' into snapshot15 and fix patches	2013-01-22 17:28:28 -05:00