Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added some block variants for plated blocks #83

Merged
merged 7 commits into from
Sep 15, 2024
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge branch '1.21' into deco
  • Loading branch information
jshipley committed Aug 26, 2024
commit bc9dc36909ae195b63dc7ed97805b71697c4b66e
101 changes: 45 additions & 56 deletions src/main/generated/data/minecraft/tags/block/mineable/pickaxe.json
Original file line number Diff line number Diff line change
@@ -1,77 +1,66 @@
{
"values": [
"oritech:machine_frame_block",
"oritech:laser_arm_block",
"oritech:ceiling_light",
"oritech:banana_block",
"oritech:atomic_forge_block",
"oritech:fluid_pipe",
"oritech:tech_lever",
"oritech:steam_boiler_addon",
"oritech:tech_door",
"oritech:machine_core_3",
"oritech:machine_capacitor_addon",
"oritech:machine_core_7",
"oritech:placer_block",
"oritech:nickel_plating_slab",
"oritech:nickel_plating_block",
"oritech:machine_acceptor_addon",
"oritech:lava_generator_block",
"oritech:item_filter_block",
"oritech:fluid_pipe",
"oritech:treefeller_block",
"oritech:machine_plating_slab",
"oritech:fragment_forge_block",
"oritech:machine_inventory_proxy_addon",
"oritech:caution_block",
"oritech:machine_core_1",
"oritech:capacitor_addon_extender",
"oritech:basic_generator_block",
"oritech:machine_core_4",
"oritech:big_solar_panel_block",
"oritech:machine_frame_block",
"oritech:quarry_addon",
"oritech:placer_block",
"oritech:banana_block",
"oritech:machine_extender",
"oritech:big_solar_panel_block",
"oritech:spawner_controller_block",
"oritech:steam_engine_block",
"oritech:bio_generator_block",
"oritech:enchantment_catalyst_block",
"oritech:centrifuge_block",
"oritech:machine_redstone_addon",
"oritech:ceiling_light_hanging",
"oritech:machine_plating_pressure_plate",
"oritech:pulverizer_block",
"oritech:nickel_plating_block",
"oritech:industrial_glass_block",
"oritech:energy_pipe",
"oritech:item_filter_block",
"oritech:fragment_forge_block",
"oritech:drone_port_block",
"oritech:tech_button",
"oritech:machine_acceptor_addon",
"oritech:machine_yield_addon",
"oritech:treefeller_block",
"oritech:machine_core_5",
"oritech:metal_beam_block",
"oritech:fuel_generator_block",
"oritech:large_storage_block",
"oritech:machine_inventory_proxy_addon",
"oritech:ceiling_light_hanging",
"oritech:fertilizer_block",
"oritech:machine_core_7",
"oritech:machine_plating_block",
"oritech:laser_arm_block",
"oritech:iron_plating_block",
"oritech:machine_plating_button",
"oritech:lava_generator_block",
"oritech:foundry_block",
"oritech:basic_generator_block",
"oritech:pump_block",
"oritech:destroyer_block",
"oritech:powered_furnace_block",
"oritech:item_pipe",
"oritech:machine_speed_addon",
"oritech:bio_generator_block",
"oritech:large_storage_block",
"oritech:machine_efficiency_addon",
"oritech:steam_boiler_addon",
"oritech:machine_plating_trapdoor",
"oritech:centrifuge_block",
"oritech:drone_port_block",
"oritech:destroyer_block",
"oritech:industrial_glass_block",
"oritech:deep_drill_block",
"oritech:crop_filter_addon",
"oritech:tech_button",
"oritech:iron_plating_stairs",
"oritech:machine_core_2",
"oritech:pump_block",
"oritech:iron_plating_slab",
"oritech:steam_engine_block",
"oritech:quarry_addon",
"oritech:energy_pipe",
"oritech:nickel_plating_stairs",
"oritech:tech_lever",
"oritech:machine_plating_wall",
"oritech:pulverizer_block",
"oritech:machine_plating_block",
"oritech:machine_plating_stairs",
"oritech:item_pipe",
"oritech:deep_drill_block",
"oritech:assembler_block",
"oritech:fertilizer_block",
"oritech:metal_beam_block",
"oritech:machine_core_6",
"oritech:machine_plating_door",
"oritech:powered_furnace_block",
"oritech:foundry_block",
"oritech:machine_core_1",
"oritech:machine_core_5",
"oritech:machine_fluid_addon",
"oritech:atomic_forge_block",
"oritech:enchanter_block",
"oritech:ceiling_light",
"oritech:machine_core_6",
"oritech:machine_core_4",
"oritech:machine_core_3",
"oritech:energy_pipe_connection",
"oritech:fluid_pipe_connection",
"oritech:item_pipe_connection",
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.