Merge remote-tracking branch 'origin/mc1.18/dev' into mc1.18/dev

Browse source

# Conflicts:
#	build.gradle
#	src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/ContraptionWorld.java
#	src/main/java/com/simibubi/create/foundation/utility/worldWrappers/PlacementSimulationWorld.java

...

This commit is contained in:

Aeiou 2021-12-20 17:03:06 -05:00

parent e6c99b250e af6ad4b70b

commit 5015412043

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show stats Download patch file Download diff file Expand all files Collapse all files

Diff content is not available