Merge branch '1.20-1.20.1' into snapshot

# Conflicts:
#	build.gradle
#	gradle.properties
#	src/main/java/one/oth3r/sit/Events.java
#	src/main/java/one/oth3r/sit/ModMenu.java
#	src/main/resources/fabric.mod.json
This commit is contained in:
Oth3r 2023-11-30 18:05:27 -06:00
commit 4c9432fd18
15 changed files with 401 additions and 193 deletions

View file

@ -15,5 +15,3 @@ archives_base_name=sit!
# Dependencies
fabric_version=0.90.11+1.20.3
modmenu_version=7.0.0
yacl_version=3.0.0+1.20