Merge branch 'master' into 987-dlc2-learnset

Author: Naramsim

Makefile

@@ -1,7 +1,6 @@
 veekun_pokedex_repository = ../pokedex
 local_config = --settings=config.local
 docker_config = --settings=config.docker-compose
-HASURA_GRAPHQL_ADMIN_SECRET=pokemon
 
 .PHONY: help
 .SILENT:
@@ -148,5 +147,5 @@ update-graphql-data-prod:
 	sync; echo 3 > /proc/sys/vm/drop_caches
 	docker compose exec -T web sh -c 'rm -rf /tmp/cache/*'
 	docker compose start graphql-engine
-	sleep 30
+	sleep 120
 	make hasura-apply

data/v2/csv/move_names.csv

@@ -8499,10 +8499,26 @@ move_id,local_language_id,name
 874,8,Corsa all'Oro
 874,9,Make It Rain
 874,11,ゴールドラッシュ
-875,8,Botta
+875,1,サイコブレイド 
+875,3,사이코블레이드
+875,4,精神劍
+875,5,Lame Psychique
+875,6,Psychoschneide
+875,7,Psicohojas
+875,8,Psicolama
 875,9,Psyblade
-876,8,Botta
+875,11,サイコブレイド 
+875,12,精神剑
+876,1,ハイドロスチーム
+876,3,하이드로스팀
+876,4,水蒸氣
+876,5,Hydrovapeur
+876,6,Hydrodampf
+876,7,Hidrovapor
+876,8,Idrovapore
 876,9,Hydro Steam
+876,11,ハイドロスチーム
+876,12,水蒸气
 877,1,カタストロフィ
 877,4,大灾难
 877,8,Catastrofe

data/v2/csv/pokedex_version_groups.csv

@@ -7,6 +7,7 @@ pokedex_id,version_group_id
 4,5
 4,6
 5,8
+5,23
 6,9
 7,10
 8,11
@@ -28,6 +29,8 @@ pokedex_id,version_group_id
 26,19
 27,20
 28,20
+28,21
+29,22
 29,20
 30,24
 31,25

data/v2/csv/pokemon_abilities_past.csv

@@ -4,9 +4,15 @@ pokemon_id,generation_id,ability_id,is_hidden,slot
 243,6,10,1,3
 244,6,18,1,3
 245,6,11,1,3
+275,8,34,0,2
+393,8,172,1,3
+394,8,172,1,3
+395,8,172,1,3
+475,8,80,0,2
 543,5,95,1,3
 544,5,95,1,3
 545,5,95,1,3
 607,5,23,1,3
 608,5,23,1,3
-609,5,23,1,3
+609,5,23,1,3
+10016,5,69,0,1

data/v2/csv/pokemon_dex_numbers.csv

@@ -5810,11 +5810,11 @@
 641,1,641
 641,8,147
 641,9,198
-641,30,232
+641,30,231
 642,1,642
 642,8,148
 642,9,199
-642,30,231
+642,30,232
 643,1,643
 643,8,149
 643,9,295