Merge branch '1.21.1' into 1.20.6

# Conflicts:
#	gradle.properties
#	src/main/java/one/oth3r/sit/file/CustomBlock.java
#	src/main/java/one/oth3r/sit/file/CustomItem.java
This commit is contained in:
Oth3r 2025-06-14 19:04:04 -05:00
commit aa108714d5
43 changed files with 215 additions and 117 deletions

View file

@ -13,11 +13,12 @@ yarn_mappings=1.20.6+build.3
loader_version=0.16.13
# Mod Properties
mod_version=1.2.4.1+1.20.6
mod_version=1.2.4.3+1.20.6
maven_group=one.oth3r
file_name=sit!
# Dependencies
fabric_version=0.100.4+1.20.6
modmenu_version=10.0.0-beta.1
otterlib_version=0.1.2.1+1.20.6-fabric
otterlib_version=0.1.2.1+1.20.6-fabric
otterlib_max_version=0.2.0.0+1.20.6-fabric