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

@ -21,13 +21,6 @@ dependencies {
modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
// modImplementation "com.terraformersmc:modmenu:${project.modmenu_version}"
// modImplementation "dev.isxander.yacl:yet-another-config-lib-fabric:${project.yacl_version}"
// Uncomment the following line to enable the deprecated Fabric API modules.
// These are included in the Fabric API production distribution and allow you to update your mod to the latest modules at a later more convenient time.
// modImplementation "net.fabricmc.fabric-api:fabric-api-deprecated:${project.fabric_version}"
}
processResources {