Merge branch 'master' into patch-1

docs/Radarr/Radarr-collection-of-custom-formats.md

@@ -80,7 +80,7 @@ I also made 3 guides related to this one.
 | --------------------------------------------------------------------------- | --------------------------------------------------------------------- | ----------- | ------------------------------------- |
 | [Anime BD Tier 01 (Top SeaDex Muxers)](#anime-bd-tier-01-top-seadex-muxers) | [Anime Web Tier 01 (Muxers)](#anime-web-tier-01-muxers)               | [v0](#v0)   | [Uncensored](#uncensored)             |
 | [Anime BD Tier 02 (SeaDex Muxers)](#anime-bd-tier-02-seadex-muxers)         | [Anime Web Tier 02 (Top FanSubs)](#anime-web-tier-02-top-fansubs)     | [v1](#v1)   | [10bit](#10bit)                       |
-| [Anime BD Tier 03 (SeaDex Muxers)](#anime-bd-tier-03-seadex-muxers)         | [Anime Web Tier 03 (SubsPlease)](#anime-web-tier-03-subsplease)       | [v2](#v2)   | [Anime Dual Audio](#anime-dual-audio) |
+| [Anime BD Tier 03 (SeaDex Muxers)](#anime-bd-tier-03-seadex-muxers)         | [Anime Web Tier 03 (Official Subs)](#anime-web-tier-03-official-subs) | [v2](#v2)   | [Anime Dual Audio](#anime-dual-audio) |
 | [Anime BD Tier 04 (SeaDex Muxers)](#anime-bd-tier-04-seadex-muxers)         | [Anime Web Tier 04 (Official Subs)](#anime-web-tier-04-official-subs) | [v3](#v3)   | [Dubs Only](#dubs-only)               |
 | [Anime BD Tier 05 (Remuxes)](#anime-bd-tier-05-remuxes)                     | [Anime Web Tier 05 (FanSubs)](#anime-web-tier-05-fansubs)             | [v4](#v4)   |                                       |
 | [Anime BD Tier 06 (FanSubs)](#anime-bd-tier-06-fansubs)                     | [Anime Web Tier 06 (FanSubs)](#anime-web-tier-06-fansubs)             | [VRV](#vrv) |                                       |
@@ -1571,15 +1571,15 @@ I also made 3 guides related to this one.
 
 ------
 
-### Anime Web Tier 03 (SubsPlease)
+### Anime Web Tier 03 (Official Subs)
 
-??? faq "Anime Web Tier 03 (SubsPlease) - [CLICK TO EXPAND]"
+??? faq "Anime Web Tier 03 Official Subs) - [CLICK TO EXPAND]"
-    SubsPlease group. They are official subs but tend to be more consistent and release fast
+    Official sub groups that tend to be more consistent and release fast
 
 ??? example "JSON - [CLICK TO EXPAND]"
 
     ```json
-    [[% filter indent(width=4) %]][[% include 'json/radarr/cf/anime-web-tier-03-subsplease.json' %]][[% endfilter %]]
+    [[% filter indent(width=4) %]][[% include 'json/radarr/cf/anime-web-tier-03-official-subs.json' %]][[% endfilter %]]
     ```
 
 <sub><sup>[TOP](#index)</sup>

docs/Sonarr/sonarr-collection-of-custom-formats.md

@@ -81,7 +81,7 @@ I also made 3 guides related to this one.
 | --------------------------------------------------------------------------- | --------------------------------------------------------------------- | ----------- | ------------------------------------- |
 | [Anime BD Tier 01 (Top SeaDex Muxers)](#anime-bd-tier-01-top-seadex-muxers) | [Anime Web Tier 01 (Muxers)](#anime-web-tier-01-muxers)               | [v0](#v0)   | [Uncensored](#uncensored)             |
 | [Anime BD Tier 02 (SeaDex Muxers)](#anime-bd-tier-02-seadex-muxers)         | [Anime Web Tier 02 (Top FanSubs)](#anime-web-tier-02-top-fansubs)     | [v1](#v1)   | [10bit](#10bit)                       |
-| [Anime BD Tier 03 (SeaDex Muxers)](#anime-bd-tier-03-seadex-muxers)         | [Anime Web Tier 03 (SubsPlease)](#anime-web-tier-03-subsplease)       | [v2](#v2)   | [Anime Dual Audio](#anime-dual-audio) |
+| [Anime BD Tier 03 (SeaDex Muxers)](#anime-bd-tier-03-seadex-muxers)         | [Anime Web Tier 03 (Official Subs)](#anime-web-tier-03-official-subs) | [v2](#v2)   | [Anime Dual Audio](#anime-dual-audio) |
 | [Anime BD Tier 04 (SeaDex Muxers)](#anime-bd-tier-04-seadex-muxers)         | [Anime Web Tier 04 (Official Subs)](#anime-web-tier-04-official-subs) | [v3](#v3)   | [Dubs Only](#dubs-only)               |
 | [Anime BD Tier 05 (Remuxes)](#anime-bd-tier-05-remuxes)                     | [Anime Web Tier 05 (FanSubs)](#anime-web-tier-05-fansubs)             | [v4](#v4)   |                                       |
 | [Anime BD Tier 06 (FanSubs)](#anime-bd-tier-06-fansubs)                     | [Anime Web Tier 06 (FanSubs)](#anime-web-tier-06-fansubs)             | [VRV](#vrv) |                                       |
@@ -1544,15 +1544,15 @@ I also made 3 guides related to this one.
 
 ------
 
-### Anime Web Tier 03 (SubsPlease)
+### Anime Web Tier 03 (Official Subs)
 
-??? faq "Anime Web Tier 03 (SubsPlease) - [CLICK TO EXPAND]"
+??? faq "Anime Web Tier 03 (Official Subs) - [CLICK TO EXPAND]"
-    SubsPlease group. They are official subs but tend to be more consistent and release fast
+    Official sub groups that tend to be more consistent and release fast
 
 ??? example "JSON - [CLICK TO EXPAND]"
 
     ```json
-    [[% filter indent(width=4) %]][[% include 'json/sonarr/cf/anime-web-tier-03-subsplease.json' %]][[% endfilter %]]
+    [[% filter indent(width=4) %]][[% include 'json/sonarr/cf/anime-web-tier-03-official-subs.json' %]][[% endfilter %]]
     ```
 
 <sub><sup>[TOP](#index)</sup>

docs/json/radarr/cf/anime-lq-groups.json

@@ -1165,15 +1165,6 @@
         "value": "\\b(YakuboEncodes)\\b"
       }
     },
-    {
-      "name": "Yameii",
-      "implementation": "ReleaseTitleSpecification",
-      "negate": false,
-      "required": false,
-      "fields": {
-        "value": "\\[Yameii\\]|-Yameii\\b"
-      }
-    },
     {
       "name": "youshikibi",
       "implementation": "ReleaseTitleSpecification",

docs/json/radarr/cf/anime-web-tier-03-official-subs.json

@@ -1,7 +1,7 @@
 {
-  "trash_id": "b5a83ef7296f3c5358236e3452ed1d97",
+  "trash_id": "de41e72708d2c856fa261094c85e965d",
   "trash_score": "400",
-  "name": "Anime Web Tier 03 (SubsPlease)",
+  "name": "Anime Web Tier 03 (Official Subs)",
   "includeCustomFormatWhenRenaming": false,
   "specifications": [
     {
@@ -39,6 +39,24 @@
       "fields": {
         "value": "\\b(SubsPlease)\\b"
       }
+    },
+    {
+      "name": "VARYG",
+      "implementation": "ReleaseTitleSpecification",
+      "negate": false,
+      "required": false,
+      "fields": {
+        "value": "\\b(VARYG)\\b"
+      }
+    },
+    {
+      "name": "ZR",
+      "implementation": "ReleaseTitleSpecification",
+      "negate": false,
+      "required": false,
+      "fields": {
+        "value": "\\b(ZR)\\b"
+      }
     }
   ]
 }

docs/json/radarr/cf/anime-web-tier-03-subsplease.json

@@ -1,35 +0,0 @@
-{
-  "trash_id": "5b1a5d3df27396373b4ce236fc337eaa",
-  "trash_score": "400",
-  "name": "Anime Web Tier 03 (SubsPlease)",
-  "includeCustomFormatWhenRenaming": false,
-  "specifications": [
-    {
-      "name": "WEBDL",
-      "implementation": "SourceSpecification",
-      "negate": false,
-      "required": false,
-      "fields": {
-        "value": 7
-      }
-    },
-    {
-      "name": "WEBRIP",
-      "implementation": "SourceSpecification",
-      "negate": false,
-      "required": false,
-      "fields": {
-        "value": 8
-      }
-    },
-    {
-      "name": "SubsPlease",
-      "implementation": "ReleaseTitleSpecification",
-      "negate": false,
-      "required": false,
-      "fields": {
-        "value": "\\b(SubsPlease)\\b"
-      }
-    }
-  ]
-}

docs/json/radarr/cf/anime-web-tier-04-official-subs.json

@@ -111,15 +111,6 @@
       "fields": {
         "value": "\\b(URANIME)\\b"
       }
-    },
-    {
-      "name": "ZR",
-      "implementation": "ReleaseTitleSpecification",
-      "negate": false,
-      "required": false,
-      "fields": {
-        "value": "\\b(ZR)\\b"
-      }
     }
   ]
 }

docs/json/radarr/cf/dubs-only.json

@@ -57,6 +57,15 @@
       "fields": {
         "value": "\\b(torenter69)\\b"
       }
+    },
+    {
+      "name": "Yameii",
+      "implementation": "ReleaseTitleSpecification",
+      "negate": false,
+      "required": false,
+      "fields": {
+        "value": "\\[Yameii\\]|-Yameii\\b"
+      }
     }
   ]
 }

docs/json/sonarr/cf/anime-web-tier-03-official-subs.json

@@ -0,0 +1,62 @@
+{
+  "trash_id": "c27f2ae6a4e82373b0f1da094e2489ad",
+  "trash_score": "400",
+  "name": "Anime Web Tier 03 (Official Subs)",
+  "includeCustomFormatWhenRenaming": false,
+  "specifications": [
+    {
+      "name": "WEBDL",
+      "implementation": "SourceSpecification",
+      "negate": false,
+      "required": false,
+      "fields": {
+        "value": 3
+      }
+    },
+    {
+      "name": "WEBRIP",
+      "implementation": "SourceSpecification",
+      "negate": false,
+      "required": false,
+      "fields": {
+        "value": 4
+      }
+    },
+    {
+      "name": "WEB",
+      "implementation": "SourceSpecification",
+      "negate": false,
+      "required": false,
+      "fields": {
+        "value": 1
+      }
+    },
+    {
+      "name": "SubsPlease",
+      "implementation": "ReleaseTitleSpecification",
+      "negate": false,
+      "required": false,
+      "fields": {
+        "value": "\\b(SubsPlease)\\b"
+      }
+    },
+    {
+      "name": "VARYG",
+      "implementation": "ReleaseTitleSpecification",
+      "negate": false,
+      "required": false,
+      "fields": {
+        "value": "\\b(VARYG)\\b"
+      }
+    },
+    {
+      "name": "ZR",
+      "implementation": "ReleaseTitleSpecification",
+      "negate": false,
+      "required": false,
+      "fields": {
+        "value": "\\b(ZR)\\b"
+      }
+    }
+  ]
+}

docs/json/sonarr/cf/anime-web-tier-04-official-subs.json

@@ -120,15 +120,6 @@
       "fields": {
         "value": "\\b(URANIME)\\b"
       }
-    },
-    {
-      "name": "ZR",
-      "implementation": "ReleaseTitleSpecification",
-      "negate": false,
-      "required": false,
-      "fields": {
-        "value": "\\b(ZR)\\b"
-      }
     }
   ]
 }

includes/cf/sonarr-anime.md

@@ -11,7 +11,7 @@
     | [{{ sonarr['cf']['anime-bd-tier-08-mini-encodes']['name'] }}](/Sonarr/sonarr-collection-of-custom-formats/#anime-bd-tier-08-mini-encodes)           | {{ sonarr['cf']['anime-bd-tier-08-mini-encodes']['trash_score'] }}      | {{ sonarr['cf']['anime-bd-tier-08-mini-encodes']['trash_id'] }}      |
     | [{{ sonarr['cf']['anime-web-tier-01-muxers']['name'] }}](/Sonarr/sonarr-collection-of-custom-formats/#anime-web-tier-01-muxers)                     | {{ sonarr['cf']['anime-web-tier-01-muxers']['trash_score'] }}           | {{ sonarr['cf']['anime-web-tier-01-muxers']['trash_id'] }}           |
     | [{{ sonarr['cf']['anime-web-tier-02-top-fansubs']['name'] }}](/Sonarr/sonarr-collection-of-custom-formats/#anime-web-tier-02-top-fansubs)           | {{ sonarr['cf']['anime-web-tier-02-top-fansubs']['trash_score'] }}      | {{ sonarr['cf']['anime-web-tier-02-top-fansubs']['trash_id'] }}      |
-    | [{{ sonarr['cf']['anime-web-tier-03-subsplease']['name'] }}](/Sonarr/sonarr-collection-of-custom-formats/#anime-web-tier-03-subsplease)             | {{ sonarr['cf']['anime-web-tier-03-subsplease']['trash_score'] }}       | {{ sonarr['cf']['anime-web-tier-03-subsplease']['trash_id'] }}       |
+    | [{{ sonarr['cf']['anime-web-tier-03-official-subs']['name'] }}](/Sonarr/sonarr-collection-of-custom-formats/#anime-web-tier-03-official-subs)       | {{ sonarr['cf']['anime-web-tier-03-official-subs']['trash_score'] }}    | {{ sonarr['cf']['anime-web-tier-03-official-subs']['trash_id'] }}       |
     | [{{ sonarr['cf']['anime-web-tier-04-official-subs']['name'] }}](/Sonarr/sonarr-collection-of-custom-formats/#anime-web-tier-04-official-subs)       | {{ sonarr['cf']['anime-web-tier-04-official-subs']['trash_score'] }}    | {{ sonarr['cf']['anime-web-tier-04-official-subs']['trash_id'] }}    |
     | [{{ sonarr['cf']['anime-web-tier-05-fansubs']['name'] }}](/Sonarr/sonarr-collection-of-custom-formats/#anime-web-tier-05-fansubs)                   | {{ sonarr['cf']['anime-web-tier-05-fansubs']['trash_score'] }}          | {{ sonarr['cf']['anime-web-tier-05-fansubs']['trash_id'] }}          |
     | [{{ sonarr['cf']['anime-web-tier-06-fansubs']['name'] }}](/Sonarr/sonarr-collection-of-custom-formats/#anime-web-tier-06-fansubs)                   | {{ sonarr['cf']['anime-web-tier-06-fansubs']['trash_score'] }}          | {{ sonarr['cf']['anime-web-tier-06-fansubs']['trash_id'] }}          |