API tools faq
paste
Guest User

Untitled

a guest
Dec 17th, 2020
120
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Lua 23.59 KB | None | 0 0
raw download clone embed print report
  1. diff -C3 -r apm-power-notnotmelon_1.0.3/data-final-fixes.lua apm-power-notnotmelon_1.0.3-patch/data-final-fixes.lua
  2. *** apm-power-notnotmelon_1.0.3/data-final-fixes.lua    2019-11-10 21:45:34.000000000 +0100
  3. --- apm-power-notnotmelon_1.0.3-patch/data-final-fixes.lua  2020-11-01 11:37:53.727425984 +0100
  4. ***************
  5. *** 10,13 ****
  6.   require('prototypes.integrations.tiles')
  7.   require('prototypes.integrations.final-overwrites')
  8.   require('prototypes.integrations.patches')
  9. ! --require('prototypes.power.map-gen-presets')
  10. \ Kein Zeilenumbruch am Dateiende.
  11. --- 10,13 ----
  12.   require('prototypes.integrations.tiles')
  13.   require('prototypes.integrations.final-overwrites')
  14.   require('prototypes.integrations.patches')
  15. ! --require('prototypes.power.map-gen-presets')
  16. diff -C3 -r apm-power-notnotmelon_1.0.3/info.json apm-power-notnotmelon_1.0.3-patch/info.json
  17. *** apm-power-notnotmelon_1.0.3/info.json   2020-10-15 13:34:35.000000000 +0200
  18. --- apm-power-notnotmelon_1.0.3-patch/info.json 2020-11-01 11:37:00.924615775 +0100
  19. ***************
  20. *** 1,6 ****
  21.   {
  22.           "name": "apm-power-notnotmelon",
  23. !         "version": "1.0.3",
  24.           "title": "Amator Phasma's Coal & Steam",
  25.           "author": "AmatorPhasma",
  26.           "dependencies": [
  27. --- 1,6 ----
  28.   {
  29.           "name": "apm-power-notnotmelon",
  30. !         "version": "1.0.4",
  31.           "title": "Amator Phasma's Coal & Steam",
  32.           "author": "AmatorPhasma",
  33.           "dependencies": [
  34. diff -C3 -r apm-power-notnotmelon_1.0.3/prototypes/integrations/entities.lua apm-power-notnotmelon_1.0.3-patch/prototypes/integrations/entities.lua
  35. *** apm-power-notnotmelon_1.0.3/prototypes/integrations/entities.lua    2020-08-14 17:39:46.000000000 +0200
  36. --- apm-power-notnotmelon_1.0.3-patch/prototypes/integrations/entities.lua  2020-11-01 11:37:53.728425977 +0100
  37. ***************
  38. *** 134,147 ****
  39.   -- ----------------------------------------------------------------------------
  40.   if mods.angelsrefining and apm_power_compat_angel then
  41.     apm.lib.utils.assembler.burner.overhaul('burner-ore-crusher')
  42. -   apm.lib.utils.assembler.set.hidden('burner-ore-crusher')
  43.   end
  44.  
  45.   if mods.angelssmelting and apm_power_compat_angel then
  46. -   apm.lib.utils.assembler.set.hidden('burner-ore-crusher')
  47.     apm.lib.utils.assembler.set.hidden('apm_steelworks_0')
  48.     apm.lib.utils.assembler.set.hidden('apm_steelworks_1')
  49. !  
  50.     apm.lib.utils.assembler.burner.overhaul('blast-furnace', true)
  51.     apm.lib.utils.assembler.burner.overhaul('blast-furnace-2', true)
  52.     apm.lib.utils.assembler.burner.overhaul('blast-furnace-3', true)
  53. --- 134,145 ----
  54.   -- ----------------------------------------------------------------------------
  55.   if mods.angelsrefining and apm_power_compat_angel then
  56.     apm.lib.utils.assembler.burner.overhaul('burner-ore-crusher')
  57.   end
  58.  
  59.   if mods.angelssmelting and apm_power_compat_angel then
  60.     apm.lib.utils.assembler.set.hidden('apm_steelworks_0')
  61.     apm.lib.utils.assembler.set.hidden('apm_steelworks_1')
  62. !
  63.     apm.lib.utils.assembler.burner.overhaul('blast-furnace', true)
  64.     apm.lib.utils.assembler.burner.overhaul('blast-furnace-2', true)
  65.     apm.lib.utils.assembler.burner.overhaul('blast-furnace-3', true)
  66. ***************
  67. *** 196,199 ****
  68.     apm.lib.utils.storage_tank.set.hidden('apm_valve_0')
  69.     apm.lib.utils.storage_tank.set.hidden('apm_valve_1')
  70.     apm.lib.utils.storage_tank.set.hidden('apm_valve_2')
  71. ! end
  72. \ Kein Zeilenumbruch am Dateiende.
  73. --- 194,197 ----
  74.     apm.lib.utils.storage_tank.set.hidden('apm_valve_0')
  75.     apm.lib.utils.storage_tank.set.hidden('apm_valve_1')
  76.     apm.lib.utils.storage_tank.set.hidden('apm_valve_2')
  77. ! end
  78. diff -C3 -r apm-power-notnotmelon_1.0.3/prototypes/integrations/final-overwrites.lua apm-power-notnotmelon_1.0.3-patch/prototypes/integrations/final-overwrites.lua
  79. *** apm-power-notnotmelon_1.0.3/prototypes/integrations/final-overwrites.lua    2020-08-14 17:39:46.000000000 +0200
  80. --- apm-power-notnotmelon_1.0.3-patch/prototypes/integrations/final-overwrites.lua  2020-11-01 11:37:53.728425977 +0100
  81. ***************
  82. *** 98,104 ****
  83.   --
  84.   -- ----------------------------------------------------------------------------
  85.   if mods.angelsrefining and apm_power_compat_angel then
  86. -   apm.lib.utils.item.remove('burner-ore-crusher')
  87.     -- unification of mud items:
  88.     apm.lib.utils.recipe.result.replace_all('solid-mud', 'apm_wet_mud')
  89.     apm.lib.utils.recipe.ingredient.replace_all('solid-mud', 'apm_dry_mud')
  90. --- 98,103 ----
  91. diff -C3 -r apm-power-notnotmelon_1.0.3/prototypes/integrations/fuel.lua apm-power-notnotmelon_1.0.3-patch/prototypes/integrations/fuel.lua
  92. *** apm-power-notnotmelon_1.0.3/prototypes/integrations/fuel.lua    2020-08-14 17:39:46.000000000 +0200
  93. --- apm-power-notnotmelon_1.0.3-patch/prototypes/integrations/fuel.lua  2020-11-01 11:37:53.729425970 +0100
  94. ***************
  95. *** 93,99 ****
  96.             apm.lib.utils.recipe.remove(recipe.name)
  97.         end
  98.     end
  99. !   apm.lib.utils.patch.aai.generate_vehicle_fuel()
  100.   end
  101.  
  102.   -- kingarthur -----------------------------------------------------------------
  103. --- 93,99 ----
  104.             apm.lib.utils.recipe.remove(recipe.name)
  105.         end
  106.     end
  107. ! --    apm.lib.utils.patch.aai.generate_vehicle_fuel()
  108.   end
  109.  
  110.   -- kingarthur -----------------------------------------------------------------
  111. ***************
  112. *** 107,110 ****
  113.     apm.lib.utils.fuel.overhaul(2, 'coal-dust', 0.5, 'apm_generic_ash', 'chemical')
  114.     apm.lib.utils.fuel.overhaul(1, 'raw-fiber', 0.2, 'apm_generic_ash', 'chemical')
  115.     apm.lib.utils.fuel.overhaul(2, 'coal-briquette', 5, 'apm_generic_ash', 'chemical')
  116. ! end
  117. \ Kein Zeilenumbruch am Dateiende.
  118. --- 107,110 ----
  119.     apm.lib.utils.fuel.overhaul(2, 'coal-dust', 0.5, 'apm_generic_ash', 'chemical')
  120.     apm.lib.utils.fuel.overhaul(1, 'raw-fiber', 0.2, 'apm_generic_ash', 'chemical')
  121.     apm.lib.utils.fuel.overhaul(2, 'coal-briquette', 5, 'apm_generic_ash', 'chemical')
  122. ! end
  123. diff -C3 -r apm-power-notnotmelon_1.0.3/prototypes/integrations/recipes.lua apm-power-notnotmelon_1.0.3-patch/prototypes/integrations/recipes.lua
  124. *** apm-power-notnotmelon_1.0.3/prototypes/integrations/recipes.lua 2020-08-14 17:39:46.000000000 +0200
  125. --- apm-power-notnotmelon_1.0.3-patch/prototypes/integrations/recipes.lua   2020-11-01 11:37:53.729425970 +0100
  126. ***************
  127. *** 69,75 ****
  128.     apm.lib.utils.recipe.ingredient.mod('apm_cooling_pond_0', 'steel-plate', 0)
  129.     apm.power.machine_frame_addition('apm_cooling_pond_0', 3, nil, 6, nil, true)
  130.     apm.lib.utils.recipe.ingredient.mod('apm_hybrid_cooling_tower_0', 'steel-plate', 0)
  131. !   apm.power.machine_frame_addition('apm_hybrid_cooling_tower_0', 3, nil, 6, nil, true)   
  132.   end
  133.  
  134.   -- AsphaltRoads ----------------------------------------------------------------
  135. --- 69,75 ----
  136.     apm.lib.utils.recipe.ingredient.mod('apm_cooling_pond_0', 'steel-plate', 0)
  137.     apm.power.machine_frame_addition('apm_cooling_pond_0', 3, nil, 6, nil, true)
  138.     apm.lib.utils.recipe.ingredient.mod('apm_hybrid_cooling_tower_0', 'steel-plate', 0)
  139. !   apm.power.machine_frame_addition('apm_hybrid_cooling_tower_0', 3, nil, 6, nil, true)
  140.   end
  141.  
  142.   -- AsphaltRoads ----------------------------------------------------------------
  143. ***************
  144. *** 320,326 ****
  145.         apm.lib.utils.recipe.ingredient.mod('basic-splitter', 'copper-cable', 0)
  146.         apm.lib.utils.recipe.ingredient.mod('basic-splitter', 'apm_mechanical_relay', 4)
  147.         apm.lib.utils.recipe.ingredient.mod('basic-transport-belt', 'apm_rubber', 1)
  148. -       apm.lib.utils.recipe.ingredient.mod('basic-transport-belt', 'iron-stick', 2)
  149.         apm.lib.utils.recipe.ingredient.mod('basic-transport-belt', 'iron-plate', 0)
  150.         if mods.bobores and mods.bobplates then
  151.             apm.lib.utils.recipe.ingredient.mod('transport-belt', 'tin-plate', 2)
  152. --- 320,325 ----
  153. ***************
  154. *** 373,384 ****
  155.     apm.lib.utils.recipe.ingredient.mod('carbon', 'coal', 0)
  156.     apm.lib.utils.recipe.ingredient.mod('carbon', 'apm_coke', 1, 2)
  157.     apm.lib.utils.recipe.ingredient.mod('offshore-pump', 'basic-circuit-board', 0)
  158. -   apm.lib.utils.recipe.ingredient.mod('rail-signal', 'basic-circuit-board', 1)
  159. -   apm.lib.utils.recipe.ingredient.mod('rail-signal', 'electronic-circuit', 0)
  160. -   apm.lib.utils.recipe.ingredient.mod('rail-chain-signal', 'basic-circuit-board', 1)
  161. -   apm.lib.utils.recipe.ingredient.mod('rail-chain-signal', 'electronic-circuit', 1)
  162.     apm.lib.utils.recipe.ingredient.replace('phenolic-board', 'wood', 'apm_wood_pellets', 2)
  163.     apm.lib.utils.recipe.ingredient.replace('electric-mining-drill', 'basic-circuit-board', 'electronic-circuit')
  164.   end
  165.  
  166.   if mods.bobassembly and apm_power_compat_bob then
  167. --- 372,387 ----
  168.     apm.lib.utils.recipe.ingredient.mod('carbon', 'coal', 0)
  169.     apm.lib.utils.recipe.ingredient.mod('carbon', 'apm_coke', 1, 2)
  170.     apm.lib.utils.recipe.ingredient.mod('offshore-pump', 'basic-circuit-board', 0)
  171.     apm.lib.utils.recipe.ingredient.replace('phenolic-board', 'wood', 'apm_wood_pellets', 2)
  172.     apm.lib.utils.recipe.ingredient.replace('electric-mining-drill', 'basic-circuit-board', 'electronic-circuit')
  173. +
  174. +   if mods.angelsindustries then
  175. +   else
  176. +       apm.lib.utils.recipe.ingredient.mod('rail-signal', 'basic-circuit-board', 1)
  177. +       apm.lib.utils.recipe.ingredient.mod('rail-signal', 'electronic-circuit', 0)
  178. +       apm.lib.utils.recipe.ingredient.mod('rail-chain-signal', 'basic-circuit-board', 1)
  179. +       apm.lib.utils.recipe.ingredient.mod('rail-chain-signal', 'electronic-circuit', 1)
  180. +   end
  181.   end
  182.  
  183.   if mods.bobassembly and apm_power_compat_bob then
  184. ***************
  185. *** 435,444 ****
  186.   end
  187.  
  188.   if not mods.boblogistics and mods.bobelectronics and apm_power_compat_bob then
  189. !   apm.lib.utils.recipe.ingredient.mod('splitter', 'basic-circuit-board', 0)
  190.   elseif mods.boblogistics and mods.bobelectronics and apm_power_compat_bob then
  191.     if apm.lib.utils.setting.get.starup('bobmods-logistics-beltoverhaul') then
  192. !       apm.lib.utils.recipe.ingredient.mod('splitter', 'basic-circuit-board', 5)
  193.     else
  194.         apm.lib.utils.recipe.ingredient.mod('splitter', 'basic-circuit-board', 0)
  195.     end
  196. --- 438,450 ----
  197.   end
  198.  
  199.   if not mods.boblogistics and mods.bobelectronics and apm_power_compat_bob then
  200. !   if mods.angelsindustries then
  201. !   else
  202. !       apm.lib.utils.recipe.ingredient.mod('splitter', 'basic-circuit-board', 0)
  203. !   end
  204.   elseif mods.boblogistics and mods.bobelectronics and apm_power_compat_bob then
  205.     if apm.lib.utils.setting.get.starup('bobmods-logistics-beltoverhaul') then
  206. ! --        apm.lib.utils.recipe.ingredient.mod('splitter', 'basic-circuit-board', 5)
  207.     else
  208.         apm.lib.utils.recipe.ingredient.mod('splitter', 'basic-circuit-board', 0)
  209.     end
  210. ***************
  211. *** 451,458 ****
  212.   end
  213.  
  214.   if mods.bobelectronics and mods.angelsrefining and apm_power_compat_bob then
  215. !   apm.lib.utils.recipe.ingredient.mod('clarifier', 'electronic-circuit', 0)
  216. !   apm.lib.utils.recipe.ingredient.mod('clarifier', 'basic-circuit-board', 4)
  217.   end
  218.  
  219.   if mods.bobmining and apm_power_compat_bob then
  220. --- 457,467 ----
  221.   end
  222.  
  223.   if mods.bobelectronics and mods.angelsrefining and apm_power_compat_bob then
  224. !   if mods.angelsindustries then
  225. !   else
  226. !       apm.lib.utils.recipe.ingredient.mod('clarifier', 'electronic-circuit', 0)
  227. !       apm.lib.utils.recipe.ingredient.mod('clarifier', 'basic-circuit-board', 4)
  228. !   end
  229.   end
  230.  
  231.   if mods.bobmining and apm_power_compat_bob then
  232. ***************
  233. *** 617,623 ****
  234.  
  235.     apm.lib.utils.recipe.remove('pellet-coke')
  236.     apm.lib.utils.recipe.remove('coal-crushed')
  237. !  
  238.     apm.lib.utils.recipe.result.mod('coal-cracking-1', 'solid-coke', 2)
  239.     apm.lib.utils.recipe.result.mod('coal-cracking-2', 'solid-coke', 2)
  240.     apm.lib.utils.recipe.result.mod('condensates-refining', 'solid-coke', 1)
  241. --- 626,632 ----
  242.  
  243.     apm.lib.utils.recipe.remove('pellet-coke')
  244.     apm.lib.utils.recipe.remove('coal-crushed')
  245. !
  246.     apm.lib.utils.recipe.result.mod('coal-cracking-1', 'solid-coke', 2)
  247.     apm.lib.utils.recipe.result.mod('coal-cracking-2', 'solid-coke', 2)
  248.     apm.lib.utils.recipe.result.mod('condensates-refining', 'solid-coke', 1)
  249. ***************
  250. *** 701,707 ****
  251.         recipe.normal.ingredients = {
  252.                 {type="item", name="solid-paper", amount=6}
  253.             }
  254. !       recipe.normal.results = {
  255.                 {type='item', name='apm_wood_board', amount=3}
  256.             }
  257.         recipe.normal.main_product = ''
  258. --- 710,716 ----
  259.         recipe.normal.ingredients = {
  260.                 {type="item", name="solid-paper", amount=6}
  261.             }
  262. !       recipe.normal.results = {
  263.                 {type='item', name='apm_wood_board', amount=3}
  264.             }
  265.         recipe.normal.main_product = ''
  266. diff -C3 -r apm-power-notnotmelon_1.0.3/prototypes/integrations/technologies.lua apm-power-notnotmelon_1.0.3-patch/prototypes/integrations/technologies.lua
  267. *** apm-power-notnotmelon_1.0.3/prototypes/integrations/technologies.lua    2020-08-14 17:39:46.000000000 +0200
  268. --- apm-power-notnotmelon_1.0.3-patch/prototypes/integrations/technologies.lua  2020-11-01 11:37:53.730425962 +0100
  269. ***************
  270. *** 231,237 ****
  271.     apm.lib.utils.recipe.remove('wooden-board')
  272.  
  273.     apm.lib.utils.technology.remove.prerequisites('apm_water_supply-2', 'apm_power_electricity')
  274. !   apm.lib.utils.technology.add.prerequisites('apm_water_supply-2', 'electronics')
  275.  
  276.     apm.lib.utils.technology.force.recipe_for_unlock('apm_power_electricity', 'basic-circuit-board')
  277.     apm.lib.utils.technology.force.recipe_for_unlock('electronics', 'electronic-circuit')
  278. --- 231,237 ----
  279.     apm.lib.utils.recipe.remove('wooden-board')
  280.  
  281.     apm.lib.utils.technology.remove.prerequisites('apm_water_supply-2', 'apm_power_electricity')
  282. !   -- apm.lib.utils.technology.add.prerequisites('apm_water_supply-2', 'electronics')
  283.  
  284.     apm.lib.utils.technology.force.recipe_for_unlock('apm_power_electricity', 'basic-circuit-board')
  285.     apm.lib.utils.technology.force.recipe_for_unlock('electronics', 'electronic-circuit')
  286. ***************
  287. *** 246,253 ****
  288.   end
  289.  
  290.   if mods.bobwarfare and apm_power_compat_bob then
  291. !   apm.lib.utils.technology.remove.prerequisites('radars', 'military')
  292. !   apm.lib.utils.technology.add.prerequisites('radars', 'military-2')
  293.   end
  294.  
  295.   if mods.bobpower and apm_power_compat_bob then
  296. --- 246,253 ----
  297.   end
  298.  
  299.   if mods.bobwarfare and apm_power_compat_bob then
  300. !   --apm.lib.utils.technology.remove.prerequisites('radars', 'military')
  301. !   --apm.lib.utils.technology.add.prerequisites('radars', 'military-2')
  302.   end
  303.  
  304.   if mods.bobpower and apm_power_compat_bob then
  305. ***************
  306. *** 284,290 ****
  307.   -- ----------------------------------------------------------------------------
  308.   if mods.angelsrefining and apm_power_compat_angel then
  309.     apm.lib.utils.technology.add.prerequisites('ore-crushing', 'apm_power_electricity')
  310. !   apm.lib.utils.technology.add.prerequisites('water-treatment', 'apm_power_electricity')
  311.   end
  312.  
  313.   if mods.angelssmelting and apm_power_compat_angel then
  314. --- 284,290 ----
  315.   -- ----------------------------------------------------------------------------
  316.   if mods.angelsrefining and apm_power_compat_angel then
  317.     apm.lib.utils.technology.add.prerequisites('ore-crushing', 'apm_power_electricity')
  318. ! --    apm.lib.utils.technology.add.prerequisites('water-treatment', 'apm_power_electricity')
  319.   end
  320.  
  321.   if mods.angelssmelting and apm_power_compat_angel then
  322. diff -C3 -r apm-power-notnotmelon_1.0.3/prototypes/main/entities/coking_plants.lua apm-power-notnotmelon_1.0.3-patch/prototypes/main/entities/coking_plants.lua
  323. *** apm-power-notnotmelon_1.0.3/prototypes/main/entities/coking_plants.lua  2020-08-14 17:39:46.000000000 +0200
  324. --- apm-power-notnotmelon_1.0.3-patch/prototypes/main/entities/coking_plants.lua    2020-11-01 11:37:53.730425962 +0100
  325. ***************
  326. *** 56,62 ****
  327.   --coking_plant.icon_size = 32
  328.   coking_plant.flags = {"placeable-neutral", "placeable-player", "player-creation"}
  329.   coking_plant.minable = {mining_time = 0.2, result = "apm_coking_plant_0"}
  330. ! coking_plant.crafting_categories = {"apm_coking"}
  331.   coking_plant.crafting_speed = 1
  332.   coking_plant.fast_replaceable_group = "apm_coking_plant"
  333.   coking_plant.next_upgrade = "apm_coking_plant_1"
  334. --- 56,62 ----
  335.   --coking_plant.icon_size = 32
  336.   coking_plant.flags = {"placeable-neutral", "placeable-player", "player-creation"}
  337.   coking_plant.minable = {mining_time = 0.2, result = "apm_coking_plant_0"}
  338. ! coking_plant.crafting_categories = {"apm_coking", "apm_coking_2"}
  339.   coking_plant.crafting_speed = 1
  340.   coking_plant.fast_replaceable_group = "apm_coking_plant"
  341.   coking_plant.next_upgrade = "apm_coking_plant_1"
  342. diff -C3 -r apm-power-notnotmelon_1.0.3/prototypes/main/entities/labs.lua apm-power-notnotmelon_1.0.3-patch/prototypes/main/entities/labs.lua
  343. *** apm-power-notnotmelon_1.0.3/prototypes/main/entities/labs.lua   2020-08-14 17:39:46.000000000 +0200
  344. --- apm-power-notnotmelon_1.0.3-patch/prototypes/main/entities/labs.lua 2020-11-01 11:37:53.730425962 +0100
  345. ***************
  346. *** 135,141 ****
  347.   lab.module_specification = apm.power.constants.modules.specification_1
  348.   lab.allowed_effects = apm.power.constants.modules.allowed_effects_1
  349.   lab.fast_replaceable_group = "lab"
  350. - lab.next_upgrade = "lab"
  351.   lab.inputs = {
  352.         "apm_industrial_science_pack",
  353.         "apm_steam_science_pack",
  354. --- 135,140 ----
  355. ***************
  356. *** 173,176 ****
  357.   lab.off_animation.layers[1].hr_version.frame_count = 1
  358.   lab.off_animation.layers[2].frame_count = 1
  359.   lab.off_animation.layers[2].hr_version.frame_count = 1
  360. ! data:extend({lab})
  361. \ Kein Zeilenumbruch am Dateiende.
  362. --- 172,175 ----
  363.   lab.off_animation.layers[1].hr_version.frame_count = 1
  364.   lab.off_animation.layers[2].frame_count = 1
  365.   lab.off_animation.layers[2].hr_version.frame_count = 1
  366. ! data:extend({lab})
  367. diff -C3 -r apm-power-notnotmelon_1.0.3/prototypes/main/recipes/greenhouse.lua apm-power-notnotmelon_1.0.3-patch/prototypes/main/recipes/greenhouse.lua
  368. *** apm-power-notnotmelon_1.0.3/prototypes/main/recipes/greenhouse.lua  2020-09-22 19:34:50.000000000 +0200
  369. --- apm-power-notnotmelon_1.0.3-patch/prototypes/main/recipes/greenhouse.lua    2020-11-01 11:37:53.731425955 +0100
  370. ***************
  371. *** 22,28 ****
  372.   recipe.normal.ingredients = {
  373.           {type="item", name="wood", amount=4}
  374.       }
  375. ! recipe.normal.results = {
  376.           {type='item', name='apm_tree_seeds', amount=1}
  377.       }
  378.   recipe.normal.main_product = 'apm_tree_seeds'
  379. --- 22,28 ----
  380.   recipe.normal.ingredients = {
  381.           {type="item", name="wood", amount=4}
  382.       }
  383. ! recipe.normal.results = {
  384.           {type='item', name='apm_tree_seeds', amount=1}
  385.       }
  386.   recipe.normal.main_product = 'apm_tree_seeds'
  387. ***************
  388. *** 66,72 ****
  389.           {type="item", name="apm_wet_mud", amount=5},
  390.           {type="item", name='apm_generic_ash', amount=10}
  391.       }
  392. ! recipe.normal.results = {
  393.           {type='item', name='apm_fertiliser_1', amount=1}
  394.       }
  395.   recipe.normal.main_product = ''
  396. --- 66,72 ----
  397.           {type="item", name="apm_wet_mud", amount=5},
  398.           {type="item", name='apm_generic_ash', amount=10}
  399.       }
  400. ! recipe.normal.results = {
  401.           {type='item', name='apm_fertiliser_1', amount=1}
  402.       }
  403.   recipe.normal.main_product = ''
  404. ***************
  405. *** 106,112 ****
  406.           {type='item', name='apm_fertiliser_1', amount=1},
  407.           {type='item', name='apm_ammonium_sulfate', amount=5}
  408.       }
  409. ! recipe.normal.results = {
  410.           {type='item', name='apm_fertiliser_2', amount=1}
  411.       }
  412.   recipe.normal.main_product = ''
  413. --- 106,112 ----
  414.           {type='item', name='apm_fertiliser_1', amount=1},
  415.           {type='item', name='apm_ammonium_sulfate', amount=5}
  416.       }
  417. ! recipe.normal.results = {
  418.           {type='item', name='apm_fertiliser_2', amount=1}
  419.       }
  420.   recipe.normal.main_product = ''
  421. ***************
  422. *** 191,197 ****
  423.           {type="item", name="apm_fertiliser_1", amount=3},
  424.           {type="fluid", name="water", amount=200}
  425.       }
  426. ! recipe.normal.results = {
  427.           {type='item', name='wood', amount=60}
  428.       }
  429.   recipe.normal.main_product = ''
  430. --- 191,197 ----
  431.           {type="item", name="apm_fertiliser_1", amount=3},
  432.           {type="fluid", name="water", amount=200}
  433.       }
  434. ! recipe.normal.results = {
  435.           {type='item', name='wood', amount=60}
  436.       }
  437.   recipe.normal.main_product = ''
  438. ***************
  439. *** 231,237 ****
  440.           {type="item", name="apm_fertiliser_2", amount=4},
  441.           {type="fluid", name="water", amount=200}
  442.       }
  443. ! recipe.normal.results = {
  444.           {type='item', name='wood', amount=75}
  445.       }
  446.   recipe.normal.main_product = ''
  447. --- 231,237 ----
  448.           {type="item", name="apm_fertiliser_2", amount=4},
  449.           {type="fluid", name="water", amount=200}
  450.       }
  451. ! recipe.normal.results = {
  452.           {type='item', name='wood', amount=75}
  453.       }
  454.   recipe.normal.main_product = ''
  455. Nur in apm-power-notnotmelon_1.0.3-patch/prototypes/main/recipes: greenhouse.lua.orig.
  456. diff -C3 -r apm-power-notnotmelon_1.0.3/prototypes/main/recipes-overwrites.lua apm-power-notnotmelon_1.0.3-patch/prototypes/main/recipes-overwrites.lua
  457. *** apm-power-notnotmelon_1.0.3/prototypes/main/recipes-overwrites.lua  2020-08-14 17:39:48.000000000 +0200
  458. --- apm-power-notnotmelon_1.0.3-patch/prototypes/main/recipes-overwrites.lua    2020-11-01 11:37:53.731425955 +0100
  459. ***************
  460. *** 52,58 ****
  461.   apm.lib.utils.recipe.ingredient.mod('burner-inserter', 'iron-gear-wheel', 0)
  462.   apm.lib.utils.recipe.ingredient.mod('burner-inserter', 'iron-plate', 1)
  463.   apm.lib.utils.recipe.ingredient.mod('burner-inserter', 'apm_simple_engine', 1)
  464. - apm.lib.utils.recipe.ingredient.mod('burner-inserter', 'iron-stick', 2)
  465.  
  466.   apm.lib.utils.recipe.ingredient.mod('burner-mining-drill', 'iron-gear-wheel', 0)
  467.   apm.lib.utils.recipe.ingredient.mod('burner-mining-drill', 'apm_simple_engine', 1)
  468. --- 52,57 ----
  469. ***************
  470. *** 62,68 ****
  471.  
  472.   apm.lib.utils.recipe.ingredient.mod('fast-inserter', 'apm_gearing', 2)
  473.  
  474. - apm.lib.utils.recipe.ingredient.mod('long-handed-inserter', 'iron-stick', 0)
  475.   apm.lib.utils.recipe.ingredient.mod('long-handed-inserter', 'iron-plate', 2)
  476.   apm.lib.utils.recipe.ingredient.mod('long-handed-inserter', 'electronic-circuit', 1)
  477.   apm.lib.utils.recipe.ingredient.replace('long-handed-inserter', 'iron-gear-wheel', 'apm_gearing', 2)
  478. --- 61,66 ----
  479. ***************
  480. *** 74,80 ****
  481.   apm.lib.utils.recipe.ingredient.mod('filter-inserter', 'apm_gearing', 1)
  482.  
  483.   apm.lib.utils.recipe.ingredient.mod('transport-belt', 'apm_rubber', 1)
  484. - apm.lib.utils.recipe.ingredient.mod('transport-belt', 'iron-stick', 2)
  485.   apm.lib.utils.recipe.ingredient.mod('transport-belt', 'iron-plate', 0)
  486.  
  487.   apm.lib.utils.recipe.ingredient.mod('offshore-pump', 'apm_steam_relay', 2)
  488. --- 72,77 ----
  489. diff -C3 -r apm-power-notnotmelon_1.0.3/prototypes/main/technologies-overwrites.lua apm-power-notnotmelon_1.0.3-patch/prototypes/main/technologies-overwrites.lua
  490. *** apm-power-notnotmelon_1.0.3/prototypes/main/technologies-overwrites.lua 2020-08-14 17:39:48.000000000 +0200
  491. --- apm-power-notnotmelon_1.0.3-patch/prototypes/main/technologies-overwrites.lua   2020-11-01 11:37:53.732425948 +0100
  492. ***************
  493. *** 79,85 ****
  494.   --apm.lib.utils.technology.add.science_pack('logistic-science-pack', 'apm_industrial_science_pack', 1)
  495.   apm.lib.utils.technology.force.recipe_for_unlock('logistic-science-pack', 'lab')
  496.  
  497. ! apm.lib.utils.technology.force.recipe_for_unlock('military-2', 'radar')
  498.  
  499.   apm.lib.utils.technology.add.prerequisites('heavy-armor', 'apm_puddling_furnace_0')
  500.   apm.lib.utils.technology.remove.prerequisites('heavy-armor', 'steel-processing')
  501. --- 79,85 ----
  502.   --apm.lib.utils.technology.add.science_pack('logistic-science-pack', 'apm_industrial_science_pack', 1)
  503.   apm.lib.utils.technology.force.recipe_for_unlock('logistic-science-pack', 'lab')
  504.  
  505. ! apm.lib.utils.technology.force.recipe_for_unlock('military', 'radar')
  506.  
  507.   apm.lib.utils.technology.add.prerequisites('heavy-armor', 'apm_puddling_furnace_0')
  508.   apm.lib.utils.technology.remove.prerequisites('heavy-armor', 'steel-processing')
Advertisement
Add Comment
Please, Sign In to add comment
Public Pastes
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!