Commit Graph

755 Commits

Author SHA1 Message Date
480fa7cf7c
Hmm yes reinforced redstone lamp is made of reinforced redstone lamp 2025-02-08 12:59:20 +07:00
70fdf98d0f flywheel battery blocks textures 2025-02-08 04:20:54 +05:00
fb3b547b5d dilithium texture 2025-02-07 02:58:55 +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
90aa1ee523
resources not components 2025-01-21 16:46:22 +03:00
975b540fe4
Deepslate Dilithium Kot 2025-01-21 16:42:38 +03: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
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
bbb8471d26 Texture tweaks 2025-01-20 12:39:57 +05:00
38227bc937
Add back proper on-block level gauge textures 2025-01-18 15:28:33 +07:00
c0b8488afd Railing 2025-01-10 19:42:10 +05:00
2067c9cceb h2 2025-01-10 18:59:55 +05:00
9c834e21e7 Merge remote-tracking branch 'origin/1.21' into 1.21 2025-01-10 18:33:43 +05:00
140eecf57d h 2025-01-10 18:33:29 +05:00
d8744841d9
powered energy cables blockstate, БАГНУТАЯ ХУЙНЯ!!!!!!!!!!!! 2025-01-10 15:05:28 +03:00
057977f4a4 swap cable states since there aren't any atm 2025-01-10 16:08:47 +05:00
b2ee766194
генерация моделей мусора и полосок опасности вместе с блокстейтами 2025-01-09 20:47:59 +03:00
5dd4c027a9
если вы ещё не поняли что я ненормальный 2025-01-09 20:11:54 +03:00
e7ae4977d3
да и остальное тритановое тоже 2025-01-09 19:57:30 +03:00
12d63e962f
двери с люками тоже. и некрашенные блоки с полоской 2025-01-09 19:49:28 +03:00
cc8a149c25
генерация colomposed текстур и автотрек текстур для датагена 2025-01-09 19:34:32 +03:00
13d76df9fa
генерируем перекрашенные текстуры в рантайме
AMD User — Сегодня, в 15:29
no wae
imagemagick in my meinkraft coed!!1?/
2025-01-09 15:50:50 +03:00
b7f1f34b9c Ok party pooper 2025-01-07 19:28:13 +05:00
9621356682
Captain Redstone Keyes 2025-01-07 18:17:03 +07:00
dc523973b0 forgot 2025-01-07 01:44:01 +05:00
d69eef7464 New power cables, the texture contains both unpowered and powered states, and I have no idea how to handle this, also the UVs on them are still wrong, the second half of the cable texture is not used at all. 2025-01-07 01:40:30 +05:00
db01f126f4 texture updates 2025-01-07 01:38:38 +05:00
78a1fecf92 Please replace danger stripe with these 50/50% 2 variant textures, I have no idea where the blockstates are to make it 2025-01-07 01:37:30 +05:00
7c35c284cd
Briefcase grill 2025-01-05 23:50:43 +07:00
ab83fc9d45
развернул. но всё равно всрато 2024-12-12 17:45:16 +03:00
1712f92335
Kotlin for Kotlin (switch to KFF loader) 2024-11-19 03:40:18 +03:00
7664b0b4de
Significantly improve chart clarity in tooltips 2024-11-15 13:41:16 +07:00
ab5a2275c2
Singularity generator operation modes, inject rate, (visual) radio button 2024-11-13 18:51:58 +07:00
a50cad6832
Refactor buttons to have more streamlined hierarchy 2024-11-10 14:10:27 +07:00
cdfa529d7b
Updated gauge design, horizontal matter gauge, added missing gauges to menus 2024-11-05 22:03:11 +07:00
29ab315e43
УРА БОЛЬШЕ ВСРАТЫХ ИКОНОК (перенос чекбокса блокировки содержимого вправо + тултип для переключения ресайза) 2024-10-24 05:54:08 +03:00
84da57719d
переключение скейлинга текста в табличке
(и всратая палитра на иконку выбора цвета)
2024-10-23 20:50:31 +03:00
0e1dcbf1fe
попытка пофиксить отсутствующие блоки в структурах 2024-10-16 00:32:02 +03:00
a6ff93d74c
"Diagram" basic rendering code, added gui icons for energy counter 2024-09-22 17:51:15 +07:00
dbdc575c6c
epic remap fail 2024-09-05 02:36:52 +03:00
bf37573f35
вы больше не кормод 2024-09-05 02:32:02 +03:00
20567a7154
Improve readability of "auto balance" icon 2024-09-04 22:40:27 +07:00
724c5751c6
Fix red slash on "dont balance" icon not matching pixels of similar icon "ignore redstone signal" 2024-09-04 22:30:42 +07:00
b208ca1358
Uncolored tritanium blocks all stripe variants 2024-09-04 15:28:32 +07:00
7bcc1e37e2
стул. пока без функционала 2024-09-03 02:44:18 +03:00
e88c2ba9b0
Move tritanium loot tables to datagen 2024-08-31 14:06:40 +07:00
ae3fef941b
руда. 2024-08-31 07:55:52 +03:00
0cd5867063
ещё пару блокстейтов в датаген 2024-08-31 07:09:18 +03:00
3d80a1e069
Merge remote-tracking branch 'origin/1.21' into 1.21 2024-08-31 10:50:53 +07:00
3dd7583d4e
Update DynamicBufferSource hooks 2024-08-31 10:31:42 +07:00
09320efa73
Merge branch '1.21' of https://git.dbotthepony.ru/DBot/overdrive_that_matters into 1.21 2024-08-31 06:28:29 +03:00
eeef87dcd1
давайте просто не будем хранить нбт блока который якобы декор 2024-08-31 06:28:05 +03:00
b3ca648be5
Merge remote-tracking branch 'origin/1.21' into 1.21 2024-08-31 10:10:45 +07:00
cb99fbe749
moved and upgraded structures 2024-08-31 05:51:11 +03:00
c5945723fa
Update energy servo multipart model 2024-08-31 09:47:01 +07:00
85279c4de8
датаген - кабель материи + тонкий кабель (база) 2024-08-30 16:47:25 +03:00
b5d7d99c63
датаген - добив рецептов 2024-08-30 16:40:52 +03:00
0446e5adb3
Update js coremods signatures 2024-08-28 18:10:43 +07:00
15618622ab
Update a bunch of models to use neoforge constructs 2024-08-27 23:41:50 +07:00
3b06e71fc0
Comment out level renderer patch 2024-08-27 23:41:34 +07:00
b939f7b020
Update js coremods import 2024-08-27 21:32:17 +07:00
5085fccf14
Update various files to make mod run 2024-08-27 21:30:42 +07:00
e3990d7fb5
Update mixins 2024-08-26 20:15:39 +07:00
381ca7dc2d
Update slotChangedCraftingGrid signature 2024-08-23 20:23:38 +07:00
eaefda867d
Update energy container upgrade recipe 2024-08-15 19:26:37 +07:00
64780fbda5
Resolve most of simple enough compilation errors 2024-08-10 01:24:15 +07:00
9b7e424fc5
Switch to neoforge and neogradle 2024-07-04 19:52:30 +07:00
769c1650e5 Fuck interpolation 2024-01-29 11:44:47 +06:00
a885ea4d87 Models and more texture updates 2024-01-29 04:15:13 +06:00
58ed338c7a Various texture updates 2024-01-29 03:03:39 +06:00
eb60c371ed Painting table and water source models 2024-01-29 02:54:49 +06:00
a51a4a3ad0
datagen biome modifiers for ores 2024-01-22 20:25:47 +03: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
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
c356cd703e
:mind_blown: More multiblock code 2024-01-17 17:30:50 +07:00
884336ffa1
Redo old recipes 2024-01-12 19:05:26 +07:00
d3b0eb5f92
Add tintindex to holo sign to color its lights 2024-01-08 21:32:53 +07:00
05db4a0c05
Use cutout for microwave oven 2024-01-06 11:28:48 +07:00
6aabc72145
Chemical generator, energy servo and energy counter coloring 2024-01-06 11:21:40 +07:00
796f7fdc98
Fix drive viewer model 2024-01-05 00:45:21 +07:00
a56dbd60f6
Switch render mode to cutout for holo sign and matter replicator 2024-01-05 00:38:53 +07:00
5d44a26493
Fix pattern monitor rotation 2024-01-05 00:32:30 +07:00
a95a5f27ff
Wireless charger, pattern monitor, driver viewer and storage power supplier coloring 2024-01-05 00:24:53 +07:00
f4bbf54095
Android station coloring 2024-01-04 19:37:36 +07:00
8aa34b3645
Induction furnace and powered furnace painting 2024-01-04 15:57:12 +07:00
3f2e90e55c
Merge remote-tracking branch 'origin/1.20.2' into 1.20.2 2024-01-04 14:06:48 +07:00
5b51c5e655
Microwave oven painting 2024-01-04 14:06:23 +07:00
071bb7b3ad Chug xp 2024-01-04 12:46:19 +06:00
9ecf53342e
More machine coloring 2024-01-04 13:40:40 +07:00
895ed6fbef Fix Computer 1000 yard stare + 4chair 2024-01-04 12:38:38 +06:00
9d876c573c
Merge remote-tracking branch 'origin/1.20.2' into 1.20.2 2024-01-04 12:07:45 +07:00
8f92b8d3f1
Add computer terminal as actual block 2024-01-03 20:46:51 +07:00
0dcf6664a3
Add painter recipes to matter recipe finder 2024-01-03 20:03:23 +07:00
b2c2bfa536
Plate press coloring 2024-01-03 19:56:50 +07:00
d6dc8689f8
Essence storage coloring 2024-01-03 18:51:59 +07:00
cb50ee2c68
Colored machines test, update creative menu order
update SupplierList/Map impl to use Java's suppliers
general code layout improvements
2024-01-03 18:36:06 +07:00
73773d4c70 tele jigsaw grunt pathic telepathic st'ructure processor jigsaw worldgenjson 2024-01-03 16:53:27 +06:00
565819c3e3
Add placeholder textures for liquid xp 2024-01-03 15:06:36 +07:00
6e16364491 Laboratory rebuild WIP + decorative computer model 2024-01-03 09:57:03 +06:00
0a5dbf468f
Update author list 2024-01-02 12:24:09 +07:00
76de15f01b Update the texture for metal beams and lamps 2024-01-02 00:15:39 +06:00
ea448c5262 More texture adjustments 2024-01-01 23:51:32 +06:00
ffa94d190d Microwave 2024-01-01 23:16:59 +06:00
6bee0784d3 Texture adjustments 2024-01-01 16:42:47 +06:00
1c0cdb8b5b
Energy cable tiers, fix some Client -> Server logic leaks in singleplayer 2023-12-30 20:26:31 +07:00
19bb6600dd
Bump KFF and Forge 2023-12-22 14:27:41 +07:00
993b1ac0fc
extremely fast archaeology 2023-11-15 02:13:30 +03:00
8a6e8afa61
machine upgrades 2023-11-13 21:54:10 +03:00
6c9058e72d
darken base tritanium armor color 2023-10-30 12:54:53 +03:00
6aaad2fe88
покраска тритановой брони
#178 :WiseTree:
2023-10-30 12:41:25 +03:00
0e83e08ec6
manual hammer priming 2023-10-26 17:01:36 +03:00
171e16a7c4
Remove Mekanism compat since it will not be updated to newer versions 2023-10-26 18:44:03 +07:00
db4f24e85e
DBot — Сегодня, в 8:11
Ящикатор?
2023-10-26 08:22:49 +03:00
294a402447
mod/toml version != jar version 2023-10-23 00:13:26 +03:00
54cfd84103
сейчас мы будем показывать жидкость
closes #258
2023-10-22 06:28:04 +03:00
91c8100729
DBot — Сегодня, в 14:51
Считается что работает правильно
Пока не доказано обратное
2023-10-21 15:32:25 +03:00
c32a5bf71b
Mod now compiles on 1.20.2 2023-10-07 22:27:02 +07:00
313f9cb39d
Swim Boosters android feature, electromotor crafting component 2023-08-23 14:24:43 +07:00
af2d621cee
Hopper and dispenser/dropper menus? 2023-08-21 11:13:48 +07:00
9244de0ac2
Vanilla chests with OTM gui 2023-08-20 23:36:13 +07:00
1ab252e57a
Move sorting order button sprite 1 pixel down 2023-08-20 15:42:49 +07:00
d4c029f27d
Slice container APIs and decouple interface from implementation, container sorting test 2023-08-20 15:39:20 +07:00
e88c29be57
Revert "Fix ingredients being "empty" when playing multiplayer"
This reverts commit f56884705a.
2023-08-19 01:13:32 +07:00
a0b0580bfa
Add circuit plating recipe to datagen 2023-08-19 00:18:48 +07:00
f56884705a
Fix ingredients being "empty" when playing multiplayer
These changes reflects Forge's PR https://github.com/MinecraftForge/MinecraftForge/pull/9688
2023-08-18 23:43:54 +07:00
0428b60561
Update pattern monitor 2023-08-18 21:05:35 +07:00
0c23e53bbc
Swap color palette for side controls 2023-08-12 15:01:41 +07:00
f8c2be4d4c
Storage bus insert/extract priorities configuration, operation mode, small refactorings 2023-08-12 01:08:42 +07:00
f27f21e3de
Make Exopack slot changes trigger advancements, and optimize them 2023-08-04 22:50:59 +07:00
ed84905627
Exopack ender chest access upgrade 2023-07-30 01:50:30 +07:00
912e361693
why 2023-07-30 00:56:35 +07:00
ff308ee67a
Actual tabs sprites, and all 4 sprite states for them 2023-07-29 16:30:56 +07:00
e518f2c732
рендер шизы
(или жидкостях в танках-предметах)
#258
2023-07-25 05:58:32 +03:00
1ff20b090f *Collapses* 2023-07-22 05:47:43 +06:00
19e205b527 Furnaces 2023-07-21 17:53:25 +06:00
90ae56dbdc Matter upgrades texture (not implemented) 2023-07-21 02:54:39 +06:00
8d4e0d83ee Electric furnace model (Looks broken atm, TODO: fix it) 2023-07-21 02:52:59 +06:00
dc50a79b20
Merge remote-tracking branch 'origin/master' into master
# Conflicts:
#	src/data/kotlin/ru/dbotthepony/mc/otm/datagen/lang/English.kt
#	src/data/kotlin/ru/dbotthepony/mc/otm/datagen/lang/Russian.kt
2023-07-18 12:04:13 +07:00
a707e49b8c
Exopack coloring and toggle exopack glowing 2023-07-18 01:55:17 +07:00
67c54357e8
bump forge to recommended build 2023-07-15 22:48:14 +03:00
4daa0be19a
Color picker panel 2023-07-15 19:41:31 +07:00
57b2b64ff9
Add custom position/tex/color shader without fragment discarding 2023-07-15 19:35:38 +07:00
027d6ef65f
exopack curios inventory button 2023-07-14 22:25:48 +03:00