From f1ddc86bdd5bcec2d39ed58c408241a7f00d222b Mon Sep 17 00:00:00 2001 From: drcrazy Date: Tue, 23 Jul 2019 01:20:04 +0300 Subject: [PATCH] Reorder crafting table recipes --- .../init/recipes/CraftingTableRecipes.java | 8 -------- .../armor}/cloaking_device.json | 0 .../armor}/lapotronic_orbpack.json | 0 .../armor}/lithium_ion_batpack.json | 0 .../battery}/lapotron_crystal.json | 0 .../battery}/lapotronic_orb.json | 0 .../battery}/lithium_ion_battery.json | 0 .../battery}/red_cell_battery.json | 0 .../cable/copper_cable.json | 0 .../cable/glassfiber_cable_3.json | 0 .../cable/glassfiber_cable_4.json | 0 .../cable/glassfiber_cable_6.json | 0 .../cable/glassfiber_cable_8.json | 0 .../cable/gold_cable.json | 0 .../cable/hv_cable.json | 0 .../cable/insulated_copper_cable.json | 0 .../cable/insulated_copper_cable_alt.json | 0 .../cable/insulated_copper_cable_shapeless.json} | 0 .../cable/insulated_gold_cable.json | 0 .../cable/insulated_gold_cable_shapeless.json} | 0 .../cable/insulated_hv_cable.json | 0 .../cable/insulated_hv_cable_shapeless.json} | 0 .../cable/tin_cable.json | 0 .../{crafting_shaped => crafting_table}/cell.json | 0 .../frequency_transmitter.json | 0 .../gem_armor_tools}/bronze_axe.json | 0 .../gem_armor_tools}/bronze_boots.json | 0 .../gem_armor_tools}/bronze_chestplate.json | 0 .../gem_armor_tools}/bronze_helmet.json | 0 .../gem_armor_tools}/bronze_hoe.json | 0 .../gem_armor_tools}/bronze_leggings.json | 0 .../gem_armor_tools}/bronze_pickaxe.json | 0 .../gem_armor_tools}/bronze_spade.json | 0 .../gem_armor_tools}/bronze_sword.json | 0 .../gem_armor_tools}/peridot_axe.json | 0 .../gem_armor_tools}/peridot_boots.json | 0 .../gem_armor_tools}/peridot_chestplate.json | 0 .../gem_armor_tools}/peridot_helmet.json | 0 .../gem_armor_tools}/peridot_hoe.json | 0 .../gem_armor_tools}/peridot_leggings.json | 0 .../gem_armor_tools}/peridot_pickaxe.json | 0 .../gem_armor_tools}/peridot_spade.json | 0 .../gem_armor_tools}/peridot_sword.json | 0 .../gem_armor_tools}/ruby_axe.json | 0 .../gem_armor_tools}/ruby_boots.json | 0 .../gem_armor_tools}/ruby_chestplate.json | 0 .../gem_armor_tools}/ruby_helmet.json | 0 .../gem_armor_tools}/ruby_hoe.json | 0 .../gem_armor_tools}/ruby_leggings.json | 0 .../gem_armor_tools}/ruby_pickaxe.json | 0 .../gem_armor_tools}/ruby_spade.json | 0 .../gem_armor_tools}/ruby_sword.json | 0 .../gem_armor_tools}/sapphire_axe.json | 0 .../gem_armor_tools}/sapphire_boots.json | 0 .../gem_armor_tools}/sapphire_chestplate.json | 0 .../gem_armor_tools}/sapphire_helmet.json | 0 .../gem_armor_tools}/sapphire_hoe.json | 0 .../gem_armor_tools}/sapphire_leggings.json | 0 .../gem_armor_tools}/sapphire_pickaxe.json | 0 .../gem_armor_tools}/sapphire_spade.json | 0 .../gem_armor_tools}/sapphire_sword.json | 0 .../ingot/aluminum_ingot_from_block.json | 12 ++++++++++++ .../crafting_table/ingot/brass_ingot_from_block.json | 12 ++++++++++++ .../ingot/bronze_ingot_from_block.json | 12 ++++++++++++ .../ingot/chrome_ingot_from_block.json | 12 ++++++++++++ .../ingot/electrum_ingot_from_block.json | 12 ++++++++++++ .../crafting_table/ingot/invar_ingot_from_block.json | 12 ++++++++++++ .../ingot}/iridium_alloy_ingot.json | 0 .../ingot/iridium_ingot_from_block.json | 12 ++++++++++++ .../crafting_table/ingot/lead_ingot_from_block.json | 12 ++++++++++++ .../ingot}/mixed_metal_ingot.json | 0 .../ingot}/mixed_metal_ingot_alt.json | 0 .../mixed_metal_ingot_aluminum_invar_bronze.json | 0 .../mixed_metal_ingot_aluminum_nickel_brass.json | 0 .../mixed_metal_ingot_aluminum_nickel_bronze.json | 0 .../mixed_metal_ingot_aluminum_titanium_brass.json | 0 .../mixed_metal_ingot_aluminum_titanium_bronze.json | 0 .../mixed_metal_ingot_aluminum_tungsten_brass.json | 0 .../mixed_metal_ingot_aluminum_tungsten_bronze.json | 0 ...xed_metal_ingot_aluminum_tungstensteel_brass.json | 0 ...ed_metal_ingot_aluminum_tungstensteel_bronze.json | 0 ...ingot_mixed_metal_ingot_aluminum_invar_brass.json | 0 ..._ingot_mixed_metal_ingot_tin_titanium_bronze.json | 0 ...al_ingot_mixed_metal_ingot_zinc_invar_bronze.json | 0 .../ingot}/mixed_metal_ingot_tin_invar_brass.json | 0 .../ingot}/mixed_metal_ingot_tin_invar_bronze.json | 0 .../ingot}/mixed_metal_ingot_tin_nickel_brass.json | 0 .../ingot}/mixed_metal_ingot_tin_nickel_bronze.json | 0 .../ingot}/mixed_metal_ingot_tin_titanium_brass.json | 0 .../ingot}/mixed_metal_ingot_tin_tungsten_brass.json | 0 .../mixed_metal_ingot_tin_tungsten_bronze.json | 0 .../mixed_metal_ingot_tin_tungstensteel_brass.json | 0 .../mixed_metal_ingot_tin_tungstensteel_bronze.json | 0 .../ingot}/mixed_metal_ingot_zinc_invar_brass.json | 0 .../ingot}/mixed_metal_ingot_zinc_iron_brass.json | 0 .../ingot}/mixed_metal_ingot_zinc_iron_bronze.json | 0 .../ingot}/mixed_metal_ingot_zinc_nickel_brass.json | 0 .../ingot}/mixed_metal_ingot_zinc_nickel_bronze.json | 0 .../mixed_metal_ingot_zinc_titanium_brass.json | 0 .../mixed_metal_ingot_zinc_titanium_bronze.json | 0 .../mixed_metal_ingot_zinc_tungsten_brass.json | 0 .../mixed_metal_ingot_zinc_tungsten_bronze.json | 0 .../mixed_metal_ingot_zinc_tungstensteel_brass.json | 0 .../mixed_metal_ingot_zinc_tungstensteel_bronze.json | 0 .../ingot/nickel_ingot_from_block.json | 12 ++++++++++++ .../ingot/platinum_ingot_from_block.json | 12 ++++++++++++ .../ingot/silver_ingot_from_block.json | 12 ++++++++++++ .../crafting_table/ingot/steel_ingot_from_block.json | 12 ++++++++++++ .../ingot/titanium_ingot_from_block.json | 12 ++++++++++++ .../ingot/tungsten_ingot_from_block.json | 12 ++++++++++++ .../crafting_table/ingot/zinc_ingot_from_block.json | 12 ++++++++++++ .../machine}/adjustable_su.json | 0 .../machine}/alarm.json | 0 .../machine}/alloy_smelter.json | 0 .../machine}/auto_crafting_table.json | 0 .../machine}/charge_o_mat.json | 0 .../machine}/chemical_reactor.json | 0 .../machine}/compressor.json | 0 .../machine}/diesel_generator.json | 0 .../machine}/diesel_generator_alt.json | 0 .../machine}/digital_chest.json | 0 .../machine}/digital_chest_alt.json | 0 .../machine}/distillation_tower.json | 0 .../machine}/dragon_egg_syphon.json | 0 .../machine}/electric_furnace.json | 0 .../machine}/extractor.json | 0 .../machine}/fluid_replicator.json | 0 .../machine}/fusion_coil.json | 0 .../machine}/fusion_control_computer.json | 0 .../machine}/gas_turbine.json | 0 .../machine}/gas_turbine_alt.json | 0 .../machine}/grinder.json | 0 .../machine}/high_voltage_su.json | 0 .../machine}/hv_transformer.json | 0 .../machine}/implosion_compressor.json | 0 .../machine}/industrial_blast_furnace.json | 0 .../machine}/industrial_centrifuge.json | 0 .../machine}/industrial_centrifuge_alt.json | 0 .../machine}/industrial_electrolyzer.json | 0 .../machine}/industrial_grinder.json | 0 .../machine}/industrial_sawmill.json | 0 .../machine}/interdimensional_su.json | 0 .../machine}/iron_alloy_furnace.json | 0 .../machine}/iron_furnace.json | 0 .../machine}/iron_furnace_alt.json | 0 .../machine}/lamp_incandescent.json | 0 .../machine}/lamp_led.json | 0 .../machine}/lapotronic_su.json | 0 .../machine}/lightning_rod.json | 0 .../machine}/low_voltage_su.json | 0 .../machine}/lsu_storage.json | 0 .../machine}/lv_transformer.json | 0 .../machine}/matter_fabricator.json | 0 .../machine}/medium_voltage_su.json | 0 .../machine}/mv_transformer.json | 0 .../machine}/plasma_generator.json | 0 .../machine}/player_detector.json | 0 .../machine}/quantum_chest.json | 0 .../machine}/quantum_tank.json | 0 .../machine}/recycler.json | 0 .../machine}/rolling_machine.json | 0 .../machine}/scrapboxinator.json | 0 .../machine}/semi_fluid_generator.json | 0 .../machine}/semi_fluid_generator_alt.json | 0 .../machine}/solid_fuel_generator.json | 0 .../machine}/thermal_generator.json | 0 .../machine}/vacuum_freezer.json | 0 .../machine}/water_mill.json | 0 .../machine}/wind_mill.json | 0 .../machine}/wind_mill_alt.json | 0 .../machine_block}/advanced_machine_casing.json | 0 .../machine_block}/advanced_machine_casing_alt.json | 0 .../machine_block}/advanced_machine_frame.json | 0 .../machine_block}/basic_machine_casing.json | 0 .../machine_block}/basic_machine_casing_alt.json | 0 .../machine_block}/basic_machine_casing_alt_alt.json | 0 .../machine_block}/basic_machine_frame.json | 0 .../machine_block}/industrial_machine_casing.json | 0 .../industrial_machine_casing_alt.json | 0 .../machine_block}/industrial_machine_frame.json | 0 .../manual.json | 0 .../misc_block}/computer_cube.json | 0 .../misc_block}/refined_iron_fence.json | 0 .../misc_block}/reinforced_glass.json | 0 .../misc_block}/reinforced_glass_alt.json | 0 .../misc_block}/rubber_plank_slab.json | 0 .../misc_block}/rubber_plank_stair.json | 0 .../misc_block}/rubber_planks.json | 0 .../parts/advanced_circuit.json | 0 .../parts/carbon_fiber.json | 0 .../parts/data_storage_chip.json | 0 .../parts/data_storage_core.json | 0 .../parts/diamond_grinding_head.json | 0 .../parts/diamond_saw_blade.json | 0 .../parts/digital_display.json | 0 .../parts/electronic_circuit.json | 0 .../parts/energy_crystal.json | 0 .../parts/energy_flow_chip.json | 0 .../parts/helium_coolant_cell_180k.json | 0 .../parts/helium_coolant_cell_360k.json | 0 .../parts/helium_coolant_cell_60k.json | 0 .../parts/iridium_neutron_reflector.json | 0 .../parts/nak_coolant_cell_180k.json | 0 .../parts/nak_coolant_cell_360k.json | 0 .../parts/nak_coolant_cell_60k.json | 0 .../parts/nak_coolant_cell_60k_alt.json | 0 .../parts/neutron_reflector.json | 0 .../parts/superconductor.json | 0 .../parts/thick_neutron_reflector.json | 0 .../parts/tungsten_grinding_head.json | 0 .../parts/water_coolant_cell_10k.json | 0 .../parts/water_coolant_cell_30k.json | 0 .../parts/water_coolant_cell_60k.json | 0 .../scrap_box.json | 0 .../solar_panel/advanced_solar_panel.json | 0 .../solar_panel/advanced_solar_panel_alt.json | 0 .../solar_panel/basic_solar_panel.json | 0 .../solar_panel/industrial_solar_panel.json | 0 .../solar_panel/industrial_solar_panel_alt.json | 0 .../solar_panel/quantum_solar_panel.json | 0 .../solar_panel/quantum_solar_panel_alt.json | 0 .../solar_panel/ultimate_solar_panel.json | 0 .../solar_panel/ultimate_solar_panel_alt.json | 0 .../storage_block/aluminum_storage_block.json | 0 .../storage_block/brass_storage_block.json | 0 .../storage_block/bronze_storage_block.json | 0 .../storage_block/chrome_storage_block.json | 0 .../storage_block/electrum_storage_block.json | 0 .../storage_block/invar_storage_block.json | 0 .../iridium_reinforced_stone_storage_block.json | 0 ...idium_reinforced_tungstensteel_storage_block.json | 0 ...m_reinforced_tungstensteel_storage_block_alt.json | 0 .../storage_block/iridium_storage_block.json | 0 .../storage_block/lead_storage_block.json | 0 .../storage_block/nickel_storage_block.json | 0 .../storage_block/platinum_storage_block.json | 0 .../storage_block/silver_storage_block.json | 0 .../storage_block/steel_storage_block.json | 0 .../storage_block/titanium_storage_block.json | 0 .../storage_block/tungsten_storage_block.json | 0 .../storage_block/zinc_storage_block.json | 0 .../tool}/advanced_chainsaw.json | 0 .../tool}/advanced_drill.json | 0 .../tool}/advanced_jackhammer.json | 0 .../tool}/basic_chainsaw.json | 0 .../tool}/basic_drill.json | 0 .../tool}/basic_jackhammer.json | 0 .../tool}/electric_treetap.json | 0 .../tool}/industrial_chainsaw.json | 0 .../tool}/industrial_drill.json | 0 .../tool}/industrial_jackhammer.json | 0 .../tool}/nanosaber.json | 0 .../tool}/rock_cutter.json | 0 .../tool}/treetap.json | 0 .../tool}/wrench.json | 0 .../upgrade}/energy_storage_upgrade.json | 0 .../upgrade}/overclocker_upgrade.json | 0 .../upgrade}/overclocker_upgrade_alt.json | 0 .../upgrade}/overclocker_upgrade_alt_alt.json | 0 .../upgrade}/superconductor_upgrade.json | 0 .../upgrade}/transformer_upgrade.json | 0 .../uu_matter/aluminum_dust.json | 0 .../uu_matter/bone.json | 0 .../uu_matter/cactus.json | 0 .../uu_matter/chrome_dust.json | 0 .../uu_matter/clay.json | 0 .../uu_matter/coal_ore.json | 0 .../uu_matter/cocoa_beans.json | 0 .../uu_matter/copper_dust.json | 0 .../uu_matter/diamond_ore.json | 0 .../uu_matter/emerald_ore.json | 0 .../uu_matter/ender_pearl.json | 0 .../uu_matter/feather.json | 0 .../uu_matter/glass.json | 0 .../uu_matter/glowstone.json | 0 .../uu_matter/gold_ore.json | 0 .../uu_matter/grass_block.json | 0 .../uu_matter/gunpowder.json | 0 .../uu_matter/ink_sac.json | 0 .../uu_matter/iridium_ore.json | 0 .../uu_matter/iron_ore.json | 0 .../uu_matter/lapis_ore.json | 0 .../uu_matter/lead_dust.json | 0 .../uu_matter/lily_pad.json | 0 .../uu_matter/oak_wood.json | 0 .../uu_matter/obsidian.json | 0 .../uu_matter/platinum_dust.json | 0 .../uu_matter/redstone_ore.json | 0 .../uu_matter/snow_block.json | 0 .../uu_matter/stone.json | 0 .../uu_matter/sugar_cane.json | 0 .../uu_matter/tin_dust.json | 0 .../uu_matter/titanium_dust.json | 0 .../uu_matter/tungsten_dust.json | 0 .../uu_matter/vine.json | 0 295 files changed, 180 insertions(+), 8 deletions(-) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table/armor}/cloaking_device.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table/armor}/lapotronic_orbpack.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table/armor}/lithium_ion_batpack.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table/battery}/lapotron_crystal.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table/battery}/lapotronic_orb.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table/battery}/lithium_ion_battery.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table/battery}/red_cell_battery.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table}/cable/copper_cable.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table}/cable/glassfiber_cable_3.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table}/cable/glassfiber_cable_4.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table}/cable/glassfiber_cable_6.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table}/cable/glassfiber_cable_8.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table}/cable/gold_cable.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table}/cable/hv_cable.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table}/cable/insulated_copper_cable.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table}/cable/insulated_copper_cable_alt.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shapeless/insulated_copper_cable.json => crafting_table/cable/insulated_copper_cable_shapeless.json} (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table}/cable/insulated_gold_cable.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shapeless/insulated_gold_cable.json => crafting_table/cable/insulated_gold_cable_shapeless.json} (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table}/cable/insulated_hv_cable.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shapeless/insulated_hv_cable.json => crafting_table/cable/insulated_hv_cable_shapeless.json} (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table}/cable/tin_cable.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table}/cell.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shapeless => crafting_table}/frequency_transmitter.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table/gem_armor_tools}/bronze_axe.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table/gem_armor_tools}/bronze_boots.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table/gem_armor_tools}/bronze_chestplate.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table/gem_armor_tools}/bronze_helmet.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table/gem_armor_tools}/bronze_hoe.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table/gem_armor_tools}/bronze_leggings.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table/gem_armor_tools}/bronze_pickaxe.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table/gem_armor_tools}/bronze_spade.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table/gem_armor_tools}/bronze_sword.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table/gem_armor_tools}/peridot_axe.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table/gem_armor_tools}/peridot_boots.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table/gem_armor_tools}/peridot_chestplate.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table/gem_armor_tools}/peridot_helmet.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table/gem_armor_tools}/peridot_hoe.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table/gem_armor_tools}/peridot_leggings.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table/gem_armor_tools}/peridot_pickaxe.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table/gem_armor_tools}/peridot_spade.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table/gem_armor_tools}/peridot_sword.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table/gem_armor_tools}/ruby_axe.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table/gem_armor_tools}/ruby_boots.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table/gem_armor_tools}/ruby_chestplate.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table/gem_armor_tools}/ruby_helmet.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table/gem_armor_tools}/ruby_hoe.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table/gem_armor_tools}/ruby_leggings.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table/gem_armor_tools}/ruby_pickaxe.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table/gem_armor_tools}/ruby_spade.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table/gem_armor_tools}/ruby_sword.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table/gem_armor_tools}/sapphire_axe.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table/gem_armor_tools}/sapphire_boots.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table/gem_armor_tools}/sapphire_chestplate.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table/gem_armor_tools}/sapphire_helmet.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table/gem_armor_tools}/sapphire_hoe.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table/gem_armor_tools}/sapphire_leggings.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table/gem_armor_tools}/sapphire_pickaxe.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table/gem_armor_tools}/sapphire_spade.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table/gem_armor_tools}/sapphire_sword.json (100%) create mode 100644 src/main/resources/data/techreborn/recipes/crafting_table/ingot/aluminum_ingot_from_block.json create mode 100644 src/main/resources/data/techreborn/recipes/crafting_table/ingot/brass_ingot_from_block.json create mode 100644 src/main/resources/data/techreborn/recipes/crafting_table/ingot/bronze_ingot_from_block.json create mode 100644 src/main/resources/data/techreborn/recipes/crafting_table/ingot/chrome_ingot_from_block.json create mode 100644 src/main/resources/data/techreborn/recipes/crafting_table/ingot/electrum_ingot_from_block.json create mode 100644 src/main/resources/data/techreborn/recipes/crafting_table/ingot/invar_ingot_from_block.json rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table/ingot}/iridium_alloy_ingot.json (100%) create mode 100644 src/main/resources/data/techreborn/recipes/crafting_table/ingot/iridium_ingot_from_block.json create mode 100644 src/main/resources/data/techreborn/recipes/crafting_table/ingot/lead_ingot_from_block.json rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table/ingot}/mixed_metal_ingot.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table/ingot}/mixed_metal_ingot_alt.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table/ingot}/mixed_metal_ingot_aluminum_invar_bronze.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table/ingot}/mixed_metal_ingot_aluminum_nickel_brass.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table/ingot}/mixed_metal_ingot_aluminum_nickel_bronze.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table/ingot}/mixed_metal_ingot_aluminum_titanium_brass.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table/ingot}/mixed_metal_ingot_aluminum_titanium_bronze.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table/ingot}/mixed_metal_ingot_aluminum_tungsten_brass.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table/ingot}/mixed_metal_ingot_aluminum_tungsten_bronze.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table/ingot}/mixed_metal_ingot_aluminum_tungstensteel_brass.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table/ingot}/mixed_metal_ingot_aluminum_tungstensteel_bronze.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table/ingot}/mixed_metal_ingot_mixed_metal_ingot_aluminum_invar_brass.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table/ingot}/mixed_metal_ingot_mixed_metal_ingot_tin_titanium_bronze.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table/ingot}/mixed_metal_ingot_mixed_metal_ingot_zinc_invar_bronze.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table/ingot}/mixed_metal_ingot_tin_invar_brass.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table/ingot}/mixed_metal_ingot_tin_invar_bronze.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table/ingot}/mixed_metal_ingot_tin_nickel_brass.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table/ingot}/mixed_metal_ingot_tin_nickel_bronze.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table/ingot}/mixed_metal_ingot_tin_titanium_brass.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table/ingot}/mixed_metal_ingot_tin_tungsten_brass.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table/ingot}/mixed_metal_ingot_tin_tungsten_bronze.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table/ingot}/mixed_metal_ingot_tin_tungstensteel_brass.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table/ingot}/mixed_metal_ingot_tin_tungstensteel_bronze.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table/ingot}/mixed_metal_ingot_zinc_invar_brass.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table/ingot}/mixed_metal_ingot_zinc_iron_brass.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table/ingot}/mixed_metal_ingot_zinc_iron_bronze.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table/ingot}/mixed_metal_ingot_zinc_nickel_brass.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table/ingot}/mixed_metal_ingot_zinc_nickel_bronze.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table/ingot}/mixed_metal_ingot_zinc_titanium_brass.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table/ingot}/mixed_metal_ingot_zinc_titanium_bronze.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table/ingot}/mixed_metal_ingot_zinc_tungsten_brass.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table/ingot}/mixed_metal_ingot_zinc_tungsten_bronze.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table/ingot}/mixed_metal_ingot_zinc_tungstensteel_brass.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table/ingot}/mixed_metal_ingot_zinc_tungstensteel_bronze.json (100%) create mode 100644 src/main/resources/data/techreborn/recipes/crafting_table/ingot/nickel_ingot_from_block.json create mode 100644 src/main/resources/data/techreborn/recipes/crafting_table/ingot/platinum_ingot_from_block.json create mode 100644 src/main/resources/data/techreborn/recipes/crafting_table/ingot/silver_ingot_from_block.json create mode 100644 src/main/resources/data/techreborn/recipes/crafting_table/ingot/steel_ingot_from_block.json create mode 100644 src/main/resources/data/techreborn/recipes/crafting_table/ingot/titanium_ingot_from_block.json create mode 100644 src/main/resources/data/techreborn/recipes/crafting_table/ingot/tungsten_ingot_from_block.json create mode 100644 src/main/resources/data/techreborn/recipes/crafting_table/ingot/zinc_ingot_from_block.json rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table/machine}/adjustable_su.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table/machine}/alarm.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table/machine}/alloy_smelter.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table/machine}/auto_crafting_table.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table/machine}/charge_o_mat.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table/machine}/chemical_reactor.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table/machine}/compressor.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table/machine}/diesel_generator.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table/machine}/diesel_generator_alt.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table/machine}/digital_chest.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table/machine}/digital_chest_alt.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table/machine}/distillation_tower.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table/machine}/dragon_egg_syphon.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table/machine}/electric_furnace.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table/machine}/extractor.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table/machine}/fluid_replicator.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table/machine}/fusion_coil.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table/machine}/fusion_control_computer.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table/machine}/gas_turbine.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table/machine}/gas_turbine_alt.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table/machine}/grinder.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table/machine}/high_voltage_su.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table/machine}/hv_transformer.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table/machine}/implosion_compressor.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table/machine}/industrial_blast_furnace.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table/machine}/industrial_centrifuge.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table/machine}/industrial_centrifuge_alt.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table/machine}/industrial_electrolyzer.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table/machine}/industrial_grinder.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table/machine}/industrial_sawmill.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table/machine}/interdimensional_su.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table/machine}/iron_alloy_furnace.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table/machine}/iron_furnace.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table/machine}/iron_furnace_alt.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table/machine}/lamp_incandescent.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table/machine}/lamp_led.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table/machine}/lapotronic_su.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table/machine}/lightning_rod.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table/machine}/low_voltage_su.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table/machine}/lsu_storage.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table/machine}/lv_transformer.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table/machine}/matter_fabricator.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table/machine}/medium_voltage_su.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table/machine}/mv_transformer.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table/machine}/plasma_generator.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table/machine}/player_detector.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table/machine}/quantum_chest.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table/machine}/quantum_tank.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table/machine}/recycler.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table/machine}/rolling_machine.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table/machine}/scrapboxinator.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table/machine}/semi_fluid_generator.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table/machine}/semi_fluid_generator_alt.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shapeless => crafting_table/machine}/solid_fuel_generator.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table/machine}/thermal_generator.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table/machine}/vacuum_freezer.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table/machine}/water_mill.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table/machine}/wind_mill.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table/machine}/wind_mill_alt.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table/machine_block}/advanced_machine_casing.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table/machine_block}/advanced_machine_casing_alt.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table/machine_block}/advanced_machine_frame.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table/machine_block}/basic_machine_casing.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table/machine_block}/basic_machine_casing_alt.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table/machine_block}/basic_machine_casing_alt_alt.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table/machine_block}/basic_machine_frame.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table/machine_block}/industrial_machine_casing.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table/machine_block}/industrial_machine_casing_alt.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table/machine_block}/industrial_machine_frame.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shapeless => crafting_table}/manual.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table/misc_block}/computer_cube.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table/misc_block}/refined_iron_fence.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table/misc_block}/reinforced_glass.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table/misc_block}/reinforced_glass_alt.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table/misc_block}/rubber_plank_slab.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table/misc_block}/rubber_plank_stair.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shapeless => crafting_table/misc_block}/rubber_planks.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table}/parts/advanced_circuit.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table}/parts/carbon_fiber.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table}/parts/data_storage_chip.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table}/parts/data_storage_core.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table}/parts/diamond_grinding_head.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table}/parts/diamond_saw_blade.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table}/parts/digital_display.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table}/parts/electronic_circuit.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table}/parts/energy_crystal.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table}/parts/energy_flow_chip.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table}/parts/helium_coolant_cell_180k.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table}/parts/helium_coolant_cell_360k.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table}/parts/helium_coolant_cell_60k.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table}/parts/iridium_neutron_reflector.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table}/parts/nak_coolant_cell_180k.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table}/parts/nak_coolant_cell_360k.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table}/parts/nak_coolant_cell_60k.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table}/parts/nak_coolant_cell_60k_alt.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table}/parts/neutron_reflector.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table}/parts/superconductor.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table}/parts/thick_neutron_reflector.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table}/parts/tungsten_grinding_head.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table}/parts/water_coolant_cell_10k.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table}/parts/water_coolant_cell_30k.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table}/parts/water_coolant_cell_60k.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table}/scrap_box.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table}/solar_panel/advanced_solar_panel.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table}/solar_panel/advanced_solar_panel_alt.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table}/solar_panel/basic_solar_panel.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table}/solar_panel/industrial_solar_panel.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table}/solar_panel/industrial_solar_panel_alt.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table}/solar_panel/quantum_solar_panel.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table}/solar_panel/quantum_solar_panel_alt.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table}/solar_panel/ultimate_solar_panel.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table}/solar_panel/ultimate_solar_panel_alt.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table}/storage_block/aluminum_storage_block.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table}/storage_block/brass_storage_block.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table}/storage_block/bronze_storage_block.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table}/storage_block/chrome_storage_block.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table}/storage_block/electrum_storage_block.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table}/storage_block/invar_storage_block.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shapeless => crafting_table/storage_block}/iridium_reinforced_stone_storage_block.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shapeless => crafting_table/storage_block}/iridium_reinforced_tungstensteel_storage_block.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shapeless => crafting_table/storage_block}/iridium_reinforced_tungstensteel_storage_block_alt.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table}/storage_block/iridium_storage_block.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table}/storage_block/lead_storage_block.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table}/storage_block/nickel_storage_block.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table}/storage_block/platinum_storage_block.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table}/storage_block/silver_storage_block.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table}/storage_block/steel_storage_block.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table}/storage_block/titanium_storage_block.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table}/storage_block/tungsten_storage_block.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table}/storage_block/zinc_storage_block.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table/tool}/advanced_chainsaw.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table/tool}/advanced_drill.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table/tool}/advanced_jackhammer.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table/tool}/basic_chainsaw.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table/tool}/basic_drill.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table/tool}/basic_jackhammer.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table/tool}/electric_treetap.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table/tool}/industrial_chainsaw.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table/tool}/industrial_drill.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table/tool}/industrial_jackhammer.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table/tool}/nanosaber.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table/tool}/rock_cutter.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table/tool}/treetap.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table/tool}/wrench.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table/upgrade}/energy_storage_upgrade.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table/upgrade}/overclocker_upgrade.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table/upgrade}/overclocker_upgrade_alt.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table/upgrade}/overclocker_upgrade_alt_alt.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table/upgrade}/superconductor_upgrade.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table/upgrade}/transformer_upgrade.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table}/uu_matter/aluminum_dust.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table}/uu_matter/bone.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table}/uu_matter/cactus.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table}/uu_matter/chrome_dust.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table}/uu_matter/clay.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table}/uu_matter/coal_ore.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table}/uu_matter/cocoa_beans.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table}/uu_matter/copper_dust.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table}/uu_matter/diamond_ore.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table}/uu_matter/emerald_ore.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table}/uu_matter/ender_pearl.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table}/uu_matter/feather.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table}/uu_matter/glass.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table}/uu_matter/glowstone.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table}/uu_matter/gold_ore.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table}/uu_matter/grass_block.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table}/uu_matter/gunpowder.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table}/uu_matter/ink_sac.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table}/uu_matter/iridium_ore.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table}/uu_matter/iron_ore.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table}/uu_matter/lapis_ore.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table}/uu_matter/lead_dust.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table}/uu_matter/lily_pad.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table}/uu_matter/oak_wood.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table}/uu_matter/obsidian.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table}/uu_matter/platinum_dust.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table}/uu_matter/redstone_ore.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table}/uu_matter/snow_block.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table}/uu_matter/stone.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table}/uu_matter/sugar_cane.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table}/uu_matter/tin_dust.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table}/uu_matter/titanium_dust.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table}/uu_matter/tungsten_dust.json (100%) rename src/main/resources/data/techreborn/recipes/{crafting_shaped => crafting_table}/uu_matter/vine.json (100%) diff --git a/src/main/java/techreborn/init/recipes/CraftingTableRecipes.java b/src/main/java/techreborn/init/recipes/CraftingTableRecipes.java index b01be915e..09c57fd1f 100644 --- a/src/main/java/techreborn/init/recipes/CraftingTableRecipes.java +++ b/src/main/java/techreborn/init/recipes/CraftingTableRecipes.java @@ -40,14 +40,6 @@ public class CraftingTableRecipes extends RecipeMethods { } static void registerCompressionRecipes() { -// for (String name : BlockStorage.types) { -// if (OreUtil.hasIngot(name)) { -// registerShapeless(getMaterial(name, 9, Type.INGOT), BlockStorage.getStorageBlockByName(name)); -// } else if (OreUtil.hasGem(name)) { -// registerShaped(BlockStorage.getStorageBlockByName(name), "AAA", "AAA", "AAA", 'A', "gem" + StringUtils.toFirstCapital(name)); -// registerShapeless(getMaterial(name, 9, Type.GEM), BlockStorage.getStorageBlockByName(name)); -// } -// } // for (String block : BlockStorage2.types){ // block = CaseFormat.LOWER_UNDERSCORE.to(CaseFormat.LOWER_CAMEL, block); diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/cloaking_device.json b/src/main/resources/data/techreborn/recipes/crafting_table/armor/cloaking_device.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/cloaking_device.json rename to src/main/resources/data/techreborn/recipes/crafting_table/armor/cloaking_device.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/lapotronic_orbpack.json b/src/main/resources/data/techreborn/recipes/crafting_table/armor/lapotronic_orbpack.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/lapotronic_orbpack.json rename to src/main/resources/data/techreborn/recipes/crafting_table/armor/lapotronic_orbpack.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/lithium_ion_batpack.json b/src/main/resources/data/techreborn/recipes/crafting_table/armor/lithium_ion_batpack.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/lithium_ion_batpack.json rename to src/main/resources/data/techreborn/recipes/crafting_table/armor/lithium_ion_batpack.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/lapotron_crystal.json b/src/main/resources/data/techreborn/recipes/crafting_table/battery/lapotron_crystal.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/lapotron_crystal.json rename to src/main/resources/data/techreborn/recipes/crafting_table/battery/lapotron_crystal.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/lapotronic_orb.json b/src/main/resources/data/techreborn/recipes/crafting_table/battery/lapotronic_orb.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/lapotronic_orb.json rename to src/main/resources/data/techreborn/recipes/crafting_table/battery/lapotronic_orb.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/lithium_ion_battery.json b/src/main/resources/data/techreborn/recipes/crafting_table/battery/lithium_ion_battery.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/lithium_ion_battery.json rename to src/main/resources/data/techreborn/recipes/crafting_table/battery/lithium_ion_battery.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/red_cell_battery.json b/src/main/resources/data/techreborn/recipes/crafting_table/battery/red_cell_battery.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/red_cell_battery.json rename to src/main/resources/data/techreborn/recipes/crafting_table/battery/red_cell_battery.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/cable/copper_cable.json b/src/main/resources/data/techreborn/recipes/crafting_table/cable/copper_cable.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/cable/copper_cable.json rename to src/main/resources/data/techreborn/recipes/crafting_table/cable/copper_cable.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/cable/glassfiber_cable_3.json b/src/main/resources/data/techreborn/recipes/crafting_table/cable/glassfiber_cable_3.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/cable/glassfiber_cable_3.json rename to src/main/resources/data/techreborn/recipes/crafting_table/cable/glassfiber_cable_3.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/cable/glassfiber_cable_4.json b/src/main/resources/data/techreborn/recipes/crafting_table/cable/glassfiber_cable_4.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/cable/glassfiber_cable_4.json rename to src/main/resources/data/techreborn/recipes/crafting_table/cable/glassfiber_cable_4.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/cable/glassfiber_cable_6.json b/src/main/resources/data/techreborn/recipes/crafting_table/cable/glassfiber_cable_6.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/cable/glassfiber_cable_6.json rename to src/main/resources/data/techreborn/recipes/crafting_table/cable/glassfiber_cable_6.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/cable/glassfiber_cable_8.json b/src/main/resources/data/techreborn/recipes/crafting_table/cable/glassfiber_cable_8.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/cable/glassfiber_cable_8.json rename to src/main/resources/data/techreborn/recipes/crafting_table/cable/glassfiber_cable_8.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/cable/gold_cable.json b/src/main/resources/data/techreborn/recipes/crafting_table/cable/gold_cable.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/cable/gold_cable.json rename to src/main/resources/data/techreborn/recipes/crafting_table/cable/gold_cable.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/cable/hv_cable.json b/src/main/resources/data/techreborn/recipes/crafting_table/cable/hv_cable.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/cable/hv_cable.json rename to src/main/resources/data/techreborn/recipes/crafting_table/cable/hv_cable.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/cable/insulated_copper_cable.json b/src/main/resources/data/techreborn/recipes/crafting_table/cable/insulated_copper_cable.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/cable/insulated_copper_cable.json rename to src/main/resources/data/techreborn/recipes/crafting_table/cable/insulated_copper_cable.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/cable/insulated_copper_cable_alt.json b/src/main/resources/data/techreborn/recipes/crafting_table/cable/insulated_copper_cable_alt.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/cable/insulated_copper_cable_alt.json rename to src/main/resources/data/techreborn/recipes/crafting_table/cable/insulated_copper_cable_alt.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shapeless/insulated_copper_cable.json b/src/main/resources/data/techreborn/recipes/crafting_table/cable/insulated_copper_cable_shapeless.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shapeless/insulated_copper_cable.json rename to src/main/resources/data/techreborn/recipes/crafting_table/cable/insulated_copper_cable_shapeless.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/cable/insulated_gold_cable.json b/src/main/resources/data/techreborn/recipes/crafting_table/cable/insulated_gold_cable.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/cable/insulated_gold_cable.json rename to src/main/resources/data/techreborn/recipes/crafting_table/cable/insulated_gold_cable.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shapeless/insulated_gold_cable.json b/src/main/resources/data/techreborn/recipes/crafting_table/cable/insulated_gold_cable_shapeless.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shapeless/insulated_gold_cable.json rename to src/main/resources/data/techreborn/recipes/crafting_table/cable/insulated_gold_cable_shapeless.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/cable/insulated_hv_cable.json b/src/main/resources/data/techreborn/recipes/crafting_table/cable/insulated_hv_cable.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/cable/insulated_hv_cable.json rename to src/main/resources/data/techreborn/recipes/crafting_table/cable/insulated_hv_cable.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shapeless/insulated_hv_cable.json b/src/main/resources/data/techreborn/recipes/crafting_table/cable/insulated_hv_cable_shapeless.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shapeless/insulated_hv_cable.json rename to src/main/resources/data/techreborn/recipes/crafting_table/cable/insulated_hv_cable_shapeless.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/cable/tin_cable.json b/src/main/resources/data/techreborn/recipes/crafting_table/cable/tin_cable.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/cable/tin_cable.json rename to src/main/resources/data/techreborn/recipes/crafting_table/cable/tin_cable.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/cell.json b/src/main/resources/data/techreborn/recipes/crafting_table/cell.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/cell.json rename to src/main/resources/data/techreborn/recipes/crafting_table/cell.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shapeless/frequency_transmitter.json b/src/main/resources/data/techreborn/recipes/crafting_table/frequency_transmitter.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shapeless/frequency_transmitter.json rename to src/main/resources/data/techreborn/recipes/crafting_table/frequency_transmitter.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/bronze_axe.json b/src/main/resources/data/techreborn/recipes/crafting_table/gem_armor_tools/bronze_axe.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/bronze_axe.json rename to src/main/resources/data/techreborn/recipes/crafting_table/gem_armor_tools/bronze_axe.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/bronze_boots.json b/src/main/resources/data/techreborn/recipes/crafting_table/gem_armor_tools/bronze_boots.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/bronze_boots.json rename to src/main/resources/data/techreborn/recipes/crafting_table/gem_armor_tools/bronze_boots.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/bronze_chestplate.json b/src/main/resources/data/techreborn/recipes/crafting_table/gem_armor_tools/bronze_chestplate.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/bronze_chestplate.json rename to src/main/resources/data/techreborn/recipes/crafting_table/gem_armor_tools/bronze_chestplate.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/bronze_helmet.json b/src/main/resources/data/techreborn/recipes/crafting_table/gem_armor_tools/bronze_helmet.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/bronze_helmet.json rename to src/main/resources/data/techreborn/recipes/crafting_table/gem_armor_tools/bronze_helmet.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/bronze_hoe.json b/src/main/resources/data/techreborn/recipes/crafting_table/gem_armor_tools/bronze_hoe.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/bronze_hoe.json rename to src/main/resources/data/techreborn/recipes/crafting_table/gem_armor_tools/bronze_hoe.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/bronze_leggings.json b/src/main/resources/data/techreborn/recipes/crafting_table/gem_armor_tools/bronze_leggings.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/bronze_leggings.json rename to src/main/resources/data/techreborn/recipes/crafting_table/gem_armor_tools/bronze_leggings.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/bronze_pickaxe.json b/src/main/resources/data/techreborn/recipes/crafting_table/gem_armor_tools/bronze_pickaxe.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/bronze_pickaxe.json rename to src/main/resources/data/techreborn/recipes/crafting_table/gem_armor_tools/bronze_pickaxe.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/bronze_spade.json b/src/main/resources/data/techreborn/recipes/crafting_table/gem_armor_tools/bronze_spade.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/bronze_spade.json rename to src/main/resources/data/techreborn/recipes/crafting_table/gem_armor_tools/bronze_spade.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/bronze_sword.json b/src/main/resources/data/techreborn/recipes/crafting_table/gem_armor_tools/bronze_sword.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/bronze_sword.json rename to src/main/resources/data/techreborn/recipes/crafting_table/gem_armor_tools/bronze_sword.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/peridot_axe.json b/src/main/resources/data/techreborn/recipes/crafting_table/gem_armor_tools/peridot_axe.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/peridot_axe.json rename to src/main/resources/data/techreborn/recipes/crafting_table/gem_armor_tools/peridot_axe.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/peridot_boots.json b/src/main/resources/data/techreborn/recipes/crafting_table/gem_armor_tools/peridot_boots.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/peridot_boots.json rename to src/main/resources/data/techreborn/recipes/crafting_table/gem_armor_tools/peridot_boots.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/peridot_chestplate.json b/src/main/resources/data/techreborn/recipes/crafting_table/gem_armor_tools/peridot_chestplate.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/peridot_chestplate.json rename to src/main/resources/data/techreborn/recipes/crafting_table/gem_armor_tools/peridot_chestplate.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/peridot_helmet.json b/src/main/resources/data/techreborn/recipes/crafting_table/gem_armor_tools/peridot_helmet.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/peridot_helmet.json rename to src/main/resources/data/techreborn/recipes/crafting_table/gem_armor_tools/peridot_helmet.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/peridot_hoe.json b/src/main/resources/data/techreborn/recipes/crafting_table/gem_armor_tools/peridot_hoe.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/peridot_hoe.json rename to src/main/resources/data/techreborn/recipes/crafting_table/gem_armor_tools/peridot_hoe.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/peridot_leggings.json b/src/main/resources/data/techreborn/recipes/crafting_table/gem_armor_tools/peridot_leggings.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/peridot_leggings.json rename to src/main/resources/data/techreborn/recipes/crafting_table/gem_armor_tools/peridot_leggings.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/peridot_pickaxe.json b/src/main/resources/data/techreborn/recipes/crafting_table/gem_armor_tools/peridot_pickaxe.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/peridot_pickaxe.json rename to src/main/resources/data/techreborn/recipes/crafting_table/gem_armor_tools/peridot_pickaxe.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/peridot_spade.json b/src/main/resources/data/techreborn/recipes/crafting_table/gem_armor_tools/peridot_spade.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/peridot_spade.json rename to src/main/resources/data/techreborn/recipes/crafting_table/gem_armor_tools/peridot_spade.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/peridot_sword.json b/src/main/resources/data/techreborn/recipes/crafting_table/gem_armor_tools/peridot_sword.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/peridot_sword.json rename to src/main/resources/data/techreborn/recipes/crafting_table/gem_armor_tools/peridot_sword.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/ruby_axe.json b/src/main/resources/data/techreborn/recipes/crafting_table/gem_armor_tools/ruby_axe.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/ruby_axe.json rename to src/main/resources/data/techreborn/recipes/crafting_table/gem_armor_tools/ruby_axe.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/ruby_boots.json b/src/main/resources/data/techreborn/recipes/crafting_table/gem_armor_tools/ruby_boots.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/ruby_boots.json rename to src/main/resources/data/techreborn/recipes/crafting_table/gem_armor_tools/ruby_boots.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/ruby_chestplate.json b/src/main/resources/data/techreborn/recipes/crafting_table/gem_armor_tools/ruby_chestplate.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/ruby_chestplate.json rename to src/main/resources/data/techreborn/recipes/crafting_table/gem_armor_tools/ruby_chestplate.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/ruby_helmet.json b/src/main/resources/data/techreborn/recipes/crafting_table/gem_armor_tools/ruby_helmet.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/ruby_helmet.json rename to src/main/resources/data/techreborn/recipes/crafting_table/gem_armor_tools/ruby_helmet.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/ruby_hoe.json b/src/main/resources/data/techreborn/recipes/crafting_table/gem_armor_tools/ruby_hoe.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/ruby_hoe.json rename to src/main/resources/data/techreborn/recipes/crafting_table/gem_armor_tools/ruby_hoe.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/ruby_leggings.json b/src/main/resources/data/techreborn/recipes/crafting_table/gem_armor_tools/ruby_leggings.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/ruby_leggings.json rename to src/main/resources/data/techreborn/recipes/crafting_table/gem_armor_tools/ruby_leggings.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/ruby_pickaxe.json b/src/main/resources/data/techreborn/recipes/crafting_table/gem_armor_tools/ruby_pickaxe.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/ruby_pickaxe.json rename to src/main/resources/data/techreborn/recipes/crafting_table/gem_armor_tools/ruby_pickaxe.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/ruby_spade.json b/src/main/resources/data/techreborn/recipes/crafting_table/gem_armor_tools/ruby_spade.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/ruby_spade.json rename to src/main/resources/data/techreborn/recipes/crafting_table/gem_armor_tools/ruby_spade.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/ruby_sword.json b/src/main/resources/data/techreborn/recipes/crafting_table/gem_armor_tools/ruby_sword.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/ruby_sword.json rename to src/main/resources/data/techreborn/recipes/crafting_table/gem_armor_tools/ruby_sword.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/sapphire_axe.json b/src/main/resources/data/techreborn/recipes/crafting_table/gem_armor_tools/sapphire_axe.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/sapphire_axe.json rename to src/main/resources/data/techreborn/recipes/crafting_table/gem_armor_tools/sapphire_axe.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/sapphire_boots.json b/src/main/resources/data/techreborn/recipes/crafting_table/gem_armor_tools/sapphire_boots.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/sapphire_boots.json rename to src/main/resources/data/techreborn/recipes/crafting_table/gem_armor_tools/sapphire_boots.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/sapphire_chestplate.json b/src/main/resources/data/techreborn/recipes/crafting_table/gem_armor_tools/sapphire_chestplate.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/sapphire_chestplate.json rename to src/main/resources/data/techreborn/recipes/crafting_table/gem_armor_tools/sapphire_chestplate.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/sapphire_helmet.json b/src/main/resources/data/techreborn/recipes/crafting_table/gem_armor_tools/sapphire_helmet.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/sapphire_helmet.json rename to src/main/resources/data/techreborn/recipes/crafting_table/gem_armor_tools/sapphire_helmet.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/sapphire_hoe.json b/src/main/resources/data/techreborn/recipes/crafting_table/gem_armor_tools/sapphire_hoe.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/sapphire_hoe.json rename to src/main/resources/data/techreborn/recipes/crafting_table/gem_armor_tools/sapphire_hoe.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/sapphire_leggings.json b/src/main/resources/data/techreborn/recipes/crafting_table/gem_armor_tools/sapphire_leggings.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/sapphire_leggings.json rename to src/main/resources/data/techreborn/recipes/crafting_table/gem_armor_tools/sapphire_leggings.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/sapphire_pickaxe.json b/src/main/resources/data/techreborn/recipes/crafting_table/gem_armor_tools/sapphire_pickaxe.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/sapphire_pickaxe.json rename to src/main/resources/data/techreborn/recipes/crafting_table/gem_armor_tools/sapphire_pickaxe.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/sapphire_spade.json b/src/main/resources/data/techreborn/recipes/crafting_table/gem_armor_tools/sapphire_spade.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/sapphire_spade.json rename to src/main/resources/data/techreborn/recipes/crafting_table/gem_armor_tools/sapphire_spade.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/sapphire_sword.json b/src/main/resources/data/techreborn/recipes/crafting_table/gem_armor_tools/sapphire_sword.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/sapphire_sword.json rename to src/main/resources/data/techreborn/recipes/crafting_table/gem_armor_tools/sapphire_sword.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_table/ingot/aluminum_ingot_from_block.json b/src/main/resources/data/techreborn/recipes/crafting_table/ingot/aluminum_ingot_from_block.json new file mode 100644 index 000000000..8e7eab708 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/crafting_table/ingot/aluminum_ingot_from_block.json @@ -0,0 +1,12 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "techreborn:aluminum_storage_block" + } + ], + "result": { + "item": "techreborn:aluminum_ingot", + "count": 9 + } +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/crafting_table/ingot/brass_ingot_from_block.json b/src/main/resources/data/techreborn/recipes/crafting_table/ingot/brass_ingot_from_block.json new file mode 100644 index 000000000..2d976917d --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/crafting_table/ingot/brass_ingot_from_block.json @@ -0,0 +1,12 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "techreborn:brass_storage_block" + } + ], + "result": { + "item": "techreborn:brass_ingot", + "count": 9 + } +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/crafting_table/ingot/bronze_ingot_from_block.json b/src/main/resources/data/techreborn/recipes/crafting_table/ingot/bronze_ingot_from_block.json new file mode 100644 index 000000000..72112e25b --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/crafting_table/ingot/bronze_ingot_from_block.json @@ -0,0 +1,12 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "techreborn:bronze_storage_block" + } + ], + "result": { + "item": "techreborn:bronze_ingot", + "count": 9 + } +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/crafting_table/ingot/chrome_ingot_from_block.json b/src/main/resources/data/techreborn/recipes/crafting_table/ingot/chrome_ingot_from_block.json new file mode 100644 index 000000000..a3f4a1359 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/crafting_table/ingot/chrome_ingot_from_block.json @@ -0,0 +1,12 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "techreborn:chrome_storage_block" + } + ], + "result": { + "item": "techreborn:chrome_ingot", + "count": 9 + } +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/crafting_table/ingot/electrum_ingot_from_block.json b/src/main/resources/data/techreborn/recipes/crafting_table/ingot/electrum_ingot_from_block.json new file mode 100644 index 000000000..e49b9378c --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/crafting_table/ingot/electrum_ingot_from_block.json @@ -0,0 +1,12 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "techreborn:electrum_storage_block" + } + ], + "result": { + "item": "techreborn:electrum_ingot", + "count": 9 + } +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/crafting_table/ingot/invar_ingot_from_block.json b/src/main/resources/data/techreborn/recipes/crafting_table/ingot/invar_ingot_from_block.json new file mode 100644 index 000000000..7d217c944 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/crafting_table/ingot/invar_ingot_from_block.json @@ -0,0 +1,12 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "techreborn:invar_storage_block" + } + ], + "result": { + "item": "techreborn:invar_ingot", + "count": 9 + } +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/iridium_alloy_ingot.json b/src/main/resources/data/techreborn/recipes/crafting_table/ingot/iridium_alloy_ingot.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/iridium_alloy_ingot.json rename to src/main/resources/data/techreborn/recipes/crafting_table/ingot/iridium_alloy_ingot.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_table/ingot/iridium_ingot_from_block.json b/src/main/resources/data/techreborn/recipes/crafting_table/ingot/iridium_ingot_from_block.json new file mode 100644 index 000000000..cf9aa5e62 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/crafting_table/ingot/iridium_ingot_from_block.json @@ -0,0 +1,12 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "techreborn:iridium_storage_block" + } + ], + "result": { + "item": "techreborn:iridium_ingot", + "count": 9 + } +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/crafting_table/ingot/lead_ingot_from_block.json b/src/main/resources/data/techreborn/recipes/crafting_table/ingot/lead_ingot_from_block.json new file mode 100644 index 000000000..5366f1a9c --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/crafting_table/ingot/lead_ingot_from_block.json @@ -0,0 +1,12 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "techreborn:lead_storage_block" + } + ], + "result": { + "item": "techreborn:lead_ingot", + "count": 9 + } +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/mixed_metal_ingot.json b/src/main/resources/data/techreborn/recipes/crafting_table/ingot/mixed_metal_ingot.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/mixed_metal_ingot.json rename to src/main/resources/data/techreborn/recipes/crafting_table/ingot/mixed_metal_ingot.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/mixed_metal_ingot_alt.json b/src/main/resources/data/techreborn/recipes/crafting_table/ingot/mixed_metal_ingot_alt.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/mixed_metal_ingot_alt.json rename to src/main/resources/data/techreborn/recipes/crafting_table/ingot/mixed_metal_ingot_alt.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/mixed_metal_ingot_aluminum_invar_bronze.json b/src/main/resources/data/techreborn/recipes/crafting_table/ingot/mixed_metal_ingot_aluminum_invar_bronze.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/mixed_metal_ingot_aluminum_invar_bronze.json rename to src/main/resources/data/techreborn/recipes/crafting_table/ingot/mixed_metal_ingot_aluminum_invar_bronze.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/mixed_metal_ingot_aluminum_nickel_brass.json b/src/main/resources/data/techreborn/recipes/crafting_table/ingot/mixed_metal_ingot_aluminum_nickel_brass.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/mixed_metal_ingot_aluminum_nickel_brass.json rename to src/main/resources/data/techreborn/recipes/crafting_table/ingot/mixed_metal_ingot_aluminum_nickel_brass.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/mixed_metal_ingot_aluminum_nickel_bronze.json b/src/main/resources/data/techreborn/recipes/crafting_table/ingot/mixed_metal_ingot_aluminum_nickel_bronze.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/mixed_metal_ingot_aluminum_nickel_bronze.json rename to src/main/resources/data/techreborn/recipes/crafting_table/ingot/mixed_metal_ingot_aluminum_nickel_bronze.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/mixed_metal_ingot_aluminum_titanium_brass.json b/src/main/resources/data/techreborn/recipes/crafting_table/ingot/mixed_metal_ingot_aluminum_titanium_brass.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/mixed_metal_ingot_aluminum_titanium_brass.json rename to src/main/resources/data/techreborn/recipes/crafting_table/ingot/mixed_metal_ingot_aluminum_titanium_brass.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/mixed_metal_ingot_aluminum_titanium_bronze.json b/src/main/resources/data/techreborn/recipes/crafting_table/ingot/mixed_metal_ingot_aluminum_titanium_bronze.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/mixed_metal_ingot_aluminum_titanium_bronze.json rename to src/main/resources/data/techreborn/recipes/crafting_table/ingot/mixed_metal_ingot_aluminum_titanium_bronze.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/mixed_metal_ingot_aluminum_tungsten_brass.json b/src/main/resources/data/techreborn/recipes/crafting_table/ingot/mixed_metal_ingot_aluminum_tungsten_brass.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/mixed_metal_ingot_aluminum_tungsten_brass.json rename to src/main/resources/data/techreborn/recipes/crafting_table/ingot/mixed_metal_ingot_aluminum_tungsten_brass.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/mixed_metal_ingot_aluminum_tungsten_bronze.json b/src/main/resources/data/techreborn/recipes/crafting_table/ingot/mixed_metal_ingot_aluminum_tungsten_bronze.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/mixed_metal_ingot_aluminum_tungsten_bronze.json rename to src/main/resources/data/techreborn/recipes/crafting_table/ingot/mixed_metal_ingot_aluminum_tungsten_bronze.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/mixed_metal_ingot_aluminum_tungstensteel_brass.json b/src/main/resources/data/techreborn/recipes/crafting_table/ingot/mixed_metal_ingot_aluminum_tungstensteel_brass.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/mixed_metal_ingot_aluminum_tungstensteel_brass.json rename to src/main/resources/data/techreborn/recipes/crafting_table/ingot/mixed_metal_ingot_aluminum_tungstensteel_brass.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/mixed_metal_ingot_aluminum_tungstensteel_bronze.json b/src/main/resources/data/techreborn/recipes/crafting_table/ingot/mixed_metal_ingot_aluminum_tungstensteel_bronze.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/mixed_metal_ingot_aluminum_tungstensteel_bronze.json rename to src/main/resources/data/techreborn/recipes/crafting_table/ingot/mixed_metal_ingot_aluminum_tungstensteel_bronze.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/mixed_metal_ingot_mixed_metal_ingot_aluminum_invar_brass.json b/src/main/resources/data/techreborn/recipes/crafting_table/ingot/mixed_metal_ingot_mixed_metal_ingot_aluminum_invar_brass.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/mixed_metal_ingot_mixed_metal_ingot_aluminum_invar_brass.json rename to src/main/resources/data/techreborn/recipes/crafting_table/ingot/mixed_metal_ingot_mixed_metal_ingot_aluminum_invar_brass.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/mixed_metal_ingot_mixed_metal_ingot_tin_titanium_bronze.json b/src/main/resources/data/techreborn/recipes/crafting_table/ingot/mixed_metal_ingot_mixed_metal_ingot_tin_titanium_bronze.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/mixed_metal_ingot_mixed_metal_ingot_tin_titanium_bronze.json rename to src/main/resources/data/techreborn/recipes/crafting_table/ingot/mixed_metal_ingot_mixed_metal_ingot_tin_titanium_bronze.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/mixed_metal_ingot_mixed_metal_ingot_zinc_invar_bronze.json b/src/main/resources/data/techreborn/recipes/crafting_table/ingot/mixed_metal_ingot_mixed_metal_ingot_zinc_invar_bronze.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/mixed_metal_ingot_mixed_metal_ingot_zinc_invar_bronze.json rename to src/main/resources/data/techreborn/recipes/crafting_table/ingot/mixed_metal_ingot_mixed_metal_ingot_zinc_invar_bronze.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/mixed_metal_ingot_tin_invar_brass.json b/src/main/resources/data/techreborn/recipes/crafting_table/ingot/mixed_metal_ingot_tin_invar_brass.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/mixed_metal_ingot_tin_invar_brass.json rename to src/main/resources/data/techreborn/recipes/crafting_table/ingot/mixed_metal_ingot_tin_invar_brass.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/mixed_metal_ingot_tin_invar_bronze.json b/src/main/resources/data/techreborn/recipes/crafting_table/ingot/mixed_metal_ingot_tin_invar_bronze.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/mixed_metal_ingot_tin_invar_bronze.json rename to src/main/resources/data/techreborn/recipes/crafting_table/ingot/mixed_metal_ingot_tin_invar_bronze.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/mixed_metal_ingot_tin_nickel_brass.json b/src/main/resources/data/techreborn/recipes/crafting_table/ingot/mixed_metal_ingot_tin_nickel_brass.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/mixed_metal_ingot_tin_nickel_brass.json rename to src/main/resources/data/techreborn/recipes/crafting_table/ingot/mixed_metal_ingot_tin_nickel_brass.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/mixed_metal_ingot_tin_nickel_bronze.json b/src/main/resources/data/techreborn/recipes/crafting_table/ingot/mixed_metal_ingot_tin_nickel_bronze.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/mixed_metal_ingot_tin_nickel_bronze.json rename to src/main/resources/data/techreborn/recipes/crafting_table/ingot/mixed_metal_ingot_tin_nickel_bronze.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/mixed_metal_ingot_tin_titanium_brass.json b/src/main/resources/data/techreborn/recipes/crafting_table/ingot/mixed_metal_ingot_tin_titanium_brass.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/mixed_metal_ingot_tin_titanium_brass.json rename to src/main/resources/data/techreborn/recipes/crafting_table/ingot/mixed_metal_ingot_tin_titanium_brass.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/mixed_metal_ingot_tin_tungsten_brass.json b/src/main/resources/data/techreborn/recipes/crafting_table/ingot/mixed_metal_ingot_tin_tungsten_brass.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/mixed_metal_ingot_tin_tungsten_brass.json rename to src/main/resources/data/techreborn/recipes/crafting_table/ingot/mixed_metal_ingot_tin_tungsten_brass.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/mixed_metal_ingot_tin_tungsten_bronze.json b/src/main/resources/data/techreborn/recipes/crafting_table/ingot/mixed_metal_ingot_tin_tungsten_bronze.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/mixed_metal_ingot_tin_tungsten_bronze.json rename to src/main/resources/data/techreborn/recipes/crafting_table/ingot/mixed_metal_ingot_tin_tungsten_bronze.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/mixed_metal_ingot_tin_tungstensteel_brass.json b/src/main/resources/data/techreborn/recipes/crafting_table/ingot/mixed_metal_ingot_tin_tungstensteel_brass.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/mixed_metal_ingot_tin_tungstensteel_brass.json rename to src/main/resources/data/techreborn/recipes/crafting_table/ingot/mixed_metal_ingot_tin_tungstensteel_brass.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/mixed_metal_ingot_tin_tungstensteel_bronze.json b/src/main/resources/data/techreborn/recipes/crafting_table/ingot/mixed_metal_ingot_tin_tungstensteel_bronze.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/mixed_metal_ingot_tin_tungstensteel_bronze.json rename to src/main/resources/data/techreborn/recipes/crafting_table/ingot/mixed_metal_ingot_tin_tungstensteel_bronze.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/mixed_metal_ingot_zinc_invar_brass.json b/src/main/resources/data/techreborn/recipes/crafting_table/ingot/mixed_metal_ingot_zinc_invar_brass.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/mixed_metal_ingot_zinc_invar_brass.json rename to src/main/resources/data/techreborn/recipes/crafting_table/ingot/mixed_metal_ingot_zinc_invar_brass.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/mixed_metal_ingot_zinc_iron_brass.json b/src/main/resources/data/techreborn/recipes/crafting_table/ingot/mixed_metal_ingot_zinc_iron_brass.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/mixed_metal_ingot_zinc_iron_brass.json rename to src/main/resources/data/techreborn/recipes/crafting_table/ingot/mixed_metal_ingot_zinc_iron_brass.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/mixed_metal_ingot_zinc_iron_bronze.json b/src/main/resources/data/techreborn/recipes/crafting_table/ingot/mixed_metal_ingot_zinc_iron_bronze.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/mixed_metal_ingot_zinc_iron_bronze.json rename to src/main/resources/data/techreborn/recipes/crafting_table/ingot/mixed_metal_ingot_zinc_iron_bronze.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/mixed_metal_ingot_zinc_nickel_brass.json b/src/main/resources/data/techreborn/recipes/crafting_table/ingot/mixed_metal_ingot_zinc_nickel_brass.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/mixed_metal_ingot_zinc_nickel_brass.json rename to src/main/resources/data/techreborn/recipes/crafting_table/ingot/mixed_metal_ingot_zinc_nickel_brass.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/mixed_metal_ingot_zinc_nickel_bronze.json b/src/main/resources/data/techreborn/recipes/crafting_table/ingot/mixed_metal_ingot_zinc_nickel_bronze.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/mixed_metal_ingot_zinc_nickel_bronze.json rename to src/main/resources/data/techreborn/recipes/crafting_table/ingot/mixed_metal_ingot_zinc_nickel_bronze.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/mixed_metal_ingot_zinc_titanium_brass.json b/src/main/resources/data/techreborn/recipes/crafting_table/ingot/mixed_metal_ingot_zinc_titanium_brass.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/mixed_metal_ingot_zinc_titanium_brass.json rename to src/main/resources/data/techreborn/recipes/crafting_table/ingot/mixed_metal_ingot_zinc_titanium_brass.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/mixed_metal_ingot_zinc_titanium_bronze.json b/src/main/resources/data/techreborn/recipes/crafting_table/ingot/mixed_metal_ingot_zinc_titanium_bronze.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/mixed_metal_ingot_zinc_titanium_bronze.json rename to src/main/resources/data/techreborn/recipes/crafting_table/ingot/mixed_metal_ingot_zinc_titanium_bronze.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/mixed_metal_ingot_zinc_tungsten_brass.json b/src/main/resources/data/techreborn/recipes/crafting_table/ingot/mixed_metal_ingot_zinc_tungsten_brass.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/mixed_metal_ingot_zinc_tungsten_brass.json rename to src/main/resources/data/techreborn/recipes/crafting_table/ingot/mixed_metal_ingot_zinc_tungsten_brass.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/mixed_metal_ingot_zinc_tungsten_bronze.json b/src/main/resources/data/techreborn/recipes/crafting_table/ingot/mixed_metal_ingot_zinc_tungsten_bronze.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/mixed_metal_ingot_zinc_tungsten_bronze.json rename to src/main/resources/data/techreborn/recipes/crafting_table/ingot/mixed_metal_ingot_zinc_tungsten_bronze.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/mixed_metal_ingot_zinc_tungstensteel_brass.json b/src/main/resources/data/techreborn/recipes/crafting_table/ingot/mixed_metal_ingot_zinc_tungstensteel_brass.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/mixed_metal_ingot_zinc_tungstensteel_brass.json rename to src/main/resources/data/techreborn/recipes/crafting_table/ingot/mixed_metal_ingot_zinc_tungstensteel_brass.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/mixed_metal_ingot_zinc_tungstensteel_bronze.json b/src/main/resources/data/techreborn/recipes/crafting_table/ingot/mixed_metal_ingot_zinc_tungstensteel_bronze.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/mixed_metal_ingot_zinc_tungstensteel_bronze.json rename to src/main/resources/data/techreborn/recipes/crafting_table/ingot/mixed_metal_ingot_zinc_tungstensteel_bronze.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_table/ingot/nickel_ingot_from_block.json b/src/main/resources/data/techreborn/recipes/crafting_table/ingot/nickel_ingot_from_block.json new file mode 100644 index 000000000..aa41d8cac --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/crafting_table/ingot/nickel_ingot_from_block.json @@ -0,0 +1,12 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "techreborn:nickel_storage_block" + } + ], + "result": { + "item": "techreborn:nickel_ingot", + "count": 9 + } +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/crafting_table/ingot/platinum_ingot_from_block.json b/src/main/resources/data/techreborn/recipes/crafting_table/ingot/platinum_ingot_from_block.json new file mode 100644 index 000000000..03ed58e89 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/crafting_table/ingot/platinum_ingot_from_block.json @@ -0,0 +1,12 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "techreborn:platinum_storage_block" + } + ], + "result": { + "item": "techreborn:platinum_ingot", + "count": 9 + } +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/crafting_table/ingot/silver_ingot_from_block.json b/src/main/resources/data/techreborn/recipes/crafting_table/ingot/silver_ingot_from_block.json new file mode 100644 index 000000000..970d80ec2 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/crafting_table/ingot/silver_ingot_from_block.json @@ -0,0 +1,12 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "techreborn:silver_storage_block" + } + ], + "result": { + "item": "techreborn:silver_ingot", + "count": 9 + } +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/crafting_table/ingot/steel_ingot_from_block.json b/src/main/resources/data/techreborn/recipes/crafting_table/ingot/steel_ingot_from_block.json new file mode 100644 index 000000000..79aad7f77 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/crafting_table/ingot/steel_ingot_from_block.json @@ -0,0 +1,12 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "techreborn:steel_storage_block" + } + ], + "result": { + "item": "techreborn:steel_ingot", + "count": 9 + } +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/crafting_table/ingot/titanium_ingot_from_block.json b/src/main/resources/data/techreborn/recipes/crafting_table/ingot/titanium_ingot_from_block.json new file mode 100644 index 000000000..c89f6c96a --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/crafting_table/ingot/titanium_ingot_from_block.json @@ -0,0 +1,12 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "techreborn:titanium_storage_block" + } + ], + "result": { + "item": "techreborn:titanium_ingot", + "count": 9 + } +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/crafting_table/ingot/tungsten_ingot_from_block.json b/src/main/resources/data/techreborn/recipes/crafting_table/ingot/tungsten_ingot_from_block.json new file mode 100644 index 000000000..5aed064cf --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/crafting_table/ingot/tungsten_ingot_from_block.json @@ -0,0 +1,12 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "techreborn:tungsten_storage_block" + } + ], + "result": { + "item": "techreborn:tungsten_ingot", + "count": 9 + } +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/crafting_table/ingot/zinc_ingot_from_block.json b/src/main/resources/data/techreborn/recipes/crafting_table/ingot/zinc_ingot_from_block.json new file mode 100644 index 000000000..ab042ab35 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/crafting_table/ingot/zinc_ingot_from_block.json @@ -0,0 +1,12 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "techreborn:zinc_storage_block" + } + ], + "result": { + "item": "techreborn:zinc_ingot", + "count": 9 + } +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/adjustable_su.json b/src/main/resources/data/techreborn/recipes/crafting_table/machine/adjustable_su.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/adjustable_su.json rename to src/main/resources/data/techreborn/recipes/crafting_table/machine/adjustable_su.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/alarm.json b/src/main/resources/data/techreborn/recipes/crafting_table/machine/alarm.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/alarm.json rename to src/main/resources/data/techreborn/recipes/crafting_table/machine/alarm.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/alloy_smelter.json b/src/main/resources/data/techreborn/recipes/crafting_table/machine/alloy_smelter.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/alloy_smelter.json rename to src/main/resources/data/techreborn/recipes/crafting_table/machine/alloy_smelter.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/auto_crafting_table.json b/src/main/resources/data/techreborn/recipes/crafting_table/machine/auto_crafting_table.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/auto_crafting_table.json rename to src/main/resources/data/techreborn/recipes/crafting_table/machine/auto_crafting_table.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/charge_o_mat.json b/src/main/resources/data/techreborn/recipes/crafting_table/machine/charge_o_mat.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/charge_o_mat.json rename to src/main/resources/data/techreborn/recipes/crafting_table/machine/charge_o_mat.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/chemical_reactor.json b/src/main/resources/data/techreborn/recipes/crafting_table/machine/chemical_reactor.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/chemical_reactor.json rename to src/main/resources/data/techreborn/recipes/crafting_table/machine/chemical_reactor.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/compressor.json b/src/main/resources/data/techreborn/recipes/crafting_table/machine/compressor.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/compressor.json rename to src/main/resources/data/techreborn/recipes/crafting_table/machine/compressor.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/diesel_generator.json b/src/main/resources/data/techreborn/recipes/crafting_table/machine/diesel_generator.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/diesel_generator.json rename to src/main/resources/data/techreborn/recipes/crafting_table/machine/diesel_generator.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/diesel_generator_alt.json b/src/main/resources/data/techreborn/recipes/crafting_table/machine/diesel_generator_alt.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/diesel_generator_alt.json rename to src/main/resources/data/techreborn/recipes/crafting_table/machine/diesel_generator_alt.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/digital_chest.json b/src/main/resources/data/techreborn/recipes/crafting_table/machine/digital_chest.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/digital_chest.json rename to src/main/resources/data/techreborn/recipes/crafting_table/machine/digital_chest.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/digital_chest_alt.json b/src/main/resources/data/techreborn/recipes/crafting_table/machine/digital_chest_alt.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/digital_chest_alt.json rename to src/main/resources/data/techreborn/recipes/crafting_table/machine/digital_chest_alt.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/distillation_tower.json b/src/main/resources/data/techreborn/recipes/crafting_table/machine/distillation_tower.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/distillation_tower.json rename to src/main/resources/data/techreborn/recipes/crafting_table/machine/distillation_tower.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/dragon_egg_syphon.json b/src/main/resources/data/techreborn/recipes/crafting_table/machine/dragon_egg_syphon.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/dragon_egg_syphon.json rename to src/main/resources/data/techreborn/recipes/crafting_table/machine/dragon_egg_syphon.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/electric_furnace.json b/src/main/resources/data/techreborn/recipes/crafting_table/machine/electric_furnace.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/electric_furnace.json rename to src/main/resources/data/techreborn/recipes/crafting_table/machine/electric_furnace.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/extractor.json b/src/main/resources/data/techreborn/recipes/crafting_table/machine/extractor.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/extractor.json rename to src/main/resources/data/techreborn/recipes/crafting_table/machine/extractor.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/fluid_replicator.json b/src/main/resources/data/techreborn/recipes/crafting_table/machine/fluid_replicator.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/fluid_replicator.json rename to src/main/resources/data/techreborn/recipes/crafting_table/machine/fluid_replicator.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/fusion_coil.json b/src/main/resources/data/techreborn/recipes/crafting_table/machine/fusion_coil.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/fusion_coil.json rename to src/main/resources/data/techreborn/recipes/crafting_table/machine/fusion_coil.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/fusion_control_computer.json b/src/main/resources/data/techreborn/recipes/crafting_table/machine/fusion_control_computer.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/fusion_control_computer.json rename to src/main/resources/data/techreborn/recipes/crafting_table/machine/fusion_control_computer.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/gas_turbine.json b/src/main/resources/data/techreborn/recipes/crafting_table/machine/gas_turbine.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/gas_turbine.json rename to src/main/resources/data/techreborn/recipes/crafting_table/machine/gas_turbine.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/gas_turbine_alt.json b/src/main/resources/data/techreborn/recipes/crafting_table/machine/gas_turbine_alt.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/gas_turbine_alt.json rename to src/main/resources/data/techreborn/recipes/crafting_table/machine/gas_turbine_alt.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/grinder.json b/src/main/resources/data/techreborn/recipes/crafting_table/machine/grinder.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/grinder.json rename to src/main/resources/data/techreborn/recipes/crafting_table/machine/grinder.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/high_voltage_su.json b/src/main/resources/data/techreborn/recipes/crafting_table/machine/high_voltage_su.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/high_voltage_su.json rename to src/main/resources/data/techreborn/recipes/crafting_table/machine/high_voltage_su.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/hv_transformer.json b/src/main/resources/data/techreborn/recipes/crafting_table/machine/hv_transformer.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/hv_transformer.json rename to src/main/resources/data/techreborn/recipes/crafting_table/machine/hv_transformer.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/implosion_compressor.json b/src/main/resources/data/techreborn/recipes/crafting_table/machine/implosion_compressor.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/implosion_compressor.json rename to src/main/resources/data/techreborn/recipes/crafting_table/machine/implosion_compressor.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/industrial_blast_furnace.json b/src/main/resources/data/techreborn/recipes/crafting_table/machine/industrial_blast_furnace.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/industrial_blast_furnace.json rename to src/main/resources/data/techreborn/recipes/crafting_table/machine/industrial_blast_furnace.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/industrial_centrifuge.json b/src/main/resources/data/techreborn/recipes/crafting_table/machine/industrial_centrifuge.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/industrial_centrifuge.json rename to src/main/resources/data/techreborn/recipes/crafting_table/machine/industrial_centrifuge.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/industrial_centrifuge_alt.json b/src/main/resources/data/techreborn/recipes/crafting_table/machine/industrial_centrifuge_alt.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/industrial_centrifuge_alt.json rename to src/main/resources/data/techreborn/recipes/crafting_table/machine/industrial_centrifuge_alt.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/industrial_electrolyzer.json b/src/main/resources/data/techreborn/recipes/crafting_table/machine/industrial_electrolyzer.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/industrial_electrolyzer.json rename to src/main/resources/data/techreborn/recipes/crafting_table/machine/industrial_electrolyzer.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/industrial_grinder.json b/src/main/resources/data/techreborn/recipes/crafting_table/machine/industrial_grinder.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/industrial_grinder.json rename to src/main/resources/data/techreborn/recipes/crafting_table/machine/industrial_grinder.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/industrial_sawmill.json b/src/main/resources/data/techreborn/recipes/crafting_table/machine/industrial_sawmill.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/industrial_sawmill.json rename to src/main/resources/data/techreborn/recipes/crafting_table/machine/industrial_sawmill.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/interdimensional_su.json b/src/main/resources/data/techreborn/recipes/crafting_table/machine/interdimensional_su.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/interdimensional_su.json rename to src/main/resources/data/techreborn/recipes/crafting_table/machine/interdimensional_su.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/iron_alloy_furnace.json b/src/main/resources/data/techreborn/recipes/crafting_table/machine/iron_alloy_furnace.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/iron_alloy_furnace.json rename to src/main/resources/data/techreborn/recipes/crafting_table/machine/iron_alloy_furnace.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/iron_furnace.json b/src/main/resources/data/techreborn/recipes/crafting_table/machine/iron_furnace.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/iron_furnace.json rename to src/main/resources/data/techreborn/recipes/crafting_table/machine/iron_furnace.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/iron_furnace_alt.json b/src/main/resources/data/techreborn/recipes/crafting_table/machine/iron_furnace_alt.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/iron_furnace_alt.json rename to src/main/resources/data/techreborn/recipes/crafting_table/machine/iron_furnace_alt.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/lamp_incandescent.json b/src/main/resources/data/techreborn/recipes/crafting_table/machine/lamp_incandescent.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/lamp_incandescent.json rename to src/main/resources/data/techreborn/recipes/crafting_table/machine/lamp_incandescent.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/lamp_led.json b/src/main/resources/data/techreborn/recipes/crafting_table/machine/lamp_led.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/lamp_led.json rename to src/main/resources/data/techreborn/recipes/crafting_table/machine/lamp_led.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/lapotronic_su.json b/src/main/resources/data/techreborn/recipes/crafting_table/machine/lapotronic_su.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/lapotronic_su.json rename to src/main/resources/data/techreborn/recipes/crafting_table/machine/lapotronic_su.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/lightning_rod.json b/src/main/resources/data/techreborn/recipes/crafting_table/machine/lightning_rod.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/lightning_rod.json rename to src/main/resources/data/techreborn/recipes/crafting_table/machine/lightning_rod.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/low_voltage_su.json b/src/main/resources/data/techreborn/recipes/crafting_table/machine/low_voltage_su.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/low_voltage_su.json rename to src/main/resources/data/techreborn/recipes/crafting_table/machine/low_voltage_su.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/lsu_storage.json b/src/main/resources/data/techreborn/recipes/crafting_table/machine/lsu_storage.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/lsu_storage.json rename to src/main/resources/data/techreborn/recipes/crafting_table/machine/lsu_storage.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/lv_transformer.json b/src/main/resources/data/techreborn/recipes/crafting_table/machine/lv_transformer.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/lv_transformer.json rename to src/main/resources/data/techreborn/recipes/crafting_table/machine/lv_transformer.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/matter_fabricator.json b/src/main/resources/data/techreborn/recipes/crafting_table/machine/matter_fabricator.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/matter_fabricator.json rename to src/main/resources/data/techreborn/recipes/crafting_table/machine/matter_fabricator.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/medium_voltage_su.json b/src/main/resources/data/techreborn/recipes/crafting_table/machine/medium_voltage_su.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/medium_voltage_su.json rename to src/main/resources/data/techreborn/recipes/crafting_table/machine/medium_voltage_su.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/mv_transformer.json b/src/main/resources/data/techreborn/recipes/crafting_table/machine/mv_transformer.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/mv_transformer.json rename to src/main/resources/data/techreborn/recipes/crafting_table/machine/mv_transformer.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/plasma_generator.json b/src/main/resources/data/techreborn/recipes/crafting_table/machine/plasma_generator.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/plasma_generator.json rename to src/main/resources/data/techreborn/recipes/crafting_table/machine/plasma_generator.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/player_detector.json b/src/main/resources/data/techreborn/recipes/crafting_table/machine/player_detector.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/player_detector.json rename to src/main/resources/data/techreborn/recipes/crafting_table/machine/player_detector.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/quantum_chest.json b/src/main/resources/data/techreborn/recipes/crafting_table/machine/quantum_chest.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/quantum_chest.json rename to src/main/resources/data/techreborn/recipes/crafting_table/machine/quantum_chest.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/quantum_tank.json b/src/main/resources/data/techreborn/recipes/crafting_table/machine/quantum_tank.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/quantum_tank.json rename to src/main/resources/data/techreborn/recipes/crafting_table/machine/quantum_tank.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/recycler.json b/src/main/resources/data/techreborn/recipes/crafting_table/machine/recycler.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/recycler.json rename to src/main/resources/data/techreborn/recipes/crafting_table/machine/recycler.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/rolling_machine.json b/src/main/resources/data/techreborn/recipes/crafting_table/machine/rolling_machine.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/rolling_machine.json rename to src/main/resources/data/techreborn/recipes/crafting_table/machine/rolling_machine.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/scrapboxinator.json b/src/main/resources/data/techreborn/recipes/crafting_table/machine/scrapboxinator.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/scrapboxinator.json rename to src/main/resources/data/techreborn/recipes/crafting_table/machine/scrapboxinator.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/semi_fluid_generator.json b/src/main/resources/data/techreborn/recipes/crafting_table/machine/semi_fluid_generator.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/semi_fluid_generator.json rename to src/main/resources/data/techreborn/recipes/crafting_table/machine/semi_fluid_generator.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/semi_fluid_generator_alt.json b/src/main/resources/data/techreborn/recipes/crafting_table/machine/semi_fluid_generator_alt.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/semi_fluid_generator_alt.json rename to src/main/resources/data/techreborn/recipes/crafting_table/machine/semi_fluid_generator_alt.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shapeless/solid_fuel_generator.json b/src/main/resources/data/techreborn/recipes/crafting_table/machine/solid_fuel_generator.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shapeless/solid_fuel_generator.json rename to src/main/resources/data/techreborn/recipes/crafting_table/machine/solid_fuel_generator.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/thermal_generator.json b/src/main/resources/data/techreborn/recipes/crafting_table/machine/thermal_generator.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/thermal_generator.json rename to src/main/resources/data/techreborn/recipes/crafting_table/machine/thermal_generator.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/vacuum_freezer.json b/src/main/resources/data/techreborn/recipes/crafting_table/machine/vacuum_freezer.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/vacuum_freezer.json rename to src/main/resources/data/techreborn/recipes/crafting_table/machine/vacuum_freezer.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/water_mill.json b/src/main/resources/data/techreborn/recipes/crafting_table/machine/water_mill.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/water_mill.json rename to src/main/resources/data/techreborn/recipes/crafting_table/machine/water_mill.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/wind_mill.json b/src/main/resources/data/techreborn/recipes/crafting_table/machine/wind_mill.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/wind_mill.json rename to src/main/resources/data/techreborn/recipes/crafting_table/machine/wind_mill.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/wind_mill_alt.json b/src/main/resources/data/techreborn/recipes/crafting_table/machine/wind_mill_alt.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/wind_mill_alt.json rename to src/main/resources/data/techreborn/recipes/crafting_table/machine/wind_mill_alt.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/advanced_machine_casing.json b/src/main/resources/data/techreborn/recipes/crafting_table/machine_block/advanced_machine_casing.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/advanced_machine_casing.json rename to src/main/resources/data/techreborn/recipes/crafting_table/machine_block/advanced_machine_casing.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/advanced_machine_casing_alt.json b/src/main/resources/data/techreborn/recipes/crafting_table/machine_block/advanced_machine_casing_alt.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/advanced_machine_casing_alt.json rename to src/main/resources/data/techreborn/recipes/crafting_table/machine_block/advanced_machine_casing_alt.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/advanced_machine_frame.json b/src/main/resources/data/techreborn/recipes/crafting_table/machine_block/advanced_machine_frame.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/advanced_machine_frame.json rename to src/main/resources/data/techreborn/recipes/crafting_table/machine_block/advanced_machine_frame.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/basic_machine_casing.json b/src/main/resources/data/techreborn/recipes/crafting_table/machine_block/basic_machine_casing.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/basic_machine_casing.json rename to src/main/resources/data/techreborn/recipes/crafting_table/machine_block/basic_machine_casing.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/basic_machine_casing_alt.json b/src/main/resources/data/techreborn/recipes/crafting_table/machine_block/basic_machine_casing_alt.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/basic_machine_casing_alt.json rename to src/main/resources/data/techreborn/recipes/crafting_table/machine_block/basic_machine_casing_alt.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/basic_machine_casing_alt_alt.json b/src/main/resources/data/techreborn/recipes/crafting_table/machine_block/basic_machine_casing_alt_alt.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/basic_machine_casing_alt_alt.json rename to src/main/resources/data/techreborn/recipes/crafting_table/machine_block/basic_machine_casing_alt_alt.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/basic_machine_frame.json b/src/main/resources/data/techreborn/recipes/crafting_table/machine_block/basic_machine_frame.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/basic_machine_frame.json rename to src/main/resources/data/techreborn/recipes/crafting_table/machine_block/basic_machine_frame.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/industrial_machine_casing.json b/src/main/resources/data/techreborn/recipes/crafting_table/machine_block/industrial_machine_casing.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/industrial_machine_casing.json rename to src/main/resources/data/techreborn/recipes/crafting_table/machine_block/industrial_machine_casing.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/industrial_machine_casing_alt.json b/src/main/resources/data/techreborn/recipes/crafting_table/machine_block/industrial_machine_casing_alt.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/industrial_machine_casing_alt.json rename to src/main/resources/data/techreborn/recipes/crafting_table/machine_block/industrial_machine_casing_alt.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/industrial_machine_frame.json b/src/main/resources/data/techreborn/recipes/crafting_table/machine_block/industrial_machine_frame.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/industrial_machine_frame.json rename to src/main/resources/data/techreborn/recipes/crafting_table/machine_block/industrial_machine_frame.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shapeless/manual.json b/src/main/resources/data/techreborn/recipes/crafting_table/manual.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shapeless/manual.json rename to src/main/resources/data/techreborn/recipes/crafting_table/manual.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/computer_cube.json b/src/main/resources/data/techreborn/recipes/crafting_table/misc_block/computer_cube.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/computer_cube.json rename to src/main/resources/data/techreborn/recipes/crafting_table/misc_block/computer_cube.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/refined_iron_fence.json b/src/main/resources/data/techreborn/recipes/crafting_table/misc_block/refined_iron_fence.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/refined_iron_fence.json rename to src/main/resources/data/techreborn/recipes/crafting_table/misc_block/refined_iron_fence.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/reinforced_glass.json b/src/main/resources/data/techreborn/recipes/crafting_table/misc_block/reinforced_glass.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/reinforced_glass.json rename to src/main/resources/data/techreborn/recipes/crafting_table/misc_block/reinforced_glass.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/reinforced_glass_alt.json b/src/main/resources/data/techreborn/recipes/crafting_table/misc_block/reinforced_glass_alt.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/reinforced_glass_alt.json rename to src/main/resources/data/techreborn/recipes/crafting_table/misc_block/reinforced_glass_alt.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/rubber_plank_slab.json b/src/main/resources/data/techreborn/recipes/crafting_table/misc_block/rubber_plank_slab.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/rubber_plank_slab.json rename to src/main/resources/data/techreborn/recipes/crafting_table/misc_block/rubber_plank_slab.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/rubber_plank_stair.json b/src/main/resources/data/techreborn/recipes/crafting_table/misc_block/rubber_plank_stair.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/rubber_plank_stair.json rename to src/main/resources/data/techreborn/recipes/crafting_table/misc_block/rubber_plank_stair.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shapeless/rubber_planks.json b/src/main/resources/data/techreborn/recipes/crafting_table/misc_block/rubber_planks.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shapeless/rubber_planks.json rename to src/main/resources/data/techreborn/recipes/crafting_table/misc_block/rubber_planks.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/parts/advanced_circuit.json b/src/main/resources/data/techreborn/recipes/crafting_table/parts/advanced_circuit.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/parts/advanced_circuit.json rename to src/main/resources/data/techreborn/recipes/crafting_table/parts/advanced_circuit.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/parts/carbon_fiber.json b/src/main/resources/data/techreborn/recipes/crafting_table/parts/carbon_fiber.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/parts/carbon_fiber.json rename to src/main/resources/data/techreborn/recipes/crafting_table/parts/carbon_fiber.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/parts/data_storage_chip.json b/src/main/resources/data/techreborn/recipes/crafting_table/parts/data_storage_chip.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/parts/data_storage_chip.json rename to src/main/resources/data/techreborn/recipes/crafting_table/parts/data_storage_chip.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/parts/data_storage_core.json b/src/main/resources/data/techreborn/recipes/crafting_table/parts/data_storage_core.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/parts/data_storage_core.json rename to src/main/resources/data/techreborn/recipes/crafting_table/parts/data_storage_core.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/parts/diamond_grinding_head.json b/src/main/resources/data/techreborn/recipes/crafting_table/parts/diamond_grinding_head.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/parts/diamond_grinding_head.json rename to src/main/resources/data/techreborn/recipes/crafting_table/parts/diamond_grinding_head.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/parts/diamond_saw_blade.json b/src/main/resources/data/techreborn/recipes/crafting_table/parts/diamond_saw_blade.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/parts/diamond_saw_blade.json rename to src/main/resources/data/techreborn/recipes/crafting_table/parts/diamond_saw_blade.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/parts/digital_display.json b/src/main/resources/data/techreborn/recipes/crafting_table/parts/digital_display.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/parts/digital_display.json rename to src/main/resources/data/techreborn/recipes/crafting_table/parts/digital_display.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/parts/electronic_circuit.json b/src/main/resources/data/techreborn/recipes/crafting_table/parts/electronic_circuit.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/parts/electronic_circuit.json rename to src/main/resources/data/techreborn/recipes/crafting_table/parts/electronic_circuit.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/parts/energy_crystal.json b/src/main/resources/data/techreborn/recipes/crafting_table/parts/energy_crystal.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/parts/energy_crystal.json rename to src/main/resources/data/techreborn/recipes/crafting_table/parts/energy_crystal.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/parts/energy_flow_chip.json b/src/main/resources/data/techreborn/recipes/crafting_table/parts/energy_flow_chip.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/parts/energy_flow_chip.json rename to src/main/resources/data/techreborn/recipes/crafting_table/parts/energy_flow_chip.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/parts/helium_coolant_cell_180k.json b/src/main/resources/data/techreborn/recipes/crafting_table/parts/helium_coolant_cell_180k.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/parts/helium_coolant_cell_180k.json rename to src/main/resources/data/techreborn/recipes/crafting_table/parts/helium_coolant_cell_180k.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/parts/helium_coolant_cell_360k.json b/src/main/resources/data/techreborn/recipes/crafting_table/parts/helium_coolant_cell_360k.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/parts/helium_coolant_cell_360k.json rename to src/main/resources/data/techreborn/recipes/crafting_table/parts/helium_coolant_cell_360k.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/parts/helium_coolant_cell_60k.json b/src/main/resources/data/techreborn/recipes/crafting_table/parts/helium_coolant_cell_60k.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/parts/helium_coolant_cell_60k.json rename to src/main/resources/data/techreborn/recipes/crafting_table/parts/helium_coolant_cell_60k.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/parts/iridium_neutron_reflector.json b/src/main/resources/data/techreborn/recipes/crafting_table/parts/iridium_neutron_reflector.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/parts/iridium_neutron_reflector.json rename to src/main/resources/data/techreborn/recipes/crafting_table/parts/iridium_neutron_reflector.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/parts/nak_coolant_cell_180k.json b/src/main/resources/data/techreborn/recipes/crafting_table/parts/nak_coolant_cell_180k.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/parts/nak_coolant_cell_180k.json rename to src/main/resources/data/techreborn/recipes/crafting_table/parts/nak_coolant_cell_180k.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/parts/nak_coolant_cell_360k.json b/src/main/resources/data/techreborn/recipes/crafting_table/parts/nak_coolant_cell_360k.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/parts/nak_coolant_cell_360k.json rename to src/main/resources/data/techreborn/recipes/crafting_table/parts/nak_coolant_cell_360k.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/parts/nak_coolant_cell_60k.json b/src/main/resources/data/techreborn/recipes/crafting_table/parts/nak_coolant_cell_60k.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/parts/nak_coolant_cell_60k.json rename to src/main/resources/data/techreborn/recipes/crafting_table/parts/nak_coolant_cell_60k.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/parts/nak_coolant_cell_60k_alt.json b/src/main/resources/data/techreborn/recipes/crafting_table/parts/nak_coolant_cell_60k_alt.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/parts/nak_coolant_cell_60k_alt.json rename to src/main/resources/data/techreborn/recipes/crafting_table/parts/nak_coolant_cell_60k_alt.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/parts/neutron_reflector.json b/src/main/resources/data/techreborn/recipes/crafting_table/parts/neutron_reflector.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/parts/neutron_reflector.json rename to src/main/resources/data/techreborn/recipes/crafting_table/parts/neutron_reflector.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/parts/superconductor.json b/src/main/resources/data/techreborn/recipes/crafting_table/parts/superconductor.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/parts/superconductor.json rename to src/main/resources/data/techreborn/recipes/crafting_table/parts/superconductor.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/parts/thick_neutron_reflector.json b/src/main/resources/data/techreborn/recipes/crafting_table/parts/thick_neutron_reflector.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/parts/thick_neutron_reflector.json rename to src/main/resources/data/techreborn/recipes/crafting_table/parts/thick_neutron_reflector.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/parts/tungsten_grinding_head.json b/src/main/resources/data/techreborn/recipes/crafting_table/parts/tungsten_grinding_head.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/parts/tungsten_grinding_head.json rename to src/main/resources/data/techreborn/recipes/crafting_table/parts/tungsten_grinding_head.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/parts/water_coolant_cell_10k.json b/src/main/resources/data/techreborn/recipes/crafting_table/parts/water_coolant_cell_10k.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/parts/water_coolant_cell_10k.json rename to src/main/resources/data/techreborn/recipes/crafting_table/parts/water_coolant_cell_10k.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/parts/water_coolant_cell_30k.json b/src/main/resources/data/techreborn/recipes/crafting_table/parts/water_coolant_cell_30k.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/parts/water_coolant_cell_30k.json rename to src/main/resources/data/techreborn/recipes/crafting_table/parts/water_coolant_cell_30k.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/parts/water_coolant_cell_60k.json b/src/main/resources/data/techreborn/recipes/crafting_table/parts/water_coolant_cell_60k.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/parts/water_coolant_cell_60k.json rename to src/main/resources/data/techreborn/recipes/crafting_table/parts/water_coolant_cell_60k.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/scrap_box.json b/src/main/resources/data/techreborn/recipes/crafting_table/scrap_box.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/scrap_box.json rename to src/main/resources/data/techreborn/recipes/crafting_table/scrap_box.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/solar_panel/advanced_solar_panel.json b/src/main/resources/data/techreborn/recipes/crafting_table/solar_panel/advanced_solar_panel.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/solar_panel/advanced_solar_panel.json rename to src/main/resources/data/techreborn/recipes/crafting_table/solar_panel/advanced_solar_panel.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/solar_panel/advanced_solar_panel_alt.json b/src/main/resources/data/techreborn/recipes/crafting_table/solar_panel/advanced_solar_panel_alt.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/solar_panel/advanced_solar_panel_alt.json rename to src/main/resources/data/techreborn/recipes/crafting_table/solar_panel/advanced_solar_panel_alt.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/solar_panel/basic_solar_panel.json b/src/main/resources/data/techreborn/recipes/crafting_table/solar_panel/basic_solar_panel.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/solar_panel/basic_solar_panel.json rename to src/main/resources/data/techreborn/recipes/crafting_table/solar_panel/basic_solar_panel.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/solar_panel/industrial_solar_panel.json b/src/main/resources/data/techreborn/recipes/crafting_table/solar_panel/industrial_solar_panel.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/solar_panel/industrial_solar_panel.json rename to src/main/resources/data/techreborn/recipes/crafting_table/solar_panel/industrial_solar_panel.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/solar_panel/industrial_solar_panel_alt.json b/src/main/resources/data/techreborn/recipes/crafting_table/solar_panel/industrial_solar_panel_alt.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/solar_panel/industrial_solar_panel_alt.json rename to src/main/resources/data/techreborn/recipes/crafting_table/solar_panel/industrial_solar_panel_alt.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/solar_panel/quantum_solar_panel.json b/src/main/resources/data/techreborn/recipes/crafting_table/solar_panel/quantum_solar_panel.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/solar_panel/quantum_solar_panel.json rename to src/main/resources/data/techreborn/recipes/crafting_table/solar_panel/quantum_solar_panel.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/solar_panel/quantum_solar_panel_alt.json b/src/main/resources/data/techreborn/recipes/crafting_table/solar_panel/quantum_solar_panel_alt.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/solar_panel/quantum_solar_panel_alt.json rename to src/main/resources/data/techreborn/recipes/crafting_table/solar_panel/quantum_solar_panel_alt.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/solar_panel/ultimate_solar_panel.json b/src/main/resources/data/techreborn/recipes/crafting_table/solar_panel/ultimate_solar_panel.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/solar_panel/ultimate_solar_panel.json rename to src/main/resources/data/techreborn/recipes/crafting_table/solar_panel/ultimate_solar_panel.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/solar_panel/ultimate_solar_panel_alt.json b/src/main/resources/data/techreborn/recipes/crafting_table/solar_panel/ultimate_solar_panel_alt.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/solar_panel/ultimate_solar_panel_alt.json rename to src/main/resources/data/techreborn/recipes/crafting_table/solar_panel/ultimate_solar_panel_alt.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/storage_block/aluminum_storage_block.json b/src/main/resources/data/techreborn/recipes/crafting_table/storage_block/aluminum_storage_block.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/storage_block/aluminum_storage_block.json rename to src/main/resources/data/techreborn/recipes/crafting_table/storage_block/aluminum_storage_block.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/storage_block/brass_storage_block.json b/src/main/resources/data/techreborn/recipes/crafting_table/storage_block/brass_storage_block.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/storage_block/brass_storage_block.json rename to src/main/resources/data/techreborn/recipes/crafting_table/storage_block/brass_storage_block.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/storage_block/bronze_storage_block.json b/src/main/resources/data/techreborn/recipes/crafting_table/storage_block/bronze_storage_block.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/storage_block/bronze_storage_block.json rename to src/main/resources/data/techreborn/recipes/crafting_table/storage_block/bronze_storage_block.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/storage_block/chrome_storage_block.json b/src/main/resources/data/techreborn/recipes/crafting_table/storage_block/chrome_storage_block.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/storage_block/chrome_storage_block.json rename to src/main/resources/data/techreborn/recipes/crafting_table/storage_block/chrome_storage_block.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/storage_block/electrum_storage_block.json b/src/main/resources/data/techreborn/recipes/crafting_table/storage_block/electrum_storage_block.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/storage_block/electrum_storage_block.json rename to src/main/resources/data/techreborn/recipes/crafting_table/storage_block/electrum_storage_block.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/storage_block/invar_storage_block.json b/src/main/resources/data/techreborn/recipes/crafting_table/storage_block/invar_storage_block.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/storage_block/invar_storage_block.json rename to src/main/resources/data/techreborn/recipes/crafting_table/storage_block/invar_storage_block.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shapeless/iridium_reinforced_stone_storage_block.json b/src/main/resources/data/techreborn/recipes/crafting_table/storage_block/iridium_reinforced_stone_storage_block.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shapeless/iridium_reinforced_stone_storage_block.json rename to src/main/resources/data/techreborn/recipes/crafting_table/storage_block/iridium_reinforced_stone_storage_block.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shapeless/iridium_reinforced_tungstensteel_storage_block.json b/src/main/resources/data/techreborn/recipes/crafting_table/storage_block/iridium_reinforced_tungstensteel_storage_block.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shapeless/iridium_reinforced_tungstensteel_storage_block.json rename to src/main/resources/data/techreborn/recipes/crafting_table/storage_block/iridium_reinforced_tungstensteel_storage_block.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shapeless/iridium_reinforced_tungstensteel_storage_block_alt.json b/src/main/resources/data/techreborn/recipes/crafting_table/storage_block/iridium_reinforced_tungstensteel_storage_block_alt.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shapeless/iridium_reinforced_tungstensteel_storage_block_alt.json rename to src/main/resources/data/techreborn/recipes/crafting_table/storage_block/iridium_reinforced_tungstensteel_storage_block_alt.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/storage_block/iridium_storage_block.json b/src/main/resources/data/techreborn/recipes/crafting_table/storage_block/iridium_storage_block.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/storage_block/iridium_storage_block.json rename to src/main/resources/data/techreborn/recipes/crafting_table/storage_block/iridium_storage_block.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/storage_block/lead_storage_block.json b/src/main/resources/data/techreborn/recipes/crafting_table/storage_block/lead_storage_block.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/storage_block/lead_storage_block.json rename to src/main/resources/data/techreborn/recipes/crafting_table/storage_block/lead_storage_block.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/storage_block/nickel_storage_block.json b/src/main/resources/data/techreborn/recipes/crafting_table/storage_block/nickel_storage_block.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/storage_block/nickel_storage_block.json rename to src/main/resources/data/techreborn/recipes/crafting_table/storage_block/nickel_storage_block.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/storage_block/platinum_storage_block.json b/src/main/resources/data/techreborn/recipes/crafting_table/storage_block/platinum_storage_block.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/storage_block/platinum_storage_block.json rename to src/main/resources/data/techreborn/recipes/crafting_table/storage_block/platinum_storage_block.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/storage_block/silver_storage_block.json b/src/main/resources/data/techreborn/recipes/crafting_table/storage_block/silver_storage_block.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/storage_block/silver_storage_block.json rename to src/main/resources/data/techreborn/recipes/crafting_table/storage_block/silver_storage_block.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/storage_block/steel_storage_block.json b/src/main/resources/data/techreborn/recipes/crafting_table/storage_block/steel_storage_block.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/storage_block/steel_storage_block.json rename to src/main/resources/data/techreborn/recipes/crafting_table/storage_block/steel_storage_block.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/storage_block/titanium_storage_block.json b/src/main/resources/data/techreborn/recipes/crafting_table/storage_block/titanium_storage_block.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/storage_block/titanium_storage_block.json rename to src/main/resources/data/techreborn/recipes/crafting_table/storage_block/titanium_storage_block.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/storage_block/tungsten_storage_block.json b/src/main/resources/data/techreborn/recipes/crafting_table/storage_block/tungsten_storage_block.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/storage_block/tungsten_storage_block.json rename to src/main/resources/data/techreborn/recipes/crafting_table/storage_block/tungsten_storage_block.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/storage_block/zinc_storage_block.json b/src/main/resources/data/techreborn/recipes/crafting_table/storage_block/zinc_storage_block.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/storage_block/zinc_storage_block.json rename to src/main/resources/data/techreborn/recipes/crafting_table/storage_block/zinc_storage_block.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/advanced_chainsaw.json b/src/main/resources/data/techreborn/recipes/crafting_table/tool/advanced_chainsaw.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/advanced_chainsaw.json rename to src/main/resources/data/techreborn/recipes/crafting_table/tool/advanced_chainsaw.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/advanced_drill.json b/src/main/resources/data/techreborn/recipes/crafting_table/tool/advanced_drill.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/advanced_drill.json rename to src/main/resources/data/techreborn/recipes/crafting_table/tool/advanced_drill.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/advanced_jackhammer.json b/src/main/resources/data/techreborn/recipes/crafting_table/tool/advanced_jackhammer.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/advanced_jackhammer.json rename to src/main/resources/data/techreborn/recipes/crafting_table/tool/advanced_jackhammer.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/basic_chainsaw.json b/src/main/resources/data/techreborn/recipes/crafting_table/tool/basic_chainsaw.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/basic_chainsaw.json rename to src/main/resources/data/techreborn/recipes/crafting_table/tool/basic_chainsaw.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/basic_drill.json b/src/main/resources/data/techreborn/recipes/crafting_table/tool/basic_drill.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/basic_drill.json rename to src/main/resources/data/techreborn/recipes/crafting_table/tool/basic_drill.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/basic_jackhammer.json b/src/main/resources/data/techreborn/recipes/crafting_table/tool/basic_jackhammer.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/basic_jackhammer.json rename to src/main/resources/data/techreborn/recipes/crafting_table/tool/basic_jackhammer.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/electric_treetap.json b/src/main/resources/data/techreborn/recipes/crafting_table/tool/electric_treetap.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/electric_treetap.json rename to src/main/resources/data/techreborn/recipes/crafting_table/tool/electric_treetap.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/industrial_chainsaw.json b/src/main/resources/data/techreborn/recipes/crafting_table/tool/industrial_chainsaw.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/industrial_chainsaw.json rename to src/main/resources/data/techreborn/recipes/crafting_table/tool/industrial_chainsaw.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/industrial_drill.json b/src/main/resources/data/techreborn/recipes/crafting_table/tool/industrial_drill.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/industrial_drill.json rename to src/main/resources/data/techreborn/recipes/crafting_table/tool/industrial_drill.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/industrial_jackhammer.json b/src/main/resources/data/techreborn/recipes/crafting_table/tool/industrial_jackhammer.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/industrial_jackhammer.json rename to src/main/resources/data/techreborn/recipes/crafting_table/tool/industrial_jackhammer.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/nanosaber.json b/src/main/resources/data/techreborn/recipes/crafting_table/tool/nanosaber.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/nanosaber.json rename to src/main/resources/data/techreborn/recipes/crafting_table/tool/nanosaber.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/rock_cutter.json b/src/main/resources/data/techreborn/recipes/crafting_table/tool/rock_cutter.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/rock_cutter.json rename to src/main/resources/data/techreborn/recipes/crafting_table/tool/rock_cutter.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/treetap.json b/src/main/resources/data/techreborn/recipes/crafting_table/tool/treetap.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/treetap.json rename to src/main/resources/data/techreborn/recipes/crafting_table/tool/treetap.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/wrench.json b/src/main/resources/data/techreborn/recipes/crafting_table/tool/wrench.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/wrench.json rename to src/main/resources/data/techreborn/recipes/crafting_table/tool/wrench.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/energy_storage_upgrade.json b/src/main/resources/data/techreborn/recipes/crafting_table/upgrade/energy_storage_upgrade.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/energy_storage_upgrade.json rename to src/main/resources/data/techreborn/recipes/crafting_table/upgrade/energy_storage_upgrade.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/overclocker_upgrade.json b/src/main/resources/data/techreborn/recipes/crafting_table/upgrade/overclocker_upgrade.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/overclocker_upgrade.json rename to src/main/resources/data/techreborn/recipes/crafting_table/upgrade/overclocker_upgrade.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/overclocker_upgrade_alt.json b/src/main/resources/data/techreborn/recipes/crafting_table/upgrade/overclocker_upgrade_alt.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/overclocker_upgrade_alt.json rename to src/main/resources/data/techreborn/recipes/crafting_table/upgrade/overclocker_upgrade_alt.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/overclocker_upgrade_alt_alt.json b/src/main/resources/data/techreborn/recipes/crafting_table/upgrade/overclocker_upgrade_alt_alt.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/overclocker_upgrade_alt_alt.json rename to src/main/resources/data/techreborn/recipes/crafting_table/upgrade/overclocker_upgrade_alt_alt.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/superconductor_upgrade.json b/src/main/resources/data/techreborn/recipes/crafting_table/upgrade/superconductor_upgrade.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/superconductor_upgrade.json rename to src/main/resources/data/techreborn/recipes/crafting_table/upgrade/superconductor_upgrade.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/transformer_upgrade.json b/src/main/resources/data/techreborn/recipes/crafting_table/upgrade/transformer_upgrade.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/transformer_upgrade.json rename to src/main/resources/data/techreborn/recipes/crafting_table/upgrade/transformer_upgrade.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/uu_matter/aluminum_dust.json b/src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/aluminum_dust.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/uu_matter/aluminum_dust.json rename to src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/aluminum_dust.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/uu_matter/bone.json b/src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/bone.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/uu_matter/bone.json rename to src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/bone.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/uu_matter/cactus.json b/src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/cactus.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/uu_matter/cactus.json rename to src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/cactus.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/uu_matter/chrome_dust.json b/src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/chrome_dust.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/uu_matter/chrome_dust.json rename to src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/chrome_dust.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/uu_matter/clay.json b/src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/clay.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/uu_matter/clay.json rename to src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/clay.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/uu_matter/coal_ore.json b/src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/coal_ore.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/uu_matter/coal_ore.json rename to src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/coal_ore.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/uu_matter/cocoa_beans.json b/src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/cocoa_beans.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/uu_matter/cocoa_beans.json rename to src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/cocoa_beans.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/uu_matter/copper_dust.json b/src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/copper_dust.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/uu_matter/copper_dust.json rename to src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/copper_dust.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/uu_matter/diamond_ore.json b/src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/diamond_ore.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/uu_matter/diamond_ore.json rename to src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/diamond_ore.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/uu_matter/emerald_ore.json b/src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/emerald_ore.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/uu_matter/emerald_ore.json rename to src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/emerald_ore.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/uu_matter/ender_pearl.json b/src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/ender_pearl.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/uu_matter/ender_pearl.json rename to src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/ender_pearl.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/uu_matter/feather.json b/src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/feather.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/uu_matter/feather.json rename to src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/feather.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/uu_matter/glass.json b/src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/glass.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/uu_matter/glass.json rename to src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/glass.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/uu_matter/glowstone.json b/src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/glowstone.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/uu_matter/glowstone.json rename to src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/glowstone.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/uu_matter/gold_ore.json b/src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/gold_ore.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/uu_matter/gold_ore.json rename to src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/gold_ore.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/uu_matter/grass_block.json b/src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/grass_block.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/uu_matter/grass_block.json rename to src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/grass_block.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/uu_matter/gunpowder.json b/src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/gunpowder.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/uu_matter/gunpowder.json rename to src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/gunpowder.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/uu_matter/ink_sac.json b/src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/ink_sac.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/uu_matter/ink_sac.json rename to src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/ink_sac.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/uu_matter/iridium_ore.json b/src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/iridium_ore.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/uu_matter/iridium_ore.json rename to src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/iridium_ore.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/uu_matter/iron_ore.json b/src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/iron_ore.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/uu_matter/iron_ore.json rename to src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/iron_ore.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/uu_matter/lapis_ore.json b/src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/lapis_ore.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/uu_matter/lapis_ore.json rename to src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/lapis_ore.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/uu_matter/lead_dust.json b/src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/lead_dust.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/uu_matter/lead_dust.json rename to src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/lead_dust.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/uu_matter/lily_pad.json b/src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/lily_pad.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/uu_matter/lily_pad.json rename to src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/lily_pad.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/uu_matter/oak_wood.json b/src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/oak_wood.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/uu_matter/oak_wood.json rename to src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/oak_wood.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/uu_matter/obsidian.json b/src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/obsidian.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/uu_matter/obsidian.json rename to src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/obsidian.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/uu_matter/platinum_dust.json b/src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/platinum_dust.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/uu_matter/platinum_dust.json rename to src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/platinum_dust.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/uu_matter/redstone_ore.json b/src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/redstone_ore.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/uu_matter/redstone_ore.json rename to src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/redstone_ore.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/uu_matter/snow_block.json b/src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/snow_block.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/uu_matter/snow_block.json rename to src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/snow_block.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/uu_matter/stone.json b/src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/stone.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/uu_matter/stone.json rename to src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/stone.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/uu_matter/sugar_cane.json b/src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/sugar_cane.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/uu_matter/sugar_cane.json rename to src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/sugar_cane.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/uu_matter/tin_dust.json b/src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/tin_dust.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/uu_matter/tin_dust.json rename to src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/tin_dust.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/uu_matter/titanium_dust.json b/src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/titanium_dust.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/uu_matter/titanium_dust.json rename to src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/titanium_dust.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/uu_matter/tungsten_dust.json b/src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/tungsten_dust.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/uu_matter/tungsten_dust.json rename to src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/tungsten_dust.json diff --git a/src/main/resources/data/techreborn/recipes/crafting_shaped/uu_matter/vine.json b/src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/vine.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/crafting_shaped/uu_matter/vine.json rename to src/main/resources/data/techreborn/recipes/crafting_table/uu_matter/vine.json