mirrors/Create
0
0
Fork 0
mirror of https://github.com/Creators-of-Create/Create.git synced 2025-03-04 06:44:40 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'mc1.20.1/feature-dev' into mc1.21.1/dev

Browse source 
# Conflicts:
#	src/main/resources/data/create/structures/gametest/contraptions/arrow_dispenser.nbt
#	src/main/resources/data/create/structures/gametest/contraptions/controls.nbt
#	src/main/resources/data/create/structures/gametest/contraptions/crop_farming.nbt
#	src/main/resources/data/create/structures/gametest/contraptions/elevator.nbt
#	src/main/resources/data/create/structures/gametest/contraptions/mounted_fluid_drain.nbt
#	src/main/resources/data/create/structures/gametest/contraptions/mounted_item_extract.nbt
#	src/main/resources/data/create/structures/gametest/contraptions/ploughing.nbt
#	src/main/resources/data/create/structures/gametest/contraptions/redstone_contacts.nbt
#	src/main/resources/data/create/structures/gametest/contraptions/roller_filling.nbt
#	src/main/resources/data/create/structures/gametest/contraptions/roller_paving_and_clearing.nbt
#	src/main/resources/data/create/structures/gametest/contraptions/train_observer.nbt
#	src/main/resources/data/create/structures/gametest/fluids/3_pipe_combine.nbt
#	src/main/resources/data/create/structures/gametest/fluids/3_pipe_split.nbt
#	src/main/resources/data/create/structures/gametest/fluids/hose_pulley_transfer.nbt
#	src/main/resources/data/create/structures/gametest/fluids/in_world_pumping_in.nbt
#	src/main/resources/data/create/structures/gametest/fluids/in_world_pumping_out.nbt
#	src/main/resources/data/create/structures/gametest/fluids/large_waterwheel.nbt
#	src/main/resources/data/create/structures/gametest/fluids/small_waterwheel.nbt
#	src/main/resources/data/create/structures/gametest/fluids/smart_observer_pipes.nbt
#	src/main/resources/data/create/structures/gametest/fluids/steam_engine.nbt
#	src/main/resources/data/create/structures/gametest/fluids/waterwheel_materials.nbt
#	src/main/resources/data/create/structures/gametest/items/andesite_tunnel_split.nbt
#	src/main/resources/data/create/structures/gametest/items/arm_purgatory.nbt
#	src/main/resources/data/create/structures/gametest/items/attribute_filters.nbt
#	src/main/resources/data/create/structures/gametest/items/belt_coaster.nbt
#	src/main/resources/data/create/structures/gametest/items/brass_tunnel_filtering.nbt
#	src/main/resources/data/create/structures/gametest/items/brass_tunnel_prefer_nearest.nbt
#	src/main/resources/data/create/structures/gametest/items/brass_tunnel_round_robin.nbt
#	src/main/resources/data/create/structures/gametest/items/brass_tunnel_single_split.nbt
#	src/main/resources/data/create/structures/gametest/items/brass_tunnel_split.nbt
#	src/main/resources/data/create/structures/gametest/items/brass_tunnel_sync_input.nbt
#	src/main/resources/data/create/structures/gametest/items/depot_display.nbt
#	src/main/resources/data/create/structures/gametest/items/smart_observer_belt_and_funnel.nbt
#	src/main/resources/data/create/structures/gametest/items/smart_observer_chutes.nbt
#	src/main/resources/data/create/structures/gametest/items/smart_observer_counting.nbt
#	src/main/resources/data/create/structures/gametest/items/smart_observer_filtered_storage.nbt
#	src/main/resources/data/create/structures/gametest/items/smart_observer_storage.nbt
#	src/main/resources/data/create/structures/gametest/items/storages.nbt
#	src/main/resources/data/create/structures/gametest/items/threshold_switch.nbt
#	src/main/resources/data/create/structures/gametest/items/vault_comparator_output.nbt
#	src/main/resources/data/create/structures/gametest/misc/netherite_backtank.nbt
#	src/main/resources/data/create/structures/gametest/misc/schematicannon.nbt
#	src/main/resources/data/create/structures/gametest/misc/shearing.nbt
#	src/main/resources/data/create/structures/gametest/misc/smart_observer_blocks.nbt
#	src/main/resources/data/create/structures/gametest/misc/threshold_switch_pulley.nbt
#	src/main/resources/data/create/structures/gametest/processing/brass_mixing.nbt
#	src/main/resources/data/create/structures/gametest/processing/brass_mixing_2.nbt
#	src/main/resources/data/create/structures/gametest/processing/crushing_wheel_crafting.nbt
#	src/main/resources/data/create/structures/gametest/processing/iron_compacting.nbt
#	src/main/resources/data/create/structures/gametest/processing/precision_mechanism_crafting.nbt
#	src/main/resources/data/create/structures/gametest/processing/sand_washing.nbt
#	src/main/resources/data/create/structures/gametest/processing/stone_cobble_sand_crushing.nbt
#	src/main/resources/data/create/structures/gametest/processing/track_crafting.nbt
#	src/main/resources/data/create/structures/gametest/processing/water_filling_bottle.nbt
#	src/main/resources/data/create/structures/gametest/processing/wheat_milling.nbt
This commit is contained in:
IThundxr 2025-01-17 22:49:18 -05:00
commit 531a5725eb
Failed to generate hash of commit
Show stats Download patch file Download diff file Expand all files Collapse all files

Diff content is not available