Merge remote-tracking branch 'purebluez/master' into dev

GTNewHorizons · Feb 3, 2025 · 0554a8e · 0554a8e
2 parents bf80485 + 90e89ee
commit 0554a8e
Show file tree

Hide file tree

Showing 3 changed files with 304 additions and 0 deletions.
diff --git a/src/main/java/com/dreammaster/gthandler/GT_CraftingRecipeLoader.java b/src/main/java/com/dreammaster/gthandler/GT_CraftingRecipeLoader.java
@@ -796,6 +796,14 @@ public void run() {
                 new Object[] { "TCT", "PMP", "TCT", 'M', ItemList.Machine_HV_Brewery, 'P', ItemList.Electric_Pump_HV,
                         'T', OrePrefixes.plate.get(Materials.WoodSealed), 'C', OrePrefixes.circuit.get(Materials.EV) });
 
+        // Solar Factory
+        GTModHandler.addCraftingRecipe(
+                ItemList.SolarFactory.get(1),
+                bits,
+                new Object[] { "TTT", "PMP", "CTC", 'M', ItemList.Machine_HV_Assembler, 'P',
+                        ItemList.Cover_SolarPanel_8V, 'T', OrePrefixes.plate.get(Materials.StainlessSteel), 'C',
+                        OrePrefixes.circuit.get(Materials.EV) });
+
         // Reinforced Wooden Casing
         GTModHandler.addCraftingRecipe(
                 ItemList.Casing_Reinforced_Wood.get(1),

diff --git a/src/main/java/com/dreammaster/gthandler/GT_MachineRecipeLoader.java b/src/main/java/com/dreammaster/gthandler/GT_MachineRecipeLoader.java
@@ -36,6 +36,7 @@
 import com.dreammaster.gthandler.recipes.PolarizerRecipes;
 import com.dreammaster.gthandler.recipes.RecipeRemoval;
 import com.dreammaster.gthandler.recipes.SifterRecipes;
+import com.dreammaster.gthandler.recipes.SolarFactoryRecipes;
 import com.dreammaster.gthandler.recipes.SpaceAssemblerRecipes;
 import com.dreammaster.gthandler.recipes.VacuumFreezerRecipes;
 import com.dreammaster.gthandler.recipes.VacuumFurnaceRecipes;
@@ -80,6 +81,7 @@ public void run() {
         new MixerRecipes().run();
         new NeutroniumCompressorRecipes().run();
         new SifterRecipes().run();
+        new SolarFactoryRecipes().run();
         new VacuumFreezerRecipes().run();
         new WiremillRecipes().run();
         new CrackingRecipes().run();