Advertisement
MigukNamja

1.2.4 vs. 1.2.5 script diffs

Jul 24th, 2017
842
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 7.99 KB | None | 0 0
  1. dwharris@server:/home/minecraft/TestServer/mods$ diff -r /home/minecraft/ATME_1.2.4/scripts /home/minecraft/ATME_1.2.5/scripts/
  2. diff -r /home/minecraft/ATME_1.2.4/scripts/ae2_expert.zs /home/minecraft/ATME_1.2.5/scripts/ae2_expert.zs
  3. 23a24,25
  4. > //=====Quartz glass
  5. > //
  6. 24a27,36
  7. > mods.astralsorcery.LightTransmutation.addTransmutation(<environmentaltech:glass_clear>, <appliedenergistics2:quartz_glass>, 50);
  8. >
  9. >
  10. > //=====Grindstone
  11. > //
  12. > recipes.remove(<appliedenergistics2:grindstone>);
  13. > recipes.addShaped(<appliedenergistics2:grindstone>,
  14. > [[<embers:ashenStone>,<ore:gearBronze>,<embers:ashenStone>],
  15. > [<appliedenergistics2:material>,<embers:ashenStone>,<appliedenergistics2:material>],
  16. > [<embers:ashenStone>,<appliedenergistics2:material>,<embers:ashenStone>]]);
  17. 39a52
  18. >
  19. diff -r /home/minecraft/ATME_1.2.4/scripts/crossroads_expert.zs /home/minecraft/ATME_1.2.5/scripts/crossroads_expert.zs
  20. 39,40c39,43
  21. <
  22. <
  23. ---
  24. > //=====Guide Book
  25. > //
  26. > recipes.remove(<guideapi:ItemGuideBook:2>);
  27. > recipes.addShapeless(<guideapi:ItemGuideBook:2>,
  28. > [<ic2:ingot:6>,<tconstruct:pattern>]);
  29. 47,48c50,51
  30. < [driedBricks, null, driedBricks],
  31. < [driedBricks, driedBricks, driedBricks]]);
  32. ---
  33. > [tinIngot, null, tinIngot],
  34. > [driedBricks, tinIngot, driedBricks]]);
  35. 58a62,68
  36. > //=====bronze Gear=====
  37. > //
  38. > recipes.remove(<crossroads:gearBronze>);
  39. > recipes.addShaped(<crossroads:gearBronze>,
  40. > [[null,<ore:ingotBronze>,null],
  41. > [<ore:ingotBronze>,stoneGear,<ore:ingotBronze>],
  42. > [null,<ore:ingotBronze>,null]]);
  43. diff -r /home/minecraft/ATME_1.2.4/scripts/Embers_expert_recipes.zs /home/minecraft/ATME_1.2.5/scripts/Embers_expert_recipes.zs
  44. 31a32,36
  45. > //=====Disable stamp base
  46. > //
  47. > recipes.remove(<embers:stamperBase>);
  48. > <embers:stamperBase>.addTooltip(format.red("Disabled due to duping bug."));
  49. >
  50. 191,195c196,200
  51. < recipes.remove(<embers:stamperBase>);
  52. < recipes.addShaped(<embers:stamperBase>,
  53. < [[copperIngot,null,copperIngot],
  54. < [caminitePlate,null,caminitePlate],
  55. < [caminiteBricks,caminiteBricks,caminiteBricks]]);
  56. ---
  57. > //recipes.remove(<embers:stamperBase>);
  58. > //recipes.addShaped(<embers:stamperBase>,
  59. > //[[copperIngot,null,copperIngot],
  60. > // [caminitePlate,null,caminitePlate],
  61. > // [caminiteBricks,caminiteBricks,caminiteBricks]]);
  62. diff -r /home/minecraft/ATME_1.2.4/scripts/enderStorage_expert.zs /home/minecraft/ATME_1.2.5/scripts/enderStorage_expert.zs
  63. 32c32
  64. < [BlazeQuartz,BlockOfEnder,BlazeQuartz]]);
  65. ---
  66. > [BlazeQuartz,<mekanism:BasicBlock:7>,BlazeQuartz]]);
  67. 41c41
  68. < [BlazeQuartz,BlockOfEnder,BlazeQuartz]]);
  69. ---
  70. > [BlazeQuartz,<mekanism:BasicBlock:7>,BlazeQuartz]]);
  71. diff -r /home/minecraft/ATME_1.2.4/scripts/flintMod_expert.zs /home/minecraft/ATME_1.2.5/scripts/flintMod_expert.zs
  72. 17c17
  73. < //=====Flint Axe=====
  74. ---
  75. > //=====Flint tools
  76. 19a20,26
  77. > recipes.remove(<flintmod:hoeFlint>);
  78. > recipes.remove(<flintmod:pickaxeFlint>);
  79. > recipes.remove(<flintmod:spadeFlint>);
  80. > recipes.remove(<flintmod:knifeFlint>);
  81. >
  82. > //=====Flint Axe=====
  83. > //
  84. 30d36
  85. < recipes.remove(<flintmod:hoeFlint>);
  86. 41d46
  87. < recipes.remove(<flintmod:pickaxeFlint>);
  88. 52d56
  89. < recipes.remove(<flintmod:spadeFlint>);
  90. 63d66
  91. < recipes.remove(<flintmod:knifeFlint>);
  92. 70a74,123
  93. >
  94. > //=====Flint Axe=====
  95. > //
  96. > recipes.addShaped(<flintmod:axeFlint>,
  97. > [[flint,flint],
  98. > [flint,<tconstruct:stone_stick>]]);
  99. >
  100. > recipes.addShaped(<flintmod:axeFlint>,
  101. > [[<immcraft:rock>,<immcraft:rock>],
  102. > [<immcraft:rock>,<tconstruct:stone_stick>]]);
  103. >
  104. > //=====Flint Hoe=====
  105. > //
  106. > recipes.addShapedMirrored(<flintmod:hoeFlint>,
  107. > [[<tconstruct:stone_stick>,flint],
  108. > [<tconstruct:stone_stick>,null]]);
  109. >
  110. > recipes.addShapedMirrored(<flintmod:hoeFlint>,
  111. > [[<tconstruct:stone_stick>,<immcraft:rock>],
  112. > [<tconstruct:stone_stick>,null]]);
  113. >
  114. > //=====Flint Pickaxe=====
  115. > //
  116. > recipes.addShaped(<flintmod:pickaxeFlint>,
  117. > [[flint,flint],
  118. > [<tconstruct:stone_stick>,flint]]);
  119. >
  120. > recipes.addShapedMirrored(<flintmod:pickaxeFlint>,
  121. > [[<immcraft:rock>,<immcraft:rock>],
  122. > [<tconstruct:stone_stick>,<immcraft:rock>]]);
  123. >
  124. > //=====Flint Shovel=====
  125. > //
  126. > recipes.addShapedMirrored(<flintmod:spadeFlint>,
  127. > [[null,flint],
  128. > [null,<tconstruct:stone_stick>]]);
  129. >
  130. > recipes.addShapedMirrored(<flintmod:spadeFlint>,
  131. > [[null,<immcraft:rock>],
  132. > [null,<tconstruct:stone_stick>]]);
  133. >
  134. > //=====Flint Knife=====
  135. > //
  136. > recipes.addShapedMirrored(<flintmod:knifeFlint>,
  137. > [[null,flint],
  138. > [<tconstruct:stone_stick>,null]]);
  139. >
  140. > recipes.addShapedMirrored(<flintmod:knifeFlint>,
  141. > [[null,<immcraft:rock>],
  142. > [<tconstruct:stone_stick>,null]]);
  143. diff -r /home/minecraft/ATME_1.2.4/scripts/forestry_expert.zs /home/minecraft/ATME_1.2.5/scripts/forestry_expert.zs
  144. 15,16d14
  145. <
  146. <
  147. 79d76
  148. < //mods.forestry.Carpenter.removeRecipe(<forestry:craftingMaterial:7>, <liquid:biomass>);
  149. 113,118d109
  150. <
  151. < //OutputStack, InputArray, MoltenGlassInput, CastInput
  152. < mods.forestry.ThermionicFabricator.addCast(<ic2:crafting:1>*4,
  153. < [[null,<rscircuits:resource:1>,null],
  154. < [<rscircuits:resource:3>,<opencomputers:material:5>,<rscircuits:resource:3>],
  155. < [LVCoil,<rscircuits:resource:1>,LVCoil]],500);
  156. 139c130
  157. <
  158. ---
  159. >
  160. \ No newline at end of file
  161. diff -r /home/minecraft/ATME_1.2.4/scripts/IC2_expert.zs /home/minecraft/ATME_1.2.5/scripts/IC2_expert.zs
  162. 47c47,52
  163. <
  164. ---
  165. > //====Basic Circuit
  166. > //OutputStack, InputArray, MoltenGlassInput, CastInput
  167. > mods.forestry.ThermionicFabricator.addCast(<ic2:crafting:1>,
  168. > [[null,<rscircuits:resource:1>,null],
  169. > [<rscircuits:resource:3>,<opencomputers:material:5>,<rscircuits:resource:3>],
  170. > [<immersiveengineering:wirecoil>,<rscircuits:resource:1>,<immersiveengineering:wirecoil>]],500);
  171. diff -r /home/minecraft/ATME_1.2.4/scripts/miscellaneous_expert.zs /home/minecraft/ATME_1.2.5/scripts/miscellaneous_expert.zs
  172. 138c138,139
  173. <
  174. ---
  175. > furnace.remove(<*>, <mekanism:Dust:2>);
  176. > furnace.remove(<*>, <mekanism:OreBlock>);
  177. 293c294,319
  178. <
  179. ---
  180. >
  181. > //=====String
  182. > //
  183. > recipes.remove(<minecraft:string>);
  184. >
  185. > recipes.addShapeless(<minecraft:string>*3,
  186. > [<ore:itemFlint>,<ore:wool>]);
  187. >
  188. > recipes.addShaped(<minecraft:string>*3,
  189. > [[<immersiveengineering:material:4>],
  190. > [<immersiveengineering:material:4>],
  191. > [<immersiveengineering:material:4>]]);
  192. >
  193. > recipes.addShapeless(<minecraft:string>*2,
  194. > [<ore:cropCotton>,<ore:cropCotton>,<ore:cropCotton>]);
  195. >
  196. >
  197. > recipes.addShapeless(<minecraft:string>*6,
  198. > [<forestry:craftingMaterial:2>,<forestry:craftingMaterial:2>,<forestry:craftingMaterial:2>]);
  199. >
  200. > recipes.addShapeless(<minecraft:string>*6,
  201. > [<xreliquary:mob_ingredient:2>]);
  202. >
  203. > recipes.addShapeless(<minecraft:string>*2,
  204. > [<biomesoplenty:flax_string>,<biomesoplenty:flax_string>]);
  205. >
  206. diff -r /home/minecraft/ATME_1.2.4/scripts/rftools_expert.zs /home/minecraft/ATME_1.2.5/scripts/rftools_expert.zs
  207. 141,143c141,143
  208. < [[<rftools:machine_base>],
  209. < [<ore:circuitBasic>],
  210. < [<rftools:machine_base>]]);
  211. ---
  212. > [[<immersiveengineering:material:2>,<rftools:machine_base>,<immersiveengineering:material:2>],
  213. > [<immersiveengineering:material:2>,<immersiveengineering:material:9>,<immersiveengineering:material:2>],
  214. > [<immersiveengineering:material:2>,<rftools:machine_base>,<immersiveengineering:material:2>]]);
  215. 147,149c147,149
  216. < [[<rftools:machine_base>],
  217. < [<ore:circuitBasic>],
  218. < [<rftools:machine_base>]]);
  219. ---
  220. > [[<immersiveengineering:material:2>,<rftools:machine_base>,<immersiveengineering:material:2>],
  221. > [<immersiveengineering:material:2>,<immersiveengineering:material:9>,<immersiveengineering:material:2>],
  222. > [<immersiveengineering:material:2>,<rftools:machine_base>,<immersiveengineering:material:2>]]);
  223. diff -r /home/minecraft/ATME_1.2.4/scripts/tconstruct_expert.zs /home/minecraft/ATME_1.2.5/scripts/tconstruct_expert.zs
  224. 180,181d179
  225. < mods.tconstruct.Smeltery.removeMelting(<mekanism:OreBlock>); //osmium ore
  226. < mods.tconstruct.Smeltery.removeMelting(<mekanism:Dust:2>); //osmium dust
  227. 186d183
  228. <
  229. 195a193
  230. > mods.tconstruct.Casting.removeTableRecipe(<mekanism:Ingot:1>);
  231. dwharris@server:/home/minecraft/TestServer/mods$
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement