Merge remote-tracking branch 'origin/v2-1.21.9' into v2-1.21.9

Browse Source

# Conflicts:
#	src/main/java/com/acethewildfire/acesbs/KNOWN_ISSUES
#	src/main/java/com/acethewildfire/acesbs/datagen/ModBlockTagProvider.java
#	src/main/java/com/acethewildfire/acesbs/datagen/ModItemTagProvider.java

...

This commit is contained in:

Vos

2026-03-18 22:21:46 -05:00

parent c5628975e8 1832026cd8

commit 333d5699bd

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

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available