Merge branch 'master' into 1.15

# Conflicts:
#	src/main/java/carpet/mixins/PistonHandler_movableTEMixin.java
This commit is contained in:
gnembon committed 2019-10-16 09:40:36 -03:00
commit 6018f680b4
4 files changed
+7 -7

No files matched your search

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