Merge branch 'master' into 1.15

# Conflicts:
#	src/main/java/carpet/mixins/MinecraftServer_tickspeedMixin.java
#	src/main/resources/carpet.mixins.json

src/main/resources/carpet.mixins.json

@@ -154,7 +154,8 @@
     "IntegratedServerMixin",
     "InGameHudMixin",
     "PlayerListHudMixin",
-    "PistonBlockEntityRenderer_movableTEMixin"
+    "PistonBlockEntityRenderer_movableTEMixin",
+    "ClientPlayNetworkHandler_smoothClientAnimationsMixin"
   ],
   "server": [
     "MinecraftDedicatedServerMixin"

src/main/resources/fabric.mod.json

@@ -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",