Commit graph

277 commits

Author SHA1 Message Date
Oth3r
eb2305fb6b
Merge branch '1.20.4' into 1.20.1
# Conflicts:
#	gradle.properties
2025-07-08 13:25:16 -05:00
Oth3r
e75151a091
Merge branch '1.20.6' into 1.20.4
# Conflicts:
#	gradle.properties
#	src/main/java/one/oth3r/sit/utl/Events.java
2025-07-08 13:14:51 -05:00
Oth3r
620ff81c37
Merge branch '1.21.4' into 1.21.1
# Conflicts:
#	gradle.properties
#	src/main/java/one/oth3r/sit/SitClient.java
2025-06-27 17:41:29 -05:00
Oth3r
13ddcbee82
Revert "1.21.6 port"
This reverts commit 34c20ac753.
2025-06-27 17:31:38 -05:00
Oth3r
7a54b0a75a
otterlib 0.2.1.0 port 2025-06-24 13:50:23 -05:00
Oth3r
34c20ac753 1.21.6 port
(cherry picked from commit 7a1f058f6c)
2025-06-21 18:00:22 -05:00
Oth3r
85cc76a022 otterlib language system 2025-06-16 20:36:32 -05:00
Oth3r
c8902c5138 remove unused utilities 2025-06-16 20:31:42 -05:00
Oth3r
b190792064 switch to otterlib Num utility 2025-06-16 20:30:38 -05:00
Oth3r
c9cc006245 otterlib 0.2 changes 2025-06-16 15:07:37 -05:00
Oth3r
eaa290a8bf Merge branch '1.20.4' into 1.20.1
# Conflicts:
#	gradle.properties
2025-06-14 19:09:05 -05:00
Oth3r
8526732352 1.20.4 and below limitation 2025-06-14 19:07:09 -05:00
Oth3r
ce325ad2df Merge branch '1.20.6' into 1.20.4
# Conflicts:
#	gradle.properties
2025-06-14 19:05:57 -05:00
Oth3r
53dd704f80 1.21.1 changes 2025-06-14 19:02:31 -05:00
Oth3r
e64027930d Merge branch '1.21.4' into 1.21.1
# Conflicts:
#	gradle.properties
2025-06-14 19:00:48 -05:00
Oth3r
02a7157a93 add otterlib max version as the beta changes a lot of stuff 2025-06-14 18:56:21 -05:00
Oth3r
2eb6952144 fix not(!) tag check logic 2025-06-14 18:50:55 -05:00
github-actions[bot]
cfcf68f463 Rename JSON translation files to lowercase for consistency 2025-06-14 22:49:33 +00:00
github-actions[bot]
235a0a61db New Crowdin translations by GitHub Action 2025-06-14 22:49:21 +00:00
Oth3r
e6eb46d7fa lowercase locale 2025-06-14 17:43:38 -05:00
Oth3r
6c02b090ac get the player's actual reach when checking sitting 2025-06-14 17:13:19 -05:00
Oth3r
4ff646e99b 1.20.1 backport 2025-05-20 13:02:02 -05:00
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