virt-mirrors/Sit
1
0
Fork 1
mirror of https://github.com/Oth3r/Sit.git synced 2025-09-19 16:03:22 +02:00
Code Issues Projects Releases Packages Wiki Activity
398 commits 12 branches 0 tags 59 MiB
Commit graph

398 commits

This branch
This branch
All branches
Author SHA1 Message Date
Oth3r
6eeb5b3698
 		Merge branch '1.20.6' into 1.20.4 
# Conflicts:
#	gradle.properties
 2025-07-08 13:22:15 -05:00
Oth3r
36ca37d8ff
 		Merge branch '1.21.1' into 1.20.6 
# Conflicts:
#	gradle.properties
 2025-07-08 13:20:45 -05:00
Oth3r
29cd1eccc1
 		Merge branch '1.21.4' into 1.21.1 
# Conflicts:
#	gradle.properties
 2025-07-08 13:18:11 -05:00
Oth3r
22e366bd86
 		fix version number (v1.2.4.5) 2025-07-08 13:16:30 -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
a44362c6cd
 		Merge branch '1.21.1' into 1.20.6 
# Conflicts:
#	gradle.properties
 2025-07-08 13:03:57 -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
6596ffe1ff
 		Merge branch '1.21.5' into 1.21.4 
# Conflicts:
#	gradle.properties
 2025-06-27 17:36:42 -05:00
Oth3r
82ec9b01b6
 		v1.2.4.5+1.21.5 2025-06-27 17:35:41 -05:00
Oth3r
13ddcbee82
 		Revert "1.21.6 port" 
This reverts commit 34c20ac753.
 2025-06-27 17:31:38 -05:00
Oth3r
e4f0625e4c
 		add devauth and update dependency formatting 2025-06-27 17:28:15 -05:00
Oth3r
9077e8e663
 		Merge branch 'dev' 
# Conflicts:
#	gradle.properties
 2025-06-24 14:01:03 -05:00
Oth3r
71eb10a2a0
 		v1.2.4.5 2025-06-24 14:00:33 -05:00
Oth3r
7a54b0a75a
 		otterlib 0.2.1.0 port 2025-06-24 13:50:23 -05:00
Oth3r
6dcd99c12a
 		v1.2.4.4 2025-06-23 17:57:20 -05:00
Oth3r
392d508ef3
 		update gradle 2025-06-23 17:32:40 -05:00
Oth3r
00c52b26cf
 		oth3r repo 2025-06-23 17:32:21 -05:00
Oth3r
34c20ac753 1.21.6 port 
(cherry picked from commit 7a1f058f6c)
 2025-06-21 18:00:22 -05:00
Oth3r
3f9517a1f0 1.21.6 update 2025-06-17 10:34:33 -05:00
Oth3r
7a1f058f6c 1.21.6 port 2025-06-17 10:34:23 -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
ea7e42f8a5 changelog clarification 2025-06-14 19:13:19 -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
aa108714d5 Merge branch '1.21.1' into 1.20.6 
# Conflicts:
#	gradle.properties
#	src/main/java/one/oth3r/sit/file/CustomBlock.java
#	src/main/java/one/oth3r/sit/file/CustomItem.java
 2025-06-14 19:04:04 -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
e5dddd4ab7 Merge branch 'master' into 1.21.4 
# Conflicts:
#	gradle.properties
 2025-06-14 18:58:34 -05:00
Oth3r
82c4b375d5 v1.2.4.3 2025-06-14 18:57:37 -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
c675a24e94 v1.2.4.2+1.21.5 2025-06-14 18:52:00 -05:00
Oth3r
2eb6952144 fix not(!) tag check logic 2025-06-14 18:50:55 -05:00
Haru
d82b4b49f9
 		Merge pull request #24 from Oth3r/crowdin/translations 
Update translations from Crowdin
 2025-06-14 18:07:09 -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
dea8b5af3e fix target directory 2025-06-14 17:48:17 -05:00
Oth3r
86066ebfb1 Merge remote-tracking branch 'origin/master' 2025-06-14 17:45:58 -05: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
bc23a3d2c2
 		README refresh 2025-06-06 20:09:48 -05:00
Oth3r
61ff50a81d
 		add OtterLib dependency message, fixes #23 2025-06-06 20:01:52 -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
6cc4c2d294 Merge branch 'master' into 1.21.4 
# Conflicts:
#	gradle.properties
#	src/main/java/one/oth3r/sit/screen/ClickableImageWidget.java
#	src/main/java/one/oth3r/sit/screen/ConfigScreen.java
 2025-05-15 11:20:34 -05:00