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

2770 Commits

Author SHA1 Message Date
DBotThePony
1d68f32b19
Fix multiplayer RecipeSerializer.codec 
# Conflicts:
#	build.gradle.kts
 2024-01-02 13:53:33 +07:00
DBotThePony
ae544e8844
Merge branch '1.20.1' into 1.19.4 2024-01-02 12:26:47 +07:00
DBotThePony
6e4bf4e7ec
Merge branch '1.20.2' into 1.20.1 2024-01-02 12:26:47 +07:00
DBotThePony
0a5dbf468f
Update author list 2024-01-02 12:24:09 +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
37e7f42587
add missing import 2024-01-02 12:10:43 +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
ad76b4cabc
Fix tooltips being wrongly positioned 2024-01-01 22:41:58 +07:00
GearShocky
6bee0784d3 Texture adjustments 2024-01-01 16:42:47 +06: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
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
DBotThePony
4e3ca82fc7
Destroy cables on piston push instead of block 2024-01-01 16:43:11 +07:00
DBotThePony
d84af00876
Merge branch '1.20.1' into 1.19.4 2024-01-01 16:41:39 +07:00
DBotThePony
a9cb2db3b4
Merge branch '1.20.2' into 1.20.1 2024-01-01 16:38:01 +07:00
DBotThePony
64b8346424
Specify proper piston push behavior for most blocks 2024-01-01 16:37:42 +07:00
DBotThePony
6dbd942626
Merge branch 'master' into 1.19.4 2024-01-01 15:47:20 +07:00
DBotThePony
748a232569
Merge branch 'master' into 1.20.1 2024-01-01 15:45:06 +07:00
DBotThePony
50112bfbaf
Don't make cables seem to be interactable 2024-01-01 15:00:50 +07:00
DBotThePony
da4c1108c2
Fix slot panel quick move display 2024-01-01 14:45:37 +07:00
DBotThePony
8e469c309d
Make datagen run? 2024-01-01 14:23:28 +07:00
DBotThePony
f3bf84a7a2
Make mod compile against 1.19.4 2024-01-01 12:19:07 +07:00
DBotThePony
b6643a6dd3
Make main source set compile against 1.19.4 2024-01-01 12:10:02 +07:00
DBotThePony
31268e33ef
Merge branch 'master' into 1.19.4 2024-01-01 12:01:33 +07:00
DBotThePony
86c426a504
Merge branch 'master' into 1.20.1 2024-01-01 11:45:14 +07:00
DBotThePony
3db63aa589
Add MatteryContainer.ContainerListener 2024-01-01 11:45:06 +07:00
DBotThePony
afe7d698c8
More backporting 2024-01-01 11:39:30 +07:00
DBotThePony
0bcc078fe9
More backporting 2024-01-01 11:19:20 +07:00
DBotThePony
e3e02dbad2
More backporting 2024-01-01 03:28:59 +07:00
DBotThePony
e563b85946
Some backporting 2024-01-01 03:22:05 +07:00
DBotThePony
cc82146f0a
Remove import 2024-01-01 03:00:55 +07:00
DBotThePony
108b49bedb
Merge branch 'master' into 1.20.1 2024-01-01 02:55:55 +07:00
DBotThePony
716d251ca0
More MGUIGraphics moves 2024-01-01 02:51:54 +07:00
DBotThePony
1dab485d29
Specify font implicitly 2024-01-01 02:46:00 +07:00
DBotThePony
d81d7885c0
And move it to render subpackage 2024-01-01 02:40:58 +07:00
DBotThePony
311de079fa
Add polyfill guigraphics 2024-01-01 02:39:58 +07:00
DBotThePony
71850b38e5
Merge branch 'master' into 1.20.1 2024-01-01 00:58:18 +07:00
DBotThePony
2e23ce1a04
One more isCancelable 2024-01-01 00:58:17 +07:00