Merge branch 'dev/feature' into dev/resource-packs

src/main/resources/lang/default.lang

@@ -2244,11 +2244,13 @@ environments:
 	the_end: end, the end
 	custom: custom
 
-
+# -- Entity Potion Causes --
 entity potion causes:
 	area_effect_cloud: enter area effect cloud
 	arrow: arrow infliction
 	attack: attack
+	axolotl: axolotl
+	warden: warden
 	beacon: beacon effect
 	command: command
 	conduit: conduit effect
@@ -2352,6 +2354,7 @@ types:
 	biome: biome¦s @a
 	potioneffecttype: potion effect type¦s @a
 	potioneffect: potion effect¦s @a
+	entitypotioncause: entity potion cause¦s @an
 	enchantment: enchantment¦s @an
 	damagecause: damage cause¦s @a
 	teleportcause: teleport cause¦s @a