|
|
854339fdbb
|
Merge branch '1.19.3' of https://git.dbotthepony.ru/DBot/overdrive_that_matters into 1.19.2
|
2024-01-14 00:29:23 +07:00 |
|
|
|
b4c4410432
|
Merge branch '1.19.4' of https://git.dbotthepony.ru/DBot/overdrive_that_matters into 1.19.3
|
2024-01-14 00:29:16 +07:00 |
|
|
|
5eb78b6e9c
|
Merge branch '1.20.1' of https://git.dbotthepony.ru/DBot/overdrive_that_matters into 1.19.4
|
2024-01-14 00:29:10 +07:00 |
|
|
|
b35dfaeacd
|
Merge branch '1.20.2' of https://git.dbotthepony.ru/DBot/overdrive_that_matters into 1.20.1
|
2024-01-14 00:29:02 +07:00 |
|
|
|
f7e3166ca0
|
Fix wrong argument order inside children panels
|
2024-01-14 00:28:06 +07:00 |
|
|
|
87a7c2961f
|
Use volatileEnergyValues in BatteryBankBlockEntity
|
2024-01-13 19:40:15 +07:00 |
|
|
|
3bd53fdba0
|
Простота устройства данного аккумулятора позволяет вам заменить .
|
2024-01-13 13:30:28 +07:00 |
|
|
|
327963f4e5
|
Merge branch '1.19.3' of https://git.dbotthepony.ru/DBot/overdrive_that_matters into 1.19.2
|
2024-01-13 12:18:26 +07:00 |
|
|
|
b4ae0bb6ae
|
Merge branch '1.19.4' of https://git.dbotthepony.ru/DBot/overdrive_that_matters into 1.19.3
|
2024-01-13 12:18:19 +07:00 |
|
|
|
6e143e072d
|
Merge branch '1.20.1' of https://git.dbotthepony.ru/DBot/overdrive_that_matters into 1.19.4
|
2024-01-13 12:18:01 +07:00 |
|
|
|
6a2eb3dec2
|
Merge branch '1.20.2' of https://git.dbotthepony.ru/DBot/overdrive_that_matters into 1.20.1
|
2024-01-13 12:17:56 +07:00 |
|
|
|
c2b92b443b
|
Mods try to be smart by supporting both fabric and forge, while in reality they support for- or -ge
|
2024-01-13 12:17:15 +07:00 |
|
|
|
5fd6df3447
|
Merge branch '1.19.3' of https://git.dbotthepony.ru/DBot/overdrive_that_matters into 1.19.2
|
2024-01-13 12:05:08 +07:00 |
|
|
|
4d26cffbc8
|
Merge branch '1.19.4' of https://git.dbotthepony.ru/DBot/overdrive_that_matters into 1.19.3
|
2024-01-13 12:05:02 +07:00 |
|
|
|
410ba675ea
|
Merge branch '1.20.1' of https://git.dbotthepony.ru/DBot/overdrive_that_matters into 1.19.4
|
2024-01-13 12:04:57 +07:00 |
|
|
|
ce94d22212
|
Merge branch '1.20.2' of https://git.dbotthepony.ru/DBot/overdrive_that_matters into 1.20.1
|
2024-01-13 12:04:52 +07:00 |
|
|
|
13cac25abd
|
Also remove player from player2ResubCount when he disconnects
|
2024-01-13 12:04:37 +07:00 |
|
|
|
829c4e68ef
|
Merge branch '1.19.3' of https://git.dbotthepony.ru/DBot/overdrive_that_matters into 1.19.2
|
2024-01-13 12:02:45 +07:00 |
|
|
|
d9b18ddaa6
|
Merge branch '1.19.4' of https://git.dbotthepony.ru/DBot/overdrive_that_matters into 1.19.3
|
2024-01-13 12:02:37 +07:00 |
|
|
|
fccf97c4c8
|
Merge branch '1.20.1' of https://git.dbotthepony.ru/DBot/overdrive_that_matters into 1.19.4
|
2024-01-13 12:02:30 +07:00 |
|
|
|
21b84651a8
|
Merge branch '1.20.2' of https://git.dbotthepony.ru/DBot/overdrive_that_matters into 1.20.1
|
2024-01-13 12:02:26 +07:00 |
|
|
|
0321e1fa00
|
Don't spam regular log, instead spam debug one
|
2024-01-13 12:02:18 +07:00 |
|
|
|
fb3e556523
|
Merge branch '1.19.3' of https://git.dbotthepony.ru/DBot/overdrive_that_matters into 1.19.2
|
2024-01-13 11:51:03 +07:00 |
|
|
|
c3373bca30
|
Merge branch '1.19.4' of https://git.dbotthepony.ru/DBot/overdrive_that_matters into 1.19.3
|
2024-01-13 11:50:57 +07:00 |
|
|
|
55c975f1e8
|
Merge branch '1.20.1' of https://git.dbotthepony.ru/DBot/overdrive_that_matters into 1.19.4
|
2024-01-13 11:50:50 +07:00 |
|
|
|
80917f7d12
|
Merge branch '1.20.2' of https://git.dbotthepony.ru/DBot/overdrive_that_matters into 1.20.1
|
2024-01-13 11:50:42 +07:00 |
|
|
|
027d9747bd
|
Clarify which player got resusbcribed
|
2024-01-13 11:47:18 +07:00 |
|
|
|
65914a9d03
|
Merge branch '1.19.3' of https://git.dbotthepony.ru/DBot/overdrive_that_matters into 1.19.2
|
2024-01-13 11:43:16 +07:00 |
|
|
|
c652f8d6d4
|
Merge branch '1.19.4' of https://git.dbotthepony.ru/DBot/overdrive_that_matters into 1.19.3
|
2024-01-13 11:43:07 +07:00 |
|
|
|
07bc48887e
|
Merge branch '1.20.1' of https://git.dbotthepony.ru/DBot/overdrive_that_matters into 1.19.4
|
2024-01-13 11:42:59 +07:00 |
|
|
|
12b10ee6fe
|
Merge branch '1.20.2' of https://git.dbotthepony.ru/DBot/overdrive_that_matters into 1.20.1
|
2024-01-13 11:42:52 +07:00 |
|
|
|
1f47f51157
|
Chunk resubscription? for broken mods
|
2024-01-13 11:42:36 +07:00 |
|
|
|
e5c67d2085
|
Post merge fixes for 1.19.2
|
2024-01-12 21:53:53 +07:00 |
|
|
|
a045791714
|
Merge branch '1.19.3' of https://git.dbotthepony.ru/DBot/overdrive_that_matters into 1.19.2
|
2024-01-12 21:38:26 +07:00 |
|
|
|
46bc642385
|
Merge branch '1.19.4' of https://git.dbotthepony.ru/DBot/overdrive_that_matters into 1.19.3
|
2024-01-12 21:33:14 +07:00 |
|
|
|
9e72d73bfd
|
Merge branch '1.20.1' of https://git.dbotthepony.ru/DBot/overdrive_that_matters into 1.19.4
|
2024-01-12 21:25:13 +07:00 |
|
|
|
a88549f17f
|
Post merge fixes for 1.20.1
|
2024-01-12 21:21:07 +07:00 |
|
|
|
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 |
|
