Commit graph

4 commits

Author SHA1 Message Date
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
3944881f22 use the otterlib customfile interface 2025-05-04 13:39:34 -05:00
Oth3r
32a4b0006a 1.20.6 port 2024-11-27 10:42:50 -06:00
Oth3r
2bffecf784 new custom item json type, simplifying some things 2024-09-21 19:52:44 -05:00