Sodium potassium (#1322)

* Add a new way get Sodium Potassium
Add Fluid Sodium to gt

* spotless
remove old NAk and Helium cell recipes

* derp

* add liquid sodium texture

(cherry picked from commit bd050330f91e0306e156f6a130783e867661338a)

* add liquid sodium cells

(cherry picked from commit 45f988cf3bbca43abf3f07a0a8e7ba891b8727a3)

* move recipe to core mod

(cherry picked from commit 7db15cd792136abac6fb88c9a7fa9d05f1f0619e)

* add a heater recipe without a input fluid

* Revert "move recipe to core mod"

This reverts commit 9d5ff875a00e59c6edb52336b7d9c20889d9bd9b.

* use fluid heater recipe without input fluid

* Spotless apply for branch Sodium-Potassium for #1322 (#1328)

* Two slots wiremill (#1324)

* add a circuit slot to wiremil

* add circuits to wire recipes

* add 2 input slots to Wiremil

* exchange circuit and material slot

* add 2x-16x wires to wiremil

* add missing 12x wires

* add slot migration code (#1326)

* spotlessApply (#1327)

Co-authored-by: Martin Robertz <dream-master@gmx.net>
Co-authored-by: GitHub GTNH Actions <>

Co-authored-by: Glease <4586901+Glease@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* spotlessApply

Co-authored-by: Martin Robertz <dream-master@gmx.net>
Co-authored-by: Glease <4586901+Glease@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: GitHub GTNH Actions <>

* Revert "Spotless apply for branch Sodium-Potassium for #1322 (#1328)"

This reverts commit 5bf31ffddfeddd1c4d161d434abb8402939ec9d6.

* spotless

* make fluid heater working with <1 fluid

(cherry picked from commit 8045cf6f03d0ce030b8e7b2fa6c70dca6d9ccc5d)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Glease <4586901+Glease@users.noreply.github.com>

1 files changed, 1 insertions, 1 deletions

diff --git a/src/main/java/gregtech/api/enums/Materials.java b/src/main/java/gregtech/api/enums/Materials.java
index 4134c80c57..c72f75e365 100644
--- a/src/main/java/gregtech/api/enums/Materials.java
+++ b/src/main/java/gregtech/api/enums/Materials.java
@@ -110,7 +110,7 @@ public class Materials implements IColorModulationContainer, ISubTagContainer {
     public static Materials Scandium                = new Materials(  27, TextureSet.SET_METALLIC          ,   1.0F,      0,  2, 1|2  |8   |32             , 204, 204, 204,   0,   "Scandium"                ,   "Scandium"                      ,    0,       0,       1814, 1814,  true, false,   2,   1,   1, Dyes.dyeYellow      , Element.Sc        , Arrays.asList(new TC_AspectStack(TC_Aspects.METALLUM, 2), new TC_AspectStack(TC_Aspects.RADIO, 1)));
     public static Materials Silicon                 = new Materials(  20, TextureSet.SET_METALLIC          ,   1.0F,      0,  2, 1|2  |8   |32             ,  60,  60,  80,   0,   "Silicon"                 ,   "Raw Silicon"                   ,    0,       0,       2273, 2273,  true, false,   1,   1,   1, Dyes.dyeBlack       , Element.Si        , Arrays.asList(new TC_AspectStack(TC_Aspects.METALLUM, 2), new TC_AspectStack(TC_Aspects.TENEBRAE, 1)));
     public static Materials Silver                  = new Materials(  54, TextureSet.SET_SHINY             ,  10.0F,     64,  2, 1|2  |8   |32|64|128      , 220, 220, 255,   0,   "Silver"                  ,   "Silver"                        ,    0,       0,       1234,    0, false, false,   3,   1,   1, Dyes.dyeLightGray   , Element.Ag        , Arrays.asList(new TC_AspectStack(TC_Aspects.METALLUM, 2), new TC_AspectStack(TC_Aspects.LUCRUM, 1)));
-    public static Materials Sodium                  = new Materials(  17, TextureSet.SET_METALLIC          ,   1.0F,      0,  2, 1         |32             ,   0,   0, 150,   0,   "Sodium"                  ,   "Sodium"                        ,    0,       0,        370,    0, false, false,   1,   1,   1, Dyes.dyeBlue        , Element.Na        , Arrays.asList(new TC_AspectStack(TC_Aspects.VITREUS, 2), new TC_AspectStack(TC_Aspects.LUX, 1)));
+    public static Materials Sodium                  = new Materials(  17, TextureSet.SET_METALLIC          ,   1.0F,      0,  2, 1      |16|32             ,   0,   0, 150,   0,   "Sodium"                  ,   "Sodium"                        ,    0,       0,        370,    0, false, false,   1,   1,   1, Dyes.dyeBlue        , Element.Na        , Arrays.asList(new TC_AspectStack(TC_Aspects.VITREUS, 2), new TC_AspectStack(TC_Aspects.LUX, 1)));
     public static Materials Strontium               = new Materials(  44, TextureSet.SET_METALLIC          ,   1.0F,      0,  2, 1    |8   |32             , 200, 200, 200,   0,   "Strontium"               ,   "Strontium"                     ,    0,       0,       1050,    0, false, false,   1,   1,   1, Dyes.dyeLightGray   , Element.Sr        , Arrays.asList(new TC_AspectStack(TC_Aspects.METALLUM, 2), new TC_AspectStack(TC_Aspects.STRONTIO, 1)));
     public static Materials Sulfur                  = new Materials(  22, TextureSet.SET_DULL              ,   1.0F,      0,  2, 1    |8   |32             , 200, 200,   0,   0,   "Sulfur"                  ,   "Sulfur"                        ,    0,       0,        388,    0, false, false,   2,   1,   1, Dyes.dyeYellow      , Element.S         , Collections.singletonList(new TC_AspectStack(TC_Aspects.IGNIS, 1)));
     public static Materials Tantalum                = new Materials(  80, TextureSet.SET_SHINY             ,   6.0F,   2560,  3, 1|2  |8   |32             , 105, 183, 255,   0,   "Tantalum"                ,   "Tantalum"                      ,    0,       0,       3290, 3290,  true, false,   4,   1,   1, Dyes._NULL          , Element.Ta        , Arrays.asList(new TC_AspectStack(TC_Aspects.METALLUM, 2), new TC_AspectStack(TC_Aspects.VINCULUM, 1))).disableAutoGeneratedBlastFurnaceRecipes();