Merge branch '1.21.1' into 1.20.6

# Conflicts:
#	gradle.properties
#	src/main/java/one/oth3r/sit/screen/ConfigScreen.java
#	src/main/java/one/oth3r/sit/screen/UnderConstructionScreen.java
#	src/main/java/one/oth3r/sit/utl/Utl.java
This commit is contained in:
Oth3r 2025-05-20 12:48:01 -05:00
commit f2cba71afa
65 changed files with 960 additions and 526 deletions

View file

@ -13,10 +13,11 @@ yarn_mappings=1.20.6+build.3
loader_version=0.16.13
# Mod Properties
mod_version=1.2.3.2+1.20.6
mod_version=1.2.4.1+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