Oth3r a971fa9926 Merge branch '1.21.1' into 1.20.6 ... # Conflicts: # gradle.properties		2025-02-23 15:23:04 -06:00
..
java/one/oth3r/sit	Merge branch '1.21.1' into 1.20.6	2025-02-23 15:23:04 -06:00
resources	update localization	2025-02-14 11:41:15 -06:00