Christian 082ee1a5ea Merge branch 'master' into snapshot15 ... Conflicts: fml-src-1.4.7-4.7.22.539-master.zip fml-src-1.4.7-4.7.35.556-master.zip fml-src-13w02b-4.99.16.541-snapshot15.zip		2013-02-27 23:19:11 -05:00
..
ContainerFurnace.java.patch	Update patche for jad-style names.	2013-01-11 23:46:08 -08:00
Slot.java.patch	First patches updae to 1.5, Many rendeirng related changes, most notibly removed Item/Block's getTextureFile() functions.	2013-01-12 05:12:10 -08:00
SlotArmor.java.patch	Merge branch 'master' into snapshot15	2013-02-27 23:19:11 -05:00
SlotBrewingStandIngredient.java.patch	ItemStack sensitive versions of Item.getPotionEffect and Item.isPotionIngredient Closes #321	2013-02-23 12:02:36 -08:00
SlotCrafting.java.patch	First patches updae to 1.5, Many rendeirng related changes, most notibly removed Item/Block's getTextureFile() functions.	2013-01-12 05:12:10 -08:00
SlotFurnace.java.patch	Update patche for jad-style names.	2013-01-11 23:46:08 -08:00