|
|
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 |
|
|
|
37ce7343d4
|
Fix damage type names
|
2024-01-02 15:29:40 +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 |
|
|
|
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 |
|
|
|
cae417b3b4
|
Fix item icons not being rendered correctly
|
2024-01-02 14:38:58 +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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
20469a14dd
|
:wine:
|
2024-01-01 22:53:51 +07:00 |
|
|
|
8a891e6ffb
|
Merge branch '1.19.4' into 1.19.3
|
2024-01-01 22:44:09 +07:00 |
|
|
|
ad76b4cabc
|
Fix tooltips being wrongly positioned
|
2024-01-01 22:41:58 +07:00 |
|
|
|
9cf66e443e
|
Fix items being rendered with 1 pixel offset
|
2024-01-01 22:24:15 +07:00 |
|
|
|
2506f0fe0e
|
Fix missed translatable contents
|
2024-01-01 22:17:23 +07:00 |
|
|
|
2aa084290b
|
Make mod compile against 1.19.3
|
2024-01-01 22:15:32 +07:00 |
|
|
|
b9f6b65900
|
Make main source set compile against 1.19.3
|
2024-01-01 22:12:39 +07:00 |
|
|
|
41ce2841b1
|
More backporting
|
2024-01-01 22:04:53 +07:00 |
|
|
|
a5ba27cf63
|
More backporting
|
2024-01-01 22:04:26 +07:00 |
|
|
|
7b415fbce3
|
More backporting
|
2024-01-01 22:01:57 +07:00 |
|
|
|
2a117a540e
|
More backporting
|
2024-01-01 21:07:43 +07:00 |
|
|
|
df15bd2f69
|
More backporting
|
2024-01-01 17:55:27 +07:00 |
|
|
|
6bee0784d3
|
Texture adjustments
|
2024-01-01 16:42:47 +06:00 |
|
