Merge remote-tracking branch 'origin/voxel-shape-refactor' into voxel-shape-refactor

Browse source

# Conflicts:
#	src/main/java/com/simibubi/create/foundation/utility/AllShapes.java

...

This commit is contained in:

Zelophed 2019-12-10 18:05:34 +01:00

parent ac3f2ba85c 7a96a8b7ed

commit 69eae7fd75

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