diff --git a/VERSION b/VERSION index 6b35906a..b8e25b9c 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.17.3-develop69 +1.17.3-develop70 diff --git a/defaults/movie/seasonal.yml b/defaults/movie/seasonal.yml index 9c602ff8..b6efdc75 100644 --- a/defaults/movie/seasonal.yml +++ b/defaults/movie/seasonal.yml @@ -109,6 +109,7 @@ dynamic_collections: patrick: St. Patrick's Day easter: Easter mother: Mother's Day + memorial: Memorial Day father: Father's Day independence: Independence Day labor: Labor Day @@ -126,8 +127,9 @@ dynamic_collections: years: range(12/26-01/04) valentine: range(02/01-02/29) patrick: range(03/01-03/18) - easter: range(03/15-04/30) + easter: range(03/20-04/30) mother: range(05/05-05-10) + memorial: range(5/18-6/7) father: range(06/15-06/20) independence: range(06/23-07/11) labor: range(09/01-09/10) @@ -145,6 +147,7 @@ dynamic_collections: - https://www.imdb.com/list/ls062665509/ - https://www.imdb.com/list/ls051733651/ mother: https://www.imdb.com/list/ls072551197/ + memorial: https://www.imdb.com/list/ls002014923/ father: https://www.imdb.com/list/ls020471057/ independence: - https://www.imdb.com/list/ls068664510/ diff --git a/defaults/translations/default.yml b/defaults/translations/default.yml index a00cef4f..3bfe77dc 100644 --- a/defaults/translations/default.yml +++ b/defaults/translations/default.yml @@ -236,7 +236,7 @@ translations: resolution_standards_other_name: Other Resolutions resolution_standards_other_summary: <>s that have other uncommon resolutions. - # possible key_names: New Year's Day, Valentine's Day, St. Patrick's Day, Easter, Mother's Day, Father's Day, Independence Day, Labor Day, Halloween, Thanksgiving, Christmas + # possible key_names: New Year's Day, Valentine's Day, St. Patrick's Day, Easter, Mother's Day, Memorial Day, Father's Day, Independence Day, Labor Day, Halloween, Thanksgiving, Christmas seasonal_name: <> <>s seasonal_summary: A collection of <> <>s that may relate to the season. diff --git a/docs/conf.py b/docs/conf.py index 39ee29e4..4413f627 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -173,6 +173,7 @@ html_theme_options = { ]), ("_menu", "Defaults", [ ("PMM Defaults", "defaults/readme"), + ("PMM Files", "defaults/files"), ("_divider", ), ("_menu", "Award Collections", [ ("Awards Separator", "defaults/award/separator"), @@ -182,7 +183,7 @@ html_theme_options = { ("Cannes File Festival Awards", "defaults/award/cannes"), ("Critics Choice Awards", "defaults/award/choice"), ("Emmy Awards", "defaults/award/emmy"), - ("Golden Globe Awards", "defaults/award/bafgoldenta"), + ("Golden Globe Awards", "defaults/award/golden"), ("Independent Spirit Awards", "defaults/award/spirit"), ("Sundance File Festival Awards", "defaults/award/sundance"), ("Other Awards", "defaults/award/other"), @@ -190,10 +191,11 @@ html_theme_options = { ("_menu", "Chart Collections", [ ("Chart Separator", "defaults/chart/separator"), ("_divider", ), + ("Basic Charts", "defaults/chart/basic"), ("AniList Charts", "defaults/chart/anilist"), + ("Flixpatrol Charts", "defaults/chart/flixpatrol"), ("IMDb Charts", "defaults/chart/imdb"), ("MyAnimeList Charts", "defaults/chart/myanimelist"), - ("Plex Charts", "defaults/chart/plex"), ("Tautulli Charts", "defaults/chart/tautulli"), ("TMDb Charts", "defaults/chart/tmdb"), ("Trakt Charts", "defaults/chart/trakt"), @@ -204,38 +206,38 @@ html_theme_options = { ("Audio Language Collections", "defaults/both/audio_language"), ("Content Ratings (US) Collections", "defaults/movie/content_rating_us"), ("Content Ratings (UK) Collections", "defaults/both/content_rating_uk"), - ("Genre Collections", "defaults/both/genre"), - ("Resolution Collections", "defaults/both/resolution"), - ("Resolution Standards Collections", "defaults/both/resolution_standards"), - ("Streaming Collections", "defaults/both/streaming"), - ("Studio Collections", "defaults/both/studio"), - ("Subtitle Language Collections", "defaults/both/subtitle_language"), - ("Year Collections", "defaults/both/year"), ("Country Collections", "defaults/movie/country"), ("Decade Collections", "defaults/movie/decade"), ("Director Collections", "defaults/movie/director"), ("Franchise Collections", "defaults/movie/franchise"), + ("Genre Collections", "defaults/both/genre"), ("Producer Collections", "defaults/movie/producer"), + ("Resolution Collections", "defaults/both/resolution"), + ("Resolution Standards Collections", "defaults/both/resolution_standards"), ("Seasonal Collections", "defaults/movie/seasonal"), + ("Streaming Collections", "defaults/both/streaming"), + ("Studio Collections", "defaults/both/studio"), + ("Subtitle Language Collections", "defaults/both/subtitle_language"), ("Universe Collections", "defaults/movie/universe"), ("Writer Collections", "defaults/movie/writer"), + ("Year Collections", "defaults/both/year"), ]), ("_menu", "Show Collections", [ ("Actor Collections", "defaults/both/actor"), ("Audio Language Collections", "defaults/both/audio_language"), ("Content Ratings (US) Collections", "defaults/show/content_rating_us"), ("Content Ratings (UK) Collections", "defaults/both/content_rating_uk"), + ("Country Collections", "defaults/show/country"), + ("Decade Collections", "defaults/show/decade"), + ("Franchise Collections", "defaults/show/franchise"), ("Genre Collections", "defaults/both/genre"), + ("Network Collections", "defaults/show/network"), ("Resolution Collections", "defaults/both/resolution"), ("Resolution Standards Collections", "defaults/both/resolution_standards"), ("Streaming Collections", "defaults/both/streaming"), ("Studio Collections", "defaults/both/studio"), ("Subtitle Language Collections", "defaults/both/subtitle_language"), ("Year Collections", "defaults/both/year"), - ("Country Collections", "defaults/show/country"), - ("Decade Collections", "defaults/show/decade"), - ("Network Collections", "defaults/show/network"), - ("Franchise Collections", "defaults/show/franchise"), ]), ("Playlists", "defaults/playlists"), ("_menu", "Overlays", [ diff --git a/docs/defaults/defaults.md b/docs/defaults/readme.md similarity index 100% rename from docs/defaults/defaults.md rename to docs/defaults/readme.md