resolve merge conflicts

This commit is contained in:
dfsek committed 2021-05-28 14:50:24 -07:00
1 parent 94611913c3
commit cba3388cb1
10 files changed
+63 -38

No files matched your search

@@ -4,7 +4,7 @@
"package": "com.dfsek.terra.fabric.mixin",
"compatibilityLevel": "JAVA_8",
"mixins": [
"StructureAccessorAccessor"
"StructureAccessorAccessor",
"CommandManagerMixin",
"GeneratorOptionsMixin",
"ServerWorldMixin",