Merge branch 'master' into digitalsingularity

GTNewHorizons · Oct 13, 2024 · 52a578e · 52a578e
2 parents 5152042 + 78c228f
commit 52a578e
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/src/main/java/com/dreammaster/gthandler/recipes/CircuitAssemblerRecipes.java b/src/main/java/com/dreammaster/gthandler/recipes/CircuitAssemblerRecipes.java
@@ -604,7 +604,7 @@ public void solderingMaterials() {
  GTValues.RA.stdBuilder()
  .itemInputs(
  ItemList.Circuit_Board_Phenolic_Good.get(1L),
- GTOreDictUnificator.get(OrePrefixes.circuit, Materials.LV, 2),
+ GTModHandler.getModItem(IndustrialCraft2.ID, "itemPartCircuit", 1L, 0),
  ItemList.Circuit_Parts_Diode.get(2L),
  GTOreDictUnificator.get(OrePrefixes.wireGt01, Materials.Copper, 2))
  .itemOutputs(ItemList.Circuit_Good.get(1L)).fluidInputs(tMat.getMolten(144L * tMultiplier / 2L))

diff --git a/src/main/java/com/dreammaster/scripts/ScriptArchitectureCraft.java b/src/main/java/com/dreammaster/scripts/ScriptArchitectureCraft.java
@@ -75,6 +75,18 @@ public void loadRecipes() {
  "screwIron",
  "craftingToolScrewdriver");
 
+ addShapedRecipe(
+ getModItem(ArchitectureCraft.ID, "glowbrush", 1),
+ null,
+ "materialCloth",
+ "dustGlowstone",
+ null,
+ "gearWood",
+ "materialCloth",
+ "stickWood",
+ null,
+ null);
+
  addShapelessRecipe(getModItem(ArchitectureCraft.ID, "sawblade", 1), "toolHeadBuzzSawAnyIron");
 
  addShapelessRecipe(