Commit Graph

3019 Commits

Author SHA1 Message Date
5552be70d5
Merge branch '1.20.2' of https://git.dbotthepony.ru/DBot/overdrive_that_matters into 1.20.1 2024-01-12 21:17:44 +07:00
c07120a1cb
Common menu base for processing machines 2024-01-12 21:00:48 +07:00
71f13f70bf
Scissor stack fix 2024-01-12 20:57:12 +07:00
0dffe511fd
Remove regular plate press, twin plate press is now the normal one 2024-01-12 19:17:07 +07:00
884336ffa1
Redo old recipes 2024-01-12 19:05:26 +07:00
e86299460b
Move fluid items to tooltiplist 2024-01-12 16:51:55 +07:00
c988c4b869
Fix matter capacitor bank breaking when using creative capacitors 2024-01-12 16:44:16 +07:00
bfd3c89bbf
Add tooltips to a handful of machines 2024-01-12 16:43:38 +07:00
882f1ce408
Tooltips galore 2024-01-12 15:53:58 +07:00
3c2c037ed0
Merge branch '1.20.2' of https://git.dbotthepony.ru/DBot/overdrive_that_matters into 1.20.2 2024-01-11 17:50:14 +07:00
878b715a3e
DBot — Сегодня, в 10:01
Оно создаёт промежуточный список, лучше просто foreach и is проверка
2024-01-11 10:05:37 +03:00
c01b949b45
DBot — Сегодня, в 9:08
Тот же вопрос
Я не думаю.
Я думаю2 что надо удалить предмет
2024-01-11 09:50:45 +03:00
538c36e50a
shield decorator for all shield-like items 2024-01-11 09:47:01 +03:00
8c257db68f
Caching default blockRotation implementation 2024-01-09 23:35:22 +07:00
91ccd0af16
Update explosive hammer tooltip 2024-01-09 20:04:46 +07:00
c210e9f842
Merge branch '1.19.4' of https://git.dbotthepony.ru/DBot/overdrive_that_matters into 1.19.3 2024-01-09 18:25:57 +07:00
d29f68fc4e
Merge branch '1.20.1' of https://git.dbotthepony.ru/DBot/overdrive_that_matters into 1.19.4 2024-01-09 18:25:53 +07:00
cb386d39f5
Merge branch '1.20.2' of https://git.dbotthepony.ru/DBot/overdrive_that_matters into 1.20.1 2024-01-09 18:25:48 +07:00
c45f5f6029
send help 2024-01-09 18:23:38 +07:00
55e6a4cb19
Merge branch '1.19.4' of https://git.dbotthepony.ru/DBot/overdrive_that_matters into 1.19.3 2024-01-09 17:54:32 +07:00
6bbe2f2750
Merge branch '1.20.1' of https://git.dbotthepony.ru/DBot/overdrive_that_matters into 1.19.4 2024-01-09 17:54:25 +07:00
22c3c22081
Merge branch '1.20.2' of https://git.dbotthepony.ru/DBot/overdrive_that_matters into 1.20.1 2024-01-09 17:54:17 +07:00
80155ba7bc
Once again i demand you to STOP updating blockstates in being-unloaded chunks 2024-01-09 17:53:17 +07:00
d65b8df579
Now when positioning panels, exopack charge slots are considered into inventory frame height 2024-01-09 14:56:03 +07:00
aa93150f09
We don't need jvm overloads here 2024-01-09 14:40:03 +07:00
6ff737a315
Fix slots hidden behind by other panels still being visible to "lookup recipes" keybind 2024-01-09 14:39:21 +07:00
c1fbdfa1a6
Get rid of slot provider interface 2024-01-09 14:37:55 +07:00
d38df3d927
Merge branch '1.19.4' of https://git.dbotthepony.ru/DBot/overdrive_that_matters into 1.19.3 2024-01-09 13:53:47 +07:00
562e6c509f
Merge branch '1.20.1' of https://git.dbotthepony.ru/DBot/overdrive_that_matters into 1.19.4 2024-01-09 13:53:39 +07:00
0da77bc453
Merge branch '1.20.2' of https://git.dbotthepony.ru/DBot/overdrive_that_matters into 1.20.1 2024-01-09 13:53:32 +07:00
3a813d4353
Calculate fluid operations using Longs 2024-01-09 13:53:06 +07:00
5645d5f56f
Merge branch '1.19.4' of https://git.dbotthepony.ru/DBot/overdrive_that_matters into 1.19.3 2024-01-09 13:44:41 +07:00
4a606b8d36
Merge branch '1.20.1' of https://git.dbotthepony.ru/DBot/overdrive_that_matters into 1.19.4 2024-01-09 13:43:24 +07:00
46820a311f
Merge branch '1.20.2' of https://git.dbotthepony.ru/DBot/overdrive_that_matters into 1.20.1 2024-01-09 13:41:17 +07:00
1c9ea6f8bd
Revert fluid gauge panel clicking for jei recipes 2024-01-09 13:15:41 +07:00
b95a1885e8
Less rigid jei support 2024-01-09 13:15:09 +07:00
0b464c3a0b
Don't display "show recipes" on progress gauge because mouse cursor already tells that 2024-01-09 12:24:39 +07:00
0e60e84eb3
Mod name and JEI on fluid gauge panel 2024-01-09 12:22:53 +07:00
a5c1d7fbf8
Use networked field directly as backing fluid field 2024-01-09 12:01:38 +07:00
7e5ea3be8d
Add missing infinite water source to creative menu 2024-01-09 11:56:41 +07:00
b0dc5baa71
Add fluid container interaction with infinite water source block 2024-01-09 11:53:30 +07:00
0a1cb62479
Add more missing machines to creative menu 2024-01-09 11:19:54 +07:00
eac3bea94a
Relaxed player sets 2024-01-09 01:09:09 +07:00
8ea83dbd40
More compact backlog storage 2024-01-09 00:52:48 +07:00
dda015c5ef
update blockentity backlog phrasing 2024-01-09 00:50:33 +07:00
e009ed33a3
Make progress bar in exopack inventory be clickable 2024-01-08 23:01:49 +07:00
801577fd9e
Readd phantom attractor to machines list 2024-01-08 22:20:51 +07:00
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
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