diff --git a/src/main/java/supersymmetry/api/recipes/SuSyRecipeMaps.java b/src/main/java/supersymmetry/api/recipes/SuSyRecipeMaps.java
index f09820a8e..cf86f7ca8 100644
--- a/src/main/java/supersymmetry/api/recipes/SuSyRecipeMaps.java
+++ b/src/main/java/supersymmetry/api/recipes/SuSyRecipeMaps.java
@@ -116,7 +116,7 @@ public class SuSyRecipeMaps {
             .setProgressBar(GuiTextures.PROGRESS_BAR_MAGNET, ProgressWidget.MoveType.HORIZONTAL)
             .setSound(GTSoundEvents.CENTRIFUGE);
 
-    public static final RecipeMap<SimpleRecipeBuilder> POLISHING_MACHINE = new RecipeMap<>("polishing_machine", 1, 1, 2, 1, new SimpleRecipeBuilder(), false)
+    public static final RecipeMap<SimpleRecipeBuilder> WAFER_SPINNER = new RecipeMap<>("wafer_spinner", 1, 1, 2, 1, new SimpleRecipeBuilder(), false)
             .setProgressBar(GuiTextures.PROGRESS_BAR_MIXER, ProgressWidget.MoveType.CIRCULAR)
             .setSound(GTSoundEvents.CENTRIFUGE);
 
@@ -168,6 +168,9 @@ public class SuSyRecipeMaps {
     public static final RecipeMap<SimpleRecipeBuilder> CVD_RECIPES = new RecipeMap<>("cvd", 3, 1, 2, 2, new SimpleRecipeBuilder(), false)
             .setSound(GTSoundEvents.ARC);
 
+    public static final RecipeMap<SimpleRecipeBuilder> SPUTTER_DEPOSITION_RECIPES = new RecipeMap<>("sputter_deposition", 6, 1, 2, 2, new SimpleRecipeBuilder(), false)
+            .setSound(GTSoundEvents.ELECTROLYZER);
+
     public static final RecipeMap<SimpleRecipeBuilder> ORE_SORTER_RECIPES = new RecipeMap<>("ore_sorter", 2, 20, 1, 1, new SimpleRecipeBuilder(), false)
             .setProgressBar(GuiTextures.PROGRESS_BAR_EXTRACT, ProgressWidget.MoveType.HORIZONTAL)
             .setSound(GTSoundEvents.MACERATOR);
@@ -267,7 +270,7 @@ public class SuSyRecipeMaps {
     public static final RecipeMap<SimpleRecipeBuilder> IN_SITU_LEACHER = new RecipeMap<>("in_situ_leacher", 2, 2, 2, 2, new SimpleRecipeBuilder(), false)
             .setSound(GTSoundEvents.COMPRESSOR);
 
-    public static final RecipeMap<SimpleRecipeBuilder> EUV_LITHOGRAPHY = new RecipeMap<>("euv_lithography", 3, 3, 3, 3, new SimpleRecipeBuilder(), false)
+    public static final RecipeMap<SimpleRecipeBuilder> EUV_LITHOGRAPHY = new RecipeMap<>("euv_lithography", 3, 3, 0, 0, new SimpleRecipeBuilder(), false)
             .setSound(GTSoundEvents.ELECTROLYZER);
 
     public static final RecipeMap<SimpleRecipeBuilder> ROTARY_KILN = new RecipeMap<>("rotary_kiln", 3, 2, 3, 3, new SimpleRecipeBuilder(), false)
diff --git a/src/main/java/supersymmetry/client/renderer/textures/SusyTextures.java b/src/main/java/supersymmetry/client/renderer/textures/SusyTextures.java
index cb6ba09e8..cdf21b885 100644
--- a/src/main/java/supersymmetry/client/renderer/textures/SusyTextures.java
+++ b/src/main/java/supersymmetry/client/renderer/textures/SusyTextures.java
@@ -41,6 +41,7 @@ public SusyTextures(){
     public static final OrientedOverlayRenderer UV_LIGHT_BOX_OVERLAY = new OrientedOverlayRenderer("machines/uv_light_box");
     public static final OrientedOverlayRenderer CVD_OVERLAY = new OrientedOverlayRenderer("machines/cvd");
     public static final OrientedOverlayRenderer ION_IMPLANTER_OVERLAY = new OrientedOverlayRenderer("machines/ion_implanter");
+    public static final OrientedOverlayRenderer SPUTTER_DEPOSITION_OVERLAY = new OrientedOverlayRenderer("machines/sputter_deposition");
     public static final OrientedOverlayRenderer PHASE_SEPARATOR_OVERLAY = new OrientedOverlayRenderer("machines/phase_separator");
     public static final OrientedOverlayRenderer BATH_CONDENSER_OVERLAY = new OrientedOverlayRenderer("machines/bath_condenser");
     public static final OrientedOverlayRenderer CATALYTIC_REFORMER_OVERLAY = new OrientedOverlayRenderer("multiblock/catalytic_reformer");
@@ -50,7 +51,7 @@ public SusyTextures(){
     public static final OrientedOverlayRenderer FLUID_DECOMPRESSOR_OVERLAY = new OrientedOverlayRenderer("machines/fluid_decompressor");
     public static final OrientedOverlayRenderer ELECTROSTATIC_SEPARATOR_OVERLAY = new OrientedOverlayRenderer("machines/electrostatic_separator");
     public static final OrientedOverlayRenderer TEXTILE_SPINNER_OVERLAY = new OrientedOverlayRenderer("machines/textile_spinner");
-    public static final OrientedOverlayRenderer POLISHING_MACHINE_OVERLAY = new OrientedOverlayRenderer("machines/polishing_machine");
+    public static final OrientedOverlayRenderer WAFER_SPINNER_OVERLAY = new OrientedOverlayRenderer("machines/wafer_spinner");
     public static final OrientedOverlayRenderer ARC_FURNACE_OVERLAY = new OrientedOverlayRenderer("machines/multiblocks/arc_furnace");
     public static final OrientedOverlayRenderer CLARIFIER_OVERLAY = new OrientedOverlayRenderer("machines/multiblocks/clarifier");
     public static final OrientedOverlayRenderer CONDENSER_OVERLAY = new OrientedOverlayRenderer("machines/multiblocks/condenser");
@@ -103,6 +104,7 @@ public SusyTextures(){
     public static final SimpleOverlayRenderer RESTRICTIVE_FILTER_FILTER_OVERLAY = new SimpleOverlayRenderer("cover/overlay_restrictive_filter");
     public static final SimpleOverlayRenderer STRAND_BUS_OVERLAY = new SimpleOverlayRenderer(
             "logistics/overlay_strand_bus");
+    public static final SimpleOverlayRenderer EUV_SAFE_CASING = new SimpleOverlayRenderer("multiblock_casing/euv_safe_casing");
 
     public static final SimpleCubeRenderer MASONRY_BRICK = new SimpleCubeRenderer("gregtech:blocks/multiblock_casing/masonry_brick");
 
diff --git a/src/main/java/supersymmetry/common/CommonProxy.java b/src/main/java/supersymmetry/common/CommonProxy.java
index 8f3ebac6a..29fd3f282 100644
--- a/src/main/java/supersymmetry/common/CommonProxy.java
+++ b/src/main/java/supersymmetry/common/CommonProxy.java
@@ -161,6 +161,7 @@ public static void registerBlocks(@NotNull RegistryEvent.Register<Block> event)
         registry.register(SuSyBlocks.CONVEYOR_BELT);
         registry.register(SuSyBlocks.ROCKET_ASSEMBLER_CASING);
         registry.register(SuSyBlocks.REGOLITH);
+        registry.register(SuSyBlocks.EUV_LITHOGRAPHER_COMPONENT);
 
         SHEETED_FRAMES.values().stream().distinct().forEach(registry::register);
     }
@@ -200,6 +201,7 @@ public static void registerItems(@NotNull RegistryEvent.Register<Item> event) {
         registry.register(createItemBlock(SuSyBlocks.CONVEYOR_BELT, VariantItemBlock::new));
         registry.register(createItemBlock(SuSyBlocks.ROCKET_ASSEMBLER_CASING, VariantItemBlock::new));
         registry.register(createItemBlock(SuSyBlocks.REGOLITH, VariantItemBlockFalling::new));
+        registry.register(createItemBlock(SuSyBlocks.EUV_LITHOGRAPHER_COMPONENT, VariantItemBlock::new));
 
         SHEETED_FRAMES.values()
                 .stream().distinct()
diff --git a/src/main/java/supersymmetry/common/blocks/BlockEUVLithographerComponent.java b/src/main/java/supersymmetry/common/blocks/BlockEUVLithographerComponent.java
new file mode 100644
index 000000000..42a6f9b7d
--- /dev/null
+++ b/src/main/java/supersymmetry/common/blocks/BlockEUVLithographerComponent.java
@@ -0,0 +1,58 @@
+package supersymmetry.common.blocks;
+
+import gregtech.api.block.VariantBlock;
+import net.minecraft.block.SoundType;
+import net.minecraft.block.material.Material;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.entity.EntityLiving;
+import net.minecraft.util.BlockRenderLayer;
+import net.minecraft.util.IStringSerializable;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.IBlockAccess;
+import org.jetbrains.annotations.NotNull;
+
+import javax.annotation.Nonnull;
+
+public class BlockEUVLithographerComponent extends VariantBlock<BlockEUVLithographerComponent.EUVComponentType> {
+
+    public BlockEUVLithographerComponent() {
+        super(Material.IRON);
+        setTranslationKey("euv_lithographer_component");
+        setHardness(5.0f);
+        setResistance(5.0f);
+        setSoundType(SoundType.METAL);
+        setHarvestLevel("wrench", 1);
+        setDefaultState(getState(EUVComponentType.LASER));
+    }
+
+    @Nonnull
+    @Override
+    public BlockRenderLayer getRenderLayer() {
+        return BlockRenderLayer.SOLID;
+    }
+
+    @Override
+    public boolean canCreatureSpawn(@NotNull IBlockState state, @NotNull IBlockAccess world, @NotNull BlockPos pos,
+                                    @NotNull EntityLiving.SpawnPlacementType type) {
+        return false;
+    }
+
+    public enum EUVComponentType implements IStringSerializable {
+        LASER("laser"),
+        RETICLE("reticle"),
+        MIRROR("mirror"),
+        TRAY("tray"),
+        HANDLER("handler");
+
+        private final String name;
+
+        EUVComponentType(String name) {
+            this.name = name;
+        }
+
+        @Nonnull
+        public String getName() {
+            return this.name;
+        }
+    }
+}
diff --git a/src/main/java/supersymmetry/common/blocks/BlockSuSyMultiblockCasing.java b/src/main/java/supersymmetry/common/blocks/BlockSuSyMultiblockCasing.java
index a1703b5cb..60853d08e 100644
--- a/src/main/java/supersymmetry/common/blocks/BlockSuSyMultiblockCasing.java
+++ b/src/main/java/supersymmetry/common/blocks/BlockSuSyMultiblockCasing.java
@@ -40,7 +40,8 @@ public enum CasingType implements IStringSerializable {
         COPPER_PIPE("copper_casing_pipe"),
         HEAVY_DUTY_PAD("heavy_duty_pad"),
         ADVANCED_REFRACTORY_LINING("advanced_refractory_lining"),
-        COALESCENCE_PLATE("coalescence_plate");
+        COALESCENCE_PLATE("coalescence_plate"),
+        EUV_SAFE_CASING("euv_safe_casing");
 
         private final String name;
 
diff --git a/src/main/java/supersymmetry/common/blocks/SuSyBlocks.java b/src/main/java/supersymmetry/common/blocks/SuSyBlocks.java
index 251123867..cc0fab4a5 100644
--- a/src/main/java/supersymmetry/common/blocks/SuSyBlocks.java
+++ b/src/main/java/supersymmetry/common/blocks/SuSyBlocks.java
@@ -50,6 +50,7 @@ public class SuSyBlocks {
     public static BlockConveyor CONVEYOR_BELT;
     public static BlockRocketAssemblerCasing ROCKET_ASSEMBLER_CASING;
     public static BlockRegolith REGOLITH;
+    public static BlockEUVLithographerComponent EUV_LITHOGRAPHER_COMPONENT;
 
     public static void init() {
         COOLING_COIL = new BlockCoolingCoil();
@@ -134,12 +135,15 @@ public static void init() {
 
         CONVEYOR_BELT = new BlockConveyor();
         CONVEYOR_BELT.setRegistryName("conveyor_belt");
-      
+
         ROCKET_ASSEMBLER_CASING = new BlockRocketAssemblerCasing();
         ROCKET_ASSEMBLER_CASING.setRegistryName("rocket_assembler_casing");
 
         REGOLITH = new BlockRegolith();
         REGOLITH.setRegistryName("regolith");
+
+        EUV_LITHOGRAPHER_COMPONENT = new BlockEUVLithographerComponent();
+        EUV_LITHOGRAPHER_COMPONENT.setRegistryName("euv_lithographer_component");
     }
 
     @SideOnly(Side.CLIENT)
@@ -174,6 +178,7 @@ public static void registerItemModels() {
         registerItemModel(CONVEYOR_BELT);
         registerItemModel(ROCKET_ASSEMBLER_CASING);
         registerItemModel(REGOLITH);
+        registerItemModel(EUV_LITHOGRAPHER_COMPONENT);
     }
 
     @SideOnly(Side.CLIENT)
diff --git a/src/main/java/supersymmetry/common/metatileentities/SuSyMetaTileEntities.java b/src/main/java/supersymmetry/common/metatileentities/SuSyMetaTileEntities.java
index 40cfec809..4408ba92b 100644
--- a/src/main/java/supersymmetry/common/metatileentities/SuSyMetaTileEntities.java
+++ b/src/main/java/supersymmetry/common/metatileentities/SuSyMetaTileEntities.java
@@ -115,6 +115,7 @@ public class SuSyMetaTileEntities {
 
     public static SimpleMachineMetaTileEntity[] ION_IMPLANTER;
     public static SimpleMachineMetaTileEntity[] CVD;
+    public static SimpleMachineMetaTileEntity[] SPUTTER_DEPOSITION;
 
     public static SimpleMachineMetaTileEntity[] WEAPONS_FACTORY;
 
@@ -172,7 +173,7 @@ public class SuSyMetaTileEntities {
     public static SimpleMachineMetaTileEntity[] BATH_CONDENSER;
     public static SimpleMachineMetaTileEntity[] ELECTROSTATIC_SEPARATOR;
     public static SimpleMachineMetaTileEntity[] TEXTILE_SPINNER;
-    public static SimpleMachineMetaTileEntity[] POLISHING_MACHINE;
+    public static SimpleMachineMetaTileEntity[] WAFER_SPINNER;
 
     public static MetaTileEntityPrimitiveSmelter PRIMITIVE_SMELTER;
     public static MetaTileEntityPrimitiveItemBus PRIMITIVE_ITEM_IMPORT;
@@ -228,6 +229,8 @@ public class SuSyMetaTileEntities {
     //public static MetaTileEntityStockReader STOCK_CONTENT_READER;
     public static MetaTileEntityLocomotiveController STOCK_CONTROLLER;
 
+    public static MetaTileEntityEUVLithographer EUV_LITHOGRAPHER;
+
     public static void init() {
         MAGNETIC_REFRIGERATOR = registerMetaTileEntity(14500, new MetaTileEntityMagneticRefrigerator(susyId("magnetic_refrigerator")));
         COAGULATION_TANK = registerMetaTileEntity(14501, new MetaTileEntityCoagulationTank(susyId("coagulation_tank")));
@@ -311,6 +314,9 @@ public static void init() {
         CURTAIN_COATER = registerMetaTileEntity(14513, new MetaTileEntityCurtainCoater(susyId("curtain_coater")));
         MILLING = registerMetaTileEntity(14514, new MetaTileEntityPreciseMillingMachine(susyId("milling")));
 
+        EUV_LITHOGRAPHER = registerMetaTileEntity(14741, new MetaTileEntityEUVLithographer(susyId("euv_lithographer")));
+        registerSimpleMTE(SPUTTER_DEPOSITION, 12, 14742, "sputter_deposition", SuSyRecipeMaps.SPUTTER_DEPOSITION_RECIPES, SusyTextures.SPUTTER_DEPOSITION_OVERLAY, true, GTUtility.defaultTankSizeFunction);
+
         //thermodynamic stuff
         registerSimpleMTE(FLUID_COMPRESSOR, 12, 15000, "fluid_compressor", SuSyRecipeMaps.FLUID_COMPRESSOR_RECIPES, SusyTextures.FLUID_COMPRESSOR_OVERLAY, true, GTUtility.defaultTankSizeFunction);
         registerSimpleMTE(FLUID_DECOMPRESSOR, 12, 15013, "fluid_decompressor", SuSyRecipeMaps.FLUID_DECOMPRESSOR_RECIPES, SusyTextures.FLUID_DECOMPRESSOR_OVERLAY, true, GTUtility.defaultTankSizeFunction);
@@ -414,7 +420,7 @@ public static void init() {
         }
 
         registerSimpleMTE(ELECTROSTATIC_SEPARATOR, 12, 17035, "electrostatic_separator", SuSyRecipeMaps.ELECTROSTATIC_SEPARATOR, SusyTextures.ELECTROSTATIC_SEPARATOR_OVERLAY, true, GTUtility.defaultTankSizeFunction);
-        registerSimpleMTE(POLISHING_MACHINE, 12, 17048, "polishing_machine", SuSyRecipeMaps.POLISHING_MACHINE, SusyTextures.POLISHING_MACHINE_OVERLAY, true, GTUtility.defaultTankSizeFunction);
+        registerSimpleMTE(WAFER_SPINNER, 12, 17048, "wafer_spinner", SuSyRecipeMaps.WAFER_SPINNER, SusyTextures.WAFER_SPINNER_OVERLAY, true, GTUtility.defaultTankSizeFunction);
         registerSimpleMTE(TEXTILE_SPINNER, 12, 17061, "textile_spinner", SuSyRecipeMaps.SPINNING_RECIPES, SusyTextures.TEXTILE_SPINNER_OVERLAY, true);
         ArrayList<Integer> ids = new ArrayList<>();
         for (int id = 14500; id < 15000; id++) {
@@ -429,7 +435,7 @@ public static void init() {
         STOCK_ITEM_EXCHANGER = registerMetaTileEntity(18002, new MetaTileEntityStockItemExchanger(susyId("stock_item_exchanger")));
         //STOCK_CONTENT_READER = registerMetaTileEntity(18003, new MetaTileEntityStockReader(susyId("stock_content_reader")));
         STOCK_CONTROLLER = registerMetaTileEntity(18004, new MetaTileEntityLocomotiveController(susyId("stock_controller")));
-      
+
         //Space machines
         LANDING_PAD = registerMetaTileEntity(18005, new MetaTileEntityLandingPad(susyId("landing_pad")));
         SCRAP_RECYCLER = registerMetaTileEntity(18006, new MetaTileEntityScrapRecycler(susyId("scrap_recycler")));
@@ -504,6 +510,7 @@ private static void registerCatalystMTE(CatalystMachineMetaTileEntity[] machines
         UV_LIGHT_BOX = new SimpleMachineMetaTileEntity[GTValues.OpV];
         CVD = new SimpleMachineMetaTileEntity[GTValues.OpV];
         ION_IMPLANTER = new SimpleMachineMetaTileEntity[GTValues.OpV];
+        SPUTTER_DEPOSITION = new SimpleMachineMetaTileEntity[GTValues.OpV];
 
         FLUID_COMPRESSOR = new SimpleMachineMetaTileEntity[GTValues.OpV];
         FLUID_DECOMPRESSOR = new SimpleMachineMetaTileEntity[GTValues.OpV];
@@ -511,7 +518,7 @@ private static void registerCatalystMTE(CatalystMachineMetaTileEntity[] machines
 
         ELECTROSTATIC_SEPARATOR = new SimpleMachineMetaTileEntity[GTValues.OpV];
         TEXTILE_SPINNER = new SimpleMachineMetaTileEntity[GTValues.OpV];
-        POLISHING_MACHINE = new SimpleMachineMetaTileEntity[GTValues.OpV];
+        WAFER_SPINNER = new SimpleMachineMetaTileEntity[GTValues.OpV];
 
         PHASE_SEPARATOR = new SimpleMachineMetaTileEntity[1];
         BATH_CONDENSER = new SimpleMachineMetaTileEntity[1];
diff --git a/src/main/java/supersymmetry/common/metatileentities/multi/electric/MetaTileEntityEUVLithographer.java b/src/main/java/supersymmetry/common/metatileentities/multi/electric/MetaTileEntityEUVLithographer.java
new file mode 100644
index 000000000..610bf0eb7
--- /dev/null
+++ b/src/main/java/supersymmetry/common/metatileentities/multi/electric/MetaTileEntityEUVLithographer.java
@@ -0,0 +1,108 @@
+package supersymmetry.common.metatileentities.multi.electric;
+
+
+import gregtech.api.metatileentity.MetaTileEntity;
+import gregtech.api.metatileentity.interfaces.IGregTechTileEntity;
+import gregtech.api.metatileentity.multiblock.IMultiblockPart;
+import gregtech.api.metatileentity.multiblock.RecipeMapMultiblockController;
+import gregtech.api.pattern.BlockPattern;
+import gregtech.api.pattern.FactoryBlockPattern;
+import gregtech.api.pattern.TraceabilityPredicate;
+import gregtech.client.renderer.ICubeRenderer;
+import gregtech.client.renderer.texture.Textures;
+import gregtech.common.blocks.BlockTurbineCasing;
+import gregtech.common.blocks.MetaBlocks;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.util.ResourceLocation;
+import supersymmetry.api.recipes.SuSyRecipeMaps;
+import supersymmetry.client.renderer.textures.SusyTextures;
+import supersymmetry.common.blocks.*;
+
+import javax.annotation.Nonnull;
+
+
+import static gregtech.api.util.RelativeDirection.*;
+
+public class MetaTileEntityEUVLithographer extends RecipeMapMultiblockController {
+
+    public MetaTileEntityEUVLithographer(ResourceLocation metaTileEntityId) {
+        super(metaTileEntityId, SuSyRecipeMaps.EUV_LITHOGRAPHY);
+    }
+
+    @Override
+    public MetaTileEntity createMetaTileEntity(IGregTechTileEntity iGregTechTileEntity) {
+        return new MetaTileEntityEUVLithographer(metaTileEntityId);
+    }
+
+    @Override
+    protected BlockPattern createStructurePattern() {
+        TraceabilityPredicate casingPredicate = states(getCasingState()).setMinGlobalLimited(210);
+        return FactoryBlockPattern.start(RIGHT, FRONT, DOWN)
+                .aisle("CCCCCCCCCCXXXX", "CCCCCCCCCCXXXX", "CCCCCCCCCCXXXX", "CCCCCCCCCCXXXX")
+                .aisle("CCCCCCCCCCXXXX", "C     MMRMXLLX", "C         XLLX", "CCCCCCCCCCXXXX")
+                .aisle("CCSCCCCCCCXXXX", "C         XLLX", "CATTTA    XLLX", "CCCCCCCCCCXXXX")
+                .aisle("CCCCCCCCCCXXXX", "CTATATMMMLLLLX", "CXXXXXXXXXXLLX", "CCCCCCCCCCXXXX")
+                .aisle("CCCCCCCCCCXXXX", "CCCCCCCCCCXXXX", "CCCCCCCCCCXXXX", "CCCCCCCCCCXXXX")
+                .where('S', selfPredicate())
+                .where('C', casingPredicate.or(autoAbilities()))
+                .where('X', casingPredicate)
+                .where('G', states(getGearBoxState()))
+                .where('L', states(getLaserEmitterState()))
+                .where('T', states(getTrayState()))
+                .where('A', states(getRobotArmState()))
+                .where('M', states(getMirrorState()))
+                .where('R', states(getReticleState()))
+                .where(' ', air())
+                .build();
+    }
+
+    protected IBlockState getCasingState() {
+        return SuSyBlocks.MULTIBLOCK_CASING.getState(BlockSuSyMultiblockCasing.CasingType.EUV_SAFE_CASING);
+    }
+
+    protected IBlockState getGearBoxState() {
+        return MetaBlocks.TURBINE_CASING.getState(BlockTurbineCasing.TurbineCasingType.TUNGSTENSTEEL_GEARBOX);
+    }
+
+    protected IBlockState getTrayState() {
+        return SuSyBlocks.EUV_LITHOGRAPHER_COMPONENT.getState(BlockEUVLithographerComponent.EUVComponentType.TRAY);
+    }
+
+    protected IBlockState getRobotArmState() {
+        return SuSyBlocks.EUV_LITHOGRAPHER_COMPONENT.getState(BlockEUVLithographerComponent.EUVComponentType.HANDLER);
+    }
+
+    protected IBlockState getLaserEmitterState() {
+        return SuSyBlocks.EUV_LITHOGRAPHER_COMPONENT.getState(BlockEUVLithographerComponent.EUVComponentType.LASER);
+    }
+
+    protected IBlockState getMirrorState() {
+        return SuSyBlocks.EUV_LITHOGRAPHER_COMPONENT.getState(BlockEUVLithographerComponent.EUVComponentType.MIRROR);
+    }
+
+    protected IBlockState getReticleState() {
+        return SuSyBlocks.EUV_LITHOGRAPHER_COMPONENT.getState(BlockEUVLithographerComponent.EUVComponentType.RETICLE);
+    }
+
+
+
+    @Override
+    public ICubeRenderer getBaseTexture(IMultiblockPart iMultiblockPart) {
+        return SusyTextures.EUV_SAFE_CASING;
+    }
+
+    @Nonnull
+    @Override
+    protected ICubeRenderer getFrontOverlay() {
+        return Textures.BLAST_FURNACE_OVERLAY;
+    }
+
+    @Override
+    public boolean allowsExtendedFacing() {
+        return false;
+    }
+
+    public boolean allowsFlip() {
+        return true;
+    }
+}
diff --git a/src/main/resources/assets/gregtech/textures/blocks/casings/euv_component/carbon_dioxide_laser.png b/src/main/resources/assets/gregtech/textures/blocks/casings/euv_component/carbon_dioxide_laser.png
new file mode 100644
index 000000000..596e7a471
Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/casings/euv_component/carbon_dioxide_laser.png differ
diff --git a/src/main/resources/assets/gregtech/textures/blocks/casings/euv_component/euv_laser_mirror.png b/src/main/resources/assets/gregtech/textures/blocks/casings/euv_component/euv_laser_mirror.png
new file mode 100644
index 000000000..6bfca05c3
Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/casings/euv_component/euv_laser_mirror.png differ
diff --git a/src/main/resources/assets/gregtech/textures/blocks/casings/euv_component/euv_laser_reticle.png b/src/main/resources/assets/gregtech/textures/blocks/casings/euv_component/euv_laser_reticle.png
new file mode 100644
index 000000000..222fc4cd8
Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/casings/euv_component/euv_laser_reticle.png differ
diff --git a/src/main/resources/assets/gregtech/textures/blocks/casings/euv_component/euv_laser_reticle_side.png b/src/main/resources/assets/gregtech/textures/blocks/casings/euv_component/euv_laser_reticle_side.png
new file mode 100644
index 000000000..286a70c39
Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/casings/euv_component/euv_laser_reticle_side.png differ
diff --git a/src/main/resources/assets/gregtech/textures/blocks/casings/euv_component/euv_wafer_robot_arm.png b/src/main/resources/assets/gregtech/textures/blocks/casings/euv_component/euv_wafer_robot_arm.png
new file mode 100644
index 000000000..22fc9bc84
Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/casings/euv_component/euv_wafer_robot_arm.png differ
diff --git a/src/main/resources/assets/gregtech/textures/blocks/casings/euv_component/euv_wafer_stage.png b/src/main/resources/assets/gregtech/textures/blocks/casings/euv_component/euv_wafer_stage.png
new file mode 100644
index 000000000..ca583488d
Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/casings/euv_component/euv_wafer_stage.png differ
diff --git a/src/main/resources/assets/gregtech/textures/blocks/machines/sputter_deposition/overlay_front.png b/src/main/resources/assets/gregtech/textures/blocks/machines/sputter_deposition/overlay_front.png
new file mode 100644
index 000000000..2700e687a
Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/machines/sputter_deposition/overlay_front.png differ
diff --git a/src/main/resources/assets/gregtech/textures/blocks/machines/sputter_deposition/overlay_front_active.png b/src/main/resources/assets/gregtech/textures/blocks/machines/sputter_deposition/overlay_front_active.png
new file mode 100644
index 000000000..2c34206e4
Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/machines/sputter_deposition/overlay_front_active.png differ
diff --git a/src/main/resources/assets/gregtech/textures/blocks/machines/sputter_deposition/overlay_front_active_emissive.png b/src/main/resources/assets/gregtech/textures/blocks/machines/sputter_deposition/overlay_front_active_emissive.png
new file mode 100644
index 000000000..80a72cc3c
Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/machines/sputter_deposition/overlay_front_active_emissive.png differ
diff --git a/src/main/resources/assets/gregtech/textures/blocks/machines/sputter_deposition/overlay_side.png b/src/main/resources/assets/gregtech/textures/blocks/machines/sputter_deposition/overlay_side.png
new file mode 100644
index 000000000..c2f2ae434
Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/machines/sputter_deposition/overlay_side.png differ
diff --git a/src/main/resources/assets/gregtech/textures/blocks/machines/sputter_deposition/overlay_side_active.png b/src/main/resources/assets/gregtech/textures/blocks/machines/sputter_deposition/overlay_side_active.png
new file mode 100644
index 000000000..297ab5bd2
Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/machines/sputter_deposition/overlay_side_active.png differ
diff --git a/src/main/resources/assets/gregtech/textures/blocks/machines/sputter_deposition/overlay_side_active_emissive.png b/src/main/resources/assets/gregtech/textures/blocks/machines/sputter_deposition/overlay_side_active_emissive.png
new file mode 100644
index 000000000..c2039765b
Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/machines/sputter_deposition/overlay_side_active_emissive.png differ
diff --git a/src/main/resources/assets/gregtech/textures/blocks/machines/polishing_machine/overlay_front.png b/src/main/resources/assets/gregtech/textures/blocks/machines/wafer_spinner/overlay_front.png
similarity index 100%
rename from src/main/resources/assets/gregtech/textures/blocks/machines/polishing_machine/overlay_front.png
rename to src/main/resources/assets/gregtech/textures/blocks/machines/wafer_spinner/overlay_front.png
diff --git a/src/main/resources/assets/gregtech/textures/blocks/machines/polishing_machine/overlay_front_active.png b/src/main/resources/assets/gregtech/textures/blocks/machines/wafer_spinner/overlay_front_active.png
similarity index 100%
rename from src/main/resources/assets/gregtech/textures/blocks/machines/polishing_machine/overlay_front_active.png
rename to src/main/resources/assets/gregtech/textures/blocks/machines/wafer_spinner/overlay_front_active.png
diff --git a/src/main/resources/assets/gregtech/textures/blocks/machines/polishing_machine/overlay_front_active.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/machines/wafer_spinner/overlay_front_active.png.mcmeta
similarity index 100%
rename from src/main/resources/assets/gregtech/textures/blocks/machines/polishing_machine/overlay_front_active.png.mcmeta
rename to src/main/resources/assets/gregtech/textures/blocks/machines/wafer_spinner/overlay_front_active.png.mcmeta
diff --git a/src/main/resources/assets/gregtech/textures/blocks/machines/polishing_machine/overlay_top.png b/src/main/resources/assets/gregtech/textures/blocks/machines/wafer_spinner/overlay_top.png
similarity index 100%
rename from src/main/resources/assets/gregtech/textures/blocks/machines/polishing_machine/overlay_top.png
rename to src/main/resources/assets/gregtech/textures/blocks/machines/wafer_spinner/overlay_top.png
diff --git a/src/main/resources/assets/gregtech/textures/blocks/machines/polishing_machine/overlay_top_active.png b/src/main/resources/assets/gregtech/textures/blocks/machines/wafer_spinner/overlay_top_active.png
similarity index 100%
rename from src/main/resources/assets/gregtech/textures/blocks/machines/polishing_machine/overlay_top_active.png
rename to src/main/resources/assets/gregtech/textures/blocks/machines/wafer_spinner/overlay_top_active.png
diff --git a/src/main/resources/assets/gregtech/textures/blocks/machines/polishing_machine/overlay_top_active.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/machines/wafer_spinner/overlay_top_active.png.mcmeta
similarity index 100%
rename from src/main/resources/assets/gregtech/textures/blocks/machines/polishing_machine/overlay_top_active.png.mcmeta
rename to src/main/resources/assets/gregtech/textures/blocks/machines/wafer_spinner/overlay_top_active.png.mcmeta
diff --git a/src/main/resources/assets/gregtech/textures/blocks/multiblock_casing/euv_safe_casing.png b/src/main/resources/assets/gregtech/textures/blocks/multiblock_casing/euv_safe_casing.png
new file mode 100644
index 000000000..9f8af8c82
Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/multiblock_casing/euv_safe_casing.png differ
diff --git a/src/main/resources/assets/susy/blockstates/euv_lithographer_component.json b/src/main/resources/assets/susy/blockstates/euv_lithographer_component.json
new file mode 100644
index 000000000..887aa1694
--- /dev/null
+++ b/src/main/resources/assets/susy/blockstates/euv_lithographer_component.json
@@ -0,0 +1,43 @@
+{
+  "forge_marker" : 1,
+  "defaults": {
+    "model" : "minecraft:cube_all",
+    "textures" : {
+      "all" : "gregtech:blocks/casings/euv_component/carbon_dioxide_laser"
+    }
+  },
+  "variants" : {
+    "variant=laser" : {
+      "model" : "minecraft:cube_all",
+      "textures" : {
+        "all" : "gregtech:blocks/casings/euv_component/carbon_dioxide_laser"
+      }
+    },
+    "variant=mirror" : {
+      "model" : "minecraft:cube_all",
+      "textures" : {
+        "all" : "gregtech:blocks/casings/euv_component/euv_laser_mirror"
+      }
+    },
+    "variant=reticle" : {
+      "model" : "minecraft:cube_bottom_top",
+      "textures" : {
+        "bottom": "gregtech:blocks/casings/euv_component/euv_laser_reticle",
+        "top": "gregtech:blocks/casings/solid/machine_casing_robust_tungstensteel",
+        "side": "gregtech:blocks/casings/euv_component/euv_laser_reticle_side"
+      }
+    },
+    "variant=tray" : {
+      "model" : "minecraft:cube_all",
+      "textures" : {
+        "all" : "gregtech:blocks/casings/euv_component/euv_wafer_stage"
+      }
+    },
+    "variant=handler" : {
+      "model" : "minecraft:cube_all",
+      "textures" : {
+        "all" : "gregtech:blocks/casings/euv_component/euv_wafer_robot_arm"
+      }
+    }
+  }
+}
diff --git a/src/main/resources/assets/susy/blockstates/susy_multiblock_casing.json b/src/main/resources/assets/susy/blockstates/susy_multiblock_casing.json
index 45f7dd07f..1f9f47211 100644
--- a/src/main/resources/assets/susy/blockstates/susy_multiblock_casing.json
+++ b/src/main/resources/assets/susy/blockstates/susy_multiblock_casing.json
@@ -81,6 +81,12 @@
       "textures" : {
         "all" : "gregtech:blocks/multiblock_casing/coalescence_plate"
       }
+    },
+    "variant=euv_safe_casing" : {
+      "model" : "minecraft:cube_all",
+      "textures" : {
+        "all" : "gregtech:blocks/multiblock_casing/euv_safe_casing"
+      }
     }
   }
 }
diff --git a/src/main/resources/assets/susy/lang/en_us.lang b/src/main/resources/assets/susy/lang/en_us.lang
index d0595a770..ae59dfafc 100644
--- a/src/main/resources/assets/susy/lang/en_us.lang
+++ b/src/main/resources/assets/susy/lang/en_us.lang
@@ -32,6 +32,7 @@ tile.rocket_assembler_casing.reinforced_foundation.name=Reinforced Foundation
 tile.rocket_assembler_casing.foundation.name=Rocket Assembler Foundation
 tile.rocket_assembler_casing.rails.name=Rocket Assembler Rails
 tile.rocket_assembler_casing.structural_frame.name=Rocket Assembler Structural Frame
+tile.susy_multiblock_casing.euv_safe_casing.name=Extreme-Ultraviolet-Safe Lithographer Casing
 
 tile.serpentine.basic.name=Copper Tubing Serpentine Block
 
@@ -115,6 +116,12 @@ tile.conveyor_belt.lv.name=Conveyor Belt
 
 tile.drill_bit.steel.name=Steel Drill Bit Block
 
+tile.euv_lithographer_component.laser.name=Carbon Dioxide Laser Generator
+tile.euv_lithographer_component.mirror.name=Silicon-Molybdenum EUV Mirror
+tile.euv_lithographer_component.reticle.name=Silicon-Molybdenum EUV Reticle
+tile.euv_lithographer_component.tray.name=Wafer Chuck Component
+tile.euv_lithographer_component.handler.name=Wafer Transfer End Effector
+
 # Rocks
 tile.susy_stone_smooth.gabbro.name=Gabbro
 tile.susy_stone_smooth.gneiss.name=Gneiss
@@ -363,6 +370,7 @@ susy.machine.scrap_recycler.name=Scrap Recycler
 susy.machine.rocket_assembler.name=Rocket Assembler
 susy.machine.rocket_programmer.name=Rocket Programmer
 susy.machine.metallurgical_converter.name=Metallurgical Converter
+susy.machine.euv_lithographer.name=Extreme Ultraviolet Lithographer
 
 susy.machine.primitive_item_import.name=Primitive Item Import Bus
 susy.machine.primitive_item_import.tooltip=Only for use with the Primitive Smelter
@@ -717,20 +725,20 @@ susy.machine.textile_spinner.uiv.name=Epic Textile Spinner III
 susy.machine.textile_spinner.uxv.name=Epic Textile Spinner IV
 susy.machine.textile_spinner.opv.name=Legendary Textile Spinner
 
-# Polishing Machine
-susy.machine.polishing_machine.lv.name=Basic Polishing Machine
-susy.machine.polishing_machine.mv.name=Advanced Polishing Machine
-susy.machine.polishing_machine.hv.name=Advanced Polishing Machine II
-susy.machine.polishing_machine.ev.name=Advanced Polishing Machine III
-susy.machine.polishing_machine.iv.name=Elite Polishing Machine
-susy.machine.polishing_machine.luv.name=Elite Polishing Machine II
-susy.machine.polishing_machine.zpm.name=Elite Polishing Machine III
-susy.machine.polishing_machine.uv.name=Ultimate Polishing Machine
-susy.machine.polishing_machine.uhv.name=Epic Polishing Machine
-susy.machine.polishing_machine.uev.name=Epic Polishing Machine II
-susy.machine.polishing_machine.uiv.name=Epic Polishing Machine III
-susy.machine.polishing_machine.uxv.name=Epic Polishing Machine IV
-susy.machine.polishing_machine.opv.name=Legendary Polishing Machine
+# Wafer Spinner
+susy.machine.wafer_spinner.lv.name=Basic Wafer Spinner
+susy.machine.wafer_spinner.mv.name=Advanced Wafer Spinner
+susy.machine.wafer_spinner.hv.name=Advanced Wafer Spinner II
+susy.machine.wafer_spinner.ev.name=Advanced Wafer Spinner III
+susy.machine.wafer_spinner.iv.name=Elite Wafer Spinner
+susy.machine.wafer_spinner.luv.name=Elite Wafer Spinner II
+susy.machine.wafer_spinner.zpm.name=Elite Wafer Spinner III
+susy.machine.wafer_spinner.uv.name=Ultimate Wafer Spinner
+susy.machine.wafer_spinner.uhv.name=Epic Wafer Spinner
+susy.machine.wafer_spinner.uev.name=Epic Wafer Spinner II
+susy.machine.wafer_spinner.uiv.name=Epic Wafer Spinner III
+susy.machine.wafer_spinner.uxv.name=Epic Wafer Spinner IV
+susy.machine.wafer_spinner.opv.name=Legendary Wafer Spinner
 
 susy.machine.bath_condenser.name=Bath Condenser
 susy.machine.bath_condenser.tooltip=Only works inside a Cryogenic Distillation Tower
@@ -773,6 +781,22 @@ tile.susy_multiblock_casing.copper_casing_pipe.name=Conductive Copper Pipe Casin
 tile.metallurgy.hydraulic_cylinder.name=Hydraulic Cylinder
 tile.metallurgy_2.flying_shear_saw.name=Flying Shear Saw
 tile.metallurgy_roll.roll.name=Roll
+
+# Sputtering Machine
+susy.machine.sputter_deposition.lv.name=Basic Sputtering Machine
+susy.machine.sputter_deposition.mv.name=Advanced Sputtering Machine
+susy.machine.sputter_deposition.hv.name=Advanced Sputtering Machine II
+susy.machine.sputter_deposition.ev.name=Advanced Sputtering Machine III
+susy.machine.sputter_deposition.iv.name=Elite Sputtering Machine
+susy.machine.sputter_deposition.luv.name=Elite Sputtering Machine II
+susy.machine.sputter_deposition.zpm.name=Elite Sputtering Machine III
+susy.machine.sputter_deposition.uv.name=Ultimate Sputtering Machine
+susy.machine.sputter_deposition.uhv.name=Epic Sputtering Machine
+susy.machine.sputter_deposition.uev.name=Epic Sputtering Machine II
+susy.machine.sputter_deposition.uiv.name=Epic Sputtering Machine III
+susy.machine.sputter_deposition.uxv.name=Epic Sputtering Machine IV
+susy.machine.sputter_deposition.opv.name=Legendary Sputtering Machine
+
 # Recipemaps
 recipemap.coagulation_tank.name=Coagulation
 recipemap.latex_collector.name=Arboreal Collector
@@ -826,7 +850,7 @@ recipemap.blender.name=Blender
 recipemap.phase_separator.name=Phase Separation
 recipemap.bath_condenser.name=Bath Condenser
 recipemap.drone_pad.name=Drone Pad
-recipemap.polishing_machine.name=Polishing
+recipemap.wafer_spinner.name=Wafer Spinning
 recipemap.gravity_separator=Gravity Separation
 recipemap.spinning.name=Textile Spinning
 recipemap.large_steam_turbine.name=Large Steam Turbine
@@ -834,14 +858,15 @@ recipemap.primitive_smelter.name=Primitive Smelting
 recipemap.large_fluid_pump.name=Large Fluid Pump
 recipemap.sieve_distillation.name=Fractional Distillation
 recipemap.jet_wingpack_fuels.name=Jet Wingpack Fuels
-recipemap.curtain_coater.name=Curtain Coater
-recipemap.milling.name=Precise Milling Machine
+recipemap.curtain_coater.name=Curtain Coating
+recipemap.milling.name=Precise Milling
 recipemap.hot_isostatic_press.name=Hot Isostatic Press
 recipemap.gas_atomizer.name=Gas Atomizer
 recipemap.metallurgical_converter.name=Metallurgical Converter
 recipemap.low_pressure_advanced_steam_turbine.name=Low Pressure Advanced Steam Turbine
 recipemap.high_pressure_advanced_steam_turbine.name=High Pressure Advanced Steam Turbine
 recipemap.mixer_settler.name=Mixer-Settler
+recipemap.sputter_deposition.name=Sputter Deposition
 
 susy.multiblock.primitive_mud_pump.description=The Primitive Mud Pump is a Steam Era multiblock that collects mud once per second, but only if it is in a river biome, and when the controller is between Y = 64 and Y = 80 (Inclusive). It can use a Pump, ULV, or LV Output Hatch.
 
diff --git a/src/main/resources/assets/susy/lang/ru_RU.lang b/src/main/resources/assets/susy/lang/ru_RU.lang
index 27a2e4c9f..b9f593830 100644
--- a/src/main/resources/assets/susy/lang/ru_RU.lang
+++ b/src/main/resources/assets/susy/lang/ru_RU.lang
@@ -386,7 +386,7 @@ susy.machine.continuous_stirred_tank_reactor.iv.name=Превосходный Р
 susy.machine.continuous_stirred_tank_reactor.luv.name=Превосходный Р.Н.П. реактор II
 susy.machine.continuous_stirred_tank_reactor.zpm.name=Превосходный Р.Н.П. реактор III
 susy.machine.continuous_stirred_tank_reactor.uv.name=Безупречный Р.Н.П. реактор
-susy.machine.continuous_stirred_tank_reactor.uhv.name=Идеальный Р.Н.П. реактор 
+susy.machine.continuous_stirred_tank_reactor.uhv.name=Идеальный Р.Н.П. реактор
 susy.machine.continuous_stirred_tank_reactor.uev.name=Идеальный Р.Н.П. реактор II
 susy.machine.continuous_stirred_tank_reactor.uiv.name=Идеальный Р.Н.П. реактор III
 susy.machine.continuous_stirred_tank_reactor.uxv.name=Идеальный Р.Н.П. реактор IV
@@ -438,7 +438,7 @@ susy.machine.bubble_column_reactor.uxv.name=Идеальный Р.Б.К реак
 susy.machine.bubble_column_reactor.opv.name=Совершенный Р.Б.К реактор
 
 # реактор периодического действия (Р.П.Д) (Batch Reactor)
-susy.machine.batch_reactor.lv.name=Обычный Р.П.Д реактор 
+susy.machine.batch_reactor.lv.name=Обычный Р.П.Д реактор
 susy.machine.batch_reactor.mv.name=Улучшеный Р.П.Д реактор
 susy.machine.batch_reactor.hv.name=Улучшеный Р.П.Д реактор II
 susy.machine.batch_reactor.ev.name=Улучшеный Р.П.Д реактор III
@@ -654,20 +654,20 @@ susy.machine.textile_spinner.uiv.name=Идеальный текстильный
 susy.machine.textile_spinner.uxv.name=Идеальный текстильный прядильщик IV
 susy.machine.textile_spinner.opv.name=Совершенный текстильный прядильщик
 
-# Polishing Machine
-susy.machine.polishing_machine.lv.name=Обычная полировальная машина
-susy.machine.polishing_machine.mv.name=Улучшеная полировальная машина
-susy.machine.polishing_machine.hv.name=Улучшеная полировальная машина II
-susy.machine.polishing_machine.ev.name=Улучшеная полировальная машина III
-susy.machine.polishing_machine.iv.name=Превосходная полировальная машина
-susy.machine.polishing_machine.luv.name=Превосходная полировальная машина II
-susy.machine.polishing_machine.zpm.name=Превосходная полировальная машина III
-susy.machine.polishing_machine.uv.name=Безупречная полировальная машина
-susy.machine.polishing_machine.uhv.name=Идеальная полировальная машина
-susy.machine.polishing_machine.uev.name=Идеальная полировальная машина II
-susy.machine.polishing_machine.uiv.name=Идеальная полировальная машина III
-susy.machine.polishing_machine.uxv.name=Идеальная полировальная машина IV
-susy.machine.polishing_machine.opv.name=Совершенная полировальная машина
+# Wafer Spinner
+susy.machine.wafer_spinner.lv.name=Обычная полировальная машина
+susy.machine.wafer_spinner.mv.name=Улучшеная полировальная машина
+susy.machine.wafer_spinner.hv.name=Улучшеная полировальная машина II
+susy.machine.wafer_spinner.ev.name=Улучшеная полировальная машина III
+susy.machine.wafer_spinner.iv.name=Превосходная полировальная машина
+susy.machine.wafer_spinner.luv.name=Превосходная полировальная машина II
+susy.machine.wafer_spinner.zpm.name=Превосходная полировальная машина III
+susy.machine.wafer_spinner.uv.name=Безупречная полировальная машина
+susy.machine.wafer_spinner.uhv.name=Идеальная полировальная машина
+susy.machine.wafer_spinner.uev.name=Идеальная полировальная машина II
+susy.machine.wafer_spinner.uiv.name=Идеальная полировальная машина III
+susy.machine.wafer_spinner.uxv.name=Идеальная полировальная машина IV
+susy.machine.wafer_spinner.opv.name=Совершенная полировальная машина
 
 susy.machine.bath_condenser.name=Конденсатор для ванны
 susy.machine.bath_condenser.tooltip=Работает только внутри криогенной дистилляционной башни.
@@ -734,7 +734,7 @@ recipemap.blender.name=Блендер
 recipemap.phase_separator.name=Разделение фаз
 recipemap.bath_condenser.name=Конденсатор для ванны
 recipemap.drone_pad.name=Площадка для дронов
-recipemap.polishing_machine.name=Полировка
+recipemap.wafer_spinner.name=Полировка
 recipemap.gravity_separator=Гравитационное разделение
 recipemap.spinning.name=Текстильное прядение
 recipemap.large_steam_turbine.name=Большая паровая турбина
diff --git a/src/main/resources/assets/susy/lang/zh_cn.lang b/src/main/resources/assets/susy/lang/zh_cn.lang
index ba567ca7f..1de6a6fdd 100644
--- a/src/main/resources/assets/susy/lang/zh_cn.lang
+++ b/src/main/resources/assets/susy/lang/zh_cn.lang
@@ -663,20 +663,20 @@ susy.machine.textile_spinner.uiv.name=史诗纺线机 III
 susy.machine.textile_spinner.uxv.name=史诗纺线机 IV
 susy.machine.textile_spinner.opv.name=传说纺线机
 
-# Polishing Machine
-susy.machine.polishing_machine.lv.name=基础抛光机
-susy.machine.polishing_machine.mv.name=进阶抛光机
-susy.machine.polishing_machine.hv.name=进阶抛光机 II
-susy.machine.polishing_machine.ev.name=进阶抛光机 III
-susy.machine.polishing_machine.iv.name=精英抛光机
-susy.machine.polishing_machine.luv.name=精英抛光机 II
-susy.machine.polishing_machine.zpm.name=精英抛光机 III
-susy.machine.polishing_machine.uv.name=终极抛光机
-susy.machine.polishing_machine.uhv.name=史诗抛光机
-susy.machine.polishing_machine.uev.name=史诗抛光机 II
-susy.machine.polishing_machine.uiv.name=史诗抛光机 III
-susy.machine.polishing_machine.uxv.name=史诗抛光机 IV
-susy.machine.polishing_machine.opv.name=传说抛光机
+# Wafer Spinner
+susy.machine.wafer_spinner.lv.name=基础晶圆旋涂机
+susy.machine.wafer_spinner.mv.name=进阶晶圆旋涂机
+susy.machine.wafer_spinner.hv.name=进阶晶圆旋涂机 II
+susy.machine.wafer_spinner.ev.name=进阶晶圆旋涂机 III
+susy.machine.wafer_spinner.iv.name=精英晶圆旋涂机
+susy.machine.wafer_spinner.luv.name=精英晶圆旋涂机 II
+susy.machine.wafer_spinner.zpm.name=精英晶圆旋涂机 III
+susy.machine.wafer_spinner.uv.name=终极晶圆旋涂机
+susy.machine.wafer_spinner.uhv.name=史诗晶圆旋涂机
+susy.machine.wafer_spinner.uev.name=史诗晶圆旋涂机 II
+susy.machine.wafer_spinner.uiv.name=史诗晶圆旋涂机 III
+susy.machine.wafer_spinner.uxv.name=史诗晶圆旋涂机 IV
+susy.machine.wafer_spinner.opv.name=传说晶圆旋涂机
 
 susy.machine.bath_condenser.name=浴式冷凝器
 susy.machine.bath_condenser.tooltip=仅在低温蒸馏厂中工作
@@ -743,7 +743,7 @@ recipemap.blender.name=混合搅拌
 recipemap.phase_separator.name=相分离
 recipemap.bath_condenser.name=浴式冷凝
 recipemap.drone_pad.name=无人机坪
-recipemap.polishing_machine.name=抛光
+recipemap.wafer_spinner.name=晶圆旋涂
 recipemap.gravity_separator=重力分离
 recipemap.spinning.name=纺线
 recipemap.large_steam_turbine.name=大型蒸汽轮机