Добавлены все обновления от сообщества, вплоть до #148

2024-09-12 14:28:43 +03:00
parent 98159766c4
commit 487a0e6e16
8841 changed files with 23077 additions and 20175 deletions
--- a/angelspetrochem/graphics/entity/advanced-chemical-plant/advanced-chemical-plant.png
+++ b/angelspetrochem/graphics/entity/advanced-chemical-plant/advanced-chemical-plant.png
--- a/angelspetrochem/graphics/entity/advanced-gas-refinery/advanced-gas-refinery-shadow.png
+++ b/angelspetrochem/graphics/entity/advanced-gas-refinery/advanced-gas-refinery-shadow.png
--- a/angelspetrochem/graphics/entity/advanced-gas-refinery/hr-advanced-gas-refinery-light.png
+++ b/angelspetrochem/graphics/entity/advanced-gas-refinery/hr-advanced-gas-refinery-light.png
--- a/angelspetrochem/graphics/entity/flare-stack/hr-flare-stack-light.png
+++ b/angelspetrochem/graphics/entity/flare-stack/hr-flare-stack-light.png
--- a/angelspetrochem/graphics/entity/fluid-splitter/fluid-splitter-animation.png
+++ b/angelspetrochem/graphics/entity/fluid-splitter/fluid-splitter-animation.png
--- a/angelspetrochem/graphics/entity/fluid-splitter/heavy-pump.png
+++ b/angelspetrochem/graphics/entity/fluid-splitter/heavy-pump.png
--- a/angelspetrochem/graphics/entity/gas-refinery/hr-gas-refinery-light.png
+++ b/angelspetrochem/graphics/entity/gas-refinery/hr-gas-refinery-light.png
--- a/angelspetrochem/graphics/entity/petrochem-oil-tank/hr-petrochem-oil-tank.png
+++ b/angelspetrochem/graphics/entity/petrochem-oil-tank/hr-petrochem-oil-tank.png
--- a/angelspetrochem/graphics/entity/petrochem-oil-tank/petrochem-oil-tank.png
+++ b/angelspetrochem/graphics/entity/petrochem-oil-tank/petrochem-oil-tank.png
--- a/angelspetrochem/graphics/entity/polymerization-chamber/13.png
+++ b/angelspetrochem/graphics/entity/polymerization-chamber/13.png
--- a/angelspetrochem/graphics/entity/polymerization-chamber/22.png
+++ b/angelspetrochem/graphics/entity/polymerization-chamber/22.png
--- a/angelspetrochem/graphics/entity/steam-cracker/steam-cracker.png
+++ b/angelspetrochem/graphics/entity/steam-cracker/steam-cracker.png
--- a/angelspetrochem/graphics/icons/catalyst-metal-blue.png
+++ b/angelspetrochem/graphics/icons/catalyst-metal-blue.png
--- a/angelspetrochem/graphics/icons/catalyst-metal-carrier.png
+++ b/angelspetrochem/graphics/icons/catalyst-metal-carrier.png
--- a/angelspetrochem/graphics/icons/catalyst-metal-green.png
+++ b/angelspetrochem/graphics/icons/catalyst-metal-green.png
--- a/angelspetrochem/graphics/icons/catalyst-metal-red.png
+++ b/angelspetrochem/graphics/icons/catalyst-metal-red.png
--- a/angelspetrochem/graphics/icons/catalyst-metal-yellow.png
+++ b/angelspetrochem/graphics/icons/catalyst-metal-yellow.png
--- a/angelspetrochem/graphics/icons/catalyst-metal.png
+++ b/angelspetrochem/graphics/icons/catalyst-metal.png
--- a/angelspetrochem/graphics/icons/coal-crushed.png
+++ b/angelspetrochem/graphics/icons/coal-crushed.png
--- a/angelspetrochem/graphics/icons/molecules/allyl-chloride.png
+++ b/angelspetrochem/graphics/icons/molecules/allyl-chloride.png
--- a/angelspetrochem/graphics/icons/molecules/ammonium-chloride.png
+++ b/angelspetrochem/graphics/icons/molecules/ammonium-chloride.png
--- a/angelspetrochem/graphics/icons/molecules/butadiene.png
+++ b/angelspetrochem/graphics/icons/molecules/butadiene.png
--- a/angelspetrochem/graphics/icons/molecules/chloramine.png
+++ b/angelspetrochem/graphics/icons/molecules/chloramine.png
--- a/angelspetrochem/graphics/icons/molecules/ethylene.png
+++ b/angelspetrochem/graphics/icons/molecules/ethylene.png
--- a/angelspetrochem/graphics/icons/molecules/formaldehyde.png
+++ b/angelspetrochem/graphics/icons/molecules/formaldehyde.png
--- a/angelspetrochem/graphics/icons/molecules/glycerol.png
+++ b/angelspetrochem/graphics/icons/molecules/glycerol.png
--- a/angelspetrochem/graphics/icons/molecules/heavy-water.png
+++ b/angelspetrochem/graphics/icons/molecules/heavy-water.png
--- a/angelspetrochem/graphics/icons/molecules/hydrofluoric-acid.png
+++ b/angelspetrochem/graphics/icons/molecules/hydrofluoric-acid.png
--- a/angelspetrochem/graphics/icons/molecules/nitric-oxide.png
+++ b/angelspetrochem/graphics/icons/molecules/nitric-oxide.png
--- a/angelspetrochem/graphics/icons/molecules/polyethylene.png
+++ b/angelspetrochem/graphics/icons/molecules/polyethylene.png
--- a/angelspetrochem/graphics/icons/molecules/polyethylene_rotated.png
+++ b/angelspetrochem/graphics/icons/molecules/polyethylene_rotated.png
--- a/angelspetrochem/graphics/icons/molecules/propene.png
+++ b/angelspetrochem/graphics/icons/molecules/propene.png
--- a/angelspetrochem/graphics/icons/ore-fluorite.png
+++ b/angelspetrochem/graphics/icons/ore-fluorite.png
--- a/angelspetrochem/graphics/icons/petrochem-inline-tank.png
+++ b/angelspetrochem/graphics/icons/petrochem-inline-tank.png
--- a/angelspetrochem/graphics/icons/petrochem-oil-tank.png
+++ b/angelspetrochem/graphics/icons/petrochem-oil-tank.png
--- a/angelspetrochem/graphics/icons/powder-coke.png
+++ b/angelspetrochem/graphics/icons/powder-coke.png
--- a/angelspetrochem/graphics/icons/rocket-booster.png
+++ b/angelspetrochem/graphics/icons/rocket-booster.png
--- a/angelspetrochem/graphics/icons/solid-coke.png
+++ b/angelspetrochem/graphics/icons/solid-coke.png
--- a/angelspetrochem/graphics/icons/solid-electrode-used.png
+++ b/angelspetrochem/graphics/icons/solid-electrode-used.png
--- a/angelspetrochem/graphics/icons/solid-electrode.png
+++ b/angelspetrochem/graphics/icons/solid-electrode.png
--- a/angelspetrochem/graphics/icons/solid-oil-residual.png
+++ b/angelspetrochem/graphics/icons/solid-oil-residual.png
--- a/angelspetrochem/graphics/icons/solid-resin.png
+++ b/angelspetrochem/graphics/icons/solid-resin.png
--- a/angelspetrochem/graphics/icons/solid-sodium-hydroxide.png
+++ b/angelspetrochem/graphics/icons/solid-sodium-hydroxide.png
--- a/angelspetrochem/graphics/icons/solid-sodium.png
+++ b/angelspetrochem/graphics/icons/solid-sodium.png
--- a/angelspetrochem/graphics/icons/solid-sulfur.png
+++ b/angelspetrochem/graphics/icons/solid-sulfur.png
--- a/angelspetrochem/graphics/icons/valve-inspector.png
+++ b/angelspetrochem/graphics/icons/valve-inspector.png
--- a/angelspetrochem/graphics/technology/air-filter-tech.png
+++ b/angelspetrochem/graphics/technology/air-filter-tech.png
--- a/angelspetrochem/graphics/technology/booster-tech.png
+++ b/angelspetrochem/graphics/technology/booster-tech.png
--- a/angelspetrochem/graphics/technology/plastic-1-tech.png
+++ b/angelspetrochem/graphics/technology/plastic-1-tech.png
--- a/angelspetrochem/graphics/technology/plastic-2-tech.png
+++ b/angelspetrochem/graphics/technology/plastic-2-tech.png
--- a/angelspetrochem/graphics/technology/plastic-3-tech.png
+++ b/angelspetrochem/graphics/technology/plastic-3-tech.png
--- a/angelspetrochem/prototypes/items/petrochem-solids.lua
+++ b/angelspetrochem/prototypes/items/petrochem-solids.lua
@@ -110,7 +110,7 @@ data:extend({
    subgroup = "petrochem-sodium",
    order = "b[sodium]-a[sodium-carbonate]",
    stack_size = 2000,
-  },                
+  },
  {
    type = "item",
    name = "solid-sodium-hypochlorite",
--- a/angelspetrochem/prototypes/recipes/petrochem-solids.lua
+++ b/angelspetrochem/prototypes/recipes/petrochem-solids.lua
@@ -556,8 +556,7 @@ data:extend({
  {
    type = "recipe",
    name = "solid-trinitrotoluene",
-	category = "advanced-chemistry", -- Aleksei-bird
- --   category = "chemistry", -- Aleksei-bird
+    category = "chemistry",
    subgroup = "petrochem-solids-2",
    energy_required = 2,
    enabled = false,