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

Browse source

# 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

parent 4201a184a9 612f9f5efa

commit dcfcf9e896

1 changed files with 1 additions and 1 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show stats Download patch file Download diff file Expand all files Collapse all files