diff --git a/.readthedocs.yml b/.readthedocs.yml index 1f0e431a..8042f378 100644 --- a/.readthedocs.yml +++ b/.readthedocs.yml @@ -3,7 +3,9 @@ version: 2 build: - image: latest + os: ubuntu-22.04 + tools: + python: "3.7" sphinx: configuration: docs/conf.py @@ -11,8 +13,6 @@ sphinx: formats: [] python: - version: "3.7" - install: - requirements: docs/requirements.txt diff --git a/VERSION b/VERSION index 5ce799ac..bac20614 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.19.1-develop1 +1.19.1-develop5 diff --git a/defaults/both/studio.yml b/defaults/both/studio.yml index ace8e9fc..d355c753 100644 --- a/defaults/both/studio.yml +++ b/defaults/both/studio.yml @@ -313,6 +313,7 @@ dynamic_collections: - FilmNation Entertainment - Flynn Picture Company - Focus Features + - Food Network - Fortiche Production - Fox Television Studios - Freckle Films @@ -332,8 +333,9 @@ dynamic_collections: - HartBeat Productions - Hartswood Films - Hasbro - - Heyday Films - HBO + - Heyday Films + - Hughes Entertainment - Hurwitz & Schlossberg Productions - Hyperobject Industries - Icon Entertainment International @@ -358,6 +360,7 @@ dynamic_collections: - Legendary Pictures - Let's Not Turn This Into a Whole Big Production - Levity Entertainment Group + - Lightstorm Entertainment - Likely Story - Lionsgate - Live Entertainment @@ -368,7 +371,7 @@ dynamic_collections: - Mandalay Entertainment - Mandarin - Mandarin Motion Pictures Limited - - marv + - Marv Films - Marvel Animation - Marvel Studios - Matt Tolmach Productions @@ -458,6 +461,7 @@ dynamic_collections: - The Mark Gordon Company - The Sea Change Project - The Weinstein Company + - Tim Burton Productions - Thunder Road - Titmouse - Tomorrow Studios @@ -481,6 +485,7 @@ dynamic_collections: - Walden Media - Walt Disney Animation Studios - Walt Disney Pictures + - Walt Disney Productions - Warner Animation Group - Warner Bros. Pictures - Warner Bros. Television diff --git a/defaults/chart/flixpatrol.yml b/defaults/chart/flixpatrol.yml deleted file mode 100644 index b87c285f..00000000 --- a/defaults/chart/flixpatrol.yml +++ /dev/null @@ -1,67 +0,0 @@ -############################################################################## -# FlixPatrol Charts Collections # -# Created by Yozora, Bullmoose20, anon_fawkes, & Sohjiro # -# EDITING THIS FILE MAY CAUSE PULLING NEW UPDATES TO FAIL # -# https://metamanager.wiki/en/latest/defaults/chart/flixpatrol.html # -############################################################################## - -external_templates: - pmm: templates - template_variables: - collection_section: "020" - pre: "_#" - -templates: - flixpatrol: - default: - location: world - location_<>: <> - time_window: last_week - time_window_<>: <> - limit: 10 - limit_<>: <> - conditionals: - actual_location: - default: <>>> - conditions: - - key: apple - value: world - limit: <> - flixpatrol_top: - platform: <> - location: <> - time_window: <>>> - limit: <>>> - -dynamic_collections: - FlixPatrol: - type: custom - data: - netflix: Netflix - disney: Disney+ - max: Max - hulu: Hulu - paramount: Paramount+ - prime: Prime Video - apple: Apple TV+ - title_format: <> Top <> - template: - - flixpatrol - - shared - - arr - - custom - template_variables: - limit: - default: 10 - platform: - default: <> - max: hbo - paramount: paramount_plus - prime: amazon_prime - apple: apple_tv - image: - default: chart/<>_top - translation_key: - default: flixpatrol - dynamic: - default: true diff --git a/defaults/overlays/flixpatrol.yml b/defaults/overlays/flixpatrol.yml deleted file mode 100644 index 97b55284..00000000 --- a/defaults/overlays/flixpatrol.yml +++ /dev/null @@ -1,104 +0,0 @@ -############################################################################## -# FlixPatrol Overlays # -# Created by Yozora, Bullmoose20, anon_fawkes, & Sohjiro # -# EDITING THIS FILE MAY CAUSE PULLING NEW UPDATES TO FAIL # -# https://metamanager.wiki/en/latest/defaults/overlays/flixpatrol.html # -############################################################################## - -external_templates: - pmm: templates - template_variables: - default: - pre_text: TOP - style: round - limit: 10 - limit_<>: <> - conditionals: - pmm: - conditions: - - file.exists: false - file_<>.exists: false - url.exists: false - url_<>.exists: false - git.exists: false - git_<>.exists: false - repo.exists: false - repo_<>.exists: false - value: logo/<