0b91f54863
dum
2024-01-22 19:06:47 +07:00
5fde1376b9
Merge branch '1.19.4' of https://git.dbotthepony.ru/DBot/overdrive_that_matters into 1.19.3
2024-01-22 14:28:45 +07:00
b6ef6c5e8e
Merge branch '1.20.1' of https://git.dbotthepony.ru/DBot/overdrive_that_matters into 1.19.4
2024-01-22 14:28:36 +07:00
376e548cec
Revert "what"
...
This reverts commit 87e64a102a
2024-01-22 14:28:21 +07:00
2e427f05b1
Merge branch '1.19.4' of https://git.dbotthepony.ru/DBot/overdrive_that_matters into 1.19.3
2024-01-22 14:03:26 +07:00
5829dc8e5a
Merge branch '1.20.1' of https://git.dbotthepony.ru/DBot/overdrive_that_matters into 1.19.4
2024-01-22 14:03:14 +07:00
653ecedafb
Proper backport "allow vanilla servers on otm modded clients"
2024-01-22 14:02:21 +07:00
53b9a7ec02
Merge branch '1.19.4' of https://git.dbotthepony.ru/DBot/overdrive_that_matters into 1.19.3
2024-01-22 12:57:19 +07:00
5f6fb9c731
Merge branch '1.20.1' of https://git.dbotthepony.ru/DBot/overdrive_that_matters into 1.19.4
2024-01-22 12:51:17 +07:00
87e64a102a
what
2024-01-22 11:45:56 +07:00
0b7e54b4ef
Merge branch '1.20.2' of https://git.dbotthepony.ru/DBot/overdrive_that_matters into 1.20.1
2024-01-22 11:45:00 +07:00
c6059b0393
Merge remote-tracking branch 'origin/1.20.2' into 1.20.2
...
# Conflicts:
# src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/decorative/PainterBlockEntity.kt
2024-01-22 11:40:48 +07:00
f0dba4ccc3
Merge branch '1.20.2' of https://git.dbotthepony.ru/DBot/overdrive_that_matters into 1.20.1
2024-01-22 11:39:06 +07:00
d18399795b
Void/Unit subscripable
2024-01-21 23:33:03 +07:00
9ad1c8e82a
Micro optimize combinedcontainer stack iterator for best case scenario
2024-01-21 23:32:40 +07:00
8a3ef344e3
essence storage empty/filled blockstate
2024-01-21 13:14:42 +03:00
7c794126b6
slurp
2024-01-21 11:55:58 +03:00
8ebc611c7c
Custom splashes
2024-01-20 18:31:39 +07:00
d669fcb28d
шиза с моделями и блокстейтами кабелей
2024-01-19 15:55:48 +03:00
317cb98613
Блок в точке 559, 62, -131 содержит следующую информацию: -2147481752
...
Блок в точке 559, 62, -131 содержит следующую информацию: -2147481786
Блок в точке 559, 62, -131 содержит следующую информацию: 1839
Блок в точке 559, 62, -131 содержит следующую информацию: -2147481832
Блок в точке 559, 62, -131 содержит следующую информацию: -2147481854
Блок в точке 559, 62, -131 содержит следующую информацию: 1777
2024-01-19 13:59:05 +03:00
26382d9601
Fix wrong blast resistance of tritanium striped block
2024-01-18 23:22:31 +07:00
d540cbef3c
Overflow prevention inside painter block entity
2024-01-18 19:28:04 +07:00
604029dcd5
Add missing callback info
2024-01-17 20:11:02 +07:00
6999b42b1f
Since OTM does not specifically modify vanilla behavior when it's structures are in "default" state, accept connections to vanilla servers or server with OTM missing
2024-01-17 20:02:14 +07:00
c356cd703e
:mind_blown: More multiblock code
2024-01-17 17:30:50 +07:00
f97ad565d4
Multiblock test
2024-01-17 13:18:40 +07:00
94afd4f19a
How did i mess up left/right sprites of machine side controls again
2024-01-14 10:51:15 +07:00
0ae1cd21fe
Fix secondary furnace recipes not using proper config values
2024-01-14 00:52:38 +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
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
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
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
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
