Further potion fixes to match expression

Author: TheBentoBox

combat.sk

@@ -6,7 +6,7 @@ update aquatic:
 	{update aquatic effects):
 		turtle master = - {"Potion": "minecraft:turtle_master"}
 		(long|extended) turtle master = - {"Potion": "minecraft:long_turtle_master"}
-		(strong|tier (2|II)) turtle master = - {"Potion": "minecraft:strong_turtle_master"}
+		(strong|upgraded|level 2) turtle master = - {"Potion": "minecraft:strong_turtle_master"}
 		slow fall[ing] = - {"Potion": "minecraft:slow_falling"}
 		(long|extended) slow fall[ing] = - {"Potion": "minecraft:long_slow_falling"}
 
@@ -28,30 +28,30 @@ combat update:
 		(long|extended) invisibility = - {"Potion": "minecraft:long_invisibility"}
 		leaping = - {"Potion": "minecraft:leaping"}
 		(long|extended) leaping = - {"Potion": "minecraft:long_leaping"}
-		(strong|tier (2|II)) leaping = - {"Potion": "minecraft:strong_leaping"}
+		(strong|upgraded|level 2) leaping = - {"Potion": "minecraft:strong_leaping"}
 		fire resistance = - {"Potion": "minecraft:fire_resistance"}
 		(long|extended) fire resistance = - {"Potion": "minecraft:long_fire_resistance"}
 		(swiftness|speed) = - {"Potion": "minecraft:swiftness"}
 		(long|extended) (swiftness|speed) = - {"Potion": "minecraft:long_swiftness"}
-		(strong|tier (2|II)) (swiftness|speed) = - {"Potion": "minecraft:strong_swiftness"}
+		(strong|upgraded|level 2) (swiftness|speed) = - {"Potion": "minecraft:strong_swiftness"}
 		slowness = - {"Potion": "minecraft:slowness"}
 		(long|extended) slowness = - {"Potion": "minecraft:long_slowness"}
-		(strong|tier (2|II)) slowness = - {"Potion": "minecraft:strong_slowness"}
+		(strong|upgraded|level 2) slowness = - {"Potion": "minecraft:strong_slowness"}
 		water breathing = - {"Potion": "minecraft:water_breathing"}
 		(long|extended) water breathing = - {"Potion": "minecraft:long_water_breathing"}
 		(healing|instant health) = - {"Potion": "minecraft:healing"}
-		(strong|tier (2|II)) (healing|instant health) = - {"Potion": "minecraft:strong_healing"}
+		(strong|upgraded|level 2) (healing|instant health) = - {"Potion": "minecraft:strong_healing"}
 		[instant] (harming|damage) = - {"Potion": "minecraft:harming"}
-		(strong|tier (2|II)) [instant] (harming|damage) = - {"Potion": "minecraft:strong_harming"}
+		(strong|upgraded|level 2) [instant] (harming|damage) = - {"Potion": "minecraft:strong_harming"}
 		poison = - {"Potion": "minecraft:poison"}
 		(long|extended) poison = - {"Potion": "minecraft:long_poison"}
-		(strong|tier (2|II)) poison = - {"Potion": "minecraft:strong_poison"}
+		(strong|upgraded|level 2) poison = - {"Potion": "minecraft:strong_poison"}
 		regen[eration] = - {"Potion": "minecraft:regeneration"}
 		(long|extended) regen[eration] = - {"Potion": "minecraft:long_regeneration"}
-		(strong|tier (2|II)) regen[eration] = - {"Potion": "minecraft:strong_regeneration"}
+		(strong|upgraded|level 2) regen[eration] = - {"Potion": "minecraft:strong_regeneration"}
 		strength = - {"Potion": "minecraft:strength"}
 		(long|extended) strength = - {"Potion": "minecraft:long_strength"}
-		(strong|tier (2|II)) strength = - {"Potion": "minecraft:strong_strength"}
+		(strong|upgraded|level 2) strength = - {"Potion": "minecraft:strong_strength"}
 		weakness = - {"Potion": "minecraft:weakness"}
 		(long|extended) weakness = - {"Potion": "minecraft:long_weakness"}
 		luck = - {"Potion": "minecraft:luck"}