1.2.4 vs. 1.2.5 script diffs

dwharris@server:/home/minecraft/TestServer/mods$ diff -r /home/minecraft/ATME_1.2.4/scripts /home/minecraft/ATME_1.2.5/scripts/
diff -r /home/minecraft/ATME_1.2.4/scripts/ae2_expert.zs /home/minecraft/ATME_1.2.5/scripts/ae2_expert.zs
23a24,25
> //=====Quartz glass
> //
24a27,36
> mods.astralsorcery.LightTransmutation.addTransmutation(<environmentaltech:glass_clear>, <appliedenergistics2:quartz_glass>, 50);
>
>
> //=====Grindstone
> //
> recipes.remove(<appliedenergistics2:grindstone>);
> recipes.addShaped(<appliedenergistics2:grindstone>,
> [[<embers:ashenStone>,<ore:gearBronze>,<embers:ashenStone>],
>  [<appliedenergistics2:material>,<embers:ashenStone>,<appliedenergistics2:material>],
>  [<embers:ashenStone>,<appliedenergistics2:material>,<embers:ashenStone>]]);
39a52
>
diff -r /home/minecraft/ATME_1.2.4/scripts/crossroads_expert.zs /home/minecraft/ATME_1.2.5/scripts/crossroads_expert.zs
39,40c39,43
<
<
---
> //=====Guide Book
> //
> recipes.remove(<guideapi:ItemGuideBook:2>);
> recipes.addShapeless(<guideapi:ItemGuideBook:2>,
> [<ic2:ingot:6>,<tconstruct:pattern>]);
47,48c50,51
<  [driedBricks, null, driedBricks],
<  [driedBricks, driedBricks, driedBricks]]);
---
>  [tinIngot, null, tinIngot],
>  [driedBricks, tinIngot, driedBricks]]);
58a62,68
> //=====bronze Gear=====
> //
> recipes.remove(<crossroads:gearBronze>);
> recipes.addShaped(<crossroads:gearBronze>,
> [[null,<ore:ingotBronze>,null],
>  [<ore:ingotBronze>,stoneGear,<ore:ingotBronze>],
>  [null,<ore:ingotBronze>,null]]);
diff -r /home/minecraft/ATME_1.2.4/scripts/Embers_expert_recipes.zs /home/minecraft/ATME_1.2.5/scripts/Embers_expert_recipes.zs
31a32,36
> //=====Disable stamp base
> //
> recipes.remove(<embers:stamperBase>);
> <embers:stamperBase>.addTooltip(format.red("Disabled due to duping bug."));
>
191,195c196,200
< recipes.remove(<embers:stamperBase>);
< recipes.addShaped(<embers:stamperBase>,
< [[copperIngot,null,copperIngot],
<  [caminitePlate,null,caminitePlate],
<  [caminiteBricks,caminiteBricks,caminiteBricks]]);
---
> //recipes.remove(<embers:stamperBase>);
> //recipes.addShaped(<embers:stamperBase>,
> //[[copperIngot,null,copperIngot],
> // [caminitePlate,null,caminitePlate],
> // [caminiteBricks,caminiteBricks,caminiteBricks]]);
diff -r /home/minecraft/ATME_1.2.4/scripts/enderStorage_expert.zs /home/minecraft/ATME_1.2.5/scripts/enderStorage_expert.zs
32c32
<  [BlazeQuartz,BlockOfEnder,BlazeQuartz]]);
---
>  [BlazeQuartz,<mekanism:BasicBlock:7>,BlazeQuartz]]);
41c41
<  [BlazeQuartz,BlockOfEnder,BlazeQuartz]]);
---
>  [BlazeQuartz,<mekanism:BasicBlock:7>,BlazeQuartz]]);
diff -r /home/minecraft/ATME_1.2.4/scripts/flintMod_expert.zs /home/minecraft/ATME_1.2.5/scripts/flintMod_expert.zs
17c17
< //=====Flint Axe=====
---
> //=====Flint tools
19a20,26
> recipes.remove(<flintmod:hoeFlint>);
> recipes.remove(<flintmod:pickaxeFlint>);
> recipes.remove(<flintmod:spadeFlint>);
> recipes.remove(<flintmod:knifeFlint>);
>
> //=====Flint Axe=====
> //
30d36
< recipes.remove(<flintmod:hoeFlint>);
41d46
< recipes.remove(<flintmod:pickaxeFlint>);
52d56
< recipes.remove(<flintmod:spadeFlint>);
63d66
< recipes.remove(<flintmod:knifeFlint>);
70a74,123
>
> //=====Flint Axe=====
> //
> recipes.addShaped(<flintmod:axeFlint>,
> [[flint,flint],
>  [flint,<tconstruct:stone_stick>]]);
>
> recipes.addShaped(<flintmod:axeFlint>,
> [[<immcraft:rock>,<immcraft:rock>],
>  [<immcraft:rock>,<tconstruct:stone_stick>]]);
>
> //=====Flint Hoe=====
> //
> recipes.addShapedMirrored(<flintmod:hoeFlint>,
> [[<tconstruct:stone_stick>,flint],
>  [<tconstruct:stone_stick>,null]]);
>
> recipes.addShapedMirrored(<flintmod:hoeFlint>,
> [[<tconstruct:stone_stick>,<immcraft:rock>],
>  [<tconstruct:stone_stick>,null]]);
>
> //=====Flint Pickaxe=====
> //
> recipes.addShaped(<flintmod:pickaxeFlint>,
> [[flint,flint],
>  [<tconstruct:stone_stick>,flint]]);
>
> recipes.addShapedMirrored(<flintmod:pickaxeFlint>,
> [[<immcraft:rock>,<immcraft:rock>],
>  [<tconstruct:stone_stick>,<immcraft:rock>]]);
>
> //=====Flint Shovel=====
> //
> recipes.addShapedMirrored(<flintmod:spadeFlint>,
> [[null,flint],
>  [null,<tconstruct:stone_stick>]]);
>
> recipes.addShapedMirrored(<flintmod:spadeFlint>,
> [[null,<immcraft:rock>],
>  [null,<tconstruct:stone_stick>]]);
>
> //=====Flint Knife=====
> //
> recipes.addShapedMirrored(<flintmod:knifeFlint>,
> [[null,flint],
>  [<tconstruct:stone_stick>,null]]);
>
> recipes.addShapedMirrored(<flintmod:knifeFlint>,
> [[null,<immcraft:rock>],
>  [<tconstruct:stone_stick>,null]]);
diff -r /home/minecraft/ATME_1.2.4/scripts/forestry_expert.zs /home/minecraft/ATME_1.2.5/scripts/forestry_expert.zs
15,16d14
<
<
79d76
< //mods.forestry.Carpenter.removeRecipe(<forestry:craftingMaterial:7>, <liquid:biomass>);
113,118d109
<
< //OutputStack, InputArray, MoltenGlassInput, CastInput
< mods.forestry.ThermionicFabricator.addCast(<ic2:crafting:1>*4,
< [[null,<rscircuits:resource:1>,null],
<  [<rscircuits:resource:3>,<opencomputers:material:5>,<rscircuits:resource:3>],
<  [LVCoil,<rscircuits:resource:1>,LVCoil]],500);
139c130
<
---
>
\ No newline at end of file
diff -r /home/minecraft/ATME_1.2.4/scripts/IC2_expert.zs /home/minecraft/ATME_1.2.5/scripts/IC2_expert.zs
47c47,52
<
---
> //====Basic Circuit
> //OutputStack, InputArray, MoltenGlassInput, CastInput
> mods.forestry.ThermionicFabricator.addCast(<ic2:crafting:1>,
> [[null,<rscircuits:resource:1>,null],
>  [<rscircuits:resource:3>,<opencomputers:material:5>,<rscircuits:resource:3>],
>  [<immersiveengineering:wirecoil>,<rscircuits:resource:1>,<immersiveengineering:wirecoil>]],500);
diff -r /home/minecraft/ATME_1.2.4/scripts/miscellaneous_expert.zs /home/minecraft/ATME_1.2.5/scripts/miscellaneous_expert.zs
138c138,139
<
---
> furnace.remove(<*>, <mekanism:Dust:2>);
> furnace.remove(<*>, <mekanism:OreBlock>);
293c294,319
<
---
>
> //=====String
> //
> recipes.remove(<minecraft:string>);
>
> recipes.addShapeless(<minecraft:string>*3,
> [<ore:itemFlint>,<ore:wool>]);
>
> recipes.addShaped(<minecraft:string>*3,
> [[<immersiveengineering:material:4>],
>  [<immersiveengineering:material:4>],
>  [<immersiveengineering:material:4>]]);
>
> recipes.addShapeless(<minecraft:string>*2,
> [<ore:cropCotton>,<ore:cropCotton>,<ore:cropCotton>]);
>
>
> recipes.addShapeless(<minecraft:string>*6,
> [<forestry:craftingMaterial:2>,<forestry:craftingMaterial:2>,<forestry:craftingMaterial:2>]);
>
> recipes.addShapeless(<minecraft:string>*6,
> [<xreliquary:mob_ingredient:2>]);
>
> recipes.addShapeless(<minecraft:string>*2,
> [<biomesoplenty:flax_string>,<biomesoplenty:flax_string>]);
>
diff -r /home/minecraft/ATME_1.2.4/scripts/rftools_expert.zs /home/minecraft/ATME_1.2.5/scripts/rftools_expert.zs
141,143c141,143
< [[<rftools:machine_base>],
<  [<ore:circuitBasic>],
<  [<rftools:machine_base>]]);
---
> [[<immersiveengineering:material:2>,<rftools:machine_base>,<immersiveengineering:material:2>],
>  [<immersiveengineering:material:2>,<immersiveengineering:material:9>,<immersiveengineering:material:2>],
>  [<immersiveengineering:material:2>,<rftools:machine_base>,<immersiveengineering:material:2>]]);
147,149c147,149
< [[<rftools:machine_base>],
<  [<ore:circuitBasic>],
<  [<rftools:machine_base>]]);
---
> [[<immersiveengineering:material:2>,<rftools:machine_base>,<immersiveengineering:material:2>],
>  [<immersiveengineering:material:2>,<immersiveengineering:material:9>,<immersiveengineering:material:2>],
>  [<immersiveengineering:material:2>,<rftools:machine_base>,<immersiveengineering:material:2>]]);
diff -r /home/minecraft/ATME_1.2.4/scripts/tconstruct_expert.zs /home/minecraft/ATME_1.2.5/scripts/tconstruct_expert.zs
180,181d179
< mods.tconstruct.Smeltery.removeMelting(<mekanism:OreBlock>); //osmium ore
< mods.tconstruct.Smeltery.removeMelting(<mekanism:Dust:2>); //osmium dust
186d183
<
195a193
> mods.tconstruct.Casting.removeTableRecipe(<mekanism:Ingot:1>);
dwharris@server:/home/minecraft/TestServer/mods$