Merge remote-tracking branch 'origin/mc1.18/snowtoice' into mc1.18/snowtoice

# Conflicts:
#	src/generated/resources/.cache/cache
#	src/generated/resources/data/create/recipes/emptying/compat/alexsmobs/lava_bottle.json
This commit is contained in:
attackeight 2024-04-15 21:10:34 -04:00
commit dcfcf9e896

View file

@ -20,4 +20,4 @@
"type": "forge:mod_loaded" "type": "forge:mod_loaded"
} }
] ]
} }