From 7ba4ca69238bab475679eb830559bf1ee812a920 Mon Sep 17 00:00:00 2001 From: Xikaro <55663835+Xikaro@users.noreply.github.com> Date: Fri, 28 Oct 2022 04:15:16 +0500 Subject: [PATCH] External improvements (#166) * lang * Update controller_column_lights.png.mcmeta * energy cell cells display internal energy storage along the bar * 3D drive * drive fix model * 3D chest * Update ru_ru.lang * Update ru_ru.lang * model fix drive and chest --- .../appliedenergistics2/lang/en_us.lang | 30 +- .../appliedenergistics2/lang/ru_ru.lang | 84 +-- .../models/block/chest/base.json | 132 ++++- .../models/block/chest/cell_state_empty.json | 26 +- .../models/block/chest/cell_state_full.json | 83 ++- .../block/chest/cell_state_offline.json | 39 +- .../models/block/chest/cell_state_online.json | 83 ++- .../block/chest/cell_state_types_full.json | 83 ++- .../models/block/chest/lights_off.json | 2 +- .../models/block/chest/lights_on.json | 17 +- .../models/block/drive_base.json | 452 +++++++++------ .../models/block/drive_base_depth.json | 545 +++++++++--------- .../models/block/drive_cell_empty.json | 32 +- .../models/block/drive_cell_full.json | 87 +-- .../models/block/drive_cell_off.json | 47 +- .../models/block/drive_cell_on.json | 87 +-- .../models/block/drive_cell_types_full.json | 87 +-- .../controller_column_lights.png.mcmeta | 4 +- .../textures/blocks/creative_energy_cell.png | Bin 341 -> 3856 bytes .../textures/blocks/dense_energy_cell.png | Bin 405 -> 3847 bytes .../textures/blocks/dense_energy_cell0.png | Bin 402 -> 286 bytes .../textures/blocks/dense_energy_cell1.png | Bin 401 -> 300 bytes .../textures/blocks/dense_energy_cell2.png | Bin 403 -> 296 bytes .../textures/blocks/dense_energy_cell3.png | Bin 405 -> 296 bytes .../textures/blocks/dense_energy_cell4.png | Bin 403 -> 295 bytes .../textures/blocks/dense_energy_cell5.png | Bin 404 -> 295 bytes .../textures/blocks/dense_energy_cell6.png | Bin 405 -> 305 bytes .../textures/blocks/dense_energy_cell7.png | Bin 404 -> 305 bytes .../blocks/drive_cell_states_emissive.png | Bin 0 -> 121 bytes .../drive_cell_states_emissive.png.mcmeta | 10 + .../textures/blocks/energy_cell.png | Bin 382 -> 3839 bytes .../textures/blocks/energy_cell0.png | Bin 350 -> 250 bytes .../textures/blocks/energy_cell1.png | Bin 353 -> 249 bytes .../textures/blocks/energy_cell2.png | Bin 351 -> 267 bytes .../textures/blocks/energy_cell3.png | Bin 382 -> 267 bytes .../textures/blocks/energy_cell4.png | Bin 381 -> 266 bytes .../textures/blocks/energy_cell5.png | Bin 382 -> 266 bytes .../textures/blocks/energy_cell6.png | Bin 385 -> 267 bytes .../textures/blocks/energy_cell7.png | Bin 384 -> 267 bytes 39 files changed, 996 insertions(+), 934 deletions(-) create mode 100644 src/main/resources/assets/appliedenergistics2/textures/blocks/drive_cell_states_emissive.png create mode 100644 src/main/resources/assets/appliedenergistics2/textures/blocks/drive_cell_states_emissive.png.mcmeta diff --git a/src/main/resources/assets/appliedenergistics2/lang/en_us.lang b/src/main/resources/assets/appliedenergistics2/lang/en_us.lang index 5c772e86e..6431b6a43 100644 --- a/src/main/resources/assets/appliedenergistics2/lang/en_us.lang +++ b/src/main/resources/assets/appliedenergistics2/lang/en_us.lang @@ -263,10 +263,10 @@ gui.tooltips.appliedenergistics2.SubstitutionsOff=Substitutions Disabled gui.tooltips.appliedenergistics2.Encode=Encode Pattern gui.tooltips.appliedenergistics2.EncodeDescription=Write the entered pattern to the current encoded pattern, or to available blank pattern. Hold Shift to transfer directly to your inventory gui.tooltips.appliedenergistics2.FuzzyMode=Fuzzy Comparison -gui.tooltips.appliedenergistics2.FZPercent_25=Split Damage at 25% -gui.tooltips.appliedenergistics2.FZPercent_50=Split Damage at 50% -gui.tooltips.appliedenergistics2.FZPercent_75=Split Damage at 75% -gui.tooltips.appliedenergistics2.FZPercent_99=Split Damage at 99% +gui.tooltips.appliedenergistics2.FZPercent_25=Split Damage at §a25%§r +gui.tooltips.appliedenergistics2.FZPercent_50=Split Damage at §e50%§r +gui.tooltips.appliedenergistics2.FZPercent_75=Split Damage at §675%§r +gui.tooltips.appliedenergistics2.FZPercent_99=Split Damage at §499%§r gui.tooltips.appliedenergistics2.SortOrder=Sort Order gui.tooltips.appliedenergistics2.SortBy=Sort By gui.tooltips.appliedenergistics2.FZIgnoreAll=Match Any @@ -290,8 +290,8 @@ gui.tooltips.appliedenergistics2.TrashController=Deletion via Shift / Space Clic gui.tooltips.appliedenergistics2.InterfaceBlockingMode=Blocking Mode gui.tooltips.appliedenergistics2.InterfaceCraftingMode=Crafting Mode gui.tooltips.appliedenergistics2.Trash=Destroy Items -gui.tooltips.appliedenergistics2.MatterBalls=Condense Into Matter Balls\n%s per item -gui.tooltips.appliedenergistics2.Singularity=Condense Into Singularities\n%s per item +gui.tooltips.appliedenergistics2.MatterBalls=Condense Into Matter Balls\n§a%s§r per item +gui.tooltips.appliedenergistics2.Singularity=Condense Into Singularities\n§a%s§r per item gui.tooltips.appliedenergistics2.Read=Extract Only gui.tooltips.appliedenergistics2.Write=Insert Only gui.tooltips.appliedenergistics2.ReadWrite=Bi-Directional @@ -410,16 +410,16 @@ waila.appliedenergistics2.Locked=Locked waila.appliedenergistics2.Unlocked=Unlocked waila.appliedenergistics2.Showing=Showing waila.appliedenergistics2.Contains=Contains -waila.appliedenergistics2.Channels=%1$d of %2$d Channels +waila.appliedenergistics2.Channels=§2%1$d§r of §4%2$d§r Channels waila.appliedenergistics2.P2PUnlinked=Unlinked waila.appliedenergistics2.p2p_input_one_output=Linked (Input Side) - 1 Output -waila.appliedenergistics2.p2p_input_many_outputs=Linked (Input Side) - %d Outputs +waila.appliedenergistics2.p2p_input_many_outputs=Linked (Input Side) - §4%d§r Outputs waila.appliedenergistics2.p2p_output_one_input=Linked (Output Side) - 1 Input -waila.appliedenergistics2.p2p_output_many_inputs=Linked (Output Side) - %d Inputs +waila.appliedenergistics2.p2p_output_many_inputs=Linked (Output Side) - §2%d§r Inputs waila.appliedenergistics2.P2POutput=Linked (Output Side) // TheOneProbe -theoneprobe.appliedenergistics2.crafting=Crafting: %1$s +theoneprobe.appliedenergistics2.crafting=Crafting: §2%1$s§r theoneprobe.appliedenergistics2.device_online=Device Online theoneprobe.appliedenergistics2.device_offline=Device Offline theoneprobe.appliedenergistics2.device_missing_channel=Device Missing Channel @@ -427,15 +427,15 @@ theoneprobe.appliedenergistics2.locked=Locked theoneprobe.appliedenergistics2.unlocked=Unlocked theoneprobe.appliedenergistics2.showing=Showing theoneprobe.appliedenergistics2.contains=Contains -theoneprobe.appliedenergistics2.channels=%1$d of %2$d Channels +theoneprobe.appliedenergistics2.channels=§2%1$d§r of §4%2$d§r Channels theoneprobe.appliedenergistics2.p2p_unlinked=Unlinked theoneprobe.appliedenergistics2.p2p_input_one_output=Linked (Input Side) - 1 Output -theoneprobe.appliedenergistics2.p2p_input_many_outputs=Linked (Input Side) - %d Outputs +theoneprobe.appliedenergistics2.p2p_input_many_outputs=Linked (Input Side) - §4%d§r Outputs theoneprobe.appliedenergistics2.p2p_output_one_input=Linked (Output Side) - 1 Input -theoneprobe.appliedenergistics2.p2p_output_many_inputs=Linked (Output Side) - %d Inputs +theoneprobe.appliedenergistics2.p2p_output_many_inputs=Linked (Output Side) - §2%d§r Inputs theoneprobe.appliedenergistics2.p2p_output=Linked (Output Side) -theoneprobe.appliedenergistics2.p2p_frequency=Frequency: %1$s -theoneprobe.appliedenergistics2.stored_energy=%1$d / %2$d +theoneprobe.appliedenergistics2.p2p_frequency=Frequency: §5%1$s§r +theoneprobe.appliedenergistics2.stored_energy=§2%1$d§к / §4%2$d§r // Items item.appliedenergistics2.storage_cell_1k.name=§61k§r ME Storage Cell diff --git a/src/main/resources/assets/appliedenergistics2/lang/ru_ru.lang b/src/main/resources/assets/appliedenergistics2/lang/ru_ru.lang index ec06debe0..c9a91514c 100644 --- a/src/main/resources/assets/appliedenergistics2/lang/ru_ru.lang +++ b/src/main/resources/assets/appliedenergistics2/lang/ru_ru.lang @@ -2,23 +2,23 @@ tile.appliedenergistics2.cable_bus.name=AE2 кабель и/или шина tile.appliedenergistics2.cell_workbench.name=Верстак для ячеек tile.appliedenergistics2.charger.name=Зарядник -tile.appliedenergistics2.chest.name=МЭ сундук +tile.appliedenergistics2.chest.name=МЭ Сундук tile.appliedenergistics2.condenser.name=Конденсатор материи -tile.appliedenergistics2.controller.name=МЭ контроллер +tile.appliedenergistics2.controller.name=МЭ Контроллер tile.appliedenergistics2.crank.name=Деревянная рукоятка tile.appliedenergistics2.creative_energy_cell.name=Творческая энергетическая ячейка tile.appliedenergistics2.dense_energy_cell.name=Плотная энергетическая ячейка tile.appliedenergistics2.energy_cell.name=Энергетическая ячейка -tile.appliedenergistics2.drive.name=МЭ накопитель +tile.appliedenergistics2.drive.name=МЭ Накопитель tile.appliedenergistics2.energy_acceptor.name=Приёмщик энергии tile.appliedenergistics2.grindstone.name=Кварцевый дробитель tile.appliedenergistics2.matrix_frame.name=Каркас матрицы -tile.appliedenergistics2.io_port.name=МЭ порт ввода\вывода +tile.appliedenergistics2.io_port.name=МЭ Порт ввода\вывода tile.appliedenergistics2.inscriber.name=Высекатель -tile.appliedenergistics2.interface.name=МЭ интерфейс -tile.appliedenergistics2.fluid_interface.name=МЭ жидкостный интерфейс -tile.appliedenergistics2.quantum_link.name=МЭ камера квантовой связи -tile.appliedenergistics2.quantum_ring.name=МЭ квантовое кольцо +tile.appliedenergistics2.interface.name=МЭ Интерфейс +tile.appliedenergistics2.fluid_interface.name=МЭ Жидкостный интерфейс +tile.appliedenergistics2.quantum_link.name=МЭ Камера квантовой связи +tile.appliedenergistics2.quantum_ring.name=МЭ Квантовое кольцо tile.appliedenergistics2.fluix_block.name=Изменчивый блок tile.appliedenergistics2.quartz_block.name=Блок истинного кварца tile.appliedenergistics2.chiseled_quartz_block.name=Резной блок истинного кварца @@ -31,10 +31,10 @@ tile.appliedenergistics2.spatial_io_port.name=Пространственный tile.appliedenergistics2.spatial_pylon.name=Пространственный пилон tile.appliedenergistics2.tiny_tnt.name=Маленький динамит tile.appliedenergistics2.vibration_chamber.name=Вибрационная камера -tile.appliedenergistics2.wireless_access_point.name=МЭ беспроводная точка доступа +tile.appliedenergistics2.wireless_access_point.name=МЭ Беспроводная точка доступа tile.appliedenergistics2.quartz_ore.name=Руда истинного кварца tile.appliedenergistics2.charged_quartz_ore.name=Заряженная руда истинного кварца -tile.appliedenergistics2.security_station.name=МЭ терминал безопасности +tile.appliedenergistics2.security_station.name=МЭ Терминал безопасности tile.appliedenergistics2.quartz_growth_accelerator.name=Ускоритель роста кристаллов tile.appliedenergistics2.sky_stone_block.name=Небесный камень tile.appliedenergistics2.smooth_sky_stone_block.name=Блок небесного камня @@ -73,8 +73,9 @@ tile.appliedenergistics2.sky_stone_small_brick_slab.name=Плита из мал tile.appliedenergistics2.sky_stone_slab.name=Плита из небесного камня // Chat Messages -chat.appliedenergistics2.ChestCannotReadStorageCell=МЭ сундук не может прочитать ячейку хранения. +chat.appliedenergistics2.ChestCannotReadStorageCell=МЭ Сундук не может прочитать ячейку хранения. chat.appliedenergistics2.SettingCleared=Карта памяти очищена. +chat.appliedenergistics2.MissingPatternsToEncode=Недостаточно шаблонов для завершения копирования. chat.appliedenergistics2.OutOfRange=Беспроводная сеть вне зоны действия. chat.appliedenergistics2.InvalidMachine=Неподходящий механизм. chat.appliedenergistics2.LoadedSettings=Настройки успешно загружены. @@ -168,6 +169,8 @@ gui.appliedenergistics2.StoredFluids=Хранящиеся жидкости gui.appliedenergistics2.Terminal=Терминал gui.appliedenergistics2.InterfaceTerminal=Терминал интерфейсов gui.appliedenergistics2.InterfaceTerminalHint=Показать или спрятать в терминале интерфейсов. +gui.appliedenergistics2.InterfaceConfigurationTerminal=Терминал конфигурации интерфейса +gui.appliedenergistics2.FluidInterfaceConfigurationTerminal=Терминал жидкостной конфигурации интерфейсов gui.appliedenergistics2.FormationPlane=Плоскость формирования gui.appliedenergistics2.FluidFormationPlane=Плоскость формирования жидкости gui.appliedenergistics2.VibrationChamber=Вибрационная камера @@ -175,7 +178,6 @@ gui.appliedenergistics2.NetworkDetails=Подробности сети gui.appliedenergistics2.StorageCells=МЭ Ячейки хранения gui.appliedenergistics2.IOBuses=МЭ Шина импорта\экспорта gui.appliedenergistics2.IOBusesFluids=МЭ Жидкостная шина импорта\экспорта -gui.appliedenergistics2.IOBusesFluids=МЭ Шина импорта/экспорта жидкости gui.appliedenergistics2.Stores=Хранит gui.appliedenergistics2.BytesUsed=Байт использовано gui.appliedenergistics2.Types=Типов @@ -220,7 +222,7 @@ gui.appliedenergistics2.Crafting=Крафт gui.appliedenergistics2.Scheduled=Запланировано gui.appliedenergistics2.CraftingStatus=Статус крафта gui.appliedenergistics2.FromStorage=Доступно -gui.appliedenergistics2.ToCraft=Необходимо скрафтить +gui.appliedenergistics2.ToCraft=Нужно еще gui.appliedenergistics2.CraftingPlan=План крафта gui.appliedenergistics2.Automatic=Автоматически gui.appliedenergistics2.Start=Старт @@ -261,10 +263,10 @@ gui.tooltips.appliedenergistics2.SubstitutionsOff=Замещения выклю gui.tooltips.appliedenergistics2.Encode=Закодировать шаблон gui.tooltips.appliedenergistics2.EncodeDescription=Запишите введённый шаблон на текущий закодированный шаблон, или на доступный чистый шаблон. gui.tooltips.appliedenergistics2.FuzzyMode=Нечёткое сравнение -gui.tooltips.appliedenergistics2.FZPercent_25=Разделять урон с 25% -gui.tooltips.appliedenergistics2.FZPercent_50=Разделять урон с 50% -gui.tooltips.appliedenergistics2.FZPercent_75=Разделять урон с 75% -gui.tooltips.appliedenergistics2.FZPercent_99=Разделять урон с 99% +gui.tooltips.appliedenergistics2.FZPercent_25=Разделять урон с §a25%§r +gui.tooltips.appliedenergistics2.FZPercent_50=Разделять урон с §e50%§r +gui.tooltips.appliedenergistics2.FZPercent_75=Разделять урон с §675%§r +gui.tooltips.appliedenergistics2.FZPercent_99=Разделять урон с §499%§r gui.tooltips.appliedenergistics2.SortOrder=Порядок сортировки gui.tooltips.appliedenergistics2.SortBy=Сортировать по gui.tooltips.appliedenergistics2.FZIgnoreAll=Любое соответствие @@ -288,8 +290,8 @@ gui.tooltips.appliedenergistics2.TrashController=Удаление по нажа gui.tooltips.appliedenergistics2.InterfaceBlockingMode=Блокирующий режим gui.tooltips.appliedenergistics2.InterfaceCraftingMode=Режим крафта gui.tooltips.appliedenergistics2.Trash=Уничтожить предметы -gui.tooltips.appliedenergistics2.MatterBalls=Конденсировать в шары материи\n%s за предмет -gui.tooltips.appliedenergistics2.Singularity=Конденсировать в сингулярности\n%s за предмет +gui.tooltips.appliedenergistics2.MatterBalls=Конденсировать в шары материи\n§a%s§r за предмет +gui.tooltips.appliedenergistics2.Singularity=Конденсировать в сингулярности\n§a%s§r за предмет gui.tooltips.appliedenergistics2.Read=Только извлекать gui.tooltips.appliedenergistics2.Write=Только вкладывать gui.tooltips.appliedenergistics2.ReadWrite=Двухсторонний @@ -408,16 +410,16 @@ waila.appliedenergistics2.Locked=Заблокировано waila.appliedenergistics2.Unlocked=Разблокировано waila.appliedenergistics2.Showing=Показывает waila.appliedenergistics2.Contains=Содержит -waila.appliedenergistics2.Channels=Каналы: %1$d из %2$d +waila.appliedenergistics2.Channels=Каналы: §2%1$d§r из §4%2$d§r waila.appliedenergistics2.P2PUnlinked=Не связанный -waila.appliedenergistics2.p2p_input_one_output=Связанный (Сторона ввода) -waila.appliedenergistics2.p2p_input_many_outputs=Связанный (Сторона ввода) - %d выводов -waila.appliedenergistics2.p2p_output_one_input=Связанный (Сторона вывода) -waila.appliedenergistics2.p2p_output_many_inputs=Связанный (Сторона вывода) - %d выводов -waila.appliedenergistics2.P2POutput=Связанный (Сторона вывода) +waila.appliedenergistics2.p2p_input_one_output=Связанный (Сторона входа) - 1 Выход +waila.appliedenergistics2.p2p_input_many_outputs=Связанный (Сторона входа) - §4%d§r Выходов +waila.appliedenergistics2.p2p_output_one_input=Связанный (Сторона выхода) - 1 Вход +waila.appliedenergistics2.p2p_output_many_inputs=Связанный (Сторона выхода) - §2%d§r Входов +waila.appliedenergistics2.P2POutput=Связанный (Сторона выхода) // TheOneProbe -theoneprobe.appliedenergistics2.crafting=Создается: %1$s +theoneprobe.appliedenergistics2.crafting=Создается: §2%1$s§r theoneprobe.appliedenergistics2.device_online=Устройство включено theoneprobe.appliedenergistics2.device_offline=Устройство выключено theoneprobe.appliedenergistics2.device_missing_channel=У устройства нет канала. @@ -425,15 +427,15 @@ theoneprobe.appliedenergistics2.locked=Заблокировано theoneprobe.appliedenergistics2.unlocked=Разблокировано theoneprobe.appliedenergistics2.showing=Показывает theoneprobe.appliedenergistics2.contains=Содержит -theoneprobe.appliedenergistics2.channels=Каналы: %1$d из %2$d +theoneprobe.appliedenergistics2.channels=Каналы: §2%1$d§r из §4%2$d§r theoneprobe.appliedenergistics2.p2p_unlinked=Не связанный -theoneprobe.appliedenergistics2.p2p_input_one_output=Связанный (сторона ввода) -theoneprobe.appliedenergistics2.p2p_input_many_outputs=Связанный (сторона ввода) - %d выводов -theoneprobe.appliedenergistics2.p2p_output_one_input=Связанный (Сторона вывода) -theoneprobe.appliedenergistics2.p2p_output_many_inputs=Связанный (Сторона вывода) - %d выводов -theoneprobe.appliedenergistics2.p2p_output=Связанный (Сторона вывода) -theoneprobe.appliedenergistics2.p2p_frequency=Частота: %1$s -theoneprobe.appliedenergistics2.stored_energy=%1$d / %2$d +theoneprobe.appliedenergistics2.p2p_input_one_output=Связанный (Сторона входа) - 1 Выход +theoneprobe.appliedenergistics2.p2p_input_many_outputs=Связанный (Сторона входа) - §4%d§r Выходов +theoneprobe.appliedenergistics2.p2p_output_one_input=Связанный (Сторона выхода) - 1 Вход +theoneprobe.appliedenergistics2.p2p_output_many_inputs=Связанный (Сторона выхода) - §2%d§r Входов +theoneprobe.appliedenergistics2.p2p_output=Связанный (Сторона выхода) +theoneprobe.appliedenergistics2.p2p_frequency=Частота: §5%1$s§r +theoneprobe.appliedenergistics2.stored_energy=§2%1$d§к / §4%2$d§r // Items item.appliedenergistics2.storage_cell_1k.name=§61k§r МЭ Ячейка хранения @@ -444,7 +446,7 @@ item.appliedenergistics2.fluid_storage_cell_1k.name=§61k§r МЭ Жидкост item.appliedenergistics2.fluid_storage_cell_4k.name=§e4k§r МЭ Жидкостная ячейка хранения item.appliedenergistics2.fluid_storage_cell_16k.name=§a16k§r МЭ Жидкостная ячейка хранения item.appliedenergistics2.fluid_storage_cell_64k.name=§b64k§r МЭ Жидкостная ячейка хранения -item.appliedenergistics2.creative_storage_cell.name=Творческая МЭ ячейка хранения +item.appliedenergistics2.creative_storage_cell.name=Творческая МЭ Ячейка хранения item.appliedenergistics2.encoded_pattern.name=Кодированный шаблон item.appliedenergistics2.view_cell.name=Ячейка представления item.appliedenergistics2.facade.name=Кабельный фасад @@ -535,12 +537,12 @@ item.appliedenergistics2.multi_part.fluid_formation_plane.name=МЭ Жидкос item.appliedenergistics2.multi_part.import_bus.name=МЭ Шина импорта item.appliedenergistics2.multi_part.fluid_import_bus.name=МЭ Жидкостная шина импорта item.appliedenergistics2.multi_part.interface.name=МЭ Интерфейс -item.appliedenergistics2.multi_part.fluid_interface.name=МЭ Интерфейс жидкостей +item.appliedenergistics2.multi_part.fluid_interface.name=МЭ Жидкостый нтерфейс item.appliedenergistics2.multi_part.level_emitter.name=МЭ Излучатель уровня item.appliedenergistics2.multi_part.fluid_level_emitter.name=МЭ Излучатель уровня item.appliedenergistics2.multi_part.p2p_tunnel.name=Туннель точка-точка item.appliedenergistics2.multi_part.pattern_terminal.name=МЭ Терминал шаблонов -item.appliedenergistics2.multi_part.expanded_processing_pattern_terminal.name=ME терминал расширенной схемы обработки +item.appliedenergistics2.multi_part.expanded_processing_pattern_terminal.name=ME Терминал расширенных шаблонов item.appliedenergistics2.multi_part.quartz_fiber.name=Кварцевое оптическое волокно item.appliedenergistics2.multi_part.storage_bus.name=МЭ Шина хранения item.appliedenergistics2.multi_part.oredict_storage_bus.name=МЭ Шина хранения по словарю руд @@ -550,6 +552,8 @@ item.appliedenergistics2.multi_part.inverted_toggle_bus.name=МЭ Инверти item.appliedenergistics2.multi_part.toggle_bus.name=МЭ Шина переключения item.appliedenergistics2.multi_part.crafting_monitor.name=МЭ Монитор крафта item.appliedenergistics2.multi_part.interface_terminal.name=МЭ Терминал интерфейсов +item.appliedenergistics2.multi_part.interface_configuration_terminal.name=МЭ Терминал конфигурации интерфейсов +item.appliedenergistics2.multi_part.fluid_interface_configuration_terminal.name=МЭ Терминал жидкостной конфигурации интерфейсов item.appliedenergistics2.multi_part.fluid_terminal.name=МЭ Жидкостный терминал item.appliedenergistics2.multi_part.invalid_type.name=Отключенный предмет @@ -623,7 +627,7 @@ achievement.ae2.Charger.desc=Сделайте зарядник! achievement.ae2.CrystalGrowthAccelerator=Ускоритель - ещё мягко сказано! achievement.ae2.CrystalGrowthAccelerator.desc=Сделайте ускоритель роста кристаллов! achievement.ae2.GlassCable=Изменчивое энергетическое соединение! -achievement.ae2.GlassCable.desc=Сделайте МЭ стеклянный кабель! +achievement.ae2.GlassCable.desc=Сделайте МЭ Стеклянный кабель! achievement.ae2.Networking1=Сетевое подмастерье! achievement.ae2.Networking1.desc=Достигните 8 каналов, подключая устройства к сети! achievement.ae2.Controller=Коммутатор сети! @@ -650,8 +654,8 @@ achievement.ae2.QNB=Квантовое туннелирование! achievement.ae2.QNB.desc=Сделайте квантовое соединение! // Stats -stat.ae2.ItemsInserted=Предметов добавлено в МЭ хранилище -stat.ae2.ItemsExtracted=Предметов извлечено из МЭ хранилища +stat.ae2.ItemsInserted=Предметов добавлено в МЭ Хранилище +stat.ae2.ItemsExtracted=Предметов извлечено из МЭ Хранилища stat.ae2.TurnedCranks=Сломано рукояток //Keys diff --git a/src/main/resources/assets/appliedenergistics2/models/block/chest/base.json b/src/main/resources/assets/appliedenergistics2/models/block/chest/base.json index 18e09d8b6..06fc63a1c 100644 --- a/src/main/resources/assets/appliedenergistics2/models/block/chest/base.json +++ b/src/main/resources/assets/appliedenergistics2/models/block/chest/base.json @@ -1,12 +1,122 @@ { - "parent": "block/cube", - "textures": { - "particle": "appliedenergistics2:blocks/chest/side", - "up": "appliedenergistics2:blocks/chest/top", - "down": "appliedenergistics2:blocks/chest/bottom", - "north": "appliedenergistics2:blocks/chest/front", - "east": "appliedenergistics2:blocks/chest/side", - "south": "appliedenergistics2:blocks/chest/side", - "west": "appliedenergistics2:blocks/chest/side" - } -} + "credit": "Made with Blockbench", + "textures": { + "up": "appliedenergistics2:blocks/chest/top", + "down": "appliedenergistics2:blocks/chest/bottom", + "north": "appliedenergistics2:blocks/chest/front", + "particle": "appliedenergistics2:blocks/chest/side", + "east": "appliedenergistics2:blocks/chest/side" + }, + "elements": [ + { + "name": "inside_border_right", + "from": [4, 3, 0], + "to": [5, 8, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 13, 1]}, + "faces": { + "east": {"uv": [0, 6, 1, 11], "rotation": 180, "texture": "#down"} + } + }, + { + "name": "inside_right", + "from": [2, 1, 1], + "to": [5, 12, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 11, 3]}, + "faces": { + "east": {"uv": [5, 2, 14, 13], "texture": "#down"} + } + }, + { + "from": [0, 0, 0], + "to": [16, 16, 16], + "faces": { + "north": {"uv": [0, 0, 16, 16], "texture": "#north"}, + "east": {"uv": [0, 0, 16, 16], "texture": "#east"}, + "south": {"uv": [0, 0, 16, 16], "texture": "#east"}, + "west": {"uv": [0, 0, 16, 16], "texture": "#east"}, + "up": {"uv": [0, 0, 16, 16], "texture": "#up"}, + "down": {"uv": [0, 0, 16, 16], "texture": "#down"} + } + }, + { + "name": "inside_back", + "from": [5, 4, 7], + "to": [11, 7, 10], + "rotation": {"angle": 0, "axis": "y", "origin": [19, 11, 8]}, + "faces": { + "north": {"uv": [3, 2, 14, 14], "texture": "#down"} + } + }, + { + "name": "inside_left", + "from": [11, 1, 1], + "to": [14, 12, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [18, 11, 3]}, + "faces": { + "north": {"uv": [2, 5, 2, 5], "texture": "#down"}, + "west": {"uv": [5, 2, 14, 13], "texture": "#down"} + } + }, + { + "name": "inside_top", + "from": [5, 6, 1], + "to": [11, 9, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [15, 16, 3]}, + "faces": { + "north": {"uv": [14, 12, 14, 12], "texture": "#down"}, + "down": {"uv": [12, 15, 12, 15], "texture": "#down"} + } + }, + { + "name": "inside_bottom", + "from": [5, 1, 1], + "to": [11, 4, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [15, 11, 3]}, + "faces": { + "north": {"uv": [1, 6, 1, 6], "texture": "#down"}, + "up": {"uv": [6, 1, 6, 1], "texture": "#down"} + } + }, + { + "name": "inside_border_bottom", + "from": [4, 0, 0], + "to": [12, 3, 9], + "rotation": {"angle": 0, "axis": "y", "origin": [15, 10, 1]}, + "faces": { + "up": {"uv": [0, 4, 9, 13], "rotation": 90, "texture": "#missing"} + } + }, + { + "name": "inside_border_top", + "from": [5, 7, 0], + "to": [12, 10, 9], + "rotation": {"angle": 0, "axis": "y", "origin": [15, 17, 1]}, + "faces": { + "down": {"uv": [0, 4, 9, 13], "rotation": 270, "texture": "#down"} + } + }, + { + "name": "inside_border_left", + "from": [11, 3, 0], + "to": [12, 8, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [15, 13, 1]}, + "faces": { + "west": {"uv": [0, 8, 1, 13], "texture": "#down"} + } + } + ], + "groups": [ + { + "name": "chest", + "origin": [8, 8, 8], + "color": 0, + "children": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9] + }, + { + "name": "cells", + "origin": [8, 8, 8], + "color": 0, + "children": [] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/chest/cell_state_empty.json b/src/main/resources/assets/appliedenergistics2/models/block/chest/cell_state_empty.json index 9e9a7eaca..f15d8be3d 100644 --- a/src/main/resources/assets/appliedenergistics2/models/block/chest/cell_state_empty.json +++ b/src/main/resources/assets/appliedenergistics2/models/block/chest/cell_state_empty.json @@ -1,24 +1,4 @@ { - "textures": { - "state": "appliedenergistics2:blocks/chest/cell_state_empty" - }, - "elements": [ - { - "from": [ - 0, - 0, - 0 - ], - "to": [ - 16, - 16, - 16 - ], - "faces": { - "north": { - "texture": "#state" - } - } - } - ] -} + "textures": {}, + "elements": [] +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/chest/cell_state_full.json b/src/main/resources/assets/appliedenergistics2/models/block/chest/cell_state_full.json index 1a451d77e..b20bb847d 100644 --- a/src/main/resources/assets/appliedenergistics2/models/block/chest/cell_state_full.json +++ b/src/main/resources/assets/appliedenergistics2/models/block/chest/cell_state_full.json @@ -1,47 +1,38 @@ { - "ae2_uvl_marker": true, - "textures": { - "backdrop": "appliedenergistics2:blocks/chest/cell_state_backdrop", - "state": "appliedenergistics2:blocks/chest/cell_state_full" - }, - "elements": [ - { - "from": [ - 0, - 0, - 0 - ], - "to": [ - 16, - 16, - 16 - ], - "faces": { - "north": { - "texture": "#backdrop" - } - } - }, - { - "from": [ - 0, - 0, - 0 - ], - "to": [ - 16, - 16, - 16 - ], - "faces": { - "north": { - "texture": "#state", - "uvlightmap": { - "block": 0.007, - "sky": 0.007 - } - } - } - } - ] -} + "credit": "Made with Blockbench", + "textures": { + "front": "appliedenergistics2:blocks/chest/cell_state_backdrop", + "state": "appliedenergistics2:blocks/chest/cell_state_full", + "top_front": "appliedenergistics2:blocks/drive_cell_states_emissive" + }, + "elements": [ + { + "name": "Cell Backdrop", + "from": [5, 4, 0], + "to": [11, 6, 1], + "shade": false, + "faces": { + "north": {"uv": [5, 10, 11, 12], "texture": "#front"}, + "up": {"uv": [5, 10, 11, 11], "texture": "#front"} + } + }, + { + "name": "Cell Light", + "from": [9, 4, 0], + "to": [10, 5, 0], + "shade": false, + "faces": { + "north": {"uv": [6, 11, 7, 12], "texture": "#state"} + } + }, + { + "name": "Cell Light", + "from": [9, 4, 0], + "to": [10, 5, 0], + "shade": false, + "faces": { + "north": {"uv": [1, 7, 2, 8], "texture": "#top_front"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/chest/cell_state_offline.json b/src/main/resources/assets/appliedenergistics2/models/block/chest/cell_state_offline.json index 59b9eb03f..01fb60a16 100644 --- a/src/main/resources/assets/appliedenergistics2/models/block/chest/cell_state_offline.json +++ b/src/main/resources/assets/appliedenergistics2/models/block/chest/cell_state_offline.json @@ -1,24 +1,17 @@ { - "textures": { - "state": "appliedenergistics2:blocks/chest/cell_state_offline" - }, - "elements": [ - { - "from": [ - 0, - 0, - 0 - ], - "to": [ - 16, - 16, - 16 - ], - "faces": { - "north": { - "texture": "#state" - } - } - } - ] -} + "credit": "Made with Blockbench", + "textures": { + "front": "appliedenergistics2:blocks/chest/cell_state_offline" + }, + "elements": [ + { + "from": [5, 4, 0], + "to": [11, 6, 1], + "shade": false, + "faces": { + "north": {"uv": [5, 10, 11, 12], "texture": "#front"}, + "up": {"uv": [5, 10, 11, 11], "texture": "#front"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/chest/cell_state_online.json b/src/main/resources/assets/appliedenergistics2/models/block/chest/cell_state_online.json index 6ef9f3c8b..dbf8f806e 100644 --- a/src/main/resources/assets/appliedenergistics2/models/block/chest/cell_state_online.json +++ b/src/main/resources/assets/appliedenergistics2/models/block/chest/cell_state_online.json @@ -1,47 +1,38 @@ { - "ae2_uvl_marker": true, - "textures": { - "backdrop": "appliedenergistics2:blocks/chest/cell_state_backdrop", - "state": "appliedenergistics2:blocks/chest/cell_state_online" - }, - "elements": [ - { - "from": [ - 0, - 0, - 0 - ], - "to": [ - 16, - 16, - 16 - ], - "faces": { - "north": { - "texture": "#backdrop" - } - } - }, - { - "from": [ - 0, - 0, - 0 - ], - "to": [ - 16, - 16, - 16 - ], - "faces": { - "north": { - "texture": "#state", - "uvlightmap": { - "block": 0.007, - "sky": 0.007 - } - } - } - } - ] -} + "ae2_uvl_marker": true, + "parent": "block/block", + "textures": { + "front": "appliedenergistics2:blocks/chest/cell_state_backdrop", + "state": "appliedenergistics2:blocks/chest/cell_state_online", + "top_front": "appliedenergistics2:blocks/drive_cell_states_emissive" + }, + "elements": [ + { + "name": "Cell Backdrop", + "from": [5, 4, 0], + "to": [11, 6, 1], + "shade": false, + "faces": { + "north": {"uv": [5, 10, 11, 12], "texture": "#front"}, + "up": {"uv": [5, 10, 11, 11], "texture": "#front"} + } + }, + { + "name": "Cell Light", + "from": [9, 4, 0], + "to": [10, 5, 0], + "shade": false, + "faces": { + "north": {"uv": [6, 11, 7, 12], "texture": "#state"} + } + }, + { + "name": "Cell Light", + "from": [9, 4, 0], + "to": [10, 5, 0], + "faces": { + "north": {"uv": [1, 3, 2, 4], "texture": "#top_front"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/chest/cell_state_types_full.json b/src/main/resources/assets/appliedenergistics2/models/block/chest/cell_state_types_full.json index d87a670e0..c90088364 100644 --- a/src/main/resources/assets/appliedenergistics2/models/block/chest/cell_state_types_full.json +++ b/src/main/resources/assets/appliedenergistics2/models/block/chest/cell_state_types_full.json @@ -1,47 +1,38 @@ { - "ae2_uvl_marker": true, - "textures": { - "backdrop": "appliedenergistics2:blocks/chest/cell_state_backdrop", - "state": "appliedenergistics2:blocks/chest/cell_state_types_full" - }, - "elements": [ - { - "from": [ - 0, - 0, - 0 - ], - "to": [ - 16, - 16, - 16 - ], - "faces": { - "north": { - "texture": "#backdrop" - } - } - }, - { - "from": [ - 0, - 0, - 0 - ], - "to": [ - 16, - 16, - 16 - ], - "faces": { - "north": { - "texture": "#state", - "uvlightmap": { - "block": 0.007, - "sky": 0.007 - } - } - } - } - ] -} + "credit": "Made with Blockbench", + "textures": { + "front": "appliedenergistics2:blocks/chest/cell_state_backdrop", + "state": "appliedenergistics2:blocks/chest/cell_state_types_full", + "top_front": "appliedenergistics2:blocks/drive_cell_states_emissive" + }, + "elements": [ + { + "name": "Cell Backdrop", + "from": [5, 4, 0], + "to": [11, 6, 1], + "shade": false, + "faces": { + "north": {"uv": [5, 10, 11, 12], "texture": "#front"}, + "up": {"uv": [5, 10, 11, 11], "texture": "#front"} + } + }, + { + "name": "Cell Light", + "from": [9, 4, 0], + "to": [10, 5, 0], + "shade": false, + "faces": { + "north": {"uv": [6, 11, 7, 12], "texture": "#state"} + } + }, + { + "name": "Cell Light", + "from": [9, 4, 0], + "to": [10, 5, 0], + "shade": false, + "faces": { + "north": {"uv": [1, 5, 2, 6], "texture": "#top_front"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/chest/lights_off.json b/src/main/resources/assets/appliedenergistics2/models/block/chest/lights_off.json index 6ea61de80..56b6c873d 100644 --- a/src/main/resources/assets/appliedenergistics2/models/block/chest/lights_off.json +++ b/src/main/resources/assets/appliedenergistics2/models/block/chest/lights_off.json @@ -22,4 +22,4 @@ } } ] -} +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/chest/lights_on.json b/src/main/resources/assets/appliedenergistics2/models/block/chest/lights_on.json index 2b477b8c3..507543afc 100644 --- a/src/main/resources/assets/appliedenergistics2/models/block/chest/lights_on.json +++ b/src/main/resources/assets/appliedenergistics2/models/block/chest/lights_on.json @@ -21,9 +21,10 @@ "up": { "texture": "#lights_bright", "tintindex": 3, + "unlit": true, "uvlightmap": { - "block": 0.007, - "sky": 0.007 + "block": 15, + "sky": 15 } } } @@ -43,9 +44,10 @@ "up": { "texture": "#lights_medium", "tintindex": 2, + "unlit": true, "uvlightmap": { - "block": 0.007, - "sky": 0.007 + "block": 15, + "sky": 15 } } } @@ -65,12 +67,13 @@ "up": { "texture": "#lights_dark", "tintindex": 1, + "unlit": true, "uvlightmap": { - "block": 0.007, - "sky": 0.007 + "block": 15, + "sky": 15 } } } } ] -} +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/drive_base.json b/src/main/resources/assets/appliedenergistics2/models/block/drive_base.json index 9812538dd..88c523044 100644 --- a/src/main/resources/assets/appliedenergistics2/models/block/drive_base.json +++ b/src/main/resources/assets/appliedenergistics2/models/block/drive_base.json @@ -1,172 +1,284 @@ { - "parent": "block/block", - "textures": { - "particle": "appliedenergistics2:blocks/drive_side", - "side": "appliedenergistics2:blocks/drive_side", - "bottom": "appliedenergistics2:blocks/drive_bottom", - "top": "appliedenergistics2:blocks/drive_top", - "front": "appliedenergistics2:blocks/drive_front", - "inner": "appliedenergistics2:blocks/drive_bottom" - }, - "elements": [ - { - "name": "Right Side Panel", - "from": [ - 0.0, - 1.0, - 0.0 - ], - "to": [ - 2.0, - 15.0, - 16.0 - ], - "faces": { - "north": { - "texture": "#front" - }, - "east": { - "texture": "#inner" - }, - "south": { - "texture": "#side" - }, - "west": { - "texture": "#side" - } - } - }, - { - "name": "Left Side Panel", - "from": [ - 14.0, - 1.0, - 0.0 - ], - "to": [ - 16.0, - 15.0, - 16.0 - ], - "faces": { - "north": { - "texture": "#front" - }, - "east": { - "texture": "#side" - }, - "south": { - "texture": "#side" - }, - "west": { - "texture": "#inner" - } - } - }, - { - "name": "Back Panel", - "from": [ - 2.0, - 1.0, - 8.0 - ], - "to": [ - 14.0, - 15.0, - 16.0 - ], - "faces": { - "north": { - "texture": "#inner" - }, - "south": { - "texture": "#side" - } - } - }, - { - "name": "Bottom Panel", - "from": [ - 0.0, - 0.0, - 0.0 - ], - "to": [ - 16.0, - 1.0, - 16.0 - ], - "faces": { - "north": { - "texture": "#front" - }, - "east": { - "texture": "#side" - }, - "south": { - "texture": "#side" - }, - "west": { - "texture": "#side" - }, - "up": { - "texture": "#inner" - }, - "down": { - "texture": "#bottom" - } - } - }, - { - "name": "Top Panel", - "from": [ - 0.0, - 15.0, - 0.0 - ], - "to": [ - 16.0, - 16.0, - 16.0 - ], - "faces": { - "north": { - "texture": "#front" - }, - "east": { - "texture": "#side" - }, - "south": { - "texture": "#side" - }, - "west": { - "texture": "#side" - }, - "up": { - "texture": "#top" - }, - "down": { - "texture": "#inner" - } - } - }, - { - "name": "Front Panel", - "from": [ - 2.0, - 1.0, - 0.0 - ], - "to": [ - 14.0, - 15.0, - 8.0 - ], - "faces": { - "north": { - "texture": "#front" - } - } - } - ] + "parent": "block/block", + "ambientocclusion": false, + "textures": { + "particle": "appliedenergistics2:blocks/drive_side", + "side": "appliedenergistics2:blocks/drive_side", + "bottom": "appliedenergistics2:blocks/drive_bottom", + "top": "appliedenergistics2:blocks/drive_top", + "front": "appliedenergistics2:blocks/drive_front" + }, + "elements": [ + { + "name": "Right Side Panel", + "from": [0, 1, 0], + "to": [2, 15, 16], + "faces": { + "north": { + "uv": [15, 1, 16, 15], + "texture": "#front", + "cullface": "north" + }, + "east": { + "uv": [0, 2, 16, 14], + "rotation": 180, + "texture": "#bottom", + "cullface": "north" + }, + "south": { + "uv": [0, 1, 1, 15], + "texture": "#side", + "cullface": "south" + }, + "west": { + "uv": [0, 1, 16, 15], + "texture": "#side", + "cullface": "west" + } + } + }, + { + "name": "Left Side Panel", + "from": [14, 1, 0], + "to": [16, 15, 16], + "faces": { + "north": { + "uv": [0, 1, 1, 15], + "texture": "#front", + "cullface": "north" + }, + "east": { + "uv": [0, 1, 16, 15], + "texture": "#side", + "cullface": "east" + }, + "south": { + "uv": [15, 1, 16, 15], + "texture": "#side", + "cullface": "south" + }, + "west": { + "uv": [0, 2, 16, 14], + "texture": "#bottom", + "cullface": "north" + } + } + }, + { + "name": "Back Panel", + "from": [2, 1, 7], + "to": [14, 15, 16], + "rotation": { + "angle": 0, + "axis": "y", + "origin": [8, 8, 9] + }, + "faces": { + "north": { + "uv": [13, 2, 14, 13], + "texture": "#bottom" + }, + "south": { + "uv": [1, 1, 15, 15], + "texture": "#side", + "cullface": "south" + } + } + }, + { + "name": "Bottom Panel", + "from": [0, 0, 0], + "to": [16, 1, 16], + "faces": { + "north": { + "uv": [0, 15, 16, 16], + "texture": "#front", + "cullface": "north" + }, + "east": { + "uv": [0, 15, 16, 16], + "texture": "#side", + "cullface": "east" + }, + "south": { + "uv": [0, 15, 16, 16], + "texture": "#side", + "cullface": "south" + }, + "west": { + "uv": [0, 15, 16, 16], + "texture": "#side", + "cullface": "west" + }, + "up": { + "uv": [0, 2, 16, 14], + "rotation": 90, + "texture": "#bottom", + "cullface": "north" + }, + "down": { + "uv": [0, 0, 16, 16], + "texture": "#bottom", + "cullface": "down" + } + } + }, + { + "name": "Top Panel", + "from": [0, 15, 0], + "to": [16, 16, 16], + "faces": { + "north": { + "uv": [0, 0, 16, 1], + "texture": "#front", + "cullface": "north" + }, + "east": { + "uv": [0, 0, 16, 1], + "texture": "#side", + "cullface": "east" + }, + "south": { + "uv": [0, 0, 16, 1], + "texture": "#side", + "cullface": "south" + }, + "west": { + "uv": [0, 0, 16, 1], + "texture": "#side", + "cullface": "west" + }, + "up": { + "uv": [0, 0, 16, 16], + "texture": "#top", + "cullface": "up" + }, + "down": { + "uv": [0, 2, 16, 14], + "rotation": 270, + "texture": "#bottom", + "cullface": "north" + } + } + }, + { + "name": "Front Panel", + "from": [7, 1, 1], + "to": [9, 15, 7], + "faces": { + "north": { + "uv": [7, 1, 9, 15], + "texture": "#front", + "cullface": "north" + }, + "east": { + "uv": [1, 2, 7, 14], + "rotation": 180, + "texture": "#bottom", + "cullface": "north" + }, + "west": { + "uv": [1, 2, 7, 14], + "texture": "#bottom", + "cullface": "north" + } + } + }, + { + "name": "Separator", + "from": [1, 3, 2], + "to": [15, 4, 7], + "faces": { + "north": { + "uv": [1, 12, 15, 13], + "texture": "#front", + "cullface": "north" + }, + "up": { + "uv": [1, 2, 6, 14], + "rotation": 90, + "texture": "#bottom", + "cullface": "north" + }, + "down": { + "uv": [1, 2, 6, 14], + "rotation": 270, + "texture": "#bottom", + "cullface": "north" + } + } + }, + { + "name": "Separator", + "from": [1, 6, 2], + "to": [15, 7, 7], + "faces": { + "north": { + "uv": [1, 9, 15, 10], + "texture": "#front", + "cullface": "north" + }, + "up": { + "uv": [1, 2, 6, 14], + "rotation": 90, + "texture": "#bottom", + "cullface": "north" + }, + "down": { + "uv": [1, 2, 6, 14], + "rotation": 270, + "texture": "#bottom", + "cullface": "north" + } + } + }, + { + "name": "Separator", + "from": [1, 9, 2], + "to": [15, 10, 7], + "faces": { + "north": { + "uv": [1, 6, 15, 7], + "texture": "#front", + "cullface": "north" + }, + "up": { + "uv": [1, 2, 6, 14], + "rotation": 90, + "texture": "#bottom", + "cullface": "north" + }, + "down": { + "uv": [1, 2, 6, 14], + "rotation": 270, + "texture": "#bottom", + "cullface": "north" + } + } + }, + { + "name": "Separator", + "from": [1, 12, 2], + "to": [15, 13, 7], + "faces": { + "north": { + "uv": [1, 3, 15, 4], + "texture": "#front", + "cullface": "north" + }, + "up": { + "uv": [1, 2, 6, 14], + "rotation": 90, + "texture": "#bottom", + "cullface": "north" + }, + "down": { + "uv": [1, 2, 6, 14], + "rotation": 270, + "texture": "#bottom", + "cullface": "north" + } + } + } + ] } diff --git a/src/main/resources/assets/appliedenergistics2/models/block/drive_base_depth.json b/src/main/resources/assets/appliedenergistics2/models/block/drive_base_depth.json index 1f5462186..faac3a35a 100644 --- a/src/main/resources/assets/appliedenergistics2/models/block/drive_base_depth.json +++ b/src/main/resources/assets/appliedenergistics2/models/block/drive_base_depth.json @@ -1,273 +1,284 @@ { - "parent": "block/block", - "textures": { - "side": "appliedenergistics2:blocks/drive_side", - "bottom": "appliedenergistics2:blocks/drive_bottom", - "top": "appliedenergistics2:blocks/drive_top", - "front": "appliedenergistics2:blocks/drive_front", - "inner": "appliedenergistics2:blocks/drive_bottom" - }, - "elements": [ - { - "name": "Right Side Panel", - "from": [ - 0.0, - 1.0, - 0.0 - ], - "to": [ - 2.0, - 15.0, - 16.0 - ], - "faces": { - "north": { - "texture": "#front" - }, - "east": { - "texture": "#inner" - }, - "south": { - "texture": "#side" - }, - "west": { - "texture": "#side" - } - } + "parent": "block/block", + "ambientocclusion": false, + "textures": { + "particle": "appliedenergistics2:blocks/drive_side", + "side": "appliedenergistics2:blocks/drive_side", + "bottom": "appliedenergistics2:blocks/drive_bottom", + "top": "appliedenergistics2:blocks/drive_top", + "front": "appliedenergistics2:blocks/drive_front" + }, + "elements": [ + { + "name": "Right Side Panel", + "from": [0, 1, 0], + "to": [2, 15, 16], + "faces": { + "north": { + "uv": [15, 1, 16, 15], + "texture": "#front", + "cullface": "north" }, - { - "name": "Left Side Panel", - "from": [ - 14.0, - 1.0, - 0.0 - ], - "to": [ - 16.0, - 15.0, - 16.0 - ], - "faces": { - "north": { - "texture": "#front" - }, - "east": { - "texture": "#side" - }, - "south": { - "texture": "#side" - }, - "west": { - "texture": "#inner" - } - } + "east": { + "uv": [0, 2, 16, 14], + "rotation": 180, + "texture": "#bottom", + "cullface": "north" }, - { - "name": "Back Panel", - "from": [ - 2.0, - 1.0, - 8.0 - ], - "to": [ - 14.0, - 15.0, - 16.0 - ], - "faces": { - "north": { - "texture": "#inner" - }, - "south": { - "texture": "#side" - } - } + "south": { + "uv": [0, 1, 1, 15], + "texture": "#side", + "cullface": "south" }, - { - "name": "Bottom Panel", - "from": [ - 0.0, - 0.0, - 0.0 - ], - "to": [ - 16.0, - 1.0, - 16.0 - ], - "faces": { - "north": { - "texture": "#front" - }, - "east": { - "texture": "#side" - }, - "south": { - "texture": "#side" - }, - "west": { - "texture": "#side" - }, - "up": { - "texture": "#inner" - }, - "down": { - "texture": "#bottom" - } - } - }, - { - "name": "Top Panel", - "from": [ - 0.0, - 15.0, - 0.0 - ], - "to": [ - 16.0, - 16.0, - 16.0 - ], - "faces": { - "north": { - "texture": "#front" - }, - "east": { - "texture": "#side" - }, - "south": { - "texture": "#side" - }, - "west": { - "texture": "#side" - }, - "up": { - "texture": "#top" - }, - "down": { - "texture": "#inner" - } - } - }, - { - "name": "Middle Strut", - "from": [ - 7.0, - 1.0, - 0.0 - ], - "to": [ - 9.0, - 15.0, - 8.0 - ], - "faces": { - "north": { - "texture": "#front" - }, - "east": { - "texture": "#inner" - }, - "west": { - "texture": "#inner" - } - } - }, - { - "name": "Separator", - "from": [ - 2.0, - 3.0, - 1.0 - ], - "to": [ - 14.0, - 4.0, - 8.0 - ], - "faces": { - "north": { - "texture": "#front" - }, - "up": { - "texture": "#inner" - }, - "down": { - "texture": "#inner" - } - } - }, - { - "name": "Separator", - "from": [ - 2.0, - 6.0, - 1.0 - ], - "to": [ - 14.0, - 7.0, - 8.0 - ], - "faces": { - "north": { - "texture": "#front" - }, - "up": { - "texture": "#inner" - }, - "down": { - "texture": "#inner" - } - } - }, - { - "name": "Separator", - "from": [ - 2.0, - 9.0, - 1.0 - ], - "to": [ - 14.0, - 10.0, - 8.0 - ], - "faces": { - "north": { - "texture": "#front" - }, - "up": { - "texture": "#inner" - }, - "down": { - "texture": "#inner" - } - } - }, - { - "name": "Separator", - "from": [ - 2.0, - 12.0, - 1.0 - ], - "to": [ - 14.0, - 13.0, - 8.0 - ], - "faces": { - "north": { - "texture": "#front" - }, - "up": { - "texture": "#inner" - }, - "down": { - "texture": "#inner" - } - } + "west": { + "uv": [0, 1, 16, 15], + "texture": "#side", + "cullface": "west" } - ] + } + }, + { + "name": "Left Side Panel", + "from": [14, 1, 0], + "to": [16, 15, 16], + "faces": { + "north": { + "uv": [0, 1, 1, 15], + "texture": "#front", + "cullface": "north" + }, + "east": { + "uv": [0, 1, 16, 15], + "texture": "#side", + "cullface": "east" + }, + "south": { + "uv": [15, 1, 16, 15], + "texture": "#side", + "cullface": "south" + }, + "west": { + "uv": [0, 2, 16, 14], + "texture": "#bottom", + "cullface": "north" + } + } + }, + { + "name": "Back Panel", + "from": [2, 1, 7], + "to": [14, 15, 16], + "rotation": { + "angle": 0, + "axis": "y", + "origin": [8, 8, 9] + }, + "faces": { + "north": { + "uv": [13, 2, 14, 13], + "texture": "#bottom" + }, + "south": { + "uv": [1, 1, 15, 15], + "texture": "#side", + "cullface": "south" + } + } + }, + { + "name": "Bottom Panel", + "from": [0, 0, 0], + "to": [16, 1, 16], + "faces": { + "north": { + "uv": [0, 15, 16, 16], + "texture": "#front", + "cullface": "north" + }, + "east": { + "uv": [0, 15, 16, 16], + "texture": "#side", + "cullface": "east" + }, + "south": { + "uv": [0, 15, 16, 16], + "texture": "#side", + "cullface": "south" + }, + "west": { + "uv": [0, 15, 16, 16], + "texture": "#side", + "cullface": "west" + }, + "up": { + "uv": [0, 2, 16, 14], + "rotation": 90, + "texture": "#bottom", + "cullface": "north" + }, + "down": { + "uv": [0, 0, 16, 16], + "texture": "#bottom", + "cullface": "down" + } + } + }, + { + "name": "Top Panel", + "from": [0, 15, 0], + "to": [16, 16, 16], + "faces": { + "north": { + "uv": [0, 0, 16, 1], + "texture": "#front", + "cullface": "north" + }, + "east": { + "uv": [0, 0, 16, 1], + "texture": "#side", + "cullface": "east" + }, + "south": { + "uv": [0, 0, 16, 1], + "texture": "#side", + "cullface": "south" + }, + "west": { + "uv": [0, 0, 16, 1], + "texture": "#side", + "cullface": "west" + }, + "up": { + "uv": [0, 0, 16, 16], + "texture": "#top", + "cullface": "up" + }, + "down": { + "uv": [0, 2, 16, 14], + "rotation": 270, + "texture": "#bottom", + "cullface": "north" + } + } + }, + { + "name": "Front Panel", + "from": [7, 1, 1], + "to": [9, 15, 7], + "faces": { + "north": { + "uv": [7, 1, 9, 15], + "texture": "#front", + "cullface": "north" + }, + "east": { + "uv": [1, 2, 7, 14], + "rotation": 180, + "texture": "#bottom", + "cullface": "north" + }, + "west": { + "uv": [1, 2, 7, 14], + "texture": "#bottom", + "cullface": "north" + } + } + }, + { + "name": "Separator", + "from": [1, 3, 2], + "to": [15, 4, 7], + "faces": { + "north": { + "uv": [1, 12, 15, 13], + "texture": "#front", + "cullface": "north" + }, + "up": { + "uv": [1, 2, 6, 14], + "rotation": 90, + "texture": "#bottom", + "cullface": "north" + }, + "down": { + "uv": [1, 2, 6, 14], + "rotation": 270, + "texture": "#bottom", + "cullface": "north" + } + } + }, + { + "name": "Separator", + "from": [1, 6, 2], + "to": [15, 7, 7], + "faces": { + "north": { + "uv": [1, 9, 15, 10], + "texture": "#front", + "cullface": "north" + }, + "up": { + "uv": [1, 2, 6, 14], + "rotation": 90, + "texture": "#bottom", + "cullface": "north" + }, + "down": { + "uv": [1, 2, 6, 14], + "rotation": 270, + "texture": "#bottom", + "cullface": "north" + } + } + }, + { + "name": "Separator", + "from": [1, 9, 2], + "to": [15, 10, 7], + "faces": { + "north": { + "uv": [1, 6, 15, 7], + "texture": "#front", + "cullface": "north" + }, + "up": { + "uv": [1, 2, 6, 14], + "rotation": 90, + "texture": "#bottom", + "cullface": "north" + }, + "down": { + "uv": [1, 2, 6, 14], + "rotation": 270, + "texture": "#bottom", + "cullface": "north" + } + } + }, + { + "name": "Separator", + "from": [1, 12, 2], + "to": [15, 13, 7], + "faces": { + "north": { + "uv": [1, 3, 15, 4], + "texture": "#front", + "cullface": "north" + }, + "up": { + "uv": [1, 2, 6, 14], + "rotation": 90, + "texture": "#bottom", + "cullface": "north" + }, + "down": { + "uv": [1, 2, 6, 14], + "rotation": 270, + "texture": "#bottom", + "cullface": "north" + } + } + } + ] } diff --git a/src/main/resources/assets/appliedenergistics2/models/block/drive_cell_empty.json b/src/main/resources/assets/appliedenergistics2/models/block/drive_cell_empty.json index 0f1c68022..6334701b6 100644 --- a/src/main/resources/assets/appliedenergistics2/models/block/drive_cell_empty.json +++ b/src/main/resources/assets/appliedenergistics2/models/block/drive_cell_empty.json @@ -1,32 +1,4 @@ { - "ae2_uvl_marker": true, - "textures": { - "front": "appliedenergistics2:blocks/drive_cell_states" - }, - "elements": [ - { - "name": "Cell Backdrop", - "from": [ - 9.0, - 13.0, - 0.0 - ], - "to": [ - 14.0, - 15.0, - 1.0 - ], - "faces": { - "north": { - "texture": "#front", - "uv": [ - 0, - 10, - 5, - 12 - ] - } - } - } - ] + "textures": {}, + "elements": [] } diff --git a/src/main/resources/assets/appliedenergistics2/models/block/drive_cell_full.json b/src/main/resources/assets/appliedenergistics2/models/block/drive_cell_full.json index 06c5b1214..5c89a5566 100644 --- a/src/main/resources/assets/appliedenergistics2/models/block/drive_cell_full.json +++ b/src/main/resources/assets/appliedenergistics2/models/block/drive_cell_full.json @@ -1,60 +1,29 @@ { - "ae2_uvl_marker": true, - "textures": { - "front": "appliedenergistics2:blocks/drive_cell_states" - }, - "elements": [ - { - "name": "Cell Backdrop", - "from": [ - 9.0, - 13.0, - 0.0 - ], - "to": [ - 14.0, - 15.0, - 1.0 - ], - "faces": { - "north": { - "texture": "#front", - "uv": [ - 0, - 8, - 5, - 10 - ] - } - } - }, - { - "name": "Cell Light", - "from": [ - 9.0, - 13.0, - 0.0 - ], - "to": [ - 14.0, - 15.0, - 1.0 - ], - "faces": { - "north": { - "texture": "#front", - "uv": [ - 0, - 6, - 5, - 8 - ], - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } - } - } - } - ] -} + "textures": { + "front": "appliedenergistics2:blocks/drive_cell_states", + "top_front": "appliedenergistics2:blocks/drive_cell_states_emissive" + }, + "elements": [ + { + "name": "Cell Backdrop", + "from": [9, 13, 1], + "to": [14, 15, 2], + "shade": false, + "faces": { + "north": {"uv": [0, 8, 5, 10], "texture": "#front"}, + "up": {"uv": [0, 8, 5, 9], "texture": "#front"}, + "down": {"uv": [5, 10, 0, 9], "texture": "#front"} + } + }, + { + "name": "Cell Light", + "from": [9, 13, 1], + "to": [14, 15, 2], + "shade": false, + "faces": { + "north": {"uv": [0, 6, 5, 8], "texture": "#top_front"}, + "down": {"uv": [5, 8, 0, 7], "texture": "#top_front"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/drive_cell_off.json b/src/main/resources/assets/appliedenergistics2/models/block/drive_cell_off.json index 555f2064d..b837fd99d 100644 --- a/src/main/resources/assets/appliedenergistics2/models/block/drive_cell_off.json +++ b/src/main/resources/assets/appliedenergistics2/models/block/drive_cell_off.json @@ -1,31 +1,18 @@ { - "textures": { - "front": "appliedenergistics2:blocks/drive_cell_states" - }, - "elements": [ - { - "name": "Cell", - "from": [ - 9.0, - 13.0, - 0.0 - ], - "to": [ - 14.0, - 15.0, - 1.0 - ], - "faces": { - "north": { - "texture": "#front", - "uv": [ - 0, - 0, - 5, - 2 - ] - } - } - } - ] -} + "ambientocclusion": false, + "textures": { + "front": "appliedenergistics2:blocks/drive_cell_states" + }, + "elements": [ + { + "name": "Cell Backdrop", + "from": [9, 13, 1], + "to": [14, 15, 2], + "faces": { + "north": {"uv": [0, 0, 5, 2], "texture": "#front"}, + "up": {"uv": [0, 0, 5, 1], "texture": "#front"}, + "down": {"uv": [5, 2, 0, 1], "texture": "#front"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/drive_cell_on.json b/src/main/resources/assets/appliedenergistics2/models/block/drive_cell_on.json index c192ded2e..3fe7493de 100644 --- a/src/main/resources/assets/appliedenergistics2/models/block/drive_cell_on.json +++ b/src/main/resources/assets/appliedenergistics2/models/block/drive_cell_on.json @@ -1,60 +1,29 @@ { - "ae2_uvl_marker": true, - "textures": { - "front": "appliedenergistics2:blocks/drive_cell_states" - }, - "elements": [ - { - "name": "Cell Backdrop", - "from": [ - 9.0, - 13.0, - 0.0 - ], - "to": [ - 14.0, - 15.0, - 1.0 - ], - "faces": { - "north": { - "texture": "#front", - "uv": [ - 0, - 8, - 5, - 10 - ] - } - } - }, - { - "name": "Cell Light", - "from": [ - 9.0, - 13.0, - 0.0 - ], - "to": [ - 14.0, - 15.0, - 1.0 - ], - "faces": { - "north": { - "texture": "#front", - "uv": [ - 0, - 2, - 5, - 4 - ], - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } - } - } - } - ] -} + "textures": { + "front": "appliedenergistics2:blocks/drive_cell_states", + "top_front": "appliedenergistics2:blocks/drive_cell_states_emissive" + }, + "elements": [ + { + "name": "Cell Backdrop", + "from": [9, 13, 1], + "to": [14, 15, 2], + "shade": false, + "faces": { + "north": {"uv": [0, 8, 5, 10], "texture": "#front"}, + "up": {"uv": [0, 8, 5, 9], "texture": "#front"}, + "down": {"uv": [5, 10, 0, 9], "texture": "#front"} + } + }, + { + "name": "Cell Light", + "from": [9, 13, 1], + "to": [14, 15, 2], + "shade": false, + "faces": { + "north": {"uv": [0, 2, 5, 4], "texture": "#top_front"}, + "down": {"uv": [5, 4, 0, 3], "texture": "#top_front"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/models/block/drive_cell_types_full.json b/src/main/resources/assets/appliedenergistics2/models/block/drive_cell_types_full.json index 38a8738a3..b8d910338 100644 --- a/src/main/resources/assets/appliedenergistics2/models/block/drive_cell_types_full.json +++ b/src/main/resources/assets/appliedenergistics2/models/block/drive_cell_types_full.json @@ -1,60 +1,29 @@ { - "ae2_uvl_marker": true, - "textures": { - "front": "appliedenergistics2:blocks/drive_cell_states" - }, - "elements": [ - { - "name": "Cell Backdrop", - "from": [ - 9.0, - 13.0, - 0.0 - ], - "to": [ - 14.0, - 15.0, - 1.0 - ], - "faces": { - "north": { - "texture": "#front", - "uv": [ - 0, - 8, - 5, - 10 - ] - } - } - }, - { - "name": "Cell Light", - "from": [ - 9.0, - 13.0, - 0.0 - ], - "to": [ - 14.0, - 15.0, - 1.0 - ], - "faces": { - "north": { - "texture": "#front", - "uv": [ - 0, - 4, - 5, - 6 - ], - "uvlightmap": { - "sky": 0.007, - "block": 0.007 - } - } - } - } - ] -} + "textures": { + "front": "appliedenergistics2:blocks/drive_cell_states", + "top_front": "appliedenergistics2:blocks/drive_cell_states_emissive" + }, + "elements": [ + { + "name": "Cell Backdrop", + "from": [9, 13, 1], + "to": [14, 15, 2], + "shade": false, + "faces": { + "north": {"uv": [0, 8, 5, 10], "texture": "#front"}, + "up": {"uv": [0, 8, 5, 9], "texture": "#front"}, + "down": {"uv": [5, 10, 0, 9], "texture": "#front"} + } + }, + { + "name": "Cell Light", + "from": [9, 13, 1], + "to": [14, 15, 2], + "shade": false, + "faces": { + "north": {"uv": [0, 4, 5, 6], "texture": "#top_front"}, + "down": {"uv": [5, 6, 0, 5], "texture": "#top_front"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/controller_column_lights.png.mcmeta b/src/main/resources/assets/appliedenergistics2/textures/blocks/controller_column_lights.png.mcmeta index 8e2af92cc..313e1f2b7 100644 --- a/src/main/resources/assets/appliedenergistics2/textures/blocks/controller_column_lights.png.mcmeta +++ b/src/main/resources/assets/appliedenergistics2/textures/blocks/controller_column_lights.png.mcmeta @@ -2,6 +2,7 @@ "animation": { "frametime": 3, "frames": [ + 0, 1, 2, 3, @@ -12,8 +13,7 @@ 8, 9, 10, - 11, - 0 + 11 ] } } diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/creative_energy_cell.png b/src/main/resources/assets/appliedenergistics2/textures/blocks/creative_energy_cell.png index 1f4fd0ef9ecacac21356cad560df0cc1e736ed4d..83823f43dbe87f43489354c3162bff6557664dce 100644 GIT binary patch literal 3856 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4kiW$h6xih%orFLI14-?iy0WWg+Z8+Vb&Z8 z1_qw;%#etZ2wxwokg&dz0$52&wylyQ$U=n(-v9;Y{GwC^Gd%;{WCH^u1#?S1Lo*W-GXot3BLgD? zeFIZ{LnB>7Gb;lVD?@VyC{VIfuqjGOvkG!?gW6S;l4h%vQBqQ1rLSLJUanVete0Pu zu5V~*X{m2uq;F)TTa=QfTU?n}l31aeSF8*(!6mggxhS)sBr`ux0c2ugQhsTPt&$Sd z*oxc&xUqS~&|pf=&(*I;EYLU9GXQxB?AMfJxVnPUq8za0Darb&IjOm+c_qdAhI)o@ zwH3JqzP@nfSdGoig{v+uaV;ysuevy-vLIDID784hv?w{%wJbHSL>cCT;*y|LM9^Th z3{`tjY8qT~K}LQ_esM-VjzEA*qXb1sW*QC)K{6;xQ!6rYCKEjtgKhKmwerj>E=kNwPW5!LRjSA>(96tBu}VobPBgbLGSW3OGD*}mvNSQ)wM;Zf z)=f!FPBAo3F*C3*NQLQl$xki?B`J`8NbX9>PtHuSg2#oGsilR5S)y^0Zjy#2jQ(L9R;4OtDHbNJ}+NGBDFMPBKf= zHMB4>)J-x*CNj)C&0l}BcANq$i!w4@16Erhai zG8MpC(kd|-;)P^T+DuJRf(mD1iD2S_5@Kw5Mrt13R0~m7oS#-wo>-LXn4X$fLLg7* z<8pd&Vi|si8ylOZ8KtFK>Y5rEnCPY@nWX4iS|%szrY0q&SXdfb8Yh~j!90%Xa3d=d z11nPlSPmlH;m{yW&PdElPff8^(pMtiD@i8CX~sz=X1Yn1My9&vplo50Xl$x$Xklq+ zZe)_2VrprG-78oM1ERcQWTh6eJcU=BAdU78Tnnr4{Ap zDkK&Z5aIO5E786 z>5Zn5qz`HuK#Bl;aP5s$Izad?kdSl(#SOU1wZd8s5Sa#pQq!zb2p06l2B}HrMiwc$ zsYxcLx`~FMf)fbL=$*G`XvKU&z zI3=b-Svi?@*sCXETx|mm@SIFSW|!u`GBpaAp znkA>Cq!4SCnL)BeieZ|eZn8m=v97tLNuq92s->~6g^5{OqD5M&abl_gv1XYkTc#u$ z8W`vrCR!TmCYzX8=q4E&n&~E5n46lKo0z2<8<`MmmW4sGahjn~l5U!jQL?U~xrvdk zg`rWZu3@5avYCOYiG{Ic5~f+CRN_dw!Ql>xM1B0R4OWTNdbU%57!%~;24aF6`k+R? zodTjak(!rct5l?9Z^yQ-lV~EDYsgw5m3n$7PoBw_9J^qaQi#-+hnlVNj zu080YvTJ9Dkw;KL!N!O32V|WdIr+$R);H8Q$j0z=CK~bR>9sTpY+dk$Toq6+L{^tB4*p~ zt`)Dz+_?3K<@r-?X0vOj#yxz?C+bviPBMAv!%eTU_Z?zn;cf9{_))kmUt?!e+!Pf} zKkp-**Nz6Rzs^0m@&31khdF2GeP?OVIek2~eT(OX{SADIEUGOG98C|bU+EV9vimO9 zAbd0LyU2m|jpbztk+&8;uViQuNXg54=l^)WXMCl))>N;xVYfAM*mx}xFL%C~9uXBE z|9pPKb%2NQ0W)$G3a^HG`qoD*TO z3ELdncwWJDwJ`R*b=OQija*sl5y1s#Z*2 zHigOHN{yQw!j{2u!cFvRQzwgy5&|?@HYCY?{OPQf9pM$o;S!RaaGQTP-@9^k& zX(sz{IKI25_jLW#|AjSSkF%Rp+20)Ab^LF|F@_sQ=4Ne`I)B^fJBQ+wpy-Z}A_sro Ze{Ad%wWWCe8;gPZte&oZF6*2UngE6vAQ1on delta 325 zcmbOrca>>^WIY=L1B3kM|A`C?3@qu6zK#qG8~eHcB(gFvFeoH@1o<*BRH-pAG_)`< z{9<5WXn4WEP-?)y@G60U!Dq|^$ZLQOFdm2LoEE)PCCfjpdi4K zd9XkJ@o9118;rF9GO8DO(>$-qJQtGxCEK| z$}sV6d83sWmx!I#@4cNne)uydEN4hQ_xnw~y^z}5Lp~3R`@FVdQ&MBb@0K;~79RL6T diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/dense_energy_cell.png b/src/main/resources/assets/appliedenergistics2/textures/blocks/dense_energy_cell.png index 9e602fd116a2a7e7c6db2f664d6189a80f6f5955..265c42c1e6948272dddcdbe40d1912e2872713f0 100644 GIT binary patch literal 3847 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4kiW$h6xih%orFLI14-?iy0WWg+Z8+Vb&Z8 z1_qw;%#etZ2wxwokg&dz0$52&wylyQ$U=n(-v9;Y{GwC^Gd%;{WCH^u1#?S1Lo*W-GXot3BLgD? zeFIZ{LnB>7Gb;lVD?@VyC{VIfuqjGOvkG!?gW6S;l4h%vQBqQ1rLSLJUanVete0Pu zu5V~*X{m2uq;F)TTa=QfTU?n}l31aeSF8*(!6mggxhS)sBr`ux0c2ugQhsTPt&$Sd z*oxc&xUqS~&|pf=&(*I;EYLU9GXQxB?AMfJxVnPUq8za0Darb&IjOm+c_qdAhI)o@ zwH3JqzP@nfSdGoig{v+uaV;ysuevy-vLIDID784hv?w{%wJbHSL>cCT;*y|LM9^Th z3{`tjY8qT~K}LQ_esM-VjzEA*qXb1sW*QC)K{6;xQ!6rYCKEjtgKhKmwerj>E=kNwPW5!LRjSA>(96tBu}ZcyH%T$FOw&y@OET9rv@l85wKT9y z)-^UYPO&gBFtSKaPK4=q$xki?B`J`8NbX9>PtHuSg2#oGXg`uIDacW8m%ryU^%=FB>#2jQ(L9R;4OtDHbNJ}+NGBDFMPBKda zxyn#C$tclMH!;a5#lS2r&BEB&L`eZ*uXBD*evxl}N~*1rv62EPuC4rwGE?(P5<$7k zR>=@57y(MCIi(Omb0Y%-0|R|S5DAr!Bp{EF4$aFfu~jlsQUIkEE3o~+1&PV2wn}EE zrpBgF@qo;V)SL*H%-qzx;>`R!TO~s?WSK}*8BjR}%AZyqnZ+gfMU~K!COEYa%F4-9 z0B1?7#AJvUl0j)RHAM+3oQWlZi3>`IvE>=5d3aMTL|JiuT1k0gQL1BlYF-I}JfV-v z>BWg<_#JL+Y?@}2mTIYMYGh!do0epfqHAfHoT!_cl$2s&X=rJjXqpD|IHtpmtV|57 zOyN0*bcaKOG&v(NFFiHIR!Lupe6JXoCR!w#8(Zj_nU{e z8YG)1C&A+o)hk#E1ERcQWTh6eJcU=BAdU78Tnnr4{Ap zDkK&Z5aIO5E77d zj3j+f(*RNg=!0u-q|yPxcY%bY8z^qTRjw7ba)8)07?hf3l|rzfH#SI3GB>hF(M?S< zG1W~pG%?mqO14PVH84*xNj5byNV0&WXpm|7los@$Gz3pxRMzT{B~oR9y>0OJm)XB#UGNb4#=2 zl#~==%`!7cwn#BdGt^BsNHW$nw=_xAO-i*i*0nG(OG~s!OEpeRH6Ye3^JL4EL_-4u zUBg66L)~N(6ARrWLqjv&L<@6MQ*#ruRAVC(V$HHJNH$J0G)mGFj&^Aa*g-)cifHB_m*}n=n&Xg-yQsRl9l)Ak_|IH7OT&_ zJ9GVE_DiZOZWmYF|6W=D{`UlLaW&g}Pk!$ca0(Prboq59MQ{4%+}%MdYi`!CHwZX! zB)T=dEG#OsxjS2m@qi^e!vPcDmHjPO80J)kKK@;&Z{Yj>*sr8;m&cZ}5nHFnT+iJa z#h|AyZ*XkcUjOXl$L9UrasGR)E5||0%pQFYr ztB)S7)4FT&a>tyvaqAELicoH0;Am3dac1b**t_-AyS)29%0VufENZ>=)nW1VlF7HL z`-uAy* zHMEm27W9}rLDVHL2)czY(RaF#p z#k?0RTBp=v;2V5-%R%#a>-eecp3_Sv@Y?SGa`VT*$y2BM&z4=5$)$KAq-@E0`@j7U zv)|NQ^HF|yWp(u)&19YfXM9AsSS8=L#VWUGbUorY*yF-}xt_VITq`+IS4AJxRrPfB Kb6Mw<&;$U|{U*u) delta 389 zcmZpdo60;vvYw5BfkFQB|3n4`29|V3Uq=Rpjs4tz5?L7-7!;B{f_xbms?-=58d?|_ zelajGG`wJ7C^cYUc$L7wU^Rn*LA+qju0R_G1_sUokH}&M2EJt=%-DWsWj+G~gH(xY zL`iUdT1k0gQ7S_~VrE{6o}X)oLYc9ish**s`)4QfdIkoDr=Bj3Ar}5iCn@qBau9H> zR`C#MQ7~u;DP(BMVih{bI3b4VzCwWv<3Zk82|G@j2R>(fyD=;Fy1e!K_a{3TDz=}z9aroBG2JpK0QvdrszS zxBuMkmhQRpV?%}xNaW-66UkrlQ#2#^rnyYuXmIEEKK?1S;gH0Im0uaJe5lE1t61fx oykxc*!+HPNj1!d(1WYYmVv%sG!+mE10|Nttr>mdKI;Vst0CB#NZvX%Q diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/dense_energy_cell0.png b/src/main/resources/assets/appliedenergistics2/textures/blocks/dense_energy_cell0.png index afce73be4ced90a6f270921ac11b93f2c5a0bf42..684e566e7056f63af80645d527abb859545479d9 100644 GIT binary patch delta 270 zcmbQlJdbIDWIZzj1A~Sxe=q|BgLi;Wh^v~C%&gRFa&mGaA|mlVD<{UBRaI3r(9`nu z^>uJ?I632gThO7b@GVtURWoPKbg&nuh1{kfDobN?crXF|qT6HgnuGncFpTeGg*U}>(VSgrOIRk`DT d=l^Gv*J0n6#r8akfq{X+lik(NWt~$(699y8d9VNg delta 386 zcmbQoG>LhFWIY=L1B3kM|A`C?3@qu6zK#qG8~eHcB(gFvFeoH@1o<*BRH-pAG_)`< z{9<5WXn4WEP-?)y@G60U!Dq|^$ZLQk33x*LoEE4PEzDMU4jW!Pe(=%^g9HlxXL;Y3?Tx$vWvvl4ckoUr|5d|O$7=>D5$=Kr_4>$g!)x;y0h zR^G!Cj#$2O##i>uufOF!zicci$nbt!)y=(|rkrFDZICgKKVZ@4$@JjoJsyFn zkLs>RN0u5hnA%j^=du|{m9+k6WLX$K|5tHmmQ(KSG=}u|KYbW$wU{O@y60rRcKgrm zZt0#opEhLZfJB~7Kau<~KSeWwZ<@;ljs|yr@8h3R8xBcaSn11n{Yo<-V6*344$rjF6*2UngDJNlD_}| diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/dense_energy_cell1.png b/src/main/resources/assets/appliedenergistics2/textures/blocks/dense_energy_cell1.png index a173bb9667d5ab04cb093240766a6b91e97b503e..b67605245d5cbedc89585d25818e39ed5cf028d8 100644 GIT binary patch delta 284 zcmbQpyoPClWIZzj1A~Sxe=q|BLr8#6h^v~CjGUZYX4vMws8chNuc)i5$9b>t_4Rdd za4^!>YzsP6RaG@}=1d1m{h<8L^zPN?gI4_ScyMaw|LyJXepFt#xBvgkQ~!@o|9AQF z8BSM7#Jpdx;TbNTu$we# zFv)nd9{b}s^;Ol=pPbJ-PcHAdS95k*xH?j

zopr06mw2TL1t6 delta 385 zcmZ3(G?96NWIY=L1B3kM|A`C?3@qu6zK#qG8~eHcB(gFvFeoH@1o<*BRH-pAG_)`< z{9<5WXn4WEP-?)y@G60U!Dq|^$ZLQ4?SHRLoEE4PBP?cau9H} zoFv8NEuFlghkb(}m-l1QoHaSNO(s=xLelw0PjWw97d+PWX!6-VKl>ABCK;~R4GImt zwk=oa`3iQ`1D{jM?$3(7CU5;d{$vM3#rB)G<-EOT@&quRNc_rL5<6XmVcz?*41t>O z%)+%#Kjv`YJzwQNo3V#2_F+AP!-^^1#h%yI=?TE{7#6wqNjlo%?U? z#mJyMD+Q@;hb1e@f2n?&@kct6Yg)6apbFE2i-#|5tdU$`z*dsw%wTGBe>UU1RTnv4 nE@M6L`Er`W5)Ol~T-%a05pS;k`Q^>Pz`)??>gTe~DWM4f^4F6_ diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/dense_energy_cell2.png b/src/main/resources/assets/appliedenergistics2/textures/blocks/dense_energy_cell2.png index 103babce5b6893f50ccdee1951f1e4d8e129c9d6..c4344b5da56dd17c3eaba669077f9089e403301c 100644 GIT binary patch delta 280 zcmbQtyn<}_X3m^hRaNC+ssH5Y|Jp@Ig7Q1h2d((u@nC!Vy9n1sk5YF3sJxILv-9%h z%WvMi$q3z)kvq4Wfq`L?r;B5V#O2if+kA%=c$}G8gf3g>UN5Wv|9>HONp+;)q@~S; zGEyyXGOlNbN_vDaX6z2wn(n*Dz$IYotqE@O3A6tGaAG~WyFv5OgVOwj`$huk3Mpn6 zjOrIo^O9{jQy<$Q%xU$CcgBAkLwDxCpSc?kf8)IyGyBlJy{~V~vALfRQ>q|^$ZLQk3C%+LoEE4PEzDMVG4@`ylC>*0k_j!g%Pm{r&vCTp48S;E;i+vl^{&(jz9Ry{JG{quAD^4przKHpLb z4Nc9xtyb7q6~MH|FYWuo0h{ONH@6O+H(P zSK;=Z5j!n<7_QWO__IawK*j~pf9wJ+aka0`tFGcS^_|Q(XYX@k)-MY=T)L{b?{2yG z?7q}o)u+pt7i|QIERR>}Ke>P6(ge#0Ax9+!Ia?js)6*Hbk{y>6cyjSwUN~zun lc~J~D_PJ~>T@1-ruQB%&#XMeRGZz$A44$rjF6*2UngC(Il}_X3m^hRaNC+ssH5Y|Jp@Ig7Q1h2d((u@nC!Vy9n1sk5YF3sJxILv-9%h z%WvMi$q3z)kvq4Wfq`L?r;B5V#O2if+kA%=c$}G8gf3g>UN5Wv|9>HONp+;)q@~S; zGEyyXGOlNbN_vDaX6z2wn(n*Dz$IYotqE@O3A6tGaAG~WyFv5OgVOwj`$huk3Mpn6 zjOrIo^O9{jQy<$Q%xU$CcgBAkLwDxCpSc?kf8)IyGyBlJy{~V~vALfRQ>q|^$ZLQPd!~6LoEE4PEzDMPijqF~SxQpnJh#VT}=aY78!eT4!U#)G`G5_X(4$)CKR=j{Tmy3I4~|CjEXn`F3F zCn$2-H4|T<=PTG%4}8w}c4JoTb$RRe?@x9xRBS(aJFeJ!CQkt4iOjF8TXJWsFwA>@ zmLX8{otb#_Ilek(22&gRTs8x#lGgu>EDOWu|0?dxaw?5YXGnkl(}!`dKGVcS_ngev zZvVO6E!}hH$A%0YkjTgBCz8M9r)Wm-O>>#R(csSSef(2u!y$EU;Nalv z>pMO9^30ht|F_*WFfh>8*6!JMyLQo$p#091rn%>XRy@xU<(9vcR0|UcEPZ!4!iOZ?}H~EezaD-^{T-o+*-@pI$&fz!Tot`#f0*^tv zbIH;rxl7JT#ELK~TocgDPMjwi%YQBMwd4q|^$ZLQk3C%+LoEE4PBP>=-TvlI~Xdy-@F~??LCtxfbqo2KTNyUc?&U||DM*c zLgf4G?y22}IUH(u&->42>|u+2SkK`2;_C8$F^gseTsDzBaI@Mj*g?L_VabZ^7kppm z{#$!7GAPeVL8{wf$%^t{s-I^3k&fh=)~qV1!t~(c;Y%B9Bo`R4m1H?HnA+T*%{Xt> qMUI!tSPy)@oaV5E!yqizcK5%Oi+55ha~T*I7(8A5T-G@yGywpb;+A~? diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/dense_energy_cell5.png b/src/main/resources/assets/appliedenergistics2/textures/blocks/dense_energy_cell5.png index 3c6240776f871b9d590dd6e2cc27460029b918c3..39c79895fec554c2c63e9a0ef15754a43ec2358b 100644 GIT binary patch delta 279 zcmbQjyqsx*WIZzj1A~Sxe=q|BLtubUh^v~COm_d;lQaHTRaKcAY9#xw?F>EU;Nalv z>pMO9^30ht|F_*WFfh>8*6!JMyLQo$p#091rn%>XRy@xU<(9vcR0|UcEPZ!4!iOZ?}H~EezaD-^{T-o+*-@pI$&fz!Tot`#f0*^tv zbIH;rxl7JT#ELK~TocgDPMjwi%YQBMwd4q|^$ZLQPdr^5LoEE4PBP>=(d*-3qxyfRQ;d%mMMW;z zq_Z}2mdd$6ey@h>7vF3&-M#jH+0EF=f{Y*DOTl1pw zKj-(Jn^g3e@nQr>K9subEdo{CSV(LrAZi ohq*4py!mF#O0EqHwO%t^K9X_5y;`P?fq{X+)78&qol`;+08X`(b^rhX diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/dense_energy_cell6.png b/src/main/resources/assets/appliedenergistics2/textures/blocks/dense_energy_cell6.png index 72c6c5d01e0d5302c643d75051b74915705984f1..28dd12c6eab7e5fcd2dfa0c5a970a93240b10ce1 100644 GIT binary patch delta 289 zcmbQrypd^wWIZzj1A~Sxe=q|BLwJBsh^v~COk2>Q3DIXx&iJ1ku+~^lt#!#^UteDb z2Zxy{R~;<%tE#GI&Ybzb?e6;XpL(|4j&fg8Fll{IerJ03>XfFr=Yv)}&pfcb{oTt` z|L^VppC7aH&6_uuFJEr8DXC&$V3_LZ;us=vIko>b-w_24m$gCllDDGX{{8j;{!Xv* z_-$=1DF=+3GqWbkm+MZCGhdd*b|5O@T=Kd%Nf)c9#9d3^ckf_6@s`n*!;hoxnC9(O zhh}liaBJ|`wBU@qNw9Cb-7n7TttXGm&CPt+UU{T8c@BI3x4){lgQ^y2cJ8{dUNq|^$ZLQPd!~6LoEE4PSWK&Piz!DAmfhv6z$(<2EBk@6LfL}VB*vN#vqX-t`wKY2UP+XY&2n`fH8e_djIG%G4{ z$tIn(nX^>R1@e0}e82c+tLbjt`DHg_CkrxucsIGd_SrNe$puUkK0o5lxNYXiU~_*q zf?qSQc=+=k&xep+ pHxF}NhI#YNn3Y@`7HYj_c-@t=f9JJZxeN>p44$rjF6*2UngAlPmOlUh diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/dense_energy_cell7.png b/src/main/resources/assets/appliedenergistics2/textures/blocks/dense_energy_cell7.png index 1e714aef796f791dbad04c9171abc13f7aca76b0..28dd12c6eab7e5fcd2dfa0c5a970a93240b10ce1 100644 GIT binary patch delta 289 zcmbQjypd^wWIZzj1A~Sxe=q|BLwJBsh^v~COk2>Q3DIXx&iJ1ku+~^lt#!#^UteDb z2Zxy{R~;<%tE#GI&Ybzb?e6;XpL(|4j&fg8Fll{IerJ03>XfFr=Yv)}&pfcb{oTt` z|L^VppC7aH&6_uuFJEr8DXC&$V3_LZ;us=vIko>b-w_24m$gCllDDGX{{8j;{!Xv* z_-$=1DF=+3GqWbkm+MZCGhdd*b|5O@T=Kd%Nf)c9#9d3^ckf_6@s`n*!;hoxnC9(O zhh}liaBJ|`wBU@qNw9Cb-7n7TttXGm&CPt+UU{T8c@BI3x4){lgQ^y2cJ8{dUNq|^$ZLQPdr^5LoEE4PBP>=LB?TGYn^w=#-968rnAkWmr`{k)o#z_=4sHqdJFJV@cnX;roMQM7 V72Ggg$H2hA;OXk;vd$@?2>>^49~%Gw literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/drive_cell_states_emissive.png.mcmeta b/src/main/resources/assets/appliedenergistics2/textures/blocks/drive_cell_states_emissive.png.mcmeta new file mode 100644 index 000000000..7401007ae --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/textures/blocks/drive_cell_states_emissive.png.mcmeta @@ -0,0 +1,10 @@ +{ + "ctm": { + "ctm_version": 1, + "layer": "BLOOM", + "gregtech": true, + "extra": { + "light": 15 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/energy_cell.png b/src/main/resources/assets/appliedenergistics2/textures/blocks/energy_cell.png index cc184ca0694913ef614daf0bf67bbd29aa17d7c1..001a211c6afc24b973b2e7181c469dedfc65f2ab 100644 GIT binary patch literal 3839 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4kiW$h6xih%orFLI14-?iy0WWg+Z8+Vb&Z8 z1_qw;%#etZ2wxwokg&dz0$52&wylyQ$U=n(-v9;Y{GwC^Gd%;{WCH^u1#?S1Lo*W-GXot3BLgD? zeFIZ{LnB>7Gb;lVD?@VyC{VIfuqjGOvkG!?gW6S;l4h%vQBqQ1rLSLJUanVete0Pu zu5V~*X{m2uq;F)TTa=QfTU?n}l31aeSF8*(!6mggxhS)sBr`ux0c2ugQhsTPt&$Sd z*oxc&xUqS~&|pf=&(*I;EYLU9GXQxB?AMfJxVnPUq8za0Darb&IjOm+c_qdAhI)o@ zwH3JqzP@nfSdGoig{v+uaV;ysuevy-vLIDID784hv?w{%wJbHSL>cCT;*y|LM9^Th z3{`tjY8qT~K}LQ_esM-VjzEA*qXb1sW*QC)K{6;xQ!6rYCKEjtgKhKmwerj>E=kNwPW5!LRjSA>(96tBu`)F?PBAr2G}AS+G)&bsGdHo&O*F7b z)-_8rPD`{fO))Y^Oor)q$xki?B`J`8NbX9>PtHuSg2#oGrG<&PrKwSxuBnN+sjg{? ziMg(2qG6hDQc|*ofrUY;X;P{M%ryU^%=FB>#2jQ(L9R;4OtDHbNJ}+NGBDFMPBKf= zHMB4>)J-x*CNj)C&0l}BcANq$i!w4@16Erhai zG8MpC(kd|-;)P^T+DuJRf(mD1iD2S_5@Kw5Mrt13R0~m7oS#-wo>-LXn4X$fLLg7* z<8pd&Vi|si8ylOZ8KtFK>Y5rEnCPY@nWX4iS|%szrY0q&SXdfb8Yh~j!90%Xa3d=d z11nPlSPmlH;m{yW&PdElPff8^(pMtiD;Ab%=ElZJ2D)Yj7HPUkMkXn`Nft&ax~3MU ziN+@81{NuaCfL1#r7$4MD@KNTM#v=-L=!QdNzTtJOD!rv#7#kBQDSatNorBCtx{T1 zey&1dK|xMtGB{`Hm*u5EYbJPRR4B<;KomVV11%-BC=)3KAlm|Wf&vxoBbeTZD+wV1 ziJIPM8cF(~rU9e~&ZkYterE|oy03H)e|wUwgCrtP9`CklXcCEO;U9&3@wdyQ<5x_ z4a_agl2cMrh&9X1AlV|tFwIam*&xYS*WA)1Q8y{o(pcBR#4Ih*A}!T8G1Y)rv&@q% zQxXjg40H_>Ee&;(O-w9wlMD^bbQ3MiO-;>B%uS=Z3q z#7Nh|&?r^cFwr>K%)r#d!q_qi(=1XdaU|W~aEC;qKK|GSt3+x&+bKYd3371*F~JRe zP@~^Y0nwXC%}cRWDpIny3y5wHWnf^^^K@|x(U>?j=xnxdpv;`_n{F=A-)-8f=DT#s zRu5&(Wnz0PFU4J+J$-4_#|7*k*C=pky$aoy_0Hiyj`U0xx01NkBcR5 zZ`T%XmOp=3`)K!q?K{t$$$w`4Dd1@xZoMHwBpUWXX1T=USY~H)B(7%WAy8M2wCWR@{tq(8vuRFVY zophUG!|n6;tL8ng%68lK>(j%~cbr;FpUnCG`|rd<6Yo}(dt{lF1A@r!UDIXB22loTO4H;~vPe;POk2w;ElKEc_<9Onqi?u719Y z-`q7*jxT?=r(*l9dtS>g=f8_*Ot@Vp;`+5pw&82S&g-vzr+S~yi@jB7mN7|%ooTW9 zr(I_CpEVhdMd(duE_irsa_6IqQ!FDjL>QI?t!%b0*?l)qS71$yju_*MUGq++Fr*mG z{2G_FY|YO?@2jgkHGMBHnX;_+ee&OUC7D1zt<>C2ll0&3yu0Q@oA2d6N~)I8^X=>c z{~rJNHmCN|nL7dL)wT0~XB}fWb4&8{rYn2O=kPjlEZw5KbfUDB*^T@Ys>a-v?Tx!Y OT~tq3KbLh*2~7aHoG11G delta 366 zcmew_`;TdYWIY=L1B3kM|A`C?3@qu6zK#qG8~eHcB(gFvFeoH@1o<*BRH-pAG_)`< z{9<5WXn4WEP-?)y@G60U!Dq|^$ZLQ=R92;LoEE4PTI(O$Uwk# zvmk4b*n*^?1EnlWE~_u2g2_cq&3n=X4fm3e_1KYyH&=z=B%rZumlR2uj{uW8s;XffBE zA?u#=GNwNn67`JfEC;=pF-h>BY&llAhT+>j^?F8!d{>2_CvQtGTb-RR^;Y%iH|9kf zIb6E-{MMhC`aM15$9wsexdw6E3$Dq9Fxs8TV0y8P^}~9vWlTz28%|v2pIpm$`$m>= UZstNE1_lNOPgg&ebxsLQ04R!$O#lD@ diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/energy_cell0.png b/src/main/resources/assets/appliedenergistics2/textures/blocks/energy_cell0.png index 2e827af8a4e9bdb96253604aa18f3aaf06e75e99..5de9b807dcf971bec1473a10685125d92b801328 100644 GIT binary patch delta 233 zcmcb|^owzVWIZzj1A~Sxe=q|BgK>aQh^vaCtcZxn#!FvY)?J>o@5S=tuXo-0YiywH z>+9>_;4tIt|Ej90nKNf@xqbiCy$6eqpMLY^&6M?9zA!K_GhDcma?T;2ZqQJo- z$|yO1=l{&+l+T+tu340`RWfMp$?3g$%YUt$#kk>y!RKt{TU}8LlQuoIY0gNl(DmVF zKjX$2af@%mP6kWnm=lf`@hhV*H*_1XayHb{a5;q{~z-cy4gY!zi~D&FfcH9y85}Sb4q9e0A!YGjsO4v delta 334 zcmeyxc#mmFNs zoPmMitfz}(h=u>sNrqg990Xj8wX7AFHYQ|FHgn&wq5dz+wM||p_pOK;+b=#;|KFpu`C}Ht)?W(jM+_EoE|@K* nuun^pJ!KW+%;j&{e={BEOSZPxE7xXVU|{fc^>bP0l+XkKNRNeb diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/energy_cell1.png b/src/main/resources/assets/appliedenergistics2/textures/blocks/energy_cell1.png index 718deab9f382e8611e89e1dbc4286038341c74a8..ab25243c141c4a1d758cdce1fbed8371695bbd34 100644 GIT binary patch delta 232 zcmaFJ^pkOdWIZzj1A~Sxe=q|BgK>aQh^wlSe9QVP{d=BmzxQy#kr(UEecE~RkAs7Q zudlDEq1KGE|7XseSyffF==kZN{Lb|5)ejy#D9rJ_$H2hQ=;`7ZB5^sjpPP%tki$88 z^|61?|1FOd6`M9UNMPQqBTaFCZpMgh{eI~zLqy$-%G)8^e#z`fEb4JA5!e$psf{7m zgX!5u;ha?mY#G7}C(Mcu4A(WT(VxeDJ=XAa*H+;NNB&i<-(i1o{fg#;ro|eWOl6Z2 qGT4mse3f>YbiP>s_}BfP@>-p&4~kMV?HCvs7(8A5T-G@yGywpw^Jv!q delta 337 zcmey#_>gIWWIY=L1B3kM|A`C?42;D=?oJHr&dI!FU|?WLcl32+VA$Bt{U?!?fq{Xu zz$3Dlfr0NZ2s0kfUy;JVz#vuP8c`CQpH@FNs zoPmMif~SjPh=u>sNrqg990Xi#r%au2=$wO<_iT}!jrF|`RJRCxVbeTv%(dS;e2N~YS`V9&dCoLL2PVmW)U}N9VZ~K#* zp-Pu&rqO#Z^R<_~9<96?7nEnIAl>b-?9A>zLXl$iZms|SO?<`n_$ouzS4X~%L^ojv pb6tm;P$Rw*Aaj>^H z(9`nu^__9{e^pi0%$YN{+`fP6-hYq%NHf{z6%Tw2E~ch13*@#L$7>V3=J&1!qT>)*aWK7ZMj)&+l~EV`Tj z{hj1+X8p=HB3YA^&4e$rE%GhfxXifWzopr01|(P#sB~S diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/energy_cell3.png b/src/main/resources/assets/appliedenergistics2/textures/blocks/energy_cell3.png index cc184ca0694913ef614daf0bf67bbd29aa17d7c1..d0a013318823cee182241443ee0578fef51b3cf8 100644 GIT binary patch delta 250 zcmeyz)Xg+OvYwfNfk8u;KbV1m!6v{b#8p*EcK7XnE$c4#?|HW5`0GuVzooV>aj>^H z(9`nu^__9{e^pi0%$YN{+`fP6-hYq%NHf{z6%Tw2E~ch13*@#L$7>V3=J&1!qT>)*aWK7ZMj)&+l~EV`Tj z{hj1+X8p=HB3YA^&4e$rE%GhfxXifWUahK delta 366 zcmeBX`o}auvYw5BfkFQB|3n4`29|V3Uq=Rpjs4tz5?L7-7!;B{f_xbms?-=58d?|_ zelajGG`wJ7C^cYUc$L7wU^Rn*LA+qju0R_G1_sUokH}&M2EJt=%-DWsWj+G~gH(xY zL`iUdT1k0gQ7S_~VrE{6o}X)oLYc9ish**s`)4QfdIkoDbDl1aAr}5iCvD_CWFX+W zS&%hIY(ddv!4*ooI4*8vab3dma8jS>jfR}!7m>fNowSq+syV*v_y3=dmb`91skC&8 z&hwZfcApk7&6qF0`)vO1dz)>iO_#l#%DljhpFhq>bU~8>)0)>&Dh>Rf*EDP^w3uto zkaf>_8PlH(iF(F#mV@5Qm?Zd5wj3*5!|-jNdOf2mdKI;Vst09+)Dz5oCK diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/energy_cell4.png b/src/main/resources/assets/appliedenergistics2/textures/blocks/energy_cell4.png index ca9143a39dd7a1d9e032d4ea1d2e95d9bcaad7e2..7bd3e3281f107c195a3a6d2818bd11b6150d89f6 100644 GIT binary patch delta 249 zcmey%)WtMGvYwfNfk8u;KbV1m!7{)n#8pj6x?#ncO_#q-Ir%rUYsHEauY0!LHqg`Z z_4RddaM*qO-;M{5ryqRgV5whKRW)GTwHhd?ppiyfBl=Lm-}*fJ5MG`w0+trbpHI|&)fYC%Nh0+algCxO>6aGp4e$i zcrML$lDzWDq3Pl)7QdG>R&n;`0Y>=|GsW@rj!0N~{W7$ft28m}c8@6q{_b#0w z>!R~9#zK>x{S0YM4^$sB9CJ2WxbMB}0lRNc)-$|V%aL+wkM`Xye%;H{sy%l;ZOGAK znrZa@lXptwA4$=FzumK>d#*FB*vf9H&?f22aCZyC$Iz1&3c=hbY+@zfaL2S|{7%`Q S&BVaKz~JfX=d#Wzp$Pz9-He+6 diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/energy_cell5.png b/src/main/resources/assets/appliedenergistics2/textures/blocks/energy_cell5.png index d7ccdf5754227447531dddae69bfba45b24d4fa5..7bd3e3281f107c195a3a6d2818bd11b6150d89f6 100644 GIT binary patch delta 249 zcmeyz)WtMGvYwfNfk8u;KbV1m!7{)n#8pj6x?#ncO_#q-Ir%rUYsHEauY0!LHqg`Z z_4RddaM*qO-;M{5ryqRgV5whKRW)GTwHhd?ppiyfBl=Lm-}*fJ5MG`w0+trbpHI|&)fYC%Nh0+algCxO>6aGp4e$i zcrML$lDzWDq3Pl)7Q|KEPOZTB)+-Qeq` zX6K6qf1hdQdhqYZji=wXC05)r+54to*E)tPFCHHBKE|lUp>$xAjw{m<1Aq1_y?;OM zVG8J$Gve!5ocJf5Re(iblHEXV66e?2_YB`Qs@F3*tanuies=feveGCU)7##sa@kXo z1y4+=+#auV`q}vvAMV=+-A&jd<*?T71f$`Z45k;$SUc8x9b=rCV>O;;N=3z5MvAo^7{x-TG^8sM)gOWMVvPq)$;j2mi;6UFX7+sCp_AbyI` zgc7#!jL)4ci>sT%OkQO-ALY6to$-os+w=1#F{fFdU$Ez2wdt`|`j+-OzdKvC&Xs#N z7W|%N^j7ndXYm@Z$-F13Pbb_-RWXoiHrnNX{>A#I|E~XMXyIe)Fu6WMgn@y9!PC{x JWt~$(69AhlbsGQx delta 369 zcmeBXYGj@uSnTu$sZZAYL$MSD+080|RG)M`SSr1K%sx`peaLg0m^3l}a-YhL4ck}a~aOR(pj=lxB3%M_39pY!Jbeaq=4Z}T?z z#9qH?(dYWcm|v^m_2cB`B7GeL_H(RLGNRXJ?$w@wfC(XYTulUXSk3pcw$PW^xZ9f-OJOeJ$F8B z$kAb%Y4rY+cS__RNzs45-B(HXgfp+W%5JI9Ch5y?cMHSE(32Jl!MrDI-sWx4e|I?j V{6^alTLuOO22WQ%mvv4FO#lEFjQIcn diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/energy_cell7.png b/src/main/resources/assets/appliedenergistics2/textures/blocks/energy_cell7.png index 9c18613e915611ea259d2ffa67d0f27d11ec4bf3..b2f92f28e422dab6e1dc6c7db883c1b91e0e0898 100644 GIT binary patch delta 250 zcmZo*?q-@GSV>O;;N=3z5MvAo^7{x-TG^8sM)gOWMVvPq)$;j2mi;6UFX7+sCp_AbyI` zgc7#!jL)4ci>sT%OkQO-ALY6to$-os+w=1#F{fFdU$Ez2wdt`|`j+-OzdKvC&Xs#N z7W|%N^j7ndXYm@Z$-F13Pbb_-RWXoiHrnNX{>A#I|E~XMXyIe)Fu6WMgn@y9!PC{x JWt~$(69Aeqbs7Kw delta 368 zcmeBXYG9rqSnTu$sZZAYL$MSD+080|RG)M`SSr1K%TsjqgO zJ65QZG`}){G3LFz^_%-;mUeFot8b=N&tqJ1@o@9>9_A1Mmxjz)T`V1m^Y~Usul}0J zwm{4_MMl8=aOMwg1&%l)z62W;;a9)!F}_Lm|Hsr2*X^+E%K zJTawmdc4xeNq T=AVTO3=9mOu6{1-oD!M