DBot/overdrive_that_matters
DBot/overdrive_that_matters
3
1
Fork 0
Code Issues 63 Pull Requests Packages Releases Wiki Activity
2,916 Commits 10 Branches 0 Tags 28 MiB
cae417b3b4
Commit Graph

2916 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
DBotThePony
cae417b3b4
Fix item icons not being rendered correctly 2024-01-02 14:38:58 +07:00
DBotThePony
8d42686cc5
Merge branch '1.19.4' into 1.19.3 2024-01-02 14:19:26 +07:00
DBotThePony
62cc823e29
Merge branch '1.20.1' into 1.19.4 2024-01-02 14:19:25 +07:00
DBotThePony
c821fa76a6
Merge branch '1.20.2' into 1.20.1 2024-01-02 14:19:25 +07:00
DBotThePony
290705dc38
Use proxied cursemaven because direct connection is not very productive 2024-01-02 14:19:19 +07:00
DBotThePony
57cc9730f8
Merge branch '1.19.4' into 1.19.3 2024-01-02 13:53:50 +07:00
DBotThePony
1d68f32b19
Fix multiplayer RecipeSerializer.codec 
# Conflicts:
#	build.gradle.kts
 2024-01-02 13:53:33 +07:00
DBotThePony
6b6f9f8062
Merge branch '1.19.4' into 1.19.3 2024-01-02 12:26:48 +07:00
DBotThePony
6e4bf4e7ec
Merge branch '1.20.2' into 1.20.1 2024-01-02 12:26:47 +07:00
DBotThePony
ae544e8844
Merge branch '1.20.1' into 1.19.4 2024-01-02 12:26:47 +07:00
DBotThePony
0a5dbf468f
Update author list 2024-01-02 12:24:09 +07:00
DBotThePony
3819e5c49b
Merge branch '1.19.4' into 1.19.3 2024-01-02 12:22:22 +07:00
DBotThePony
d96a0e1a63
Merge branch '1.20.1' into 1.19.4 2024-01-02 12:22:14 +07:00
DBotThePony
5b45cf7d0a
Merge branch '1.20.2' into 1.20.1 2024-01-02 12:22:08 +07:00
DBotThePony
46d5f8b76b
Revert import changes 2024-01-02 12:21:48 +07:00
DBotThePony
ea448788c5
Merge branch '1.19.4' into 1.19.3 2024-01-02 12:10:51 +07:00
DBotThePony
37e7f42587
add missing import 2024-01-02 12:10:43 +07:00
DBotThePony
34a9bfd48a
Merge branch '1.19.4' into 1.19.3 2024-01-02 12:01:48 +07:00
DBotThePony
7f15ae6a3a
Merge branch '1.20.1' into 1.19.4 2024-01-02 12:01:30 +07:00
DBotThePony
edea36a8a6
Merge branch '1.20.2' into 1.20.1 2024-01-02 12:00:12 +07:00
DBotThePony
113db7fa9e
Add microwave oven block shape 2024-01-02 11:53:52 +07:00
DBotThePony
063095df10
Merge branch 'master' of https://git.dbotthepony.ru/DBot/overdrive_that_matters into master 2024-01-02 11:42:45 +07:00
GearShocky
76de15f01b Update the texture for metal beams and lamps 2024-01-02 00:15:39 +06:00
GearShocky
ea448c5262 More texture adjustments 2024-01-01 23:51:32 +06:00
GearShocky
355242b470 Merge remote-tracking branch 'origin/master' 2024-01-01 23:17:20 +06:00
GearShocky
ffa94d190d Microwave 2024-01-01 23:16:59 +06:00
DBotThePony
20469a14dd
:wine: 2024-01-01 22:53:51 +07:00
DBotThePony
8a891e6ffb
Merge branch '1.19.4' into 1.19.3 2024-01-01 22:44:09 +07:00
DBotThePony
ad76b4cabc
Fix tooltips being wrongly positioned 2024-01-01 22:41:58 +07:00
DBotThePony
9cf66e443e
Fix items being rendered with 1 pixel offset 2024-01-01 22:24:15 +07:00
DBotThePony
2506f0fe0e
Fix missed translatable contents 2024-01-01 22:17:23 +07:00
DBotThePony
2aa084290b
Make mod compile against 1.19.3 2024-01-01 22:15:32 +07:00
DBotThePony
b9f6b65900
Make main source set compile against 1.19.3 2024-01-01 22:12:39 +07:00
DBotThePony
41ce2841b1
More backporting 2024-01-01 22:04:53 +07:00
DBotThePony
a5ba27cf63
More backporting 2024-01-01 22:04:26 +07:00
DBotThePony
7b415fbce3
More backporting 2024-01-01 22:01:57 +07:00
DBotThePony
2a117a540e
More backporting 2024-01-01 21:07:43 +07:00
DBotThePony
df15bd2f69
More backporting 2024-01-01 17:55:27 +07:00
GearShocky
6bee0784d3 Texture adjustments 2024-01-01 16:42:47 +06:00
DBotThePony
3dab053420
Merge branch '1.19.4' into 1.19.3 2024-01-01 17:31:45 +07:00
DBotThePony
7258e1e4d3
Merge branch '1.20.1' into 1.19.4 2024-01-01 17:31:35 +07:00
DBotThePony
34ef50f6ee
Merge branch '1.20.2' into 1.20.1 2024-01-01 17:31:29 +07:00
DBotThePony
2cc8215cb0
Revert "Polyfill dataresult" 
This reverts commit e3df0d82e0.
 2024-01-01 17:30:48 +07:00
DBotThePony
4c5c2362ce
Merge branch '1.20.2' into 1.20.1 2024-01-01 17:29:28 +07:00
DBotThePony
e3df0d82e0
Polyfill dataresult 2024-01-01 17:28:46 +07:00
DBotThePony
0a5ae54614
Some backporting 2024-01-01 17:18:57 +07:00
DBotThePony
45dd3e5c4b
Downgrade dependencies 2024-01-01 17:02:19 +07:00
DBotThePony
5ad9d49537
Merge branch '1.20.1' into 1.19.4 2024-01-01 16:51:04 +07:00
DBotThePony
54fa8a252e
Merge branch '1.20.2' into 1.20.1 2024-01-01 16:51:04 +07:00
DBotThePony
18965ccfc7
god damn it 2024-01-01 16:50:37 +07:00