diff --git a/forge/fml-src-2.1.24.92.zip b/forge/fml-src-2.1.28.95.zip similarity index 81% rename from forge/fml-src-2.1.24.92.zip rename to forge/fml-src-2.1.28.95.zip index 653d0b7514..db19db6a70 100644 Binary files a/forge/fml-src-2.1.24.92.zip and b/forge/fml-src-2.1.28.95.zip differ diff --git a/forge/patches/minecraft/net/minecraft/src/SlotCrafting.java.patch b/forge/patches/minecraft/net/minecraft/src/SlotCrafting.java.patch index 98dcc67fc0..ee3ba70d3d 100644 --- a/forge/patches/minecraft/net/minecraft/src/SlotCrafting.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/SlotCrafting.java.patch @@ -1,7 +1,8 @@ --- ../src_base/minecraft/net/minecraft/src/SlotCrafting.java 0000-00-00 00:00:00.000000000 -0000 +++ ../src_work/minecraft/net/minecraft/src/SlotCrafting.java 0000-00-00 00:00:00.000000000 -0000 -@@ -1,5 +1,8 @@ - package net.minecraft.src; +@@ -2,6 +2,9 @@ + + import cpw.mods.fml.client.FMLClientHandler; +import cpw.mods.fml.client.FMLClientHandler; +import net.minecraft.src.forge.ForgeHooks; @@ -9,13 +10,11 @@ public class SlotCrafting extends Slot { /** The craft matrix inventory linked to this result slot. */ -@@ -96,6 +99,9 @@ - */ +@@ -99,6 +102,7 @@ public void onPickupFromSlot(ItemStack par1ItemStack) { -+ FMLClientHandler.instance().onItemCrafted(thePlayer, par1ItemStack, craftMatrix); + FMLClientHandler.instance().onItemCrafted(thePlayer, par1ItemStack, inventory); + ForgeHooks.onTakenFromCrafting(thePlayer, par1ItemStack, craftMatrix); -+ this.func_48434_c(par1ItemStack); for (int var2 = 0; var2 < this.craftMatrix.getSizeInventory(); ++var2) diff --git a/forge/release.py b/forge/release.py index f6bd3f1fbe..3641902863 100644 --- a/forge/release.py +++ b/forge/release.py @@ -79,7 +79,7 @@ def main(): zip_add('fml', 'fml') zip_add('conf', 'conf') zip_add('install/install.cmd') - zip_add_perm('install/install.sh', 0777) + zip_add('install/install.sh') zip_add('install/README-MinecraftForge.txt') zip_add('install/install.py') zip_add('forge.py') @@ -120,8 +120,8 @@ def zip_add_perm(file, perm, key=None): #zip.write(file, key) with open(file, 'r') as fh: data = fh.read() - info = zipfile.ZipInfo(name) - info.external_attr = perm << 16L + info = zipfile.ZipInfo(key) + info.external_attr = 0777 << 16L zip.writestr(info, data) def zip_start(name, base=None):