7d075ccfc3
Merge remote-tracking branch 'origin/1.21' into 1.21
2025-02-07 19:54:35 +07:00
da13d77af3
⚙ SHOCKY — Сегодня, в 19:53
...
не могу
мультиблок
влепить текстуры что есть
ибо мультиблок ещё на машине Дбота
2025-02-07 19:54:17 +07:00
fb3b547b5d
dilithium texture
2025-02-07 02:58:55 +05:00
c3c43d7af6
Fix error message
2025-01-23 12:35:11 +07:00
a93fe595be
Merge remote-tracking branch 'origin/1.21' into 1.21
2025-01-22 22:11:52 +07:00
b01dba2a21
Add generics to ColoredDecorativeBlock so manual casts are no longer required
2025-01-22 22:11:42 +07:00
b4c8676daa
Update comments
2025-01-22 13:27:13 +07:00
99ebeddae4
m
2025-01-21 23:04:17 +05:00
7a1edd5e4a
Merge remote-tracking branch 'origin/1.21' into 1.21
...
# Conflicts:
# src/main/kotlin/ru/dbotthepony/mc/otm/registry/game/MItems.kt
2025-01-21 21:29:36 +05:00
d03439b076
missing tags for dilithium crystal block
2025-01-21 17:03:51 +03:00
90aa1ee523
resources not components
2025-01-21 16:46:22 +03:00
975b540fe4
Deepslate Dilithium Kot
2025-01-21 16:42:38 +03:00
15417e65aa
p
2025-01-21 17:00:22 +05:00
1a50ecd6af
Mark star chair as having description
2025-01-21 15:43:20 +07:00
f922df53be
Remove savedcountingmap as it is not used
2025-01-21 15:33:19 +07:00
fc675811be
Rename "content" to "game", as it better resemble what that package contains
2025-01-21 15:31:31 +07:00
0d9be21cff
Move more registry objects to subpackages
2025-01-21 15:21:31 +07:00
122ca66e65
Move MBlockEntities to subpackage
2025-01-21 15:08:21 +07:00
ca264e9292
Move MItems, MBlocks, MFluids and MCreativeTabs to content subpackage
2025-01-21 15:03:58 +07:00
5a5ef2cd68
YuRaNnNzZZ — 15.01.2025 17:56
...
надо наверное эмиссив прописать на модели активных кабелей
2025-01-21 03:25:02 +03:00
216a923b53
missing models
2025-01-21 03:06:58 +03:00
92df9579f0
multi-level pattern storages with upgrade recipes (upgrade ops)
...
AMD User — Сегодня, в 2:55
Юра пошёл делать upgradeops
AMD User — Сегодня, в 2:56
MLC
TLC
YuRaNnNzZZ — Сегодня, в 2:56
верно
AMD User — Сегодня, в 2:56
А потом не меняя цены меняем на QLC
Втихую
2025-01-21 02:59:57 +03:00
bf87d48254
require mekanism loaded for mekanism painter recipes
2025-01-20 19:32:12 +03:00
76cb2c83f0
лишнее
2025-01-20 17:15:56 +03:00
495447648f
Split loot tables file
2025-01-20 20:46:14 +07:00
4888dad2dd
Split tags file into several files
2025-01-20 20:40:30 +07:00
6de80d792e
Bump bottom limit of how spread out ore is in large tritanium vein, as well make it appear less often
2025-01-20 20:26:09 +07:00
e63bbb79d2
Dilithium ore and crystals
2025-01-20 20:22:55 +07:00
e331790a71
Armor assembly
2025-01-20 15:07:25 +05:00
6661384dfd
add a few pixels on upgrade textures
2025-01-20 15:06:40 +05:00
4898d18112
h
2025-01-20 13:25:57 +05:00
32f3803cb9
:wires:
2025-01-20 13:04:46 +05:00
75e9b782fa
Merge remote-tracking branch 'origin/1.21' into 1.21
2025-01-20 12:40:14 +05:00
bbb8471d26
Texture tweaks
2025-01-20 12:39:57 +05:00
a47ec64cbb
Ronna and Quetta SI prefixes
2025-01-20 08:41:53 +07:00
3f91e554cb
Throttle "powered" cable updates even further when it doesn't oscillate
2025-01-19 23:12:18 +07:00
a9b191eb72
Greatly improve cable network segment slicing and splicing
2025-01-19 22:51:37 +07:00
aa41647c04
Speed up cable Segment splitting
2025-01-19 21:12:59 +07:00
9579bc6a0c
LinkedHashSet instead of ObjectLinkedOpenHashSet for update performance
...
because LinkedHashSet uses linked list, while ObjectLinkedOpenHashSet use sequential array of keys
2025-01-19 20:56:32 +07:00
20b3fe78ba
Further reduce amount of small tritanium patches
2025-01-19 15:12:42 +07:00
2e2af1bc69
Reduce amount of regular tritanium ore in deepslate layer
2025-01-19 15:12:01 +07:00
d528f8465c
Tritanium cloud/ellipsoid ore distribution
2025-01-19 15:10:46 +07:00
35e871890c
Move DecimalProvider to data.world subpackage
2025-01-19 13:30:58 +07:00
6fc26c869a
Move codecs to subpackage
2025-01-19 13:28:54 +07:00
77821768bc
Better tritanium ore placement
2025-01-19 13:22:56 +07:00
c8c8e75b62
Update cables throughput values and recipes
2025-01-19 10:45:53 +07:00
b0bf4adb0f
Not/Normal Pill along Suspicious food
2025-01-19 01:58:18 +07:00
78896089ec
Update deprecated method usage
2025-01-19 01:50:37 +07:00
e53a7f65d8
Add JEI search aliases
2025-01-19 01:44:34 +07:00
8c4e2b1ea6
Add portable grill to smoking catalysts
2025-01-19 01:34:24 +07:00