Aleksei-bird
/
Factorio-Paranoidal_mod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Activity

Compare commits

base: Aleksei-bird:ecfbebdcdfad3c4216d9596a79d5d4a364667a02
Branches Tags
Aleksei-bird:master
...
compare: Aleksei-bird:3013e73cfa3ba4189e946cbff0962f3f7d5e5db0
Branches Tags
Aleksei-bird:master

2 Commits
ecfbebdcdf ... 3013e73cfa

Author SHA1 Message Date
Aleksei-bird 3013e73cfa Merge branch 'master' of https://git.alex-lab.su/Aleksei-bird/Factorio-Paranoidal_mod 
# Conflicts:
#	angelssmelting/prototypes/override/smelting-override-iron.lua
 2024-11-24 22:02:08 +03:00
Aleksei-bird 9814c3803d Включен рецепт "Пачка железных прутов" 2024-11-24 21:59:48 +03:00
1 changed files with 5 additions and 0 deletions
Show Stats Expand all files Collapse all files

5
angelssmelting/prototypes/override/smelting-override-iron.lua
View File

@ -184,8 +184,13 @@ if angelsmods.trigger.smelting_products["iron"].rod then
--angelsmods.functions.add_flag("iron-stick", "hidden")
OV.disable_recipe({ "iron-stick" }) --disable vanilla's recipe?
else
<<<<<<< HEAD
-- angelsmods.functions.add_flag("angels-rod-iron", "hidden")
-- angelsmods.functions.add_flag("angels-rod-stack-iron", "hidden")
=======
angelsmods.functions.add_flag("angels-rod-iron", "hidden")
angelsmods.functions.add_flag("angels-rod-stack-iron", "hidden")
>>>>>>> ecfbebdcdfad3c4216d9596a79d5d4a364667a02
-- OV.disable_recipe({ "rod-stack-iron-casting", "rod-stack-iron-casting-fast" })
-- OV.disable_recipe({ "angels-rod-iron-plate", "angels-rod-stack-iron-converting" })
end