From fcb0d0da5120549a3cc95e513e75dfaed9e742e2 Mon Sep 17 00:00:00 2001 From: YozoraXCII <96386153+YozoraXCII@users.noreply.github.com> Date: Wed, 3 Jan 2024 13:26:52 +0000 Subject: [PATCH 1/2] [74] [Content Ratings] Fix values being addons of themselves --- VERSION | 2 +- defaults/both/content_rating_mal.yml | 3 --- defaults/both/content_rating_uk.yml | 4 ---- 3 files changed, 1 insertion(+), 8 deletions(-) diff --git a/VERSION b/VERSION index f2f8ea69..c9672760 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.19.1-develop73 +1.19.1-develop74 diff --git a/defaults/both/content_rating_mal.yml b/defaults/both/content_rating_mal.yml index 165460d4..145c046a 100644 --- a/defaults/both/content_rating_mal.yml +++ b/defaults/both/content_rating_mal.yml @@ -53,7 +53,6 @@ dynamic_collections: - gb/U - gb/0+ - U - - G - 0 - 1 - 2 @@ -97,7 +96,6 @@ dynamic_collections: - 13 - gb/12A - 12+ - - PG-13 - TV-13 - gb/14+ - gb/15 @@ -116,7 +114,6 @@ dynamic_collections: - gb/18 - MA-17 - NC-17 - - R - TVMA - R - 17+ (violence & profanity) - no/15 diff --git a/defaults/both/content_rating_uk.yml b/defaults/both/content_rating_uk.yml index de099827..7f1f0f04 100644 --- a/defaults/both/content_rating_uk.yml +++ b/defaults/both/content_rating_uk.yml @@ -79,7 +79,6 @@ dynamic_collections: - TV-PG - TV-Y7 - TV-Y7-FV - - PG - 7 - 8 - 9 @@ -97,7 +96,6 @@ dynamic_collections: - no/07 12: - gb/12 - - 12 - PG-13 - Teens 13 or older - no/9 - no/09 @@ -122,7 +120,6 @@ dynamic_collections: - TV-14 - 13 - 14 - - 15 - PG-13 - Teens 13 or older - no/15 - no/16 @@ -134,7 +131,6 @@ dynamic_collections: - R - 16 - 17 - - 18 - R - 17+ (violence & profanity) - no/18 R18: From 56fe0fe9e570261ce52512794d2fae77ddac7d3c Mon Sep 17 00:00:00 2001 From: YozoraXCII <96386153+YozoraXCII@users.noreply.github.com> Date: Wed, 3 Jan 2024 13:29:22 +0000 Subject: [PATCH 2/2] [75] fix docs --- VERSION | 2 +- docs/defaults/both/content_rating_mal.md | 3 --- docs/defaults/both/content_rating_uk.md | 4 ---- 3 files changed, 1 insertion(+), 8 deletions(-) diff --git a/VERSION b/VERSION index c9672760..a7381569 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.19.1-develop74 +1.19.1-develop75 diff --git a/docs/defaults/both/content_rating_mal.md b/docs/defaults/both/content_rating_mal.md index af7fa25e..4650a624 100644 --- a/docs/defaults/both/content_rating_mal.md +++ b/docs/defaults/both/content_rating_mal.md @@ -133,7 +133,6 @@ The below is an example config.yml extract with some Template Variables added in - gb/U - gb/0+ - U - - G - 1 - 2 - 3 @@ -166,7 +165,6 @@ The below is an example config.yml extract with some Template Variables added in - 13 - gb/12A - 12+ - - PG-13 - TV-13 - gb/14+ - gb/15 @@ -180,7 +178,6 @@ The below is an example config.yml extract with some Template Variables added in - gb/18 - MA-17 - NC-17 - - R - TVMA - R - 17+ (violence & profanity) R+: diff --git a/docs/defaults/both/content_rating_uk.md b/docs/defaults/both/content_rating_uk.md index 9df3d191..9ac5075b 100644 --- a/docs/defaults/both/content_rating_uk.md +++ b/docs/defaults/both/content_rating_uk.md @@ -157,7 +157,6 @@ Note that the `template_variables:` section only needs to be used if you do want - TV-PG - TV-Y7 - TV-Y7-FV - - PG - 7 - 8 - 9 @@ -169,7 +168,6 @@ Note that the `template_variables:` section only needs to be used if you do want - PG - Children 12: - gb/12 - - 12 - PG-13 - Teens 13 or older 12A: - gb/12A @@ -184,7 +182,6 @@ Note that the `template_variables:` section only needs to be used if you do want - TV-14 - 13 - 14 - - 15 - PG-13 - Teens 13 or older 18: - gb/18 @@ -194,7 +191,6 @@ Note that the `template_variables:` section only needs to be used if you do want - R - 16 - 17 - - 18 - R - 17+ (violence & profanity) - R+ - Mild Nudity R18: