Commit Graph

3059 Commits

Author SHA1 Message Date
abd6a93fd4
Merge branch '1.19.4' of https://git.dbotthepony.ru/DBot/overdrive_that_matters into 1.19.3 2024-01-08 21:51:23 +07:00
19b4942c90
Merge branch '1.20.1' of https://git.dbotthepony.ru/DBot/overdrive_that_matters into 1.19.4 2024-01-08 21:51:15 +07:00
3743a3402d
Merge branch '1.20.2' of https://git.dbotthepony.ru/DBot/overdrive_that_matters into 1.20.1 2024-01-08 21:51:08 +07:00
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