Merge branch '1.20.6' into 1.20.4

# Conflicts:
#	gradle.properties
This commit is contained in:
Oth3r 2025-07-08 13:22:15 -05:00
commit 6eeb5b3698
Failed to generate hash of commit

Diff content is not available