Merge branch 'master' into 1.15

# Conflicts:
#	gradle.properties
This commit is contained in:
gnembon committed 2019-11-13 14:03:52 -04:00
commit 29fa86ca8a
3 files changed
+3 -3

No files matched your search

+1 -1
View File
@@ -1,7 +1,7 @@
{
"schemaVersion": 1,
"id": "carpet",
"version": "1.2.2",
"version": "1.2.3",
"name": "Carpet Mod in Fabric",
"description": "Carpet made out of fabric",