Advertisement
MigukNamja

ATM:ER 1.0.0 to 1.0.1 scripts diffs

Aug 21st, 2017
192
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 8.14 KB | None | 0 0
  1. server:~/AllTheMods$ diff -r scripts_bak/ scripts
  2. diff -r scripts_bak/bloodMagic_expert.zs scripts/bloodMagic_expert.zs
  3. 32c32
  4. < <abyssalcraft:darkstone>, <bloodmagic:ItemSlate>], 26000);
  5. ---
  6. > <abyssalcraft:darkstone>, <bloodmagic:ItemSlate>], 10000);
  7. 77a78,83
  8. > //=====Dagger Of Sacrifice=====
  9. > //
  10. >
  11. > mods.bloodmagic.Altar.removeRecipe(<bloodmagic:ItemDaggerOfSacrifice>);
  12. > mods.bloodmagic.Altar.addRecipe(<bloodmagic:ItemDaggerOfSacrifice>,2,3000,15,15,[<abyssalcraft:ethaxiumsword>]);
  13. >
  14. 84,87c90,92
  15. < recipes.addShaped(<bloodmagic:BlockBloodRune:1>,
  16. < [[<abyssalcraft:darkstone>,<bloodmagic:ItemSlate>,<abyssalcraft:darkstone>],
  17. < [<bloodmagic:ItemDemonCrystal>,<bloodmagic:BlockBloodRune>,<bloodmagic:ItemDemonCrystal>],
  18. < [<abyssalcraft:darkstone>,<bloodmagic:ItemSlate>,<abyssalcraft:darkstone>]]);
  19. ---
  20. > mods.botania.RuneAltar.addRecipe(<bloodmagic:BlockBloodRune:1>*4, [<bloodmagic:BlockBloodRune>, <abyssalcraft:darkstone>,
  21. > <bloodmagic:BlockBloodRune>, <bloodmagic:ItemDemonCrystal>, <bloodmagic:BlockBloodRune>, <extrautils2:ingredients:15>,
  22. > <bloodmagic:BlockBloodRune>, <bloodmagic:ItemSlate>], 20000);
  23. 91,94c96,98
  24. < recipes.addShaped(<bloodmagic:BlockBloodRune:4>,
  25. < [[<abyssalcraft:abystone>,<bloodmagic:ItemSlate:1>,<abyssalcraft:abystone>],
  26. < [<bloodmagic:ItemDemonCrystal:2>,<bloodmagic:BlockBloodRune>,<bloodmagic:ItemDemonCrystal:2>],
  27. < [<abyssalcraft:abystone>,<bloodmagic:ItemSlate:1>,<abyssalcraft:abystone>]]);
  28. ---
  29. > mods.botania.RuneAltar.addRecipe(<bloodmagic:BlockBloodRune:4>*4, [<bloodmagic:BlockBloodRune>, <abyssalcraft:abystone>,
  30. > <bloodmagic:BlockBloodRune>, <bloodmagic:ItemDemonCrystal:2>, <bloodmagic:BlockBloodRune>, <xreliquary:magicbane>,
  31. > <bloodmagic:BlockBloodRune>, <bloodmagic:ItemSlate:1>], 30000);
  32. 95a100
  33. > //Sacrifice?
  34. 97,100c102,104
  35. < recipes.addShaped(<bloodmagic:BlockBloodRune:3>,
  36. < [[<abyssalcraft:abystone>,<bloodmagic:ItemSlate:1>,<abyssalcraft:abystone>],
  37. < [<bloodmagic:BlockDemonCrystal:3>,<bloodmagic:BlockBloodRune>,<bloodmagic:BlockDemonCrystal:3>],
  38. < [<abyssalcraft:abystone>,<bloodmagic:ItemSlate:1>,<abyssalcraft:abystone>]]);
  39. ---
  40. > mods.botania.RuneAltar.addRecipe(<bloodmagic:BlockBloodRune:3>*4, [<bloodmagic:BlockBloodRune>, <abyssalcraft:abystone>,
  41. > <bloodmagic:BlockBloodRune>, <bloodmagic:BlockDemonCrystal:3>, <bloodmagic:BlockBloodRune>, <bloodmagic:ItemDaggerOfSacrifice>,
  42. > <bloodmagic:BlockBloodRune>, <bloodmagic:ItemSlate:1>], 30000);
  43. 101a106
  44. > //Displacement
  45. 103,106c108,110
  46. < recipes.addShaped(<bloodmagic:BlockBloodRune:5>,
  47. < [[<abyssalcraft:dreadstone>,<xreliquary:emperor_chalice>,<abyssalcraft:dreadstone>],
  48. < [<abyssalcraft:cingot>,<bloodmagic:BlockBloodRune>,<abyssalcraft:cingot>],
  49. < [<abyssalcraft:dreadstone>,<bloodmagic:ItemSlate:2>,<abyssalcraft:dreadstone>]]);
  50. ---
  51. > mods.botania.RuneAltar.addRecipe(<bloodmagic:BlockBloodRune:5>*4, [<bloodmagic:BlockBloodRune>, <abyssalcraft:dreadstone>,
  52. > <bloodmagic:BlockBloodRune>, <abyssalcraft:cingot>, <bloodmagic:BlockBloodRune>, <xreliquary:emperor_chalice>,
  53. > <bloodmagic:BlockBloodRune>, <bloodmagic:ItemSlate:2>], 40000);
  54. 107a112
  55. > //Capacity
  56. 109,112c114,116
  57. < recipes.addShaped(<bloodmagic:BlockBloodRune:6>,
  58. < [[<abyssalcraft:dreadstone>,<botania:openBucket>,<abyssalcraft:dreadstone>],
  59. < [<enderstorage:enderStorage>,<bloodmagic:BlockBloodRune>,<enderstorage:enderStorage>],
  60. < [<abyssalcraft:dreadstone>,<bloodmagic:ItemSlate:2>,<abyssalcraft:dreadstone>]]);
  61. ---
  62. > mods.botania.RuneAltar.addRecipe(<bloodmagic:BlockBloodRune:6>*4, [<bloodmagic:BlockBloodRune>, <abyssalcraft:dreadstone>,
  63. > <bloodmagic:BlockBloodRune>, <enderstorage:enderStorage>, <bloodmagic:BlockBloodRune>, <botania:openBucket>,
  64. > <bloodmagic:BlockBloodRune>, <bloodmagic:ItemSlate:2>], 40000);
  65. 113a118
  66. > //Charging?
  67. 115,118c120,122
  68. < recipes.addShaped(<bloodmagic:BlockBloodRune:10>,
  69. < [[<abyssalcraft:omotholstone>,<xreliquary:mob_ingredient:8>,<abyssalcraft:omotholstone>],
  70. < [<bloodmagic:ItemComponent:11>,<bloodmagic:BlockBloodRune>,<bloodmagic:ItemComponent:11>],
  71. < [<abyssalcraft:omotholstone>,<bloodmagic:ItemSlate:3>,<abyssalcraft:omotholstone>]]);
  72. ---
  73. > mods.botania.RuneAltar.addRecipe(<bloodmagic:BlockBloodRune:10>*4, [<bloodmagic:BlockBloodRune>, <abyssalcraft:omotholstone>,
  74. > <bloodmagic:BlockBloodRune>, <bloodmagic:ItemComponent:11>, <bloodmagic:BlockBloodRune>, <xreliquary:mob_ingredient:8>,
  75. > <bloodmagic:BlockBloodRune>, <bloodmagic:ItemSlate:3>], 50000);
  76. 119a124
  77. > //Acceleration
  78. 121,124c126,128
  79. < recipes.addShaped(<bloodmagic:BlockBloodRune:9>,
  80. < [[<abyssalcraft:omotholstone>,<xreliquary:mob_ingredient:9>,<abyssalcraft:omotholstone>],
  81. < [<xreliquary:kraken_shell>,<bloodmagic:BlockBloodRune:1>,<xreliquary:kraken_shell>],
  82. < [<abyssalcraft:omotholstone>,<bloodmagic:ItemSlate:3>,<abyssalcraft:omotholstone>]]);
  83. ---
  84. > mods.botania.RuneAltar.addRecipe(<bloodmagic:BlockBloodRune:9>*4, [<bloodmagic:BlockBloodRune:1>, <abyssalcraft:omotholstone>,
  85. > <bloodmagic:BlockBloodRune:1>, <xreliquary:mob_ingredient:9>, <bloodmagic:BlockBloodRune:1>, <xreliquary:kraken_shell>,
  86. > <bloodmagic:BlockBloodRune:1>, <bloodmagic:ItemSlate:3>], 50000);
  87. 125a130
  88. > //Augmented Capacity
  89. 127,130c132,134
  90. < recipes.addShaped(<bloodmagic:BlockBloodRune:7>,
  91. < [[<abyssalcraft:omotholstone>,<xreliquary:infernal_chalice>,<abyssalcraft:omotholstone>],
  92. < [<enderstorage:enderStorage:1>,<bloodmagic:BlockBloodRune:6>,<enderstorage:enderStorage:1>],
  93. < [<abyssalcraft:omotholstone>,<bloodmagic:ItemSlate:3>,<abyssalcraft:omotholstone>]]);
  94. ---
  95. > mods.botania.RuneAltar.addRecipe(<bloodmagic:BlockBloodRune:7>*4, [<bloodmagic:BlockBloodRune:6>, <abyssalcraft:omotholstone>,
  96. > <bloodmagic:BlockBloodRune:6>, <xreliquary:infernal_chalice>, <bloodmagic:BlockBloodRune:6>, <enderstorage:enderStorage:1>,
  97. > <bloodmagic:BlockBloodRune:6>, <bloodmagic:ItemSlate:3>], 50000);
  98. 131a136
  99. > //Orb
  100. 133,136c138,140
  101. < recipes.addShaped(<bloodmagic:BlockBloodRune:8>,
  102. < [[<abyssalcraft:omotholstone>,<bloodmagic:ItemBloodOrb:4>,<abyssalcraft:omotholstone>],
  103. < [<xreliquary:witherless_rose>,<bloodmagic:BlockBloodRune>,<xreliquary:witherless_rose>],
  104. < [<abyssalcraft:omotholstone>,<bloodmagic:ItemSlate:3>,<abyssalcraft:omotholstone>]]);
  105. ---
  106. > mods.botania.RuneAltar.addRecipe(<bloodmagic:BlockBloodRune:8>*4, [<bloodmagic:BlockBloodRune>, <abyssalcraft:omotholstone>,
  107. > <bloodmagic:BlockBloodRune>, <bloodmagic:ItemBloodOrb:4>, <bloodmagic:BlockBloodRune>, <xreliquary:witherless_rose>,
  108. > <bloodmagic:BlockBloodRune>, <bloodmagic:ItemSlate:3>], 50000);
  109. 137a142
  110. >
  111. diff -r scripts_bak/Embers_expert_recipes.zs scripts/Embers_expert_recipes.zs
  112. 227c227
  113. < mods.botania.ManaInfusion.addInfusion(<embers:dustAsh>, <darkutils:material>, 500);
  114. ---
  115. > mods.botania.ManaInfusion.addAlchemy(<embers:dustAsh>, <darkutils:material>, 500);
  116. diff -r scripts_bak/enderStorage_expert.zs scripts/enderStorage_expert.zs
  117. 27c27
  118. <
  119. ---
  120. > //
  121. 32a33,37
  122. >
  123. > recipes.addShaped(EnderChest,
  124. > [[BlazeQuartz,Wool,BlazeQuartz],
  125. > [Obsidian,<minecraft:ender_chest>,Obsidian],
  126. > [BlazeQuartz,<botania:corporeaSpark>,BlazeQuartz]]);
  127. 34,37c39,41
  128. < //===EnderTank===
  129. <
  130. <
  131. < recipes.remove(EnderTank);
  132. ---
  133. > //===EnderTank===
  134. > //
  135. > recipes.remove(EnderTank);
  136. 41a46,50
  137. >
  138. > recipes.addShaped(EnderTank,
  139. > [[BlazeQuartz,Wool,BlazeQuartz],
  140. > [Obsidian,<bloodmagic:BlockBloodTank>,Obsidian],
  141. > [BlazeQuartz,<botania:corporeaSpark>,BlazeQuartz]]);
  142. diff -r scripts_bak/miscellaneous_expert.zs scripts/miscellaneous_expert.zs
  143. 325a320,325
  144. > //=====Quest Book=====
  145. > val hqmQuestBook = <hardcorequesting:quest_book>;
  146. > recipes.remove(hqmQuestBook);
  147. > recipes.addShapeless(hqmQuestBook, [<minecraft:dirt>]);
  148. > hqmQuestBook.addTooltip(format.red("DO NOT use the Party feature or your quest progress will be gone and your game will crash!"));
  149. >
  150. diff -r scripts_bak/reliquary_expert.zs scripts/reliquary_expert.zs
  151. 36d35
  152. < //mods.jei.JEI.hide(<xreliquary:alkahestry_tome:1001>);
  153. 49a49
  154. >
  155. 54a55,58
  156. > recipes.addShaped(<xreliquary:emperor_chalice>,
  157. > [[<morebees:emeraldFragment>,<xreliquary:void_tear_empty>,<morebees:emeraldFragment>],
  158. > [<minecraft:gold_ingot>,<botania:rune>,<minecraft:gold_ingot>],
  159. > [<minecraft:gold_nugget>,<minecraft:gold_ingot>,<minecraft:gold_nugget>]]);
  160. 55a60
  161. >
  162. 69,70c74
  163. <
  164. <
  165. ---
  166. >
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement