Merge branch 'master' into 1.15

# Conflicts:
#	src/main/java/carpet/mixins/ServerPlayerInteractionManager_ghostBlocksMixin.java
#	src/main/resources/fabric.mod.json

src/main/resources/fabric.mod.json

@@ -27,7 +27,7 @@
 
   "depends": {
     "minecraft": "1.15.x",
-    "fabricloader": ">=0.4.0"
+    "fabricloader": ">=0.7.1"
   },
   "suggests": {
     "flamingo": "*"