Merge branch 'basic_systems'
# Conflicts: # src/main/java/carpet/commands/SpawnCommand.java # src/main/java/carpet/helpers/CtrlQCrafting.javax # src/main/java/carpet/utils/HUDController.java # src/main/java/carpet/utils/SpawnReporter.java # src/main/resources/carpet.mixins.json
This commit is contained in:
commit
5109263fd8
48 files changed
+6071
-54
No files matched your search
@@ -26,8 +26,7 @@
|
||||
],
|
||||
|
||||
"requires": {
|
||||
"fabricloader": ">=0.4.0",
|
||||
"fabric": "*"
|
||||
"fabricloader": ">=0.4.0"
|
||||
},
|
||||
"suggests": {
|
||||
"flamingo": "*"
|
||||
|
||||
Reference in new issue
Block a user