Merge branch 'refs/heads/master' into 1.20.4

# Conflicts:
#	gradle.properties
#	src/main/java/one/oth3r/sit/Sit.java
#	src/main/java/one/oth3r/sit/SitClient.java
#	src/main/java/one/oth3r/sit/packet/CustomPayloads.java
#	src/main/resources/fabric.mod.json
This commit is contained in:
Oth3r 2024-06-13 11:04:01 -05:00
commit 6ea4831a1c
7 changed files with 18 additions and 10 deletions

View file

@ -9,7 +9,7 @@ yarn_mappings=1.20.4+build.3
loader_version=0.15.10
# Mod Properties
mod_version=1.1.5+1.20.2-1.20.4
mod_version=1.1.6+1.20.4
maven_group=one.oth3r
archives_base_name=sit!