Merge branch 'master' into 1.17

src/main/java/carpet/CarpetSettings.java

@@ -864,7 +864,7 @@ public class CarpetSettings
 
     @Rule(
             desc = "Lightning kills the items that drop when lightning kills an entity",
-            extra = {"Setting to true will prevent lightning from killing drops", "Fixes (https://bugs.mojang.com/browse/MC-195640)."},
+            extra = {"Setting to true will prevent lightning from killing drops", "Fixes [MC-206922](https://bugs.mojang.com/browse/MC-206922)."},
             category = {BUGFIX}
     )
     public static boolean lightningKillsDropsFix = false;