mirror of
https://github.com/PolyhedralDev/Terra.git
synced 2026-10-25 21:40:08 +00:00
resolve merge conflicts
This commit is contained in:
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",
|
||||
|
||||
Reference in new issue
Block a user