[163] Merge remote-tracking branch 'JohnFawkes/nightly' into nightly

defaults/movie/seasonal.yml

@@ -163,5 +163,5 @@ dynamic_collections:
       image:
         default: seasonal/<<key>>
       translation_key:
-        default: season
+        default: seasonal
 

defaults/overlays/resolution.yml

@@ -53,6 +53,10 @@ external_templates:
               - IMAX
               - Remastered
               - Criterion
+              - Rich-Donner
+              - Black-And-Chrome
+              - Definitive
+              - Ulysses
       final_horizontal_offset:
         default: <<horizontal_offset>>
         conditions:
@@ -313,6 +317,18 @@ overlays:
   Criterion-Dovetail:
     variables: {key: criterion, weight: 10, search: Criterion, type: edition_dovetail, allowed_libraries: movie}
     template: [name: edition, name: standard]
+  Rich-Donner-Dovetail:
+    variables: {key: richarddonner, weight: 9, search: Rich, type: edition_dovetail, allowed_libraries: movie}
+    template: [name: edition, name: standard]
+  Black-And-Chrome-Dovetail:
+    variables: {key: blackchrome, weight: 8, search: Black, type: edition_dovetail, allowed_libraries: movie}
+    template: [name: edition, name: standard]
+  Definitive-Dovetail:
+    variables: {key: definitive, weight: 7, search: Definitive, type: edition_dovetail, allowed_libraries: movie}
+    template: [name: edition, name: standard]
+  Ulysses-Dovetail:
+    variables: {key: ulysses, weight: 6, search: Ulysses, type: edition_dovetail, allowed_libraries: movie}
+    template: [name: edition, name: standard]
 
   4K-DV:
     variables: {key: 4k, alt: dv, weight: 150, type: resolution}
@@ -423,6 +439,17 @@ overlays:
   Criterion:
     variables: {key: criterion, weight: 10, search: Criterion, type: edition, allowed_libraries: movie}
     template: [name: edition, name: standard]
-    
+  Rich-Donner:
+    variables: {key: richdonner, weight: 9, search: Rich, type: edition, allowed_libraries: movie}
+    template: [name: edition, name: standard]
+  Black-And-Chrome:
+    variables: {key: blackchrome, weight: 8, search: Black, type: edition, allowed_libraries: movie}
+    template: [name: edition, name: standard]
+  Definitive:
+    variables: {key: definitive, weight: 7, search: Definitive, type: edition, allowed_libraries: movie}
+    template: [name: edition, name: standard]
+  Ulysses:
+    variables: {key: ulysses, weight: 6, search: Ulysses, type: edition, allowed_libraries: movie}
+    template: [name: edition, name: standard]
     
     

docs/defaults/overlay_variables.md

@@ -6,6 +6,9 @@ Note that the `template_variables:` section only needs to be used if you do want
 
 Below are the available variables which can be used to customize the file.
 
+**NOTE:** `file`, `url`, `git`, `repo`, and `pmm` can all be used with `_<<key>>` 
+<br>For example, with the audio_codec overlay `file_dtsx: config/overlays/dtsx.png`
+
 | Variable                  | Description & Values                                                                                                                                                                                           |
 |:--------------------------|:---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
 | `use_<<key>>`<sup>1</sup> | **Description:** Turns off individual Overlays in a Defaults file.<br>**Values:** `false` to turn off the overlay                                                                                              |

docs/defaults/overlays/resolution.md

@@ -45,6 +45,10 @@ Recommendations: Editions overlay is designed to use the Editions field within P
 | IMAX                | `imax`          | `30`   |
 | Remastered          | `remastered`    | `20`   |
 | Criterion           | `criterion`     | `10`   |
+| Richard Donner      | `richarddonner` | `9`    |
+| Black and Chrome    | `blackchrome`   | `8`    |
+| Definitive          | `definitive`    | `7`    |
+| Ulysses             | `ulysses`       | `6`    |
 
 ## Config