Commit Graph

3188 Commits

Author SHA1 Message Date
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
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
d4dc6b09c3
Merge branch '1.19.3' of https://git.dbotthepony.ru/DBot/overdrive_that_matters into 1.19.2 2024-01-09 18:26:02 +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
6d007f4a27
Merge branch '1.19.3' of https://git.dbotthepony.ru/DBot/overdrive_that_matters into 1.19.2 2024-01-09 17:54: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
558e40bf58
Merge branch '1.19.3' of https://git.dbotthepony.ru/DBot/overdrive_that_matters into 1.19.2 2024-01-09 13:53:56 +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
c9d56f9204
Merge branch '1.19.3' of https://git.dbotthepony.ru/DBot/overdrive_that_matters into 1.19.2 2024-01-09 13:45:09 +07:00