[15] Merge remote-tracking branch 'yozora/nightly' into nightly

pull/1269/head
meisnate12 2 years ago
commit 6f01c3c064

@ -120,3 +120,12 @@ playlists:
trakt_url: https://trakt.tv/users/heyitsbea/lists/x-men trakt_url: https://trakt.tv/users/heyitsbea/lists/x-men
summary_xmen: The X-Men are a fictional team of superheroes appearing in American comic books published by Marvel Comics, first appearing in The X-Men Issue 1. Although initially cancelled in 1970, following its 1975 revival and subsequent direction under writer Chris Claremont, it became one of the most recognizable and successful franchises of Marvel Comics. summary_xmen: The X-Men are a fictional team of superheroes appearing in American comic books published by Marvel Comics, first appearing in The X-Men Issue 1. Although initially cancelled in 1970, following its 1975 revival and subsequent direction under writer Chris Claremont, it became one of the most recognizable and successful franchises of Marvel Comics.
- name: arr - name: arr
Dragon Ball (Timeline Order):
variables:
key: dragonball
template:
- name: playlist
trakt_url: https://trakt.tv/users/qamazi/lists/dragon-ball-binged-out
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

@ -9,7 +9,7 @@ This Default file requires [Trakt Authentication](../config/trakt)
## Playlists ## Playlists
| Playlist | Key | Description | | Playlist | Key | Description |
|:---------------------------------------------|:------------|:----------------------------------------------------------------------------------| |:---------------------------------------------|:-------------|:----------------------------------------------------------------------------------|
| `Arrowverse (Timeline Order)` | `arrow` | Playlist of Movies and Episodes in the Arrowverse (Timeline Order) | | `Arrowverse (Timeline Order)` | `arrow` | Playlist of Movies and Episodes in the Arrowverse (Timeline Order) |
| `Marvel Cinematic Universe (Timeline Order)` | `mcu` | Playlist of Movies and Episodes in the Marvel Cinematic Universe (Timeline Order) | | `Marvel Cinematic Universe (Timeline Order)` | `mcu` | Playlist of Movies and Episodes in the Marvel Cinematic Universe (Timeline Order) |
| `DC Animated Universe (Timeline Order)` | `dcau` | Playlist of Movies and Episodes in the DC Animated Universe (Timeline Order) | | `DC Animated Universe (Timeline Order)` | `dcau` | Playlist of Movies and Episodes in the DC Animated Universe (Timeline Order) |
@ -18,6 +18,7 @@ This Default file requires [Trakt Authentication](../config/trakt)
| `Star Wars (Timeline Order)` | `starwars` | Playlist of Movies and Episodes in the Star Wars (Timeline Order) | | `Star Wars (Timeline Order)` | `starwars` | Playlist of Movies and Episodes in the Star Wars (Timeline Order) |
| `Star Wars The Clone Wars (Timeline Order)` | `clonewars` | Playlist of Movies and Episodes in the Star Wars The Clone Wars (Timeline Order) | | `Star Wars The Clone Wars (Timeline Order)` | `clonewars` | Playlist of Movies and Episodes in the Star Wars The Clone Wars (Timeline Order) |
| `X-Men (Timeline Order)` | `xmen` | Playlist of Movies and Episodes in the X-Men (Timeline Order) | | `X-Men (Timeline Order)` | `xmen` | Playlist of Movies and Episodes in the X-Men (Timeline Order) |
| `Dragon Ball (Timeline Order)` | `dragonball` | Playlist of Movies and Episodes in the Dragon Ball (Timeline Order) |
## Config ## Config
@ -96,4 +97,5 @@ trakt_list:
starwars: https://trakt.tv/users/ruben_vw_/lists/star-wars-canon-timeline starwars: https://trakt.tv/users/ruben_vw_/lists/star-wars-canon-timeline
clonewars: https://trakt.tv/users/tomfin46/lists/star-wars-the-clone-wars-chronological-episode-order clonewars: https://trakt.tv/users/tomfin46/lists/star-wars-the-clone-wars-chronological-episode-order
xmen: https://trakt.tv/users/heyitsbea/lists/x-men xmen: https://trakt.tv/users/heyitsbea/lists/x-men
dragonball: https://trakt.tv/users/qamazi/lists/dragon-ball-binged-out
``` ```

Loading…
Cancel
Save