Merge remote-tracking branch 'upstream/master'

Makefile

@@ -119,7 +119,12 @@ k8s-build-db:  # (k8s) Build the database
 k8s-delete:  # (k8s) Delete pokeapi namespace
 	kubectl delete namespace pokeapi
 
-update-graphql-prod:
+start-graphql-prod:
+	git pull origin master
+	git submodule update --init
+	docker-compose -f docker-compose.yml -f docker-compose.override.yml -f Resources/compose/docker-compose-prod-graphql.yml up -d
+
+update-graphql-data-prod:
 	git pull origin master
 	git submodule update --init
 	docker stop pokeapi_graphql-engine_1

data/v2/csv/generations.csv

@@ -7,4 +7,4 @@ id,main_region_id,identifier
 6,6,generation-vi
 7,7,generation-vii
 8,8,generation-viii
-9,9,generation-ix
+9,10,generation-ix

data/v2/csv/move_meta.csv

@@ -251,7 +251,7 @@ move_id,meta_category_id,meta_ailment_id,min_hits,max_hits,min_turns,max_turns,d
 250,4,8,,,5,6,0,0,0,100,0,0
 251,0,0,6,6,,,0,0,0,0,0,0
 252,0,0,,,,,0,0,0,0,100,0
-253,0,0,,,,,0,0,0,0,0,0
+253,0,0,,,3,3,0,0,0,0,0,0
 254,13,0,,,,,0,0,0,0,0,0
 255,0,0,,,,,0,0,0,0,0,0
 256,3,0,,,,,0,25,0,0,0,0

data/v2/csv/pokedex_prose.csv

@@ -58,3 +58,4 @@ pokedex_id,local_language_id,name,description
 28,9,Isle of Armor,Isle of Armor dex
 29,9,Crown Tundra,Crown Tundra dex
 30,9,Hisui,Hisui dex
+31,9,Paldea,Paldea dex

data/v2/csv/pokedex_version_groups.csv

@@ -29,3 +29,5 @@ pokedex_id,version_group_id
 27,20
 28,20
 29,20
+30,24
+31,25

data/v2/csv/pokedexes.csv

@@ -28,3 +28,4 @@ id,region_id,identifier,is_main_series
 28,8,isle-of-armor,1
 29,8,crown-tundra,1
 30,9,hisui,1
+31,10,paldea,1

data/v2/csv/version_group_regions.csv

@@ -24,3 +24,4 @@ version_group_id,region_id
 22,8
 23,4
 24,9
+25,10

data/v2/csv/version_names.csv

@@ -346,3 +346,21 @@ version_id,local_language_id,name
 39,8,Leggende: Arceus
 39,9,Legends: Arceus
 39,12,传说 阿尔宙斯
+40,1,スカーレット
+40,3,스칼렛
+40,4,朱
+40,5,Écarlate
+40,6,Karmesin
+40,7,Escarlata
+40,8,Scarlatto
+40,9,Scarlet
+40,12,朱
+41,1,バイオレット
+41,3,바이올렛
+41,4,紫
+41,5,Violet
+41,6,Purpur
+41,7,Púrpura
+41,8,Violetto
+41,9,Violet
+41,12,紫

data/v2/csv/versions.csv

@@ -38,3 +38,5 @@ id,version_group_id,identifier
 37,23,brilliant-diamond
 38,23,shining-pearl
 39,24,legends-arceus
+40,25,scarlet
+41,25,violet