From d25bb23e8e997ea598348ec19692a04d186bc9bb Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Fri, 1 Jul 2016 15:40:46 +0100 Subject: [PATCH] Revert a shit load of stuff --- README.md | 4 +- build.gradle | 8 +- run/resourcepacks/unity/assets/TechReborn.xcf | Bin 102805 -> 104418 bytes .../unity/assets/lazurite_ctm.xcf | Bin 0 -> 21133 bytes .../blockstates/machines/centrifuge.json | 63 -------- .../machines/energy/ev_storage.json | 14 ++ .../energy/ev_storage_transmitter.json | 14 ++ .../machines/energy/ev_transformer.json | 14 ++ .../machines/energy/hv_storage.json | 14 ++ .../machines/energy/hv_transformer.json | 14 ++ .../machines/energy/lv_storage.json | 14 ++ .../machines/energy/lv_transformer.json | 14 ++ .../machines/energy/mv_storage.json | 14 ++ .../machines/energy/mv_transformer.json | 14 ++ .../generators/dragon_egg_syphon.json | 55 +++++++ .../machines/generators/gas_turbine.json | 57 +++++++ .../generators/magic_energy_absorber.json | 57 +++++++ .../generators/magic_energy_converter.json | 57 +++++++ .../generators/semi_fluid_generator.json | 57 +++++++ .../machines/generators/solar_panel.json | 57 +++++++ .../generators/thermal_generator.json | 57 +++++++ .../machines/storage/machine_blocks.json | 28 ++++ .../tier0_machines/alloy_furnace.json | 57 +++++++ .../machines/tier0_machines/furnace.json | 57 +++++++ .../tier1_machines/assembly_machine.json | 56 +++++++ .../tier1_machines/chemical_reactor.json | 56 +++++++ .../machines/tier1_machines/compressor.json | 57 +++++++ .../electric_alloy_smelter.json | 57 +++++++ .../machines/tier1_machines/extractor.json | 57 +++++++ .../machines/tier1_machines/grinder.json | 59 +++++++ .../industrial_electrolyzer.json | 56 +++++++ .../machines/tier1_machines/recycler.json | 57 +++++++ .../tier1_machines/rolling_machine.json | 56 +++++++ .../tier1_machines/scrapboxinator.json | 56 +++++++ .../machines/tier2_machines/centrifuge.json | 63 ++++++++ .../tier2_machines/computer_cube.json | 14 ++ .../tier2_machines/digital_chest.json | 13 ++ .../tier2_machines/distillation_tower.json | 61 +++++++ .../tier2_machines/implosion_compressor.json | 65 ++++++++ .../industrial_blast_furnace.json | 65 ++++++++ .../tier2_machines/industrial_centrifuge.json | 63 ++++++++ .../tier2_machines/industrial_grinder.json | 63 ++++++++ .../tier2_machines/industrial_saw_mill.json | 61 +++++++ .../tier2_machines/vacuum_freezer.json | 59 +++++++ .../industrial_chunk_loader.json | 13 ++ .../tier3_machines/quantum_chest.json | 13 ++ .../machines/tier3_machines/quantum_tank.json | 13 ++ .../assets/techreborn/blockstates/nuke.json | 14 ++ .../tier0_machines/alloy_furnace.json | 57 ------- .../blockstates/tier0_machines/furnace.json | 57 ------- .../tier1_machines/alloy_smelter.json | 57 ------- .../tier1_machines/assembly_machine.json | 56 ------- .../tier1_machines/chemical_reactor.json | 56 ------- .../tier1_machines/compressor.json | 57 ------- .../blockstates/tier1_machines/extractor.json | 57 ------- .../blockstates/tier1_machines/grinder.json | 59 ------- .../industrial_electrolyzer.json | 56 ------- .../blockstates/tier1_machines/recycler.json | 57 ------- .../tier1_machines/rolling_machine.json | 56 ------- .../tier1_machines/scrapboxinator.json | 56 ------- .../tier1_machines/vacuum_freezer.json | 59 ------- .../tier2_machines/distillation_tower.json | 61 ------- .../tier2_machines/implosion_compressor.json | 65 -------- .../industrial_blast_furnace.json | 65 -------- .../tier2_machines/industrial_centrifuge.json | 63 -------- .../tier2_machines/industrial_grinder.json | 63 -------- .../tier2_machines/industrial_saw_mill.json | 61 ------- .../models/block/template/cube_wrapped.json | 19 +++ .../textures/blocks/cables/gold_cable.png | Bin 551 -> 417 bytes .../textures/blocks/cables/tin_cable.png | Bin 444 -> 347 bytes .../generators/generator_front_off.png | Bin 694 -> 0 bytes .../machine/generators/generator_front_on.png | Bin 708 -> 0 bytes .../generators/thermal_generator_side_off.png | Bin 645 -> 0 bytes .../generators/thermal_generator_side_on.png | Bin 2819 -> 0 bytes .../tier1_machines/tier1_machine_side.png | Bin 630 -> 0 bytes .../blocks/machines/energy/ev_multi_front.png | Bin 0 -> 666 bytes .../machines/energy/ev_multi_front_ctm.png | Bin 0 -> 2215 bytes .../blocks/machines/energy/ev_multi_side.png | Bin 0 -> 582 bytes .../machines/energy/ev_multi_side_ctm.png | Bin 0 -> 2059 bytes .../energy/ev_storage_adjust_front.png | Bin 0 -> 950 bytes .../energy/ev_storage_adjust_side.png | Bin 0 -> 927 bytes .../energy/ev_storage_transmitter_front.png | Bin 0 -> 982 bytes .../energy/ev_storage_transmitter_side.png | Bin 0 -> 973 bytes .../machines/energy/ev_transformer_front.png | Bin 0 -> 902 bytes .../machines/energy/ev_transformer_side.png | Bin 0 -> 947 bytes .../machines/energy/hv_storage_front.png | Bin 0 -> 861 bytes .../machines/energy/hv_storage_side.png | Bin 0 -> 828 bytes .../machines/energy/hv_transformer_front.png | Bin 0 -> 819 bytes .../machines/energy/hv_transformer_side.png | Bin 0 -> 855 bytes .../machines/energy/lv_storage_front.png | Bin 0 -> 707 bytes .../machines/energy/lv_storage_side.png | Bin 0 -> 692 bytes .../machines/energy/lv_transformer_front.png | Bin 0 -> 686 bytes .../machines/energy/lv_transformer_side.png | Bin 0 -> 700 bytes .../machines/energy/mv_storage_front.png | Bin 0 -> 795 bytes .../machines/energy/mv_storage_side.png | Bin 0 -> 741 bytes .../machines/energy/mv_transformer_front.png | Bin 0 -> 800 bytes .../machines/energy/mv_transformer_side.png | Bin 0 -> 808 bytes .../generators/dragon_egg_syphon_side_off.png | Bin 0 -> 767 bytes .../generators/dragon_egg_syphon_side_on.png | Bin 0 -> 811 bytes .../generators/dragon_egg_syphon_top.png | Bin 0 -> 560 bytes .../generators/gas_turbine_top_off.png | Bin 0 -> 801 bytes .../generators/gas_turbine_top_on.mcmeta | 5 + .../generators/gas_turbine_top_on.png | Bin 0 -> 3868 bytes .../generators/gas_turbine_top_on.png.mcmeta | 6 + .../generators/generator_bottom.png} | Bin .../generators/generator_front_off.png | Bin 0 -> 688 bytes .../generators/generator_front_on.png | Bin 0 -> 702 bytes .../generators/generator_side.png} | Bin .../generators/generator_top.png} | Bin .../generators/lightning_rod_side.png | Bin 0 -> 806 bytes .../machines/generators/lightning_rod_top.png | Bin 0 -> 818 bytes .../magic_energy_absorber_side_off.png | Bin 0 -> 829 bytes .../magic_energy_absorber_side_on.png | Bin 0 -> 896 bytes .../magic_energy_absorber_top_off.png | Bin 0 -> 799 bytes .../magic_energy_absorber_top_on.png | Bin 0 -> 791 bytes .../magic_energy_converter_side_off.png | Bin 0 -> 728 bytes .../magic_energy_converter_side_on.png | Bin 0 -> 742 bytes .../magic_energy_converter_top_off.png | Bin 0 -> 722 bytes .../magic_energy_converter_top_on.png | Bin 0 -> 680 bytes .../generators/plasmagenerator_bottom.png | Bin 0 -> 606 bytes .../generators/plasmagenerator_side_off.png | Bin 0 -> 691 bytes .../generators/plasmagenerator_side_on.png | Bin 0 -> 734 bytes .../generators/plasmagenerator_top_off.png | Bin 0 -> 737 bytes .../generators/plasmagenerator_top_on.png | Bin 0 -> 4266 bytes .../plasmagenerator_top_on.png.mcmeta} | 0 .../semi_fluid_generator_side_off.png | Bin 0 -> 775 bytes .../semi_fluid_generator_top_off.png | Bin 0 -> 842 bytes .../generators/solar_panel_side_off.png | Bin 0 -> 638 bytes .../generators/solar_panel_side_on.png | Bin 0 -> 674 bytes .../machines/generators/solar_panel_top.png | Bin 0 -> 813 bytes .../generators/thermal_generator_side_off.png | Bin 0 -> 632 bytes .../generators/thermal_generator_side_on.png | Bin 0 -> 2820 bytes .../thermal_generator_side_on.png.mcmeta | 5 + .../generators/thermal_generator_top_off.png | Bin .../generators/thermal_generator_top_on.png | Bin .../thermal_generator_top_on.png.mcmeta | 0 .../watermill_generator_side_off.png | Bin 0 -> 712 bytes .../generators/wind_mill_front_off.png | Bin 0 -> 795 bytes .../generators/wind_mill_front_on.png | Bin 0 -> 2437 bytes .../generators/wind_mill_front_on.png.mcmeta | 6 + .../machines/generators/wind_mill_left.png | Bin 0 -> 751 bytes .../machines/generators/wind_mill_right.png | Bin 0 -> 751 bytes .../structure}/casingadvanced.png | Bin .../structure}/casingadvanced_edge.png | Bin .../structure}/casingadvanced_full.png | Bin .../structure}/casingreinforced.png | Bin .../structure}/casingreinforced_edge.png | Bin .../structure}/casingreinforced_full.png | Bin .../structure}/casingstandard.png | Bin .../structure}/casingstandard_edge.png | Bin .../structure}/casingstandard_full.png | Bin .../structure/tier1_machine_block.png} | Bin .../structure/tier2_machine_block.png} | Bin .../structure/tier3_machine_block.png} | Bin .../alloy_furnace_front_off.png | Bin .../tier0_machines/alloy_furnace_front_on.png | Bin .../alloy_furnace_front_on.png.mcmeta | 0 .../tier0_machines/furnace_front_off.png | Bin .../tier0_machines/furnace_front_on.png | Bin .../furnace_front_on.png.mcmeta | 0 .../tier0_machines/machine_bottom.png | Bin .../tier0_machines/machine_side.png | Bin .../tier0_machines/machine_top.png | Bin .../assembling_machine_front_off.png | Bin .../assembling_machine_front_on.png | Bin .../assembling_machine_front_on.png.mcmeta | 0 .../chemical_reactor_front_off.png} | Bin .../chemical_reactor_front_on.png} | Bin .../chemical_reactor_front_on.png.mcmeta} | 0 .../tier1_machines/compressor_front_off.png | Bin .../tier1_machines/compressor_front_on.png | Bin .../compressor_front_on.png.mcmeta | 0 .../electric_alloy_smelter_front_off.png} | Bin .../electric_alloy_smelter_front_on.png} | Bin .../electric_crafting_table_side.png | Bin .../electric_crafting_table_top.png | Bin .../electric_furnace_front_off.png | Bin .../electric_furnace_front_on.png | Bin .../tier1_machines/extractor_front_off.png | Bin .../tier1_machines/extractor_front_on.png | Bin .../extractor_front_on.png.mcmeta | 0 .../tier1_machines/grinder_front_off.png | Bin .../tier1_machines/grinder_front_on.png | Bin .../grinder_front_on.png.mcmeta | 0 .../tier1_machines/grinder_top_off.png | Bin .../tier1_machines/grinder_top_on.png | Bin .../tier1_machines/grinder_top_on.png.mcmeta | 0 .../industrial_electrolyzer_front_off.png | Bin .../industrial_electrolyzer_front_on.png | Bin ...ndustrial_electrolyzer_front_on.png.mcmeta | 0 .../tier1_machines/machine_bottom.png | Bin .../tier1_machines/machine_side.png | Bin .../tier1_machines/machine_top.png | Bin .../tier1_machines/player_detector_all.png | Bin .../tier1_machines/player_detector_others.png | Bin .../tier1_machines/player_detector_you.png | Bin .../tier1_machines/recycler_front_off.png | Bin .../tier1_machines/recycler_front_on.png | Bin .../recycler_front_on.png.mcmeta | 0 .../rolling_machine_front_off.png} | Bin .../rolling_machine_front_on.png} | Bin .../rolling_machine_front_on.png.mcmeta} | 0 .../scrapboxinator_front_off.png | Bin .../scrapboxinator_front_on.png | Bin .../scrapboxinator_front_on.png.mcmeta | 0 .../tier2_machines/computer_cube_front.png | Bin 0 -> 808 bytes .../tier2_machines/computer_cube_side.png | Bin 0 -> 592 bytes .../tier2_machines/digital_chest_side.png | Bin 0 -> 713 bytes .../tier2_machines/digital_chest_top.png | Bin 0 -> 805 bytes .../distillation_tower_front_off.png | Bin .../distillation_tower_front_on.png | Bin .../distillation_tower_front_on.png.mcmeta | 0 .../implosion_compressor_east_off.png | Bin .../implosion_compressor_east_on.png | Bin .../implosion_compressor_east_on.png.mcmeta | 0 .../implosion_compressor_front_off.png | Bin .../implosion_compressor_front_on.png | Bin .../implosion_compressor_front_on.png.mcmeta | 0 .../implosion_compressor_west_off.png | Bin .../implosion_compressor_west_on.png | Bin .../implosion_compressor_west_on.png.mcmeta | 0 .../industrial_blast_furnace_east_off.png | Bin .../industrial_blast_furnace_east_on.png | Bin ...ndustrial_blast_furnace_east_on.png.mcmeta | 0 .../industrial_blast_furnace_front_off.png | Bin .../industrial_blast_furnace_front_on.png | Bin ...dustrial_blast_furnace_front_on.png.mcmeta | 0 .../industrial_blast_furnace_west_off.png | Bin .../industrial_blast_furnace_west_on.png | Bin ...ndustrial_blast_furnace_west_on.png.mcmeta | 0 .../industrial_centrifuge_front_off.png | Bin .../industrial_centrifuge_front_on.png | Bin .../industrial_centrifuge_front_on.png.mcmeta | 0 .../industrial_centrifuge_top_off.png | Bin .../industrial_centrifuge_top_on.png | Bin .../industrial_centrifuge_top_on.png.mcmeta | 0 .../industrial_grinder_front_off.png | Bin .../industrial_grinder_front_on.png | Bin .../industrial_grinder_front_on.png.mcmeta | 0 .../industrial_grinder_top_off.png | Bin .../industrial_grinder_top_on.png | Bin .../industrial_grinder_top_on.png.mcmeta | 0 .../industrial_sawmill_front_off.png | Bin .../industrial_sawmill_front_on.png | Bin .../industrial_sawmill_front_on.png.mcmeta | 0 .../tier2_machines/machine_back.png | Bin .../tier2_machines/machine_bottom.png | Bin .../tier2_machines/machine_east.png | Bin .../tier2_machines/machine_top.png | Bin .../tier2_machines/machine_west.png | Bin .../vacuum_freezer_front_off.png | Bin .../vacuum_freezer_front_on.png | Bin .../vacuum_freezer_front_on.png.mcmeta | 0 .../vacuum_freezer_top_off.png | Bin .../tier2_machines}/vacuum_freezer_top_on.png | Bin .../vacuum_freezer_top_on.png.mcmeta | 0 .../industrial_chunkloader_side.png | Bin 0 -> 759 bytes .../industrial_chunkloader_top.png | Bin 0 -> 829 bytes .../machines/tier3_machines/machine_back.png | Bin 0 -> 707 bytes .../tier3_machines/machine_bottom.png | Bin 0 -> 561 bytes .../machines/tier3_machines/machine_east.png | Bin 0 -> 750 bytes .../machines/tier3_machines/machine_top.png | Bin 0 -> 633 bytes .../machines/tier3_machines/machine_west.png | Bin 0 -> 745 bytes .../tier3_machines/quantum_chest_bottom.png | Bin 0 -> 554 bytes .../tier3_machines/quantum_chest_side.png | Bin 0 -> 824 bytes .../tier3_machines/quantum_chest_top.png | Bin 0 -> 846 bytes .../techreborn/textures/blocks/nuke_front.png | Bin 0 -> 809 bytes .../techreborn/textures/blocks/nuke_side.png | Bin 0 -> 781 bytes .../techreborn/textures/blocks/nuke_top.png | Bin 0 -> 805 bytes .../items/ingot/advancedAlloyIngot.png | Bin 663 -> 0 bytes ...nicEnergyOrb.png => lapotronEnergyOrb.png} | Bin .../items/tool/lapotronEnergyOrbEmpty.png | Bin 0 -> 484 bytes .../textures/items/tool/nanosaber_on.png | Bin 902 -> 922 bytes .../items/tool/nanosaber_on.png.mcmeta | 10 +- .../techreborn/textures/unused/plasma.png | Bin 0 -> 13799 bytes .../techreborn/blocks/BlockDigitalChest.java | 26 +-- .../techreborn/blocks/BlockDistributor.java | 1 + src/main/java/techreborn/blocks/BlockOre.java | 24 +-- .../java/techreborn/blocks/BlockOre2.java | 24 +-- .../techreborn/blocks/BlockQuantumChest.java | 26 +-- .../techreborn/blocks/BlockQuantumTank.java | 26 +-- .../java/techreborn/blocks/BlockStorage.java | 37 ++--- .../java/techreborn/blocks/BlockStorage2.java | 37 ++--- .../blocks/generator/BlockHeatGenerator.java | 53 ------- .../techreborn/client/RegisterItemJsons.java | 1 + .../AlloySmelterRecipeHandler.java | 6 + .../AssemblingMachineRecipeHandler.java | 6 + .../BlastFurnaceRecipeHandler.java | 6 + .../centrifuge/CentrifugeRecipeHandler.java | 6 + .../ChemicalReactorRecipeHandler.java | 6 + .../compressor/CompressorRecipeHandler.java | 6 + .../jei/extractor/ExtractorRecipeHandler.java | 6 + .../FusionReactorRecipeHandler.java | 6 + .../jei/grinder/GrinderRecipeHandler.java | 6 + .../ImplosionCompressorRecipeHandler.java | 6 + .../IndustrialElectrolyzerRecipeHandler.java | 6 + .../IndustrialGrinderRecipeHandler.java | 6 + .../IndustrialSawmillRecipeHandler.java | 6 + .../RollingMachineRecipeHandler.java | 6 + .../jei/scrapbox/ScrapboxRecipeHandler.java | 6 + .../VacuumFreezerRecipeHandler.java | 8 +- .../techreborn/config/ConfigTechReborn.java | 5 - .../dispenser/BehaviorDispenseScrapbox.java | 5 +- src/main/java/techreborn/init/ModBlocks.java | 149 ++++++++++++++---- src/main/java/techreborn/init/ModItems.java | 9 +- src/main/java/techreborn/init/ModRecipes.java | 3 - .../items/ItemFrequencyTransmitter.java | 2 +- .../techreborn/items/ItemLapotronicOrb.java | 65 -------- .../items/battery/ItemLapotronOrb.java | 10 ++ .../java/techreborn/manual/GuiManual.java | 2 - .../manual/pages/GeneratingPowerPage.java | 5 - .../techreborn/parts/TechRebornParts.java | 16 +- .../parts/fluidPipes/MultipartFluidPipe.java | 2 +- .../java/techreborn/power/TRPowerNet.java | 10 +- .../java/techreborn/proxies/ClientProxy.java | 36 ++++- .../java/techreborn/proxies/CommonProxy.java | 15 +- .../tiles/generator/TileHeatGenerator.java | 135 ---------------- .../tiles/generator/TileThermalGenerator.java | 21 +-- .../techreborn/blockstates/storage/ores.json | 93 +++++++++++ .../blockstates/storage/storage.json | 138 ++++++++++++++++ .../techreborn/models/item/lapotronOrb.json | 14 ++ .../models/item/lapotronOrbEmpty.json | 6 + .../blocks/storage/digital_chest_side.png | Bin 0 -> 699 bytes .../textures/gui/compressorTest.png | Bin 9940 -> 0 bytes .../techreborn/textures/gui/guiSheet.png | Bin 0 -> 15032 bytes ...apotronicEnergyOrb.png => lapotronOrb.png} | Bin .../textures/items/tool/lapotronOrbEmpty.png | Bin 0 -> 215 bytes 327 files changed, 2470 insertions(+), 1680 deletions(-) create mode 100644 run/resourcepacks/unity/assets/lazurite_ctm.xcf delete mode 100644 run/resourcepacks/unity/assets/techreborn/blockstates/machines/centrifuge.json create mode 100644 run/resourcepacks/unity/assets/techreborn/blockstates/machines/energy/ev_storage.json create mode 100644 run/resourcepacks/unity/assets/techreborn/blockstates/machines/energy/ev_storage_transmitter.json create mode 100644 run/resourcepacks/unity/assets/techreborn/blockstates/machines/energy/ev_transformer.json create mode 100644 run/resourcepacks/unity/assets/techreborn/blockstates/machines/energy/hv_storage.json create mode 100644 run/resourcepacks/unity/assets/techreborn/blockstates/machines/energy/hv_transformer.json create mode 100644 run/resourcepacks/unity/assets/techreborn/blockstates/machines/energy/lv_storage.json create mode 100644 run/resourcepacks/unity/assets/techreborn/blockstates/machines/energy/lv_transformer.json create mode 100644 run/resourcepacks/unity/assets/techreborn/blockstates/machines/energy/mv_storage.json create mode 100644 run/resourcepacks/unity/assets/techreborn/blockstates/machines/energy/mv_transformer.json create mode 100644 run/resourcepacks/unity/assets/techreborn/blockstates/machines/generators/dragon_egg_syphon.json create mode 100644 run/resourcepacks/unity/assets/techreborn/blockstates/machines/generators/gas_turbine.json create mode 100644 run/resourcepacks/unity/assets/techreborn/blockstates/machines/generators/magic_energy_absorber.json create mode 100644 run/resourcepacks/unity/assets/techreborn/blockstates/machines/generators/magic_energy_converter.json create mode 100644 run/resourcepacks/unity/assets/techreborn/blockstates/machines/generators/semi_fluid_generator.json create mode 100644 run/resourcepacks/unity/assets/techreborn/blockstates/machines/generators/solar_panel.json create mode 100644 run/resourcepacks/unity/assets/techreborn/blockstates/machines/generators/thermal_generator.json create mode 100644 run/resourcepacks/unity/assets/techreborn/blockstates/machines/storage/machine_blocks.json create mode 100644 run/resourcepacks/unity/assets/techreborn/blockstates/machines/tier0_machines/alloy_furnace.json create mode 100644 run/resourcepacks/unity/assets/techreborn/blockstates/machines/tier0_machines/furnace.json create mode 100644 run/resourcepacks/unity/assets/techreborn/blockstates/machines/tier1_machines/assembly_machine.json create mode 100644 run/resourcepacks/unity/assets/techreborn/blockstates/machines/tier1_machines/chemical_reactor.json create mode 100644 run/resourcepacks/unity/assets/techreborn/blockstates/machines/tier1_machines/compressor.json create mode 100644 run/resourcepacks/unity/assets/techreborn/blockstates/machines/tier1_machines/electric_alloy_smelter.json create mode 100644 run/resourcepacks/unity/assets/techreborn/blockstates/machines/tier1_machines/extractor.json create mode 100644 run/resourcepacks/unity/assets/techreborn/blockstates/machines/tier1_machines/grinder.json create mode 100644 run/resourcepacks/unity/assets/techreborn/blockstates/machines/tier1_machines/industrial_electrolyzer.json create mode 100644 run/resourcepacks/unity/assets/techreborn/blockstates/machines/tier1_machines/recycler.json create mode 100644 run/resourcepacks/unity/assets/techreborn/blockstates/machines/tier1_machines/rolling_machine.json create mode 100644 run/resourcepacks/unity/assets/techreborn/blockstates/machines/tier1_machines/scrapboxinator.json create mode 100644 run/resourcepacks/unity/assets/techreborn/blockstates/machines/tier2_machines/centrifuge.json create mode 100644 run/resourcepacks/unity/assets/techreborn/blockstates/machines/tier2_machines/computer_cube.json create mode 100644 run/resourcepacks/unity/assets/techreborn/blockstates/machines/tier2_machines/digital_chest.json create mode 100644 run/resourcepacks/unity/assets/techreborn/blockstates/machines/tier2_machines/distillation_tower.json create mode 100644 run/resourcepacks/unity/assets/techreborn/blockstates/machines/tier2_machines/implosion_compressor.json create mode 100644 run/resourcepacks/unity/assets/techreborn/blockstates/machines/tier2_machines/industrial_blast_furnace.json create mode 100644 run/resourcepacks/unity/assets/techreborn/blockstates/machines/tier2_machines/industrial_centrifuge.json create mode 100644 run/resourcepacks/unity/assets/techreborn/blockstates/machines/tier2_machines/industrial_grinder.json create mode 100644 run/resourcepacks/unity/assets/techreborn/blockstates/machines/tier2_machines/industrial_saw_mill.json create mode 100644 run/resourcepacks/unity/assets/techreborn/blockstates/machines/tier2_machines/vacuum_freezer.json create mode 100644 run/resourcepacks/unity/assets/techreborn/blockstates/machines/tier3_machines/industrial_chunk_loader.json create mode 100644 run/resourcepacks/unity/assets/techreborn/blockstates/machines/tier3_machines/quantum_chest.json create mode 100644 run/resourcepacks/unity/assets/techreborn/blockstates/machines/tier3_machines/quantum_tank.json create mode 100644 run/resourcepacks/unity/assets/techreborn/blockstates/nuke.json delete mode 100644 run/resourcepacks/unity/assets/techreborn/blockstates/tier0_machines/alloy_furnace.json delete mode 100644 run/resourcepacks/unity/assets/techreborn/blockstates/tier0_machines/furnace.json delete mode 100644 run/resourcepacks/unity/assets/techreborn/blockstates/tier1_machines/alloy_smelter.json delete mode 100644 run/resourcepacks/unity/assets/techreborn/blockstates/tier1_machines/assembly_machine.json delete mode 100644 run/resourcepacks/unity/assets/techreborn/blockstates/tier1_machines/chemical_reactor.json delete mode 100644 run/resourcepacks/unity/assets/techreborn/blockstates/tier1_machines/compressor.json delete mode 100644 run/resourcepacks/unity/assets/techreborn/blockstates/tier1_machines/extractor.json delete mode 100644 run/resourcepacks/unity/assets/techreborn/blockstates/tier1_machines/grinder.json delete mode 100644 run/resourcepacks/unity/assets/techreborn/blockstates/tier1_machines/industrial_electrolyzer.json delete mode 100644 run/resourcepacks/unity/assets/techreborn/blockstates/tier1_machines/recycler.json delete mode 100644 run/resourcepacks/unity/assets/techreborn/blockstates/tier1_machines/rolling_machine.json delete mode 100644 run/resourcepacks/unity/assets/techreborn/blockstates/tier1_machines/scrapboxinator.json delete mode 100644 run/resourcepacks/unity/assets/techreborn/blockstates/tier1_machines/vacuum_freezer.json delete mode 100644 run/resourcepacks/unity/assets/techreborn/blockstates/tier2_machines/distillation_tower.json delete mode 100644 run/resourcepacks/unity/assets/techreborn/blockstates/tier2_machines/implosion_compressor.json delete mode 100644 run/resourcepacks/unity/assets/techreborn/blockstates/tier2_machines/industrial_blast_furnace.json delete mode 100644 run/resourcepacks/unity/assets/techreborn/blockstates/tier2_machines/industrial_centrifuge.json delete mode 100644 run/resourcepacks/unity/assets/techreborn/blockstates/tier2_machines/industrial_grinder.json delete mode 100644 run/resourcepacks/unity/assets/techreborn/blockstates/tier2_machines/industrial_saw_mill.json create mode 100644 run/resourcepacks/unity/assets/techreborn/models/block/template/cube_wrapped.json delete mode 100644 run/resourcepacks/unity/assets/techreborn/textures/blocks/machine/generators/generator_front_off.png delete mode 100644 run/resourcepacks/unity/assets/techreborn/textures/blocks/machine/generators/generator_front_on.png delete mode 100644 run/resourcepacks/unity/assets/techreborn/textures/blocks/machine/generators/thermal_generator_side_off.png delete mode 100644 run/resourcepacks/unity/assets/techreborn/textures/blocks/machine/generators/thermal_generator_side_on.png delete mode 100644 run/resourcepacks/unity/assets/techreborn/textures/blocks/machine/tier1_machines/tier1_machine_side.png create mode 100644 run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/energy/ev_multi_front.png create mode 100644 run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/energy/ev_multi_front_ctm.png create mode 100644 run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/energy/ev_multi_side.png create mode 100644 run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/energy/ev_multi_side_ctm.png create mode 100644 run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/energy/ev_storage_adjust_front.png create mode 100644 run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/energy/ev_storage_adjust_side.png create mode 100644 run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/energy/ev_storage_transmitter_front.png create mode 100644 run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/energy/ev_storage_transmitter_side.png create mode 100644 run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/energy/ev_transformer_front.png create mode 100644 run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/energy/ev_transformer_side.png create mode 100644 run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/energy/hv_storage_front.png create mode 100644 run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/energy/hv_storage_side.png create mode 100644 run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/energy/hv_transformer_front.png create mode 100644 run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/energy/hv_transformer_side.png create mode 100644 run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/energy/lv_storage_front.png create mode 100644 run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/energy/lv_storage_side.png create mode 100644 run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/energy/lv_transformer_front.png create mode 100644 run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/energy/lv_transformer_side.png create mode 100644 run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/energy/mv_storage_front.png create mode 100644 run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/energy/mv_storage_side.png create mode 100644 run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/energy/mv_transformer_front.png create mode 100644 run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/energy/mv_transformer_side.png create mode 100644 run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/generators/dragon_egg_syphon_side_off.png create mode 100644 run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/generators/dragon_egg_syphon_side_on.png create mode 100644 run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/generators/dragon_egg_syphon_top.png create mode 100644 run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/generators/gas_turbine_top_off.png create mode 100644 run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/generators/gas_turbine_top_on.mcmeta create mode 100644 run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/generators/gas_turbine_top_on.png create mode 100644 run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/generators/gas_turbine_top_on.png.mcmeta rename run/resourcepacks/unity/assets/techreborn/textures/blocks/{machine/generators/generator_machine_bottom.png => machines/generators/generator_bottom.png} (100%) create mode 100644 run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/generators/generator_front_off.png create mode 100644 run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/generators/generator_front_on.png rename run/resourcepacks/unity/assets/techreborn/textures/blocks/{machine/generators/generator_machine_side.png => machines/generators/generator_side.png} (100%) rename run/resourcepacks/unity/assets/techreborn/textures/blocks/{machine/generators/generator_machine_top.png => machines/generators/generator_top.png} (100%) create mode 100644 run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/generators/lightning_rod_side.png create mode 100644 run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/generators/lightning_rod_top.png create mode 100644 run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/generators/magic_energy_absorber_side_off.png create mode 100644 run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/generators/magic_energy_absorber_side_on.png create mode 100644 run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/generators/magic_energy_absorber_top_off.png create mode 100644 run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/generators/magic_energy_absorber_top_on.png create mode 100644 run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/generators/magic_energy_converter_side_off.png create mode 100644 run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/generators/magic_energy_converter_side_on.png create mode 100644 run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/generators/magic_energy_converter_top_off.png create mode 100644 run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/generators/magic_energy_converter_top_on.png create mode 100644 run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/generators/plasmagenerator_bottom.png create mode 100644 run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/generators/plasmagenerator_side_off.png create mode 100644 run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/generators/plasmagenerator_side_on.png create mode 100644 run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/generators/plasmagenerator_top_off.png create mode 100644 run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/generators/plasmagenerator_top_on.png rename run/resourcepacks/unity/assets/techreborn/textures/blocks/{machine/generators/thermal_generator_side_on.png.mcmeta => machines/generators/plasmagenerator_top_on.png.mcmeta} (100%) create mode 100644 run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/generators/semi_fluid_generator_side_off.png create mode 100644 run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/generators/semi_fluid_generator_top_off.png create mode 100644 run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/generators/solar_panel_side_off.png create mode 100644 run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/generators/solar_panel_side_on.png create mode 100644 run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/generators/solar_panel_top.png create mode 100644 run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/generators/thermal_generator_side_off.png create mode 100644 run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/generators/thermal_generator_side_on.png create mode 100644 run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/generators/thermal_generator_side_on.png.mcmeta rename run/resourcepacks/unity/assets/techreborn/textures/blocks/{machine => machines}/generators/thermal_generator_top_off.png (100%) rename run/resourcepacks/unity/assets/techreborn/textures/blocks/{machine => machines}/generators/thermal_generator_top_on.png (100%) rename run/resourcepacks/unity/assets/techreborn/textures/blocks/{machine => machines}/generators/thermal_generator_top_on.png.mcmeta (100%) create mode 100644 run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/generators/watermill_generator_side_off.png create mode 100644 run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/generators/wind_mill_front_off.png create mode 100644 run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/generators/wind_mill_front_on.png create mode 100644 run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/generators/wind_mill_front_on.png.mcmeta create mode 100644 run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/generators/wind_mill_left.png create mode 100644 run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/generators/wind_mill_right.png rename run/resourcepacks/unity/assets/techreborn/textures/blocks/{machine/machine_blocks => machines/structure}/casingadvanced.png (100%) rename run/resourcepacks/unity/assets/techreborn/textures/blocks/{machine/machine_blocks => machines/structure}/casingadvanced_edge.png (100%) rename run/resourcepacks/unity/assets/techreborn/textures/blocks/{machine/machine_blocks => machines/structure}/casingadvanced_full.png (100%) rename run/resourcepacks/unity/assets/techreborn/textures/blocks/{machine/machine_blocks => machines/structure}/casingreinforced.png (100%) rename run/resourcepacks/unity/assets/techreborn/textures/blocks/{machine/machine_blocks => machines/structure}/casingreinforced_edge.png (100%) rename run/resourcepacks/unity/assets/techreborn/textures/blocks/{machine/machine_blocks => machines/structure}/casingreinforced_full.png (100%) rename run/resourcepacks/unity/assets/techreborn/textures/blocks/{machine/machine_blocks => machines/structure}/casingstandard.png (100%) rename run/resourcepacks/unity/assets/techreborn/textures/blocks/{machine/machine_blocks => machines/structure}/casingstandard_edge.png (100%) rename run/resourcepacks/unity/assets/techreborn/textures/blocks/{machine/machine_blocks => machines/structure}/casingstandard_full.png (100%) rename run/resourcepacks/unity/assets/techreborn/textures/blocks/{machine/machine_blocks/machine_machine_block.png => machines/structure/tier1_machine_block.png} (100%) rename run/resourcepacks/unity/assets/techreborn/textures/blocks/{machine/machine_blocks/advancedMachine_machine_block.png => machines/structure/tier2_machine_block.png} (100%) rename run/resourcepacks/unity/assets/techreborn/textures/blocks/{machine/machine_blocks/highlyAdvancedMachine_machine_block.png => machines/structure/tier3_machine_block.png} (100%) rename run/resourcepacks/unity/assets/techreborn/textures/blocks/{machine => machines}/tier0_machines/alloy_furnace_front_off.png (100%) rename run/resourcepacks/unity/assets/techreborn/textures/blocks/{machine => machines}/tier0_machines/alloy_furnace_front_on.png (100%) rename run/resourcepacks/unity/assets/techreborn/textures/blocks/{machine => machines}/tier0_machines/alloy_furnace_front_on.png.mcmeta (100%) rename run/resourcepacks/unity/assets/techreborn/textures/blocks/{machine => machines}/tier0_machines/furnace_front_off.png (100%) rename run/resourcepacks/unity/assets/techreborn/textures/blocks/{machine => machines}/tier0_machines/furnace_front_on.png (100%) rename run/resourcepacks/unity/assets/techreborn/textures/blocks/{machine => machines}/tier0_machines/furnace_front_on.png.mcmeta (100%) rename run/resourcepacks/unity/assets/techreborn/textures/blocks/{machine => machines}/tier0_machines/machine_bottom.png (100%) rename run/resourcepacks/unity/assets/techreborn/textures/blocks/{machine => machines}/tier0_machines/machine_side.png (100%) rename run/resourcepacks/unity/assets/techreborn/textures/blocks/{machine => machines}/tier0_machines/machine_top.png (100%) rename run/resourcepacks/unity/assets/techreborn/textures/blocks/{machine => machines}/tier1_machines/assembling_machine_front_off.png (100%) rename run/resourcepacks/unity/assets/techreborn/textures/blocks/{machine => machines}/tier1_machines/assembling_machine_front_on.png (100%) rename run/resourcepacks/unity/assets/techreborn/textures/blocks/{machine => machines}/tier1_machines/assembling_machine_front_on.png.mcmeta (100%) rename run/resourcepacks/unity/assets/techreborn/textures/blocks/{machine/tier1_machines/chemical_reactor_side_off.png => machines/tier1_machines/chemical_reactor_front_off.png} (100%) rename run/resourcepacks/unity/assets/techreborn/textures/blocks/{machine/tier1_machines/chemical_reactor_side_on.png => machines/tier1_machines/chemical_reactor_front_on.png} (100%) rename run/resourcepacks/unity/assets/techreborn/textures/blocks/{machine/tier1_machines/chemical_reactor_side_on.png.mcmeta => machines/tier1_machines/chemical_reactor_front_on.png.mcmeta} (100%) rename run/resourcepacks/unity/assets/techreborn/textures/blocks/{machine => machines}/tier1_machines/compressor_front_off.png (100%) rename run/resourcepacks/unity/assets/techreborn/textures/blocks/{machine => machines}/tier1_machines/compressor_front_on.png (100%) rename run/resourcepacks/unity/assets/techreborn/textures/blocks/{machine => machines}/tier1_machines/compressor_front_on.png.mcmeta (100%) rename run/resourcepacks/unity/assets/techreborn/textures/blocks/{machine/tier1_machines/electric_alloy_furnace_front_off.png => machines/tier1_machines/electric_alloy_smelter_front_off.png} (100%) rename run/resourcepacks/unity/assets/techreborn/textures/blocks/{machine/tier1_machines/electric_alloy_furnace_front_on.png => machines/tier1_machines/electric_alloy_smelter_front_on.png} (100%) rename run/resourcepacks/unity/assets/techreborn/textures/blocks/{machine => machines}/tier1_machines/electric_crafting_table_side.png (100%) rename run/resourcepacks/unity/assets/techreborn/textures/blocks/{machine => machines}/tier1_machines/electric_crafting_table_top.png (100%) rename run/resourcepacks/unity/assets/techreborn/textures/blocks/{machine => machines}/tier1_machines/electric_furnace_front_off.png (100%) rename run/resourcepacks/unity/assets/techreborn/textures/blocks/{machine => machines}/tier1_machines/electric_furnace_front_on.png (100%) rename run/resourcepacks/unity/assets/techreborn/textures/blocks/{machine => machines}/tier1_machines/extractor_front_off.png (100%) rename run/resourcepacks/unity/assets/techreborn/textures/blocks/{machine => machines}/tier1_machines/extractor_front_on.png (100%) rename run/resourcepacks/unity/assets/techreborn/textures/blocks/{machine => machines}/tier1_machines/extractor_front_on.png.mcmeta (100%) rename run/resourcepacks/unity/assets/techreborn/textures/blocks/{machine => machines}/tier1_machines/grinder_front_off.png (100%) rename run/resourcepacks/unity/assets/techreborn/textures/blocks/{machine => machines}/tier1_machines/grinder_front_on.png (100%) rename run/resourcepacks/unity/assets/techreborn/textures/blocks/{machine => machines}/tier1_machines/grinder_front_on.png.mcmeta (100%) rename run/resourcepacks/unity/assets/techreborn/textures/blocks/{machine => machines}/tier1_machines/grinder_top_off.png (100%) rename run/resourcepacks/unity/assets/techreborn/textures/blocks/{machine => machines}/tier1_machines/grinder_top_on.png (100%) rename run/resourcepacks/unity/assets/techreborn/textures/blocks/{machine => machines}/tier1_machines/grinder_top_on.png.mcmeta (100%) rename run/resourcepacks/unity/assets/techreborn/textures/blocks/{machine => machines}/tier1_machines/industrial_electrolyzer_front_off.png (100%) rename run/resourcepacks/unity/assets/techreborn/textures/blocks/{machine => machines}/tier1_machines/industrial_electrolyzer_front_on.png (100%) rename run/resourcepacks/unity/assets/techreborn/textures/blocks/{machine => machines}/tier1_machines/industrial_electrolyzer_front_on.png.mcmeta (100%) rename run/resourcepacks/unity/assets/techreborn/textures/blocks/{machine => machines}/tier1_machines/machine_bottom.png (100%) rename run/resourcepacks/unity/assets/techreborn/textures/blocks/{machine => machines}/tier1_machines/machine_side.png (100%) rename run/resourcepacks/unity/assets/techreborn/textures/blocks/{machine => machines}/tier1_machines/machine_top.png (100%) rename run/resourcepacks/unity/assets/techreborn/textures/blocks/{machine => machines}/tier1_machines/player_detector_all.png (100%) rename run/resourcepacks/unity/assets/techreborn/textures/blocks/{machine => machines}/tier1_machines/player_detector_others.png (100%) rename run/resourcepacks/unity/assets/techreborn/textures/blocks/{machine => machines}/tier1_machines/player_detector_you.png (100%) rename run/resourcepacks/unity/assets/techreborn/textures/blocks/{machine => machines}/tier1_machines/recycler_front_off.png (100%) rename run/resourcepacks/unity/assets/techreborn/textures/blocks/{machine => machines}/tier1_machines/recycler_front_on.png (100%) rename run/resourcepacks/unity/assets/techreborn/textures/blocks/{machine => machines}/tier1_machines/recycler_front_on.png.mcmeta (100%) rename run/resourcepacks/unity/assets/techreborn/textures/blocks/{machine/tier1_machines/rolling_machine_side_off.png => machines/tier1_machines/rolling_machine_front_off.png} (100%) rename run/resourcepacks/unity/assets/techreborn/textures/blocks/{machine/tier1_machines/rolling_machine_side_on.png => machines/tier1_machines/rolling_machine_front_on.png} (100%) rename run/resourcepacks/unity/assets/techreborn/textures/blocks/{machine/tier1_machines/rolling_machine_side_on.png.mcmeta => machines/tier1_machines/rolling_machine_front_on.png.mcmeta} (100%) rename run/resourcepacks/unity/assets/techreborn/textures/blocks/{machine => machines}/tier1_machines/scrapboxinator_front_off.png (100%) rename run/resourcepacks/unity/assets/techreborn/textures/blocks/{machine => machines}/tier1_machines/scrapboxinator_front_on.png (100%) rename run/resourcepacks/unity/assets/techreborn/textures/blocks/{machine => machines}/tier1_machines/scrapboxinator_front_on.png.mcmeta (100%) create mode 100644 run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/tier2_machines/computer_cube_front.png create mode 100644 run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/tier2_machines/computer_cube_side.png create mode 100644 run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/tier2_machines/digital_chest_side.png create mode 100644 run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/tier2_machines/digital_chest_top.png rename run/resourcepacks/unity/assets/techreborn/textures/blocks/{machine => machines}/tier2_machines/distillation_tower_front_off.png (100%) rename run/resourcepacks/unity/assets/techreborn/textures/blocks/{machine => machines}/tier2_machines/distillation_tower_front_on.png (100%) rename run/resourcepacks/unity/assets/techreborn/textures/blocks/{machine => machines}/tier2_machines/distillation_tower_front_on.png.mcmeta (100%) rename run/resourcepacks/unity/assets/techreborn/textures/blocks/{machine => machines}/tier2_machines/implosion_compressor_east_off.png (100%) rename run/resourcepacks/unity/assets/techreborn/textures/blocks/{machine => machines}/tier2_machines/implosion_compressor_east_on.png (100%) rename run/resourcepacks/unity/assets/techreborn/textures/blocks/{machine => machines}/tier2_machines/implosion_compressor_east_on.png.mcmeta (100%) rename run/resourcepacks/unity/assets/techreborn/textures/blocks/{machine => machines}/tier2_machines/implosion_compressor_front_off.png (100%) rename run/resourcepacks/unity/assets/techreborn/textures/blocks/{machine => machines}/tier2_machines/implosion_compressor_front_on.png (100%) rename run/resourcepacks/unity/assets/techreborn/textures/blocks/{machine => machines}/tier2_machines/implosion_compressor_front_on.png.mcmeta (100%) rename run/resourcepacks/unity/assets/techreborn/textures/blocks/{machine => machines}/tier2_machines/implosion_compressor_west_off.png (100%) rename run/resourcepacks/unity/assets/techreborn/textures/blocks/{machine => machines}/tier2_machines/implosion_compressor_west_on.png (100%) rename run/resourcepacks/unity/assets/techreborn/textures/blocks/{machine => machines}/tier2_machines/implosion_compressor_west_on.png.mcmeta (100%) rename run/resourcepacks/unity/assets/techreborn/textures/blocks/{machine => machines}/tier2_machines/industrial_blast_furnace_east_off.png (100%) rename run/resourcepacks/unity/assets/techreborn/textures/blocks/{machine => machines}/tier2_machines/industrial_blast_furnace_east_on.png (100%) rename run/resourcepacks/unity/assets/techreborn/textures/blocks/{machine => machines}/tier2_machines/industrial_blast_furnace_east_on.png.mcmeta (100%) rename run/resourcepacks/unity/assets/techreborn/textures/blocks/{machine => machines}/tier2_machines/industrial_blast_furnace_front_off.png (100%) rename run/resourcepacks/unity/assets/techreborn/textures/blocks/{machine => machines}/tier2_machines/industrial_blast_furnace_front_on.png (100%) rename run/resourcepacks/unity/assets/techreborn/textures/blocks/{machine => machines}/tier2_machines/industrial_blast_furnace_front_on.png.mcmeta (100%) rename run/resourcepacks/unity/assets/techreborn/textures/blocks/{machine => machines}/tier2_machines/industrial_blast_furnace_west_off.png (100%) rename run/resourcepacks/unity/assets/techreborn/textures/blocks/{machine => machines}/tier2_machines/industrial_blast_furnace_west_on.png (100%) rename run/resourcepacks/unity/assets/techreborn/textures/blocks/{machine => machines}/tier2_machines/industrial_blast_furnace_west_on.png.mcmeta (100%) rename run/resourcepacks/unity/assets/techreborn/textures/blocks/{machine => machines}/tier2_machines/industrial_centrifuge_front_off.png (100%) rename run/resourcepacks/unity/assets/techreborn/textures/blocks/{machine => machines}/tier2_machines/industrial_centrifuge_front_on.png (100%) rename run/resourcepacks/unity/assets/techreborn/textures/blocks/{machine => machines}/tier2_machines/industrial_centrifuge_front_on.png.mcmeta (100%) rename run/resourcepacks/unity/assets/techreborn/textures/blocks/{machine => machines}/tier2_machines/industrial_centrifuge_top_off.png (100%) rename run/resourcepacks/unity/assets/techreborn/textures/blocks/{machine => machines}/tier2_machines/industrial_centrifuge_top_on.png (100%) rename run/resourcepacks/unity/assets/techreborn/textures/blocks/{machine => machines}/tier2_machines/industrial_centrifuge_top_on.png.mcmeta (100%) rename run/resourcepacks/unity/assets/techreborn/textures/blocks/{machine => machines}/tier2_machines/industrial_grinder_front_off.png (100%) rename run/resourcepacks/unity/assets/techreborn/textures/blocks/{machine => machines}/tier2_machines/industrial_grinder_front_on.png (100%) rename run/resourcepacks/unity/assets/techreborn/textures/blocks/{machine => machines}/tier2_machines/industrial_grinder_front_on.png.mcmeta (100%) rename run/resourcepacks/unity/assets/techreborn/textures/blocks/{machine => machines}/tier2_machines/industrial_grinder_top_off.png (100%) rename run/resourcepacks/unity/assets/techreborn/textures/blocks/{machine => machines}/tier2_machines/industrial_grinder_top_on.png (100%) rename run/resourcepacks/unity/assets/techreborn/textures/blocks/{machine => machines}/tier2_machines/industrial_grinder_top_on.png.mcmeta (100%) rename run/resourcepacks/unity/assets/techreborn/textures/blocks/{machine => machines}/tier2_machines/industrial_sawmill_front_off.png (100%) rename run/resourcepacks/unity/assets/techreborn/textures/blocks/{machine => machines}/tier2_machines/industrial_sawmill_front_on.png (100%) rename run/resourcepacks/unity/assets/techreborn/textures/blocks/{machine => machines}/tier2_machines/industrial_sawmill_front_on.png.mcmeta (100%) rename run/resourcepacks/unity/assets/techreborn/textures/blocks/{machine => machines}/tier2_machines/machine_back.png (100%) rename run/resourcepacks/unity/assets/techreborn/textures/blocks/{machine => machines}/tier2_machines/machine_bottom.png (100%) rename run/resourcepacks/unity/assets/techreborn/textures/blocks/{machine => machines}/tier2_machines/machine_east.png (100%) rename run/resourcepacks/unity/assets/techreborn/textures/blocks/{machine => machines}/tier2_machines/machine_top.png (100%) rename run/resourcepacks/unity/assets/techreborn/textures/blocks/{machine => machines}/tier2_machines/machine_west.png (100%) rename run/resourcepacks/unity/assets/techreborn/textures/blocks/{machine/greg_machines => machines/tier2_machines}/vacuum_freezer_front_off.png (100%) rename run/resourcepacks/unity/assets/techreborn/textures/blocks/{machine/greg_machines => machines/tier2_machines}/vacuum_freezer_front_on.png (100%) rename run/resourcepacks/unity/assets/techreborn/textures/blocks/{machine/greg_machines => machines/tier2_machines}/vacuum_freezer_front_on.png.mcmeta (100%) rename run/resourcepacks/unity/assets/techreborn/textures/blocks/{machine/greg_machines => machines/tier2_machines}/vacuum_freezer_top_off.png (100%) rename run/resourcepacks/unity/assets/techreborn/textures/blocks/{machine/greg_machines => machines/tier2_machines}/vacuum_freezer_top_on.png (100%) rename run/resourcepacks/unity/assets/techreborn/textures/blocks/{machine/greg_machines => machines/tier2_machines}/vacuum_freezer_top_on.png.mcmeta (100%) create mode 100644 run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/tier3_machines/industrial_chunkloader_side.png create mode 100644 run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/tier3_machines/industrial_chunkloader_top.png create mode 100644 run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/tier3_machines/machine_back.png create mode 100644 run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/tier3_machines/machine_bottom.png create mode 100644 run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/tier3_machines/machine_east.png create mode 100644 run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/tier3_machines/machine_top.png create mode 100644 run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/tier3_machines/machine_west.png create mode 100644 run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/tier3_machines/quantum_chest_bottom.png create mode 100644 run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/tier3_machines/quantum_chest_side.png create mode 100644 run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/tier3_machines/quantum_chest_top.png create mode 100644 run/resourcepacks/unity/assets/techreborn/textures/blocks/nuke_front.png create mode 100644 run/resourcepacks/unity/assets/techreborn/textures/blocks/nuke_side.png create mode 100644 run/resourcepacks/unity/assets/techreborn/textures/blocks/nuke_top.png delete mode 100644 run/resourcepacks/unity/assets/techreborn/textures/items/ingot/advancedAlloyIngot.png rename run/resourcepacks/unity/assets/techreborn/textures/items/tool/{lapotronicEnergyOrb.png => lapotronEnergyOrb.png} (100%) create mode 100644 run/resourcepacks/unity/assets/techreborn/textures/items/tool/lapotronEnergyOrbEmpty.png create mode 100644 run/resourcepacks/unity/assets/techreborn/textures/unused/plasma.png delete mode 100644 src/main/java/techreborn/blocks/generator/BlockHeatGenerator.java delete mode 100644 src/main/java/techreborn/items/ItemLapotronicOrb.java create mode 100644 src/main/java/techreborn/items/battery/ItemLapotronOrb.java delete mode 100644 src/main/java/techreborn/tiles/generator/TileHeatGenerator.java create mode 100644 src/main/resources/assets/techreborn/blockstates/storage/ores.json create mode 100644 src/main/resources/assets/techreborn/blockstates/storage/storage.json create mode 100644 src/main/resources/assets/techreborn/models/item/lapotronOrb.json create mode 100644 src/main/resources/assets/techreborn/models/item/lapotronOrbEmpty.json create mode 100644 src/main/resources/assets/techreborn/textures/blocks/storage/digital_chest_side.png delete mode 100644 src/main/resources/assets/techreborn/textures/gui/compressorTest.png create mode 100644 src/main/resources/assets/techreborn/textures/gui/guiSheet.png rename src/main/resources/assets/techreborn/textures/items/tool/{lapotronicEnergyOrb.png => lapotronOrb.png} (100%) create mode 100644 src/main/resources/assets/techreborn/textures/items/tool/lapotronOrbEmpty.png diff --git a/README.md b/README.md index b4cf70c9b..affdb1aff 100644 --- a/README.md +++ b/README.md @@ -45,7 +45,7 @@ Jenkins builds of TechReborn are compiled directly from this repository. Please 1.7.10: --- -*Please understand that the 1.7.10 version of TechReborn is not being maintained. We've moved onto TechReborn for Minecraft 1.8.9. If there is an extremely critical bug that you find in the 1.7.10 version, report it to the bug tracker and we will determine if it is drastic enough for a fix.* +*Please understand that the 1.7.10 version of TechReborn is not being maintained. We've moved onto TechReborn for Minecraft 1.9. If there is an extremely critical bug that you find in the 1.7.10 version, report it to the bug tracker and we will determine if it is drastic enough for a fix.* [![Build Status](http://modmuss50.me:8080/job/TechReborn/job/TechReborn-1.7.10/badge/icon)](http://modmuss50.me:8080/job/TechReborn/job/TechReborn-1.7.10/) @@ -67,6 +67,6 @@ Inactive And everyone else who has helped with languages and code. - # License Infomation: +# License Infomation: The mod is licenced under MIT. We have got permisson from Greg to use his textures, everything else has been recoded and retextured. If you have any quierys please ask on irc or in an issue. diff --git a/build.gradle b/build.gradle index 7acc3dcd8..a76a2d4d8 100644 --- a/build.gradle +++ b/build.gradle @@ -32,7 +32,7 @@ targetCompatibility = 1.8 repositories { maven { name = "Modmuss50" - url = "http://maven.modmuss50.me/" + url = "https://maven.modmuss50.me/" } maven { name "TiC" @@ -73,6 +73,9 @@ if (ENV.BUILD_NUMBER) { minecraft { version = "1.9.4-12.17.0.1950" + if(ENV.JOB_BASE_NAME == "TechReborn-1.10"){ + version = "1.10-12.18.0.1992-1.10.0" + } mappings = "snapshot_20160518" replace "@MODVERSION@", project.version // makeObfSourceJar = false @@ -175,6 +178,9 @@ modsIO { artifact = jar.archivePath modid = "1182" minecraft = "1.9.4" + if(ENV.JOB_BASE_NAME == "TechReborn-1.10"){ + minecraft = "1.10" + } changelog = "See github at : https://github.com/TechReborn/TechReborn" tag = "alpha" current = true diff --git a/run/resourcepacks/unity/assets/TechReborn.xcf b/run/resourcepacks/unity/assets/TechReborn.xcf index d184d1253a23223bb575a196c61f42711f7f730b..463c6aed21d34b4334fabb326838e8bfd81ddc05 100644 GIT binary patch delta 13778 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�@31DZbODOr7fQKi$_8OlhLG z=Hx9YE-Woxvv$qWMcH(uO$!f?%AB2)9=R|oHi*hbW(>v@K>gy>)U4Fpq?B-4AeoWT z30ZSf=B6!7N{CIMZ(|lOU$v@qRhhJM;krUvc-aYYF}bNpsdIDHX{j;u==XXl$#Dx3 z<5N=AaY?BpXU4}QWThs}PFt9ekVpoyQW9fxlM+)?)ba62G@i4vaQU*8%S#G3u3El= z%2eE}sJN_%==WmsVq)Wn9}yZDlNu2f5v7ic4yQAF#I$Mg=@HQpQSZma&Pt{)(sHs3 zvNH2?v(@>9i!;)di59>Q>o!Z}6^F|Y?ylaobJJRSO_-OLzis`B^-C+%>g-hj6-$>c zD__56!-^d%N*1mrdC8JxJJzpUUsAE6IFI;;wr$^CeQ@{TV|yx&?AiwKQDI^JjskVT zii*_*h4fZ*$I6w3I|`O9UtPU?`D&6Y3f0S&?I>Bks-&X0xPT07U%4`W+p=W^YpaTj zONg+w`lIrlyUTZ1%6s-4*g`*1T(YE4TC{Xg;r^xh#bxvp#_X)(vW3g?7FHJ&=5Jtf zcCna8a(VHxd@8N$Hk9t!wxwd*mhF2g%Qh?1?ADC%_h-De@W1P`TjH-ez|Jw9C&p*= zcU8_XXx?%w(Hd-R$bPt~G_6}H{5*$Y`1ed60k8a~`UgT+co|q%Hz$%hIP>M+*^m%N z=dfpyNl9_(Wnm4<9z8L4Z&<^v^st6Vwz>MA4huWbklwH`nxtob>eFEmmktZ(klLTq zf*`nI^=f7{D6OGkA$49&nGg`F9Q9rWhK4aeFC)MDYGDdDAKAG0^Q&CzI zJE%Vm`FC2{sivZ)73{G7j3me{f|5MuFghL*ns)AFM&t9En$|$q2zV795|yYp)N3|^ zPV~`hehtm+JZspj4_#V6s^%9ARB&v53(cy(*zHcMN|vRdS+uWMv?ST9HHlO&BOO}% zT1k%d<}i#5X0j{1W;r&ZTyL$TABe)6xKuh|KM$O_w+s@FN77mR&$x~0l-X#4|4gDR zOAWECJ27b;<+x1gQohy1BJy+J%}Rn768^?-8X0^Q)Sw9^2d^p1bP^?pEXU+9@Z+yi zn8WmJ;y#Z|sI7$gU$AGEKj+i!oY(=T6}4d^fB z5$O@8GYNlx3_;bBV0v&PrXFdinq65&+ET`DAqdtfDJFoV08n1-%l%Stwp8{)zm!h#w3>4LotVUU#6uvd}7_BMplFHs^% zS07%7g$C25!C+VBy^_2arim9>;+C~d5bW8SwlV&jWS*wVOKsT9O%T)MQeF`7AD zdZ%%|(y3f}r7n?>XO-&O#`%ejiP4Pwba`!KBIM*W)+$nBZDSn$+B}VP$$MfPOAJOU z-mA#_s=PGjy{eva4j(qvv#Rm7ya}6LRKd=s4eUYt8F8A5ikg}dnD?TensSv+RZ-Ka zH0HgkzDb=+w|@d7KP{=JLa=C2Q@tXk)i=@Jl|7Gi$$MHd{olXwb#j!lWzxZ^=fxT3GimGcmQWHf54=ZzgoNvSI02?bbTNUHo8#$0FKuRf z<+RxxhG~l=rv%(WPQOaP&BE+`+_2(r_9+g-*_WghiFi@MF_AHm!!RREqo0Ngn2941ttQ$Y znaD&Ie{~cSS#-!%T1y$mtP;(rxj0czSfIS}qam&Oyx=ZRUhunScLrY36Y`Wo&6D%K zmsG+VOqqMnd{oEuQW$k%!0o_~YATkfl=ejokxq_}>VDMc-&ycN{7*DbijVOVfW zL%QL5%9{jGwGPt!i)D_eI4=Hz!?5_86zGKZn#0Rb)*HHt-;flIRbTNMtCV@J6a(~a zG>4btQ9WVZF^-{Vt^1P0aNW0>l9hN(&tbz6Za^V#;4dd`_=a%`5SSB*LVH(pVGWk) XIegfG@`pOgAL=T{XpBm6jp}~^9j;J( delta 10772 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 delta 466 zcmV;@0WJQa1E&O#JPL6D01|Nl^W1ulkwzzfrAb6VR5(wykV{J&Q5c5jw{_vBRoi%_ zUh#%8*1=lsq9T=ozoZM%YP{eDi8YzrtVT^H9VKm|Gd7oM6a;_3<99-rXQRc%1Lu8s zc{zLrpv8@iQch2EWq%2eNQVD>Ib*kajNNYe#d8j zMCp54sZaye)6e|P%u=vMMd^E5src_3IH5i&hm&|e#<)m+5~c4M1UN8grnolbIFt(2qP6s;jr zD^iZhkG^-~?)FlQw&Lx!)v|HAY_aucP!PKx0Uob`5e9fejZel9lhC*&i)*^IsHd;CClp#g6_=MDLd zCk~{(*5Ph7au%%TM8jtLr06+_a^PbkoY5)KL07*qo IM6N<$f=-*}`~Uy| diff --git a/run/resourcepacks/unity/assets/techreborn/textures/blocks/cables/tin_cable.png b/run/resourcepacks/unity/assets/techreborn/textures/blocks/cables/tin_cable.png index 30b9503a4c776ed7550783121c211f8386868791..146af2fc24d2573a2a805727b2e34d1e74010f22 100644 GIT binary patch delta 245 zcmVnlhij=NXNrJJbX_6$+kbM|52$@mXhCCU=_7a7pt#OI+4$Voi4nIL$dHcbd+mX$osC vk|Y6ZPGjUe&!zFklTKX>@&AcG`-w0g3a2pB23c7|00000NkvXXu0mjfp{;9> delta 341 zcmV-b0jmDn0=xr|Bnkm@Qb$4nuFf3kks%uj5&!@T5&_cPe*BR}Ie!5fNkl1<2q9|0sIF53;Tz1N?GfChEEXyL->vgB>I+Fy*?z&D_ z_;ox*}p!(2T0n>7;Sr_wsx`bvVY7dq_DRj}nHV%HnBAj^kJx9pGJj zI2^?HeT_|HK$d0t7Fa1slAW^aOcJmHt1$p&pZ5+X30Q-@@iOD9Pno8=uGPe^6a+ya n{13c;O#ZxgFiG&Y6~y}iQ!*{7cgtE`00000NkvXXu0mjf4|$#5 diff --git a/run/resourcepacks/unity/assets/techreborn/textures/blocks/machine/generators/generator_front_off.png b/run/resourcepacks/unity/assets/techreborn/textures/blocks/machine/generators/generator_front_off.png deleted file mode 100644 index bbd13a4947b0a14fd01e7a02db265a05c8f58e02..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 694 zcmV;n0!jUeP)wfQh ziET>yn#Kx(4yF_*mu}r$I`?l7C%g4Oa1#fqAPRzmf{5VmZd*{HeI|D8P?9w15MSTB z_nv#sxqd$Q`yYRH_W@8%a)f?vEm zzIF3JB#ByItxL-J&8C8|_D%p-=ktr%Y`$1@v*YvE#C-Y6?u(ZvwHEy9ho2m9y(t1C z5X=F%_<$X6d>qsn27pph3oSz;Z zQrFUZKR!8;Gy!6`5sOGNv!cy>2$ObOtyb1MM3DQ)IlsNXPeepG0CJwRt98Q|2(c+G z!Y*C9Tv`hN=_6{b2+-YefObu3Vv$-}Kwx0glJm^0w_4qt2szK^L_FLhVr#xtnwl!% z7!gP)Oj>KJ4T*;vX)9qCZiKKrI%=xR<+IY7$5<}^X{8+g`&> zOhiOUxYat#SyiWL@`y02ssTXm20*XQ&ZlV-VPYO*tk;`7n-LQtA|f-NpPhwU&Y5bd zrEC_9t0DpbZbpQFXl4j#W<*>{+1`FD=WMF@;PWq9t*tjVXOXUrI588kv|5;0wTUDW chA~*u|K>l9rI$+UasU7T07*qoM6N<$f)+1AdH?_b diff --git a/run/resourcepacks/unity/assets/techreborn/textures/blocks/machine/generators/generator_front_on.png b/run/resourcepacks/unity/assets/techreborn/textures/blocks/machine/generators/generator_front_on.png deleted file mode 100644 index ff71beb7354da6c99c8cf1cd2a9002806b419920..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 708 zcmV;#0z3VQP)6ae7!Q+2Dm z2guM4G7@)cnjkAu+Ck_bT$^_uukf?pHT%{p&C9wAO<2i<8q^ zHy0tqAlf$D98rrMA=Fs(NilawAleoRer zYwh&xEW`m2-IO?l5LGoxRqKICnr=25Z4KPXtf!RT+21E3BJ2Pu4bnuLqIU!zb9L9t zm#^en9U!#sr4$5cX4pZR#5iyWC07SW$0|9ciE68*m>Lmsnofzho4NaJI?Gj5gs^va zBn(VaN-Y(MyD3S{uIi?Q@btk!6?uN|Zm!k5A00iaIY0aRzNjFxno4WI)W@6&;PCKp z{_^;*^{X!?=f58O);TWP>d8@l@A!{@OlATtG^m&;WM!>jX^53{e{zglu0hWPnspIVsw_w1iOOjgUK zo2HbgXzm=wrN*@Qr?)$!88_xdc z_s567{b>;eFja{tJR>5qG6MjrptWYEt+g=*vxvHXdF@nn5fLK(@z*mz$O;h#07Sh0 z#VIkpJv-a;TQig77cXC3`|MPt ziMqYpkJkJ9!vtY9BY+QgyR+?fcj1D$zk23!MMQU>s?Y!a$IM$3CjRuwCy+@I)q5wVUw^ps;NFiJ+51LK-5j$j z>(S45AKw2dGR9g7Kvp^D3=c#U5dautvWR(jrL@M(+wHch)|}xXgxq&Kk02r<@{F;x zF%nipnrT&KW^WrLu5i*d(mgUVv#JoWGmf<)3liL&nE^oEJY3BvJP%_Wd1f~A0BUVh zfJuNzM+E>jA{9Y}P?<+QGeuZ+RzX79nuvI;&3vjRfJ8U|0RR9T@1~Yu2$+dPSXBTJ z5gFclmpSGb2Q#m#sxtEgFn1zqtwkgvRuwb%-dz=M+`P5sT(-i4MNAiQV$ f5@{q1RV?j)s~eJPYBujQ00000NkvXXu0mjfTaX%0 diff --git a/run/resourcepacks/unity/assets/techreborn/textures/blocks/machine/generators/thermal_generator_side_on.png b/run/resourcepacks/unity/assets/techreborn/textures/blocks/machine/generators/thermal_generator_side_on.png deleted file mode 100644 index 6845524c08a0dbabbe2b8fa6ecf68da24e819910..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2819 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 diff --git a/run/resourcepacks/unity/assets/techreborn/textures/blocks/machine/tier1_machines/tier1_machine_side.png b/run/resourcepacks/unity/assets/techreborn/textures/blocks/machine/tier1_machines/tier1_machine_side.png deleted file mode 100644 index 6ce52fa671e19d3d267c9beed4f24d05b8d5f030..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 630 zcmV-+0*U>JP)3I6{#@8ZFLhY*Oagd7yIn;_16ue++Ns=eg9efakGKQq&8xVwm$nfVZw z);k~~fDRvHoX%%6a}UXkmp{K)*Y$Wj0>Buf)M{q6lsRYXeGC_2RXv_guiw0*@L1RN z@!$Udz|5Grx3<*!e~D`;H;0@1zy3zR)|+JJ;c$5I{8>aq1R~a2d+&%y%!p{s#^$en z{iUk{5+SphiHNE$%R)p%RBJ7z0KoNn6%jz#_s!kM7^G%4e9n0|98?t%BXhWK+h%4` zs(Z`{#F7(gsU*xrI3jxQL}X)RW=2ea2{1FwtcVbzYH!-5t6jJD^}5zlLDJ3I-lT|o zm|3m0tJ1gYoEQ72$+e(Ei#z+@!{ckx>=Tmdh4z2PoG|9&eQF!6iI;L z?io@f5(vqMpHAmxS=>yR`NPM19U2}iGE9jJGZBmS#>8eSQb-u)ygA=~2L*PkEOtCl Qm;e9(07*qoM6N<$g1rDBbN~PV diff --git a/run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/energy/ev_multi_front.png b/run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/energy/ev_multi_front.png new file mode 100644 index 0000000000000000000000000000000000000000..d3cc97f93890740558b5e281339a5def93967982 GIT binary patch literal 666 zcmV;L0%iS)P)l?q>hI z-S^(TGh^`*J=MUR;>?^MUAXgrh(Jb#0jRJF8|R^-suBxTB_dVT7*yB+m|3{4!elH| z$R;SI67x)jIpoH=FdA52=^Sjkaz{kQdF43yI@EC|+_X05hx?(EA&0O+*aE=k&dI;sE}a*3)sr~ok58C3XQ+xq%#FYC4dCXA)2O960^ zm#-9#C7KeWsyYDOgRS!JQ%o6v$p2taDLDu57iEoP`(Hnaod5s;07*qoM6N<$f|{o) Ad;kCd literal 0 HcmV?d00001 diff --git a/run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/energy/ev_multi_front_ctm.png b/run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/energy/ev_multi_front_ctm.png new file mode 100644 index 0000000000000000000000000000000000000000..0019abce5fdc2013fe8539bd68fddad1ed9e47d3 GIT binary patch literal 2215 zcmV;Y2w3-tP)^*y*z4zItrx(FO?sj*7vRdZ|K8w7n`+6 zD*`}7Yoke&B(5w)q>*JcO*0p?*0bq!u{S@QOz(Q&;oc2*D5X9Xt$gk?H{NmEty>qj z5&(b*WnR2~=+My6~*H z2kS~HkRqbsN&rWe^T?RZ{OMDtia{TM1P4;gY~my#qVxUL9b0<)@5k$J9J15(|NLox zG3XcTeWP!F=@*Y%YrD;cQm|1Z!MS{@;{-A8xb*VB^2|;r8+=;3;pqoI`|6vAIr!=@ zjV;Ty(PZ0}UVk_OaL?Uecw#WLSUXwCf-^RsoJCJqU(3< z`hh-EPq!_djPqIN-hKC;KC@IEQFS(^k*3#Nwc~t$)j203A1xaKA2K|G- zej32qw4CO}`HPoYb90R>t7a-~2oyZ8ji-C}+;jgk`-?&U`6nK9K8Oel0Jzzhy)|BB zG@Wfm3E=n7e4mKc#?!@ayW4E6u8#l&Yqu{hkkZ0|gO^Bz1q1*u{`6ZA zS?R9`2d;**Pzr#u&QJ2ngmOz>y z=nqC)I&(yn*3)LznC3;bOCo}>Vi84Tj8RHu&87_;$MJH1l>mr*aP~r$W!rjP1n+z( ztQGG_X*(S`$JYAhT)We5jb=r=)$GpC=VY>0t7>KTUPR1XGYcWqBdxM*I+-XU=e={T z+sZ_wkwk&z(r}W-rgW}qf8n6CfmXqL7Mc}SKpsv6S{YH=G7AS4#Q@BmU;8c*fmF3G z;UFB8i6JZ^?5&6pk%)+Q!Xa*U>+{={QdzW;HS2{fW@VYx)0p5HT4@Tt)yUG$V(>1i zHO%~Vw^fUh(hw#cRmFg?FAL!iT&c8iv$2j7_P*ZRzS#$EI#$xF$5E^)&kN1v>S(;- zgSo4Bn~i)|CYIo;hpI%RG<%DW2Rn=E=5O*rt5GL!hvSKfjGv4N*uJpv-tm(gy!reN zP0)aZ;6(^vtuHScLI5;NgPDb60HjosZ185o2fcb$H+t23t#x8lQQEt2+ycNd)5{0` z92q0tYjBl%h3Dtrnz46}-jWbFgy5Vn$`V8@(8k1ZoTlkqy#}Du>CE?fkN);8_U_ql z+~mC*42QE>?ijUNVgu8ACr(3zT^XFSwhS!Y&ShJzuB@8KI3I*rlx9*yq=^(sthLtK z+Oporwk|FztvCB1GN#*U&zOkF7_CJFUfB?giL!d*@mH2M^8H75&VOR(E_hnwf4t5^}9!Bn|)B0-2>14 z1i;w~D?!+K7wJMPlHdok{D1khcEf?^9@AQ{jdN1)!P8$~f5X`_c%Rj3E2DL-%(0_K zlh|B1zdS3;Z$I?V+IR|r_pIZZ(JInfgCRi^t&G;^+TF8DOZ7BeI(Z_W&Gvn1U+F{X z0|`ZOED-bl@#A@(qq;ai@Z9Xqzxd{*Vh|qQv-{B7?*z}nLYl1gRfi-=Lu zg%3`hJT;!qtoPHr4Bnf+{qt=Om+cc+Or$07wE)`q$Khjvg+Kyf3C=OJ%4*35fBVfh z1`b#FATs(dfB*LeZ{A&jw=QXRd@)ld77nChUrcnIR%T~cN^k&tIU}Xh&SJ%1n+!=4 z2fnnn-fA{R<8hqCH6_E**cg5I%%tKC2Vdp8Qp(NNNk^fW0tmLOemyw&DhkigG*oo7AW^0P1V~)&lHAwszOOwLo5a<~b}{xm^6bq!5rHT( z05F3Y>MfWgvyLQ1gd}TWh68x=`~@>a4NS2HQ!(q%Gb75N=H)LTZG z1OO2cwX7rVE6WJLMMSJ==F3;-ds2WjyIYC~z>>?%{PF|iZX+TNK-B8k%Y5cr%;1&fC`ABQrArsJG+(8h`@Gs3b*Ah{bZ*ExN^Wb#ZYqQqIoL`0_&xjq;CdHa zIqtHKE^5rksN41R`wt(zF-AV58%co>%rZh1fM?V?9Ic&w->7=a4AHjsduzKW1Ar_8 zqfD@X>8wT6#>1_umg9|B6a4`|jKlQGj5?v2wUTrI+sm)h-S?OVfGMws*2Fo0|5N@~ U#D|)5Gynhq07*qoM6N<$g1IINZU6uP literal 0 HcmV?d00001 diff --git a/run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/energy/ev_multi_side_ctm.png b/run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/energy/ev_multi_side_ctm.png new file mode 100644 index 0000000000000000000000000000000000000000..75eb253227d558cf0846b3c129beed4930a9f19b GIT binary patch literal 2059 zcmV+m2=w=fP)N6@}N{RW94- z_+0unlT3#oASek)h$ulqAe1NGK;jo5@k2oZMFjD{MWBd8Nr0JAIy2pU`dsW|yQ=oy zJb2O!)RR?Ob=|AhXZrN%vqe=nCICdV*|$Ymrg1d0dDB#mj!B$z$F6&LeztA9AOGT4 z=Wo8p%x@GoKlt8T@4fT=S027X001J4{qVtuAO7vLC%^qj*KBs=dz;bV*dG)GZU7MLBk+qga{LMXh?aUA2A3`@TO}uSG<19*5z2yDz*008=8G_FT_ql425# zs&N>Cb6~b7L4ZzKQSFi)UC}E5v05g~*Vh6z2p1(-)?%Us<%HWt!Pfj*>chd%oqHxSr zRh=^5ZMOi-45q}+7f!M|_Lr|b@I~0R-L^f}!K*3&5R)&=%nxGAx_tWlW*7zl=gVd` zn=P8A>-#>*X0ttCHZex;{c^Fm*|#tSz|Na!T~|Zj-|i0V7(hLn<)It0I>+ooY_|aT zu;1f<%kcQi=S5L;$DutOrXDrB>w4#0*R}vuvY7!G<5-s=cvsi6stBcL0Hz9HDgY7j zbQO;-&dkir+A-yvuWs+SC;*(TmhG6@F{PBA-R+ne#6%=%oCa29SvUr8ak{QT03ad& zOcIDyl|xyURrSU7?d5~>%LnH%#`U}|8Ke@*vJ6Fx@xId)g-J?%r#Vhl-L)NnaU8F1 zHs1TyVyPk`qLN=+W*o<>=QjYZxBKhu{*BjPyWJg_NJZi}UT^nxRlf21Ypd0YiE@l) zHrZox(dEMj+hgyXn+4x>-7pTGr>7z>d_1q~cfb24fRs{<@zcjozwx!pT|d6;{jMKA zfBdu;n>WoglAR}zWZfLP%Zqa}>&Cq6`jo}Y)BqqI51J!qvwe4bba6HgLmbEXd_Jul zMK_18D2mg?{C2koATd5zFNvM0sAPkg8m1V+iQ%Fu(h8Qg;Vi&u8N*ZHctkx&%<^DLVmy6T0vz~mj zTuxTjoXyOy7LAC^3dc>;wJj5+oKs4t%f`&+Wg%+Mw{0E#n9^i_Q(@=fSaMdQ;}8v$ zk<8%O8@s4#DqI8r{)a#RB@uymI+v-K3i|+4Gt(T+jEKz4ax#^$IGvq6V&2)m`X(KrUx}OO%cTZ$Ajg3MmcT| ztuK6T4+K2AxcKOk&+qmAN0*M^029e(1gLW_CKVCDsm)c@Gyovxvb@*(dmfz6nwfXE zIXmY{&%+ph^40?YQPuzS{T~(HTh0zTrQVR$R7FHZ2r42eV2mUEg;uv#pKaY$KA)z~R95ji3z z3(h&`VjO4lX0cdIJa~3>HSwVE{`6#hR3akpoij6Jjw0R{ZF{U|^U`w_g7;ojkFf__ z2<5yiy>p=`yrVP>$G-Qz*mr$YyvzfEBe*W=Y(6uyX+fuDc{ZN`C>N`gVpW8T)AiNO zX0=}Xx*l}~NH?Y~ z=5;d%K;GZ%TQ%#m5)+8(Du}3>ipce@%_-mO|Bnak*cU}zSHuLs$2e#fn07H1?3%Jr z(KPghuQYSWV^>#SCZA#$We@Wa!6SgL{KvT->K%8 z-#XuR{ltTU@z2lydFYNY=dK?mXaBoD{zc^leMHR{&P4BDuc#5oU}}<*!f{iT_xg9g z`<8q~uCI6?g?GRH!=LW;{_i))F_nvxJRI2vQy~s{XkDl$vTGVm5`a7&iCum2aMFLX z+>#>|eZJW(7xVq$5Xw-oZTAQ7-Jk#6PI|ABr+jDTblj0EWat1$9H(Col{`hE=FA1( z>l15?*@Y5>VHnDy@XUv{1yNOoi3eP;zx(`eFQOFpF)CAL;H9o9w*mCGSF5kT{SpsQ pg}?*=%

@1|^z!uzT|He*l$FY?6IY6Ndl*002ovPDHLkV1lHz_`U!D literal 0 HcmV?d00001 diff --git a/run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/energy/ev_storage_adjust_front.png b/run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/energy/ev_storage_adjust_front.png new file mode 100644 index 0000000000000000000000000000000000000000..48d11cb4992362fb53ca5359f17b480bb948bac5 GIT binary patch literal 950 zcmV;n14;aeP)y=wCMISV4F?Z;Qi)zMTxLKQRAex= z6}F)nqUEi?M3^!V3SD`gr%#{f@i0Gs!$~KoJUhE{7r{hG`*$BI$VU41>F2jvNY7u%Y|W2k}ZTqOpzD@>3ibIvo$UQW^+S zQ(48N_aQpZzK?4cQ1hnFTYV$EQM=3fR*v@8`>3yP0AS?m2$lO;o`0f^+DHVCs&e_a zIi4(9p|`J}X3Ij@1&4PM23y%20FL7Tu&}g3nWhmaF5%YtZ2&CG0-&g*l$W9fT-!!< z6r_`Ap(0Sm$kZ=rJ|7K@G2-zA0Bx4V+Uhd$k+#lrIorkWku0Ut zSb39+)3YRwM(JBFVRqlc=>|WSlGiBrYfN6hfhr{fL*FB$2USW*uI3bDzfO?Z*&(?8 zHx1z$K1)fye6yRitV3^KKd&Ee;k%#5s0>yxFgV0PV;9=;MMQb9g1L=<+1uMC8mc0b z*~iT1!OpXmbvVE3u(+{}sq5r&I@`M$T%mH~uRZdXg(?(DxxKkXxTYG0f5NnFWPA5h=eiy{Nkc3~C=?=479e~$ z$ar#+6V=7E)%lqDeU>vlPZMuyrnD@8ueb!irjfq&C#qd=xO6jx3z()wJQgFKNbs_v zFfcSs&d_=F#UA2K&1~&tNG~lRRmpgAilU;Tdk?~uK_+gd{*P4P{$t0ONzJjhzel7t z%=$lfI8+s4Wo4Q1mTx=7W- Ye}z6|km@N0=l}o!07*qoM6N<$f~pI)RsaA1 literal 0 HcmV?d00001 diff --git a/run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/energy/ev_storage_adjust_side.png b/run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/energy/ev_storage_adjust_side.png new file mode 100644 index 0000000000000000000000000000000000000000..51103fd5ea648a8cfe19de471e3469709f8d3e28 GIT binary patch literal 927 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 literal 0 HcmV?d00001 diff --git a/run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/energy/ev_transformer_side.png b/run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/energy/ev_transformer_side.png new file mode 100644 index 0000000000000000000000000000000000000000..b8ace5c6110d2d767db8be46e05e95c882303b18 GIT binary patch literal 947 zcmV;k15EshP)RaRh^cM*f2(Bh$hh!~odG{J)x6G;;bO^h)yX-rJi#At}G)Pt#R=oRCo#zs<= zV3i8Aku}sJun!)oP;HAY50`oE%y_7uzu}|2cm9Is&&wmTucPAODv)&m91t3okwLf$ zj^|=q28vM7GZ_>iF-#jF6iL_d=lMEa#)Ag}WF6>jZ^0*hh?)-8iVw4I=ybIO&3@+4?aGJl#<-y12{k|79$pm@!G4eAf&*b>t}NA1}-2RC(BchH&PJ} zQ{Qli^U+aG9`8ddEFyR?Kvj7eT2X-KPWCf2G)!GxJ>?Y@bTl`Tlaqry($W2P#_=fB zB*|2Y&D(#nxoc2g86moo&&^$pp6Wt=nz>H;?q9eCUlr9zfPgz z@jz*aaA}B77A2pb?&a2=%Sd#L7n>S!y)5yybr#|Y_G_NOzw!g3I8egU=HKk>q}lo> z&Gz;#re%R+acj@z;+jiha|=_~$z*g4!^RUTzx=U-W!tDik%aHga-zGFt#q2HtJ5qd z5)2=zXCyjCVsnc(yMin($4T9Yaq9FiWua2I{5_`QAS_d-?`S)f)z!4Mwqh6t1HIiW z{Jubcna$ZJi-^t7Gtk$As;WHN)I{;YAf4?;Z~^75k3RKeZZ4fIjhLoQU2QGHXNFM} zg@%?kGKS9b+%^1p`MfjoKB;69sY)iNra|HUgR)?NsrkkKBV`%AFv|G1-?6l^PS&y* zd})a0<`$BvBtOnv10Wm;vzkiXfACpcMX^l)G@lQE+R6x?>*6mcq~hTa0DhkeK%k_A zb94Ln3kng2Zt%tn#~8m;K(RlUnVWHbo|)z1r> zP7aoPGC0&om57+r-H_Xg(jNp(CV*lma1DOhZQsiDj9ns)kS{cpg&K_zz57 Va0o_*#DM?+002ovPDHLkV1l-*wcY># literal 0 HcmV?d00001 diff --git a/run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/energy/hv_storage_front.png b/run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/energy/hv_storage_front.png new file mode 100644 index 0000000000000000000000000000000000000000..f3bb996a1291f2a2c93091a2cb9c4a2f862ea98d GIT binary patch literal 861 zcmV-j1ETziP)z|nAQ0(I$1liF{>2Q%pZwO78%aW7$780OnAUR@J;j|&^Mpd5cLVoKqGSk zt^?Oas9QEdfReCHVJi#m-H-P6oO{kayvXNI_@LuQ1`NY=T^D1dl=6M0l*E`aR>KJS zzT}>V5USM}LWp~U>`lZXwjB=FXPt&jT=4WQNY~F+kxq16`s%MYg)-iYeS|}Vw0FO&$3;>Uc#p3ev;P9zi3lA~I ziQOHSCjTD0nrpQql+wb3;^48$O9zF8O=SzO5rMW5D-Sz90i5GU-c5_pE z+w+EDoFBXLRw`L8l~=IU|IXml_$XzJk51l5#bdf@0zhA~CwqOi<7V=eiif_g{Y2+7bzx zdf8bco$XPpp>buUSXXDwOl4QF6^riF4O7zstXe&LZX|d9JA217tE&#d#1n!t#%pf1 zp>eYm0swZkM#le{o3=Ca3yX>SBYpc*Kh9;P6hSjcsOHufI&`3qbB}vMNMECbagUP! niy8L_MxKy_5Q33XiV*SydNpY6GMXS%00000NkvXXu0mjf1HGM( literal 0 HcmV?d00001 diff --git a/run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/energy/hv_storage_side.png b/run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/energy/hv_storage_side.png new file mode 100644 index 0000000000000000000000000000000000000000..82662dd1ca62a6e75d78c3362201969ad16e1343 GIT binary patch literal 828 zcmV-C1H=4@P) zppND^_ndpqJv~&=_x!zlA3S+zpJABEWD+5$lyY6AlthRyW+Mn)S8~UJ5ZX3_5OPQ0 z&EZfW81(s4DAf}4iNmKZjyvYl%)MI0fqXxV?5P{-{g7%|hGBTU-r3nX!Z{N{#^Z6r zFaQAeT04$5>}yntF$PK_S8m+{063g4B<3~4bcDp=f_%gDP)aAG(T3w^Yqpes?CD*y zcoD+5e_)`htTdQk*!TXm*XM%(Oij-q0KjB48l9M^Z#?~Z^d~|nys_|k$GfMmIy4GK%}Pf!HagKRCQU&&g!jcmi6#Odu>ITE8X00<^0FqijH=?0ZklP9wQ5BsLP$zUDRqQcw>oEjJ~1%-Z9`s8%ln?#*G~vx z)E$iE=H_GtR^D%ElTu140RR91N{AGqqq}!gN%4~OrQN}Z>$=GAPaPQ@L;uiqT}o-1 zrus7qKnS5y0AVsRI_3z8H-|&TnO?t6liVp>n=gd;-^K)IEV2fNzX@i?I_~`XIgB`G zyUW(McJ(FZ=3FTsy?kZcHs>5+j0wK|_!*&^-(xo2Y~Eg7brjV!k;i)Qn)5#*)m<%KfZ3MsH~Zqp6>rLSYEs# zJFw#O;8!P^L$pU}R);Ed0H>c3ahrzBVa^$Mj%A zlQx3~_ttXma7PH~Qi2(G2>!d6aR(#l2#GPq2r8v8#=ilvHD-tSTV!+q0000$*LZvUSyj9;A|PQAW@fVK3N{HW3!0tY||p%n~|<1w|dA*P$*wggTUhc_&wzEk5#IlH^5yN~WGY zezb1Kf%?OZBk?{&h~4*QG*nXw0QjT-LE3D`P)acNuOWn?n#%r>4-!Ta!e}fIK2Z*J zU58qFHytvEL7%^IJi6lN^;_mJFin#Xvb?ZhED(nLq2%@EPb8A4woC}Iv7%~To6lwq zq|J5=iPfd0*{oq0hTsfg>1!hCrwk#4>f!kG^k+p;(wcUkZasHAdXT+ak$S&q&bi|_ zKU1mTOgHBo**4i*8;pOPvMlR=50WHxcJ=Jp72*QGSTrojIRJo$)9rWe-YcuBMgW+m zspjQTN)Z5W2VOU~o_~6~0{{R3fU#(JWzi~1X*!*boNT*#?HYuTF=i8sbMDSn&$OKF zym_gtq?iyZ`7H%cHSYHZN`K7Fdc8hf*9$lA3)NH>6c)PO?qnj-+12xFYB1n0T3E;^ zF6DPxlL)abGwWNjj8O^zs3(<1O#q|UY- x+o67)k{gBMyhs6=EgbW6jw3!9h-F(EO|n20mkg>h`|YQ~#gZpkiox5cPgHkUBH zm?JX*riD1L2x7o$N^vNa6b_}Qr|&uM$8NUgPk7L$r+akWa9tN;q?D3UDJ3wbj8!p0 zQVP%a5kl1}LkM|3Cx_#)sAWYWHJTQ1%Fdb3t}OY+(9Yw5BPW|plseX%ot~(ztJ8Ho z91gFqm#F74&V_B;x~>Djt>N^!zMg)i7-P_$`r+4G0N{IG#VH4L!{>s;4>apWNYk{} zg+kx?OUZXTC#R;jZrO|pc|13l=xDc^TW0>g7mh>_Kyh^q1HkJ-p|HGsqJQ8?{w2mZ z{&vfs=?6o9jWt?PN@;efaN?6MSe0=uqyj1gKYj7ao%DoMkVDJdm3 z&Dw?hBK}{wT;3>eVEg6e(N{_cDJ4QkDZqp-$+0#&eqs`_L&(n;<>?BQew|zA0CbmKb&z&B`E~wd?lAH=ASRjPA|>RB21_j zFhj=Gn}Z*`pO6Yre_x7f0RZSdJCOZn`Dn6BDfRoveWg@qYm91vKSsy4)kdy=dl>)# zfE;Yu_r{JL!C-Lm-rXZz$>Qqji h7laUkky45f@-Hf*g#GOhudx6C002ovPDHLkV1lV$kW2so literal 0 HcmV?d00001 diff --git a/run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/energy/lv_storage_front.png b/run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/energy/lv_storage_front.png new file mode 100644 index 0000000000000000000000000000000000000000..44fe7d848a635ade8b3cc84fc1a797c848b9a3fa GIT binary patch literal 707 zcmV;!0zCbRP)vS|J6eSEx*|71=L2unH(Y;zf#gP`l@Qaw{qBeo z#iA-EvzD>ygZWd_(srKG8qVtyz1^SaW8!df98Qju59?mR0W;y`P4Yx z-)+Z^lyGPr`Z2K58oChKHZ3oHe#ZH-=6Ld)oae9gNBWeo#(Xm!sS1NuLTL?J3t9^y zMozBd_w|lDXK>Ep`#2S``3SbOW@IqZ{;JaEw9d0wELg2pM4&8k>dKmUHg54gbFVKuQB5 zg3*E!;qt6Ti{N}eWko-tQ?`h;bmMao)KR pn$}Yl2hi+VlV$(_002ovPDHLkV1oSdOtb(1 literal 0 HcmV?d00001 diff --git a/run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/energy/lv_storage_side.png b/run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/energy/lv_storage_side.png new file mode 100644 index 0000000000000000000000000000000000000000..7d0cf021906253e1b3db6d12d256cbdc3e8d2d6e GIT binary patch literal 692 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 XuN_PX(6N#d00000NkvXXu0mjfFs4=_ literal 0 HcmV?d00001 diff --git a/run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/energy/mv_transformer_front.png b/run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/energy/mv_transformer_front.png new file mode 100644 index 0000000000000000000000000000000000000000..cfd3387341d9ae5c42177bf1f2a7c59f85c606dc GIT binary patch literal 800 zcmV+*1K<3KP)$=J8WB30EYkbaP1qn zkT?%JH>4!7Fbp-SobqT@2@|PJkWi37psFCDE)@)9X_X9sDz$2twnK$@bYQ?@=#U{| z0Ra*oqN)O75LULTBBc-6O|Nfa-+S&o_dFQ9FtB~YFa6&~E`9m6GcXW@g2NgDr2%Nr zl#Bvuh_)t?5uro`0ii646G{o2DCB1*+_B-D(pan>0oVs8-u&qO_jo2VfApojPv*u) z^X~Xl;|14hMP)3EQaip+2>^Uozxm<2Zv&80o_cGszR?6AmF)I~8tnFN}>=E9GzhzQYG|LjWkH#^T_C=lkAa!7WYh_ok-$ zJ;t+?aR4$&I3=v!Xaaa5!+WhiHczeO3$9*S?&RIglkemUu31@5lxaVFSX*7QT2mQ| zg~PM;M$_vAUNZ8(4V;nM>e~EV)d1w&)z4Wb1E5+dw>B>P+MA<*5F)#8pHhkfnSZ`{ z{dDbm?FIl4a7!>Tno~(qZ#3r*pYQ#AhFIL+@uRk()@B`k>~!sV?MA6oisIJoPW$@OG9}TR@Hg00007nsdJTw~< zs|j=?*^>M*yUhpM1Df-);hsN)CcRX(iK?v@($puIKKyy6>Hw|9ttv zy~ZC>N@DEc&d#N!^M0)wD~ybdWjVK6bL-&Wy$*oIg=(=>BBF));{cS_M`y~M^V!*% zMMj(V9sn=^*IIpW=ETOxA|lFWv;9Fd2nLf=#kul~)!G=# zII|YSH~^WZoE%nfGy&v?hbJe-BO$xtE48xH0K|U(pfZEO;IAit4}0$F+Pc-6WFpSL zwNP&~!+zgrou;}R{4f*T8GiBYq1KO_IXshntGpZf~#K18{eV(?Z_s?Dy|(*5~Ht z;v|0Z=n>ai0n}=DMhb;r9{dTwuT>M7x~^Nud#h{f04kMAr``7Qt~+#)Vi5}wjgOC6 zV*$Kzv|MjA+pX5_vuCSo>u2Bf0jN~v^Fz5@P6Pwz>Wy!bI8M?;E1k(^lUNYTFh<09 m5(`F5%7pU_aRzG{&-@P{2y*QR)3KER0000Nkl6o#L=ebwo7 zViRT>aWQxSdl-m{A`Xa`h~l9Cz>P~mT=-|)_yhbCf=dM*FVmCg!fOYHWYFj&)BRO_ zRduRd#E9U$n|F0M5AS)8`t`X$e}^wThKNWd z=ZxgS^3D;i>#){gQ_0+42b}k;`UuugQX=#L>nx=RDJ8nDBMt-F7`CT7Ebkl>W56z# zOMY1%vhD+xMpaM*KtMZET%)T(S|z85(u%NNqqM=;4y!Oca(Ra;!Z1Xf^Jrs;p{D_z ze;6r3DH){=)@V-euNZmHt%Cz>PJx^=hlhu3Zcf<$<}+@8`yDYx{;Sbw#I@aBcAvk_ z@!h*TdgTh#iWO;i@0rbJjK^bMyYV)!ym13-Evxk!+W7^Pg4z^XH!fYeOc(|#U~{X) z7&$sRX0kP5|K^t*EEW$Wc;f1ut4}}2pC>2GW;3J+Rx5+w*kC%HvN_)1#l6?rd-E;M z);-QBYOQ1ujIoqFAf-YBr43CAHVuJV3is~)MNR{^zy69J_V*u1@c8^m=1)CC2#JZ& zq@1x*Dt!oaUB`51hZkPjOvYoZ za~N%CfC5nJ{1N_fsY1V6^VocT9->GAG}G;EKKb|~st8gmr4*cV_^v}K#V`z{oB??E z{ST>9@ZMu%h=kD7uY2Bk?*oiB|J!;&BULClv+8@i_mq^d#u$G5>1X`bgj58hG|y>44&0EVCM=bRHe zcI+DLN&x~yARI2Dui-cAs4R&J^;>1pDpYxsb z{W6rY@Gj5v>XBaQ6+iv*YjPowfZAH5lms8~ArNCC#sEM{kYyRpS+Xp{7=uz8ZN2A{ z`-fQDAf-eI!JDL%P)Y$1LLh{QRFc*0EqSrUqo>D6DJ9l6%&)Eih%x?Ge#6?-gb;Dg z5u9f-J15I?w9e4hJJzKkD+)GM4O-!?#Z(5JX}k|uYsvGRx@nL~vC|(gnO#uV20fWf zcsZF;Rt8NX3h)6SfXuLUiHw4fBF@$bDKKS;kP4-9v_P>t91ugGX=<{pK-(6vl(g&? z#hr|`Dlu_Q*mh_oxm|DADhi$+9ig2yIOmv7r*w-xcF}MU_vx($?9PXD5}b@KS?C+i zy3a_xlC#AbAMEWxjOY*&MNu#sjcB*qh+RQd&A_c$mNW7!v1UyzHt5_VrQ&Tl#54^N z&@M&ly5{`+f=;(XoaY?KkLjNd82KT2KeD*{Hy8DaX?{$Zuen&x7>z~*AJ9@LidKt$ zzt48N1zkavW|V_VR_PTk&infTX{( z!;^bo;N}zl`r#qV)89Dwc8q)Rh}DnZQB9Az|MkzDeg7q&fA%Rcc#5JxJpAgLwEzAd zPaZ#}-PuM-^*?I@1Q24tJIAJ~_~^j{o?iSak0005cNkl0`+oKQ zFB^l;ja)3FsEp?kOtLwU*chW37yIsH(zDk^_2-tu-^k%r1PYu|0U;?!UhJon%wt9^+e{yEo-wRrSpPfO9>6_VniFrn@8J ypWFTWi`~6#Tg{b`{{G{q{|c7m?iU8FIp^O_-*T#@!^TWkn{ZCf_ueP>uH#gh^dj4=Sj7>O~WwWir@QZDx} zGj|oMwZ?nTwOfDEa{o_(_nxuQ?O2mxT~Pqwih|i+eq#Rq651HFUqd9J(5xiEuQ^)n zoZ9A1jO=KTueMloIX0mX5fX~qiw~&Pw$cCWb1Xet=F;?ePMYa1+UxZ7^#SnVJG*#q&-?8D;3F!P3OE0_gEj`GAcLo#X41CmHH7eDTdBBaLxJM@Ip;c4dx%N)ItcvMfVsu%U<$3PKT4 z`3egQ3!FH9oUgu{V&5kpGr!#A%$c)1ez=5RUWCCRLPF2+N&!p{(ghglanZ|Fvd`}1`)vu36Y4907YZ>y9^BsuxGr%{$nR-udc9nVuInp zem?#D03igdwO})hF=(SL07hFv)aqh3dZt~-@d*sNp`5weoy zrRO)Y@6Zt>C5poH!q7&9gmNwJFF)eP>1npV`Z7u>l&D5wbFNN930Uu00000NkvXXu0mjfw4!md literal 0 HcmV?d00001 diff --git a/run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/generators/gas_turbine_top_on.mcmeta b/run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/generators/gas_turbine_top_on.mcmeta new file mode 100644 index 000000000..24f9c2fae --- /dev/null +++ b/run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/generators/gas_turbine_top_on.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 1 + } +} diff --git a/run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/generators/gas_turbine_top_on.png b/run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/generators/gas_turbine_top_on.png new file mode 100644 index 0000000000000000000000000000000000000000..b437165ea7092a87010a3bc3b0dcd5d595ada91f GIT binary patch literal 3868 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 Wb)6C_34|g50000&od+d literal 0 HcmV?d00001 diff --git a/run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/generators/generator_front_on.png b/run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/generators/generator_front_on.png new file mode 100644 index 0000000000000000000000000000000000000000..4838211358b9bf92aff4d0c35fa7ca6286bfc14a GIT binary patch literal 702 zcmV;v0zv(WP)_X%yVTD+Mgz^D=4}ZXpzhUW3vI*csJY>Kq za*PJa!eYjVVLZ3HtE;M6usN#}_Wu62nRS37f{3QBX71hH0HAk>F}5Z##+)+|v#8$s zZC9isVh8~M0HF6yL;zrBW{!kkm&+kdp1gXCh$vF$i!%Ul_wW0=B^NVqty$CA$;UVh z%#lUgYMoH~?M0I(4&JONwFM+5T&~V1DZP602Aky8+Q-vV zjst|?rbx^jRW(ah>r5z3SF4q_2JUFqQ%cu%b`TLUbbyowX`)So_W(ZT>aLeAUCy;S z0JrX?lmO7oLI-IQ<3P+MR|gLss^pX=s;!n{YKVc-#s(sFGk4$I*vwT_1Viuc0Rt0C zDYevq)J;)pc2zgU0PkKrt0M28?B!a``@zBMn)A`ie?%n^sj0NaratD30Q>v<(@%%b zm!JQboc;OiuTF8dE#4mFpAVn@A20s0`)lal&9DdP?zL7}Eq>>((c9zKCqxv^zq~j+ z4CC_l%^&0V#Z`-l1E84#;HUY5dH8&`@L}`*jVmSRVTkwc-Z7pWAN|*d$znct)07gH zTyh?_w|{`ircZyuy2k1Cb=nf3cs|b^-!Db-c;Ujul#+^s2M-_BQfjNFM$AnrQY1no kt|b$aNM(-51icf-ZzK`39NkSE&j0`b07*qoM6N<$f`vp!rT_o{ literal 0 HcmV?d00001 diff --git a/run/resourcepacks/unity/assets/techreborn/textures/blocks/machine/generators/generator_machine_side.png b/run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/generators/generator_side.png similarity index 100% rename from run/resourcepacks/unity/assets/techreborn/textures/blocks/machine/generators/generator_machine_side.png rename to run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/generators/generator_side.png diff --git a/run/resourcepacks/unity/assets/techreborn/textures/blocks/machine/generators/generator_machine_top.png b/run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/generators/generator_top.png similarity index 100% rename from run/resourcepacks/unity/assets/techreborn/textures/blocks/machine/generators/generator_machine_top.png rename to run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/generators/generator_top.png diff --git a/run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/generators/lightning_rod_side.png b/run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/generators/lightning_rod_side.png new file mode 100644 index 0000000000000000000000000000000000000000..07e150857e21c1e9a094c0ac42504cdd50c8ba51 GIT binary patch literal 806 zcmV+>1KIqEP)3mP2U`l0cdk0Zvak9+x?%#Bs$4;kH{+wEf?N+6W{j~Kw>R)UB~$FVN{i4?_A>O>tAu~)z5H8p5XK+zjE~Hv#h=M9qsXT zLX0dz4^JvU`wxK+~42l zkGIdDsx;PORoQy~+`}40xbx9V%;s}qN-SDS%^6z_)Ka*8d&+BXT|`CyN1pm{g$Bqa zlVW6Z>n}!2OBBH7oB-kE`Z|-zgnV!;YNY@MLoS7!5~*ZVl-+yxC^_MrLptB#{hZa+ z6>6!B#$#+_DL_0h*~XF!h!Ijuj7AGM=SU%7Rh1hzZ_&q|oHA-HG4zNws0yN%zVoOk kA@o?=AXcGPh6`i<1-{^IAg-IO%m4rY07*qoM6N<$g2vo($^ZZW literal 0 HcmV?d00001 diff --git a/run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/generators/lightning_rod_top.png b/run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/generators/lightning_rod_top.png new file mode 100644 index 0000000000000000000000000000000000000000..b873a25a56a7e52939cadae34c8e98eac6e0e043 GIT binary patch literal 818 zcmV-21I_%2P){L1ete5i2NN1Pt1R2v$(KaH9*CqEHMXf`SOeN;e{cf>47{ zZM6_+WyF#i3n4>XltMEmZ|1&t&v6kL8eAWKIN$$&^25)UEyhSRp;rW)bNsrr#PHBv zID-xNPq}$7JieP4_ zD*4tHB7$=cVqmqSe0@V%Zr?;i$g+$y%>biT8=#VA$m!3%ur#ak>{CYo5D_l7u2GgH z8V$7wfGNyAI)!r%jgjwv`h_CoB$8Da8m#f{`9|nmr(ssK|y4w0^XTIX({2XRRyJ5Hjui4ZDc#Do>F7Iwgl5j#Lg%orjDnV_nwRoX&Q8rP1UHkdvrMHB_u z_ug~P{~QKg02}zEpY*B2+xLB1dq_;rLJ0iz z`frB49vaZbaPLls8y|fPF=9m$d7ksZhc~F#>vVs8!1nGQ)>@uF9kF}$8Y05}!2vNT zv`!rVd_+-IM8NtKDa(?dIvw(tI(TLyA&rwEkr*j)00-KE%=Z^;%V;GOeRAq?- z!D?m5r>Cjcr@4B4A5he4HRcx<$&8}keaKp)g)x@-`L`H6>ao1KfzpN~0qd%Q7y^?? z!7umkBJyUQt!9hCpod0t@y`Y4X9Ii`tkDcl`!w2ZocCA>kx5ao*=(|O`7$R*M>N}Q zl*yQ>&$8KSBT3k~w$HHNWovtvi;D|t){;c9NkNK{S1+FP`qiIkYv^~oBob)DX|Ia} zhe8u1(tG#-tu^nyzf1(QNB}f%Us~eI>N-_fvAnU#%K9eWIab#;SlwuHWo3;NBdZ%* z%+AddC6MPix-3eHV#4C$CC>UiYEwBjvqV5*WO&-cW|k+zAqqwCfti_E@;oOvhx+`B zFH=>PRK7xjV64Tv3T-ls(P(3-$^xSe&Q(~Op{;?GFgD{ql3$h|-kCA(00000NkvXX Hu0mjf7|wQe literal 0 HcmV?d00001 diff --git a/run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/generators/magic_energy_absorber_side_on.png b/run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/generators/magic_energy_absorber_side_on.png new file mode 100644 index 0000000000000000000000000000000000000000..b4bc07782c77d89b76fa3c3323840d9d1258281c GIT binary patch literal 896 zcmV-`1AqL9P)Zmyy1$C>B6@B94h!atyY;0vFxIQQ$tV4NcWnbt@tan@s%=5pp?Q|L+5=h6p}hFOkF`q zDbYITpZP`JnJ!{(&2saz11w*=%$8%9Fn?d5^5Y3=YkfOP;4WQ@+LNH1`~V|0d) zg0xyi$cRW4P=bh#QVZTW@;sw=`*qHq>n2NU1fcJkMJB(07;6neM(o{wjZaQ@QI{l4 zO;00@PBF&tLeBy(?Yf9k6`tO9iIvp~JD>Uur7~_WFEOzDclPg^p-|8a^-W=o0q;@H z1(GCT{LDHU8n)5%#2@_db2shn3L#b*KeLghddJw;kK%(s%0S;vLz?G!K$+mlvW(uI zpAe#nINnORT;|}=65iL?yW=KxbrJ85Y~;}JEY39%MUZD1&N`G75lMYLg+e1=eES$6 z=-gD`qsdm{NU-C{^NfGAg&I^ExUk6%G!~lBTzi@&OJF&vW?0O=x3K&U$KT%IL)Xl-k^)!9|XZx8Zy% z&RX7j`Cs1qxQpebB^nwnNs=J5G$T!Gw6@;M;GQbQVhI&1Jg~Nw@!Gx{s95pl;4)G+ zVvVJ-v56!}uv#PDKKy>jvy9y2IO~X%!sr|s#YB-rMv6R3iDZP1-MvIaG5QX_&7URi`-Dp6 zA<9V!FCxPm$EFvkZCzn$@fsr|BW!H^POVns<)g>2*3!PzV&?Ume0{x3n(h!4e3oT+ z@5!vqBBKXBW$pHDl*ropD$Ct2MYK3yW_P8+o2Spv zIB^5-J@^FY9M)M6FrcdB>2LL^*C(mhC)i0-F1K2Ib-6{a*W-(epW_mTF@_KV-g|5a z0f`VoU}O0VoA)+}K~Pl=HeaCE+vMmg$C*9x8r$33T>tFZA)Uq;Y*O;5DoM#Reds+# z^LJ4*K=`rB3Qz1hhseOACwG6q$y0A*jKLU#a}M+Ig)jB+^9>f4Zw`5gqBv`D$-k7W zC5mF*0KDeZB;Wn8jt7vuVCt#;RI62Dj5z216QchIEXGKwR3hXB-g(PncjbXpt+m4; dL?zF2{syS~dc{_;9g6?}002ovPDHLkV1m^bbqW9g literal 0 HcmV?d00001 diff --git a/run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/generators/magic_energy_absorber_top_on.png b/run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/generators/magic_energy_absorber_top_on.png new file mode 100644 index 0000000000000000000000000000000000000000..5bf89df1038e0b583697fe9c492ceea705d3ddd6 GIT binary patch literal 791 zcmV+y1L*vTP)XtSoZi@LPxo-g_?Jx|aiok1=`Icg(bZWzWL9oLo9eGMJbc zrzKE(DnVDr7P9VfmA(q5anQd?5s^0^%+`8SO z-s)4YPmMW z!+Vc-2>?T?DuG(9#pd-r^agF}b;m=~r)Z9UO|4dCJX^+R9_Jh}MnVWkj1f%`W2AfL zb-cewii(-B(S3p#|6u#CLu_=PrP&@d!P}S{B7FbE z8ee?)KB_~HzWnGNUOn;#&N-ZOc<*r^FMnmvKQqVbne!tak{VtFpZ!ZogrtV}A$SM( zKgtgmejxy8QL=yUER9BkloH Va#cJ8;8Oqq002ovPDHLkV1llZZLR8sZ6Y7ks#W|K}o70b78zr5PJ4&PpMLVOiij#RJLi0(fru%kTnYeu_09U-r9~n~ znakxQ^scqP_yh;N&V0R7GF`00HB2oESx^T5?2#VKPBu zEj0+izIuIDMN*2+d1Gx1R~4Y)ZwL!>L1W39i^~^H?;mY$Qpur|^8I(;Hk&O({BN?b z{N}F@A5;KgK?JgNdiKu;AASU?BvQTiGcz-9t*j!Vh&xb!-re2;G)I3Q=Tr`#9^F}7es=ooY~%d-#l^}y?+ObU zw7%7Pdv&cn)dIl&%l-cRz*$t)(f04X>%DGwT39b%OwiaWOgRN*e*DXWRsXUZAz{4=!8y0`-upRb#ERCnRnAUM2E(DUij+UcAX==SF0{hd(-*xmZAs$`ZF*oTnJigCLv~#B*FkvLY8GQhAhj9qA&bX+Odt98{g;Dod+Wf z)$SA)Nfd|yFmx7NTZ`f(F*v1F(QYekj4fFOv%P17FnjN^EZ4@kqLYA9zLklIqSD41 z{dZ-xoagT+Cv6NxjInXFuTp^m7y!^cJk}aGl>j0rjZ9J$bCzoNpZM`|2=XKiyoy^x^tK z>sNCTvnT4`4qouiF|pOkx0`l|c1=J~zNDD`!so!FmGP=g%bJKoKx(4_MqpN_AQ4bCC(6AbM$bk2OiAqEFe}9HB<#}!n96Hint202u78hF97&AT7@X<4|u{H*;O=gVN#(Gy6Z9?$YX4)F0)YZM_ YAK^}=crmUa4gdfE07*qoM6N<$f_-F8umAu6 literal 0 HcmV?d00001 diff --git a/run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/generators/magic_energy_converter_top_off.png b/run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/generators/magic_energy_converter_top_off.png new file mode 100644 index 0000000000000000000000000000000000000000..5cdd773274ac5eac4afcbed2889dddf2256d1ad3 GIT binary patch literal 722 zcmV;@0xkWCP)_TqCqM|R-z_lgq2o8Mg;}YB&>f@lYU0SY9RD!^g$$X6DloByXiHv55k~p4YIEH zzUQ31cY_Pjs2{M_dSE@~!Pq!6vzjb;MC1^ou&|0U0H}a-E=2E~t5hl$iDHah+qQV` z5z!a}005w>)>;5yW@bjj<>lox%{`qe5F&c-iyuChv;Qr4@B8=cBI_s%0RXZPdfMAo zR#wt9EzZtt-r7b90l>ug^Ny`;BJ!dzSNUD8W)&1Lsw!ZzYW3rXh56#_*Tuz=k((lN z`_|1;sWkJpkR+)ntXfr{x&)cI#_Ez}+xB)!(gTMEYTT@F^w{x^&Mrh_5Gs|bC}5Ul zM3iOO!n=89-qhTjrn&1ocAqIORLj3bD2zN9p#? z-b=kbiy>V2zQk89TQq}%gZYP5G3XLfRhLj}YjfHAwd>ar(c!@(29TK>8dkrWoUE&_H^vxa zthJ;9NnITxju(o|EUb^8Ol&7$K6yE%sVD_?*IS* literal 0 HcmV?d00001 diff --git a/run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/generators/magic_energy_converter_top_on.png b/run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/generators/magic_energy_converter_top_on.png new file mode 100644 index 0000000000000000000000000000000000000000..9ae94694471c073830bc0eac463d8eef9ea2ae70 GIT binary patch literal 680 zcmV;Z0$2TsP)?z!LR zC6cS7qkf4)L&@RA86Ay=m)fE+b(EPv?_u~B8n8vNJqyRH7Uq) z#_!&H&S_ypwCD%C&-=prxTi1YL`2M0DH4&SoK;jzO#ql8gphI!A@uuwPs};zbEi(k z7>UR^2LOPXdG7&;h=>r;?(S|`4!n9l&qNesTv}P%tNzyzW4w6bJo~^^N&u>qW=@~% z^?GGla&xq5b+}*vKO6P1x~{5k=0Em-?(J87QaCeHxN3iYX!_VdbF>94Og2?@p;7Mu zn3^bxQVl~xgJmd4L=LuwqR`DR0cdV)W`Kw?aH6}-?JkjXgnoZt4OCSXGgnnL*riKGY032Dne|T2xs~!03(GNI>~5(lg~EGZvNtm}sF@gaz!!~n z_uWME)KZV%v1v(}863R#?1=$*Vt=gB0mgxmjm?{vFU@Z4q;_}b zXk%x5tOmG+#hf!UQ_fiwIcE>lTb%@$Ssjqkk+Li+p!wx%t<^p_-Z@91U^5E^_g2^U zVr&4+Jl)-PfQTFd;*rC(!9nMobIyCurYLGPBAT0D5)u8d=!tyrcnjwo5vdq?XJ!Wt z3_xN!dwgnmcvw}v_kXne+eK9^iXz9vp6S*5c@_H&#=l@9I>G3X6s?g9x2+CCX|DTAI1n3bF34(Xe+4iK^mlSSXj6LIJz4`SwgFy*yToZ+`jbcLr zchfZ?gb>Dr!5Iv9@$<`ODYO}EKRK74q`Py}H9`r~&Voy_GcH|lZ*{TuCj4#OQf6qa-n-t-B@BsL1ePhD)#+CWY7h4Lk#GX7z1Vj zO=c1j8M@~x5fS9RV>c*~8h|-(D07LK6>w}E$4T1^B7n7k42{t|=`IwB+uWWGGJ^J` zC(N4s@NCCzVvK<@(Oo^qjzdckuhR>=eCt)$hhTD9%m?Nq4 zAQ08XoD+8w$f&(2?1?1oW*)c2L<(%?aiR#yh1>V-Ot=?>?ZyOE=fXAz=W*V9>(u9Q zBVqt>Jl${=@qOZXOzOA+foMBe6gh z?LrFLMwmH^I#2%n=Wm{0Um#%MMiQ@Hzg_7fB48dTXnh`co35g|dHnGwx>tz9hWGFO s#Q6VL#YP&C(6iB^1MZN4u@@)*0fZ4|j#0006~Nkl47p6o%nZn~BV%lZK$0R96uv5II&KppA%Uz2oD?P!{)xw)Is5GOLy?9md>8QQ(I-Ft^m7JD ziqhwXqC^<(4q8d?07N7r1rMjFV)G8PQazmW^K*J@lv)5#6a+F7t%}Wtg<;*$TDZTx z5|&6{6PQN{YqyZ7%XCwElL>*MGKjUY9UF;y#|urXPzuZhM}_EZb^5B!$WLt%zZ|*P*m7#HWXDZ{`j5h)^T^P zZ*Ewv_PF}Y2xsgB(lHNNv*VpW=5BPX>`B_0754pd;V{bJQ;Zy-cmDOs+ zVkn$Ef5q90*X&w@Z~#1mQY+RP?#bTXh=@WY)olh3wvUfQI1kq!J}Z#bnl?=g%LNur zbx&sN42ywrTr<=KU!Hvns<=6&R$80LNFp397560FNOvj%;ZARzN8S9dppJ)3yGP0} zkO|d2aC0_y|FBp-V>~+HyQ8m=1T#Zx#oY;atQ%&X-R2|vPmicosn%z@b&k)zA?(vx znNFJ;5rKrGqF8r=AT2mJIz}W3bE=AP`SvXyMns?@cmyJfihu}i9TCOcP${4w5!A(k Ze*t4&htf~O!ZrW^002ovPDHLkV1hPQH7x)D literal 0 HcmV?d00001 diff --git a/run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/generators/plasmagenerator_side_on.png b/run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/generators/plasmagenerator_side_on.png new file mode 100644 index 0000000000000000000000000000000000000000..70475f16c98ef6bf21fed6d7d60337580b063b4f GIT binary patch literal 734 zcmV<40wMj0P)&uU#&6oBz>t-a4Z z_fKvb0~IW>P$YC9NM0nb;n3dR604NFq;elqQ z4wdSaS}K|o_sbQd$&6R8enCZ*S_a;|e@99W0R%KDsYxVFL(Noh%^5ZuvS!SU>Vc{IW=1(V5?Xa0usrwzx`%%`U#XyE2`&vIvce_i=u^$DxxiuvpSBFOGR z%85sZhqU9C4|2+jKMF@;cjFBM3u>8Lfa&+;)EBMnNf5cy{#Z{yUuK^q4qtaQ81m(5K-_T zTOGih-FAz+@zueK^V9zcE_#-C4}$MLH1u6ZGj6GFWV2wXg{Ezo&F1{xwOqUw9*trC z)<`+=&mytfgS#=EWz2%GN|=!ma5G9@*y{R0@ciR~mp2o-{g%`;L_juktQzapzqI2M zeqA5&^H0G^- zQj6g@QJur%$A|=8jjSSEUtM8dad%V%b4Nr`5fH&@K}4xmQAwa6?&P-RKb0ns&1Bd% QOaK4?07*qoM6N<$f?m>5dH?_b literal 0 HcmV?d00001 diff --git a/run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/generators/plasmagenerator_top_off.png b/run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/generators/plasmagenerator_top_off.png new file mode 100644 index 0000000000000000000000000000000000000000..8a03eb508590558e27a11d5ea9ddf7cb33bf5b71 GIT binary patch literal 737 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 M07*qoM6N<$g4z^9&Hw-a literal 0 HcmV?d00001 diff --git a/run/resourcepacks/unity/assets/techreborn/textures/blocks/machine/generators/thermal_generator_side_on.png.mcmeta b/run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/generators/plasmagenerator_top_on.png.mcmeta similarity index 100% rename from run/resourcepacks/unity/assets/techreborn/textures/blocks/machine/generators/thermal_generator_side_on.png.mcmeta rename to run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/generators/plasmagenerator_top_on.png.mcmeta diff --git a/run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/generators/semi_fluid_generator_side_off.png b/run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/generators/semi_fluid_generator_side_off.png new file mode 100644 index 0000000000000000000000000000000000000000..bc7f286b9b9ae85568031ec84fbf490929497881 GIT binary patch literal 775 zcmV+i1Ni)jP))Tu zu9dI8d`!*>tu;z1-mCYHF$Mq;L8PIL=H~huKkV`2v*&27H905#{ObyU*4lmey~hv{ zX_QisQdys0;Jn9Lht0L{ZX0mJ!0j%AHPoC5yMT3;T7{f5-g{z7Xk++bzF>WRNsIxz zUaxt*K4ZHJSUOEX6#xP4$Z?Bq3h9lKBT6g6c8k&mV?9=3_~gNYCPGRP=LWPf#IU0S ze)t%vLaha*4c2I`-`%n|3_LqM#g-f>rEqq3#{T{crM8GvK;gY-bA3ZsP;*5qu+DM$ z_AQ@2d&|ldfRGXmu%$O*j9gq? zG8<NVeg`wiZE z>d`TuA0D8MqtPiT^8D8q_x$P6F{|a02I#w&X~uEHdw+NR&4!W-A?zqI(VAlZ;rxHR zNo5!YYz&bQc04{jpdKA_yV>yM>nG$~D7B)s#yQ7gvE=E0{L!NW{9vg$V~sKV_WLVR zNk|p;rc+K%PSD0-j7A$viUFeyIVY_1oL|0y-kHos{sn0)leQjpyh;E7002ovPDHLk FV1mh;W#Iq- literal 0 HcmV?d00001 diff --git a/run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/generators/semi_fluid_generator_top_off.png b/run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/generators/semi_fluid_generator_top_off.png new file mode 100644 index 0000000000000000000000000000000000000000..565de6c27d009d780b801ecdc3375f0d397ea06f GIT binary patch literal 842 zcmV-Q1GW5#P)Ani`Ug=7&BW}yp3BYyPLG$h0b`ahVDnaREPz3=-T7l{LUcIUTw&Uqdl_1(SS zqzVB63g^&T6MV#nK#W3+0RRz5l7y;qBuPS^=NMzL&U;RdAIG^8tu;z1{v8p)7z02E zfe<3vX!dq@sii~QU*E!Nt#PhIbi$*JP0}<4pr02gn_!}+kqr|n$4=o%tl^dC$0#FM zo1mSq0QmLsDoQD?&79+)Rdp%Hkuy?yX3Rf|dT58rHBB;;5`bJ(od4hUl1m{W~ zu5Y3ALH7Oqed<|8MA6&bW+bYl82-)xuKRjH+8e;+YWo;7`1B-{w1KjxJE?U96 zm);t%5AJ@3D+(rG9LHLV_TCdBL|5?6+y$~MV`XK9k&zMFS1z(}X@)Gz2E2WF7JVqH z6xbxO2!iv0`CE6G96L(0*#uzmqfY_F&H1Y=FE7(N@J`!{7<2^CPqPPg@~ZF1_Y45&+zNPR}!^Z04;sYr6Y!7KTA2NY!>drV!)JltEZ)O;eH}s#a?q zh9Q?i%(phTcR$W^PO{tWzVA-QDG78(Py+x13N?@9Xx&@QNSMYEiCG3g;Cn~6-K>-x zLL}y#rVcQ~yQZevkXV@Z*Efq8PdI|=O~rp0MfeWoX^hA*N1C2FC`-} zF_m0$Da*yOX$@iceR;XvZcR-HIWCu*&E{aWoR7I0r@-j$&5T*J6;p=}NZd`OmgK7Y zKbJRGGOKCtFjGMP@7S#)Q*BL5eM-rZ-oAM~uV-?1pS^3XA%tfyU#&#CnRJBi-kKsJ zGc)s?bN9J6KV!;ySS%bs%oKo1YfqoQ=m2I00L*M=Ol0n=ih$bGO=FCbQ%-4mcznNA zU9JyuPPMkCN<<-qY0QY-)ZBfDqO}S$fBE{Yv|?&3(rO_N%tS0DCnm17hy)Ub-k0mc YfA}(r8EQql3IG5A07*qoM6N<$f~2e&P5=M^ literal 0 HcmV?d00001 diff --git a/run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/generators/solar_panel_side_on.png b/run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/generators/solar_panel_side_on.png new file mode 100644 index 0000000000000000000000000000000000000000..c8351d1e7892846cfba819a4af0f0ea58aae61c3 GIT binary patch literal 674 zcmV;T0$u%yP)EeA2?l zPhV8k4v*L8;N>Rpf{A)a(<|xn&p(y|;kSl2-L+w^eLc%yrNX+5|fp6WoZmKya z=K?XOIClUaZfeukDiRCR_VQ{kgqN>gNiDI~dVGAmT&@r&)dqmx`~S8V9if#*2;$t? z$B%bz-v%>L?IDECX0uo<5K&b{IWAx6R|NdmXUfliR`|oZZ&U33Ze>nXTyj)(z z@t@BRe)`#qbXDmH-AvV9|2gjOul{}i_26J>9fv(pwUd)iBD~$kA0O3JiUEjf1E7m& zzx?)V2QcdZK!j$U5bxaYriy@$TI;y1&t7S^Dlv-OOBIn#ZCB&{x z&CCaBr3f>>dHXKctW8;@mQ3uJiCA)qOk7G9aU=}A53BwE0r#tpA*lzY@&Et;07*qo IM6N<$f(j!vcK`qY literal 0 HcmV?d00001 diff --git a/run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/generators/solar_panel_top.png b/run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/generators/solar_panel_top.png new file mode 100644 index 0000000000000000000000000000000000000000..7f6e5869cfa80aee363b6123be2994823ab2a99f GIT binary patch literal 813 zcmV+|1JeA7P)gW0=h{= zK~y-)J(E3)omCWtpR>=$`_7%q9fC6s7|CR?u+qZbMt^~VM2kUmAR+{WScpa>pdqHQ zunR#*6v;p!wGcbS%3ok(3}_Th?o4jxz8~kDy)7=f>eZ}gt>y0g^t0t!F`yquM1)$D zQY)&4Y6ZXyVvOWG5@V$6I=l~ru@tTx{79NjaNaRpYq9ERW*dyhhom$kyJMV1@}i>_ zV;p+My5#Mbo+pS1MHBtqdjNDHFxx!E<3E3;bEfBy|U3`Yyn6HgLC zM8=YtwljQ+_!JQl;v^CjqK|xY;SIvHWz<63CQ{SVv=KKt`o2TdSg9(QLICS31o-;m z9&dei6LCV4uwqdv);NelN{LXbGMmnrOm=XsBc_H(hr*nV~wi;+B^bApqs zZJprw_yOZsFoQ4*BafC#7Kisiq0!9M3wylt#Z9ON-r+-JV{($k;x8T^-eu?={2nV0;bLQi#WLw9~5HqE^jKm1BMXN$kO6@3C$l8-MK$|$Yw9jiFeT8!k zYwPQH?+M-qT2W@Fcd=aYE~7>H_WZk?yY?L}dTcZt``0Ht{NoqAGjJ`)Yy~mKz&P~Ou|pS2u7CJC zdlzp}P}CeI2D)U@6smZ#MwWd~Ns9LYvHynDgH^|ypWniw!{cy{|8>~)BmyQCWHmhJ zAmCuKm5`@SVP;Hbo8+U8&F$0FX^R`il{ppC?hZ02-Qy!h4U}96UWEOZpF_>?PVm74 r;G9E5P&Gu{sxlG4FkAh57zX|YE3a8+tvYdy00000NkvXXu0mjf6-#fd literal 0 HcmV?d00001 diff --git a/run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/generators/thermal_generator_side_off.png b/run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/generators/thermal_generator_side_off.png new file mode 100644 index 0000000000000000000000000000000000000000..5152bf15f74fae84a52c123e6c501d9643878a8a GIT binary patch literal 632 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 Q;J*s8G`B{Up1czMe^~X2v;Y7A literal 0 HcmV?d00001 diff --git a/run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/generators/thermal_generator_side_on.png.mcmeta b/run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/generators/thermal_generator_side_on.png.mcmeta new file mode 100644 index 000000000..8e55e43ba --- /dev/null +++ b/run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/generators/thermal_generator_side_on.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 3 + } +} diff --git a/run/resourcepacks/unity/assets/techreborn/textures/blocks/machine/generators/thermal_generator_top_off.png b/run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/generators/thermal_generator_top_off.png similarity index 100% rename from run/resourcepacks/unity/assets/techreborn/textures/blocks/machine/generators/thermal_generator_top_off.png rename to run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/generators/thermal_generator_top_off.png diff --git a/run/resourcepacks/unity/assets/techreborn/textures/blocks/machine/generators/thermal_generator_top_on.png b/run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/generators/thermal_generator_top_on.png similarity index 100% rename from run/resourcepacks/unity/assets/techreborn/textures/blocks/machine/generators/thermal_generator_top_on.png rename to run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/generators/thermal_generator_top_on.png diff --git a/run/resourcepacks/unity/assets/techreborn/textures/blocks/machine/generators/thermal_generator_top_on.png.mcmeta b/run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/generators/thermal_generator_top_on.png.mcmeta similarity index 100% rename from run/resourcepacks/unity/assets/techreborn/textures/blocks/machine/generators/thermal_generator_top_on.png.mcmeta rename to run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/generators/thermal_generator_top_on.png.mcmeta diff --git a/run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/generators/watermill_generator_side_off.png b/run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/generators/watermill_generator_side_off.png new file mode 100644 index 0000000000000000000000000000000000000000..660df659ef03229e6241c09425168d41dac2085a GIT binary patch literal 712 zcmV;(0yq7MP)*t2pw_+qV0wEOV=&X{^z-zls)GSx1%&{B0BwpDvLfM}qCyp_ zN}<-q83p?B@qme%CR*!J>vtdj)KD|(66+VwepIN9#`R{q=l%N+A52am=X`T>({6W^ zsvefhU*Eh&#Ov$plamvD{>yN1Xso@vzkmAV2{0QX@!pR{qgJb>l)9fUthJNLWIP@t zqKI^R2Z%Bp9*3r30F#AdjI-HYr`us-7MV;YXJ==KNJP2hZ?ju#-9O9aXf&ci29@^v z`~7~u-P#9GUuUz^(^K#L&ZLxbJUpVpAfQkS6--UwQdX;fSF6=xv2@N6(T?xx>dN`O z`-jDPv##p8P)Ru>6|O^Y&h-a_Ua!Z@JMxQ*i}83Y!iR_bgZ@#g-FC(Zkr4&L+&?%# zP}&)0cFtX1UhZz>oKqo5)t>jUi41^51ppuBi_LahZMHcV5jj6U7ZD;70V+j-TFmE6 z#d~jJh#}O&;ZaVd-R(a6;d}b&=bW=Prb+41caM~kl1sbYao&`ajMne{0008INkl4cC=te_o3`i0L5sIb@9SyEpP@(N2ZxKRi!CN}qCjZQglN4%1O(yTXd+u?O{rByDIQjT5W@f=SO^Aq7YaKflCkz1Mz!;O- z#28bn)f8!Mtv&KlHc67jg@uD*2mk;eB1$O$U}k0}qNo4-ee~n@>8Jl{B1)2Ediu}Q z?2_X1FwBa`&J)*S(lj^sOrsW^S$?ssm7zFI0ibbTW4T-&xqh?wd=3E8IAvz->C*iC zFTedhQ7FuoO50nt?YKq`P(++_l}hE(l`A7RZY?b?{Qvq@b$z{5nxA-32m`-3Gjq5l zXlrZB7*8`Z05rF>bazPtURho3%H>A$`N0cc`+iWXZ94&q<5+7g zBL0WL>D-BXKmPRH?OQ9=%4&73r>AE$pC24Jf4~o7W@8KzXqz(FR3n1Mz4d#W8k=r> zfA_*yXUZFI?%cWiY3FAj?5QJ^-Go+znYD8+wyY5tBux?#_utFPler=QY`uFcA{x<< z0sA|&8Mm_ZQq+s)0&+RL-Oz0p_{jYVgBdmk32HePQeRxBWBqm&{=8UQTI^2*Z0 zgF;s>_s!+Y9UaGyebNy{QD1-mxB1bfl|@9f)@rS_wU!-J$}h$zr^3J=&F3$k@7q&f zPl(6bTccm^pZem|$n~2;1O0vwAfh&&UMQ9BKl-CMJ6oKY8R$C~X0rfb6Kfh8x=(hF zPfh^<5h0>dN{fTmLx(J?FFQM}*lf1dCN{G>gBb*XFx%RVI3ZG9s~+%uMAQJlNgC{L zs;jGW&MBol&)Xr0hyW0V+0%eQbF=4pHc9b^pC_5wu_z*C)J{i4j)fG82oddA1SfGE ZzXzTbc~#fxK>Gjy002ovPDHLkV1oFDVVVE{ literal 0 HcmV?d00001 diff --git a/run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/generators/wind_mill_front_on.png b/run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/generators/wind_mill_front_on.png new file mode 100644 index 0000000000000000000000000000000000000000..4f58eb66e6a7e70056de29055ce811ccba617743 GIT binary patch literal 2437 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 literal 0 HcmV?d00001 diff --git a/run/resourcepacks/unity/assets/techreborn/textures/blocks/machine/machine_blocks/casingadvanced.png b/run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/structure/casingadvanced.png similarity index 100% rename from run/resourcepacks/unity/assets/techreborn/textures/blocks/machine/machine_blocks/casingadvanced.png rename to run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/structure/casingadvanced.png diff --git a/run/resourcepacks/unity/assets/techreborn/textures/blocks/machine/machine_blocks/casingadvanced_edge.png b/run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/structure/casingadvanced_edge.png similarity index 100% rename from run/resourcepacks/unity/assets/techreborn/textures/blocks/machine/machine_blocks/casingadvanced_edge.png rename to run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/structure/casingadvanced_edge.png diff --git a/run/resourcepacks/unity/assets/techreborn/textures/blocks/machine/machine_blocks/casingadvanced_full.png b/run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/structure/casingadvanced_full.png similarity index 100% rename from run/resourcepacks/unity/assets/techreborn/textures/blocks/machine/machine_blocks/casingadvanced_full.png rename to run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/structure/casingadvanced_full.png diff --git a/run/resourcepacks/unity/assets/techreborn/textures/blocks/machine/machine_blocks/casingreinforced.png b/run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/structure/casingreinforced.png similarity index 100% rename from run/resourcepacks/unity/assets/techreborn/textures/blocks/machine/machine_blocks/casingreinforced.png rename to run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/structure/casingreinforced.png diff --git a/run/resourcepacks/unity/assets/techreborn/textures/blocks/machine/machine_blocks/casingreinforced_edge.png b/run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/structure/casingreinforced_edge.png similarity index 100% rename from run/resourcepacks/unity/assets/techreborn/textures/blocks/machine/machine_blocks/casingreinforced_edge.png rename to run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/structure/casingreinforced_edge.png diff --git a/run/resourcepacks/unity/assets/techreborn/textures/blocks/machine/machine_blocks/casingreinforced_full.png b/run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/structure/casingreinforced_full.png similarity index 100% rename from run/resourcepacks/unity/assets/techreborn/textures/blocks/machine/machine_blocks/casingreinforced_full.png rename to run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/structure/casingreinforced_full.png diff --git a/run/resourcepacks/unity/assets/techreborn/textures/blocks/machine/machine_blocks/casingstandard.png b/run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/structure/casingstandard.png similarity index 100% rename from run/resourcepacks/unity/assets/techreborn/textures/blocks/machine/machine_blocks/casingstandard.png rename to run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/structure/casingstandard.png diff --git a/run/resourcepacks/unity/assets/techreborn/textures/blocks/machine/machine_blocks/casingstandard_edge.png b/run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/structure/casingstandard_edge.png similarity index 100% rename from run/resourcepacks/unity/assets/techreborn/textures/blocks/machine/machine_blocks/casingstandard_edge.png rename to run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/structure/casingstandard_edge.png diff --git a/run/resourcepacks/unity/assets/techreborn/textures/blocks/machine/machine_blocks/casingstandard_full.png b/run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/structure/casingstandard_full.png similarity index 100% rename from run/resourcepacks/unity/assets/techreborn/textures/blocks/machine/machine_blocks/casingstandard_full.png rename to run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/structure/casingstandard_full.png diff --git a/run/resourcepacks/unity/assets/techreborn/textures/blocks/machine/machine_blocks/machine_machine_block.png b/run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/structure/tier1_machine_block.png similarity index 100% rename from run/resourcepacks/unity/assets/techreborn/textures/blocks/machine/machine_blocks/machine_machine_block.png rename to run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/structure/tier1_machine_block.png diff --git a/run/resourcepacks/unity/assets/techreborn/textures/blocks/machine/machine_blocks/advancedMachine_machine_block.png b/run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/structure/tier2_machine_block.png similarity index 100% rename from run/resourcepacks/unity/assets/techreborn/textures/blocks/machine/machine_blocks/advancedMachine_machine_block.png rename to run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/structure/tier2_machine_block.png diff --git a/run/resourcepacks/unity/assets/techreborn/textures/blocks/machine/machine_blocks/highlyAdvancedMachine_machine_block.png b/run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/structure/tier3_machine_block.png similarity index 100% rename from run/resourcepacks/unity/assets/techreborn/textures/blocks/machine/machine_blocks/highlyAdvancedMachine_machine_block.png rename to run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/structure/tier3_machine_block.png diff --git a/run/resourcepacks/unity/assets/techreborn/textures/blocks/machine/tier0_machines/alloy_furnace_front_off.png b/run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/tier0_machines/alloy_furnace_front_off.png similarity index 100% rename from run/resourcepacks/unity/assets/techreborn/textures/blocks/machine/tier0_machines/alloy_furnace_front_off.png rename to run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/tier0_machines/alloy_furnace_front_off.png diff --git a/run/resourcepacks/unity/assets/techreborn/textures/blocks/machine/tier0_machines/alloy_furnace_front_on.png b/run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/tier0_machines/alloy_furnace_front_on.png similarity index 100% rename from run/resourcepacks/unity/assets/techreborn/textures/blocks/machine/tier0_machines/alloy_furnace_front_on.png rename to run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/tier0_machines/alloy_furnace_front_on.png diff --git a/run/resourcepacks/unity/assets/techreborn/textures/blocks/machine/tier0_machines/alloy_furnace_front_on.png.mcmeta b/run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/tier0_machines/alloy_furnace_front_on.png.mcmeta similarity index 100% rename from run/resourcepacks/unity/assets/techreborn/textures/blocks/machine/tier0_machines/alloy_furnace_front_on.png.mcmeta rename to run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/tier0_machines/alloy_furnace_front_on.png.mcmeta diff --git a/run/resourcepacks/unity/assets/techreborn/textures/blocks/machine/tier0_machines/furnace_front_off.png b/run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/tier0_machines/furnace_front_off.png similarity index 100% rename from run/resourcepacks/unity/assets/techreborn/textures/blocks/machine/tier0_machines/furnace_front_off.png rename to run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/tier0_machines/furnace_front_off.png diff --git a/run/resourcepacks/unity/assets/techreborn/textures/blocks/machine/tier0_machines/furnace_front_on.png b/run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/tier0_machines/furnace_front_on.png similarity index 100% rename from run/resourcepacks/unity/assets/techreborn/textures/blocks/machine/tier0_machines/furnace_front_on.png rename to run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/tier0_machines/furnace_front_on.png diff --git a/run/resourcepacks/unity/assets/techreborn/textures/blocks/machine/tier0_machines/furnace_front_on.png.mcmeta b/run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/tier0_machines/furnace_front_on.png.mcmeta similarity index 100% rename from run/resourcepacks/unity/assets/techreborn/textures/blocks/machine/tier0_machines/furnace_front_on.png.mcmeta rename to run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/tier0_machines/furnace_front_on.png.mcmeta diff --git a/run/resourcepacks/unity/assets/techreborn/textures/blocks/machine/tier0_machines/machine_bottom.png b/run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/tier0_machines/machine_bottom.png similarity index 100% rename from run/resourcepacks/unity/assets/techreborn/textures/blocks/machine/tier0_machines/machine_bottom.png rename to run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/tier0_machines/machine_bottom.png diff --git a/run/resourcepacks/unity/assets/techreborn/textures/blocks/machine/tier0_machines/machine_side.png b/run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/tier0_machines/machine_side.png similarity index 100% rename from run/resourcepacks/unity/assets/techreborn/textures/blocks/machine/tier0_machines/machine_side.png rename to run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/tier0_machines/machine_side.png diff --git a/run/resourcepacks/unity/assets/techreborn/textures/blocks/machine/tier0_machines/machine_top.png b/run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/tier0_machines/machine_top.png similarity index 100% rename from run/resourcepacks/unity/assets/techreborn/textures/blocks/machine/tier0_machines/machine_top.png rename to run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/tier0_machines/machine_top.png diff --git a/run/resourcepacks/unity/assets/techreborn/textures/blocks/machine/tier1_machines/assembling_machine_front_off.png b/run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/tier1_machines/assembling_machine_front_off.png similarity index 100% rename from run/resourcepacks/unity/assets/techreborn/textures/blocks/machine/tier1_machines/assembling_machine_front_off.png rename to run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/tier1_machines/assembling_machine_front_off.png diff --git a/run/resourcepacks/unity/assets/techreborn/textures/blocks/machine/tier1_machines/assembling_machine_front_on.png b/run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/tier1_machines/assembling_machine_front_on.png similarity index 100% rename from run/resourcepacks/unity/assets/techreborn/textures/blocks/machine/tier1_machines/assembling_machine_front_on.png rename to run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/tier1_machines/assembling_machine_front_on.png diff --git a/run/resourcepacks/unity/assets/techreborn/textures/blocks/machine/tier1_machines/assembling_machine_front_on.png.mcmeta b/run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/tier1_machines/assembling_machine_front_on.png.mcmeta similarity index 100% rename from run/resourcepacks/unity/assets/techreborn/textures/blocks/machine/tier1_machines/assembling_machine_front_on.png.mcmeta rename to run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/tier1_machines/assembling_machine_front_on.png.mcmeta diff --git a/run/resourcepacks/unity/assets/techreborn/textures/blocks/machine/tier1_machines/chemical_reactor_side_off.png b/run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/tier1_machines/chemical_reactor_front_off.png similarity index 100% rename from run/resourcepacks/unity/assets/techreborn/textures/blocks/machine/tier1_machines/chemical_reactor_side_off.png rename to run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/tier1_machines/chemical_reactor_front_off.png diff --git a/run/resourcepacks/unity/assets/techreborn/textures/blocks/machine/tier1_machines/chemical_reactor_side_on.png b/run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/tier1_machines/chemical_reactor_front_on.png similarity index 100% rename from run/resourcepacks/unity/assets/techreborn/textures/blocks/machine/tier1_machines/chemical_reactor_side_on.png rename to run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/tier1_machines/chemical_reactor_front_on.png diff --git a/run/resourcepacks/unity/assets/techreborn/textures/blocks/machine/tier1_machines/chemical_reactor_side_on.png.mcmeta b/run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/tier1_machines/chemical_reactor_front_on.png.mcmeta similarity index 100% rename from run/resourcepacks/unity/assets/techreborn/textures/blocks/machine/tier1_machines/chemical_reactor_side_on.png.mcmeta rename to run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/tier1_machines/chemical_reactor_front_on.png.mcmeta diff --git a/run/resourcepacks/unity/assets/techreborn/textures/blocks/machine/tier1_machines/compressor_front_off.png b/run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/tier1_machines/compressor_front_off.png similarity index 100% rename from run/resourcepacks/unity/assets/techreborn/textures/blocks/machine/tier1_machines/compressor_front_off.png rename to run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/tier1_machines/compressor_front_off.png diff --git a/run/resourcepacks/unity/assets/techreborn/textures/blocks/machine/tier1_machines/compressor_front_on.png b/run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/tier1_machines/compressor_front_on.png similarity index 100% rename from run/resourcepacks/unity/assets/techreborn/textures/blocks/machine/tier1_machines/compressor_front_on.png rename to run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/tier1_machines/compressor_front_on.png diff --git a/run/resourcepacks/unity/assets/techreborn/textures/blocks/machine/tier1_machines/compressor_front_on.png.mcmeta b/run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/tier1_machines/compressor_front_on.png.mcmeta similarity index 100% rename from run/resourcepacks/unity/assets/techreborn/textures/blocks/machine/tier1_machines/compressor_front_on.png.mcmeta rename to run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/tier1_machines/compressor_front_on.png.mcmeta diff --git a/run/resourcepacks/unity/assets/techreborn/textures/blocks/machine/tier1_machines/electric_alloy_furnace_front_off.png b/run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/tier1_machines/electric_alloy_smelter_front_off.png similarity index 100% rename from run/resourcepacks/unity/assets/techreborn/textures/blocks/machine/tier1_machines/electric_alloy_furnace_front_off.png rename to run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/tier1_machines/electric_alloy_smelter_front_off.png diff --git a/run/resourcepacks/unity/assets/techreborn/textures/blocks/machine/tier1_machines/electric_alloy_furnace_front_on.png b/run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/tier1_machines/electric_alloy_smelter_front_on.png similarity index 100% rename from run/resourcepacks/unity/assets/techreborn/textures/blocks/machine/tier1_machines/electric_alloy_furnace_front_on.png rename to run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/tier1_machines/electric_alloy_smelter_front_on.png diff --git a/run/resourcepacks/unity/assets/techreborn/textures/blocks/machine/tier1_machines/electric_crafting_table_side.png b/run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/tier1_machines/electric_crafting_table_side.png similarity index 100% rename from run/resourcepacks/unity/assets/techreborn/textures/blocks/machine/tier1_machines/electric_crafting_table_side.png rename to run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/tier1_machines/electric_crafting_table_side.png diff --git a/run/resourcepacks/unity/assets/techreborn/textures/blocks/machine/tier1_machines/electric_crafting_table_top.png b/run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/tier1_machines/electric_crafting_table_top.png similarity index 100% rename from run/resourcepacks/unity/assets/techreborn/textures/blocks/machine/tier1_machines/electric_crafting_table_top.png rename to run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/tier1_machines/electric_crafting_table_top.png diff --git a/run/resourcepacks/unity/assets/techreborn/textures/blocks/machine/tier1_machines/electric_furnace_front_off.png b/run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/tier1_machines/electric_furnace_front_off.png similarity index 100% rename from run/resourcepacks/unity/assets/techreborn/textures/blocks/machine/tier1_machines/electric_furnace_front_off.png rename to run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/tier1_machines/electric_furnace_front_off.png diff --git a/run/resourcepacks/unity/assets/techreborn/textures/blocks/machine/tier1_machines/electric_furnace_front_on.png b/run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/tier1_machines/electric_furnace_front_on.png similarity index 100% rename from run/resourcepacks/unity/assets/techreborn/textures/blocks/machine/tier1_machines/electric_furnace_front_on.png rename to run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/tier1_machines/electric_furnace_front_on.png diff --git a/run/resourcepacks/unity/assets/techreborn/textures/blocks/machine/tier1_machines/extractor_front_off.png b/run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/tier1_machines/extractor_front_off.png similarity index 100% rename from run/resourcepacks/unity/assets/techreborn/textures/blocks/machine/tier1_machines/extractor_front_off.png rename to run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/tier1_machines/extractor_front_off.png diff --git a/run/resourcepacks/unity/assets/techreborn/textures/blocks/machine/tier1_machines/extractor_front_on.png b/run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/tier1_machines/extractor_front_on.png similarity index 100% rename from run/resourcepacks/unity/assets/techreborn/textures/blocks/machine/tier1_machines/extractor_front_on.png rename to run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/tier1_machines/extractor_front_on.png diff --git a/run/resourcepacks/unity/assets/techreborn/textures/blocks/machine/tier1_machines/extractor_front_on.png.mcmeta b/run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/tier1_machines/extractor_front_on.png.mcmeta similarity index 100% rename from run/resourcepacks/unity/assets/techreborn/textures/blocks/machine/tier1_machines/extractor_front_on.png.mcmeta rename to run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/tier1_machines/extractor_front_on.png.mcmeta diff --git a/run/resourcepacks/unity/assets/techreborn/textures/blocks/machine/tier1_machines/grinder_front_off.png b/run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/tier1_machines/grinder_front_off.png similarity index 100% rename from run/resourcepacks/unity/assets/techreborn/textures/blocks/machine/tier1_machines/grinder_front_off.png rename to run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/tier1_machines/grinder_front_off.png diff --git a/run/resourcepacks/unity/assets/techreborn/textures/blocks/machine/tier1_machines/grinder_front_on.png b/run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/tier1_machines/grinder_front_on.png similarity index 100% rename from run/resourcepacks/unity/assets/techreborn/textures/blocks/machine/tier1_machines/grinder_front_on.png rename to run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/tier1_machines/grinder_front_on.png diff --git a/run/resourcepacks/unity/assets/techreborn/textures/blocks/machine/tier1_machines/grinder_front_on.png.mcmeta b/run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/tier1_machines/grinder_front_on.png.mcmeta similarity index 100% rename from run/resourcepacks/unity/assets/techreborn/textures/blocks/machine/tier1_machines/grinder_front_on.png.mcmeta rename to run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/tier1_machines/grinder_front_on.png.mcmeta diff --git a/run/resourcepacks/unity/assets/techreborn/textures/blocks/machine/tier1_machines/grinder_top_off.png b/run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/tier1_machines/grinder_top_off.png similarity index 100% rename from run/resourcepacks/unity/assets/techreborn/textures/blocks/machine/tier1_machines/grinder_top_off.png rename to run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/tier1_machines/grinder_top_off.png diff --git a/run/resourcepacks/unity/assets/techreborn/textures/blocks/machine/tier1_machines/grinder_top_on.png b/run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/tier1_machines/grinder_top_on.png similarity index 100% rename from run/resourcepacks/unity/assets/techreborn/textures/blocks/machine/tier1_machines/grinder_top_on.png rename to run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/tier1_machines/grinder_top_on.png diff --git a/run/resourcepacks/unity/assets/techreborn/textures/blocks/machine/tier1_machines/grinder_top_on.png.mcmeta b/run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/tier1_machines/grinder_top_on.png.mcmeta similarity index 100% rename from run/resourcepacks/unity/assets/techreborn/textures/blocks/machine/tier1_machines/grinder_top_on.png.mcmeta rename to run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/tier1_machines/grinder_top_on.png.mcmeta diff --git a/run/resourcepacks/unity/assets/techreborn/textures/blocks/machine/tier1_machines/industrial_electrolyzer_front_off.png b/run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/tier1_machines/industrial_electrolyzer_front_off.png similarity index 100% rename from run/resourcepacks/unity/assets/techreborn/textures/blocks/machine/tier1_machines/industrial_electrolyzer_front_off.png rename to run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/tier1_machines/industrial_electrolyzer_front_off.png diff --git a/run/resourcepacks/unity/assets/techreborn/textures/blocks/machine/tier1_machines/industrial_electrolyzer_front_on.png b/run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/tier1_machines/industrial_electrolyzer_front_on.png similarity index 100% rename from run/resourcepacks/unity/assets/techreborn/textures/blocks/machine/tier1_machines/industrial_electrolyzer_front_on.png rename to run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/tier1_machines/industrial_electrolyzer_front_on.png diff --git a/run/resourcepacks/unity/assets/techreborn/textures/blocks/machine/tier1_machines/industrial_electrolyzer_front_on.png.mcmeta b/run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/tier1_machines/industrial_electrolyzer_front_on.png.mcmeta similarity index 100% rename from run/resourcepacks/unity/assets/techreborn/textures/blocks/machine/tier1_machines/industrial_electrolyzer_front_on.png.mcmeta rename to run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/tier1_machines/industrial_electrolyzer_front_on.png.mcmeta diff --git a/run/resourcepacks/unity/assets/techreborn/textures/blocks/machine/tier1_machines/machine_bottom.png b/run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/tier1_machines/machine_bottom.png similarity index 100% rename from run/resourcepacks/unity/assets/techreborn/textures/blocks/machine/tier1_machines/machine_bottom.png rename to run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/tier1_machines/machine_bottom.png diff --git a/run/resourcepacks/unity/assets/techreborn/textures/blocks/machine/tier1_machines/machine_side.png b/run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/tier1_machines/machine_side.png similarity index 100% rename from run/resourcepacks/unity/assets/techreborn/textures/blocks/machine/tier1_machines/machine_side.png rename to run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/tier1_machines/machine_side.png diff --git a/run/resourcepacks/unity/assets/techreborn/textures/blocks/machine/tier1_machines/machine_top.png b/run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/tier1_machines/machine_top.png similarity index 100% rename from run/resourcepacks/unity/assets/techreborn/textures/blocks/machine/tier1_machines/machine_top.png rename to run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/tier1_machines/machine_top.png diff --git a/run/resourcepacks/unity/assets/techreborn/textures/blocks/machine/tier1_machines/player_detector_all.png b/run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/tier1_machines/player_detector_all.png similarity index 100% rename from run/resourcepacks/unity/assets/techreborn/textures/blocks/machine/tier1_machines/player_detector_all.png rename to run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/tier1_machines/player_detector_all.png diff --git a/run/resourcepacks/unity/assets/techreborn/textures/blocks/machine/tier1_machines/player_detector_others.png b/run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/tier1_machines/player_detector_others.png similarity index 100% rename from run/resourcepacks/unity/assets/techreborn/textures/blocks/machine/tier1_machines/player_detector_others.png rename to run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/tier1_machines/player_detector_others.png diff --git a/run/resourcepacks/unity/assets/techreborn/textures/blocks/machine/tier1_machines/player_detector_you.png b/run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/tier1_machines/player_detector_you.png similarity index 100% rename from run/resourcepacks/unity/assets/techreborn/textures/blocks/machine/tier1_machines/player_detector_you.png rename to run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/tier1_machines/player_detector_you.png diff --git a/run/resourcepacks/unity/assets/techreborn/textures/blocks/machine/tier1_machines/recycler_front_off.png b/run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/tier1_machines/recycler_front_off.png similarity index 100% rename from run/resourcepacks/unity/assets/techreborn/textures/blocks/machine/tier1_machines/recycler_front_off.png rename to run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/tier1_machines/recycler_front_off.png diff --git a/run/resourcepacks/unity/assets/techreborn/textures/blocks/machine/tier1_machines/recycler_front_on.png b/run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/tier1_machines/recycler_front_on.png similarity index 100% rename from run/resourcepacks/unity/assets/techreborn/textures/blocks/machine/tier1_machines/recycler_front_on.png rename to run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/tier1_machines/recycler_front_on.png diff --git a/run/resourcepacks/unity/assets/techreborn/textures/blocks/machine/tier1_machines/recycler_front_on.png.mcmeta b/run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/tier1_machines/recycler_front_on.png.mcmeta similarity index 100% rename from run/resourcepacks/unity/assets/techreborn/textures/blocks/machine/tier1_machines/recycler_front_on.png.mcmeta rename to run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/tier1_machines/recycler_front_on.png.mcmeta diff --git a/run/resourcepacks/unity/assets/techreborn/textures/blocks/machine/tier1_machines/rolling_machine_side_off.png b/run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/tier1_machines/rolling_machine_front_off.png similarity index 100% rename from run/resourcepacks/unity/assets/techreborn/textures/blocks/machine/tier1_machines/rolling_machine_side_off.png rename to run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/tier1_machines/rolling_machine_front_off.png diff --git a/run/resourcepacks/unity/assets/techreborn/textures/blocks/machine/tier1_machines/rolling_machine_side_on.png b/run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/tier1_machines/rolling_machine_front_on.png similarity index 100% rename from run/resourcepacks/unity/assets/techreborn/textures/blocks/machine/tier1_machines/rolling_machine_side_on.png rename to run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/tier1_machines/rolling_machine_front_on.png diff --git a/run/resourcepacks/unity/assets/techreborn/textures/blocks/machine/tier1_machines/rolling_machine_side_on.png.mcmeta b/run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/tier1_machines/rolling_machine_front_on.png.mcmeta similarity index 100% rename from run/resourcepacks/unity/assets/techreborn/textures/blocks/machine/tier1_machines/rolling_machine_side_on.png.mcmeta rename to run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/tier1_machines/rolling_machine_front_on.png.mcmeta diff --git a/run/resourcepacks/unity/assets/techreborn/textures/blocks/machine/tier1_machines/scrapboxinator_front_off.png b/run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/tier1_machines/scrapboxinator_front_off.png similarity index 100% rename from run/resourcepacks/unity/assets/techreborn/textures/blocks/machine/tier1_machines/scrapboxinator_front_off.png rename to run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/tier1_machines/scrapboxinator_front_off.png diff --git a/run/resourcepacks/unity/assets/techreborn/textures/blocks/machine/tier1_machines/scrapboxinator_front_on.png b/run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/tier1_machines/scrapboxinator_front_on.png similarity index 100% rename from run/resourcepacks/unity/assets/techreborn/textures/blocks/machine/tier1_machines/scrapboxinator_front_on.png rename to run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/tier1_machines/scrapboxinator_front_on.png diff --git a/run/resourcepacks/unity/assets/techreborn/textures/blocks/machine/tier1_machines/scrapboxinator_front_on.png.mcmeta b/run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/tier1_machines/scrapboxinator_front_on.png.mcmeta similarity index 100% rename from run/resourcepacks/unity/assets/techreborn/textures/blocks/machine/tier1_machines/scrapboxinator_front_on.png.mcmeta rename to run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/tier1_machines/scrapboxinator_front_on.png.mcmeta diff --git a/run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/tier2_machines/computer_cube_front.png b/run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/tier2_machines/computer_cube_front.png new file mode 100644 index 0000000000000000000000000000000000000000..6fb3ee0aad6be248c5c6916af2c27072b6e8eedb GIT binary patch literal 808 zcmV+@1K0eCP)SuxM0~_WaN>xHkBE6dz(sJO_*m;kMHInh z$U=muOHne}Boi6Cy?yJi`dxIG?OB|2IDE&g9DmQu63#^ca%%A*VicT<_~^+glT(WX zk3%pDf=8-IFrBh*X%CKonc<_yNx%za3f_5~84^4=!Bp`fAUH1k_B+A(0KhBHJx#CI zqvT931yv=+NL^Jp=a^2XbSVMQ>-9K&?sKYGAx1$$WZPiC&eiX@anC*MTK$H_qhC@l zEVB3PMHXKCg89X}Xqtw*Pn~BlS|-+>b}}a9lqjlnDe=$AN9a=G-xCj$bH+Kx#pm}@ z*EI&HDu2GdpYdcun-Vxde2j#uLRG1s{e;1jr?~ad8S3F}EWP_PH;k6KY2{PO{7%e_ zE+xDO0#tP%I0VFDW?Vb-7^=!u5xn&)vsx8zMZ#XD zI#t$RyAJ>n;jecNGM-HEB22rEk`si0XfDjn^@%ZZ%i0h0ckRP~g|#0U9zI7Lj%IC+ zeueDVO)iC;GykIc4DJ3*#F0DO4@SYeWNtN}t4=|ZbXqpD+92C1w zWQJnKcsyovbCVq}e1;#6NGVZDVf(Rf*?#CF;&3z@^17*Z9XTZeB7m{->M=e(dz!yb zJi0|9z~wg{+#(U6>pGq~d;|#rA0xp^CQUONS2lR&$jbyDa3Wv^&Vd;Pa2QFIY1?vT z<0?fH4k4Hsj>7%>A0n&bLI5ii&6sm!%Xoxbz>1R7j8H?dtb}65`CopekhiW{G~;8l mb!D?zTGoV*4ZutbHU9$xkXHmWX^j#c@7}z9_3&^yUzH$X+nE%^>MF{(Ki|+frXJ5X z$>o)KzCK(ZUUx22Q!_RZsbeDro#)rDw$pa^0L65UF$aX5e%>x51u6pSKx zK~y-)os&I|TvZT8&#k)ey`JuVO@qghWrTNPi4Ayj-hmT~1rR{)gam1Vh5#H`CSoSQ z?w@!6sxCoWc0xo@(I3D!<00uHp(i!o9b*Gj@kic?26GYKC z5(CQ9$KT*)BMHc(P5fN0CS`y7VtyOYL*J6N&4xMVStfFzGnc=l?I2@23uJ`4f5du0! z%$!mZy@S)KInmuH&A437cx$9mt|FN=K=}Lqf&G4ueF8`CIF&%aJy2W0+)z;-?(bP| zZkVPCNlRi`F5KQeqI+jE&%`0(Ky8iYSB=dTa%j`Px00000NkvXXu0mjfb-y_> literal 0 HcmV?d00001 diff --git a/run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/tier2_machines/digital_chest_top.png b/run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/tier2_machines/digital_chest_top.png new file mode 100644 index 0000000000000000000000000000000000000000..de5397365f9a6aaa142dd6af8d2b109e5a638f94 GIT binary patch literal 805 zcmV+=1KRwFP)TLYI&SOWPWRyo(&``_lo?qaj4=$jp zq?G8pj-eFXomwlZils!~_q=doh1?}3t8T`-~onG=(~N%Q`A}!5q^E;e!8wB z0Cy+ni~^(1P(eWjQ=#vBx|cs??)mq*`=v{Ci}$j8{(E-rJHoD&&uH^|i3r3-OooDc z!z5=+6UhvB=lZ2*aCff#*TvPd$7rpwcJWyNk}5+Pn4OuSxubp8A<0k?ro+JUg)7|m z=2!H0EYXcd%%8r@+;i^$aOlj}+_wJ+w4l`jW|-H;?CcCFC2Fnw@#;gQl*ncb?ySA> z2mq?eU+0cYCGxzd1LJgzn`2f9G4b=s36DPcm|O~k zh=i0-RaUDNT4w$^KWDd}5jyvdk1;b|oc=}COo#!kmHmE42$5PVQdH4uEPLncCyyzm zFijKReESrw3LU0F`0DW!=$+O(-Wu+WaTtk`5`!e%ot!fjKhfh`usV+uU7AN zx3?C002xQ}TyQs@{_yM_hk3Un#6&I?i6L?S_y{XX&NC1g$C1n39;=lYI(LtcNJ+3- zaBJin3L$WM`V!GH)66(KJ7c+AK!}(bF@W_>Z=Dnqxnx@FgxGoW=7L+dZ=fi{%o{N(h~h2D~|~b-X*{Vu5=l$%u?gh8XDXNDt6kdy|I|l-R&3c2IVa-V~Au`b1n5K!C z=gd6sdH=l|^wwD)93X?xfcmy1gWwHfh*&iw3DY!Tsz^$S7k|E_)PkE|pGONZ4Wtx_ pNhoWFSg{-dS!A_#ajiuB4>IH^l$|002ovPDHLkV1mDfT2lZ3 literal 0 HcmV?d00001 diff --git a/run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/tier3_machines/industrial_chunkloader_top.png b/run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/tier3_machines/industrial_chunkloader_top.png new file mode 100644 index 0000000000000000000000000000000000000000..0ec9ca188ae94a5361a848f96b15dac9fd04a86b GIT binary patch literal 829 zcmV-D1H$}?P)*KMIxC1phYrN4BXQEX0}*uM&qVCNQ59Mz1#zHKOGTR+ zHIk>n<|Pe6tu#q{bMHC(90#vI^R?Dqu)b|Be1AEsDw+*-Xb=%JL}F5sW>QuFasux? zAvSpLsj3Pq4i{tO;Qm>fre`+B0MO}Pr@wIYwOVw#s~kNrhpHkXY;0^$mMwm``YR$L zG)=?$`Z@q9B>-l|+T7Z@&EmB#hh}C_RYC}8P?lF#v4zK3kJKRmFg`wxwU(3;s=eB( z8IuyOaO9i;Xkx?c^j@m1+icerk}%|)Nhwj?xq~qV5n+C*!;axW_Uszv^6!6OjG-tB zyf1*vz(7BxFL3v+<(%O zPJe|CwJE&k(YL>3X#dlQ2%!#Cbs&jDlah1BWfDu*Ryj01g~9RD(h@80yhK#RTFdo! zPZ47TU~&0xo;&&k;)Jg+{Yc?FV#RS_Y7bE}u5cWgo8^PgKBuZGCf_;>JH~L%ar*s_ zIPugmthX3rIDYI1&fO(Z6SP_-+uJqP2#4q9`1FhOjO=^}dFEplI)8EU__L&xh#^pv zB|vX-e;1P2L{d_k*pN-;$%Bvc&y5=_{<(bLoO7nHzyCh+)>*L9zWezK?cJm79vSBRH{SvvA^^18 zZHl5GHUV?y+=Z;#dtEDn_4Yx!2uU+yd$`{V$T>sG)OF4O-@9p@%y@|M00000NkvXX Hu0mjfC#8Mb literal 0 HcmV?d00001 diff --git a/run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/tier3_machines/machine_back.png b/run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/tier3_machines/machine_back.png new file mode 100644 index 0000000000000000000000000000000000000000..02d87a159c075e77c20072154ba0356c02e6cc63 GIT binary patch literal 707 zcmV;!0zCbRP))UX5dLO7Nr4)MabRCpj*lLB8NI)CP7=!c84ZU|%jpA;6`}J2` zE*DOx698ijrg^6K&OA*-1Y50)p_Gzot#LY^`Qgnkh^cY8T=?+!JpjFTa?aFkW0~jw z)+94e6UW1m-~afNL}IHOrH?^Mi7&tS992bCF*8Jj$A2CvQ-PGQ>t3yuZ(hIV;o*V9 zG*ceemB*(Ib7P)nC>iaYZQUqSLDhDYd8W38p=$i~{{3@eTI-Zj zsI_A50Mu5W)jh2nYQ|8bxH;>(^6KTw|8eG=ndcdECjt_Qp@U^PkW0Z-cLlpdr(ZLj zbKV(SB_fCj`sjE#rpmgmxEZ}SJfN5?M5lod`zns2N#=`;Q+v zE(^;%A+2?`_30Vm=6plRW%qgvOqE;;?tvu1OgSHqO!KmLuVmrw?v6ebHK$~u52a*5 pWFM^$vLuEYIcM^4~9Y+?Wa002ovPDHLkV1hJ?K{)^b literal 0 HcmV?d00001 diff --git a/run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/tier3_machines/machine_bottom.png b/run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/tier3_machines/machine_bottom.png new file mode 100644 index 0000000000000000000000000000000000000000..c752a0c91e62e6f0feb249c545fd86f6e336042b GIT binary patch literal 561 zcmV-10?z%3P)Il$6~62sD5YNN@o@b|$e+k<5q{q#DKJynnWQ zc>gXV6BPl#BQO;rK}Ap%A`*{4L{QHWF|!gQAI?E2vijSTX*h`nIS5C z`Sz1yI*~tq{?3y}jbet`Y?8(5IGIUA@ay-++t)8CW|T-MraZnj+NIJi^=vF=OG1#D zh$wsSWKKqVA814{JZPgK+-OiS_@-1B2ZM7TI{5FsRa?4hAsU7 z?NS*Y6TlP%RF$$UKt(9Fj4b6&do?3+%1~8ImEOnvS41$?MOlFWAXaRd$!$45#sFZ9 z!L>Cal2S`SS41M9YA4ch&M3|3!^s4X>48Qj?Rve_TuiBE|3vBTsLWy8_dbC#6EeuZ zXp0El{cMZ~+V z(I>dD&Vuvi-R|nDZiBnC1}7;hIOjW6;iq4I9ldu{8)imI2~|a{kz!&g1wtSIwHd87 zPS4IzRm_~!yYu$$lEdM^$;k--tu>~cQC0FZF~(pih1QIeBDGddPEYya$Da{5=Wsai z{GVF@RFxPbWm%YW{(mNsJWXsjTYmff4+4RuETrB$o6UyHx8B6vad$!pW#MYKV~l}_kY745ckb@)*lad5Gmgi5LJ(SO zr0>7}e9gElhy+lS5(2drmRd+v6>W-0B_^PD+9 ze?p9r-aBTElqOV_J~~<}0DtcPLR2ee&fm|T5kervNUcgriBbyQI{>AY^~hAYKQ5R% z&79P|b37h7fBcv+2BoZvF-CIEc<+n>fk3myJa338;b!#S5grKFHCK!gbEnqA7=tke z+E(js#_@QhyQ5m^1CqNDM0kFC%WIDw;oW)Q@&Ju7XsVbyQH0wUFWAmAbDoe|mF0N< zD#F?687U^l7+7n#88Ib#A4m|~jnnOxDbMToN)&ExZqR0!cT$wKo+yZ{s@jMWXy(Ki gi4quNu-(l32TW?Gug8=B`~Uy|07*qoM6N<$f@_&lcK`qY literal 0 HcmV?d00001 diff --git a/run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/tier3_machines/machine_top.png b/run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/tier3_machines/machine_top.png new file mode 100644 index 0000000000000000000000000000000000000000..4aec5e96512cb33e7aeefef84905135d7b25bd73 GIT binary patch literal 633 zcmV-<0*3vGP)UD|rDSwPPbjisbdv%YczaK%g=}kjhXc!_K`+a%NJjv|__* z$TQz}yvD*iltPgqKrQ zm>B>OK}4dae0_SNZ*TZ?|A4A0W9)o+d;}mf&*7K*dbtvj%sGj<`1_xKX}#m#(6J@} zKi%G9W@IK22lgD3h`@V09~^V?{@pvifBVMudcm`fUow-i54<_5dZ71%NB|M&y|E%$ zYx3g{H}u}oh*#v+8>&iGv5$c~XOfwyDw&0wvbpo$Wv2>!-v{naM39k)3I%N28^*pP z@=9o?tQE{CT609eR|KqyiC`utLF^Zr8I=VTl?fuK6q`a;9r76=txB?zq(BVJ$x2F~%$X^ucSaT?k{LxH;0-fF%^ZLgi8n_?0iz1$ z7?>TN*mE=HhKR7%!rjre7Ll-R8<*=KBgs6}Hg~Fut@pEyIp%4r2xx0gQLL3z24jv> zVG%iH%1o+?w>NK3<;@(e0yXFE^JjWH_HuXDn3x%@H-KYbRU(4>zaCBkM~*~)`}HH% z98twg>Cb~arw^PJfBf(>y>G0!a8u>e{R3HriDGW&(2ISla#W^zI8n!^V+{TW|4m;o TjM{2$00000NkvXXu0mjf)~OTU literal 0 HcmV?d00001 diff --git a/run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/tier3_machines/machine_west.png b/run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/tier3_machines/machine_west.png new file mode 100644 index 0000000000000000000000000000000000000000..bf1842f0f1edda8aba8f0d048bee4fbe10054d5c GIT binary patch literal 745 zcmV?WK|G`pYw4)x_cJaaApSsWkK=(nTY9vpg&+?LGVWynTvs;;0l6cU^}wT z3VplpId!T|8Qf(osHCFj{iyKc&%b)_9g&8rl5<8x5N+g?SxbQs2taL0YmLLz6(WMF zk$X3ue{jpPEbRAt09tDdDaS_-WxIVWnZ>< zQP!1d9RI(?#5fG><{iKN{s)1;T2^xJoq3+QeRhMHVP=F77{`%P3LykyN`w%QRcL4B z(@#F8)CwVzLrRDU`~99}S(xV;cPGZk_>Mr$IGs++^UR;eBib4vL|SX)DuOg+=gvIO z)LNOQ3F{p*Luw_&NFGLx$0ILad`7K82!WguIj6*s6J|y!g_IJ~8Yv~Z8O}C;-{14i zSD*9YN6%R=XQpZ9_3K~Ar3$C>%D<<+>%pbnr2j$ z?vTHG^(FJXV_jEb47fYJJMKn|nOX}m1g@`daCb^6v?erF+?^a_`p$Qn20uD79=Q6XASWQ8Stvxm)LQ zx$yqer;msLDJ8~n#Cpda0)eKDX_`qnW2*Gti2&X=tPlbzCDe>s3+|4)BW*)BRW6qc z-3*bsnP{ej7*f3?;p%Wj zP8oMcTf~;*}w0&<(k-NJ)q$z5hoFdYcoFXx9Tcwd=psA5kBE5@y bH&6Tr_l&k6w!7*G00000NkvXXu0mjf3d>E? literal 0 HcmV?d00001 diff --git a/run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/tier3_machines/quantum_chest_bottom.png b/run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/tier3_machines/quantum_chest_bottom.png new file mode 100644 index 0000000000000000000000000000000000000000..d839334a1d51a4963007abec59ea7364c023d1cb GIT binary patch literal 554 zcmV+_0@eMAP)9pAAVc8(y$_*zJI^p@7rw`K_a#rDfHzTD$mykJh{dB`p{HO_iexL_jjHv6pEmU zZskS_p4+?owr%HCpi-H+7D!Lsw(m$1l0YUrYv1dEsduAw2&snu1uep5GRoA}n?$)+#j1);Sat#nG6%x4=urrps zF`h0&sC)K(mlP2kFDW8n2n0;A>k6v6kK=Gvg2oJ{r!O)n^?8CaJT*oUtho%pHY^Or zt}0XAbvzzJRaFlfJ>%nir4n{s*Hj54;PX6>Z!e(inK}_+db)d>T921+$Kyp2%1nFe z?B}n~ppN69^fm(a0EDaiI?u2FJx>?Gv`zTu55G|$*H1JMmlaiF$V;s5{u07*qoM6N<$f*tSjSpWb4 literal 0 HcmV?d00001 diff --git a/run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/tier3_machines/quantum_chest_side.png b/run/resourcepacks/unity/assets/techreborn/textures/blocks/machines/tier3_machines/quantum_chest_side.png new file mode 100644 index 0000000000000000000000000000000000000000..a000d77cb84587f5c8d7acbffedd5949c8c413f4 GIT binary patch literal 824 zcmV-81IPS{P)+4-3@HEr0>w#0 zK~y-)ozlB*TvZr`;ddSO-s8lcAR8aX9;{$U06|2ggqDU1(NKcufmXX^_$) zfoLeW0+48EkZ>ZRvBm}u!j5f$6s*Yhoc3Oae=Q0}xd6Tkc=Z&Yy7%pOSx`)-HI__L z5CuR$7x-p^P72A1;2V@y)RPHH8;mWn3d8E+JV^xS8j7Mq8$(l1$v|1HAW?`hptQjn z&Dm&7tE%X2Z)1b62_c}B!WJbD`&)oH7buH&^|^qALG#A7*Qr`9qW6#zRwPqZ74d0g zIvVr!mv_-xV~pX|yT5R7?-rB89d3R0IVnY)7eeqPz=oV~&Oy!u5ddy}bHM3eJ%-=k z=HT`_#2B&G61^izCdPnw4vB(IA~epCQ)X{(kCYW#pS(=F-NuJNj1lJ7>3;eZ_Vh>k z{ViVTuH&2|rGy?0haCO=4}-mZK6w8<-o9~-R;xvtUuWry9}p4plLH>#d6&0dyTZpG zeaN4KKR7x%q@IjXKW#qDmsgg!)Sg2`c(lLI@$oSLB0>lOr8OzTYNx|;r-P(~NaE)Q zJ*+i`!Wu+`rfFE~c3JIqF~%S<5@I|LNFszlVJ$fXrmmrO4YqNf(WK^dG^Q*{u!-nB z^|ZzomKX)^J!M(aIENmN$XOvGltqdCt=HrC3m5*^6B`%MZrT9QU0h&k@pF`+1UwMGTIoH=NG7q;@J{7Uo)B1SX-d2B}$~K zDr{3X^!ht&bh`u}nVG%F&R~F&#GBWz6GPf*pxCQUp6uu(atwjTBoWv)~dC(?l^HVXAn2hF5uDrt}BeEZ$|b#TP~fyLrk>v0n^C(SJ3 zTm&Ge9zh~T!MR9?ft)fq_3#pKc#MK4;9C(f?X!D)Cl0~P2r=Ni(7E^r9s@FnG5)|q z;5?>E5W(X(e_;u6K>+yS$M4uQvXQE;i6XpzY5~oeoHL~qCXdf!rJz|^y|Tii`=6i{ zTZmEc64^97!bk6(!Fx{#fx4=2DdC(W=gi`XH;@ph>zadyCWuv_*S&$yDN$5ew_%77 z0%LRM7->Jq=E*PEa`Y3{-O*;>$CubS^(Dh&_tT_AT~+i_0_TwsBhqSta|G}C`|Q&+ zDRKSnr^q?uoa48{yQr!P15}k5BOYi~f_Hc>b^hdo(+kvfP4&{J3_br2cfGhsHM))Q z6W_C8`+aPj_>3~V1v6ve_!NJ2I;a-J#YhlO$r)AU+Tt^)Dp&twae3|lr4*LWJ_|tb zp5i@CYACAsx~lNbkyPn74dZ9dbNBSu)VH^(S}lfW&N1}dTLA2N?*iM7eaRxViyEG}0RIya>xWc`=_Aotv5)t9f z*>70CbvFjwHv283hdv~ZZXdLn{0hH$2S<+0FxGBk6od@LjFb{FMy{QDl9UpfGnZ!{ zLqZ_NNK$2a{s7%>7tGM6A*Y1kJz(_ueE`?(zcw`h-RrTkdX=IHheyl|N8yqEkCRn#B4CBd znYlrL83owUz6UExPJ?q9ie*KL89)8}3x)i@szoy))&rF_W0v@JX^E_f5NiO;5>6`q Y1)e=!#f^wf0{{R307*qoM6N<$f~qx$ng9R* literal 0 HcmV?d00001 diff --git a/run/resourcepacks/unity/assets/techreborn/textures/blocks/nuke_front.png b/run/resourcepacks/unity/assets/techreborn/textures/blocks/nuke_front.png new file mode 100644 index 0000000000000000000000000000000000000000..2cd49163c200a93fed169ee100904f1bb90c9c52 GIT binary patch literal 809 zcmV+^1J?YBP)$mAQ$k8ZS@CQ}SSVv$!PK}Xc=@6QnUg}%a8@ju8_kYct+4d@*yyN~ zK1PtvmUXLskBq$R?%um?lhy_Rq>|KiF#;I`R4X$${4-6L6eg#|rvrdi1{p({Gd(|F zDfO(U50no8R%>bzEGbN4j8&i#1qDrQ?b%roi$DWhzjJSJXn6n5t(ag8R!H@}x0`CM zW+anZYlP6H8@C%zo#33e)UNo6QT5U1QcCH0hb#98sW1Z9eSifQ={=7-U(_Ev#29Nk zv)m6TShc$%!5C|8tnYaABy9+FFd^jXxefE?%=$d^jZ)fFQ$pPEi8C*&>N_=ZR+i;R zDPO#lj+v-&=kKF`a` z4M!s7OBX*HT=sV?IN9(@N-3pmYU>1q|F|XVSC!A2nJk_=*8oth%s_v?u>govZr^&g zSstj`{C((aO7MdG#G9V(>Vx~<^}eMJHO9EEOD%$@J^kquj8T=lb}*OKHC|LwZdt$9 znAIQp`mWr*n+7V7RBJUY98y6b1NHpvfXm!?JZ_B{pE(f#K7Aaxe5)goNDxAVFTM>8 zW5EUI!dPpK1pq>DZR3SlPAn@t<#^5M|HX=X+@XYzjiMu`>U<&mz}HGUjQN6N;t+x{ np}yb*6DfU49ZU&WOQ`b?cClWdP)0=1|XE?d+p=nqI*R76lp6hu&qif%3{tO&XZZCYtz zDTGvxqYaMVoclQ~+|;{xHqWzq(a7k{cp?#1IR)R0SW}-d9tXY;8)VTi3U?q`fs*NxoXCC?zoh z0FXisA33mGE`OeyIyHPEpcDXF zXgxXo4U7Z;Z!Pr*1~=z1#zvd&Y!+k881o1$K&4WN#bWv1JSG@}7s||hnWEO3o_wBC zs+5Yy<5J4e+jm=1%?)+yuHU_XdiXdXoXhouVJMXfU%aG(3;2IwqNYUSz=f(-38kEK z@4+LawI(#cgphmJ4i>Uq55^Anbavc+^t8S!JHBiGy>drue#^N_m!I4?x}$H?!?8m< z`!;!NaDB4j{OFfESBBPDF0Xjdof*J|0p(B>@qew-8l4}z)xR;v81n$mS!dn&n|F;H z3KdS5KEFS9a9(r9fo{Q_^UywE6UPE?_K^>GaOU zYig~v^FQWZzx~kN-AxD)QvCY8fCU$v3+KIe9sr7^rHfa`(rxKfQ{%|R%d1rh07e^L z^0008SNkl&7cLsnXszy1P$2>#0YC!Qm|w#ok}BlPM;Ljv8p6a6IL3%1 z?N-Nbu@jb%ux(A3PIN08aaTBX-`lyNr=ihmZfZ)lcPz8ploXf+9;?@d;FHz4&E5HQ z#@*1JpPQfmI5M(()4C2PwZ7B!1t5?JW5zj^A{0{o+ZorDQUZV!AqqpPX-cX5$~*wP z86A&CsFIRw-Mw$oXB)e+ZY~P|Un`Yc&t5S_>rzaVzqXih%d!%QM2w>HRCV^(43$!B z>(0B`EC5u>!#C;@yW^r^*z5(`Gyb*!|?I@!obkG zI$9k&b)x8n(r$e@T%@3o5z*JK<*^ef2bvuiG)_j^ z&imEb8xJ0F#!~5QxjaElt0@#>Vd1xu$|IOI8pwnYU<^PG0b5kHKc0{r0E85bbBYlu z43F$u--8go_T)J$edb300VO5r-Lb28&8iM3W!tvB zG(Iy`t^OKoXrHD-Z;AggXPU>4^krPvvaGg*^D{sS`}|^z60^}X&8B3tIrnq6 zg^8Fq(@g2{!+lOF1puYu*yY;;lv1n^w3_k3(NbxA8~~hD`sjf@5g~Qp|L-ez?&Weh z!5EcN==zdY69z|1VJJE~y9DPd3;_TD2q9y|;=k>Ap3x8|>$Yr<#iB;UAfP6G%$O1F z>fQV8%iH7e_|q4!ouqx~`rS+>69j>-)9I-xbo$J>!1n_lNFg;{4}1?3jS!3p4SbJa j!dO75hA9E12-W@qN2bZe?^J zG%heMIczh2P5=M`6-h)vR5(wilHE&_Q5?tpU$%*hZrXOIsN3VVqBk?!_BeG;w`g}k zB!(!>iCrWu_ z3=FsGSx)rxb@?%C=^K1syiXw+;ps>({YL#xiL&@zdiIeV?7gM zBO7IVX^QoGG2SO4tVW|e8R(<0_SZ=idFqOtt^5N%y~wb&Jja)%aX!x7qA(q1J2y)q z6=gLRCUnM(bV5KnR>F$AT7z=r&3u;3h?BznbvEWByqga4VLHOMg(P>J7D6_GaI2XG zUl)_EHsYd4+%D3ssg?_DdOp8;$lF_8X!q{Qt`ftV;T?lAN6l84N>cCu$XnCK8m zIh~9djYy3ays86o!D$^U>8tX6!{kOU5^p!L*yrNW`3`1%A~Rl*oX^Y6rUpg@ql~~< zgPA~G9Uk>Tx!|OMiOzav+ybw!4U&*2&-m<2dL5*D+6W&p5wr*-tX76488 diff --git a/run/resourcepacks/unity/assets/techreborn/textures/items/tool/lapotronicEnergyOrb.png b/run/resourcepacks/unity/assets/techreborn/textures/items/tool/lapotronEnergyOrb.png similarity index 100% rename from run/resourcepacks/unity/assets/techreborn/textures/items/tool/lapotronicEnergyOrb.png rename to run/resourcepacks/unity/assets/techreborn/textures/items/tool/lapotronEnergyOrb.png diff --git a/run/resourcepacks/unity/assets/techreborn/textures/items/tool/lapotronEnergyOrbEmpty.png b/run/resourcepacks/unity/assets/techreborn/textures/items/tool/lapotronEnergyOrbEmpty.png new file mode 100644 index 0000000000000000000000000000000000000000..91415b95e7eaaacf53514b53957794b877fadf7c GIT binary patch literal 484 zcmVPx#1ZP1_K>z@;j|==^1poj532;bRa{vGf5&!@T5&_cPe*6Fc00(qQO+^Rb1sn|t z14yi|)c^nh7<5HgbW?9;ba!ELWdLwtX>N2bZe?^JG%heMIczh2P5=M_LPxggC_!}R zUpVFrOjZ-S)VsOEFy}k>+|mALwHzO^pPakmd~A0_A6riU0{VUf6xY0KtdvXvSuP%C zu-u|3`ufJ4zJ<2q;e8k*`S`?{*Tu}z27)j_rEaPr6w{gFc$C0S0dLVT0|d8sm@ceh zannF<976b*;wT;o7@au@@2r*$qgGdonU9&D!&l)-G2?J-I`f`W=(`7M2mxG}1jx+W z&Hxir^BG{Wu=e{Dw(G;~_QlwArdUQevYOZ{SM&4ptAumv)bV?GdI@p=@Q7x*wBF^F zfXyzfqi9sr5N=my=E4ZN83Zs-+d|AZJEgK(EUVhE#8)vV7bY{)d8}BLToSuH=Z^iy arD;D4@MLO5%rQFB^CCPjG~ePS489tgr$` zFiwm@E|-JjI1DPeh@5DF8g_v8y9S}t=^zLK?9=1YM=*@~X}P@{I-L#%g8^e>W9Xdl zOYguu`3tG3segaQFdC6^`6BLXav4bls@y$v&^rRHR*R;lCdgzmSObIN3#<1HQ@wAP zdV70`h^Vo#kt!-G=ty4|MSGtCfYQ@v$nW)HbL|Zjbvuxfk^(^xV6)j^Hk+ZibPjh^ zS|(ZnSwUeDJ-m0Dnfy79*M~~LvMkhUHLO-Ev|23yz<7Lae*u0wl^5#AwBxLuVdhgPI#AboWvx;ol1FY(G9 zqz2zqd>(ZAc$%`c!E7>N$RkjC#-i9fcoX2m9{4d6n+JL}Kt-;uum?Sg8R;XmcsNox zIwL&j2#iW!Tn#%(cDtR3h|0^$soFD1QGcXpaev)2Mmq<3B0ZRPi{EPS1j*nD&hp@_ z%O&o?p1OMETH9xNu;TJ{T+2)o_u$dK;;0^c;YQ;3K)6(eC#szIJm4y;a7(pv!Grno z;ByC0ovnO)9=Plw>i4$7WHMobouQ>GWwCki-XerO_&GtbdC+F$XjRs`um>J@44^nZ zhIWV&BR#MT3(^<&vN0Ip!Hb5VbPt|A4N^vyEy4qHa!CAEODj*7R(_TTcb`v-dr(>O z00~KNXL+z=S1n2oFBbRUO7-rj9&|4g;`cza_a-hBC&uT2dgE18lqeTG5b@wQ&ty>) TrX~uL00000NkvXXu0mjf?&F>? delta 873 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 literal 0 HcmV?d00001 diff --git a/src/main/java/techreborn/blocks/BlockDigitalChest.java b/src/main/java/techreborn/blocks/BlockDigitalChest.java index c5336fe3a..6d6dad1b1 100644 --- a/src/main/java/techreborn/blocks/BlockDigitalChest.java +++ b/src/main/java/techreborn/blocks/BlockDigitalChest.java @@ -10,7 +10,7 @@ import techreborn.client.GuiHandler; import techreborn.client.TechRebornCreativeTab; import techreborn.tiles.TileDigitalChest; -public class BlockDigitalChest extends BlockMachineBase implements IAdvancedRotationTexture +public class BlockDigitalChest extends BlockMachineBase { private final String prefix = "techreborn:blocks/machine/greg_machines/"; @@ -37,28 +37,4 @@ public class BlockDigitalChest extends BlockMachineBase implements IAdvancedRota return true; } - @Override - public String getFront(boolean isActive) - { - return prefix + "quantum_chest"; - } - - @Override - public String getSide(boolean isActive) - { - return prefix + "qchest_side"; - } - - @Override - public String getTop(boolean isActive) - { - return prefix + "quantum_top"; - } - - @Override - public String getBottom(boolean isActive) - { - return prefix + "machine_bottom"; - } - } diff --git a/src/main/java/techreborn/blocks/BlockDistributor.java b/src/main/java/techreborn/blocks/BlockDistributor.java index bfd930db0..af4246085 100644 --- a/src/main/java/techreborn/blocks/BlockDistributor.java +++ b/src/main/java/techreborn/blocks/BlockDistributor.java @@ -14,6 +14,7 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import reborncore.common.util.ItemNBTHelper; +import reborncore.shields.RebornCoreShields; import techreborn.client.TechRebornCreativeTab; /** diff --git a/src/main/java/techreborn/blocks/BlockOre.java b/src/main/java/techreborn/blocks/BlockOre.java index e4443eee8..b3cb2b213 100644 --- a/src/main/java/techreborn/blocks/BlockOre.java +++ b/src/main/java/techreborn/blocks/BlockOre.java @@ -34,7 +34,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Random; -public class BlockOre extends BaseBlock implements ITexturedBlock, IOreNameProvider +public class BlockOre extends BaseBlock implements IOreNameProvider { public static final String[] ores = new String[] { "galena", "iridium", "ruby", "sapphire", "bauxite", "pyrite", @@ -198,17 +198,17 @@ public class BlockOre extends BaseBlock implements ITexturedBlock, IOreNameProvi // return meta; // } - @Override - public String getTextureNameFromState(IBlockState BlockStateContainer, EnumFacing facing) - { - return "techreborn:blocks/ore/ore" + StringUtils.toFirstCapital(ores[getMetaFromState(BlockStateContainer)]); - } - - @Override - public int amountOfStates() - { - return ores.length; - } +// @Override +// public String getTextureNameFromState(IBlockState BlockStateContainer, EnumFacing facing) +// { +// return "techreborn:blocks/ore/ore" + StringUtils.toFirstCapital(ores[getMetaFromState(BlockStateContainer)]); +// } +// +// @Override +// public int amountOfStates() +// { +// return ores.length; +// } @Override public int damageDropped(IBlockState state) { diff --git a/src/main/java/techreborn/blocks/BlockOre2.java b/src/main/java/techreborn/blocks/BlockOre2.java index 0ca0e09ee..e0d8ce282 100644 --- a/src/main/java/techreborn/blocks/BlockOre2.java +++ b/src/main/java/techreborn/blocks/BlockOre2.java @@ -27,7 +27,7 @@ import techreborn.client.TechRebornCreativeTabMisc; import techreborn.init.ModBlocks; import techreborn.world.config.IOreNameProvider; -public class BlockOre2 extends BaseBlock implements ITexturedBlock, IOreNameProvider +public class BlockOre2 extends BaseBlock implements IOreNameProvider { public static final String[] ores = new String[] { "copper", "tin"}; @@ -119,17 +119,17 @@ public class BlockOre2 extends BaseBlock implements ITexturedBlock, IOreNameProv // return meta; // } - @Override - public String getTextureNameFromState(IBlockState BlockStateContainer, EnumFacing facing) - { - return "techreborn:blocks/ore/ore" + StringUtils.toFirstCapital(ores[getMetaFromState(BlockStateContainer)]); - } - - @Override - public int amountOfStates() - { - return ores.length; - } +// @Override +// public String getTextureNameFromState(IBlockState BlockStateContainer, EnumFacing facing) +// { +// return "techreborn:blocks/ore/ore" + StringUtils.toFirstCapital(ores[getMetaFromState(BlockStateContainer)]); +// } +// +// @Override +// public int amountOfStates() +// { +// return ores.length; +// } @Override public int damageDropped(IBlockState state) { diff --git a/src/main/java/techreborn/blocks/BlockQuantumChest.java b/src/main/java/techreborn/blocks/BlockQuantumChest.java index a15dba7b1..34c40f7db 100644 --- a/src/main/java/techreborn/blocks/BlockQuantumChest.java +++ b/src/main/java/techreborn/blocks/BlockQuantumChest.java @@ -15,7 +15,7 @@ import techreborn.client.GuiHandler; import techreborn.client.TechRebornCreativeTab; import techreborn.tiles.TileQuantumChest; -public class BlockQuantumChest extends BlockMachineBase implements IAdvancedRotationTexture +public class BlockQuantumChest extends BlockMachineBase { private final String prefix = "techreborn:blocks/machine/greg_machines/"; @@ -42,28 +42,4 @@ public class BlockQuantumChest extends BlockMachineBase implements IAdvancedRota playerIn.openGui(Core.INSTANCE, GuiHandler.quantumChestID, worldIn, pos.getX(), pos.getY(), pos.getZ()); return true; } - - @Override - public String getFront(boolean isActive) - { - return prefix + "quantum_chest"; - } - - @Override - public String getSide(boolean isActive) - { - return prefix + "qchest_side"; - } - - @Override - public String getTop(boolean isActive) - { - return prefix + "quantum_top"; - } - - @Override - public String getBottom(boolean isActive) - { - return prefix + "machine_bottom"; - } } diff --git a/src/main/java/techreborn/blocks/BlockQuantumTank.java b/src/main/java/techreborn/blocks/BlockQuantumTank.java index a020f5ae3..f71e943f8 100644 --- a/src/main/java/techreborn/blocks/BlockQuantumTank.java +++ b/src/main/java/techreborn/blocks/BlockQuantumTank.java @@ -11,7 +11,7 @@ import techreborn.client.GuiHandler; import techreborn.client.TechRebornCreativeTab; import techreborn.tiles.TileQuantumTank; -public class BlockQuantumTank extends BlockMachineBase implements IAdvancedRotationTexture +public class BlockQuantumTank extends BlockMachineBase { private final String prefix = "techreborn:blocks/machine/greg_machines/"; @@ -44,28 +44,4 @@ public class BlockQuantumTank extends BlockMachineBase implements IAdvancedRotat } return true; } - - @Override - public String getFront(boolean isActive) - { - return "techreborn:blocks/machine/generators/thermal_generator_side_off"; - } - - @Override - public String getSide(boolean isActive) - { - return "techreborn:blocks/machine/generators/thermal_generator_side_off"; - } - - @Override - public String getTop(boolean isActive) - { - return prefix + "quantum_top"; - } - - @Override - public String getBottom(boolean isActive) - { - return "techreborn:blocks/machine/generators/thermal_generator_bottom"; - } } diff --git a/src/main/java/techreborn/blocks/BlockStorage.java b/src/main/java/techreborn/blocks/BlockStorage.java index 477d08a7c..14369dd32 100644 --- a/src/main/java/techreborn/blocks/BlockStorage.java +++ b/src/main/java/techreborn/blocks/BlockStorage.java @@ -1,5 +1,6 @@ package techreborn.blocks; +import com.google.common.collect.Lists; import me.modmuss50.jsonDestroyer.api.ITexturedBlock; import net.minecraft.block.material.Material; import net.minecraft.block.properties.PropertyInteger; @@ -12,18 +13,21 @@ import net.minecraft.util.EnumFacing; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import reborncore.common.BaseBlock; +import reborncore.common.blocks.PropertyString; +import reborncore.common.util.ArrayUtils; import techreborn.client.TechRebornCreativeTabMisc; import techreborn.init.ModBlocks; import java.util.List; import java.util.Random; -public class BlockStorage extends BaseBlock implements ITexturedBlock +public class BlockStorage extends BaseBlock { public static final String[] types = new String[] { "silver", "aluminum", "titanium", "chrome", "steel", "brass", "lead", "electrum", "zinc", "platinum", "tungsten", "nickel", "invar", "iridium" }; - public PropertyInteger METADATA; + static List oreNamesList = Lists.newArrayList(ArrayUtils.arrayToLowercase(types)); + public PropertyString VARIANTS = new PropertyString("type", oreNamesList); public BlockStorage(Material material) { @@ -31,7 +35,7 @@ public class BlockStorage extends BaseBlock implements ITexturedBlock setUnlocalizedName("techreborn.storage"); setCreativeTab(TechRebornCreativeTabMisc.instance); setHardness(2f); - this.setDefaultState(this.getDefaultState().withProperty(METADATA, 0)); + this.setDefaultState(this.getStateFromMeta(0)); } public static ItemStack getStorageBlockByName(String name, int count) @@ -74,37 +78,22 @@ public class BlockStorage extends BaseBlock implements ITexturedBlock } @Override - public String getTextureNameFromState(IBlockState BlockStateContainer, EnumFacing facing) - { - return "techreborn:blocks/storage/" + types[getMetaFromState(BlockStateContainer)] + "_block"; - } - - @Override - public int amountOfStates() - { - return types.length; - } - - @Override - public IBlockState getStateFromMeta(int meta) - { + public IBlockState getStateFromMeta(int meta) { if(meta > types.length){ meta = 0; } - return this.getDefaultState().withProperty(METADATA, meta); + return getBlockState().getBaseState().withProperty(VARIANTS, oreNamesList.get(meta)); } @Override - public int getMetaFromState(IBlockState state) - { - return state.getValue(METADATA); + public int getMetaFromState(IBlockState state) { + return oreNamesList.indexOf(state.getValue(VARIANTS)); } protected BlockStateContainer createBlockState() { - - METADATA = PropertyInteger.create("type", 0, types.length - 1); - return new BlockStateContainer(this, METADATA); + VARIANTS = new PropertyString("type", oreNamesList); + return new BlockStateContainer(this, VARIANTS); } } diff --git a/src/main/java/techreborn/blocks/BlockStorage2.java b/src/main/java/techreborn/blocks/BlockStorage2.java index 3b1556e1f..2a1fbf71f 100644 --- a/src/main/java/techreborn/blocks/BlockStorage2.java +++ b/src/main/java/techreborn/blocks/BlockStorage2.java @@ -1,5 +1,6 @@ package techreborn.blocks; +import com.google.common.collect.Lists; import me.modmuss50.jsonDestroyer.api.ITexturedBlock; import net.minecraft.block.material.Material; import net.minecraft.block.properties.PropertyInteger; @@ -12,6 +13,8 @@ import net.minecraft.util.EnumFacing; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import reborncore.common.BaseBlock; +import reborncore.common.blocks.PropertyString; +import reborncore.common.util.ArrayUtils; import techreborn.client.TechRebornCreativeTabMisc; import techreborn.init.ModBlocks; @@ -19,13 +22,14 @@ import java.security.InvalidParameterException; import java.util.List; import java.util.Random; -public class BlockStorage2 extends BaseBlock implements ITexturedBlock +public class BlockStorage2 extends BaseBlock { public static final String[] types = new String[] { "tungstensteel", "iridium_reinforced_tungstensteel", "iridium_reinforced_stone", "ruby", "sapphire", "peridot", "yellowGarnet", "redGarnet", "copper", "tin", "refinedIron" }; - public PropertyInteger METADATA; + static List oreNamesList = Lists.newArrayList(ArrayUtils.arrayToLowercase(types)); + public PropertyString VARIANTS = new PropertyString("type", oreNamesList); public BlockStorage2(Material material) { @@ -33,7 +37,7 @@ public class BlockStorage2 extends BaseBlock implements ITexturedBlock setUnlocalizedName("techreborn.storage2"); setCreativeTab(TechRebornCreativeTabMisc.instance); setHardness(2f); - this.setDefaultState(this.getDefaultState().withProperty(METADATA, 0)); + this.setDefaultState(this.getStateFromMeta(0)); } public static ItemStack getStorageBlockByName(String name, int count) @@ -71,37 +75,22 @@ public class BlockStorage2 extends BaseBlock implements ITexturedBlock } @Override - public String getTextureNameFromState(IBlockState BlockStateContainer, EnumFacing facing) - { - return "techreborn:blocks/storage/" + types[getMetaFromState(BlockStateContainer)] + "_block"; - } - - @Override - public int amountOfStates() - { - return types.length; - } - - @Override - public IBlockState getStateFromMeta(int meta) - { + public IBlockState getStateFromMeta(int meta) { if(meta > types.length){ meta = 0; } - return this.getDefaultState().withProperty(METADATA, meta); + return getBlockState().getBaseState().withProperty(VARIANTS, oreNamesList.get(meta)); } @Override - public int getMetaFromState(IBlockState state) - { - return state.getValue(METADATA); + public int getMetaFromState(IBlockState state) { + return oreNamesList.indexOf(state.getValue(VARIANTS)); } protected BlockStateContainer createBlockState() { - - METADATA = PropertyInteger.create("type", 0, types.length - 1); - return new BlockStateContainer(this, METADATA); + VARIANTS = new PropertyString("type", oreNamesList); + return new BlockStateContainer(this, VARIANTS); } } diff --git a/src/main/java/techreborn/blocks/generator/BlockHeatGenerator.java b/src/main/java/techreborn/blocks/generator/BlockHeatGenerator.java deleted file mode 100644 index ebc4960e1..000000000 --- a/src/main/java/techreborn/blocks/generator/BlockHeatGenerator.java +++ /dev/null @@ -1,53 +0,0 @@ -package techreborn.blocks.generator; - -import net.minecraft.block.material.Material; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; -import reborncore.common.blocks.BlockMachineBase; -import reborncore.common.blocks.IAdvancedRotationTexture; -import techreborn.client.TechRebornCreativeTab; -import techreborn.tiles.generator.TileHeatGenerator; - -public class BlockHeatGenerator extends BlockMachineBase implements IAdvancedRotationTexture -{ - - private final String prefix = "techreborn:blocks/machine/generators/"; - - public BlockHeatGenerator(Material material) - { - super(); - setUnlocalizedName("techreborn.heatgenerator"); - setCreativeTab(TechRebornCreativeTab.instance); - } - - @Override - public TileEntity createNewTileEntity(World world, int p_149915_2_) - { - return new TileHeatGenerator(); - } - - @Override - public String getFront(boolean isActive) - { - return prefix + "heat_generator_side"; - } - - @Override - public String getSide(boolean isActive) - { - return prefix + "heat_generator_side"; - } - - @Override - public String getTop(boolean isActive) - { - return prefix + "heat_generator_top"; - } - - @Override - public String getBottom(boolean isActive) - { - return prefix + "heat_generator_bottom"; - } - -} diff --git a/src/main/java/techreborn/client/RegisterItemJsons.java b/src/main/java/techreborn/client/RegisterItemJsons.java index bb6bc0e1c..487313bd8 100644 --- a/src/main/java/techreborn/client/RegisterItemJsons.java +++ b/src/main/java/techreborn/client/RegisterItemJsons.java @@ -21,6 +21,7 @@ public class RegisterItemJsons register(ModItems.lithiumBattery, "lithiumBattery"); register(ModItems.energyCrystal, "energyCrystal"); register(ModItems.lapotronCrystal, "lapotronCrystal"); + register(ModItems.lapotronicOrb, "lapotronOrb"); register(ModItems.nanosaber, "nanosaber"); } diff --git a/src/main/java/techreborn/compat/jei/alloySmelter/AlloySmelterRecipeHandler.java b/src/main/java/techreborn/compat/jei/alloySmelter/AlloySmelterRecipeHandler.java index 1f2c691ff..b53296415 100644 --- a/src/main/java/techreborn/compat/jei/alloySmelter/AlloySmelterRecipeHandler.java +++ b/src/main/java/techreborn/compat/jei/alloySmelter/AlloySmelterRecipeHandler.java @@ -32,6 +32,12 @@ public class AlloySmelterRecipeHandler implements IRecipeHandler return RecipeCategoryUids.CENTRIFUGE; } + @Nonnull + @Override + public String getRecipeCategoryUid(@Nonnull CentrifugeRecipe recipe) { + return RecipeCategoryUids.CENTRIFUGE; + } + @Nonnull @Override public IRecipeWrapper getRecipeWrapper(@Nonnull CentrifugeRecipe recipe) diff --git a/src/main/java/techreborn/compat/jei/chemicalReactor/ChemicalReactorRecipeHandler.java b/src/main/java/techreborn/compat/jei/chemicalReactor/ChemicalReactorRecipeHandler.java index 282681c20..0c96a2863 100644 --- a/src/main/java/techreborn/compat/jei/chemicalReactor/ChemicalReactorRecipeHandler.java +++ b/src/main/java/techreborn/compat/jei/chemicalReactor/ChemicalReactorRecipeHandler.java @@ -32,6 +32,12 @@ public class ChemicalReactorRecipeHandler implements IRecipeHandler return RecipeCategoryUids.COMPRESSOR; } + @Nonnull + @Override + public String getRecipeCategoryUid(@Nonnull CompressorRecipe recipe) { + return RecipeCategoryUids.COMPRESSOR; + } + @Nonnull @Override public IRecipeWrapper getRecipeWrapper(@Nonnull CompressorRecipe recipe) diff --git a/src/main/java/techreborn/compat/jei/extractor/ExtractorRecipeHandler.java b/src/main/java/techreborn/compat/jei/extractor/ExtractorRecipeHandler.java index ef343edf8..c4df3ea65 100644 --- a/src/main/java/techreborn/compat/jei/extractor/ExtractorRecipeHandler.java +++ b/src/main/java/techreborn/compat/jei/extractor/ExtractorRecipeHandler.java @@ -32,6 +32,12 @@ public class ExtractorRecipeHandler implements IRecipeHandler return RecipeCategoryUids.EXTRACTOR; } + @Nonnull + @Override + public String getRecipeCategoryUid(@Nonnull ExtractorRecipe recipe) { + return RecipeCategoryUids.EXTRACTOR; + } + @Nonnull @Override public IRecipeWrapper getRecipeWrapper(@Nonnull ExtractorRecipe recipe) diff --git a/src/main/java/techreborn/compat/jei/fusionReactor/FusionReactorRecipeHandler.java b/src/main/java/techreborn/compat/jei/fusionReactor/FusionReactorRecipeHandler.java index d68ae15bc..8072c766b 100644 --- a/src/main/java/techreborn/compat/jei/fusionReactor/FusionReactorRecipeHandler.java +++ b/src/main/java/techreborn/compat/jei/fusionReactor/FusionReactorRecipeHandler.java @@ -24,6 +24,12 @@ public class FusionReactorRecipeHandler implements IRecipeHandler return RecipeCategoryUids.GRINDER; } + @Nonnull + @Override + public String getRecipeCategoryUid(@Nonnull GrinderRecipe recipe) { + return RecipeCategoryUids.GRINDER; + } + @Nonnull @Override public IRecipeWrapper getRecipeWrapper(@Nonnull GrinderRecipe recipe) diff --git a/src/main/java/techreborn/compat/jei/implosionCompressor/ImplosionCompressorRecipeHandler.java b/src/main/java/techreborn/compat/jei/implosionCompressor/ImplosionCompressorRecipeHandler.java index 6aea87fff..d6a795f3f 100644 --- a/src/main/java/techreborn/compat/jei/implosionCompressor/ImplosionCompressorRecipeHandler.java +++ b/src/main/java/techreborn/compat/jei/implosionCompressor/ImplosionCompressorRecipeHandler.java @@ -32,6 +32,12 @@ public class ImplosionCompressorRecipeHandler implements IRecipeHandler return RecipeCategoryUids.SCRAPBOX; } + @Nonnull + @Override + public String getRecipeCategoryUid(@Nonnull ScrapboxRecipe recipe) { + return RecipeCategoryUids.SCRAPBOX; + } + @Nonnull @Override public IRecipeWrapper getRecipeWrapper(@Nonnull ScrapboxRecipe recipe) diff --git a/src/main/java/techreborn/compat/jei/vacuumFreezer/VacuumFreezerRecipeHandler.java b/src/main/java/techreborn/compat/jei/vacuumFreezer/VacuumFreezerRecipeHandler.java index 8adea0654..99b7c920b 100644 --- a/src/main/java/techreborn/compat/jei/vacuumFreezer/VacuumFreezerRecipeHandler.java +++ b/src/main/java/techreborn/compat/jei/vacuumFreezer/VacuumFreezerRecipeHandler.java @@ -29,7 +29,13 @@ public class VacuumFreezerRecipeHandler implements IRecipeHandler> multipartHashMap = new HashMap<>(); @@ -50,12 +50,12 @@ public class TechRebornParts implements ICompatModule cables.setRegistryName("cables"); GameRegistry.register(cables); - MultipartRegistry.registerPart(EmptyFluidPipe.class, "techreborn:fluidpipe.empty"); - MultipartRegistry.registerPart(InsertingFluidPipe.class, "techreborn:fluidpipe.inserting"); - MultipartRegistry.registerPart(ExtractingFluidPipe.class, "techreborn:fluidpipe.extracting"); - fluidPipe = new ItemFluidPipe(); - fluidPipe.setRegistryName("fluidPipe"); - GameRegistry.register(fluidPipe); +// MultipartRegistry.registerPart(EmptyFluidPipe.class, "techreborn:fluidpipe.empty"); +// MultipartRegistry.registerPart(InsertingFluidPipe.class, "techreborn:fluidpipe.inserting"); +// MultipartRegistry.registerPart(ExtractingFluidPipe.class, "techreborn:fluidpipe.extracting"); +// fluidPipe = new ItemFluidPipe(); +// fluidPipe.setRegistryName("fluidPipe"); +// GameRegistry.register(fluidPipe); } @Override diff --git a/src/main/java/techreborn/parts/fluidPipes/MultipartFluidPipe.java b/src/main/java/techreborn/parts/fluidPipes/MultipartFluidPipe.java index c565efe98..54773f3da 100644 --- a/src/main/java/techreborn/parts/fluidPipes/MultipartFluidPipe.java +++ b/src/main/java/techreborn/parts/fluidPipes/MultipartFluidPipe.java @@ -280,7 +280,7 @@ public abstract class MultipartFluidPipe extends Multipart implements INormallyO @Override public List getDrops() { List list = new ArrayList<>(); - list.add(new ItemStack(TechRebornParts.fluidPipe, 1, 0)); + // list.add(new ItemStack(TechRebornParts.fluidPipe, 1, 0)); return list; } diff --git a/src/main/java/techreborn/power/TRPowerNet.java b/src/main/java/techreborn/power/TRPowerNet.java index 3244a9cc9..4d18243bf 100644 --- a/src/main/java/techreborn/power/TRPowerNet.java +++ b/src/main/java/techreborn/power/TRPowerNet.java @@ -191,10 +191,10 @@ public class TRPowerNet public void setEnergy(int energy) { - energy += energy; - if (energy < 0) + this.energy += energy; + if (this.energy < 0) { - energy = 0; + this.energy = 0; } } @@ -337,7 +337,7 @@ public class TRPowerNet public int getTotalCollectible() { - if (tile.canProvideEnergy(side.getOpposite()) && tile.getEnergy() != 0) + if (tile.canProvideEnergy(side.getOpposite()) && tile.getEnergy() > 0) { return (int) Math.min(tile.getMaxOutput(), tile.getEnergy()); } @@ -347,7 +347,7 @@ public class TRPowerNet public int getTotalInsertible() { int total = 0; - if (tile.canAcceptEnergy(side.getOpposite()) && tile.getMaxPower() - tile.getEnergy() != 0) + if (tile.canAcceptEnergy(side.getOpposite()) && tile.getMaxPower() - tile.getEnergy() > 0) { total += tile.addEnergy(type.transferRate, true); } diff --git a/src/main/java/techreborn/proxies/ClientProxy.java b/src/main/java/techreborn/proxies/ClientProxy.java index eca79dab1..83a80ab39 100644 --- a/src/main/java/techreborn/proxies/ClientProxy.java +++ b/src/main/java/techreborn/proxies/ClientProxy.java @@ -163,8 +163,8 @@ public class ClientProxy extends CommonProxy } @Override - public void registerCustomBlockSateLocation(Block block, String resourceLocation) { - super.registerCustomBlockSateLocation(block, resourceLocation); + public void registerCustomBlockStateLocation(Block block, String resourceLocation, boolean item) { + super.registerCustomBlockStateLocation(block, resourceLocation, item); ModelLoader.setCustomStateMapper(block, new DefaultStateMapper() { @Override @@ -175,7 +175,35 @@ public class ClientProxy extends CommonProxy return new ModelResourceLocation(resourceDomain + ':' + resourceLocation, propertyString); } }); - String resourceDomain = Block.REGISTRY.getNameForObject(block).getResourceDomain(); - ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(block), 0, new ModelResourceLocation(resourceDomain + ':' + resourceLocation, "inventory")); + if(item){ + String resourceDomain = Block.REGISTRY.getNameForObject(block).getResourceDomain(); + ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(block), 0, new ModelResourceLocation(resourceDomain + ':' + resourceLocation, "inventory")); + } } + + + @Override + public void registerSubItemInventoryLocation(Item item, int meta, String location, String name) { + super.registerSubItemInventoryLocation(item, meta, location, name); + Block block = Block.getBlockFromItem(item); + if(block != null){ + IBlockState state = block.getStateFromMeta(meta); + String resourceDomain = Block.REGISTRY.getNameForObject(state.getBlock()).getResourceDomain(); + StateMapperBase base = new StateMapperBase() { + @Override + protected ModelResourceLocation getModelResourceLocation(IBlockState state) { + return null; + } + }; + String propertyString = base.getPropertyString(state.getProperties()); + ModelResourceLocation resourceLocation = new ModelResourceLocation(resourceDomain + ':' + location, propertyString); + ModelLoader.setCustomModelResourceLocation(item, meta, resourceLocation); + } else { + ResourceLocation loc = item.getRegistryName(); + String resourceDomain = Item.REGISTRY.getNameForObject(item).getResourceDomain(); + ModelLoader.setCustomModelResourceLocation(item, meta, new ModelResourceLocation(resourceDomain + ':' + loc, "type=" + name)); + } + + } + } diff --git a/src/main/java/techreborn/proxies/CommonProxy.java b/src/main/java/techreborn/proxies/CommonProxy.java index 3c33a0878..043bb9a77 100644 --- a/src/main/java/techreborn/proxies/CommonProxy.java +++ b/src/main/java/techreborn/proxies/CommonProxy.java @@ -1,6 +1,7 @@ package techreborn.proxies; import net.minecraft.block.Block; +import net.minecraft.item.Item; import net.minecraftforge.fml.common.event.FMLInitializationEvent; import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; @@ -38,8 +39,20 @@ public class CommonProxy implements ICompatModule } - public void registerCustomBlockSateLocation(Block block, String name) { + public void registerCustomBlockStateLocation(Block block, String name) { + registerCustomBlockStateLocation(block, name, true); + } + + public void registerCustomBlockStateLocation(Block block, String name, boolean item) { } + public void registerSubItemInventoryLocation(Item item, int meta , String location, String name){ + + } + + public void registerSubBlockInventoryLocation(Block block, int meta , String location, String name){ + registerSubItemInventoryLocation(Item.getItemFromBlock(block), meta, location, name); + } + } diff --git a/src/main/java/techreborn/tiles/generator/TileHeatGenerator.java b/src/main/java/techreborn/tiles/generator/TileHeatGenerator.java deleted file mode 100644 index 73433d5d0..000000000 --- a/src/main/java/techreborn/tiles/generator/TileHeatGenerator.java +++ /dev/null @@ -1,135 +0,0 @@ -package techreborn.tiles.generator; - -import reborncore.common.IWrenchable; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; -import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.math.BlockPos; -import reborncore.api.power.EnumPowerTier; -import reborncore.common.powerSystem.TilePowerAcceptor; -import techreborn.config.ConfigTechReborn; -import techreborn.init.ModBlocks; - -public class TileHeatGenerator extends TilePowerAcceptor implements IWrenchable -{ - - public static final int euTick = ConfigTechReborn.HeatGeneratorOutput; - - public TileHeatGenerator() - { - super(1); - } - - @Override - public void updateEntity() - { - super.updateEntity(); - - if (!worldObj.isRemote) - { - if (worldObj.getBlockState(new BlockPos(getPos().getX() + 1, getPos().getY(), getPos().getZ())) - .getBlock() == Blocks.LAVA) - { - addEnergy(euTick); - } else if (worldObj.getBlockState(new BlockPos(getPos().getX(), getPos().getY(), getPos().getZ() + 1)) - .getBlock() == Blocks.LAVA) - { - addEnergy(euTick); - } else if (worldObj.getBlockState(new BlockPos(getPos().getX(), getPos().getY(), getPos().getZ() - 1)) - .getBlock() == Blocks.LAVA) - { - addEnergy(euTick); - } else if (worldObj.getBlockState(new BlockPos(getPos().getX() - 1, getPos().getY(), getPos().getZ())) - .getBlock() == Blocks.LAVA) - { - addEnergy(euTick); - } else if (worldObj.getBlockState(new BlockPos(getPos().getX(), getPos().getY() - 1, getPos().getZ())) - .getBlock() == Blocks.LAVA) - { - addEnergy(euTick); - } - - } - } - - @Override - public boolean wrenchCanSetFacing(EntityPlayer entityPlayer, EnumFacing side) - { - return false; - } - - @Override - public EnumFacing getFacing() - { - return getFacingEnum(); - } - - @Override - public boolean wrenchCanRemove(EntityPlayer entityPlayer) - { - return entityPlayer.isSneaking(); - } - - @Override - public float getWrenchDropRate() - { - return 1.0F; - } - - @Override - public ItemStack getWrenchDrop(EntityPlayer entityPlayer) - { - return new ItemStack(ModBlocks.heatGenerator, 1); - } - - public boolean isComplete() - { - return false; - } - - @Override - public double getMaxPower() - { - return 10000; - } - - @Override - public boolean canAcceptEnergy(EnumFacing direction) - { - return false; - } - - @Override - public boolean canProvideEnergy(EnumFacing direction) - { - return true; - } - - @Override - public double getMaxOutput() - { - return 64; - } - - @Override - public double getMaxInput() - { - return 0; - } - - @Override - public EnumPowerTier getTier() - { - return EnumPowerTier.LOW; - } - - // @Override - // public void addWailaInfo(List info) - // { - // super.addWailaInfo(info); - // info.add("Power Generarating " + euTick +" EU/t"); - // - // } - -} diff --git a/src/main/java/techreborn/tiles/generator/TileThermalGenerator.java b/src/main/java/techreborn/tiles/generator/TileThermalGenerator.java index 1b78845cd..88d71b042 100644 --- a/src/main/java/techreborn/tiles/generator/TileThermalGenerator.java +++ b/src/main/java/techreborn/tiles/generator/TileThermalGenerator.java @@ -21,7 +21,7 @@ import reborncore.common.util.Tank; import techreborn.config.ConfigTechReborn; import techreborn.init.ModBlocks; -public class TileThermalGenerator extends TilePowerAcceptor implements IWrenchable, IFluidHandler,IInventoryProvider +public class TileThermalGenerator extends TilePowerAcceptor implements IWrenchable, IFluidHandler,IInventoryProvider { public static final int euTick = ConfigTechReborn.ThermalGeneratorOutput; @@ -136,13 +136,13 @@ public class TileThermalGenerator extends TilePowerAcceptor implements IWrenchab } @Override - // TODO optimise this code public void updateEntity() { super.updateEntity(); if (!worldObj.isRemote) { FluidUtils.drainContainers(this, inventory, 0, 1); + boolean didFindLava = false; for (EnumFacing direction : EnumFacing.values()) { if (worldObj.getBlockState(new BlockPos(getPos().getX() + direction.getFrontOffsetX(), @@ -150,22 +150,11 @@ public class TileThermalGenerator extends TilePowerAcceptor implements IWrenchab .getBlock() == Blocks.LAVA) { addEnergy(1); + didFindLava = true; } } - - if (worldObj.getTotalWorldTime() % 40 == 0) - { + if (worldObj.getTotalWorldTime() % 40 == 0) { BlockMachineBase bmb = (BlockMachineBase) worldObj.getBlockState(pos).getBlock(); - boolean didFindLava = false; - for (EnumFacing direction : EnumFacing.values()) - { - if (worldObj.getBlockState(new BlockPos(getPos().getX() + direction.getFrontOffsetX(), - getPos().getY() + direction.getFrontOffsetY(), - getPos().getZ() + direction.getFrontOffsetZ())).getBlock() == Blocks.LAVA) - { - didFindLava = true; - } - } bmb.setActive(didFindLava, worldObj, pos); } } @@ -224,4 +213,4 @@ public class TileThermalGenerator extends TilePowerAcceptor implements IWrenchab public Inventory getInventory() { return inventory; } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/blockstates/storage/ores.json b/src/main/resources/assets/techreborn/blockstates/storage/ores.json new file mode 100644 index 000000000..d2adab98c --- /dev/null +++ b/src/main/resources/assets/techreborn/blockstates/storage/ores.json @@ -0,0 +1,93 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": {}, + "transform": "forge:default-block", + "model": "cube_all" + }, + "variants": { + "inventory": [{}], + "type": { + "galena": { + "textures": { + "all": "techreborn:blocks/ore/oreGalena" + } + }, + "iridium": { + "textures": { + "all": "techreborn:blocks/ore/oreIridium" + } + }, + "ruby": { + "textures": { + "all": "techreborn:blocks/ore/oreRuby" + } + }, + "sapphire": { + "textures": { + "all": "techreborn:blocks/ore/oreSapphire" + } + }, + "bauxite": { + "textures": { + "all": "techreborn:blocks/ore/oreBauxite" + } + }, + "pyrite": { + "textures": { + "all": "techreborn:blocks/ore/orePyrite" + } + }, + "cinnabar": { + "textures": { + "all": "techreborn:blocks/ore/oreCinnabar" + } + }, + "sphalerite": { + "textures": { + "all": "techreborn:blocks/ore/oreSphalerite" + } + }, + "tungston": { + "textures": { + "all": "techreborn:blocks/ore/oreTungston" + } + }, + "sheldonite": { + "textures": { + "all": "techreborn:blocks/ore/oreSheldonite" + } + }, + "peridot": { + "textures": { + "all": "techreborn:blocks/ore/orePeridot" + } + }, + "sodalite": { + "textures": { + "all": "techreborn:blocks/ore/oreSodalite" + } + }, + "lead": { + "textures": { + "all": "techreborn:blocks/ore/oreLead" + } + }, + "silver": { + "textures": { + "all": "techreborn:blocks/ore/oreSilver" + } + }, + "copper": { + "textures": { + "all": "techreborn:blocks/ore/oreCopper" + } + }, + "tin": { + "textures": { + "all": "techreborn:blocks/ore/oreTin" + } + } + } + } +} diff --git a/src/main/resources/assets/techreborn/blockstates/storage/storage.json b/src/main/resources/assets/techreborn/blockstates/storage/storage.json new file mode 100644 index 000000000..7b172219f --- /dev/null +++ b/src/main/resources/assets/techreborn/blockstates/storage/storage.json @@ -0,0 +1,138 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": {}, + "transform": "forge:default-block", + "model": "cube_all" + }, + "variants": { + "inventory": [{}], + "type": { + "silver": { + "textures": { + "all": "techreborn:blocks/storage/silver_block" + } + }, + "aluminum": { + "textures": { + "all": "techreborn:blocks/storage/aluminum_block" + } + }, + "titanium": { + "textures": { + "all": "techreborn:blocks/storage/titanium_block" + } + }, + "chrome": { + "textures": { + "all": "techreborn:blocks/storage/chrome_block" + } + }, + "steel": { + "textures": { + "all": "techreborn:blocks/storage/steel_block" + } + }, + "brass": { + "textures": { + "all": "techreborn:blocks/storage/brass_block" + } + }, + "lead": { + "textures": { + "all": "techreborn:blocks/storage/lead_block" + } + }, + "electrum": { + "textures": { + "all": "techreborn:blocks/storage/electrum_block" + } + }, + "zinc": { + "textures": { + "all": "techreborn:blocks/storage/zinc_block" + } + }, + "platinum": { + "textures": { + "all": "techreborn:blocks/storage/platinum_block" + } + }, + "tungsten": { + "textures": { + "all": "techreborn:blocks/storage/tungsten_block" + } + }, + "nickel": { + "textures": { + "all": "techreborn:blocks/storage/nickel_block" + } + }, + "invar": { + "textures": { + "all": "techreborn:blocks/storage/invar_block" + } + }, + "iridium": { + "textures": { + "all": "techreborn:blocks/storage/iridium_block" + } + }, + "tungstensteel": { + "textures": { + "all": "techreborn:blocks/storage/tungstensteel_block" + } + }, + "iridium_reinforced_tungstensteel": { + "textures": { + "all": "techreborn:blocks/storage/iridium_reinforced_tungstensteel_block" + } + }, + "iridium_reinforced_stone": { + "textures": { + "all": "techreborn:blocks/storage/iridium_reinforced_stone_block" + } + }, + "ruby": { + "textures": { + "all": "techreborn:blocks/storage/ruby_block" + } + }, + "sapphire": { + "textures": { + "all": "techreborn:blocks/storage/sapphire_block" + } + }, + "peridot": { + "textures": { + "all": "techreborn:blocks/storage/peridot_block" + } + }, + "yellowGarnet": { + "textures": { + "all": "techreborn:blocks/storage/yellowGarnet_block" + } + }, + "redGarnet": { + "textures": { + "all": "techreborn:blocks/storage/redGarnet_block" + } + }, + "copper": { + "textures": { + "all": "techreborn:blocks/storage/copper_block" + } + }, + "tin": { + "textures": { + "all": "techreborn:blocks/storage/tin_block" + } + }, + "refinedIron": { + "textures": { + "all": "techreborn:blocks/storage/refinedIron_block" + } + } + } + } +} diff --git a/src/main/resources/assets/techreborn/models/item/lapotronOrb.json b/src/main/resources/assets/techreborn/models/item/lapotronOrb.json new file mode 100644 index 000000000..fb9f0514e --- /dev/null +++ b/src/main/resources/assets/techreborn/models/item/lapotronOrb.json @@ -0,0 +1,14 @@ +{ + "parent": "techreborn:item/techrebornItem", + "textures": { + "layer0": "techreborn:items/tool/lapotronOrb" + }, + "overrides": [ + { + "predicate": { + "techreborn:empty": 1 + }, + "model": "techreborn:item/lapotronOrbEmpty" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/item/lapotronOrbEmpty.json b/src/main/resources/assets/techreborn/models/item/lapotronOrbEmpty.json new file mode 100644 index 000000000..5a3c493d6 --- /dev/null +++ b/src/main/resources/assets/techreborn/models/item/lapotronOrbEmpty.json @@ -0,0 +1,6 @@ +{ + "parent": "techreborn:item/techrebornItem", + "textures": { + "layer0": "techreborn:items/tool/lapotronOrbEmpty" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/textures/blocks/storage/digital_chest_side.png b/src/main/resources/assets/techreborn/textures/blocks/storage/digital_chest_side.png new file mode 100644 index 0000000000000000000000000000000000000000..bf33ec772b8fc8a32bc960d2c7dd05c17147c0a0 GIT binary patch literal 699 zcmV;s0!00ZP)LE2z&U>sN`B*30K zbNjEV31)$Wh@hg9K7Dm`Dt!0i`)LGD=Z(n30}KN&kVGpd!~-^+-U>ki+v!9QMPnug zl;=;M;AYfXNNGV-DchL|0Z~kr0R}^Y-`mfc|F# z4Z>Gne!;TaF0QVJqM>m7H;&6sc*cUo(t7?BXD zwXoGfEVXewZTxv$$tgp0Mr&;6jhG^17_BvO&Xih_k4NSVm>D@`;x7*myuQBvUnZ8? ziS=A~_VjZ;y}8DLRvIBpf+oxj-``@>@Zp$sG-iew-W!L*0h!@)U#%4(pgCgZv{slC zoJp^R=|&sI`Fz61ptMJk%m%6n3Bqw*u}5&siPH%L+yi|y%ncP~+cxGjmSsW8R#?{~ zr52`7ZuWa(ia5~6VE9F2bC4j6K45auzcr$&^5(a<)LyY+XpHn$5lyHHqLErQRFu{# hF(xEle&p(Q&tH<=qm2p}$8`Vz002ovPDHLkV1i=XHiiHI literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/techreborn/textures/gui/compressorTest.png b/src/main/resources/assets/techreborn/textures/gui/compressorTest.png deleted file mode 100644 index 9ca139faf3657aa76ab7821e1ae20f43863a35fb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9940 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 diff --git a/src/main/resources/assets/techreborn/textures/gui/guiSheet.png b/src/main/resources/assets/techreborn/textures/gui/guiSheet.png new file mode 100644 index 0000000000000000000000000000000000000000..90818f092f742952ab97d116f26c7e856cfa1ac5 GIT binary patch literal 15032 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 GgeCynvr0|? literal 0 HcmV?d00001