Merge branch '1.21.1' into 1.20.6

# Conflicts:
#	gradle.properties
#	src/main/java/one/oth3r/sit/Events.java
#	src/main/java/one/oth3r/sit/packet/CustomPayloads.java
#	src/main/resources/fabric.mod.json
This commit is contained in:
Oth3r 2024-11-26 15:33:46 -06:00
commit 8b7b3d39ec
56 changed files with 3104 additions and 1140 deletions

View file

@ -4,16 +4,16 @@ org.gradle.parallel=true
# Fabric Properties
# check these on https://fabricmc.net/develop
min_minecraft_version=1.20.6
minecraft_version=1.20.6
yarn_mappings=1.20.6+build.3
loader_version=0.15.11
# Mod Properties
mod_version=1.1.10+1.20.6
mod_version=1.2.0+1.20.6
maven_group=one.oth3r
archives_base_name=sit!
file_name=sit!
# Dependencies
fabric_version=0.100.4+1.20.6
modmenu_version=10.0.0-beta.1
yacl_version=3.5.0+1.20.6-fabric