Merge pull request #22 from JohnTheCoolingFan/dev

1.2.0 Update
JohnTheCoolingFan · Jun 16, 2020 · 0482bd0 · 0482bd0
2 parents cd86165 + 48e1011
commit 0482bd0
Show file tree

Hide file tree

Showing 274 changed files with 272 additions and 108 deletions.
diff --git a/changelog.txt b/changelog.txt
@@ -1,8 +1,22 @@
 ---------------------------------------------------------------------------------------------------
+Version: 1.2.0
+Date: 16.06.2020
+  Major features:
+    - Added Nuclear and Plutonium filter inserters
+  Minor features:
+    - Renamed coal piece to coal dust
+    - Changed unlocks order in automation techs
+  Balancing:
+    - Added Fast inserter to Nuclear inserter recipe
+  Graphics:
+    - Updated hardened electric mining drill graphics
+    - Updated icons (except modules)
+    - Massive PNG optimisation
+---------------------------------------------------------------------------------------------------
 Version: 1.1.2
 Date: 09.04.2020
   Minor Features:
-    - Added Polish locale by Gutu [TSM]#8528
+    - Added Polish locale by Guru [TSM]#8528
 ---------------------------------------------------------------------------------------------------
 Version: 1.1.1
 Date: 08.04.2020

diff --git a/data.lua b/data.lua
@@ -5,5 +5,6 @@ require("prototypes.item.item")
 require("prototypes.recipe.recipe")
 require("prototypes.technology.technology")
 
--- TODO: remake (*AGAIN?*) icons for 64 size
--- TODO: Vanilla loaders HD support
+-- TODO: **URGENT** Fix #21
+-- TODO: modules and beacons starting from 0.18.32
+-- TODO: idea. Quantum tier (how original...)
diff --git a/graphics/entity/compressor/compressor-A-light.png b/graphics/entity/compressor/compressor-A-light.png
diff --git a/graphics/entity/compressor/compressor-B-light.png b/graphics/entity/compressor/compressor-B-light.png
diff --git a/graphics/entity/compressor/compressor-C-light.png b/graphics/entity/compressor/compressor-C-light.png
diff --git a/graphics/entity/compressor/hr-compressor-A-light.png b/graphics/entity/compressor/hr-compressor-A-light.png
diff --git a/graphics/entity/compressor/hr-compressor-B-light.png b/graphics/entity/compressor/hr-compressor-B-light.png
diff --git a/graphics/entity/compressor/hr-compressor-C-light.png b/graphics/entity/compressor/hr-compressor-C-light.png
diff --git a/graphics/entity/hardened-electric-furnace/hardened-electric-furnace.png b/graphics/entity/hardened-electric-furnace/hardened-electric-furnace.png
diff --git a/graphics/entity/hardened-electric-furnace/hr-hardened-electric-furnace.png b/graphics/entity/hardened-electric-furnace/hr-hardened-electric-furnace.png
diff --git a/...ntity/hardened-electric-mining-drill/hardened-electric-mining-drill-E-front.png b/...ntity/hardened-electric-mining-drill/hardened-electric-mining-drill-E-front.png
diff --git a/...ntity/hardened-electric-mining-drill/hardened-electric-mining-drill-E-patch.png b/...ntity/hardened-electric-mining-drill/hardened-electric-mining-drill-E-patch.png
diff --git a/...y/hardened-electric-mining-drill/hardened-electric-mining-drill-E-wet-front.png b/...y/hardened-electric-mining-drill/hardened-electric-mining-drill-E-wet-front.png
diff --git a/.../entity/hardened-electric-mining-drill/hardened-electric-mining-drill-E-wet.png b/.../entity/hardened-electric-mining-drill/hardened-electric-mining-drill-E-wet.png
diff --git a/...hics/entity/hardened-electric-mining-drill/hardened-electric-mining-drill-E.png b/...hics/entity/hardened-electric-mining-drill/hardened-electric-mining-drill-E.png
diff --git a/...ntity/hardened-electric-mining-drill/hardened-electric-mining-drill-N-patch.png b/...ntity/hardened-electric-mining-drill/hardened-electric-mining-drill-N-patch.png
diff --git a/...y/hardened-electric-mining-drill/hardened-electric-mining-drill-N-wet-front.png b/...y/hardened-electric-mining-drill/hardened-electric-mining-drill-N-wet-front.png
diff --git a/.../entity/hardened-electric-mining-drill/hardened-electric-mining-drill-N-wet.png b/.../entity/hardened-electric-mining-drill/hardened-electric-mining-drill-N-wet.png
diff --git a/...hics/entity/hardened-electric-mining-drill/hardened-electric-mining-drill-N.png b/...hics/entity/hardened-electric-mining-drill/hardened-electric-mining-drill-N.png
diff --git a/...ntity/hardened-electric-mining-drill/hardened-electric-mining-drill-S-front.png b/...ntity/hardened-electric-mining-drill/hardened-electric-mining-drill-S-front.png
diff --git a/...ntity/hardened-electric-mining-drill/hardened-electric-mining-drill-S-patch.png b/...ntity/hardened-electric-mining-drill/hardened-electric-mining-drill-S-patch.png
diff --git a/...y/hardened-electric-mining-drill/hardened-electric-mining-drill-S-wet-front.png b/...y/hardened-electric-mining-drill/hardened-electric-mining-drill-S-wet-front.png
diff --git a/.../entity/hardened-electric-mining-drill/hardened-electric-mining-drill-S-wet.png b/.../entity/hardened-electric-mining-drill/hardened-electric-mining-drill-S-wet.png
diff --git a/...hics/entity/hardened-electric-mining-drill/hardened-electric-mining-drill-S.png b/...hics/entity/hardened-electric-mining-drill/hardened-electric-mining-drill-S.png
diff --git a/...ntity/hardened-electric-mining-drill/hardened-electric-mining-drill-W-front.png b/...ntity/hardened-electric-mining-drill/hardened-electric-mining-drill-W-front.png
diff --git a/...ntity/hardened-electric-mining-drill/hardened-electric-mining-drill-W-patch.png b/...ntity/hardened-electric-mining-drill/hardened-electric-mining-drill-W-patch.png
diff --git a/...y/hardened-electric-mining-drill/hardened-electric-mining-drill-W-wet-front.png b/...y/hardened-electric-mining-drill/hardened-electric-mining-drill-W-wet-front.png
diff --git a/.../entity/hardened-electric-mining-drill/hardened-electric-mining-drill-W-wet.png b/.../entity/hardened-electric-mining-drill/hardened-electric-mining-drill-W-wet.png
diff --git a/...hics/entity/hardened-electric-mining-drill/hardened-electric-mining-drill-W.png b/...hics/entity/hardened-electric-mining-drill/hardened-electric-mining-drill-W.png
diff --git a/...dened-electric-mining-drill/hardened-electric-mining-drill-horizontal-front.png b/...dened-electric-mining-drill/hardened-electric-mining-drill-horizontal-front.png
diff --git a/...ty/hardened-electric-mining-drill/hardened-electric-mining-drill-horizontal.png b/...ty/hardened-electric-mining-drill/hardened-electric-mining-drill-horizontal.png
diff --git a/graphics/entity/hardened-electric-mining-drill/hardened-electric-mining-drill.png b/graphics/entity/hardened-electric-mining-drill/hardened-electric-mining-drill.png
diff --git a/...ty/hardened-electric-mining-drill/hr-hardened-electric-mining-drill-E-front.png b/...ty/hardened-electric-mining-drill/hr-hardened-electric-mining-drill-E-front.png
diff --git a/...ty/hardened-electric-mining-drill/hr-hardened-electric-mining-drill-E-patch.png b/...ty/hardened-electric-mining-drill/hr-hardened-electric-mining-drill-E-patch.png
diff --git a/...ardened-electric-mining-drill/hr-hardened-electric-mining-drill-E-wet-front.png b/...ardened-electric-mining-drill/hr-hardened-electric-mining-drill-E-wet-front.png
diff --git a/...tity/hardened-electric-mining-drill/hr-hardened-electric-mining-drill-E-wet.png b/...tity/hardened-electric-mining-drill/hr-hardened-electric-mining-drill-E-wet.png
diff --git a/...s/entity/hardened-electric-mining-drill/hr-hardened-electric-mining-drill-E.png b/...s/entity/hardened-electric-mining-drill/hr-hardened-electric-mining-drill-E.png
diff --git a/...ty/hardened-electric-mining-drill/hr-hardened-electric-mining-drill-N-patch.png b/...ty/hardened-electric-mining-drill/hr-hardened-electric-mining-drill-N-patch.png
diff --git a/...ardened-electric-mining-drill/hr-hardened-electric-mining-drill-N-wet-front.png b/...ardened-electric-mining-drill/hr-hardened-electric-mining-drill-N-wet-front.png
diff --git a/...tity/hardened-electric-mining-drill/hr-hardened-electric-mining-drill-N-wet.png b/...tity/hardened-electric-mining-drill/hr-hardened-electric-mining-drill-N-wet.png
diff --git a/...s/entity/hardened-electric-mining-drill/hr-hardened-electric-mining-drill-N.png b/...s/entity/hardened-electric-mining-drill/hr-hardened-electric-mining-drill-N.png
diff --git a/...ty/hardened-electric-mining-drill/hr-hardened-electric-mining-drill-S-front.png b/...ty/hardened-electric-mining-drill/hr-hardened-electric-mining-drill-S-front.png
diff --git a/...ty/hardened-electric-mining-drill/hr-hardened-electric-mining-drill-S-patch.png b/...ty/hardened-electric-mining-drill/hr-hardened-electric-mining-drill-S-patch.png
diff --git a/...ardened-electric-mining-drill/hr-hardened-electric-mining-drill-S-wet-front.png b/...ardened-electric-mining-drill/hr-hardened-electric-mining-drill-S-wet-front.png
diff --git a/...tity/hardened-electric-mining-drill/hr-hardened-electric-mining-drill-S-wet.png b/...tity/hardened-electric-mining-drill/hr-hardened-electric-mining-drill-S-wet.png
diff --git a/...s/entity/hardened-electric-mining-drill/hr-hardened-electric-mining-drill-S.png b/...s/entity/hardened-electric-mining-drill/hr-hardened-electric-mining-drill-S.png
diff --git a/...ty/hardened-electric-mining-drill/hr-hardened-electric-mining-drill-W-front.png b/...ty/hardened-electric-mining-drill/hr-hardened-electric-mining-drill-W-front.png
diff --git a/...ty/hardened-electric-mining-drill/hr-hardened-electric-mining-drill-W-patch.png b/...ty/hardened-electric-mining-drill/hr-hardened-electric-mining-drill-W-patch.png
diff --git a/...ardened-electric-mining-drill/hr-hardened-electric-mining-drill-W-wet-front.png b/...ardened-electric-mining-drill/hr-hardened-electric-mining-drill-W-wet-front.png
diff --git a/...tity/hardened-electric-mining-drill/hr-hardened-electric-mining-drill-W-wet.png b/...tity/hardened-electric-mining-drill/hr-hardened-electric-mining-drill-W-wet.png
diff --git a/...s/entity/hardened-electric-mining-drill/hr-hardened-electric-mining-drill-W.png b/...s/entity/hardened-electric-mining-drill/hr-hardened-electric-mining-drill-W.png
diff --git a/...ed-electric-mining-drill/hr-hardened-electric-mining-drill-horizontal-front.png b/...ed-electric-mining-drill/hr-hardened-electric-mining-drill-horizontal-front.png
diff --git a/...hardened-electric-mining-drill/hr-hardened-electric-mining-drill-horizontal.png b/...hardened-electric-mining-drill/hr-hardened-electric-mining-drill-horizontal.png
diff --git a/...ics/entity/hardened-electric-mining-drill/hr-hardened-electric-mining-drill.png b/...ics/entity/hardened-electric-mining-drill/hr-hardened-electric-mining-drill.png
diff --git a/...ened-electric-mining-drill/remnants/hardened-electric-mining-drill-remnants.png b/...ened-electric-mining-drill/remnants/hardened-electric-mining-drill-remnants.png
diff --git a/...d-electric-mining-drill/remnants/hr-hardened-electric-mining-drill-remnants.png b/...d-electric-mining-drill/remnants/hr-hardened-electric-mining-drill-remnants.png
diff --git a/graphics/entity/hardened-steel-furnace/hardened-steel-furnace.png b/graphics/entity/hardened-steel-furnace/hardened-steel-furnace.png
diff --git a/graphics/entity/hardened-steel-furnace/hr-hardened-steel-furnace.png b/graphics/entity/hardened-steel-furnace/hr-hardened-steel-furnace.png
diff --git a/graphics/entity/hardened-stone-furnace/hardened-stone-furnace.png b/graphics/entity/hardened-stone-furnace/hardened-stone-furnace.png
diff --git a/graphics/entity/hardened-stone-furnace/hr-hardened-stone-furnace.png b/graphics/entity/hardened-stone-furnace/hr-hardened-stone-furnace.png
diff --git a/graphics/entity/macerator/hr-macerator-A-light.png b/graphics/entity/macerator/hr-macerator-A-light.png
diff --git a/graphics/entity/macerator/hr-macerator-B-light.png b/graphics/entity/macerator/hr-macerator-B-light.png
diff --git a/graphics/entity/macerator/hr-macerator-C-light.png b/graphics/entity/macerator/hr-macerator-C-light.png
diff --git a/graphics/entity/macerator/macerator-A-light.png b/graphics/entity/macerator/macerator-A-light.png
diff --git a/graphics/entity/macerator/macerator-B-light.png b/graphics/entity/macerator/macerator-B-light.png
diff --git a/graphics/entity/macerator/macerator-C-light.png b/graphics/entity/macerator/macerator-C-light.png
diff --git a/...hics/entity/nuclear-assembling-machine/hr-nuclear-assembling-machine-pipe-E.png b/...hics/entity/nuclear-assembling-machine/hr-nuclear-assembling-machine-pipe-E.png
diff --git a/...hics/entity/nuclear-assembling-machine/hr-nuclear-assembling-machine-pipe-N.png b/...hics/entity/nuclear-assembling-machine/hr-nuclear-assembling-machine-pipe-N.png
diff --git a/...hics/entity/nuclear-assembling-machine/hr-nuclear-assembling-machine-pipe-S.png b/...hics/entity/nuclear-assembling-machine/hr-nuclear-assembling-machine-pipe-S.png
diff --git a/...hics/entity/nuclear-assembling-machine/hr-nuclear-assembling-machine-pipe-W.png b/...hics/entity/nuclear-assembling-machine/hr-nuclear-assembling-machine-pipe-W.png
diff --git a/graphics/entity/nuclear-assembling-machine/hr-nuclear-assembling-machine.png b/graphics/entity/nuclear-assembling-machine/hr-nuclear-assembling-machine.png
diff --git a/graphics/entity/nuclear-assembling-machine/nuclear-assembling-machine-pipe-E.png b/graphics/entity/nuclear-assembling-machine/nuclear-assembling-machine-pipe-E.png
diff --git a/graphics/entity/nuclear-assembling-machine/nuclear-assembling-machine-pipe-N.png b/graphics/entity/nuclear-assembling-machine/nuclear-assembling-machine-pipe-N.png
diff --git a/graphics/entity/nuclear-assembling-machine/nuclear-assembling-machine-pipe-S.png b/graphics/entity/nuclear-assembling-machine/nuclear-assembling-machine-pipe-S.png
diff --git a/graphics/entity/nuclear-assembling-machine/nuclear-assembling-machine-pipe-W.png b/graphics/entity/nuclear-assembling-machine/nuclear-assembling-machine-pipe-W.png
diff --git a/graphics/entity/nuclear-assembling-machine/nuclear-assembling-machine.png b/graphics/entity/nuclear-assembling-machine/nuclear-assembling-machine.png
diff --git a/...ics/entity/nuclear-construction-robot/hr-nuclear-construction-robot-working.png b/...ics/entity/nuclear-construction-robot/hr-nuclear-construction-robot-working.png
diff --git a/graphics/entity/nuclear-construction-robot/hr-nuclear-construction-robot.png b/graphics/entity/nuclear-construction-robot/hr-nuclear-construction-robot.png
diff --git a/graphics/entity/nuclear-construction-robot/nuclear-construction-robot-working.png b/graphics/entity/nuclear-construction-robot/nuclear-construction-robot-working.png
diff --git a/graphics/entity/nuclear-construction-robot/nuclear-construction-robot.png b/graphics/entity/nuclear-construction-robot/nuclear-construction-robot.png
diff --git a/graphics/entity/nuclear-filter-inserter/hr-nuclear-filter-inserter-hand-closed.png b/graphics/entity/nuclear-filter-inserter/hr-nuclear-filter-inserter-hand-closed.png
diff --git a/graphics/entity/nuclear-filter-inserter/hr-nuclear-filter-inserter-hand-open.png b/graphics/entity/nuclear-filter-inserter/hr-nuclear-filter-inserter-hand-open.png
diff --git a/graphics/entity/nuclear-filter-inserter/hr-nuclear-filter-inserter-platform.png b/graphics/entity/nuclear-filter-inserter/hr-nuclear-filter-inserter-platform.png
diff --git a/graphics/entity/nuclear-filter-inserter/hr-nuclear-inserter-hand-base.png b/graphics/entity/nuclear-filter-inserter/hr-nuclear-inserter-hand-base.png
diff --git a/graphics/entity/nuclear-filter-inserter/nuclear-filter-inserter-hand-closed.png b/graphics/entity/nuclear-filter-inserter/nuclear-filter-inserter-hand-closed.png
diff --git a/graphics/entity/nuclear-filter-inserter/nuclear-filter-inserter-hand-open.png b/graphics/entity/nuclear-filter-inserter/nuclear-filter-inserter-hand-open.png
diff --git a/graphics/entity/nuclear-filter-inserter/nuclear-filter-inserter-platform.png b/graphics/entity/nuclear-filter-inserter/nuclear-filter-inserter-platform.png
diff --git a/graphics/entity/nuclear-filter-inserter/nuclear-inserter-hand-base.png b/graphics/entity/nuclear-filter-inserter/nuclear-inserter-hand-base.png
diff --git a/graphics/entity/nuclear-inserter/hr-nuclear-inserter-hand-base.png b/graphics/entity/nuclear-inserter/hr-nuclear-inserter-hand-base.png
diff --git a/graphics/entity/nuclear-inserter/hr-nuclear-inserter-hand-closed.png b/graphics/entity/nuclear-inserter/hr-nuclear-inserter-hand-closed.png
diff --git a/graphics/entity/nuclear-inserter/hr-nuclear-inserter-hand-open.png b/graphics/entity/nuclear-inserter/hr-nuclear-inserter-hand-open.png
diff --git a/graphics/entity/nuclear-inserter/hr-nuclear-inserter-platform.png b/graphics/entity/nuclear-inserter/hr-nuclear-inserter-platform.png
diff --git a/graphics/entity/nuclear-inserter/nuclear-inserter-hand-base.png b/graphics/entity/nuclear-inserter/nuclear-inserter-hand-base.png
diff --git a/graphics/entity/nuclear-inserter/nuclear-inserter-hand-closed.png b/graphics/entity/nuclear-inserter/nuclear-inserter-hand-closed.png
diff --git a/graphics/entity/nuclear-inserter/nuclear-inserter-hand-open.png b/graphics/entity/nuclear-inserter/nuclear-inserter-hand-open.png
diff --git a/graphics/entity/nuclear-inserter/nuclear-inserter-platform.png b/graphics/entity/nuclear-inserter/nuclear-inserter-platform.png
diff --git a/graphics/entity/nuclear-logistic-robot/hr-nuclear-logistic-robot.png b/graphics/entity/nuclear-logistic-robot/hr-nuclear-logistic-robot.png
diff --git a/graphics/entity/nuclear-logistic-robot/nuclear-logistic-robot.png b/graphics/entity/nuclear-logistic-robot/nuclear-logistic-robot.png
diff --git a/...ty/nuclear-long-handed-inserter/hr-nuclear-long-handed-inserter-hand-closed.png b/...ty/nuclear-long-handed-inserter/hr-nuclear-long-handed-inserter-hand-closed.png
diff --git a/...tity/nuclear-long-handed-inserter/hr-nuclear-long-handed-inserter-hand-open.png b/...tity/nuclear-long-handed-inserter/hr-nuclear-long-handed-inserter-hand-open.png
diff --git a/...ntity/nuclear-long-handed-inserter/hr-nuclear-long-handed-inserter-platform.png b/...ntity/nuclear-long-handed-inserter/hr-nuclear-long-handed-inserter-platform.png
diff --git a/...ntity/nuclear-long-handed-inserter/nuclear-long-handed-inserter-hand-closed.png b/...ntity/nuclear-long-handed-inserter/nuclear-long-handed-inserter-hand-closed.png
diff --git a/.../entity/nuclear-long-handed-inserter/nuclear-long-handed-inserter-hand-open.png b/.../entity/nuclear-long-handed-inserter/nuclear-long-handed-inserter-hand-open.png
diff --git a/...s/entity/nuclear-long-handed-inserter/nuclear-long-handed-inserter-platform.png b/...s/entity/nuclear-long-handed-inserter/nuclear-long-handed-inserter-platform.png
diff --git a/graphics/entity/nuclear-splitter/hr-nuclear-splitter-east.png b/graphics/entity/nuclear-splitter/hr-nuclear-splitter-east.png
diff --git a/graphics/entity/nuclear-splitter/hr-nuclear-splitter-north.png b/graphics/entity/nuclear-splitter/hr-nuclear-splitter-north.png
diff --git a/graphics/entity/nuclear-splitter/hr-nuclear-splitter-south.png b/graphics/entity/nuclear-splitter/hr-nuclear-splitter-south.png
diff --git a/graphics/entity/nuclear-splitter/hr-nuclear-splitter-west.png b/graphics/entity/nuclear-splitter/hr-nuclear-splitter-west.png
diff --git a/graphics/entity/nuclear-splitter/nuclear-splitter-east.png b/graphics/entity/nuclear-splitter/nuclear-splitter-east.png
diff --git a/graphics/entity/nuclear-splitter/nuclear-splitter-north.png b/graphics/entity/nuclear-splitter/nuclear-splitter-north.png
diff --git a/graphics/entity/nuclear-splitter/nuclear-splitter-south.png b/graphics/entity/nuclear-splitter/nuclear-splitter-south.png
diff --git a/graphics/entity/nuclear-splitter/nuclear-splitter-west.png b/graphics/entity/nuclear-splitter/nuclear-splitter-west.png
diff --git a/.../nuclear-stack-filter-inserter/hr-nuclear-stack-filter-inserter-hand-closed.png b/.../nuclear-stack-filter-inserter/hr-nuclear-stack-filter-inserter-hand-closed.png
diff --git a/...ty/nuclear-stack-filter-inserter/hr-nuclear-stack-filter-inserter-hand-open.png b/...ty/nuclear-stack-filter-inserter/hr-nuclear-stack-filter-inserter-hand-open.png
diff --git a/...ity/nuclear-stack-filter-inserter/hr-nuclear-stack-filter-inserter-platform.png b/...ity/nuclear-stack-filter-inserter/hr-nuclear-stack-filter-inserter-platform.png
diff --git a/...ity/nuclear-stack-filter-inserter/nuclear-stack-filter-inserter-hand-closed.png b/...ity/nuclear-stack-filter-inserter/nuclear-stack-filter-inserter-hand-closed.png
diff --git a/...ntity/nuclear-stack-filter-inserter/nuclear-stack-filter-inserter-hand-open.png b/...ntity/nuclear-stack-filter-inserter/nuclear-stack-filter-inserter-hand-open.png
diff --git a/...entity/nuclear-stack-filter-inserter/nuclear-stack-filter-inserter-platform.png b/...entity/nuclear-stack-filter-inserter/nuclear-stack-filter-inserter-platform.png
diff --git a/graphics/entity/nuclear-stack-inserter/hr-nuclear-stack-inserter-hand-closed.png b/graphics/entity/nuclear-stack-inserter/hr-nuclear-stack-inserter-hand-closed.png
diff --git a/graphics/entity/nuclear-stack-inserter/hr-nuclear-stack-inserter-hand-open.png b/graphics/entity/nuclear-stack-inserter/hr-nuclear-stack-inserter-hand-open.png
diff --git a/graphics/entity/nuclear-stack-inserter/hr-nuclear-stack-inserter-platform.png b/graphics/entity/nuclear-stack-inserter/hr-nuclear-stack-inserter-platform.png
diff --git a/graphics/entity/nuclear-stack-inserter/nuclear-stack-inserter-hand-closed.png b/graphics/entity/nuclear-stack-inserter/nuclear-stack-inserter-hand-closed.png
diff --git a/graphics/entity/nuclear-stack-inserter/nuclear-stack-inserter-hand-open.png b/graphics/entity/nuclear-stack-inserter/nuclear-stack-inserter-hand-open.png
diff --git a/graphics/entity/nuclear-stack-inserter/nuclear-stack-inserter-platform.png b/graphics/entity/nuclear-stack-inserter/nuclear-stack-inserter-platform.png
diff --git a/graphics/entity/nuclear-transport-belt/hr-nuclear-transport-belt.png b/graphics/entity/nuclear-transport-belt/hr-nuclear-transport-belt.png
diff --git a/graphics/entity/nuclear-transport-belt/nuclear-transport-belt.png b/graphics/entity/nuclear-transport-belt/nuclear-transport-belt.png
diff --git a/graphics/entity/nuclear-underground-belt/hr-nuclear-underground-belt-structure.png b/graphics/entity/nuclear-underground-belt/hr-nuclear-underground-belt-structure.png
diff --git a/graphics/entity/nuclear-underground-belt/nuclear-underground-belt-structure.png b/graphics/entity/nuclear-underground-belt/nuclear-underground-belt-structure.png
diff --git a/.../entity/plutonium-assembling-machine/hr-plutonium-assembling-machine-pipe-E.png b/.../entity/plutonium-assembling-machine/hr-plutonium-assembling-machine-pipe-E.png
diff --git a/.../entity/plutonium-assembling-machine/hr-plutonium-assembling-machine-pipe-N.png b/.../entity/plutonium-assembling-machine/hr-plutonium-assembling-machine-pipe-N.png
diff --git a/.../entity/plutonium-assembling-machine/hr-plutonium-assembling-machine-pipe-S.png b/.../entity/plutonium-assembling-machine/hr-plutonium-assembling-machine-pipe-S.png
diff --git a/.../entity/plutonium-assembling-machine/hr-plutonium-assembling-machine-pipe-W.png b/.../entity/plutonium-assembling-machine/hr-plutonium-assembling-machine-pipe-W.png
diff --git a/graphics/entity/plutonium-assembling-machine/hr-plutonium-assembling-machine.png b/graphics/entity/plutonium-assembling-machine/hr-plutonium-assembling-machine.png
diff --git a/...ics/entity/plutonium-assembling-machine/plutonium-assembling-machine-pipe-E.png b/...ics/entity/plutonium-assembling-machine/plutonium-assembling-machine-pipe-E.png
diff --git a/...ics/entity/plutonium-assembling-machine/plutonium-assembling-machine-pipe-N.png b/...ics/entity/plutonium-assembling-machine/plutonium-assembling-machine-pipe-N.png
diff --git a/...ics/entity/plutonium-assembling-machine/plutonium-assembling-machine-pipe-S.png b/...ics/entity/plutonium-assembling-machine/plutonium-assembling-machine-pipe-S.png
diff --git a/...ics/entity/plutonium-assembling-machine/plutonium-assembling-machine-pipe-W.png b/...ics/entity/plutonium-assembling-machine/plutonium-assembling-machine-pipe-W.png
diff --git a/graphics/entity/plutonium-assembling-machine/plutonium-assembling-machine.png b/graphics/entity/plutonium-assembling-machine/plutonium-assembling-machine.png
diff --git a/...ics/entity/plutonium-filter-inserter/hr-plutonium-filter-inserter-hand-base.png b/...ics/entity/plutonium-filter-inserter/hr-plutonium-filter-inserter-hand-base.png
diff --git a/...s/entity/plutonium-filter-inserter/hr-plutonium-filter-inserter-hand-closed.png b/...s/entity/plutonium-filter-inserter/hr-plutonium-filter-inserter-hand-closed.png
diff --git a/...ics/entity/plutonium-filter-inserter/hr-plutonium-filter-inserter-hand-open.png b/...ics/entity/plutonium-filter-inserter/hr-plutonium-filter-inserter-hand-open.png
diff --git a/...hics/entity/plutonium-filter-inserter/hr-plutonium-filter-inserter-platform.png b/...hics/entity/plutonium-filter-inserter/hr-plutonium-filter-inserter-platform.png
diff --git a/graphics/entity/plutonium-filter-inserter/plutonium-filter-inserter-hand-base.png b/graphics/entity/plutonium-filter-inserter/plutonium-filter-inserter-hand-base.png
diff --git a/...hics/entity/plutonium-filter-inserter/plutonium-filter-inserter-hand-closed.png b/...hics/entity/plutonium-filter-inserter/plutonium-filter-inserter-hand-closed.png
diff --git a/graphics/entity/plutonium-filter-inserter/plutonium-filter-inserter-hand-open.png b/graphics/entity/plutonium-filter-inserter/plutonium-filter-inserter-hand-open.png
diff --git a/graphics/entity/plutonium-filter-inserter/plutonium-filter-inserter-platform.png b/graphics/entity/plutonium-filter-inserter/plutonium-filter-inserter-platform.png
diff --git a/graphics/entity/plutonium-inserter/hr-plutonium-inserter-hand-base.png b/graphics/entity/plutonium-inserter/hr-plutonium-inserter-hand-base.png
diff --git a/graphics/entity/plutonium-inserter/hr-plutonium-inserter-hand-closed.png b/graphics/entity/plutonium-inserter/hr-plutonium-inserter-hand-closed.png
diff --git a/graphics/entity/plutonium-inserter/hr-plutonium-inserter-hand-open.png b/graphics/entity/plutonium-inserter/hr-plutonium-inserter-hand-open.png
diff --git a/graphics/entity/plutonium-inserter/hr-plutonium-inserter-platform.png b/graphics/entity/plutonium-inserter/hr-plutonium-inserter-platform.png
diff --git a/graphics/entity/plutonium-inserter/plutonium-inserter-hand-base.png b/graphics/entity/plutonium-inserter/plutonium-inserter-hand-base.png
diff --git a/graphics/entity/plutonium-inserter/plutonium-inserter-hand-closed.png b/graphics/entity/plutonium-inserter/plutonium-inserter-hand-closed.png
diff --git a/graphics/entity/plutonium-inserter/plutonium-inserter-hand-open.png b/graphics/entity/plutonium-inserter/plutonium-inserter-hand-open.png
diff --git a/graphics/entity/plutonium-inserter/plutonium-inserter-platform.png b/graphics/entity/plutonium-inserter/plutonium-inserter-platform.png
diff --git a/...lutonium-long-handed-inserter/hr-plutonium-long-handed-inserter-hand-closed.png b/...lutonium-long-handed-inserter/hr-plutonium-long-handed-inserter-hand-closed.png
diff --git a/.../plutonium-long-handed-inserter/hr-plutonium-long-handed-inserter-hand-open.png b/.../plutonium-long-handed-inserter/hr-plutonium-long-handed-inserter-hand-open.png
diff --git a/...y/plutonium-long-handed-inserter/hr-plutonium-long-handed-inserter-platform.png b/...y/plutonium-long-handed-inserter/hr-plutonium-long-handed-inserter-platform.png
diff --git a/...y/plutonium-long-handed-inserter/plutonium-long-handed-inserter-hand-closed.png b/...y/plutonium-long-handed-inserter/plutonium-long-handed-inserter-hand-closed.png
diff --git a/...ity/plutonium-long-handed-inserter/plutonium-long-handed-inserter-hand-open.png b/...ity/plutonium-long-handed-inserter/plutonium-long-handed-inserter-hand-open.png
diff --git a/...tity/plutonium-long-handed-inserter/plutonium-long-handed-inserter-platform.png b/...tity/plutonium-long-handed-inserter/plutonium-long-handed-inserter-platform.png
diff --git a/graphics/entity/plutonium-splitter/hr-plutonium-splitter-east.png b/graphics/entity/plutonium-splitter/hr-plutonium-splitter-east.png
diff --git a/graphics/entity/plutonium-splitter/hr-plutonium-splitter-north.png b/graphics/entity/plutonium-splitter/hr-plutonium-splitter-north.png
diff --git a/graphics/entity/plutonium-splitter/hr-plutonium-splitter-south.png b/graphics/entity/plutonium-splitter/hr-plutonium-splitter-south.png
diff --git a/graphics/entity/plutonium-splitter/hr-plutonium-splitter-west.png b/graphics/entity/plutonium-splitter/hr-plutonium-splitter-west.png
diff --git a/graphics/entity/plutonium-splitter/plutonium-splitter-east.png b/graphics/entity/plutonium-splitter/plutonium-splitter-east.png
diff --git a/graphics/entity/plutonium-splitter/plutonium-splitter-north.png b/graphics/entity/plutonium-splitter/plutonium-splitter-north.png
diff --git a/graphics/entity/plutonium-splitter/plutonium-splitter-south.png b/graphics/entity/plutonium-splitter/plutonium-splitter-south.png
diff --git a/graphics/entity/plutonium-splitter/plutonium-splitter-west.png b/graphics/entity/plutonium-splitter/plutonium-splitter-west.png
diff --git a/...tonium-stack-filter-inserter/hr-plutonium-stack-filter-inserter-hand-closed.png b/...tonium-stack-filter-inserter/hr-plutonium-stack-filter-inserter-hand-closed.png
diff --git a/...lutonium-stack-filter-inserter/hr-plutonium-stack-filter-inserter-hand-open.png b/...lutonium-stack-filter-inserter/hr-plutonium-stack-filter-inserter-hand-open.png
diff --git a/...plutonium-stack-filter-inserter/hr-plutonium-stack-filter-inserter-platform.png b/...plutonium-stack-filter-inserter/hr-plutonium-stack-filter-inserter-platform.png
diff --git a/...plutonium-stack-filter-inserter/plutonium-stack-filter-inserter-hand-closed.png b/...plutonium-stack-filter-inserter/plutonium-stack-filter-inserter-hand-closed.png
diff --git a/...y/plutonium-stack-filter-inserter/plutonium-stack-filter-inserter-hand-open.png b/...y/plutonium-stack-filter-inserter/plutonium-stack-filter-inserter-hand-open.png
diff --git a/...ty/plutonium-stack-filter-inserter/plutonium-stack-filter-inserter-platform.png b/...ty/plutonium-stack-filter-inserter/plutonium-stack-filter-inserter-platform.png
diff --git a/...ics/entity/plutonium-stack-inserter/hr-plutonium-stack-inserter-hand-closed.png b/...ics/entity/plutonium-stack-inserter/hr-plutonium-stack-inserter-hand-closed.png
diff --git a/graphics/entity/plutonium-stack-inserter/hr-plutonium-stack-inserter-hand-open.png b/graphics/entity/plutonium-stack-inserter/hr-plutonium-stack-inserter-hand-open.png
diff --git a/graphics/entity/plutonium-stack-inserter/hr-plutonium-stack-inserter-platform.png b/graphics/entity/plutonium-stack-inserter/hr-plutonium-stack-inserter-platform.png
diff --git a/graphics/entity/plutonium-stack-inserter/plutonium-stack-inserter-hand-closed.png b/graphics/entity/plutonium-stack-inserter/plutonium-stack-inserter-hand-closed.png
diff --git a/graphics/entity/plutonium-stack-inserter/plutonium-stack-inserter-hand-open.png b/graphics/entity/plutonium-stack-inserter/plutonium-stack-inserter-hand-open.png
diff --git a/graphics/entity/plutonium-stack-inserter/plutonium-stack-inserter-platform.png b/graphics/entity/plutonium-stack-inserter/plutonium-stack-inserter-platform.png
diff --git a/graphics/entity/plutonium-transport-belt/hr-plutonium-transport-belt.png b/graphics/entity/plutonium-transport-belt/hr-plutonium-transport-belt.png
diff --git a/graphics/entity/plutonium-transport-belt/plutonium-transport-belt.png b/graphics/entity/plutonium-transport-belt/plutonium-transport-belt.png
diff --git a/...s/entity/plutonium-underground-belt/hr-plutonium-underground-belt-structure.png b/...s/entity/plutonium-underground-belt/hr-plutonium-underground-belt-structure.png
diff --git a/...hics/entity/plutonium-underground-belt/plutonium-underground-belt-structure.png b/...hics/entity/plutonium-underground-belt/plutonium-underground-belt-structure.png
diff --git a/graphics/icons/coal-dust.png b/graphics/icons/coal-dust.png
diff --git a/graphics/icons/coal-piece.png b/graphics/icons/coal-piece.png
diff --git a/graphics/icons/compressed-fuel.png b/graphics/icons/compressed-fuel.png
diff --git a/graphics/icons/compressor.png b/graphics/icons/compressor.png
diff --git a/graphics/icons/hardened-electric-furnace.png b/graphics/icons/hardened-electric-furnace.png
diff --git a/graphics/icons/hardened-electric-mining-drill.png b/graphics/icons/hardened-electric-mining-drill.png
diff --git a/graphics/icons/hardened-steel-furnace.png b/graphics/icons/hardened-steel-furnace.png
diff --git a/graphics/icons/hardened-stone-furnace.png b/graphics/icons/hardened-stone-furnace.png
diff --git a/graphics/icons/macerator.png b/graphics/icons/macerator.png
diff --git a/graphics/icons/modules/effectivity-module-1.png b/graphics/icons/modules/effectivity-module-1.png
diff --git a/graphics/icons/modules/effectivity-module-2.png b/graphics/icons/modules/effectivity-module-2.png
diff --git a/graphics/icons/modules/effectivity-module-3.png b/graphics/icons/modules/effectivity-module-3.png
diff --git a/graphics/icons/modules/effectivity-module-4.png b/graphics/icons/modules/effectivity-module-4.png
diff --git a/graphics/icons/modules/effectivity-module-5.png b/graphics/icons/modules/effectivity-module-5.png
diff --git a/graphics/icons/modules/effectivity-module-6.png b/graphics/icons/modules/effectivity-module-6.png
diff --git a/graphics/icons/modules/productivity-effectivity-module-1.png b/graphics/icons/modules/productivity-effectivity-module-1.png
diff --git a/graphics/icons/modules/productivity-effectivity-module-2.png b/graphics/icons/modules/productivity-effectivity-module-2.png
diff --git a/graphics/icons/modules/productivity-effectivity-module-3.png b/graphics/icons/modules/productivity-effectivity-module-3.png
diff --git a/graphics/icons/modules/productivity-effectivity-module-4.png b/graphics/icons/modules/productivity-effectivity-module-4.png
diff --git a/graphics/icons/modules/productivity-effectivity-module-5.png b/graphics/icons/modules/productivity-effectivity-module-5.png
diff --git a/graphics/icons/modules/productivity-effectivity-module-6.png b/graphics/icons/modules/productivity-effectivity-module-6.png
diff --git a/graphics/icons/modules/productivity-module-1.png b/graphics/icons/modules/productivity-module-1.png
diff --git a/graphics/icons/modules/productivity-module-2.png b/graphics/icons/modules/productivity-module-2.png
diff --git a/graphics/icons/modules/productivity-module-3.png b/graphics/icons/modules/productivity-module-3.png
diff --git a/graphics/icons/modules/productivity-module-4.png b/graphics/icons/modules/productivity-module-4.png
diff --git a/graphics/icons/modules/productivity-module-5.png b/graphics/icons/modules/productivity-module-5.png
diff --git a/graphics/icons/modules/productivity-module-6.png b/graphics/icons/modules/productivity-module-6.png
diff --git a/graphics/icons/modules/speed-effectivity-module-1.png b/graphics/icons/modules/speed-effectivity-module-1.png
diff --git a/graphics/icons/modules/speed-effectivity-module-2.png b/graphics/icons/modules/speed-effectivity-module-2.png
diff --git a/graphics/icons/modules/speed-effectivity-module-3.png b/graphics/icons/modules/speed-effectivity-module-3.png
diff --git a/graphics/icons/modules/speed-effectivity-module-4.png b/graphics/icons/modules/speed-effectivity-module-4.png
diff --git a/graphics/icons/modules/speed-effectivity-module-5.png b/graphics/icons/modules/speed-effectivity-module-5.png
diff --git a/graphics/icons/modules/speed-effectivity-module-6.png b/graphics/icons/modules/speed-effectivity-module-6.png
diff --git a/graphics/icons/modules/speed-module-1.png b/graphics/icons/modules/speed-module-1.png
diff --git a/graphics/icons/modules/speed-module-2.png b/graphics/icons/modules/speed-module-2.png
diff --git a/graphics/icons/modules/speed-module-3.png b/graphics/icons/modules/speed-module-3.png
diff --git a/graphics/icons/modules/speed-module-4.png b/graphics/icons/modules/speed-module-4.png
diff --git a/graphics/icons/modules/speed-module-5.png b/graphics/icons/modules/speed-module-5.png
diff --git a/graphics/icons/modules/speed-module-6.png b/graphics/icons/modules/speed-module-6.png
diff --git a/graphics/icons/modules/speed-productivity-module-1.png b/graphics/icons/modules/speed-productivity-module-1.png
diff --git a/graphics/icons/modules/speed-productivity-module-2.png b/graphics/icons/modules/speed-productivity-module-2.png
diff --git a/graphics/icons/modules/speed-productivity-module-3.png b/graphics/icons/modules/speed-productivity-module-3.png
diff --git a/graphics/icons/modules/speed-productivity-module-4.png b/graphics/icons/modules/speed-productivity-module-4.png
diff --git a/graphics/icons/modules/speed-productivity-module-5.png b/graphics/icons/modules/speed-productivity-module-5.png
diff --git a/graphics/icons/modules/speed-productivity-module-6.png b/graphics/icons/modules/speed-productivity-module-6.png
diff --git a/graphics/icons/nuclear-assembling-machine.png b/graphics/icons/nuclear-assembling-machine.png
diff --git a/graphics/icons/nuclear-construction-robot.png b/graphics/icons/nuclear-construction-robot.png
diff --git a/graphics/icons/nuclear-filter-inserter.png b/graphics/icons/nuclear-filter-inserter.png
diff --git a/graphics/icons/nuclear-flying-robot-frame.png b/graphics/icons/nuclear-flying-robot-frame.png
diff --git a/graphics/icons/nuclear-inserter.png b/graphics/icons/nuclear-inserter.png
diff --git a/graphics/icons/nuclear-logistic-robot.png b/graphics/icons/nuclear-logistic-robot.png
diff --git a/graphics/icons/nuclear-long-handed-inserter.png b/graphics/icons/nuclear-long-handed-inserter.png
diff --git a/graphics/icons/nuclear-metal.png b/graphics/icons/nuclear-metal.png
diff --git a/graphics/icons/nuclear-splitter.png b/graphics/icons/nuclear-splitter.png
diff --git a/graphics/icons/nuclear-stack-filter-inserter.png b/graphics/icons/nuclear-stack-filter-inserter.png
diff --git a/graphics/icons/nuclear-stack-inserter.png b/graphics/icons/nuclear-stack-inserter.png
diff --git a/graphics/icons/nuclear-transport-belt.png b/graphics/icons/nuclear-transport-belt.png
diff --git a/graphics/icons/nuclear-underground-belt.png b/graphics/icons/nuclear-underground-belt.png
diff --git a/graphics/icons/plutonium-assembling-machine.png b/graphics/icons/plutonium-assembling-machine.png
diff --git a/graphics/icons/plutonium-filter-inserter.png b/graphics/icons/plutonium-filter-inserter.png
diff --git a/graphics/icons/plutonium-inserter.png b/graphics/icons/plutonium-inserter.png
diff --git a/graphics/icons/plutonium-long-handed-inserter.png b/graphics/icons/plutonium-long-handed-inserter.png
diff --git a/graphics/icons/plutonium-splitter.png b/graphics/icons/plutonium-splitter.png
diff --git a/graphics/icons/plutonium-stack-filter-inserter.png b/graphics/icons/plutonium-stack-filter-inserter.png
diff --git a/graphics/icons/plutonium-stack-inserter.png b/graphics/icons/plutonium-stack-inserter.png
diff --git a/graphics/icons/plutonium-steel.png b/graphics/icons/plutonium-steel.png
diff --git a/graphics/icons/plutonium-transport-belt.png b/graphics/icons/plutonium-transport-belt.png
diff --git a/graphics/icons/plutonium-underground-belt.png b/graphics/icons/plutonium-underground-belt.png
diff --git a/graphics/icons/raw-nuclear-metal.png b/graphics/icons/raw-nuclear-metal.png
diff --git a/graphics/icons/raw-plutonium-steel.png b/graphics/icons/raw-plutonium-steel.png
diff --git a/graphics/icons/sawdust.png b/graphics/icons/sawdust.png
diff --git a/graphics/technology/hardened-electric-mining-drill.png b/graphics/technology/hardened-electric-mining-drill.png
diff --git a/graphics/technology/hardened-furnace.png b/graphics/technology/hardened-furnace.png
diff --git a/graphics/technology/merged-modules.png b/graphics/technology/merged-modules.png
diff --git a/graphics/technology/nuclear-automation.png b/graphics/technology/nuclear-automation.png
diff --git a/graphics/technology/nuclear-logistics.png b/graphics/technology/nuclear-logistics.png
diff --git a/graphics/technology/plutonium-automation.png b/graphics/technology/plutonium-automation.png
diff --git a/graphics/technology/plutonium-logistics.png b/graphics/technology/plutonium-logistics.png
diff --git a/graphics/technology/productivity-effectivity-module.png b/graphics/technology/productivity-effectivity-module.png
diff --git a/graphics/technology/speed-effectivity-module.png b/graphics/technology/speed-effectivity-module.png
diff --git a/graphics/technology/speed-productivity-module.png b/graphics/technology/speed-productivity-module.png
diff --git a/info.json b/info.json
@@ -1,12 +1,12 @@
 {
     "name": "RandomFactorioThings",
-    "version": "1.1.2",
+    "version": "1.2.0",
     "title": "Random Factorio Things",
     "author": "JohnTheCoolingFan",
     "contact": "https://discord.gg/grHVhE2",
     "homepage": "https://discord.gg/grHVhE2",
     "dependencies": [
-        "base >= 0.18.0",
+        "base >= 0.18.31",
         "? PlutoniumEnergy",
         "? deadlock-beltboxes-loaders",
         "? vanilla-loaders-hd >= 0.18.8"

diff --git a/migrations/1.1.3.json b/migrations/1.1.3.json
@@ -0,0 +1,10 @@
+{
+    "item":
+    [
+        ["coal-piece", "coal-dust"]
+    ],
+    "recipe":
+    [
+        ["coal-piece", "coal-dust"]
+    ]
+}
diff --git a/prototypes/entity/entities.lua b/prototypes/entity/entities.lua
@@ -1,3 +1,6 @@
+-- TODO: **URGENT** Fix #21
+--       Remake graphics again
+
 require("prototypes.entity.inserters")
 require("prototypes.entity.miners")
 require("prototypes.entity.assemblerpipes")
@@ -7,7 +10,6 @@ local entities = {}
 local nuclear_transport_belt = util.table.deepcopy(data.raw["transport-belt"]["express-transport-belt"])
 nuclear_transport_belt.name = "nuclear-transport-belt"
 nuclear_transport_belt.icon = "__RandomFactorioThings__/graphics/icons/nuclear-transport-belt.png"
-nuclear_transport_belt.icon_size = 32
 nuclear_transport_belt.minable.result = "nuclear-transport-belt"
 nuclear_transport_belt.speed = 0.125
 nuclear_transport_belt.next_upgrade = nil
@@ -18,7 +20,6 @@ table.insert(entities, nuclear_transport_belt)
 local nuclear_underground_belt = util.table.deepcopy(data.raw["underground-belt"]["express-underground-belt"])
 nuclear_underground_belt.name = "nuclear-underground-belt"
 nuclear_underground_belt.icon = "__RandomFactorioThings__/graphics/icons/nuclear-underground-belt.png"
-nuclear_underground_belt.icon_size = 32
 nuclear_underground_belt.minable.result = "nuclear-underground-belt"
 nuclear_underground_belt.max_distance = 11
 nuclear_underground_belt.speed = 0.125
@@ -37,7 +38,6 @@ table.insert(entities, nuclear_underground_belt)
 local nuclear_splitter = util.table.deepcopy(data.raw["splitter"]["express-splitter"])
 nuclear_splitter.name = "nuclear-splitter"
 nuclear_splitter.icon = "__RandomFactorioThings__/graphics/icons/nuclear-splitter.png"
-nuclear_splitter.icon_size = 32
 nuclear_splitter.minable.result = "nuclear-splitter"
 nuclear_splitter.speed = 0.125
 nuclear_splitter.next_upgrade = nil
@@ -61,7 +61,6 @@ nuclear_logistic_robot.name = "nuclear-logistic-robot"
 nuclear_logistic_robot.minable.result = "nuclear-logistic-robot"
 nuclear_logistic_robot.max_health = 150
 nuclear_logistic_robot.icon = "__RandomFactorioThings__/graphics/icons/nuclear-logistic-robot.png"
-nuclear_logistic_robot.icon_size = 32
 nuclear_logistic_robot.max_payload_size = 2
 nuclear_logistic_robot.speed = 0.1
 nuclear_logistic_robot.max_energy = "3MJ"
@@ -81,7 +80,6 @@ nuclear_construction_robot.name = "nuclear-construction-robot"
 nuclear_construction_robot.minable.result = "nuclear-construction-robot"
 nuclear_construction_robot.max_health = 150
 nuclear_construction_robot.icon = "__RandomFactorioThings__/graphics/icons/nuclear-construction-robot.png"
-nuclear_construction_robot.icon_size = 32
 nuclear_construction_robot.max_payload_size = 2
 nuclear_construction_robot.speed = 0.12
 nuclear_construction_robot.max_energy = "3MJ"
@@ -97,7 +95,6 @@ table.insert(entities, nuclear_construction_robot)
 local hardened_stone_furnace = util.table.deepcopy(data.raw["furnace"]["stone-furnace"])
 hardened_stone_furnace.name = "hardened-stone-furnace"
 hardened_stone_furnace.icon = "__RandomFactorioThings__/graphics/icons/hardened-stone-furnace.png"
-hardened_stone_furnace.icon_size = 32
 hardened_stone_furnace.minable.result = "hardened-stone-furnace"
 hardened_stone_furnace.max_health = 300
 hardened_stone_furnace.crafting_speed = 1.25
@@ -109,7 +106,6 @@ table.insert(entities, hardened_stone_furnace)
 local hardened_steel_furnace = util.table.deepcopy(data.raw["furnace"]["steel-furnace"])
 hardened_steel_furnace.name = "hardened-steel-furnace"
 hardened_steel_furnace.icon = "__RandomFactorioThings__/graphics/icons/hardened-steel-furnace.png"
-hardened_steel_furnace.icon_size = 32
 hardened_steel_furnace.minable.result = "hardened-steel-furnace"
 hardened_steel_furnace.max_health = 450
 hardened_steel_furnace.crafting_speed = 2.5
@@ -121,7 +117,6 @@ table.insert(entities, hardened_steel_furnace)
 local hardened_electric_furnace = util.table.deepcopy(data.raw["furnace"]["electric-furnace"])
 hardened_electric_furnace.name = "hardened-electric-furnace"
 hardened_electric_furnace.icon = "__RandomFactorioThings__/graphics/icons/hardened-electric-furnace.png"
-hardened_electric_furnace.icon_size = 32
 hardened_electric_furnace.minable.result = "hardened-electric-furnace"
 hardened_electric_furnace.max_health = 525
 hardened_electric_furnace.crafting_speed = 2.5
@@ -133,7 +128,6 @@ table.insert(entities, hardened_electric_furnace)
 local nuclear_assembling_machine = util.table.deepcopy(data.raw["assembling-machine"]["assembling-machine-3"])
 nuclear_assembling_machine.name = "nuclear-assembling-machine"
 nuclear_assembling_machine.icon = "__RandomFactorioThings__/graphics/icons/nuclear-assembling-machine.png"
-nuclear_assembling_machine.icon_size = 32
 nuclear_assembling_machine.minable.result = "nuclear-assembling-machine"
 nuclear_assembling_machine.max_health = 450
 nuclear_assembling_machine.crafting_speed = 2
@@ -151,7 +145,6 @@ data.raw["assembling-machine"]["assembling-machine-3"].next_upgrade = "nuclear-a
 local macerator = util.table.deepcopy(data.raw["assembling-machine"]["centrifuge"])
 macerator.name = "macerator"
 macerator.icon = "__RandomFactorioThings__/graphics/icons/macerator.png"
-macerator.icon_size = 32
 macerator.minable.result = "macerator"
 macerator.animation.layers[1].filename = "__RandomFactorioThings__/graphics/entity/macerator/macerator-C-light.png"
 macerator.animation.layers[1].hr_version.filename = "__RandomFactorioThings__/graphics/entity/macerator/hr-macerator-C-light.png"
@@ -166,7 +159,6 @@ table.insert(entities, macerator)
 local compressor = util.table.deepcopy(data.raw["assembling-machine"]["centrifuge"])
 compressor.name = "compressor"
 compressor.icon = "__RandomFactorioThings__/graphics/icons/compressor.png"
-compressor.icon_size = 32
 compressor.minable.result = "compressor"
 compressor.animation.layers[1].filename = "__RandomFactorioThings__/graphics/entity/compressor/compressor-C-light.png"
 compressor.animation.layers[1].hr_version.filename = "__RandomFactorioThings__/graphics/entity/compressor/hr-compressor-C-light.png"
@@ -183,7 +175,6 @@ if mods["PlutoniumEnergy"] then
     local plutonium_assembling_machine = util.table.deepcopy(nuclear_assembling_machine)
     plutonium_assembling_machine.name = "plutonium-assembling-machine"
     plutonium_assembling_machine.icon = "__RandomFactorioThings__/graphics/icons/plutonium-assembling-machine.png"
-    plutonium_assembling_machine.icon_size = 32
     plutonium_assembling_machine.minable.result = "plutonium-assembling-machine"
     plutonium_assembling_machine.max_health = 500
     plutonium_assembling_machine.crafting_speed = 3
@@ -199,7 +190,6 @@ if mods["PlutoniumEnergy"] then
     local plutonium_transport_belt = util.table.deepcopy(nuclear_transport_belt)
     plutonium_transport_belt.name = "plutonium-transport-belt"
     plutonium_transport_belt.icon = "__RandomFactorioThings__/graphics/icons/plutonium-transport-belt.png"
-    plutonium_transport_belt.icon_size = 32
     plutonium_transport_belt.minable.result = "plutonium-transport-belt"
     plutonium_transport_belt.speed = 0.15625
     plutonium_transport_belt.belt_animation_set.animation_set.filename = "__RandomFactorioThings__/graphics/entity/plutonium-transport-belt/plutonium-transport-belt.png"
@@ -209,7 +199,6 @@ if mods["PlutoniumEnergy"] then
     local plutonium_underground_belt = util.table.deepcopy(nuclear_underground_belt)
     plutonium_underground_belt.name = "plutonium-underground-belt"
     plutonium_underground_belt.icon = "__RandomFactorioThings__/graphics/icons/plutonium-underground-belt.png"
-    plutonium_underground_belt.icon_size = 32
     plutonium_underground_belt.minable.result = "plutonium-underground-belt"
     plutonium_underground_belt.speed = 0.15625
     plutonium_underground_belt.belt_animation_set = plutonium_transport_belt.belt_animation_set
@@ -226,7 +215,6 @@ if mods["PlutoniumEnergy"] then
     local plutonium_splitter = util.table.deepcopy(nuclear_splitter)
     plutonium_splitter.name = "plutonium-splitter"
     plutonium_splitter.icon = "__RandomFactorioThings__/graphics/icons/plutonium-splitter.png"
-    plutonium_splitter.icon_size = 32
     plutonium_splitter.minable.result = "plutonium-splitter"
     plutonium_splitter.speed = 0.15625
     plutonium_splitter.belt_animation_set = plutonium_transport_belt.belt_animation_set

diff --git a/prototypes/entity/inserters.lua b/prototypes/entity/inserters.lua
@@ -1,9 +1,10 @@
+-- TODO: nuclear filter inserter and remake recipes
+
 local inserters = {}
 
 local nuclear_inserter = util.table.deepcopy(data.raw["inserter"]["fast-inserter"])
 nuclear_inserter.name = "nuclear-inserter"
 nuclear_inserter.icon = "__RandomFactorioThings__/graphics/icons/nuclear-inserter.png"
-nuclear_inserter.icon_size = 32
 nuclear_inserter.minable.result = "nuclear-inserter"
 nuclear_inserter.energy_per_movement = "15kJ"
 nuclear_inserter.energy_per_rotation = "15kJ"
@@ -24,7 +25,6 @@ table.insert(inserters, nuclear_inserter)
 local nuclear_long_handed_inserter = util.table.deepcopy(data.raw["inserter"]["long-handed-inserter"])
 nuclear_long_handed_inserter.name = "nuclear-long-handed-inserter"
 nuclear_long_handed_inserter.icon = "__RandomFactorioThings__/graphics/icons/nuclear-long-handed-inserter.png"
-nuclear_long_handed_inserter.icon_size = 32
 nuclear_long_handed_inserter.minable.result = "nuclear-long-handed-inserter"
 nuclear_long_handed_inserter.energy_per_movement = "10kJ"
 nuclear_long_handed_inserter.energy_per_rotation = "10kJ"
@@ -42,10 +42,30 @@ nuclear_long_handed_inserter.platform_picture.sheet.hr_version.filename = "__Ran
 table.insert(inserters, nuclear_long_handed_inserter)
 data.raw["inserter"]["long-handed-inserter"].next_upgrade = "nuclear-long-handed-inserter"
 
+local nuclear_filter_inserter = util.table.deepcopy(data.raw['inserter']['filter-inserter'])
+nuclear_filter_inserter.name = 'nuclear-filter-inserter'
+nuclear_filter_inserter.icon = '__RandomFactorioThings__/graphics/icons/nuclear-filter-inserter.png'
+nuclear_filter_inserter.minable.result = 'nuclear-filter-inserter'
+nuclear_filter_inserter.energy_per_movement = '18kJ'
+nuclear_filter_inserter.energy_per_rotation = '18kJ'
+nuclear_filter_inserter.energy_source.drain = '0.7kW'
+nuclear_filter_inserter.extension_speed = 0.1
+nuclear_filter_inserter.rotation_speed = 0.06
+nuclear_filter_inserter.next_upgrade = nil
+nuclear_filter_inserter.hand_base_picture.filename = "__RandomFactorioThings__/graphics/entity/nuclear-inserter/nuclear-inserter-hand-base.png"
+nuclear_filter_inserter.hand_base_picture.hr_version.filename = "__RandomFactorioThings__/graphics/entity/nuclear-inserter/hr-nuclear-inserter-hand-base.png"
+nuclear_filter_inserter.hand_closed_picture.filename = "__RandomFactorioThings__/graphics/entity/nuclear-filter-inserter/nuclear-filter-inserter-hand-closed.png"
+nuclear_filter_inserter.hand_closed_picture.hr_version.filename = "__RandomFactorioThings__/graphics/entity/nuclear-filter-inserter/hr-nuclear-filter-inserter-hand-closed.png"
+nuclear_filter_inserter.hand_open_picture.filename = "__RandomFactorioThings__/graphics/entity/nuclear-filter-inserter/nuclear-filter-inserter-hand-open.png"
+nuclear_filter_inserter.hand_open_picture.hr_version.filename = "__RandomFactorioThings__/graphics/entity/nuclear-filter-inserter/hr-nuclear-filter-inserter-hand-open.png"
+nuclear_filter_inserter.platform_picture.sheet.filename = "__RandomFactorioThings__/graphics/entity/nuclear-filter-inserter/nuclear-filter-inserter-platform.png"
+nuclear_filter_inserter.platform_picture.sheet.hr_version.filename = "__RandomFactorioThings__/graphics/entity/nuclear-filter-inserter/hr-nuclear-filter-inserter-platform.png"
+table.insert(inserters, nuclear_filter_inserter)
+data.raw['inserter']['filter-inserter'].next_upgrade = 'nuclear-filter-inserter'
+
 local nuclear_stack_inserter = util.table.deepcopy(data.raw["inserter"]["stack-inserter"])
 nuclear_stack_inserter.name = "nuclear-stack-inserter"
 nuclear_stack_inserter.icon = "__RandomFactorioThings__/graphics/icons/nuclear-stack-inserter.png"
-nuclear_stack_inserter.icon_size = 32
 nuclear_stack_inserter.minable.result = "nuclear-stack-inserter"
 nuclear_stack_inserter.energy_per_movement = "30kJ"
 nuclear_stack_inserter.energy_per_rotation = "30kJ"
@@ -66,7 +86,6 @@ data.raw["inserter"]["stack-inserter"].next_upgrade = "nuclear-stack-inserter"
 local nuclear_stack_filter_inserter = util.table.deepcopy(data.raw["inserter"]["stack-filter-inserter"])
 nuclear_stack_filter_inserter.name = "nuclear-stack-filter-inserter"
 nuclear_stack_filter_inserter.icon = "__RandomFactorioThings__/graphics/icons/nuclear-stack-filter-inserter.png"
-nuclear_stack_filter_inserter.icon_size = 32
 nuclear_stack_filter_inserter.minable.result = "nuclear-stack-filter-inserter"
 nuclear_stack_filter_inserter.energy_per_movement = nuclear_stack_inserter.energy_per_movement
 nuclear_stack_filter_inserter.energy_per_rotation = nuclear_stack_inserter.energy_per_rotation
@@ -88,7 +107,6 @@ if mods["PlutoniumEnergy"] then
     local plutonium_inserter = util.table.deepcopy(nuclear_inserter)
     plutonium_inserter.name = "plutonium-inserter"
     plutonium_inserter.icon = "__RandomFactorioThings__/graphics/icons/plutonium-inserter.png"
-    plutonium_inserter.icon_size = 32
     plutonium_inserter.minable.result = "plutonium-inserter"
     plutonium_inserter.energy_per_movement = "25kJ"
     plutonium_inserter.energy_per_rotation = "25kJ"
@@ -108,7 +126,6 @@ if mods["PlutoniumEnergy"] then
     local plutonium_long_handed_inserter = util.table.deepcopy(nuclear_long_handed_inserter)
     plutonium_long_handed_inserter.name = "plutonium-long-handed-inserter"
     plutonium_long_handed_inserter.icon = "__RandomFactorioThings__/graphics/icons/plutonium-long-handed-inserter.png"
-    plutonium_long_handed_inserter.icon_size = 32
     plutonium_long_handed_inserter.minable.result = "plutonium-long-handed-inserter"
     plutonium_long_handed_inserter.energy_per_movement = "20kJ"
     plutonium_long_handed_inserter.energy_per_rotation = "20kJ"
@@ -125,10 +142,28 @@ if mods["PlutoniumEnergy"] then
     plutonium_long_handed_inserter.platform_picture.sheet.hr_version.filename = "__RandomFactorioThings__/graphics/entity/plutonium-long-handed-inserter/hr-plutonium-long-handed-inserter-platform.png"
     table.insert(inserters, plutonium_long_handed_inserter)
 
+    local plutonium_filter_inserter = util.table.deepcopy(nuclear_filter_inserter)
+    plutonium_filter_inserter.name = 'plutonium-filter-inserter'
+    plutonium_filter_inserter.icon = '__RandomFactorioThings__/graphics/icons/plutonium-filter-inserter.png'
+    plutonium_filter_inserter.minable.result = 'plutonium-filter-inserter'
+    plutonium_filter_inserter.energy_per_movement = '30kJ'
+    plutonium_filter_inserter.energy_per_rotation = '30kJ'
+    plutonium_filter_inserter.energy_source.drain = '0.8kW'
+    plutonium_filter_inserter.rotation_speed = 0.85
+    plutonium_filter_inserter.extension_speed = 0.15
+    plutonium_filter_inserter.hand_base_picture.filename = "__RandomFactorioThings__/graphics/entity/plutonium-filter-inserter/plutonium-filter-inserter-hand-base.png"
+    plutonium_filter_inserter.hand_base_picture.hr_version.filename = "__RandomFactorioThings__/graphics/entity/plutonium-filter-inserter/hr-plutonium-filter-inserter-hand-base.png"
+    plutonium_filter_inserter.hand_closed_picture.filename = "__RandomFactorioThings__/graphics/entity/plutonium-filter-inserter/plutonium-filter-inserter-hand-closed.png"
+    plutonium_filter_inserter.hand_closed_picture.hr_version.filename = "__RandomFactorioThings__/graphics/entity/plutonium-filter-inserter/hr-plutonium-filter-inserter-hand-closed.png"
+    plutonium_filter_inserter.hand_open_picture.filename = "__RandomFactorioThings__/graphics/entity/plutonium-filter-inserter/plutonium-filter-inserter-hand-open.png"
+    plutonium_filter_inserter.hand_open_picture.hr_version.filename = "__RandomFactorioThings__/graphics/entity/plutonium-filter-inserter/hr-plutonium-filter-inserter-hand-open.png"
+    plutonium_filter_inserter.platform_picture.sheet.filename = "__RandomFactorioThings__/graphics/entity/plutonium-filter-inserter/plutonium-filter-inserter-platform.png"
+    plutonium_filter_inserter.platform_picture.sheet.hr_version.filename = "__RandomFactorioThings__/graphics/entity/plutonium-filter-inserter/hr-plutonium-filter-inserter-platform.png"
+    table.insert(inserters, plutonium_filter_inserter)
+
     local plutonium_stack_inserter = util.table.deepcopy(nuclear_stack_inserter)
     plutonium_stack_inserter.name = "plutonium-stack-inserter"
     plutonium_stack_inserter.icon = "__RandomFactorioThings__/graphics/icons/plutonium-stack-inserter.png"
-    plutonium_stack_inserter.icon_size = 32
     plutonium_stack_inserter.minable.result = "plutonium-stack-inserter"
     plutonium_stack_inserter.energy_per_movement = "50kJ"
     plutonium_stack_inserter.energy_per_rotation = "50kJ"
@@ -148,7 +183,6 @@ if mods["PlutoniumEnergy"] then
     local plutonium_stack_filter_inserter = util.table.deepcopy(nuclear_stack_filter_inserter)
     plutonium_stack_filter_inserter.name = "plutonium-stack-filter-inserter"
     plutonium_stack_filter_inserter.icon = "__RandomFactorioThings__/graphics/icons/plutonium-stack-filter-inserter.png"
-    plutonium_stack_filter_inserter.icon_size = 32
     plutonium_stack_filter_inserter.minable.result = "plutonium-stack-filter-inserter"
     plutonium_stack_filter_inserter.energy_per_movement = plutonium_stack_inserter.energy_per_movement
     plutonium_stack_filter_inserter.energy_per_rotation = plutonium_stack_inserter.energy_per_rotation
@@ -167,8 +201,9 @@ if mods["PlutoniumEnergy"] then
 
     inserters[1].next_upgrade = "plutonium-inserter"
     inserters[2].next_upgrade = "plutonium-long-handed-inserter"
-    inserters[3].next_upgrade = "plutonium-stack-inserter"
-    inserters[4].next_upgrade = "plutonium-stack-filter-inserter"
+    inserters[3].next_upgrade = 'plutonium-filter-inserter'
+    inserters[4].next_upgrade = "plutonium-stack-inserter"
+    inserters[5].next_upgrade = "plutonium-stack-filter-inserter"
 end
 
 data:extend(inserters)