Commit Graph

1648 Commits

Author SHA1 Message Date
036de121c7
Revert "DBot — Сегодня, в 7:53"
This reverts commit 8abb4e1598.

Revert "бакпорт изменений curios под смачный пердёж"

This reverts commit 1cbf73cdfd.

Revert "помогите"

This reverts commit b97e18ca5f.

Revert "DBotThePony — Сегодня, в 17:11"

This reverts commit 0da87980f7.

Revert "android health bar + 1px wider energy bar"

This reverts commit cbaf89d4a7.

Revert "Resolve conflicts between 1.19.3 code and 1.19.2 code"

This reverts commit 006cbc75e3.

Revert "Add missing import"

This reverts commit 275e340243.

Revert "Multi packet mattery registry sync"

This reverts commit 3dcaed64cd.

Revert "Increase (de)compress buffer sizes"

This reverts commit 04a5e87fec.

Revert "Compress matter registry packet"

This reverts commit 36c14be025.

Revert "Payload may not be larger than 1048576 bytes"

This reverts commit 26a064fbe2.
2024-01-01 23:05:36 +07:00
8abb4e1598
DBot — Сегодня, в 7:53
Замени в коде parallelstream на stream
2023-06-11 08:00:48 +03:00
1cbf73cdfd
бакпорт изменений curios под смачный пердёж 2023-06-09 21:51:08 +03:00
b97e18ca5f
помогите 2023-06-07 10:05:54 +03:00
0da87980f7
DBotThePony — Сегодня, в 17:11
ах да
ты просил визуалку брони наноботов
так тыж сделал полоску хп, можно туда и наноботов влепить
:Pogomega:
2023-06-07 09:09:09 +03:00
cbaf89d4a7
android health bar + 1px wider energy bar 2023-06-07 09:07:16 +03:00
006cbc75e3
Resolve conflicts between 1.19.3 code and 1.19.2 code 2023-05-02 23:30:34 +07:00
275e340243
Add missing import 2023-05-02 23:26:28 +07:00
3dcaed64cd
Multi packet mattery registry sync 2023-05-02 23:20:06 +07:00
04a5e87fec
Increase (de)compress buffer sizes 2023-05-02 23:20:05 +07:00
36c14be025
Compress matter registry packet
# Conflicts:
#	src/main/kotlin/ru/dbotthepony/mc/otm/core/Ext.kt
#	src/main/kotlin/ru/dbotthepony/mc/otm/matter/IMatterValue.kt
#	src/main/kotlin/ru/dbotthepony/mc/otm/matter/MatterManager.kt
2023-05-02 23:20:05 +07:00
26a064fbe2
Payload may not be larger than 1048576 bytes
# Conflicts:
#	src/main/kotlin/ru/dbotthepony/mc/otm/core/util/FriendlyStreams.kt
2023-05-02 23:17:19 +07:00
5efe3a2e35
Use forValidRefs in field synchronizer 2022-12-06 18:35:34 +07:00
82389a5e72
optimize imports 2022-12-06 18:24:02 +07:00
400b92faf6
Replace Int2Object avl maps with hash maps 2022-12-05 00:28:05 +07:00
e971a6014d
Int sets to hashmap where we don't iterate 2022-12-05 00:19:50 +07:00
1b4dfc4321
Replace AVL tree maps with hash maps where we don't iterate stuff 2022-12-05 00:13:24 +07:00
1f7b8a6858
Don't throw exception if timer is already finished 2022-12-04 12:51:09 +07:00
3e70cc2a60
readability 2022-12-04 12:50:32 +07:00
de1295abc6 Fuck 2022-12-02 03:33:45 +06:00
9fce3e2242 Merge remote-tracking branch 'origin/master' 2022-12-02 03:32:09 +06:00
ef415b9898 Fixed some textures;
Texture updates: Matter replicator, pattern monitor;
Fixed UVs for Matter Replicator armatures;
2022-12-02 03:31:41 +06:00
e5261ef454
also this 2022-12-02 01:20:49 +07:00
e1cc295b38
Merge remote-tracking branch 'origin/master' into master 2022-12-02 01:19:37 +07:00
6136713cff
how 2022-12-02 01:19:05 +07:00
44647d1228
forValidRefs extension function 2022-11-30 20:23:55 +07:00
a63d9e15b5
use equals 2022-11-30 18:13:00 +07:00
b3b858233d Pattern storage and matter scanner textures update 2022-11-28 03:55:15 +06:00
cce73992e3
Make tritanium doors zombie proof 2022-11-27 19:14:17 +07:00
017802e90f
Store IEnergyStorage in Mekanism2MatteryEnergyWrapper, providing canExtract and canReceive
Fixes #205
2022-11-27 19:04:05 +07:00
a6d020bdab
BatteryBankBlockEntity now expose mekanism energy capability
Fixes #155
2022-11-27 17:47:39 +07:00
ddf44d11c2
Fix duplicate recipe names 2022-11-27 13:25:06 +07:00
5e85430f10
Greatly buff decorative recipes 2022-11-27 13:21:23 +07:00
f885791de4
Plate -> Ingot smelthing recipes 2022-11-27 13:17:35 +07:00
7073ecfbe8
Put doors, trapdoors and minecart cargo crates to appropriate tabs 2022-11-27 13:06:25 +07:00
0b31085dc6
door.
Fixes #177
2022-11-27 13:02:08 +07:00
83ce1e28f2
Revert "More matteryrecipe stuff"
This reverts commit adb5d9db59.
2022-11-27 12:53:22 +07:00
adb5d9db59
More matteryrecipe stuff 2022-11-27 12:25:48 +07:00
6dabb0b5ba
Don't cover entire screen in matter commentary 2022-11-27 00:36:03 +07:00
2c7bb69b71
exosuit -> exopack 2022-11-27 00:31:09 +07:00
2e55e256d6
tritanium d00r, painted
related to #177
2022-11-27 00:16:27 +07:00
f52fc4eb84
HasExosuit -> HasExoPack 2022-11-26 11:57:27 +07:00
f8a32ac2c3
properly register loot item conditions 2022-11-26 11:56:16 +07:00
94c64e0a5c
properly register item function types 2022-11-26 11:52:02 +07:00
e8f8682692
Fix itemstack with shared tag being synchronized when nothing changed from client viewpoint 2022-11-25 15:28:29 +07:00
3c38188ddf
a 2022-11-25 14:18:36 +07:00
58e5dfb505
Don't create "top most" config declaration
Because it is not required and clutters vision
2022-11-25 14:15:44 +07:00
5c1aaaa352
Allow to scroll exopack inventory when hovering over slots in non OTM guis through config option
Fixes #208
2022-11-25 14:14:02 +07:00
c98ef2b877
Add configured to runtimeOnly configuration 2022-11-25 13:26:06 +07:00
ae9c706cdc
Rename Exosuit to Exopack 2022-11-25 13:13:39 +07:00