d24a72d435
Downgrade dependencies
2024-01-01 23:11:41 +07:00
9956aa1ba4
Merge branch '1.19.3' into 1.19.2
2024-01-01 23:06:05 +07:00
036de121c7
Revert "DBot — Сегодня, в 7:53"
...
This reverts commit 8abb4e1598
.
Revert "бакпорт изменений curios под смачный пердёж"
This reverts commit 1cbf73cdfd
.
Revert "помогите"
This reverts commit b97e18ca5f
.
Revert "DBotThePony — Сегодня, в 17:11"
This reverts commit 0da87980f7
.
Revert "android health bar + 1px wider energy bar"
This reverts commit cbaf89d4a7
.
Revert "Resolve conflicts between 1.19.3 code and 1.19.2 code"
This reverts commit 006cbc75e3
.
Revert "Add missing import"
This reverts commit 275e340243
.
Revert "Multi packet mattery registry sync"
This reverts commit 3dcaed64cd
.
Revert "Increase (de)compress buffer sizes"
This reverts commit 04a5e87fec
.
Revert "Compress matter registry packet"
This reverts commit 36c14be025
.
Revert "Payload may not be larger than 1048576 bytes"
This reverts commit 26a064fbe2
.
2024-01-01 23:05:36 +07: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
3dab053420
Merge branch '1.19.4' into 1.19.3
2024-01-01 17:31:45 +07: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
0a5ae54614
Some backporting
2024-01-01 17:18:57 +07:00
45dd3e5c4b
Downgrade dependencies
2024-01-01 17:02:19 +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
50112bfbaf
Don't make cables seem to be interactable
2024-01-01 15:00:50 +07:00
da4c1108c2
Fix slot panel quick move display
2024-01-01 14:45:37 +07:00
c4bcab44e4
Merge branch '1.20.1' into 1.19.4
2024-01-01 14:24:59 +07:00
8e469c309d
Make datagen run?
2024-01-01 14:23:28 +07:00
f3bf84a7a2
Make mod compile against 1.19.4
2024-01-01 12:19:07 +07:00
b6643a6dd3
Make main source set compile against 1.19.4
2024-01-01 12:10:02 +07:00
31268e33ef
Merge branch 'master' into 1.19.4
2024-01-01 12:01:33 +07:00
86c426a504
Merge branch 'master' into 1.20.1
2024-01-01 11:45:14 +07:00
3db63aa589
Add MatteryContainer.ContainerListener
2024-01-01 11:45:06 +07:00
afe7d698c8
More backporting
2024-01-01 11:39:30 +07:00
0bcc078fe9
More backporting
2024-01-01 11:19:20 +07:00
e3e02dbad2
More backporting
2024-01-01 03:28:59 +07:00
e563b85946
Some backporting
2024-01-01 03:22:05 +07:00
cc82146f0a
Remove import
2024-01-01 03:00:55 +07:00
f4ec4c9066
Merge branch '1.20.1' into 1.19.4
2024-01-01 02:57:10 +07:00
108b49bedb
Merge branch 'master' into 1.20.1
2024-01-01 02:55:55 +07:00
716d251ca0
More MGUIGraphics moves
2024-01-01 02:51:54 +07:00