Merge branch 'master' into 1.17

# Conflicts:
#	src/main/java/carpet/utils/WoolTool.java
This commit is contained in:
gnembon committed 2021-04-15 14:49:17 -03:00
commit 0dd88cd1dc
8 files changed
+327 -68

No files matched your search

+2 -4
View File
@@ -3,13 +3,14 @@
"id": "carpet",
"version": "${version}",
"name": "Carpet Mod in Fabric",
"name": "Carpet Mod",
"description": "Carpet made out of fabric",
"authors": [
"gnembon, ..."
],
"contact": {
"homepage": "https://github.com/gnembon/fabric-carpet",
"issues": "https://github.com/gnembon/fabric-carpet/issues",
"sources": "https://github.com/gnembon/fabric-carpet"
},
@@ -33,8 +34,5 @@
"depends": {
"minecraft": "1.17.x",
"fabricloader": ">=0.7.1"
},
"suggests": {
"flamingo": "*"
}
}