|
a65651a293
|
Re-enable Jade at dev runtime
|
2024-01-02 18:14:28 +07:00 |
|
|
b0ca9320ca
|
Merge branch '1.19.3' of https://git.dbotthepony.ru/DBot/overdrive_that_matters into 1.19.2
|
2024-01-02 18:09:16 +07:00 |
|
|
2ae5166a01
|
Merge branch '1.19.4' of https://git.dbotthepony.ru/DBot/overdrive_that_matters into 1.19.3
|
2024-01-02 18:08:55 +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 |
|
|
824b63b012
|
Update matrix symbol name in coremod injector
|
2024-01-02 16:28:26 +07:00 |
|
|
d06f3b5856
|
Merge branch '1.19.3' into 1.19.2
|
2024-01-02 15:29:46 +07:00 |
|
|
37ce7343d4
|
Fix damage type names
|
2024-01-02 15:29:40 +07:00 |
|
|
a8121bf81b
|
Merge branch '1.19.3' into 1.19.2
|
2024-01-02 15:16:33 +07:00 |
|
|
0944e55141
|
Merge branch '1.19.4' into 1.19.3
|
2024-01-02 15:16:33 +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 |
|
|
eec2f99188
|
Merge branch '1.19.3' into 1.19.2
|
2024-01-02 15:05:26 +07:00 |
|
|
783c2bde34
|
Merge branch '1.19.4' into 1.19.3
|
2024-01-02 15:05:26 +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 |
|
|
5e73687068
|
Fix crash in CreativeMenuItemComparator
|
2024-01-02 14:55:47 +07:00 |
|
|
b763a7d1be
|
Fix item icons not being rendered correctly for 1.19.2
|
2024-01-02 14:48:32 +07:00 |
|
|
5f60ae1896
|
Merge branch '1.19.3' into 1.19.2
|
2024-01-02 14:39:05 +07:00 |
|
|
cae417b3b4
|
Fix item icons not being rendered correctly
|
2024-01-02 14:38:58 +07:00 |
|
|
fd831c74ea
|
Merge branch '1.19.3' into 1.19.2
|
2024-01-02 14:19:27 +07:00 |
|
|
8d42686cc5
|
Merge branch '1.19.4' into 1.19.3
|
2024-01-02 14:19:26 +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 |
|
|
672123850b
|
Merge branch '1.19.3' into 1.19.2
|
2024-01-02 13:53:58 +07:00 |
|
|
57cc9730f8
|
Merge branch '1.19.4' into 1.19.3
|
2024-01-02 13:53:50 +07:00 |
|
|
1d68f32b19
|
Fix multiplayer RecipeSerializer.codec
# Conflicts:
# build.gradle.kts
|
2024-01-02 13:53:33 +07:00 |
|
|
d710b23223
|
Fix multiplayer RecipeSerializer.codec
|
2024-01-02 13:51:58 +07:00 |
|
|
5971db9a24
|
Register item color handlers and decorators only on client
|
2024-01-02 13:40:48 +07:00 |
|
|
ccb5914bb2
|
Merge branch '1.19.3' into 1.19.2
|
2024-01-02 12:26:49 +07:00 |
|
|
6b6f9f8062
|
Merge branch '1.19.4' into 1.19.3
|
2024-01-02 12:26:48 +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 |
|
|
03ea3a3a5c
|
Merge branch '1.19.3' into 1.19.2
|
2024-01-02 12:22:26 +07:00 |
|
|
3819e5c49b
|
Merge branch '1.19.4' into 1.19.3
|
2024-01-02 12:22:22 +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 |
|
|
4e1a40279b
|
Merge branch '1.19.3' into 1.19.2
|
2024-01-02 12:10:55 +07:00 |
|
|
ea448788c5
|
Merge branch '1.19.4' into 1.19.3
|
2024-01-02 12:10:51 +07:00 |
|
|
37e7f42587
|
add missing import
|
2024-01-02 12:10:43 +07:00 |
|
|
99cefc2ffc
|
Merge branch '1.19.3' into 1.19.2
|
2024-01-02 12:01:58 +07:00 |
|
|
34a9bfd48a
|
Merge branch '1.19.4' into 1.19.3
|
2024-01-02 12:01:48 +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 |
|