|
|
bc59853f4e
|
Downgrade worldedit
|
2024-01-02 20:34:35 +07:00 |
|
|
|
9b80162a03
|
Merge branch '1.20.1' of https://git.dbotthepony.ru/DBot/overdrive_that_matters into 1.19.4
|
2024-01-02 20:34:06 +07:00 |
|
|
|
b28e180704
|
Downgrade worldedit
|
2024-01-02 20:33:42 +07:00 |
|
|
|
2deaef94aa
|
Merge branch '1.20.2' of https://git.dbotthepony.ru/DBot/overdrive_that_matters into 1.20.1
|
2024-01-02 20:33:11 +07:00 |
|
|
|
733b9edcad
|
Add worldedit to runtime envrionment
|
2024-01-02 20:32:35 +07:00 |
|
|
|
a65651a293
|
Re-enable Jade at dev runtime
|
2024-01-02 18:14:28 +07:00 |
|
|
|
cac468685e
|
Merge branch '1.20.1' of https://git.dbotthepony.ru/DBot/overdrive_that_matters into 1.19.4
|
2024-01-02 18:08:37 +07:00 |
|
|
|
78ac178526
|
Merge branch '1.20.2' of https://git.dbotthepony.ru/DBot/overdrive_that_matters into 1.20.1
|
2024-01-02 18:08:11 +07:00 |
|
|
|
c5313d405b
|
Actually make metal beams behave like pillars
|
2024-01-02 18:06:14 +07:00 |
|
|
|
c98562f2cb
|
Merge branch '1.20.1' into 1.19.4
|
2024-01-02 15:16:32 +07:00 |
|
|
|
92f2680feb
|
Use appropriate texture for status effect background
|
2024-01-02 15:16:28 +07:00 |
|
|
|
b8f98f0e9e
|
Merge branch '1.20.1' into 1.19.4
|
2024-01-02 15:05:25 +07:00 |
|
|
|
077e82064b
|
Merge branch '1.20.2' into 1.20.1
|
2024-01-02 15:05:25 +07:00 |
|
|
|
e6203e11b5
|
Fallback to zero if there is excess data when deserializing infinities
|
2024-01-02 15:05:22 +07:00 |
|
|
|
62cc823e29
|
Merge branch '1.20.1' into 1.19.4
|
2024-01-02 14:19:25 +07:00 |
|
|
|
c821fa76a6
|
Merge branch '1.20.2' into 1.20.1
|
2024-01-02 14:19:25 +07:00 |
|
|
|
290705dc38
|
Use proxied cursemaven because direct connection is not very productive
|
2024-01-02 14:19:19 +07:00 |
|
|
|
1d68f32b19
|
Fix multiplayer RecipeSerializer.codec
# Conflicts:
# build.gradle.kts
|
2024-01-02 13:53:33 +07:00 |
|
|
|
6e4bf4e7ec
|
Merge branch '1.20.2' into 1.20.1
|
2024-01-02 12:26:47 +07:00 |
|
|
|
ae544e8844
|
Merge branch '1.20.1' into 1.19.4
|
2024-01-02 12:26:47 +07:00 |
|
|
|
0a5dbf468f
|
Update author list
|
2024-01-02 12:24:09 +07:00 |
|
|
|
d96a0e1a63
|
Merge branch '1.20.1' into 1.19.4
|
2024-01-02 12:22:14 +07:00 |
|
|
|
5b45cf7d0a
|
Merge branch '1.20.2' into 1.20.1
|
2024-01-02 12:22:08 +07:00 |
|
|
|
46d5f8b76b
|
Revert import changes
|
2024-01-02 12:21:48 +07:00 |
|
|
|
37e7f42587
|
add missing import
|
2024-01-02 12:10:43 +07:00 |
|
|
|
7f15ae6a3a
|
Merge branch '1.20.1' into 1.19.4
|
2024-01-02 12:01:30 +07:00 |
|
|
|
edea36a8a6
|
Merge branch '1.20.2' into 1.20.1
|
2024-01-02 12:00:12 +07:00 |
|
|
|
113db7fa9e
|
Add microwave oven block shape
|
2024-01-02 11:53:52 +07:00 |
|
|
|
063095df10
|
Merge branch 'master' of https://git.dbotthepony.ru/DBot/overdrive_that_matters into master
|
2024-01-02 11:42:45 +07:00 |
|
|
|
76de15f01b
|
Update the texture for metal beams and lamps
|
2024-01-02 00:15:39 +06:00 |
|
|
|
ea448c5262
|
More texture adjustments
|
2024-01-01 23:51:32 +06:00 |
|
|
|
355242b470
|
Merge remote-tracking branch 'origin/master'
|
2024-01-01 23:17:20 +06:00 |
|
|
|
ffa94d190d
|
Microwave
|
2024-01-01 23:16:59 +06:00 |
|
|
|
ad76b4cabc
|
Fix tooltips being wrongly positioned
|
2024-01-01 22:41:58 +07:00 |
|
|
|
6bee0784d3
|
Texture adjustments
|
2024-01-01 16:42:47 +06:00 |
|
|
|
7258e1e4d3
|
Merge branch '1.20.1' into 1.19.4
|
2024-01-01 17:31:35 +07:00 |
|
|
|
34ef50f6ee
|
Merge branch '1.20.2' into 1.20.1
|
2024-01-01 17:31:29 +07:00 |
|
|
|
2cc8215cb0
|
Revert "Polyfill dataresult"
This reverts commit e3df0d82e0.
|
2024-01-01 17:30:48 +07:00 |
|
|
|
4c5c2362ce
|
Merge branch '1.20.2' into 1.20.1
|
2024-01-01 17:29:28 +07:00 |
|
|
|
e3df0d82e0
|
Polyfill dataresult
|
2024-01-01 17:28:46 +07:00 |
|
|
|
5ad9d49537
|
Merge branch '1.20.1' into 1.19.4
|
2024-01-01 16:51:04 +07:00 |
|
|
|
54fa8a252e
|
Merge branch '1.20.2' into 1.20.1
|
2024-01-01 16:51:04 +07:00 |
|
|
|
18965ccfc7
|
god damn it
|
2024-01-01 16:50:37 +07:00 |
|
|
|
4e3ca82fc7
|
Destroy cables on piston push instead of block
|
2024-01-01 16:43:11 +07:00 |
|
|
|
d84af00876
|
Merge branch '1.20.1' into 1.19.4
|
2024-01-01 16:41:39 +07:00 |
|
|
|
a9cb2db3b4
|
Merge branch '1.20.2' into 1.20.1
|
2024-01-01 16:38:01 +07:00 |
|
|
|
64b8346424
|
Specify proper piston push behavior for most blocks
|
2024-01-01 16:37:42 +07:00 |
|
|
|
454e4f6a63
|
Merge branch '1.20.1' into 1.19.4
|
2024-01-01 15:47:43 +07:00 |
|
|
|
6dbd942626
|
Merge branch 'master' into 1.19.4
|
2024-01-01 15:47:20 +07:00 |
|
|
|
748a232569
|
Merge branch 'master' into 1.20.1
|
2024-01-01 15:45:06 +07:00 |
|
