diff --git a/elepower_machines/machines/accumulator.lua b/elepower_machines/machines/accumulator.lua index 18c7692..0e39de0 100644 --- a/elepower_machines/machines/accumulator.lua +++ b/elepower_machines/machines/accumulator.lua @@ -5,8 +5,9 @@ minetest.register_node("elepower_machines:accumulator", { description = "Water Accumulator", groups = {fluid_container = 1, oddly_breakable_by_hand = 1, cracky = 1}, tiles = { - "elepower_machine_top.png^elepower_power_port.png", "elepower_machine_base.png", "elepower_machine_accumulator.png", - "elepower_machine_accumulator.png", "elepower_machine_accumulator.png", "elepower_machine_accumulator.png", + "elepower_machine_top.png^elepower_power_port.png", "elepower_machine_base.png", "elepower_machine_side.png^elepower_machine_accumulator.png", + "elepower_machine_side.png^elepower_machine_accumulator.png", "elepower_machine_side.png^elepower_machine_accumulator.png", + "elepower_machine_side.png^elepower_machine_accumulator.png", }, fluid_buffers = { water = { @@ -24,8 +25,9 @@ minetest.register_node("elepower_machines:accumulator_heavy", { description = "Water Accumulator (Heavy Water)", groups = {fluid_container = 1, oddly_breakable_by_hand = 1, cracky = 1, not_in_creative_inventory = 1}, tiles = { - "elepower_machine_top.png^elepower_power_port.png", "elepower_machine_base.png", "elepower_machine_accumulator.png", - "elepower_machine_accumulator.png", "elepower_machine_accumulator.png", "elepower_machine_accumulator.png", + "elepower_machine_top.png^elepower_power_port.png", "elepower_machine_base.png", "elepower_machine_side.png^elepower_machine_accumulator.png", + "elepower_machine_side.png^elepower_machine_accumulator.png", "elepower_machine_side.png^elepower_machine_accumulator.png", + "elepower_machine_side.png^elepower_machine_accumulator.png", }, drop = { max_items = 2, diff --git a/elepower_machines/machines/alloy_furnace.lua b/elepower_machines/machines/alloy_furnace.lua index 4ac7b82..98f2408 100644 --- a/elepower_machines/machines/alloy_furnace.lua +++ b/elepower_machines/machines/alloy_furnace.lua @@ -11,12 +11,12 @@ elepm.register_crafter("elepower_machines:alloy_furnace", { ele_active_node = true, tiles = { "elepower_machine_top.png", "elepower_machine_base.png", "elepower_machine_side.png", - "elepower_machine_side.png", "elepower_machine_side.png", "elepower_alloy_furnace.png", + "elepower_machine_side.png", "elepower_machine_side.png", "elepower_machine_side.png^elepower_alloy_furnace.png", }, ele_active_nodedef = { tiles = { "elepower_machine_top.png", "elepower_machine_base.png", "elepower_machine_side.png", - "elepower_machine_side.png", "elepower_machine_side.png", "elepower_alloy_furnace_active.png", + "elepower_machine_side.png", "elepower_machine_side.png", "elepower_machine_side.png^elepower_alloy_furnace_active.png", }, }, groups = {oddly_breakable_by_hand = 1} diff --git a/elepower_machines/machines/bucketer.lua b/elepower_machines/machines/bucketer.lua index 8828e14..795b738 100644 --- a/elepower_machines/machines/bucketer.lua +++ b/elepower_machines/machines/bucketer.lua @@ -159,7 +159,7 @@ ele.register_base_device("elepower_machines:bucketer", { end, tiles = { "elepower_machine_top.png", "elepower_machine_base.png", "elepower_machine_side.png", - "elepower_machine_side.png", "elepower_machine_side.png", "elepower_bucketer.png", + "elepower_machine_side.png", "elepower_machine_side.png", "elepower_machine_side.png^elepower_bucketer.png", }, on_receive_fields = get_fields, diff --git a/elepower_machines/machines/canning_machine.lua b/elepower_machines/machines/canning_machine.lua index 3b0fead..b1a146c 100644 --- a/elepower_machines/machines/canning_machine.lua +++ b/elepower_machines/machines/canning_machine.lua @@ -1,7 +1,7 @@ elepm.register_craft_type("can", { description = "Canning", - icon = "elepower_canning_machine.png", + icon = "elepower_machine_side.png^elepower_canning_machine.png", inputs = 2, }) @@ -10,7 +10,7 @@ elepm.register_crafter("elepower_machines:canning_machine", { craft_type = "can", tiles = { "elepower_machine_top.png", "elepower_machine_base.png", "elepower_machine_side.png", - "elepower_machine_side.png", "elepower_machine_side.png", "elepower_canning_machine.png", + "elepower_machine_side.png", "elepower_machine_side.png", "elepower_machine_side.png^elepower_canning_machine.png", }, groups = {ele_user = 1, oddly_breakable_by_hand = 1}, }) diff --git a/elepower_machines/machines/compressor.lua b/elepower_machines/machines/compressor.lua index f925691..3b76cbd 100644 --- a/elepower_machines/machines/compressor.lua +++ b/elepower_machines/machines/compressor.lua @@ -1,7 +1,7 @@ elepm.register_craft_type("compress", { description = "Compressing", - icon = "elepower_compressor.png", + icon = "elepower_machine_side.png^elepower_compressor.png", inputs = 1, }) @@ -11,7 +11,8 @@ elepm.register_crafter("elepower_machines:compressor", { ele_usage = 32, tiles = { "elepower_machine_top.png^elepower_power_port.png", "elepower_machine_base.png^elepower_power_port.png", - "elepower_compressor.png", "elepower_compressor.png", "elepower_compressor.png", "elepower_compressor.png", + "elepower_machine_side.png^elepower_compressor.png", "elepower_machine_side.png^elepower_compressor.png", + "elepower_machine_side.png^elepower_compressor.png", "elepower_machine_side.png^elepower_compressor.png", }, ele_no_automatic_ports = true, groups = {oddly_breakable_by_hand = 1} diff --git a/elepower_machines/machines/electrolyzer.lua b/elepower_machines/machines/electrolyzer.lua index 9b82656..383ef63 100644 --- a/elepower_machines/machines/electrolyzer.lua +++ b/elepower_machines/machines/electrolyzer.lua @@ -161,7 +161,7 @@ ele.register_machine("elepower_machines:electrolyzer", { description = "Electrolyzer", tiles = { "elepower_machine_top.png", "elepower_machine_base.png", "elepower_machine_side.png", - "elepower_machine_side.png", "elepower_machine_side.png", "elepower_electrolyzer.png", + "elepower_machine_side.png", "elepower_machine_side.png", "elepower_machine_side.png^elepower_electrolyzer.png", }, groups = {fluid_container = 1, cracky = 1, ele_user = 1}, on_timer = electrolyzer_timer, diff --git a/elepower_machines/machines/evaporator.lua b/elepower_machines/machines/evaporator.lua index 5673d48..51d1aa6 100644 --- a/elepower_machines/machines/evaporator.lua +++ b/elepower_machines/machines/evaporator.lua @@ -101,7 +101,7 @@ local function on_timer(pos, elapsed) end local animated = { - name = "elepower_machine_vaporidenser_animated.png", + name = "elepower_machine_base.png^elepower_machine_vaporidenser_animated.png", animation = { type = "vertical_frames", aspect_w = 16, @@ -132,7 +132,7 @@ ele.register_machine("elepower_machines:evaporator", { end, tiles = { "elepower_machine_top.png^elepower_power_port.png", "elepower_machine_base.png^elepower_power_port.png", - "elepower_machine_vaporidenser.png", + "elepower_machine_side.png^elepower_machine_vaporidenser.png", }, ele_active_node = true, ele_no_automatic_ports = true, diff --git a/elepower_machines/machines/fuel_burner.lua b/elepower_machines/machines/fuel_burner.lua index ba3111d..26338c4 100644 --- a/elepower_machines/machines/fuel_burner.lua +++ b/elepower_machines/machines/fuel_burner.lua @@ -4,13 +4,13 @@ ele.register_fluid_generator("elepower_machines:fuel_burner", { ele_usage = 8, tiles = { "elepower_machine_top.png", "elepower_machine_base.png", "elepower_machine_side.png", - "elepower_machine_side.png", "elepower_machine_side.png", "elepower_fuel_generator.png", + "elepower_machine_side.png", "elepower_machine_side.png", "elepower_machine_side.png^elepower_fuel_generator.png", }, ele_active_node = true, ele_active_nodedef = { tiles = { "elepower_machine_top.png", "elepower_machine_base.png", "elepower_machine_side.png", - "elepower_machine_side.png", "elepower_machine_side.png", "elepower_fuel_generator_active.png", + "elepower_machine_side.png", "elepower_machine_side.png", "elepower_machine_side.png^elepower_fuel_generator_active.png", }, }, fluid_buffers = { diff --git a/elepower_machines/machines/furnace.lua b/elepower_machines/machines/furnace.lua index ab5b528..e88ac50 100644 --- a/elepower_machines/machines/furnace.lua +++ b/elepower_machines/machines/furnace.lua @@ -10,12 +10,12 @@ elepm.register_crafter("elepower_machines:furnace", { ele_usage = 32, tiles = { "elepower_machine_top.png", "elepower_machine_base.png", "elepower_machine_side.png", - "elepower_machine_side.png", "elepower_machine_side.png", "elepower_furnace.png", + "elepower_machine_side.png", "elepower_machine_side.png", "elepower_machine_side.png^elepower_furnace.png", }, ele_active_nodedef = { tiles = { "elepower_machine_top.png", "elepower_machine_base.png", "elepower_machine_side.png", - "elepower_machine_side.png", "elepower_machine_side.png", "elepower_furnace_active.png", + "elepower_machine_side.png", "elepower_machine_side.png", "elepower_machine_side.png^elepower_furnace_active.png", }, }, groups = {oddly_breakable_by_hand = 1} diff --git a/elepower_machines/machines/generator.lua b/elepower_machines/machines/generator.lua index 1d4b74e..5c6c56d 100644 --- a/elepower_machines/machines/generator.lua +++ b/elepower_machines/machines/generator.lua @@ -10,12 +10,12 @@ elepm.register_fuel_generator("elepower_machines:generator", { ele_usage = 16, tiles = { "elepower_machine_top.png", "elepower_machine_base.png", "elepower_machine_side.png", - "elepower_machine_side.png", "elepower_machine_side.png", "elepower_generator.png", + "elepower_machine_side.png", "elepower_machine_side.png", "elepower_machine_side.png^elepower_generator.png", }, ele_active_nodedef = { tiles = { "elepower_machine_top.png", "elepower_machine_base.png", "elepower_machine_side.png", - "elepower_machine_side.png", "elepower_machine_side.png", "elepower_generator_active.png", + "elepower_machine_side.png", "elepower_machine_side.png", "elepower_machine_side.png^elepower_generator_active.png", } }, groups = {oddly_breakable_by_hand = 1} diff --git a/elepower_machines/machines/lava_cooler.lua b/elepower_machines/machines/lava_cooler.lua index e680291..ff0b366 100644 --- a/elepower_machines/machines/lava_cooler.lua +++ b/elepower_machines/machines/lava_cooler.lua @@ -140,7 +140,7 @@ ele.register_machine("elepower_machines:lava_cooler", { }, tiles = { "elepower_machine_top.png", "elepower_machine_base.png", "elepower_machine_side.png", - "elepower_machine_side.png", "elepower_machine_side.png", "elepower_lava_cooler.png", + "elepower_machine_side.png", "elepower_machine_side.png", "elepower_machine_side.png^elepower_lava_cooler.png", }, on_construct = function (pos) local meta = minetest.get_meta(pos) diff --git a/elepower_machines/machines/lava_generator.lua b/elepower_machines/machines/lava_generator.lua index 4fa55ea..3a5df6e 100644 --- a/elepower_machines/machines/lava_generator.lua +++ b/elepower_machines/machines/lava_generator.lua @@ -4,13 +4,13 @@ ele.register_fluid_generator("elepower_machines:lava_generator", { ele_usage = 64, tiles = { "elepower_machine_top.png", "elepower_machine_base.png", "elepower_machine_side.png", - "elepower_machine_side.png", "elepower_machine_side.png", "elepower_lava_generator.png", + "elepower_machine_side.png", "elepower_machine_side.png", "elepower_machine_side.png^elepower_lava_generator.png", }, ele_active_node = true, ele_active_nodedef = { tiles = { "elepower_machine_top.png", "elepower_machine_base.png", "elepower_machine_side.png", - "elepower_machine_side.png", "elepower_machine_side.png", "elepower_lava_generator_active.png", + "elepower_machine_side.png", "elepower_machine_side.png", "elepower_machine_side.png^elepower_lava_generator_active.png", }, }, fluid_buffers = { diff --git a/elepower_machines/machines/pulverizer.lua b/elepower_machines/machines/pulverizer.lua index b2d7cc3..cb27ae6 100644 --- a/elepower_machines/machines/pulverizer.lua +++ b/elepower_machines/machines/pulverizer.lua @@ -12,12 +12,12 @@ elepm.register_crafter("elepower_machines:pulverizer", { ele_usage = 32, tiles = { "elepower_machine_top.png", "elepower_machine_base.png", "elepower_machine_side.png", - "elepower_machine_side.png", "elepower_machine_side.png", "elepower_grinder.png", + "elepower_machine_side.png", "elepower_machine_side.png", "elepower_machine_side.png^elepower_grinder.png", }, ele_active_nodedef = { tiles = { "elepower_machine_top.png", "elepower_machine_base.png", "elepower_machine_side.png", - "elepower_machine_side.png", "elepower_machine_side.png", "elepower_grinder_active.png", + "elepower_machine_side.png", "elepower_machine_side.png", "elepower_machine_side.png^elepower_grinder_active.png", }, }, groups = {oddly_breakable_by_hand = 1} diff --git a/elepower_machines/machines/pump.lua b/elepower_machines/machines/pump.lua index 81c7527..cfb5ce9 100644 --- a/elepower_machines/machines/pump.lua +++ b/elepower_machines/machines/pump.lua @@ -211,8 +211,10 @@ end ele.register_machine("elepower_machines:pump", { description = "Pump", tiles = { - "elepower_machine_top.png^elepower_power_port.png", "elepower_pump_base.png", "elepower_pump_side.png", - "elepower_pump_side.png", "elepower_pump_side.png", "elepower_pump_side.png", + "elepower_machine_top.png^elepower_power_port.png", "elepower_machine_base.png^elepower_pump_base.png", + "elepower_machine_side.png^elepower_pump_side.png", + "elepower_machine_side.png^elepower_pump_side.png", "elepower_machine_side.png^elepower_pump_side.png", + "elepower_machine_side.png^elepower_pump_side.png", }, groups = { ele_machine = 1, diff --git a/elepower_machines/machines/sawmill.lua b/elepower_machines/machines/sawmill.lua index 78a29ea..0b0d249 100644 --- a/elepower_machines/machines/sawmill.lua +++ b/elepower_machines/machines/sawmill.lua @@ -3,7 +3,7 @@ elepm.register_craft_type("saw", { description = "Sawmilling", inputs = 1, gui_name = "elepower_saw", - icon = "elepower_sawmill.png", + icon = "elepower_machine_side.png^elepower_sawmill.png", }) elepm.register_crafter("elepower_machines:sawmill", { @@ -12,7 +12,7 @@ elepm.register_crafter("elepower_machines:sawmill", { ele_usage = 32, tiles = { "elepower_machine_top.png", "elepower_machine_base.png", "elepower_machine_side.png", - "elepower_machine_side.png", "elepower_machine_side.png", "elepower_sawmill.png", + "elepower_machine_side.png", "elepower_machine_side.png", "elepower_machine_side.png^elepower_sawmill.png", }, groups = {oddly_breakable_by_hand = 1} }) diff --git a/elepower_machines/machines/solderer.lua b/elepower_machines/machines/solderer.lua index 3530387..68b4991 100644 --- a/elepower_machines/machines/solderer.lua +++ b/elepower_machines/machines/solderer.lua @@ -2,7 +2,7 @@ elepm.register_craft_type("solder", { description = "Soldering", inputs = 3, - icon = "elepower_solderer.png", + icon = "elepower_machine_side.png^elepower_solderer.png", }) elepm.register_crafter("elepower_machines:solderer", { @@ -10,7 +10,7 @@ elepm.register_crafter("elepower_machines:solderer", { craft_type = "solder", tiles = { "elepower_machine_top.png", "elepower_machine_base.png", "elepower_machine_side.png", - "elepower_machine_side.png", "elepower_machine_side.png", "elepower_solderer.png", + "elepower_machine_side.png", "elepower_machine_side.png", "elepower_machine_side.png^elepower_solderer.png", }, groups = {oddly_breakable_by_hand = 1, cracky = 2}, ele_usage = 128, diff --git a/elepower_machines/machines/steam_turbine.lua b/elepower_machines/machines/steam_turbine.lua index b0d7740..d239cb5 100644 --- a/elepower_machines/machines/steam_turbine.lua +++ b/elepower_machines/machines/steam_turbine.lua @@ -18,13 +18,13 @@ ele.register_fluid_generator("elepower_machines:steam_turbine", { ele_output = 128, tiles = { "elepower_machine_top.png^elepower_power_port.png", "elepower_machine_base.png", "elepower_machine_side.png", - "elepower_machine_side.png", "elepower_turbine_side.png", "elepower_turbine_side.png", + "elepower_machine_side.png", "elepower_machine_side.png^elepower_turbine_side.png", "elepower_machine_side.png^elepower_turbine_side.png", }, ele_active_node = true, ele_active_nodedef = { tiles = { "elepower_machine_top.png^elepower_power_port.png", "elepower_machine_base.png", "elepower_machine_side.png", - "elepower_machine_side.png", "elepower_turbine_side.png", "elepower_turbine_side.png", + "elepower_machine_side.png", "elepower_machine_side.png^elepower_turbine_side.png", "elepower_machine_side.png^elepower_turbine_side.png", }, }, fluid_buffers = { diff --git a/elepower_machines/machines/storage.lua b/elepower_machines/machines/storage.lua index 6f60837..522691d 100644 --- a/elepower_machines/machines/storage.lua +++ b/elepower_machines/machines/storage.lua @@ -10,7 +10,7 @@ elepm.register_storage("elepower_machines:power_cell", { ele_output = 128, tiles = { "elepower_machine_top.png", "elepower_machine_base.png", "elepower_machine_side.png", - "elepower_machine_side.png", "elepower_machine_side.png", "elepower_power_cell.png", + "elepower_machine_side.png", "elepower_machine_side.png", "elepower_machine_side.png^elepower_power_cell.png", }, groups = {oddly_breakable_by_hand = 1} }) @@ -26,7 +26,7 @@ elepm.register_storage("elepower_machines:hardened_power_cell", { "elepower_machine_side.png^elepower_overlay_hardened.png", "elepower_machine_side.png^elepower_overlay_hardened.png", "elepower_machine_side.png^elepower_overlay_hardened.png", - "elepower_power_cell.png^elepower_overlay_hardened.png", + "elepower_machine_side.png^elepower_power_cell.png^elepower_overlay_hardened.png", }, groups = {oddly_breakable_by_hand = 1} }) @@ -42,7 +42,7 @@ elepm.register_storage("elepower_machines:reinforced_power_cell", { "elepower_machine_side.png^elepower_overlay_reinforced.png", "elepower_machine_side.png^elepower_overlay_reinforced.png", "elepower_machine_side.png^elepower_overlay_reinforced.png", - "elepower_power_cell.png^elepower_overlay_reinforced.png", + "elepower_machine_side.png^elepower_power_cell.png^elepower_overlay_reinforced.png", }, groups = {oddly_breakable_by_hand = 1} }) @@ -58,7 +58,7 @@ elepm.register_storage("elepower_machines:resonant_power_cell", { "elepower_machine_side.png^elepower_overlay_resonant.png", "elepower_machine_side.png^elepower_overlay_resonant.png", "elepower_machine_side.png^elepower_overlay_resonant.png", - "elepower_power_cell.png^elepower_overlay_resonant.png", + "elepower_machine_side.png^elepower_power_cell.png^elepower_overlay_resonant.png", }, groups = {oddly_breakable_by_hand = 1} }) @@ -74,7 +74,7 @@ elepm.register_storage("elepower_machines:super_power_cell", { "elepower_machine_side.png^elepower_overlay_super.png", "elepower_machine_side.png^elepower_overlay_super.png", "elepower_machine_side.png^elepower_overlay_super.png", - "elepower_power_cell.png^elepower_overlay_super.png", + "elepower_machine_side.png^elepower_power_cell.png^elepower_overlay_super.png", }, groups = {oddly_breakable_by_hand = 1} }) diff --git a/elepower_machines/machines/wind_turbine.lua b/elepower_machines/machines/wind_turbine.lua index 21bdb9b..863af20 100644 --- a/elepower_machines/machines/wind_turbine.lua +++ b/elepower_machines/machines/wind_turbine.lua @@ -121,7 +121,7 @@ ele.register_wind_generator("elepower_machines:wind_turbine", { description = "Wind Turbine\nRequires Wind Turbine Blades", tiles = { "elepower_machine_top.png", "elepower_machine_base.png", "elepower_machine_side.png", - "elepower_machine_side.png", "elepower_machine_side.png", "elepower_wind_turbine_face.png", + "elepower_machine_side.png", "elepower_machine_side.png", "elepower_machine_side.png^elepower_wind_turbine_face.png", }, ele_upgrades = { capacitor = {"capacity"}, diff --git a/elepower_machines/textures/elepower_active_cooler.png b/elepower_machines/textures/elepower_active_cooler.png index 30195a6..f289fae 100644 Binary files a/elepower_machines/textures/elepower_active_cooler.png and b/elepower_machines/textures/elepower_active_cooler.png differ diff --git a/elepower_machines/textures/elepower_alloy_furnace.png b/elepower_machines/textures/elepower_alloy_furnace.png index 86806ab..20d9a43 100644 Binary files a/elepower_machines/textures/elepower_alloy_furnace.png and b/elepower_machines/textures/elepower_alloy_furnace.png differ diff --git a/elepower_machines/textures/elepower_alloy_furnace_active.png b/elepower_machines/textures/elepower_alloy_furnace_active.png index a31e609..6bd25b2 100644 Binary files a/elepower_machines/textures/elepower_alloy_furnace_active.png and b/elepower_machines/textures/elepower_alloy_furnace_active.png differ diff --git a/elepower_machines/textures/elepower_bucketer.png b/elepower_machines/textures/elepower_bucketer.png index 426840f..5ec177e 100644 Binary files a/elepower_machines/textures/elepower_bucketer.png and b/elepower_machines/textures/elepower_bucketer.png differ diff --git a/elepower_machines/textures/elepower_canning_machine.png b/elepower_machines/textures/elepower_canning_machine.png index e9046c5..a52cf1b 100644 Binary files a/elepower_machines/textures/elepower_canning_machine.png and b/elepower_machines/textures/elepower_canning_machine.png differ diff --git a/elepower_machines/textures/elepower_compressor.png b/elepower_machines/textures/elepower_compressor.png index 33afaa3..73c16bc 100644 Binary files a/elepower_machines/textures/elepower_compressor.png and b/elepower_machines/textures/elepower_compressor.png differ diff --git a/elepower_machines/textures/elepower_electrolyzer.png b/elepower_machines/textures/elepower_electrolyzer.png index c0ee765..ca4a8d2 100644 Binary files a/elepower_machines/textures/elepower_electrolyzer.png and b/elepower_machines/textures/elepower_electrolyzer.png differ diff --git a/elepower_machines/textures/elepower_fuel_generator.png b/elepower_machines/textures/elepower_fuel_generator.png index c9b5a7e..a136bf5 100644 Binary files a/elepower_machines/textures/elepower_fuel_generator.png and b/elepower_machines/textures/elepower_fuel_generator.png differ diff --git a/elepower_machines/textures/elepower_fuel_generator_active.png b/elepower_machines/textures/elepower_fuel_generator_active.png index 163231f..548c230 100644 Binary files a/elepower_machines/textures/elepower_fuel_generator_active.png and b/elepower_machines/textures/elepower_fuel_generator_active.png differ diff --git a/elepower_machines/textures/elepower_furnace.png b/elepower_machines/textures/elepower_furnace.png index c044745..a7a2e25 100644 Binary files a/elepower_machines/textures/elepower_furnace.png and b/elepower_machines/textures/elepower_furnace.png differ diff --git a/elepower_machines/textures/elepower_furnace_active.png b/elepower_machines/textures/elepower_furnace_active.png index 261acb2..6cf9ff4 100644 Binary files a/elepower_machines/textures/elepower_furnace_active.png and b/elepower_machines/textures/elepower_furnace_active.png differ diff --git a/elepower_machines/textures/elepower_generator.png b/elepower_machines/textures/elepower_generator.png index 5b60009..2501a19 100644 Binary files a/elepower_machines/textures/elepower_generator.png and b/elepower_machines/textures/elepower_generator.png differ diff --git a/elepower_machines/textures/elepower_generator_active.png b/elepower_machines/textures/elepower_generator_active.png index 17dd88f..90f42c7 100644 Binary files a/elepower_machines/textures/elepower_generator_active.png and b/elepower_machines/textures/elepower_generator_active.png differ diff --git a/elepower_machines/textures/elepower_grinder.png b/elepower_machines/textures/elepower_grinder.png index eb1d435..efe90d3 100644 Binary files a/elepower_machines/textures/elepower_grinder.png and b/elepower_machines/textures/elepower_grinder.png differ diff --git a/elepower_machines/textures/elepower_grinder_active.png b/elepower_machines/textures/elepower_grinder_active.png index 1d15d83..c5be25e 100644 Binary files a/elepower_machines/textures/elepower_grinder_active.png and b/elepower_machines/textures/elepower_grinder_active.png differ diff --git a/elepower_machines/textures/elepower_lava_cooler.png b/elepower_machines/textures/elepower_lava_cooler.png index f5d5a16..a8a89c3 100644 Binary files a/elepower_machines/textures/elepower_lava_cooler.png and b/elepower_machines/textures/elepower_lava_cooler.png differ diff --git a/elepower_machines/textures/elepower_lava_generator.png b/elepower_machines/textures/elepower_lava_generator.png index 354ee9f..a8cba40 100644 Binary files a/elepower_machines/textures/elepower_lava_generator.png and b/elepower_machines/textures/elepower_lava_generator.png differ diff --git a/elepower_machines/textures/elepower_lava_generator_active.png b/elepower_machines/textures/elepower_lava_generator_active.png index 577737a..ba1e9fe 100644 Binary files a/elepower_machines/textures/elepower_lava_generator_active.png and b/elepower_machines/textures/elepower_lava_generator_active.png differ diff --git a/elepower_machines/textures/elepower_machine_accumulator.png b/elepower_machines/textures/elepower_machine_accumulator.png index dc19d2e..9dc1c9e 100644 Binary files a/elepower_machines/textures/elepower_machine_accumulator.png and b/elepower_machines/textures/elepower_machine_accumulator.png differ diff --git a/elepower_machines/textures/elepower_machine_base.png b/elepower_machines/textures/elepower_machine_base.png index ee2e32f..ee5609e 100644 Binary files a/elepower_machines/textures/elepower_machine_base.png and b/elepower_machines/textures/elepower_machine_base.png differ diff --git a/elepower_machines/textures/elepower_machine_side.png b/elepower_machines/textures/elepower_machine_side.png index 18372e7..80cf173 100644 Binary files a/elepower_machines/textures/elepower_machine_side.png and b/elepower_machines/textures/elepower_machine_side.png differ diff --git a/elepower_machines/textures/elepower_machine_top.png b/elepower_machines/textures/elepower_machine_top.png index ba67a12..c0632d3 100644 Binary files a/elepower_machines/textures/elepower_machine_top.png and b/elepower_machines/textures/elepower_machine_top.png differ diff --git a/elepower_machines/textures/elepower_machine_vaporidenser.png b/elepower_machines/textures/elepower_machine_vaporidenser.png index 1ae5276..230041e 100644 Binary files a/elepower_machines/textures/elepower_machine_vaporidenser.png and b/elepower_machines/textures/elepower_machine_vaporidenser.png differ diff --git a/elepower_machines/textures/elepower_machine_vaporidenser_animated.png b/elepower_machines/textures/elepower_machine_vaporidenser_animated.png index b624383..58e8b09 100644 Binary files a/elepower_machines/textures/elepower_machine_vaporidenser_animated.png and b/elepower_machines/textures/elepower_machine_vaporidenser_animated.png differ diff --git a/elepower_machines/textures/elepower_power_cell.png b/elepower_machines/textures/elepower_power_cell.png index ff6d74d..6712f7c 100644 Binary files a/elepower_machines/textures/elepower_power_cell.png and b/elepower_machines/textures/elepower_power_cell.png differ diff --git a/elepower_machines/textures/elepower_pump_base.png b/elepower_machines/textures/elepower_pump_base.png index d7e021a..e890316 100644 Binary files a/elepower_machines/textures/elepower_pump_base.png and b/elepower_machines/textures/elepower_pump_base.png differ diff --git a/elepower_machines/textures/elepower_pump_side.png b/elepower_machines/textures/elepower_pump_side.png index a33afe6..6619e75 100644 Binary files a/elepower_machines/textures/elepower_pump_side.png and b/elepower_machines/textures/elepower_pump_side.png differ diff --git a/elepower_machines/textures/elepower_sawmill.png b/elepower_machines/textures/elepower_sawmill.png index bfb17d3..f095c2a 100644 Binary files a/elepower_machines/textures/elepower_sawmill.png and b/elepower_machines/textures/elepower_sawmill.png differ diff --git a/elepower_machines/textures/elepower_solderer.png b/elepower_machines/textures/elepower_solderer.png index 8d08f75..fc3055f 100644 Binary files a/elepower_machines/textures/elepower_solderer.png and b/elepower_machines/textures/elepower_solderer.png differ diff --git a/elepower_machines/textures/elepower_turbine_side.png b/elepower_machines/textures/elepower_turbine_side.png index e794bdf..ac26c3f 100644 Binary files a/elepower_machines/textures/elepower_turbine_side.png and b/elepower_machines/textures/elepower_turbine_side.png differ diff --git a/elepower_machines/textures/elepower_wind_turbine_face.png b/elepower_machines/textures/elepower_wind_turbine_face.png index 50bbbc2..a0c29d8 100644 Binary files a/elepower_machines/textures/elepower_wind_turbine_face.png and b/elepower_machines/textures/elepower_wind_turbine_face.png differ diff --git a/elepower_mining/miner.lua b/elepower_mining/miner.lua index ac99a26..8d02fd1 100644 --- a/elepower_mining/miner.lua +++ b/elepower_mining/miner.lua @@ -265,8 +265,10 @@ minetest.register_node("elepower_mining:miner_core", { minetest.register_node("elepower_mining:miner_drill", { description = "Miner Drill\nMachine Component", tiles = { - "elepower_machine_top.png^elepower_power_port.png", "elepower_mining_apparatus_base.png", "elepower_mining_apparatus_side.png", - "elepower_mining_apparatus_side.png", "elepower_mining_apparatus_side.png", "elepower_mining_apparatus_side.png", + "elepower_machine_top.png^elepower_power_port.png", "elepower_mining_apparatus_base.png", + "elepower_machine_side.png^elepower_mining_apparatus_side.png", + "elepower_machine_side.png^elepower_mining_apparatus_side.png", + "elepower_machine_side.png^elepower_mining_apparatus_side.png", "elepower_machine_side.png^elepower_mining_apparatus_side.png", }, groups = {fluid_container = 1, oddly_breakable_by_hand = 1, cracky = 1}, after_dig_node = recalc_on_break, diff --git a/elepower_mining/textures/elepower_mining_apparatus_side.png b/elepower_mining/textures/elepower_mining_apparatus_side.png index e8f452a..d1328ce 100644 Binary files a/elepower_mining/textures/elepower_mining_apparatus_side.png and b/elepower_mining/textures/elepower_mining_apparatus_side.png differ diff --git a/elepower_papi/machine.lua b/elepower_papi/machine.lua index ed731df..68056b8 100644 --- a/elepower_papi/machine.lua +++ b/elepower_papi/machine.lua @@ -474,6 +474,8 @@ function ele.register_machine(nodename, nodedef) if nodedef.paramtype2 ~= 0 or not nodedef.paramtype2 then nodedef.paramtype2 = "facedir" + else + nodedef.paramtype2 = nil end -- Ensure machine group is used properly diff --git a/elepower_tools/ed_reconstructor.lua b/elepower_tools/ed_reconstructor.lua index 94a75f9..7918792 100644 --- a/elepower_tools/ed_reconstructor.lua +++ b/elepower_tools/ed_reconstructor.lua @@ -116,7 +116,7 @@ ele.register_machine("elepower_tools:ed_reconstructor", { description = "Energy Density Reconstructor\nRepairs tools using energy", tiles = { "elepower_machine_top.png", "elepower_machine_base.png", "elepower_machine_side.png", - "elepower_machine_side.png", "elepower_machine_side.png", "elepower_machine_ed_reconstructor.png", + "elepower_machine_side.png", "elepower_machine_side.png", "elepower_machine_side.png^elepower_machine_ed_reconstructor.png", }, groups = {cracky = 1, ele_user = 1}, on_timer = ed_timer, diff --git a/elepower_tools/textures/elepower_machine_ed_reconstructor.png b/elepower_tools/textures/elepower_machine_ed_reconstructor.png index 2528391..6fc839b 100644 Binary files a/elepower_tools/textures/elepower_machine_ed_reconstructor.png and b/elepower_tools/textures/elepower_machine_ed_reconstructor.png differ