Commit Graph

2956 Commits

Author SHA1 Message Date
ffa94d190d Microwave 2024-01-01 23:16:59 +06:00
6bee0784d3 Texture adjustments 2024-01-01 16:42:47 +06: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
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
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
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
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
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
1dab485d29
Specify font implicitly 2024-01-01 02:46:00 +07:00
d81d7885c0
And move it to render subpackage 2024-01-01 02:40:58 +07:00
311de079fa
Add polyfill guigraphics 2024-01-01 02:39:58 +07:00
71850b38e5
Merge branch 'master' into 1.20.1 2024-01-01 00:58:18 +07:00
2e23ce1a04
One more isCancelable 2024-01-01 00:58:17 +07:00
796f29127f
Merge branch 'master' into 1.20.1 2024-01-01 00:13:22 +07:00
75681fb4c4
Specify isCancelable directly 2024-01-01 00:13:15 +07:00
8c43a3ec6d
Merge branch 'master' into 1.20.1 2023-12-31 23:18:46 +07:00
023ad54b33
Various fixes related to number handling 2023-12-31 23:18:23 +07:00
477e782c7c
*french disappointment* 2023-12-31 22:44:28 +07:00
65cf8bf9df
Fixes to data loading 2023-12-31 22:43:02 +07:00
e5a982ae13
Caused by: java.lang.invoke.LambdaConversionException: Invalid receiver type int; not a subtype of implementation type class java.lang.Integer 2023-12-31 22:25:55 +07:00
f942093e4f
Don't embed condition json by default 2023-12-31 22:23:16 +07:00
5d15611f84
Update mods.toml 2023-12-31 22:20:48 +07:00
1803d687ab
Make mod compile against 1.20.1 2023-12-31 22:18:43 +07:00
347be35184
Make main source set compile 2023-12-31 22:08:15 +07:00
aa0a283e06
More backporting 2023-12-31 21:40:54 +07:00
98fcacc9a8
More backporting 2023-12-31 21:14:32 +07:00
422ae92303
More backporting 2023-12-31 21:02:52 +07:00
7683cacc29
More backporting 2023-12-31 20:42:20 +07:00
520112df77
Backport MCriterionTrigger to 1.20.1 2023-12-31 20:29:57 +07:00
5453c8c793
Merge branch 'master' into 1.20.1 2023-12-31 20:25:03 +07:00
1681a7bf4a
Streamline trigger instances into single, more portable class 2023-12-31 20:23:45 +07:00
3c5ea937a5
More backporting 2023-12-31 18:23:07 +07:00
f16483d7c0
Some recipe backporting 2023-12-31 17:46:56 +07:00
8072a7b135
Don't check for "chunk send" status because it is already sent during event fire 2023-12-31 17:08:45 +07:00
44c6d0c0cf
Merge branch 'master' into 1.20.1 2023-12-31 17:02:21 +07:00
242876d533
Migrate to custom network context 2023-12-31 17:01:57 +07:00
b2d7f6c002
Set copyIdeResources to true 2023-12-31 16:52:17 +07:00
27dce0bd31
Downgrade dependencies 2023-12-31 12:54:59 +07:00
be52bbdc59
Fix not accounting initial cable node limit when transfering energy 2023-12-31 10:53:55 +07:00
6be24540a5
Don't remove self from lively nodes when all we can do is self-feed 2023-12-31 10:29:27 +07:00
a162caefb6
Use pecrentage function 2023-12-31 10:07:44 +07:00
8d222125b5
Specify max battery of cables as positive infinity 2023-12-31 09:41:03 +07:00