Merge branch 'master' into 1.15

# Conflicts:
#	src/main/java/carpet/mixins/MinecraftServer_tickspeedMixin.java
#	src/main/resources/carpet.mixins.json
This commit is contained in:
gnembon committed 2020-01-03 00:16:46 -04:00
commit 8bcb433f72
7 files changed
+147 -27

No files matched your search

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