36cf52aa6c
# Conflicts: # src/generated/resources/.cache/9047e4e94996e73e9dfde3738763637fb609e07e # src/generated/resources/data/create/tags/blocks/casing.json # src/generated/resources/data/create/tags/blocks/fan_transparent.json # src/generated/resources/data/create/tags/blocks/safe_nbt.json # src/generated/resources/data/create/tags/blocks/wrench_pickup.json # src/generated/resources/data/create/tags/items/casing.json # src/generated/resources/data/create/tags/items/contraption_controlled.json # src/generated/resources/data/create/tags/items/create_ingots.json # src/generated/resources/data/forge/tags/blocks/concrete.json # src/generated/resources/data/forge/tags/blocks/factory_floor.json # src/generated/resources/data/forge/tags/blocks/rebar_concrete.json # src/generated/resources/data/forge/tags/blocks/storage_blocks.json # src/generated/resources/data/forge/tags/blocks/storage_blocks/aluminum.json # src/generated/resources/data/forge/tags/blocks/storage_blocks/cast_iron.json # src/generated/resources/data/forge/tags/blocks/storage_blocks/steel.json # src/generated/resources/data/forge/tags/items/buckets/diesel.json # src/generated/resources/data/forge/tags/items/buckets/gasoline.json # src/generated/resources/data/forge/tags/items/buckets/kerosene.json # src/generated/resources/data/forge/tags/items/buckets/napalm.json # src/generated/resources/data/forge/tags/items/buckets/naphtha.json # src/generated/resources/data/forge/tags/items/buckets/plastic.json # src/generated/resources/data/forge/tags/items/concrete.json # src/generated/resources/data/forge/tags/items/dusts/coal_coke.json # src/generated/resources/data/forge/tags/items/factory_floor.json # src/generated/resources/data/forge/tags/items/ingots/aluminum.json # src/generated/resources/data/forge/tags/items/ingots/cast_iron.json # src/generated/resources/data/forge/tags/items/ingots/steel.json # src/generated/resources/data/forge/tags/items/rebar_concrete.json # src/generated/resources/data/forge/tags/items/storage_blocks.json # src/generated/resources/data/forge/tags/items/storage_blocks/aluminum.json # src/generated/resources/data/forge/tags/items/storage_blocks/cast_iron.json # src/generated/resources/data/forge/tags/items/storage_blocks/steel.json # src/generated/resources/data/minecraft/tags/blocks/azalea_root_replaceable.json # src/generated/resources/data/minecraft/tags/blocks/beacon_base_blocks.json # src/generated/resources/data/minecraft/tags/blocks/climbable.json # src/generated/resources/data/minecraft/tags/blocks/doors.json # src/generated/resources/data/minecraft/tags/blocks/dripstone_replaceable_blocks.json # src/generated/resources/data/minecraft/tags/blocks/lush_ground_replaceable.json # src/generated/resources/data/minecraft/tags/blocks/mineable/axe.json # src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json # src/generated/resources/data/minecraft/tags/blocks/moss_replaceable.json # src/generated/resources/data/minecraft/tags/blocks/needs_diamond_tool.json # src/generated/resources/data/minecraft/tags/blocks/needs_iron_tool.json # src/generated/resources/data/minecraft/tags/blocks/needs_stone_tool.json # src/generated/resources/data/minecraft/tags/blocks/slabs.json # src/generated/resources/data/minecraft/tags/blocks/stairs.json # src/generated/resources/data/minecraft/tags/blocks/walls.json # src/generated/resources/data/minecraft/tags/blocks/wooden_doors.json # src/generated/resources/data/minecraft/tags/items/doors.json # src/generated/resources/data/minecraft/tags/items/slabs.json # src/generated/resources/data/minecraft/tags/items/stairs.json # src/generated/resources/data/minecraft/tags/items/walls.json # src/generated/resources/data/quark/tags/blocks/non_double_door.json # src/main/resources/data/createindustry/recipes/coking/test_coking.json # src/main/resources/data/createindustry/recipes/coking/test_coking_aaaaa.json # src/main/resources/data/createindustry/recipes/distillation/naphtha.json # src/main/resources/data/createindustry/recipes/industrial_blasting/test_blast.json # src/main/resources/data/createindustry/recipes/industrial_blasting/test_blasting_aaaaa.json
no README yet :( say gex