|
|
9fe99e92f7
|
Merge branch '1.19.4' of https://git.dbotthepony.ru/DBot/overdrive_that_matters into 1.19.3
|
2024-01-05 22:20:24 +07:00 |
|
|
|
ee624f1b3f
|
Merge branch '1.20.1' of https://git.dbotthepony.ru/DBot/overdrive_that_matters into 1.19.4
|
2024-01-05 22:20:16 +07:00 |
|
|
|
1d0e24095a
|
Merge branch '1.20.2' of https://git.dbotthepony.ru/DBot/overdrive_that_matters into 1.20.1
|
2024-01-05 22:20:09 +07:00 |
|
|
|
a113e99a8e
|
lol dum
|
2024-01-05 22:20:01 +07:00 |
|
|
|
8f8fd8c8de
|
Merge branch '1.19.4' of https://git.dbotthepony.ru/DBot/overdrive_that_matters into 1.19.3
|
2024-01-05 22:14:21 +07:00 |
|
|
|
2b884739f4
|
Merge branch '1.20.1' of https://git.dbotthepony.ru/DBot/overdrive_that_matters into 1.19.4
|
2024-01-05 22:13:57 +07:00 |
|
|
|
a7d405b5ea
|
Merge branch '1.20.2' of https://git.dbotthepony.ru/DBot/overdrive_that_matters into 1.20.1
|
2024-01-05 22:13:36 +07:00 |
|
|
|
91dbb3e587
|
Fix microwave oven render not account for rotation and yRotationNorth being wrong
|
2024-01-05 22:13:22 +07:00 |
|
|
|
dd331e0881
|
Post merge fixes for 1.19.3
|
2024-01-05 22:02:17 +07:00 |
|
|
|
a4b3d2ba8a
|
Merge branch '1.19.4' of https://git.dbotthepony.ru/DBot/overdrive_that_matters into 1.19.3
|
2024-01-05 21:55:45 +07:00 |
|
|
|
74183f0982
|
Merge branch '1.20.1' of https://git.dbotthepony.ru/DBot/overdrive_that_matters into 1.19.4
|
2024-01-05 21:47:04 +07:00 |
|
|
|
8ee5e94a78
|
Merge branch '1.20.2' of https://git.dbotthepony.ru/DBot/overdrive_that_matters into 1.20.1
|
2024-01-05 21:42:09 +07:00 |
|
|
|
e55764c10d
|
Custom deferred register with parallel entry initialization
|
2024-01-05 21:35:14 +07:00 |
|
|
|
2dcfa99f9c
|
Microwave oven in-world rendering
|
2024-01-05 19:18:10 +07:00 |
|
|
|
796f7fdc98
|
Fix drive viewer model
|
2024-01-05 00:45:21 +07:00 |
|
|
|
a56dbd60f6
|
Switch render mode to cutout for holo sign and matter replicator
|
2024-01-05 00:38:53 +07:00 |
|
|
|
5d44a26493
|
Fix pattern monitor rotation
|
2024-01-05 00:32:30 +07:00 |
|
|
|
a95a5f27ff
|
Wireless charger, pattern monitor, driver viewer and storage power supplier coloring
|
2024-01-05 00:24:53 +07:00 |
|
|
|
028d03b147
|
Fix registry dumb creating invalid csv file
|
2024-01-04 23:18:36 +07:00 |
|
|
|
d10ce72a0e
|
Post merge fixes for 1.19.3
|
2024-01-04 20:41:32 +07:00 |
|
|
|
cae867cb4d
|
Merge branch '1.19.4' of https://git.dbotthepony.ru/DBot/overdrive_that_matters into 1.19.3
|
2024-01-04 20:29:05 +07:00 |
|
|
|
76c4c3e6a2
|
Post merge fixes for 1.19.4
|
2024-01-04 20:23:11 +07:00 |
|
|
|
a68c08ecf8
|
Merge branch '1.20.1' of https://git.dbotthepony.ru/DBot/overdrive_that_matters into 1.19.4
|
2024-01-04 20:18:14 +07:00 |
|
|
|
42fe77e6b4
|
Merge branch '1.20.2' of https://git.dbotthepony.ru/DBot/overdrive_that_matters into 1.20.1
|
2024-01-04 20:10:11 +07:00 |
|
|
|
486c9b00c9
|
Remove text from text field when doing right mouse click, and text field is not multiline
|
2024-01-04 20:01:14 +07:00 |
|
|
|
54ba7e94c6
|
Cursor type for android research tree
|
2024-01-04 19:59:57 +07:00 |
|
|
|
ed73c9fda8
|
Always display transfer history when pressing shift
|
2024-01-04 19:41:05 +07:00 |
|
|
|
f4bbf54095
|
Android station coloring
|
2024-01-04 19:37:36 +07:00 |
|
|
|
c69781c22c
|
Fix cursor wars between panels when grabbing mouse input
|
2024-01-04 19:08:20 +07:00 |
|
|
|
70ec49e546
|
Display panel's mouse cursor if it grabs mouse input
|
2024-01-04 18:58:20 +07:00 |
|
|
|
dbc793a592
|
Add hand cursor to progress gauge panel
|
2024-01-04 18:53:12 +07:00 |
|
|
|
c52995541b
|
Mouse cursors support
|
2024-01-04 18:36:52 +07:00 |
|
|
|
005c8b0396
|
Holo sign text coloring
|
2024-01-04 17:48:56 +07:00 |
|
|
|
a72f2aabb2
|
Make underwater travel challenge account for displacement, and not distance
|
2024-01-04 16:57:10 +07:00 |
|
|
|
ebafdbc925
|
Set MAX_ENERGY default config value to infinity
|
2024-01-04 16:38:09 +07:00 |
|
|
|
9800eb35ba
|
Fixed energy consumption not being merged properly
|
2024-01-04 16:37:41 +07:00 |
|
|
|
b3651b1f86
|
Powered furnace cleanup
|
2024-01-04 16:26:42 +07:00 |
|
|
|
8aa34b3645
|
Induction furnace and powered furnace painting
|
2024-01-04 15:57:12 +07:00 |
|
|
|
26cb0c8cba
|
Implement matter recycler coloring
|
2024-01-04 15:11:38 +07:00 |
|
|
|
3f2e90e55c
|
Merge remote-tracking branch 'origin/1.20.2' into 1.20.2
|
2024-01-04 14:06:48 +07:00 |
|
|
|
5b51c5e655
|
Microwave oven painting
|
2024-01-04 14:06:23 +07:00 |
|
|
|
071bb7b3ad
|
Chug xp
|
2024-01-04 12:46:19 +06:00 |
|
|
|
9ecf53342e
|
More machine coloring
|
2024-01-04 13:40:40 +07:00 |
|
|
|
895ed6fbef
|
Fix Computer 1000 yard stare + 4chair
|
2024-01-04 12:38:38 +06:00 |
|
|
|
9d876c573c
|
Merge remote-tracking branch 'origin/1.20.2' into 1.20.2
|
2024-01-04 12:07:45 +07:00 |
|
|
|
0c004aedc5
|
Some unifications regarding item tooltips
|
2024-01-04 01:06:55 +07:00 |
|
|
|
1e8aecb5d7
|
Maintain inner list of decorative blocks to register
|
2024-01-04 00:00:06 +07:00 |
|
|
|
f36019b4ef
|
Subscribe to these vents only when running client
|
2024-01-03 23:50:05 +07:00 |
|
|
|
8f92b8d3f1
|
Add computer terminal as actual block
|
2024-01-03 20:46:51 +07:00 |
|
|
|
0dcf6664a3
|
Add painter recipes to matter recipe finder
|
2024-01-03 20:03:23 +07:00 |
|
|
|
b2c2bfa536
|
Plate press coloring
|
2024-01-03 19:56:50 +07:00 |
|
|
|
d6dc8689f8
|
Essence storage coloring
|
2024-01-03 18:51:59 +07:00 |
|
|
|
cb50ee2c68
|
Colored machines test, update creative menu order
update SupplierList/Map impl to use Java's suppliers
general code layout improvements
|
2024-01-03 18:36:06 +07:00 |
|
|
|
73773d4c70
|
tele jigsaw grunt pathic telepathic st'ructure processor jigsaw worldgenjson
|
2024-01-03 16:53:27 +06:00 |
|
|
|
0ab411fd90
|
Add "none" to BlockRotationFreedom
|
2024-01-03 15:11:49 +07:00 |
|
|
|
565819c3e3
|
Add placeholder textures for liquid xp
|
2024-01-03 15:06:36 +07:00 |
|
|
|
e08c81520f
|
Actually expose fluid handler of essence storage
|
2024-01-03 15:00:50 +07:00 |
|
|
|
6e16364491
|
Laboratory rebuild WIP + decorative computer model
|
2024-01-03 09:57:03 +06: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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
8e469c309d
|
Make datagen run?
|
2024-01-01 14:23:28 +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 |
|
|
|
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 |
|
|
|
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 |
|
