Merge branch 'master' into 1.20-1.20.1

# Conflicts:
#	gradle.properties
#	src/main/java/one/oth3r/sit/Events.java
This commit is contained in:
Oth3r 2023-11-26 09:25:44 -06:00
commit 6ea2982876
15 changed files with 404 additions and 190 deletions

View file

@ -1,6 +1,6 @@
{
"schemaVersion": 1,
"id": "sit",
"id": "oth3r-sit",
"version": "${version}",
"name": "Sit!",
"description": "Adds sitting to minecraft! Endless customizability for hand restrictions and sittable blocks.",
@ -18,8 +18,8 @@
"main": [
"one.oth3r.sit.Sit"
],
"server": [
"one.oth3r.sit.SitServer"
"client": [
"one.oth3r.sit.SitClient"
],
"modmenu": [
"one.oth3r.sit.ModMenu"