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
399 commits 12 branches 0 tags 59 MiB
Commit graph

118 commits

Author SHA1 Message Date
Oth3r
eaa290a8bf Merge branch '1.20.4' into 1.20.1 
# Conflicts:
#	gradle.properties
 2025-06-14 19:09:05 -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
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
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
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
Oth3r
62fd879d0d v1.2.4.1 2025-05-13 14:01:40 -05:00
Oth3r
50c84def58 remove loom version property 2025-05-12 23:18:33 -05:00
Oth3r
2402c7d7f0 bump versions 2025-05-12 23:12:10 -05:00
Oth3r
a39d4cf12f v1.2.4.0 2025-05-08 13:03:25 -05:00
Oth3r
2cf57f78c2 add otterlib dependency in fabric.mod.json 2025-05-08 12:54:45 -05:00
Oth3r
e8947f2a24 add otterlib 2025-05-03 15:36:42 -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
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
f856f0c7ed Merge branch 'master' into 1.21.4 
# Conflicts:
#	gradle.properties
 2025-04-19 19:45:40 -05:00
Oth3r
699280f005 v1.2.3.2 2025-04-19 19:42:04 -05:00
Oth3r
8a5cf181db v1.2.3.1 2025-04-08 14:37:39 -05:00
Oth3r
884a3f639b v1.2.3.1 2025-04-08 14:07:05 -05:00
Oth3r
85732506a2 bump dependencies 2025-04-08 14:02:09 -05:00
Oth3r
12573bbd88 1.21.5 port 2025-03-25 12:16:03 -05:00
Oth3r
83fda90948 add minecraft_versions 2025-03-25 12:00:44 -05:00
Oth3r
3d89222840 add max minecraft version 2025-03-25 12:00:04 -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
2e7967699e Merge branch 'master' into 1.21.3 
# Conflicts:
#	gradle.properties
 2025-03-13 17:39:41 -05:00
Oth3r
44183128a5 v1.2.3 2025-03-09 14:57:43 -05: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
Oth3r
7658dbd40e Merge branch '1.20.6' into 1.20.4 
# Conflicts:
#	gradle.properties
 2025-02-23 15:40:18 -06:00
Oth3r
a971fa9926 Merge branch '1.21.1' into 1.20.6 
# Conflicts:
#	gradle.properties
 2025-02-23 15:23:04 -06:00
Oth3r
b5eaf3df7a 1.21-1.21.1 version fix 2025-02-23 15:06:21 -06:00
Oth3r
a9399fcbf9 1.21.3 number fix 2025-02-18 12:07:14 -06:00
Oth3r
08788456b2 1.21.3 2025-02-17 16:05:18 -06:00
Oth3r
f983763a70 v1.2.2 2025-02-14 11:48:53 -06:00
Oth3r
6fd3a8bd29 update dependencies 2025-02-14 11:45:38 -06:00
Oth3r
1298e1940a Merge branch '1.20.4' into 1.20.1 
# Conflicts:
#	gradle.properties
#	src/main/java/one/oth3r/sit/Events.java
 2024-12-21 12:47:08 -06:00
Oth3r
18ad774e63 Merge branch '1.20.6' into 1.20.4 
# Conflicts:
#	gradle.properties
 2024-12-17 12:44:55 -06:00
Oth3r
fda08029bb Merge branch '1.21.3' into 1.21.1 
# Conflicts:
#	gradle.properties
 2024-12-15 11:36:25 -06:00
Oth3r
2b661a0fa8 Merge branch '1.21.3' into 1.20.6 
# Conflicts:
#	gradle.properties
 2024-12-11 14:46:32 -06:00