Merge branch 'mc1.19/fabric/dev' into mc1.20.1/fabric/dev

# Conflicts: # src/generated/resources/.cache/1befec8d6a93075ce6b4cde2ad591d86e1289c0e # src/generated/resources/.cache/35806e87dccf1c56c630455071f2d6dfd38015f6 # src/generated/resources/.cache/3f8e2bfad643b52631e6eb80098aea304497f9a9 # src/generated/resources/.cache/455c485c9c8ef171bbc1ce4d435b3110ba1557ba # src/generated/resources/.cache/82992cbf8f2794d83ac94034835eac0acd7915b9 # src/generated/resources/.cache/8374d11e7b3d6ea1837e31911da1439b12da9432 # src/generated/resources/.cache/899d321c4524b581eebda1c204a82d1a56a5eaa0 # src/generated/resources/.cache/c24b4d2b8d15abff51c78bd94f4403d9eae6c139
Fabricators-of-Create · Dec 11, 2024 · 0b78b9b · 0b78b9b
2 parents 0478f13 + 4b90976
commit 0b78b9b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/...ng/compat/betterend/end_myclium_path.json → ...g/compat/betterend/end_mycelium_path.json b/...ng/compat/betterend/end_myclium_path.json → ...g/compat/betterend/end_mycelium_path.json
@@ -10,12 +10,12 @@
   "type": "create:pressing",
   "ingredients": [
     {
-      "item": "betterend:end_myclium"
+      "item": "betterend:end_mycelium"
     }
   ],
   "results": [
     {
-      "item": "betterend:end_myclium_path"
+      "item": "betterend:end_mycelium_path"
     }
   ]
 }
diff --git a/src/main/java/com/simibubi/create/foundation/data/recipe/PressingRecipeGen.java b/src/main/java/com/simibubi/create/foundation/data/recipe/PressingRecipeGen.java
@@ -35,7 +35,7 @@ public class PressingRecipeGen extends ProcessingRecipeGen {
 		// Better End Forge
 
 		BE = moddedPaths(Mods.BE, "amber_moss", "cave_moss", "chorus_nylium", "crystal_moss",
-				"end_moss", "end_myclium", "jungle_moss", "pink_moss", "shadow_grass"),
+				"end_moss", "end_mycelium", "jungle_moss", "pink_moss", "shadow_grass"),
 		// Environmental
 		ENV_MYCELIUM = create("compat/environmental/mycelium_path", b -> b.require(Blocks.MYCELIUM)
 				.output(Mods.ENV, "mycelium_path")