# Conflicts:
#	README.md
#	build.gradle
#	gradle.properties
#	src/generated/resources/.cache/cache
#	src/main/java/com/simibubi/create/compat/curios/Curios.java
#	src/main/java/com/simibubi/create/content/contraptions/actors/seat/SeatBlock.java
#	src/main/java/com/simibubi/create/content/decoration/copycat/CopycatPanelModel.java
#	src/main/java/com/simibubi/create/content/equipment/armor/BacktankUtil.java
#	src/main/java/com/simibubi/create/content/equipment/armor/DivingHelmetItem.java
#	src/main/java/com/simibubi/create/content/equipment/armor/RemainingAirOverlay.java
#	src/main/java/com/simibubi/create/content/kinetics/belt/BeltBlockEntity.java
#	src/main/java/com/simibubi/create/content/processing/basin/BasinBlockEntity.java
#	src/main/java/com/simibubi/create/content/schematics/client/SchematicRenderer.java
#	src/main/java/com/simibubi/create/content/trains/bogey/BogeyRenderer.java
#	src/main/java/com/simibubi/create/content/trains/track/TrackPlacementOverlay.java
#	src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/filtering/FilteringBehaviour.java
#	src/main/java/com/simibubi/create/foundation/ponder/element/WorldSectionElement.java