Merge branch 'master' into snapshot

# Conflicts:
#	gradle.properties
#	src/main/java/one/oth3r/sit/ModMenu.java
#	src/main/resources/fabric.mod.json
This commit is contained in:
Oth3r 2024-01-17 14:10:45 -06:00
commit 7365b31f66
11 changed files with 105 additions and 61 deletions

View file

@ -4,12 +4,12 @@ org.gradle.parallel=true
# Fabric Properties
# check these on https://fabricmc.net/develop
minecraft_version=1.20.3-rc1
yarn_mappings=1.20.3-rc1+build.2
minecraft_version=1.20.4
yarn_mappings=1.20.4+build.1
loader_version=0.15.0
# Mod Properties
mod_version=s1.1.0+1.20.3-pre1-1.20.3-rc1
mod_version=1.1.3+1.20.2-1.20.4
maven_group=one.oth3r
archives_base_name=sit!