diff --git a/VERSION b/VERSION index dff0f99e..6fb6d71e 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.19.0-develop66 +1.19.0-develop67 diff --git a/defaults/both/studio.yml b/defaults/both/studio.yml index 6fa80c16..755b0946 100644 --- a/defaults/both/studio.yml +++ b/defaults/both/studio.yml @@ -39,61 +39,441 @@ dynamic_collections: dynamic: default: true include: + - 3 Arts Entertainment + - 6th & Idaho + - 8bit + - 20th Century Animation - 20th Century Studios + - 20th Century Fox Television + - 21 Laps Entertainment + - 87North Productions + - 101 Studios + - A+E Studios + - A-1 Pictures + - A.C.G.T. + - A24 + - ABC Signature + - ABC Studios + - Acca effe + - Actas + - AGBO + - AIC + - Ajia-Do + - Akatsuki - Amazon Studios - Amblin Entertainment + - AMC Studios + - Animation Do + - Ankama + - APPP + - Ardustry Entertainment + - Arms + - Artland + - Artmic + - Arvo Animation + - Asahi Production + - Ashi Productions + - asread. + - AtelierPontdarc + - B.CMAY PICTURES + - Bad Hat Harry Productions + - Bad Robot + - Bad Wolf + - Bakken Record + - Bandai Namco Pictures + - Bardel Entertainment + - BBC Studios + - Bee Train + - Berlanti Productions + - Bibury Animation Studios + - bilibili + - Blade + - Blown Deadline Productions - Blue Sky Studios - Blumhouse Productions + - Blur Studio + - Bones + - Bosque Ranch Productions + - Box to Box Films + - Brain's Base + - Brandywine Productions + - Bridge + - C-Station + - C2C + - Calt Production + - Canal+ + - Carnival Films + - Castle Rock Entertainment + - CBS Productions + - CBS Studios + - Centropolis Entertainment - Chernin Entertainment + - Children's Playground Entertainment + - Chimp Television + - Cinergi Pictures Entertainment + - Cloud Hearts + - CloverWorks + - Colored Pencil Animation - Columbia Pictures + - CoMix Wave Films + - Connect - Constantin Film + - Cowboy Films + - Craftar Studios + - Creators in Pack + - CygamesPictures + - Dark Horse Entertainment + - David Production + - DC Comics + - Dino De Laurentiis Company + - Diomedéa + - DLE + - Doga Kobo + - domerica + - Doozer + - Dreams Salon Entertainment Culture - DreamWorks Studios + - DreamWorks Pictures + - Drive + - Eleventh Hour Films + - EMT Squared + - Encourage Films + - Endeavor Content + - ENGI + - Entertainment One + - Eon Productions + - Expectation Entertainment + - Fandango + - feel. + - Felix Film + - Fenz + - FilmDistrict + - FilmNation Entertainment + - Fortiche Production + - Frederator Studios + - Fuqua Films + - GAINAX + - Gallop + - Gallagher Films Ltd + - Gary Sanchez Productions + - Gaumont + - Geek Toys + - Gekkou + - Gemba + - GENCO + - Generator Entertainment + - Geno Studio + - GoHands + - Gonzo + - Graphinica - Grindstone Entertainment Group + - Group Tac + - Hal Film Maker + - Hallmark + - Haoliners Animation League - Happy Madison Productions + - Hartswood Films + - HBO + - Hoods Entertainment + - Hotline - Illumination Entertainment + - Imagin + - Imperative Entertainment - Ingenious Media + - J.C.Staff + - Jerry Bruckheimer Films + - Jumondou + - Kadokawa + - Kazak Productions + - Kennedy Miller Productions + - Khara + - Kilter Films + - Kinema Citrus + - Kjam Media + - Kudos + - Kyoto Animation + - Lan Studio + - LandQ Studio + - Landscape Entertainment + - Laura Ziskin Productions + - Lay-duce - Legendary Pictures + - Lerche + - Let's Not Turn This Into a Whole Big Production + - LIDENFILMS - Lionsgate + - Lord Miller Productions - Lucasfilm Ltd + - M.S.C + - Madhouse + - Magic Bus + - Maho Film - Malevolent Films + - Mandarin + - Mandarin Motion Pictures Limited + - Manglobe + - MAPPA + - Marvel Animation - Marvel Studios + - Maximum Effort + - Media Res - Metro-Goldwyn-Mayer - Millennium Films + - Millepensee - Miramax + - Namu Animation + - NAZ - New Line Cinema + - Nexus + - Nickelodeon Animation Studio + - Nippon Animation + - Nomad + - Nut + - Okuruto Noboru + - OLM + - Orange + - Ordet - Original Film - Orion Pictures + - OZ + - P.A. Works + - P.I.C.S. + - Paramount Animation - Paramount Pictures + - Paramount Television Studios + - Passione + - Pb Animation Co. Ltd + - Pierrot + - Piki Films + - Pine Jam - Pixar - Plan B Entertainment + - Platinum Vision + - PlayStation Productions + - Plum Pictures + - Polygon Pictures + - Pony Canyon + - Powerhouse Animation Studios + - PRA + - Production +h. + - Production I.G + - Production IMS + - Production Reed + - Project No.9 + - Prospect Park + - Pulse Films + - Quad + - Radix + - RatPac Entertainment + - Red Dog Culture House + - Regency Pictures + - Reveille Productions + - Revoroot + - RocketScience + - Saetta + - SANZIGEN + - Satelight + - Science SARU + - Scott Free Productions + - Sean Daniel Company + - Secret Hideout + - See-Saw Films + - Sentai Filmworks + - Seven Arcs + - Shaft + - Shin-Ei Animation + - Shogakukan + - Showtime Networks + - Shuka + - Signal.MD + - Sil-Metropole Organisation + - SILVER LINK. + - SISTER + - Sixteen String Jack Productions + - Sky studios + - Skydance + - Sony Pictures Animation - Sony Pictures + - Spyglass Entertainment + - Staple Entertainment + - Studio 3Hz + - Studio A-CAT + - Studio Babelsberg + - Studio Bind + - Studio Blanc. + - Studio Chizu + - Studio Comet + - Studio Deen + - Studio Dragon + - Studio Elle + - Studio Flad - Studio Ghibli + - Studio Gokumi + - Studio Guts + - Studio Hibari + - Studio Kafka + - Studio Kai + - Studio Mir + - studio MOTHER + - Studio Palette + - Studio Rikka + - Studio Signpost + - Studio VOLN + - STUDIO4°C - Summit Entertainment + - Sunrise Beyond + - Sunrise + - Syfy + - Syncopy + - SynergySP + - Tall Ship Productions + - Tatsunoko Production + - Team Downey + - Telecom Animation Film + - Tezuka Productions + - The Donners' Company + - The Kennedy-Marshall Company + - The Linson Company + - The Littlefield Company + - The Mark Gordon Company + - The Weinstein Company + - Titmouse + - TMS Entertainment + - TNK + - Toei Animation + - Tomorrow Studios + - Topcraft + - Touchstone Pictures + - Touchstone Television + - Triangle Staff + - Trigger + - TriStar Pictures + - TROYCA + - TYO Animations + - Typhoon Graphics + - UCP + - ufotable + - Universal Animation Studios - Universal Pictures + - Universal Television + - V1 Studio - Village Roadshow Pictures + - W-Toon Studio + - W. Chump and Sons + - Walt Disney Animation Studios - Walt Disney Pictures + - Warner Animation Group - Warner Bros. Pictures + - Warner Bros. Television + - Wawayu Animation + - Wayfare Entertainment + - White Fox + - Wiedemann & Berg Television + - Wit Studio + - Wolfsbane + - Xebec + - Yokohama Animation Lab + - Yostar Pictures + - Yumeta Company + - Zero-G + - Zexcs addons: + 8bit: + - 8-bit 20th Century Studios: - 20th Century - 20th Century Animation - 20th Century Fox + AIC: + - AIC ASTA + - AIC A.S.T.A + - AIC Build + - AAIC PLUS+ + - AIC RIGHTS + - AIC Spirits + Ajia-Do: + - Ajiado Amazon Studios: - Amazon + Amblin Entertainment: + - Amblin Television + APPP: + - A.P.P.P. + asread.: + - Asread + AtelierPontdarc: + - Atelier Pontdarc + B.CMAY PICTURES: + - G.CMay Animation & Film + Bandai Namco Pictures: + - Bandai Visual + - Bandai Visual Company + BBC Studios: + - BBC + - BBC Studios Natural History Unit + Bibury Animation Studios: + - Bibury Animation CG Blue Sky Studios: - Blue Sky Films + Cloud Hearts: + - CLOUDHEARTS Columbia Pictures: - Columbia TriStar - - TriStar + CoMix Wave Films: + - CoMix Wave + Craftar Studios: + - Craftar + CygamesPictures: + - Cygames Pictures DreamWorks Studios: - DreamWorks - DreamWorks Animation + - DreamWorks Animation Television + - DreamWorks Classics + EMT Squared: + - EMT²0 + feel.: + - Feel + Gallop: + - Studio Gallop + Gaumont: + - Gaumont International Television + Geek Toys: + - GEEKTOYS + Gekkou: + - GEKKOU Production + GoHands: + - Go Hands + Gonzo: + - Gonzo Digimation + Hallmark: + - Hallmark Channel + - Hallmark Entertainment + - Hallmark Media + - Hallmark Movies & Mysteries + - The Hallmark Channel + Haoliners Animation League: + - Haoliners Huimeng Animation + - Haoliners Animation Illumination Entertainment: - Illumination Films + J.C.Staff: + - J.C. Staff + Khara: + - Studio Khara + Lan Studio: + - Studio LAN + Legendary Pictures: + - Legendary Television + LIDENFILMS: + - Liden Films Lucasfilm Ltd: - Lucasfilm + - Lucasfilm Animation + Mandarin: + - Mandarin Films + - Mandarin Television Marvel Studios: - - Marvel Animation - Marvel Enterprises - Marvel Entertainment - Marvel @@ -101,20 +481,66 @@ dynamic_collections: - MGM New Line Cinema: - New Line + Nexus: + - Nexus Factory + P.A. Works: + - P.A.WORKS Paramount Pictures: - Paramount - - Paramount Animation + Pierrot: + - Pierrot Plus + - Studio Pierrot Pixar: - Pixar Animation Studios + Plan B Entertainment: + - PlanB Entertainment + Platinum Vision: + - PlatinumVision + Production +h.: + - Production +h + RatPac Entertainment: + - Dune Entertainment + Regency Pictures: + - Regency Enterprises + - New Regency Pictures + - Monarchy Enterprises S.a.r.l. + Science SARU: + - Science Saru + Seven Arcs: + - Seven + - Seven Arcs Pictures + Shogakukan: + - Shogakukan Production + Signal.MD: + - Signal MD + SILVER LINK.: + - Silver Link + Sky studios: + - British Sky Broadcasting + - British Sky Broadcasting(BSkyB) Sony Pictures: - Sony - Sony Pictures Animation + - Sony Pictures Television Studios + Studio Blanc.: + - Studio Blanc + Studio Deen: + - Studio DEEN + The Kennedy-Marshall Company: + - The Kennedy/Marshall Company + The Mark Gordon Company: + - Tiger Aspect Productions + TMS Entertainment: + - Tokyo Movie Shinsha + TriStar Pictures: + - TriStar Universal Pictures: - Universal - Universal Animation Studios Walt Disney Pictures: - Disney - - Walt Disney Animation Studios Warner Bros. Pictures: - Warner - - Warner Animation Group \ No newline at end of file + - Warner Animation Group + Yokohama Animation Lab: + - Yokohama Animation Laboratory \ No newline at end of file diff --git a/defaults/overlays/images/studio/AMC Studios.png b/defaults/overlays/images/studio/AMC Studios.png index c1fdc7ce..b9379359 100644 Binary files a/defaults/overlays/images/studio/AMC Studios.png and b/defaults/overlays/images/studio/AMC Studios.png differ diff --git a/defaults/overlays/images/studio/Blur Studio.png b/defaults/overlays/images/studio/Blur Studio.png index a64720b4..2d25ed57 100644 Binary files a/defaults/overlays/images/studio/Blur Studio.png and b/defaults/overlays/images/studio/Blur Studio.png differ diff --git a/defaults/overlays/images/studio/Hallmark.png b/defaults/overlays/images/studio/Hallmark.png index 96437a7b..06d7a8a4 100644 Binary files a/defaults/overlays/images/studio/Hallmark.png and b/defaults/overlays/images/studio/Hallmark.png differ diff --git a/defaults/overlays/images/studio/Plan B Entertainment.png b/defaults/overlays/images/studio/Plan B Entertainment.png index 6fcad244..73329cb3 100644 Binary files a/defaults/overlays/images/studio/Plan B Entertainment.png and b/defaults/overlays/images/studio/Plan B Entertainment.png differ diff --git a/defaults/overlays/ratings.yml b/defaults/overlays/ratings.yml index db7840b3..e09cc63a 100644 --- a/defaults/overlays/ratings.yml +++ b/defaults/overlays/ratings.yml @@ -449,7 +449,7 @@ templates: run_definition: <> ignore_blank_results: true overlay: - name: text(<>>>_rating<>_style>>) + name: text(<<<>>>_rating<>_style>>>>) file: <>_file>> url: <>_url>> git: <>_git>> diff --git a/defaults/overlays/studio.yml b/defaults/overlays/studio.yml index c775440d..bbcd9936 100644 --- a/defaults/overlays/studio.yml +++ b/defaults/overlays/studio.yml @@ -170,6 +170,9 @@ overlays: Bad Hat Harry Productions: template: [name: standard, name: studios] + Bad Robot: + template: [name: standard, name: studios] + Bad Wolf: template: [name: standard, name: studios] @@ -443,6 +446,9 @@ overlays: Hal Film Maker: template: [name: standard, name: studios] + Hallmark: + template: [name: standard, {name: studios, search: [Hallmark Channel, Hallmark Entertainment, Hallmark Media, Hallmark Movies & Mysteries, The Hallmark Channel]}] + Haoliners Animation League: template: [name: standard, {name: studios, search: [Haoliners Animation League, Haoliners Huimeng Animation, Haoliners Animation]}] @@ -1023,7 +1029,7 @@ overlays: template: [name: standard, name: studios] Warner Bros. Pictures: - template: [name: standard, {name: studios, search: [Warner Bros. Pictures, Warner, Warner Animation Group]}] + template: [name: standard, {name: studios, search: [Warner Bros. Pictures, Warner]}] Warner Bros. Television: template: [name: standard, name: studios] diff --git a/defaults/playlist.yml b/defaults/playlist.yml index 0f73be77..d254c381 100644 --- a/defaults/playlist.yml +++ b/defaults/playlist.yml @@ -124,6 +124,6 @@ playlists: key: dragonball template: - name: playlist - trakt_list: https://trakt.tv/users/qamazi/lists/dragon-ball-binged-out + trakt_list: https://trakt.tv/users/grawler/lists/dragon-ball-in-order summary_dragonball: Dragon Ball follows the adventures of an extraordinarily strong young boy named Goku as he searches for the seven dragon balls. These balls, when combined, can grant the owner any one wish he desires. Along the way he makes many new friends, and enemies, and he trains to become the strongest fighter in the world. - name: arr diff --git a/docs/config/paths.md b/docs/config/paths.md index e96ab62e..dc5e043b 100644 --- a/docs/config/paths.md +++ b/docs/config/paths.md @@ -11,6 +11,7 @@ The path types are outlined as follows: * `- url:` refers to a metadata file which is hosted publicly on the internet. * `- git:` refers to a metadata file which is hosted on the [Configs Repo](https://github.com/meisnate12/Plex-Meta-Manager-Configs). * `- repo:` refers to a metadata file which is hosted on a custom repository specified by the user with the [`custom_repo` Setting Attribute](settings.md#custom-repo). +* `- pmm:` refers to a metadata file which is part of the built-in [default metadta files](../defaults/guide.md). ## YAML Controls diff --git a/docs/defaults/both/studio.md b/docs/defaults/both/studio.md index 84fdcb8f..395a60aa 100644 --- a/docs/defaults/both/studio.md +++ b/docs/defaults/both/studio.md @@ -82,66 +82,445 @@ These are lists provided for reference to show what values will be in use if you ```yaml include: + - 3 Arts Entertainment + - 6th & Idaho + - 8bit + - 20th Century Animation - 20th Century Studios + - 20th Century Fox Television + - 21 Laps Entertainment + - 87North Productions + - 101 Studios + - A+E Studios + - A-1 Pictures + - A.C.G.T. + - A24 + - ABC Signature + - ABC Studios + - Acca effe + - Actas + - AGBO + - AIC + - Ajia-Do + - Akatsuki - Amazon Studios - Amblin Entertainment + - AMC Studios + - Animation Do + - Ankama + - APPP + - Ardustry Entertainment + - Arms + - Artland + - Artmic + - Arvo Animation + - Asahi Production + - Ashi Productions + - asread. + - AtelierPontdarc + - B.CMAY PICTURES + - Bad Hat Harry Productions + - Bad Robot + - Bad Wolf + - Bakken Record + - Bandai Namco Pictures + - Bardel Entertainment + - BBC Studios + - Bee Train + - Berlanti Productions + - Bibury Animation Studios + - bilibili + - Blade + - Blown Deadline Productions - Blue Sky Studios - Blumhouse Productions + - Blur Studio + - Bones + - Bosque Ranch Productions + - Box to Box Films + - Brain's Base + - Brandywine Productions + - Bridge + - C-Station + - C2C + - Calt Production + - Canal+ + - Carnival Films + - Castle Rock Entertainment + - CBS Productions + - CBS Studios + - Centropolis Entertainment - Chernin Entertainment + - Children's Playground Entertainment + - Chimp Television + - Cinergi Pictures Entertainment + - Cloud Hearts + - CloverWorks + - Colored Pencil Animation - Columbia Pictures + - CoMix Wave Films + - Connect - Constantin Film + - Cowboy Films + - Craftar Studios + - Creators in Pack + - CygamesPictures + - Dark Horse Entertainment + - David Production + - DC Comics + - Dino De Laurentiis Company + - Diomedéa + - DLE + - Doga Kobo + - domerica + - Doozer + - Dreams Salon Entertainment Culture - DreamWorks Studios + - DreamWorks Pictures + - Drive + - Eleventh Hour Films + - EMT Squared + - Encourage Films + - Endeavor Content + - ENGI + - Entertainment One + - Eon Productions + - Expectation Entertainment + - Fandango + - feel. + - Felix Film + - Fenz + - FilmDistrict + - FilmNation Entertainment + - Fortiche Production + - Frederator Studios + - Fuqua Films + - GAINAX + - Gallop + - Gallagher Films Ltd + - Gary Sanchez Productions + - Gaumont + - Geek Toys + - Gekkou + - Gemba + - GENCO + - Generator Entertainment + - Geno Studio + - GoHands + - Gonzo + - Graphinica - Grindstone Entertainment Group + - Group Tac + - Hal Film Maker + - Hallmark Channel + - Haoliners Animation League - Happy Madison Productions + - Hartswood Films + - HBO + - Hoods Entertainment + - Hotline - Illumination Entertainment + - Imagin + - Imperative Entertainment - Ingenious Media + - J.C.Staff + - Jerry Bruckheimer Films + - Jumondou + - Kadokawa + - Kazak Productions + - Kennedy Miller Productions + - Khara + - Kilter Films + - Kinema Citrus + - Kjam Media + - Kudos + - Kyoto Animation + - Lan Studio + - LandQ Studio + - Landscape Entertainment + - Laura Ziskin Productions + - Lay-duce - Legendary Pictures + - Lerche + - Let's Not Turn This Into a Whole Big Production + - LIDENFILMS - Lionsgate + - Lord Miller Productions - Lucasfilm Ltd + - M.S.C + - Madhouse + - Magic Bus + - Maho Film - Malevolent Films + - Mandarin + - Mandarin Motion Pictures Limited + - Manglobe + - MAPPA + - Marvel Animation - Marvel Studios + - Maximum Effort + - Media Res - Metro-Goldwyn-Mayer - Millennium Films + - Millepensee - Miramax + - Namu Animation + - NAZ - New Line Cinema + - Nexus + - Nickelodeon Animation Studio + - Nippon Animation + - Nomad + - Nut + - Okuruto Noboru + - OLM + - Orange + - Ordet - Original Film - Orion Pictures + - OZ + - P.A. Works + - P.I.C.S. + - Paramount Animation - Paramount Pictures + - Paramount Television Studios + - Passione + - Pb Animation Co. Ltd + - Pierrot + - Piki Films + - Pine Jam - Pixar - - PlanB Entertainment + - Plan B Entertainment + - Platinum Vision + - PlayStation Productions + - Plum Pictures + - Polygon Pictures + - Pony Canyon + - Powerhouse Animation Studios + - PRA + - Production +h. + - Production I.G + - Production IMS + - Production Reed + - Project No.9 + - Prospect Park + - Pulse Films + - Quad + - Radix + - RatPac Entertainment + - Red Dog Culture House + - Regency Pictures + - Reveille Productions + - Revoroot + - RocketScience + - Saetta + - SANZIGEN + - Satelight + - Science SARU + - Scott Free Productions + - Sean Daniel Company + - Secret Hideout + - See-Saw Films + - Sentai Filmworks + - Seven Arcs + - Shaft + - Shin-Ei Animation + - Shogakukan + - Showtime Networks + - Shuka + - Signal.MD + - Sil-Metropole Organisation + - SILVER LINK. + - SISTER + - Sixteen String Jack Productions + - Sky studios + - Skydance + - Sony Pictures Animation - Sony Pictures + - Spyglass Entertainment + - Staple Entertainment + - Studio 3Hz + - Studio A-CAT + - Studio Babelsberg + - Studio Bind + - Studio Blanc. + - Studio Chizu + - Studio Comet + - Studio Deen + - Studio Dragon + - Studio Elle + - Studio Flad - Studio Ghibli + - Studio Gokumi + - Studio Guts + - Studio Hibari + - Studio Kafka + - Studio Kai + - Studio Mir + - studio MOTHER + - Studio Palette + - Studio Rikka + - Studio Signpost + - Studio VOLN + - STUDIO4°C - Summit Entertainment + - Sunrise Beyond + - Sunrise + - Syfy + - Syncopy + - SynergySP + - Tall Ship Productions + - Tatsunoko Production + - Team Downey + - Telecom Animation Film + - Tezuka Productions + - The Donners' Company + - The Kennedy-Marshall Company + - The Linson Company + - The Littlefield Company + - The Mark Gordon Company + - The Weinstein Company + - Titmouse + - TMS Entertainment + - TNK + - Toei Animation + - Tomorrow Studios + - Topcraft + - Touchstone Pictures + - Touchstone Television + - Triangle Staff + - Trigger + - TriStar Pictures + - TROYCA + - TYO Animations + - Typhoon Graphics + - UCP + - ufotable + - Universal Animation Studios - Universal Pictures + - Universal Television + - V1 Studio - Village Roadshow Pictures + - W-Toon Studio + - W. Chump and Sons + - Walt Disney Animation Studios - Walt Disney Pictures + - Warner Animation Group - Warner Bros. Pictures + - Warner Bros. Television + - Wawayu Animation + - Wayfare Entertainment + - White Fox + - Wiedemann & Berg Television + - Wit Studio + - Wolfsbane + - Xebec + - Yokohama Animation Lab + - Yostar Pictures + - Yumeta Company + - Zero-G + - Zexcs ``` ### Default `addons` ```yaml addons: + 8bit: + - 8-bit 20th Century Studios: - 20th Century - 20th Century Animation - 20th Century Fox + AIC: + - AIC ASTA + - AIC A.S.T.A + - AIC Build + - AAIC PLUS+ + - AIC RIGHTS + - AIC Spirits + Ajia-Do: + - Ajiado Amazon Studios: - Amazon + Amblin Entertainment: + - Amblin Television + APPP: + - A.P.P.P. + asread.: + - Asread + AtelierPontdarc: + - Atelier Pontdarc + B.CMAY PICTURES: + - G.CMay Animation & Film + Bandai Namco Pictures: + - Bandai Visual + - Bandai Visual Company + BBC Studios: + - BBC + - BBC Studios Natural History Unit + Bibury Animation Studios: + - Bibury Animation CG Blue Sky Studios: - Blue Sky Films + Cloud Hearts: + - CLOUDHEARTS Columbia Pictures: - Columbia TriStar - - TriStar + CoMix Wave Films: + - CoMix Wave + Craftar Studios: + - Craftar + CygamesPictures: + - Cygames Pictures DreamWorks Studios: - DreamWorks - DreamWorks Animation + - DreamWorks Animation Television + - DreamWorks Classics + EMT Squared: + - EMT²0 + feel.: + - Feel + Gallop: + - Studio Gallop + Gaumont: + - Gaumont International Television + Geek Toys: + - GEEKTOYS + Gekkou: + - GEKKOU Production + GoHands: + - Go Hands + Gonzo: + - Gonzo Digimation + Hallmark Channel: + - Hallmark Entertainment + - Hallmark Media + - Hallmark Movies & Mysteries + - The Hallmark Channel + Haoliners Animation League: + - Haoliners Huimeng Animation + - Haoliners Animation Illumination Entertainment: - Illumination Films + J.C.Staff: + - J.C. Staff + Khara: + - Studio Khara + Lan Studio: + - Studio LAN + Legendary Pictures: + - Legendary Television + LIDENFILMS: + - Liden Films Lucasfilm Ltd: - Lucasfilm + - Lucasfilm Animation + Mandarin: + - Mandarin Films + - Mandarin Television Marvel Studios: - - Marvel Animation - Marvel Enterprises - Marvel Entertainment - Marvel @@ -149,21 +528,67 @@ addons: - MGM New Line Cinema: - New Line + Nexus: + - Nexus Factory + P.A. Works: + - P.A.WORKS Paramount Pictures: - Paramount - - Paramount Animation + Pierrot: + - Pierrot Plus + - Studio Pierrot Pixar: - Pixar Animation Studios + Plan B Entertainment: + - PlanB Entertainment + Platinum Vision: + - PlatinumVision + Production +h.: + - Production +h + RatPac Entertainment: + - Dune Entertainment + Regency Pictures: + - Regency Enterprises + - New Regency Pictures + - Monarchy Enterprises S.a.r.l. + Science SARU: + - Science Saru + Seven Arcs: + - Seven + - Seven Arcs Pictures + Shogakukan: + - Shogakukan Production + Signal.MD: + - Signal MD + SILVER LINK.: + - Silver Link + Sky studios: + - British Sky Broadcasting + - British Sky Broadcasting(BSkyB) Sony Pictures: - Sony - Sony Pictures Animation + - Sony Pictures Television Studios + Studio Blanc.: + - Studio Blanc + Studio Deen: + - Studio DEEN + The Kennedy-Marshall Company: + - The Kennedy/Marshall Company + The Mark Gordon Company: + - Tiger Aspect Productions + TMS Entertainment: + - Tokyo Movie Shinsha + TriStar Pictures: + - TriStar Universal Pictures: - Universal - Universal Animation Studios Walt Disney Pictures: - Disney - - Walt Disney Animation Studios Warner Bros. Pictures: - Warner - Warner Animation Group + Yokohama Animation Lab: + - Yokohama Animation Laboratory ``` \ No newline at end of file diff --git a/docs/defaults/playlist.md b/docs/defaults/playlist.md index 0c04a290..17a9623a 100644 --- a/docs/defaults/playlist.md +++ b/docs/defaults/playlist.md @@ -94,7 +94,7 @@ The below Trakt lists are used to populate the playlists associated with the key trakt_list: arrow: https://trakt.tv/users/donxy/lists/arrowverse dcau: https://trakt.tv/users/donxy/lists/dc-animated-series-universe - dragonball: https://trakt.tv/users/qamazi/lists/dragon-ball-binged-out + dragonball: https://trakt.tv/users/grawler/lists/dragon-ball-in-order mcu: https://trakt.tv/users/donxy/lists/marvel-cinematic-universe pokemon: https://trakt.tv/users/munch54/lists/pokemon-watching-order startrek: https://trakt.tv/users/goodevilgenius/lists/star-trek-chronology diff --git a/requirements.txt b/requirements.txt index cb4c2361..5909ff41 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,7 +3,7 @@ GitPython==3.1.31 lxml==4.9.2 num2words==0.5.12 pathvalidate==3.0.0 -pillow==9.5.0 +pillow==10.0.0 PlexAPI==4.14.0 psutil==5.9.5 python-dotenv==1.0.0