diff --git a/VERSION b/VERSION index 2eefae00..b3dcfe4c 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.18.0-develop16 +1.18.0-develop17 diff --git a/defaults/both/studio.yml b/defaults/both/studio.yml index 19cb44b4..728d5541 100644 --- a/defaults/both/studio.yml +++ b/defaults/both/studio.yml @@ -83,36 +83,18 @@ dynamic_collections: - 20th Century Fox Amazon Studios: - Amazon - Amblin Entertainment: - - Amblin Entertainment Blue Sky Studios: - Blue Sky Films - Blumhouse Productions: - - Blumhouse Productions - Chernin Entertainment: - - Chernin Entertainment Columbia Pictures: - Columbia TriStar - TriStar - Constantin Film: - - Constantin Film DreamWorks Studios: - DreamWorks - DreamWorks Animation - Grindstone Entertainment Group: - - Grindstone Entertainment Group - Happy Madison Productions: - - Happy Madison Productions Illumination Entertainment: - Illumination Films - Ingenious Media: - - Ingenious Media - Legendary Pictures: - - Legendary Pictures Lucasfilm Ltd: - Lucasfilm - Malevolent Films: - - Malevolent Films Marvel Studios: - Marvel Animation - Marvel Enterprises @@ -120,33 +102,19 @@ dynamic_collections: - Marvel Metro-Goldwyn-Mayer: - MGM - Millennium Films: - - Millennium Films - Miramax: - - Miramax New Line Cinema: - New Line - Original Film: - - Original Film - Orion Pictures: - - Orion Pictures Paramount Pictures: - Paramount - Paramount Animation Pixar: - Pixar Animation Studios - PlanB Entertainment: - - PlanB Entertainment Sony Pictures: - Sony - Sony Pictures Animation - Summit Entertainment: - - Summit Entertainment Universal Pictures: - Universal - Universal Animation Studios - Village Roadshow Pictures: - - Village Roadshow Pictures Walt Disney Pictures: - Disney - Walt Disney Animation Studios diff --git a/docs/defaults/both/studio.md b/docs/defaults/both/studio.md index 5ff240f9..3ad2e21f 100644 --- a/docs/defaults/both/studio.md +++ b/docs/defaults/both/studio.md @@ -122,36 +122,18 @@ addons: - 20th Century Fox Amazon Studios: - Amazon - Amblin Entertainment: - - Amblin Entertainment Blue Sky Studios: - Blue Sky Films - Blumhouse Productions: - - Blumhouse Productions - Chernin Entertainment: - - Chernin Entertainment Columbia Pictures: - Columbia TriStar - TriStar - Constantin Film: - - Constantin Film DreamWorks Studios: - DreamWorks - DreamWorks Animation - Grindstone Entertainment Group: - - Grindstone Entertainment Group - Happy Madison Productions: - - Happy Madison Productions Illumination Entertainment: - Illumination Films - Ingenious Media: - - Ingenious Media - Legendary Pictures: - - Legendary Pictures Lucasfilm Ltd: - Lucasfilm - Malevolent Films: - - Malevolent Films Marvel Studios: - Marvel Animation - Marvel Enterprises @@ -159,33 +141,19 @@ addons: - Marvel Metro-Goldwyn-Mayer: - MGM - Millennium Films: - - Millennium Films - Miramax: - - Miramax New Line Cinema: - New Line - Original Film: - - Original Film - Orion Pictures: - - Orion Pictures Paramount Pictures: - Paramount - Paramount Animation Pixar: - Pixar Animation Studios - PlanB Entertainment: - - PlanB Entertainment Sony Pictures: - Sony - Sony Pictures Animation - Summit Entertainment: - - Summit Entertainment Universal Pictures: - Universal - Universal Animation Studios - Village Roadshow Pictures: - - Village Roadshow Pictures Walt Disney Pictures: - Disney - Walt Disney Animation Studios diff --git a/modules/meta.py b/modules/meta.py index 1cf7fd41..ff447769 100644 --- a/modules/meta.py +++ b/modules/meta.py @@ -825,8 +825,6 @@ class MetadataFile(DataFile): if add_key not in all_keys and add_key not in og_exclude: final_keys = [ck for ck in combined_keys if ck in all_keys] if custom_keys and final_keys: - if include: - include.append(add_key) auto_list[add_key] = add_key addons[add_key] = final_keys elif custom_keys: