Skip to content

Commit

Permalink
Merge remote-tracking branch 'Arial-Z/New-studios' into nightly
Browse files Browse the repository at this point in the history
# Conflicts:
#	CHANGELOG
  • Loading branch information
meisnate12 committed Aug 12, 2024
2 parents 49a654b + 5a782b3 commit 997fca0
Show file tree
Hide file tree
Showing 24 changed files with 42 additions and 0 deletions.
1 change: 1 addition & 0 deletions .github/.wordlist.txt
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ diiivoycolor
DIR
dir
DiskStation
DisneyToon
dockerfile
dockerfiles
DockerHub
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ Added [`letterboxd_user_lists`](https://kometa.wiki/en/latest/files/dynamic_type

# Updates
F1 session naming improvements
Added new studios : Disney Television Animation, DisneyToon Studios, Dynamic Planning, Film4 Productions, Golden Harvest, Hungry Man, Screen Gems, Shaw Brothers, Studio Live, The Stone Quarry

# Defaults

Expand Down
10 changes: 10 additions & 0 deletions defaults/both/studio.yml
Original file line number Diff line number Diff line change
Expand Up @@ -301,11 +301,14 @@ dynamic_collections:
- DC Comics
- Dimension Films
- Dino De Laurentiis Company
- Disney Television Animation
- DisneyToon Studios
- Don Simpson Jerry Bruckheimer Films
- Doozer
- Dreams Salon Entertainment Culture
- DreamWorks Studios
- DreamWorks Pictures
- Dynamic Planning
- Eleventh Hour Films
- EMJAG Productions
- Endeavor Content
Expand All @@ -317,6 +320,7 @@ dynamic_collections:
- Exposure Labs
- Fandango
- Fields Entertainment
- Film4 Productions
- FilmDistrict
- FilmNation Entertainment
- Flynn Picture Company
Expand All @@ -332,6 +336,7 @@ dynamic_collections:
- Gary Sanchez Productions
- Gaumont
- Generator Entertainment
- Golden Harvest
- Gracie Films
- Green Hat Films
- Grindstone Entertainment Group
Expand All @@ -344,6 +349,7 @@ dynamic_collections:
- HBO
- Heyday Films
- Hughes Entertainment
- Hungry Man
- Hurwitz & Schlossberg Productions
- Hyperobject Industries
- Icon Entertainment International
Expand Down Expand Up @@ -435,11 +441,13 @@ dynamic_collections:
- Scion Films
- Scott Free Productions
- Sculptor Media
- Screen Gems
- Sean Daniel Company
- Searchlight Pictures
- Secret Hideout
- See-Saw Films
- Serendipity Pictures
- Shaw Brothers
- Show East
- Showtime Networks
- Sil-Metropole Organisation
Expand All @@ -461,6 +469,7 @@ dynamic_collections:
- Studio 8
- Studio Babelsberg
- Studio Dragon
- Studio Live
- STX Entertainment
- Summit Entertainment
- Syfy
Expand All @@ -477,6 +486,7 @@ dynamic_collections:
- The Littlefield Company
- The Mark Gordon Company
- The Sea Change Project
- The Stone Quarry
- The Weinstein Company
- Tim Burton Productions
- TOHO
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
30 changes: 30 additions & 0 deletions defaults/overlays/studio.yml
Original file line number Diff line number Diff line change
Expand Up @@ -847,6 +847,12 @@ overlays:
Dino De Laurentiis Company:
template: [name: standard, name: studios]

Disney Television Animation:
template: [name: standard, name: studios]

DisneyToon Studios:
template: [name: standard, name: studios]

Don Simpson Jerry Bruckheimer Films:
template: [name: standard, name: studios]

Expand All @@ -862,6 +868,9 @@ overlays:
DreamWorks Pictures:
template: [name: standard, name: studios]

Dynamic Planning:
template: [name: standard, name: studios]

Eleventh Hour Films:
template: [name: standard, name: studios]

Expand Down Expand Up @@ -895,6 +904,9 @@ overlays:
Fields Entertainment:
template: [name: standard, name: studios]

Film4 Productions:
template: [name: standard, name: studios]

FilmDistrict:
template: [name: standard, name: studios]

Expand Down Expand Up @@ -940,6 +952,9 @@ overlays:
Generator Entertainment:
template: [name: standard, name: studios]

Golden Harvest:
template: [name: standard, name: studios]

Gracie Films:
template: [name: standard, name: studios]

Expand Down Expand Up @@ -976,6 +991,9 @@ overlays:
Hughes Entertainment:
template: [name: standard, name: studios]

Hungry Man:
template: [name: standard, name: studios]

Hurwitz & Schlossberg Productions:
template: [name: standard, name: studios]

Expand Down Expand Up @@ -1249,6 +1267,9 @@ overlays:
Sculptor Media:
template: [name: standard, name: studios]

Screen Gems:
template: [name: standard, name: studios]

Sean Daniel Company:
template: [name: standard, name: studios]

Expand All @@ -1264,6 +1285,9 @@ overlays:
Serendipity Pictures:
template: [name: standard, name: studios]

Shaw Brothers:
template: [name: standard, name: studios]

Show East:
template: [name: standard, name: studios]

Expand Down Expand Up @@ -1327,6 +1351,9 @@ overlays:
Studio Dragon:
template: [name: standard, name: studios]

Studio Live:
template: [name: standard, name: studios]

STX Entertainment:
template: [name: standard, {name: studios, search: [STX Entertainment, STX Films]}]

Expand Down Expand Up @@ -1375,6 +1402,9 @@ overlays:
The Sea Change Project:
template: [name: standard, name: studios]

The Stone Quarry:
template: [name: standard, name: studios]

The Weinstein Company:
template: [name: standard, name: studios]

Expand Down

0 comments on commit 997fca0

Please sign in to comment.