|
|
c9f84016c1
|
i didn't ask for kff function
|
2024-01-08 21:50:49 +07:00 |
|
|
|
c17e0aac04
|
Merge branch '1.19.4' of https://git.dbotthepony.ru/DBot/overdrive_that_matters into 1.19.3
|
2024-01-08 21:42:16 +07:00 |
|
|
|
d88801d8bf
|
Merge branch '1.20.1' of https://git.dbotthepony.ru/DBot/overdrive_that_matters into 1.19.4
|
2024-01-08 21:41:59 +07:00 |
|
|
|
055b9cc489
|
Merge branch '1.20.2' of https://git.dbotthepony.ru/DBot/overdrive_that_matters into 1.20.1
|
2024-01-08 21:41:51 +07:00 |
|
|
|
a7902b66b5
|
Fix holo sign not marking chunk it is in dirty after setting color
|
2024-01-08 21:33:20 +07:00 |
|
|
|
d3b0eb5f92
|
Add tintindex to holo sign to color its lights
|
2024-01-08 21:32:53 +07:00 |
|
|
|
d085979b9e
|
> minor spelling mistake
|
2024-01-08 14:28:15 +07:00 |
|
|
|
241f13914d
|
Merge branch '1.19.4' of https://git.dbotthepony.ru/DBot/overdrive_that_matters into 1.19.3
|
2024-01-08 14:16:39 +07:00 |
|
|
|
f1df27d5d7
|
Merge branch '1.20.1' of https://git.dbotthepony.ru/DBot/overdrive_that_matters into 1.19.4
|
2024-01-08 14:16:31 +07:00 |
|
|
|
640f62d63b
|
Merge branch '1.20.2' of https://git.dbotthepony.ru/DBot/overdrive_that_matters into 1.20.1
|
2024-01-08 14:16:23 +07:00 |
|
|
|
0fc99b90d9
|
whut
|
2024-01-08 14:16:06 +07:00 |
|
|
|
44183a45a8
|
Merge branch '1.19.4' of https://git.dbotthepony.ru/DBot/overdrive_that_matters into 1.19.3
|
2024-01-08 14:14:06 +07:00 |
|
|
|
c88023470f
|
Merge branch '1.20.1' of https://git.dbotthepony.ru/DBot/overdrive_that_matters into 1.19.4
|
2024-01-08 14:13:57 +07:00 |
|
|
|
d3423a6160
|
Post merge fixes for 1.20.1
|
2024-01-08 14:13:43 +07:00 |
|
|
|
55c0be74d3
|
Merge branch '1.20.2' of https://git.dbotthepony.ru/DBot/overdrive_that_matters into 1.20.1
|
2024-01-08 14:13:04 +07:00 |
|
|
|
c186a6b405
|
Add missing tritanium block yellow stripe painter recipe
|
2024-01-08 10:24:52 +07:00 |
|
|
|
bf450e2ff9
|
Add block entity sync backlog handling
|
2024-01-08 10:21:43 +07:00 |
|
|
|
c04830a3bb
|
Fluid tank and capsule advancements
|
2024-01-08 01:47:24 +07:00 |
|
|
|
4033fd2ba9
|
Energy servo advancement
|
2024-01-08 01:45:32 +07:00 |
|
|
|
e54ca2ecfa
|
Energy servo advancement
|
2024-01-08 00:35:46 +07:00 |
|
|
|
7d08b90020
|
Double the amount of energy produced by chemical generator from fuels
|
2024-01-08 00:13:36 +07:00 |
|
|
|
54a6f9f152
|
Add essence storage advancement
|
2024-01-07 20:15:42 +07:00 |
|
|
|
8164921344
|
how
|
2024-01-07 20:03:41 +07:00 |
|
|
|
667dcf6b58
|
Merge branch '1.19.4' of https://git.dbotthepony.ru/DBot/overdrive_that_matters into 1.19.3
|
2024-01-07 12:08:02 +07:00 |
|
|
|
a59fe8c256
|
Merge branch '1.20.1' of https://git.dbotthepony.ru/DBot/overdrive_that_matters into 1.19.4
|
2024-01-07 12:07:43 +07:00 |
|
|
|
9d9b19da9d
|
Merge branch '1.20.2' of https://git.dbotthepony.ru/DBot/overdrive_that_matters into 1.20.1
|
2024-01-07 12:07:19 +07:00 |
|
|
|
b83d2421a1
|
Remove explosive hammer priming recipe
|
2024-01-07 11:59:21 +07:00 |
|
|
|
eb460d04ec
|
Merge branch '1.19.4' of https://git.dbotthepony.ru/DBot/overdrive_that_matters into 1.19.3
|
2024-01-07 11:49:34 +07:00 |
|
|
|
6dce3a37e6
|
Merge branch '1.20.1' of https://git.dbotthepony.ru/DBot/overdrive_that_matters into 1.19.4
|
2024-01-07 11:49:27 +07:00 |
|
|
|
652acf3ce1
|
Merge branch '1.20.2' of https://git.dbotthepony.ru/DBot/overdrive_that_matters into 1.20.1
|
2024-01-07 11:49:20 +07:00 |
|
|
|
e5b3d6bf0c
|
Fix machines turning into disco ball when one slot is working and other is errored
|
2024-01-06 23:10:14 +07:00 |
|
|
|
4279840a23
|
Fix being able to switch inventory charge flag before getting exopack
|
2024-01-06 21:09:14 +07:00 |
|
|
|
9dbf40f170
|
Merge branch '1.19.4' of https://git.dbotthepony.ru/DBot/overdrive_that_matters into 1.19.3
|
2024-01-06 16:45:33 +07:00 |
|
|
|
6eb3700f88
|
Merge branch '1.20.1' of https://git.dbotthepony.ru/DBot/overdrive_that_matters into 1.19.4
|
2024-01-06 16:45:27 +07:00 |
|
|
|
101e57756a
|
Merge branch '1.20.2' of https://git.dbotthepony.ru/DBot/overdrive_that_matters into 1.20.1
|
2024-01-06 16:45:21 +07:00 |
|
|
|
c97ab62faa
|
Display whenever upgrade reached bonus limit
|
2024-01-06 14:19:33 +07:00 |
|
|
|
f165c0fbdc
|
Merge branch '1.19.4' of https://git.dbotthepony.ru/DBot/overdrive_that_matters into 1.19.3
|
2024-01-06 11:43:06 +07:00 |
|
|
|
0695f613d3
|
Merge branch '1.20.1' of https://git.dbotthepony.ru/DBot/overdrive_that_matters into 1.19.4
|
2024-01-06 11:42:56 +07:00 |
|
|
|
67dbcde6dc
|
Post merge fixes for 1.20.1
|
2024-01-06 11:41:44 +07:00 |
|
|
|
1967373a9d
|
Merge branch '1.19.4' of https://git.dbotthepony.ru/DBot/overdrive_that_matters into 1.19.3
|
2024-01-06 11:38:17 +07:00 |
|
|
|
04ce837b02
|
Merge branch '1.20.1' of https://git.dbotthepony.ru/DBot/overdrive_that_matters into 1.19.4
|
2024-01-06 11:38:03 +07:00 |
|
|
|
b4c994f02f
|
Merge branch '1.20.2' of https://git.dbotthepony.ru/DBot/overdrive_that_matters into 1.20.1
|
2024-01-06 11:37:34 +07:00 |
|
|
|
05db4a0c05
|
Use cutout for microwave oven
|
2024-01-06 11:28:48 +07:00 |
|
|
|
6aabc72145
|
Chemical generator, energy servo and energy counter coloring
|
2024-01-06 11:21:40 +07:00 |
|
|
|
a1f29021c6
|
Merge branch '1.19.4' of https://git.dbotthepony.ru/DBot/overdrive_that_matters into 1.19.3
|
2024-01-05 23:52:30 +07:00 |
|
|
|
ef997ca1fe
|
Merge branch '1.20.1' of https://git.dbotthepony.ru/DBot/overdrive_that_matters into 1.19.4
|
2024-01-05 23:52:21 +07:00 |
|
|
|
8007c1757e
|
Merge branch '1.20.2' of https://git.dbotthepony.ru/DBot/overdrive_that_matters into 1.20.1
|
2024-01-05 23:52:11 +07:00 |
|
|
|
9be5ca359d
|
Compute block shapes in background, reduces mod startup time to 1/3 of original
|
2024-01-05 23:50:10 +07:00 |
|
|
|
f3f8155027
|
Merge branch '1.19.4' of https://git.dbotthepony.ru/DBot/overdrive_that_matters into 1.19.3
|
2024-01-05 23:07:48 +07:00 |
|
|
|
7e6a150ab7
|
Merge branch '1.20.1' of https://git.dbotthepony.ru/DBot/overdrive_that_matters into 1.19.4
|
2024-01-05 23:07:42 +07:00 |
|
|
|
8aafa38c27
|
Merge branch '1.20.2' of https://git.dbotthepony.ru/DBot/overdrive_that_matters into 1.20.1
|
2024-01-05 23:07:36 +07:00 |
|
|
|
808f152cc3
|
Fix invalid workProgress calculation
|
2024-01-05 23:07:19 +07:00 |
|
|
|
8097551fd3
|
Merge branch '1.19.4' of https://git.dbotthepony.ru/DBot/overdrive_that_matters into 1.19.3
|
2024-01-05 22:59:47 +07:00 |
|
|
|
cc164f669d
|
Merge branch '1.20.1' of https://git.dbotthepony.ru/DBot/overdrive_that_matters into 1.19.4
|
2024-01-05 22:59:40 +07:00 |
|
|
|
e51ba7015a
|
Merge branch '1.20.2' of https://git.dbotthepony.ru/DBot/overdrive_that_matters into 1.20.1
|
2024-01-05 22:59:33 +07:00 |
|
|
|
a41856d6c8
|
Since game objects create intrusive holders statically, which calls into non thread-safe code, disallow parallel registration for now
|
2024-01-05 22:59:06 +07:00 |
|
|
|
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 |
|
|
|
ef4f65656c
|
Fix battery bank not being painted in world
|
2024-01-05 14:16:01 +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 |
|
|
|
f9dcf43cc4
|
Fix compilation error
|
2024-01-04 20:12:29 +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 |
|
|
|
ce8c257928
|
Some cleanup of code from previous commits
|
2024-01-04 14:57:33 +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 |
|
|
|
800fd54d8e
|
Explicitly inherit string matter value for wool
|
2024-01-03 20:04:46 +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 |
|
|
|
c5ea764848
|
Shorten configuration titles
|
2024-01-03 15:04:27 +07:00 |
|
|
|
56db45a0d4
|
Add liquid xp locale strings
|
2024-01-03 15:03:20 +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 |
|
|
|
2ae5166a01
|
Merge branch '1.19.4' of https://git.dbotthepony.ru/DBot/overdrive_that_matters into 1.19.3
|
2024-01-02 18:08:55 +07:00 |
|
|
|
cac468685e
|
Merge branch '1.20.1' of https://git.dbotthepony.ru/DBot/overdrive_that_matters into 1.19.4
|
2024-01-02 18:08:37 +07:00 |
|
|
|
78ac178526
|
Merge branch '1.20.2' of https://git.dbotthepony.ru/DBot/overdrive_that_matters into 1.20.1
|
2024-01-02 18:08:11 +07:00 |
|
|
|
c5313d405b
|
Actually make metal beams behave like pillars
|
2024-01-02 18:06:14 +07: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 |
|
