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:
gnembon committed 2019-05-13 01:51:36 -03:00
commit 5109263fd8
48 files changed
+6071 -54

No files matched your search

+1 -2
View File
@@ -26,8 +26,7 @@
],
"requires": {
"fabricloader": ">=0.4.0",
"fabric": "*"
"fabricloader": ">=0.4.0"
},
"suggests": {
"flamingo": "*"