Commit graph

283 commits

Author SHA1 Message Date
Oth3r
64e7ae97af b1.2.0.4 2024-08-31 10:07:42 -05:00
Oth3r
60ab947ad4 Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	src/main/java/one/oth3r/sit/file/ServerConfig.java
#	src/main/java/one/oth3r/sit/file/SittingConfig.java
2024-08-30 20:31:08 -05:00
Oth3r
8afbb3d99d new UI lang 2024-08-30 20:29:12 -05:00
Oth3r
457a8d10d3 new ModMenu UI 2024-08-30 20:29:03 -05:00
Oth3r
c8f86a2aaa UI assets 2024-08-30 20:28:50 -05:00
Oth3r
720b6b98c8 better comments 2024-08-29 16:28:46 -05:00
Oth3r
ba77aa9d40 new file read/load system from interface 2024-08-29 16:26:37 -05:00
Oth3r
a280a24197 new file read/load system from interface 2024-08-26 14:46:01 -05:00
Oth3r
e2b1a5f414 isSitWhileSeated -> canSitWhileSeated + better sitWhileSeated logic 2024-08-26 14:39:08 -05:00
Oth3r
2e1ae46d77 fixed sit while seated causing sit entities to not be removed for the player 2024-08-26 14:38:21 -05:00
Oth3r
4db3062a62 fixed legacy updater not updating hand requirements correctly 2024-08-26 14:17:03 -05:00
Oth3r
e772e5813a Merge branch '1.20.6' into 1.20.4 2024-08-24 17:09:46 -05:00
Oth3r
7bf178a1d2 fix multi version fabric json 2024-08-24 17:09:10 -05:00
Oth3r
1c70328b35 Merge branch '1.20.6' into 1.20.4
# Conflicts:
#	gradle.properties
2024-08-24 16:51:12 -05:00
Oth3r
32356d0c6d Merge branch 'master' into 1.20.6
# Conflicts:
#	gradle.properties
2024-08-24 16:49:57 -05:00
Oth3r
a72934c357 v1.1.10 2024-08-24 16:47:07 -05:00
Oth3r
de6c8a257a makes sure the block interaction event only works on server player, fixes #13 2024-08-24 16:45:54 -05:00
Oth3r
3da6a3bb20 removed mainBlock from HandSetting entry 2024-08-17 13:34:40 -05:00
Oth3r
757ee9668a move entity spawning to the server loop to fix C2ME crash
move checkplayers to Data from FileData
2024-08-17 13:27:26 -05:00
Oth3r
9eeb379dd9 b1.2.0.3+1.20-1.21.1 2024-08-13 13:04:20 -05:00
Oth3r
8352edc84f sittingHeight -> sitting-height CustomBlock entry 2024-08-13 13:03:38 -05:00
Oth3r
4894d720c8 better(ish) interaction detecting for server fix 2024-08-13 13:02:39 -05:00
Oth3r
47986f16c5
Merge pull request #11 from Oth3r/Oth3r-patch-1
Create bug_report.yml
2024-08-13 11:36:13 -05:00
Oth3r
5b649da2b9
Create bug_report.yml 2024-08-13 11:35:38 -05:00
Oth3r
6b51627875 new lang file for the new configs 2024-08-13 11:23:54 -05:00
Oth3r
bbbb59f6f6
Merge pull request #8 from yichifauzi/patch-1
Update zh_tw.json
2024-08-11 21:03:52 -05:00
Oth3r
880e2790fb b1.2.0.2 2024-08-09 10:27:37 -05:00
Oth3r
6364549568 1.21.1 2024-08-09 10:27:27 -05:00
dirtTW
89bc57e02f
Update zh_tw.json 2024-08-08 23:48:07 +07:00
Oth3r
cd21eb87e5 1.1.9+1.21-1.21.1 2024-08-08 10:26:02 -05:00
Oth3r
f8aa5a9fb2 added traditional chinese to the config language list 2024-08-08 10:25:03 -05:00
Oth3r
f113e5a958 Merge remote-tracking branch 'origin/master' 2024-08-08 10:21:34 -05:00
Oth3r
67a79a0707 1.21.1 support 2024-08-08 10:20:20 -05:00
Oth3r
b916467ca0 config file option comments 2024-08-07 13:02:08 -05:00
Oth3r
dde387cc3e make the resources folder match the new mod id 2024-08-07 12:50:09 -05:00
Oth3r
3322260798 cleanup 2024-08-07 12:48:38 -05:00
Oth3r
b464287fed comment + todo 2024-08-07 12:48:14 -05:00
Oth3r
e2cdc9d1d4 fix ! (not) item tags not working correctly 2024-08-07 12:46:21 -05:00
Oth3r
ea12d8eba1 some file defaults 2024-08-07 12:45:53 -05:00
Oth3r
3eb16e58de send changes to server on file load 2024-08-07 12:45:24 -05:00
Oth3r
2239522561 make 1.21 the minimum version 2024-08-07 11:29:46 -05:00
Oth3r
8201047f78 include all custom blocks for non sitable with hand if the block has an interaction 2024-08-07 11:27:40 -05:00
Oth3r
f4ac860799 fix (!) blockstates not working properly 2024-08-06 15:28:40 -05:00
Oth3r
f1f3e54d22 custom list type adapter to stop null lists from bad data 2024-08-06 12:35:37 -05:00
Oth3r
14f232e3fc new sitting keybind, executes the sit command on sit servers 2024-08-06 11:10:45 -05:00
Oth3r
6da81cb4af command code cleanup 2024-08-06 11:09:15 -05:00
Oth3r
3a56b1980d sit command try to sit at look target, before falling back to below 2024-08-06 11:08:48 -05:00
Oth3r
f4e7c55bca fixed crashing in multiplayer after playing singleplayer, fixes #6
(the event does not stop when the server stops)
2024-08-03 15:15:57 -05:00
Oth3r
15c22b480e
Merge pull request #5 from yichifauzi/master
Added Traditional Chinese (zh_tw.json)
2024-07-29 12:24:18 -05:00
Oth3r
6749255fa7 LangReader load on server start 2024-07-29 10:42:38 -05:00