Merge remote-tracking branch 'origin/main' · MaxenceDC/sparsestructures@ff3eb2b · GitHub

Commit

Merge remote-tracking branch 'origin/main'

Browse files

# Conflicts:
#	src/main/java/io/github/maxencedc/sparsestructures/CustomSpreadFactors.java
#	src/main/java/io/github/maxencedc/sparsestructures/mixins/SparseStructuresRegistryLoaderMixin.java
#	src/main/resources/fabric.mod.json

Loading branch information

MaxenceDC committed Nov 9, 2023

2 parents f6864cd + 1cc9d5e commit ff3eb2b