Skip to content

Commit

Permalink
Merge branch 'mc1.18/fabric/dev' into mc1.19/fabric/dev
Browse files Browse the repository at this point in the history
# Conflicts:
#	src/generated/resources/.cache/cache
  • Loading branch information
IThundxr committed Dec 11, 2024
2 parents b05d438 + 80ecefb commit a09f92f
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@
],
"ingredients": [
{
"item": "betterend:end_myclium"
"item": "betterend:end_mycelium"
}
],
"results": [
{
"item": "betterend:end_myclium_path"
"item": "betterend:end_mycelium_path"
}
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,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")
Expand Down

0 comments on commit a09f92f

Please sign in to comment.