Commit graph

255 commits

Author SHA1 Message Date
Oth3r
147e3410ff Merge branch '1.20.4' into 1.20.1
# Conflicts:
#	gradle.properties
#	src/main/java/one/oth3r/sit/screen/ClickableImageWidget.java
#	src/main/java/one/oth3r/sit/screen/ConfigScreen.java
#	src/main/java/one/oth3r/sit/screen/TextureButtonWidget.java
#	src/main/java/one/oth3r/sit/screen/UnderConstructionScreen.java
#	src/main/java/one/oth3r/sit/utl/Utl.java
2025-05-20 12:59:28 -05:00
Oth3r
f185a3870d 1.20.4 backport 2025-05-20 12:57:42 -05:00
Oth3r
f7f67633e6 Merge branch '1.20.6' into 1.20.4
# Conflicts:
#	gradle.properties
#	src/main/java/one/oth3r/sit/utl/Events.java
2025-05-20 12:53:07 -05:00
Oth3r
f2cba71afa Merge branch '1.21.1' into 1.20.6
# Conflicts:
#	gradle.properties
#	src/main/java/one/oth3r/sit/screen/ConfigScreen.java
#	src/main/java/one/oth3r/sit/screen/UnderConstructionScreen.java
#	src/main/java/one/oth3r/sit/utl/Utl.java
2025-05-20 12:48:01 -05:00
Oth3r
aee19a0536 1.21.1 port 2025-05-18 14:01:47 -05:00
Oth3r
b7b3b39d82 Merge branch '1.21.4' into 1.21.1
# Conflicts:
#	changelog.md
#	gradle.properties
#	src/main/java/one/oth3r/sit/screen/ClickableImageWidget.java
#	src/main/java/one/oth3r/sit/screen/ConfigScreen.java
#	src/main/java/one/oth3r/sit/screen/TextureButtonWidget.java
2025-05-18 13:57:24 -05:00
Oth3r
d32913a728 remove unnecessary assets 2025-05-12 23:15:36 -05:00
Oth3r
2f5dc87a43 update method name to avoid deprecation 2025-05-12 23:10:41 -05:00
Oth3r
4a5df4f253 enabled logging for config files 2025-05-12 23:10:20 -05:00
Oth3r
2cf57f78c2 add otterlib dependency in fabric.mod.json 2025-05-08 12:54:45 -05:00
Oth3r
a30c9b1cbd update to be compatible with new otterlib version 2025-05-08 12:54:19 -05:00
Oth3r
6f66526f52 remove unneeded language entries 2025-05-08 11:49:55 -05:00
Oth3r
1783c04c87 switch to otterlib config UI 2025-05-04 17:43:37 -05:00
Oth3r
3944881f22 use the otterlib customfile interface 2025-05-04 13:39:34 -05:00
Oth3r
c3b7bb02fd switch to CTxT 2025-05-03 15:41:16 -05:00
Oth3r
e0080e313e
Merge pull request #20 from Oth3r/crowdin_translations
Updated Crowdin translations
2025-05-03 13:43:47 -05:00
Crowdin Bot
b733960e4b New Crowdin translations by GitHub Action 2025-05-03 18:41:23 +00:00
Oth3r
07b3077438 Merge branch 'master' into dev 2025-05-03 13:23:41 -05:00
Oth3r
31fff71539 update all languages for the new naming system 2025-05-03 13:20:35 -05:00
Oth3r
aa3b25442d fix the reload method not loading the langreader 2025-05-03 13:18:21 -05:00
Oth3r
6d2c052100 use the reload method instead of loading the files directly 2025-05-03 13:17:40 -05:00
Oth3r
3aad63e1ba Merge branch '1.20.4' into 1.20.1
# Conflicts:
#	gradle.properties
#	src/main/java/one/oth3r/sit/utl/Utl.java
2025-05-03 12:28:01 -05:00
Oth3r
4c5a928f84 port fix for 1.20.4 2025-05-03 12:24:40 -05:00
Oth3r
16608e0546 Merge branch '1.20.6' into 1.20.4
# Conflicts:
#	gradle.properties
#	src/main/java/one/oth3r/sit/utl/Utl.java
2025-05-03 12:19:08 -05:00
Oth3r
05429194a9 Merge branch '1.21.1' into 1.20.6
# Conflicts:
#	gradle.properties
2025-04-27 19:38:37 -05:00
Oth3r
b32efd0296 Merge branch '1.21.4' into 1.21.1
# Conflicts:
#	gradle.properties
2025-04-27 19:33:47 -05:00
Oth3r
b13f78d45c make extra sure that packets can be sent to the server 2025-04-19 19:39:49 -05:00
Oth3r
3a51c2add2 make extra sure that packets can be sent to the server 2025-04-19 19:38:55 -05:00
Oth3r
ab87b39bb7 import fix 2025-04-08 14:36:07 -05:00
Oth3r
eb32cdc143 Revert "1.20.5 port"
This reverts commit 78c6894135.
2025-04-08 14:30:40 -05:00
Oth3r
1fc549c51e fix sitting level being off 2025-04-08 14:03:46 -05:00
Oth3r
7b8cefb1c5 remove unused imports 2025-03-25 12:13:02 -05:00
Oth3r
78c6894135 1.20.5 port 2025-03-25 12:06:10 -05:00
Oth3r
3d89222840 add max minecraft version 2025-03-25 12:00:04 -05:00
Oth3r
284930b1b6 update checkPlayerSitAbility() with the entity Y-adjustment in mind 2025-03-14 14:27:05 -05:00
Oth3r
b7094bb437 update checkPlayerSitAbility() with the entity Y-adjustment in mind 2025-03-14 14:22:28 -05:00
Oth3r
ebe2f66ff2 real fix for #17 2025-03-14 14:10:40 -05:00
Oth3r
242f107ffb real fix for #17 2025-03-14 14:10:12 -05:00
Oth3r
0a093bebc0 Merge branch '1.20.4' into 1.20.1
# Conflicts:
#	gradle.properties
2025-03-14 13:13:38 -05:00
Oth3r
134496d7d0 Merge branch '1.20.6' into 1.20.4
# Conflicts:
#	gradle.properties
2025-03-14 13:10:59 -05:00
Oth3r
f774802d69 Merge branch '1.21.1' into 1.20.6
# Conflicts:
#	gradle.properties
2025-03-14 13:05:44 -05:00
Oth3r
2c4dc72f42 Merge branch '1.21.3' into 1.21.1
# Conflicts:
#	gradle.properties
2025-03-13 17:51:07 -05:00
Oth3r
2ca49209b2 documentation 2025-03-12 18:20:53 -05:00
Oth3r
da5fc6b3de fix command parsing 2025-03-12 17:38:58 -05:00
Oth3r
82fd2b1fbf make sitting via hand use the command, for permission support 2025-03-10 10:12:10 -05:00
Oth3r
12bc551356 add canSit() method 2025-03-10 10:11:51 -05:00
Oth3r
9b7794dbb5 remove BlockState parameter of getSittingHeight() method and retrieve inside 2025-03-10 10:04:24 -05:00
Oth3r
248add0bc4 fixes #17 2025-03-09 14:55:48 -05:00
Oth3r
e11b4acd35 1.20.1 height adjustment 2025-02-23 15:47:58 -06:00
Oth3r
a878e2b41e Merge branch '1.20.4' into 1.20.1
# Conflicts:
#	gradle.properties
#	src/main/java/one/oth3r/sit/utl/Utl.java
2025-02-23 15:44:13 -06:00