Merge branch 'master' into feature/lgpe-encounter-data

Author: DJ-Meyers

data/v2/csv/pokemon_abilities.csv

@@ -2267,9 +2267,7 @@ pokemon_id,ability_id,is_hidden,slot
 947,274,0,1
 947,151,1,3
 948,298,0,1
-948,298,1,3
 949,298,0,1
-949,298,1,3
 950,271,0,1
 950,75,0,2
 950,144,1,3
@@ -2308,9 +2306,7 @@ pokemon_id,ability_id,is_hidden,slot
 962,51,0,2
 962,276,1,3
 963,41,0,1
-963,41,1,3
 964,278,0,1
-964,278,1,3
 965,142,0,1
 965,112,1,3
 966,142,0,1
@@ -2875,7 +2871,6 @@ pokemon_id,ability_id,is_hidden,slot
 10255,50,0,2
 10255,155,1,3
 10256,278,0,1
-10256,278,1,3
 10257,132,0,1
 10257,167,0,2
 10257,101,1,3
@@ -2893,26 +2888,17 @@ pokemon_id,ability_id,is_hidden,slot
 10262,55,0,2
 10262,125,1,3
 10263,50,0,1
-10263,50,1,3
 10264,288,0,1
-10264,288,1,3
 10265,288,0,1
-10265,288,1,3
 10266,288,0,1
-10266,288,1,3
 10267,288,0,1
-10267,288,1,3
 10268,289,0,1
-10268,289,1,3
 10269,289,0,1
-10269,289,1,3
 10270,289,0,1
-10270,289,1,3
 10271,289,0,1
-10271,289,1,3
 10272,299,0,1
 10273,11,0,1
 10274,104,0,1
 10275,5,0,1
 10276,305,0,1
-10277,306,0,1
+10277,306,0,1