Merge remote-tracking branch 'origin/main'

# Conflicts:
#	src/main/java/com/zivilon/cinder_loe/recipes.java

src/main/java/com/zivilon/cinder_loe/recipes.java

@@ -32,7 +32,7 @@ public class recipes {
         registerArnorRecipes();
         registerAngmarRecipes();
         ForgingRecipes.register_recipes();
-        //registerBrewingRecipes();
+        registerBrewingRecipes();
     }
 
     public static void registerGeneralRecipes() {
@@ -148,7 +148,7 @@ public class recipes {
         OreDictionary.registerOre("meat", LOTRMod.zebraCooked);
 
         GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(CinderLoE.fruitsalad), Items.bowl, "fruit1", "fruit2", "fruit3"));
-        GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(CinderLoE.pasta, 4), new ItemStack(LOTRMod.rollingPin, 1, OreDictionary.WILDCARD_VALUE), CinderLoE.dough, CinderLoE.dough));
+        GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(CinderLoE.pasta, 4), LOTRMod.rollingPin, CinderLoE.dough, CinderLoE.dough));
         GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(CinderLoE.halva), Items.sugar, CinderLoE.dough, CinderLoE.spice, LOTRMod.almond));
 
         GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(CinderLoE.chocolatebar, 2), LOTRMod.mugChocolate));
@@ -324,7 +324,7 @@ public class recipes {
         LOTRRecipes.rangerRecipes.add(new ShapedOreRecipe(new ItemStack(CinderLoE.maceArnor), " XX", " XX", "Y  ",
                 Character.valueOf('X'), Items.iron_ingot, Character.valueOf('Y'), "stickWood"));
     }
-    //public static void registerBrewingRecipes() {
+    public static void registerBrewingRecipes() {
 //        MixinLOTRBrewingRecipes.addRecipe(new ItemStack(CinderLoE.mugDemonicHealthPotion, 2), new Object[] { CinderLoE.demonbloodVial, new ItemStack(LOTRMod.tallGrass, 1, 4), new ItemStack(LOTRMod.tallGrass, 1, 4), new ItemStack(LOTRMod.tallGrass, 1, 4), CinderLoE.chocolatebar, CinderLoE.chocolatebar });
-    //}
+    }
 }