Merge branch 'master' into snapshot

# Conflicts:
#	gradle.properties
#	src/main/java/one/oth3r/sit/ModMenu.java
#	src/main/java/one/oth3r/sit/Sit.java
#	src/main/java/one/oth3r/sit/SitClient.java
This commit is contained in:
Oth3r 2024-04-10 12:12:42 -05:00
commit c6fb594d1f
8 changed files with 184 additions and 112 deletions

View file

@ -9,7 +9,7 @@ yarn_mappings=24w03b+build.6
loader_version=0.15.6
# Mod Properties
mod_version=s1.1.3+24w03b
mod_version=s1.1.4+24w03b
maven_group=one.oth3r
archives_base_name=sit!