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
..
classloading	Moved logo to new client folder	2012-08-04 22:45:31 -07:00
common	Merge remote-tracking branch 'origin/master' into snapshot15 and fix patches	2013-01-22 17:28:28 -05:00
event	Added event hooks to control to allow mod control of mob spawning. PR: #337	2013-01-01 22:20:30 -08:00
liquids	Some javadoc fixes	2013-01-21 21:57:48 -05:00
oredict	Some small code cleanups.	2013-01-01 20:57:45 -08:00
transformers	Fix noisy exception logging	2012-12-30 21:30:48 -05:00