Merge branch 'master' into 1.16

# Conflicts:
#	src/main/java/carpet/script/CarpetExpression.java
This commit is contained in:
gnembon committed 2020-07-01 14:54:04 -03:00
commit c69f65e68e
8 files changed
+48 -8

No files matched your search

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