Merge branch 'nightly' into plex-overide-verify-ssl

pull/1900/head
Kyle Sullivan 2 months ago committed by GitHub
commit 88f9a3b01e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

@ -1,59 +1,34 @@
# Requirements Update (requirements will need to be reinstalled)
Updated arrapi requirement to 1.4.7
Updated GitPython requirement to 3.1.40
Updated lxml requirement to 5.0.0
Updated num2words requirement to 0.5.13
Updated pillow requirement to 10.2.0
Updated PlexAPI requirement to 4.15.7
Updated psutil requirement to 5.9.7
Updated ruamel.yaml requirement to 0.18.5
Updated schedule requirement to 1.2.1
Updated tmdbapis requirement to 1.2.6
Added setuptools requirement at 69.0.3
Updated gitpython requirement to 3.1.41
Updated lxml requirement to 5.1.0
Updated psutil requirement to 5.9.8
Updated python-dotenv requirement to 1.0.1
# New Features
Introduced (Run Order)[https://metamanager.wiki/en/latest/config/settings/#run-order] attribute which allows the user to amend the way that each library is executed.
Introduced [IMDb Search Builder](https://metamanager.wiki/en/latest/files/builders/imdb/#imdb-search) following IMDb UI rework.
- `imdb_list` can no longer be used for Title or Keyword Searches, these must be transferred to `imdb_search` builders.
Introduced [IMDb Award Builder](https://metamanager.wiki/en/latest/files/builders/imdb/#imdb-award).
Added IMDb Awards to [Dynamic Collection Types](https://metamanager.wiki/en/latest/files/dynamic_types/#imdb-awards)
PMM Default `other_awards` has been deprecated and replace with new award PMM Default files:
- [`berlinale`](https://metamanager.wiki/en/latest/defaults/award/berlinale/) - Berlin International Film Festival Awards
- [`cesar`](https://metamanager.wiki/en/latest/defaults/award/cesar/) - César Awards
- [`nfr`](https://metamanager.wiki/en/latest/defaults/award/nfr/) - National Film Registry
- [`pca`](https://metamanager.wiki/en/latest/defaults/award/pca/) - People's Choice Awards
- [`razzie`](https://metamanager.wiki/en/latest/defaults/award/razzie/) - Razzie Awards
- [`tiff`](https://metamanager.wiki/en/latest/defaults/award/tiff/) - Toronto International Film Festival Awards
- [`venice`](https://metamanager.wiki/en/latest/defaults/award/venice/) - Venice Film Festival Awards
Reintroduced [Flixpatrol Builder](https://metamanager.wiki/en/latest/builders/flixpatrol/) following introduction of paywalled API.
Added a JSON Schema file which will assist users in validating their configuration file when using a code-aware text editor such as VSCode and VSCodium. This is a work in progress and will help identify basic errors such as specifying "yes" when the available options are "true" and "false"
- If you run into any validation issues which you don't understand, ask in our Discord Server
Added `monitor_existing` to sonarr and radarr. To update the monitored status of items existing in plex to match the `monitor` declared.
Added [Gotify](https://gotify.net/) as a notification service. Thanks @krstn420 for the initial code.
# Updates
Redesigned Wiki with new landing page and new layout using mkdocs.
Introduced batchMultiEdits - this is a major feature introduction that we hope will increase performance for all users. This is a behind-the-scenes change that the user does not need to do anything to take advantage of.
Updated `overlay_path` to `overlay_files` and split `metadata_path` into `collection_files` and `metadata_files`.
Moved `remove_overalys`, `reapply_overlays`, and `reset_overlays` to the [library level](https://metamanager.wiki/en/latest/config/libraries/#remove-overlays) instead of under `overlay_path`.
Removed `schedule` from under `overlay_path` and replaced it with the library level attribute [`schedule_overlays`](https://metamanager.wiki/en/latest/config/libraries/#schedule-overlays).
Removed library-level and collection-level logging, all logging is handled in the meta.log
Added the `score` attribute to the [`anilist_userlist`](https://metamanager.wiki/en/latest/files/builders/anilist/#anilist-userlist) builder.
Added the `episode_actor` attribute to the [`plex_search`](https://metamanager.wiki/en/latest/files/builders/plex/#plex-search) builder.
Added new [BoxOfficeMojo Builder](https://metamanager.wiki/en/latest/files/builders/mojo/) - credit to @nwithan8 for the suggestion and initial code submission
Added new [`trakt_chart` attributes](https://metamanager.wiki/en/latest/files/builders/trakt/#trakt-chart) `network_ids`, `studio_ids`, `votes`, `tmdb_ratings`, `tmdb_votes`, `imdb_ratings`, `imdb_votes`, `rt_meters`, `rt_user_meters`, `metascores` and removed the deprecated `network` attribute
Added [Trakt and MyAnimeList Authentication Page](https://metamanager.wiki/en/latest/config/auth/) allowing users to authenticate against those services directly from the wiki. credit to @chazlarson for developing the script
Trakt Builder `trakt_userlist` value `recommendations` removed and `favorites` added.
Mass Update operations now can be given a list of sources to fall back on when one fails including a manual source.
`mass_content_rating_update` has a new source `mdb_age_rating`
`mass_originally_available_update` has a new source `mdb_digital`
`plex` attributes `clean_bundles`, `empty_trash`, and `optimize` can now take any schedule options to be run only when desired.
Allows users to use the Admin username when specifying playlist users. Thanks @benbou8231!
# Defaults
[PMM Default Award Files](https://metamanager.wiki/en/latest/defaults/files/#award-collections) have been reworked to use the `imdb_award` builder and `imdb_awards` dynamic collection type.
Reintroduced [Flixpatrol Chart Defaults Collections](https://metamanager.wiki/en/latest/defaults/chart/flixpatrol/).
Added Trakt Anticipated to [Trakt Chart Defaults Collections](https://metamanager.wiki/en/latest/defaults/chart/trakt/).
Added DE Content Rating as a PMM Default [Collection](https://metamanager.wiki/en/latest/defaults/both/content_rating_de/) and [Overlay](https://metamanager.wiki/en/latest/defaults/overlays/content_rating_de/)
Added `schedule` and `schedule_<<key>>` template variables to most defaults.
# Bug Fixes
Fixed `(404) not_found` error that presented itself in PMS 1.32.7, as outlined [here](https://discord.com/channels/822460010649878528/1099773891733377065/1174751954367422585)
Fixed issue that would prevent `file_poster` from overriding `url_poster` in the PMM Defaults.
Removed `--cache-libraries` Environment Variable due to inconsistent behaviour that could cause issues.
Fixed issue with `mass_poster_update` incorrectly updating episode posters when it shouldn't.
Fixed issue with `delete_collection_named` running in a collection even if the collection wasn't scheduled to run.
Fixed the Rate Limit on MDbList calls
Fixed collection fields being locked during batch edits when they shouldn't be
Fixed awards dynamic collections where `latest` wasn't pulling the correct values
Fixed `imdb_watchlist`
Fixed `trakt_userlist`
Fixed an issue where sometimes the resolution default overlay would be off center
Fixed multiple issues with playlist deletion. Thanks @benbou8231!
Fixed an issue where dynamic collection errors would sometimes appear before the title of the Dynamic Collection.
Various other Minor Fixes
GitHub issues closed: #1438, #1542, #1563, #1568, #1571, #1585, #1609, #1618, #1621, #1623, #1632, #1636, #1642, #1662, #1666, #1670, #1674, #1688, #1705, #1712, #1749, #1781, #1772, #1786,

@ -46,7 +46,7 @@ Here are some examples of the things you can achieve using Plex Meta Manager!
![Movie Collection Preview](https://metamanager.wiki/en/latest/images/movie-collection-preview.png)
**Example Show Overlays using the [Plex Meta Manager Defaults](https://metamanager.wiki/en/latest/defaults/collections/overlays)** (click to enlarge):
**Example Show Overlays using the [Plex Meta Manager Defaults](https://metamanager.wiki/en/latest/defaults/overlays)** (click to enlarge):
![Show Library Preview](https://metamanager.wiki/en/latest/images/show-library-preview.png)

@ -1 +1 @@
1.20.0
1.20.0-develop34

@ -2,21 +2,21 @@
libraries: # This is called out once within the config.yml file
Movies: # These are names of libraries in your Plex
remove_overlays: false # Set this to true to remove all overlays
collection_files:
- pmm: basic # This is a file within PMM's defaults folder
- pmm: imdb # This is a file within PMM's defaults folder
# see the wiki for how to use local files, folders, URLs, or files from git
overlay_path:
- remove_overlays: false # Set this to true to remove all overlays
overlay_files:
- pmm: ribbon # This is a file within PMM's defaults folder
# see the wiki for how to use local files, folders, URLs, or files from git
TV Shows:
remove_overlays: false # Set this to true to remove all overlays
collection_files:
- pmm: basic # This is a file within PMM's defaults folder
- pmm: imdb # This is a file within PMM's defaults folder
# see the wiki for how to use local files, folders, URLs, or files from git
overlay_path:
- remove_overlays: false # Set this to true to remove all overlays
overlay_files:
- pmm: ribbon # This is a file within PMM's defaults folder
# see the wiki for how to use local files, folders, URLs, or files from git
Anime:
@ -69,7 +69,7 @@ settings:
ignore_ids:
ignore_imdb_ids:
item_refresh_delay: 0
playlist_sync_to_user: all
playlist_sync_to_users: all
playlist_exclude_users:
playlist_report: false
verify_ssl: true
@ -106,6 +106,9 @@ mdblist:
cache_expiration: 60
notifiarr:
apikey: ####################################
gotify:
url: http://192.168.1.12:80
token: ####################################
anidb: # Not required for AniDB builders unless you want mature content
username: ######
password: ######
@ -114,7 +117,9 @@ radarr: # Can be individually specified per library as
token: ################################
add_missing: false
add_existing: false
root_folder_path: S:/Movies
upgrade_existing: false
monitor_existing: false
root_folder_path: "S:/Movies"
monitor: true
availability: announced
quality_profile: HD-1080p
@ -127,6 +132,8 @@ sonarr: # Can be individually specified per library as
token: ################################
add_missing: false
add_existing: false
upgrade_existing: false
monitor_existing: false
root_folder_path: "S:/TV Shows"
monitor: all
quality_profile: HD-1080p

@ -34,7 +34,7 @@ dynamic_collections:
sync: true
data:
event_id: ev0000123
starting: latest-5
starting: latest-4
ending: latest
title_format: BAFTA <<key_name>>
template:

@ -34,7 +34,7 @@ dynamic_collections:
sync: true
data:
event_id: ev0000091
starting: latest-5
starting: latest-4
ending: latest
title_format: Berlinale <<key_name>>
template:

@ -34,7 +34,7 @@ dynamic_collections:
sync: true
data:
event_id: ev0000147
starting: latest-5
starting: latest-4
ending: latest
title_format: Cannes <<key_name>>
template:

@ -35,7 +35,7 @@ dynamic_collections:
sync: true
data:
event_id: ev0000157
starting: latest-5
starting: latest-4
ending: latest
title_format: Cesar <<key_name>>
template:

@ -34,7 +34,7 @@ dynamic_collections:
sync: true
data:
event_id: ev0000133
starting: latest-5
starting: latest-4
ending: latest
title_format: Critics Choice Awards <<key_name>>
template:

@ -58,7 +58,7 @@ dynamic_collections:
sync: true
data:
event_id: ev0000223
starting: latest-5
starting: latest-4
ending: latest
title_format: Emmys <<key_name>>
template:

@ -68,7 +68,7 @@ dynamic_collections:
sync: true
data:
event_id: ev0000292
starting: latest-5
starting: latest-4
ending: latest
title_format: Golden Globe <<key_name>>
template:

@ -33,7 +33,7 @@ dynamic_collections:
sync: true
data:
event_id: ev0000468
starting: latest-5
starting: latest-4
ending: latest
title_format: National Film Registry <<key_name>>
template:

@ -26,8 +26,10 @@ collections:
event_id: ev0000003
event_year: all
category_filter:
- best picture
- best motion picture of the year
- best picture
- best picture, production
- best picture, unique and artistic production
winning: true
Oscars Best Director Winners:
@ -57,7 +59,7 @@ dynamic_collections:
sync: true
data:
event_id: ev0000003
starting: latest-5
starting: latest-4
ending: latest
title_format: Oscars Winners <<key_name>>
template:

@ -42,7 +42,7 @@ dynamic_collections:
sync: true
data:
event_id: ev0000530
starting: latest-5
starting: latest-4
ending: latest
title_format: People's Choice Awards <<key_name>>
template:

@ -34,7 +34,7 @@ dynamic_collections:
sync: true
data:
event_id: ev0000558
starting: latest-5
starting: latest-4
ending: latest
title_format: Razzie <<key_name>>
template:

@ -39,7 +39,7 @@ dynamic_collections:
sync: true
data:
event_id: ev0000598
starting: latest-5
starting: latest-4
ending: latest
title_format: Screen Actors Guild <<key_name>>
template:

@ -34,7 +34,7 @@ dynamic_collections:
sync: true
data:
event_id: ev0000349
starting: latest-5
starting: latest-4
ending: latest
title_format: Independent Spirit Awards <<key_name>>
template:

@ -34,7 +34,7 @@ dynamic_collections:
sync: true
data:
event_id: ev0000631
starting: latest-5
starting: latest-4
ending: latest
title_format: Sundance Film Festival <<key_name>>
template:

@ -41,7 +41,7 @@ dynamic_collections:
sync: true
data:
event_id: ev0000659
starting: latest-5
starting: latest-4
ending: latest
title_format: Toronto International Film Festival <<key_name>>
template:

@ -42,7 +42,7 @@ dynamic_collections:
sync: true
data:
event_id: ev0000681
starting: latest-5
starting: latest-4
ending: latest
title_format: Venice <<key_name>>
template:

@ -0,0 +1,151 @@
##############################################################################
# AU Content Rating Collections #
# Adapted by 2wenty2wo #
# Created by Yozora, Bullmoose20, & Sohjiro #
# EDITING THIS FILE MAY CAUSE PULLING NEW UPDATES TO FAIL #
# https://metamanager.wiki/en/latest/defaults/overlays/content_rating_au #
##############################################################################
external_templates:
pmm: templates
template_variables:
collection_section: "110"
collections:
Ratings Collections:
template:
- name: separator
separator: content_rating
key_name: Ratings
translation_key: separator
dynamic_collections:
AU Content Rating:
type: content_rating
title_format: <<key_name>> <<library_typeU>>s
other_name: Not Rated <<library_typeU>>s
template:
- smart_filter
- shared
other_template:
- other_collection
- smart_filter
- shared
template_variables:
search_term:
default: content_rating
image:
default: content_rating/au/<<key_name>>
other: content_rating/au/NR
translation_key:
default: content_rating
other: content_rating_other
dynamic:
default: true
include:
- G
- PG
- M
- MA15+
- R18+
- X18+
addons:
G:
- au/G
- de/0
- U
- 0
- 1
- 2
- 3
- 4
- 5
- 6
- "01"
- "02"
- "03"
- "04"
- "05"
- "06"
- G
- TV-G
- TV-Y
- G - All Ages
- gb/U
- gb/0+
- E
- gb/E
- A
- no/A
- no/5
- no/05
PG:
- au/PG
- de/6
- gb/9+
- TV-PG
- TV-Y7
- TV-Y7-FV
- PG
- 7
- 8
- 9
- 10
- 11
- "07"
- "08"
- "09"
- PG - Children
- no/6
- no/06
- no/7
- no/07
- no/9
- no/09
- no/10
- no/11
M:
- au/M
- de/12
- gb/12
- no/12
- gb/15
- gb/14+
- TV-14
- 12
- 13
- 14
- 15
- PG-13 - Teens 13 or older
- PG-13
- no/15
MA15+:
- au/MA15+
- de/16
- no/16
- A-17
- TVMA
- TV-MA
- R
- 16
- 17
- M/PG
R18+:
- au/R 18+
- de/18
- gb/18
- M
- 18
- R - 17+ (violence & profanity)
- no/18
- R18
- gb/R18
- gb/X
- X
- NC-17
- R+ - Mild Nudity
- Rx - Hentai
X18+:
- au/X 18+
- de/BPjM Restricted
- BPjM Restricted

@ -0,0 +1,168 @@
##############################################################################
# NZ Content Rating Collections #
# Adapted by nzvengeance #
# Created by Yozora, Bullmoose20, & Sohjiro #
# EDITING THIS FILE MAY CAUSE PULLING NEW UPDATES TO FAIL #
# https://metamanager.wiki/en/latest/defaults/overlays/content_rating_nz #
##############################################################################
external_templates:
pmm: templates
template_variables:
collection_section: "110"
collections:
Ratings Collections:
template:
- name: separator
separator: content_rating
key_name: Ratings
translation_key: separator
dynamic_collections:
NZ Content Rating:
type: content_rating
title_format: <<key_name>> <<library_typeU>>s
other_name: Not Rated <<library_typeU>>s
template:
- smart_filter
- shared
other_template:
- other_collection
- smart_filter
- shared
template_variables:
search_term:
default: content_rating
image:
default: content_rating/nz/<<key_name>>
other: content_rating/nz/NR
translation_key:
default: content_rating
other: content_rating_other
dynamic:
default: true
include:
- G
- PG
- M
- R13
- RP13
- R15
- R16
- RP16
- R18
- RP18
- R
addons:
G:
- au/G
- de/0
- U
- 0
- 1
- 2
- 3
- 4
- 5
- 6
- "01"
- "02"
- "03"
- "04"
- "05"
- "06"
- G
- TV-G
- TV-Y
- G - All Ages
- gb/U
- gb/0+
- E
- gb/E
- A
- no/A
- no/5
- no/05
PG:
- au/PG
- de/6
- gb/9+
- TV-PG
- TV-Y7
- TV-Y7-FV
- PG
- 7
- 8
- 9
- 10
- 11
- "07"
- "08"
- "09"
- PG - Children
- no/6
- no/06
- no/7
- no/07
- no/9
- no/09
- no/10
- no/11
M:
- au/M
- de/12
- gb/12
- no/12
- gb/15
- gb/14+
- TV-14
- 12
- 13
- 14
- 15
- PG-13 - Teens 13 or older
- PG-13
- no/15
R13:
- 13
- 14
RP13:
- 14
R15:
- au/MA15+
- de/16
- no/16
- A-17
- TVMA
- TV-MA
- R
- 16
- 17
- M/PG
R16:
- 16
- 17
RP16:
- 17
R18:
- au/R 18+
- de/18
- gb/18
- M
- 18
- R - 17+ (violence & profanity)
- no/18
- R18
- gb/R18
- gb/X
- X
- NC-17
- R+ - Mild Nudity
- Rx - Hentai
RP18:
- 18
R:
- au/X 18+
- de/BPjM Restricted
- BPjM Restricted

@ -52,12 +52,16 @@ dynamic_collections:
addons:
U:
- gb/U
- gb/Uc
- gb/0+
- gb/6+
- gb/Kids & Family
- G
- TV-Y
- TV-G
- E
- gb/E
- 0
- 1
- 2
- 3
@ -76,6 +80,8 @@ dynamic_collections:
PG:
- gb/PG
- gb/9+
- gb/7
- gb/7+
- TV-PG
- TV-Y7
- TV-Y7-FV
@ -96,6 +102,9 @@ dynamic_collections:
- no/07
12:
- gb/12
- gb/A
- gb/Caution
- gb/G
- PG-13 - Teens 13 or older
- no/9
- no/09
@ -117,6 +126,9 @@ dynamic_collections:
15:
- gb/15
- gb/14+
- gb/16
- gb/16+
- gb/AA
- TV-14
- 13
- 14
@ -125,6 +137,7 @@ dynamic_collections:
- no/16
18:
- gb/18
- gb/18+
- MA-17
- TVMA
- TV-MA

@ -596,6 +596,7 @@ dynamic_collections:
- Haoliners Huimeng Animation
- Haoliners Animation
Illumination Entertainment:
- Illumination
- Illumination Films
J.C.Staff:
- J.C. Staff

@ -84,7 +84,7 @@ dynamic_collections:
# check1
trakt_url:
mcu: https://trakt.tv/users/donxy/lists/marvel-cinematic-universe
trek: https://trakt.tv/users/wdvhucb/lists/star-trek
trek: https://trakt.tv/users/dgw/lists/star-trek-canon
middle: https://trakt.tv/users/oya-kesh/lists/middle-earth
# check2
mdblist_url:

@ -0,0 +1,81 @@
##############################################################################
# AU Content Rating Overlay #
# Adapted by 2wenty2wo #
# Created by Yozora, Bullmoose20, & Sohjiro #
# EDITING THIS FILE MAY CAUSE PULLING NEW UPDATES TO FAIL #
# https://metamanager.wiki/en/latest/defaults/overlays/content_rating_au #
##############################################################################
external_templates:
pmm: templates
template_variables:
default:
key: <<overlay_name>>
horizontal_offset: 15
horizontal_align: left
vertical_offset: 270
vertical_align: bottom
back_width: 305
back_height: 105
back_radius: 30
back_color: '#00000099'
conditionals:
inside_color:
default: "c"
conditions:
- color: false
value: ""
pmm:
conditions:
- file.exists: false
file_<<key>>.exists: false
url.exists: false
url_<<key>>.exists: false
git.exists: false
git_<<key>>.exists: false
repo.exists: false
repo_<<key>>.exists: false
value: cr/au_<<overlay_name>><<inside_color>>
templates:
cr_au:
ignore_blank_results: true
plex_search:
validate: false
any:
content_rating: <<rating>>
overlays:
g:
template:
- name: standard
- {name: cr_au, rating: "au/G, de/0, U, 0, 1, 01, 2, 02, 3, 03, 4, 04, 5, 05, 6, 06, G, TV-G, TV-Y, G - All Ages, gb/U, gb/0+, E, gb/E, A, no/A, no/5, no/05"}
pg:
template:
- name: standard
- {name: cr_au, rating: "au/PG, de/6, gb/9+, TV-PG, TV-Y7, TV-Y7-FV, PG, 7, 07, 8, 08, 9, 09, 10, 11, PG - Children, no/6, no/06, no/7, no/07, no/9, no/09, no/10, no/11"}
m:
template:
- name: standard
- {name: cr_au, rating: "au/M, de/12, gb/12, 12, no/12, gb/15, gb/14+, TV-14, 12, 13, 14, 15, PG-13 - Teens 13 or older, PG-13, no/15"}
ma:
template:
- name: standard
- {name: cr_au, rating: "au/MA15+, de/16, no/16, A-17, TVMA, TV-MA, R, 16, 17, M/PG"}
r:
template:
- name: standard
- {name: cr_au, rating: "au/R 18+, de/18, gb/18, M, 18, R - 17+ (violence & profanity), no/18, R18, gb/R18, gb/X, X, NC-17, R+ - Mild Nudity, Rx - Hentai"}
x:
template:
- name: standard
- {name: cr_au, rating: "au/X 18+, de/BPjM Restricted, BPjM Restricted"}
nr:
template:
- {name: standard, key: nr}
- {name: cr_au, rating: "None, NR, Not Rated, Unrated, de/Unrated, de/Not Rated, au/Unrated, au/Not Rated"}

@ -0,0 +1,107 @@
##############################################################################
# NZ Content Rating Overlay #
# Adapted by nzvengeance #
# Created by Yozora, Bullmoose20, & Sohjiro #
# EDITING THIS FILE MAY CAUSE PULLING NEW UPDATES TO FAIL #
# https://metamanager.wiki/en/latest/defaults/overlays/content_rating_nz #
##############################################################################
external_templates:
pmm: templates
template_variables:
default:
key: <<overlay_name>>
horizontal_offset: 15
horizontal_align: left
vertical_offset: 270
vertical_align: bottom
back_width: 305
back_height: 105
back_radius: 30
back_color: '#00000099'
conditionals:
inside_color:
default: "c"
conditions:
- color: false
value: ""
pmm:
conditions:
- file.exists: false
file_<<key>>.exists: false
url.exists: false
url_<<key>>.exists: false
git.exists: false
git_<<key>>.exists: false
repo.exists: false
repo_<<key>>.exists: false
value: cr/nz_<<overlay_name>><<inside_color>>
templates:
cr_nz:
ignore_blank_results: true
plex_search:
validate: false
any:
content_rating: <<rating>>
overlays:
g:
template:
- name: standard
- {name: cr_nz, rating: "au/G, de/0, U, 0, 1, 01, 2, 02, 3, 03, 4, 04, 5, 05, 6, 06, G, TV-G, TV-Y, G - All Ages, gb/U, gb/0+, E, gb/E, A, no/A, no/5, no/05"}
pg:
template:
- name: standard
- {name: cr_nz, rating: "au/PG, de/6, gb/9+, TV-PG, TV-Y7, TV-Y7-FV, PG, 7, 07, 8, 08, 9, 09, 10, 11, PG - Children, no/6, no/06, no/7, no/07, no/9, no/09, no/10, no/11"}
m:
template:
- name: standard
- {name: cr_nz, rating: "au/M, de/12, gb/12, 12, no/12, gb/15, gb/14+, TV-14, 12, 13, 14, 15, PG-13 - Teens 13 or older, PG-13, no/15"}
r13:
template:
- name: standard
- {name: cr_nz, rating: "au/M, de/12, gb/12, 12, no/12, gb/15, gb/14+, TV-14, 12, 13, 14, 15, PG-13 - Teens 13 or older, PG-13, no/15"}
rp13:
template:
- name: standard
- {name: cr_nz, rating: "au/M, de/12, gb/12, 12, no/12, gb/15, gb/14+, TV-14, 12, 13, 14, 15, PG-13 - Teens 13 or older, PG-13, no/15"}
r15:
template:
- name: standard
- {name: cr_nz, rating: "au/MA15+, de/16, no/16, A-17, TVMA, TV-MA, R, 16, 17, M/PG"}
r16:
template:
- name: standard
- {name: cr_nz, rating: "au/MA15+, de/16, no/16, A-17, TVMA, TV-MA, R, 16, 17, M/PG"}
rp16:
template:
- name: standard
- {name: cr_nz, rating: "au/MA15+, de/16, no/16, A-17, TVMA, TV-MA, R, 16, 17, M/PG"}
r:
template:
- name: standard
- {name: cr_nz, rating: "au/R 18+, de/18, gb/18, M, 18, R - 17+ (violence & profanity), no/18, R18, gb/R18, gb/X, X, NC-17, R+ - Mild Nudity, Rx - Hentai"}
r18:
template:
- name: standard
- {name: cr_nz, rating: "au/X 18+, de/BPjM Restricted, BPjM Restricted"}
rp18:
template:
- name: standard
- {name: cr_nz, rating: "au/X 18+, de/BPjM Restricted, BPjM Restricted"}
nr:
template:
- {name: standard, key: nr}
- {name: cr_nz, rating: "None, NR, Not Rated, Unrated, de/Unrated, de/Not Rated, au/Unrated, au/Not Rated"}

@ -48,17 +48,17 @@ overlays:
u:
template:
- name: standard
- {name: cr_uk, rating: "U, 1, 01, 2, 02, 3, 03, 4, 04, 5, 05, 6, 06, G, TV-G, TV-Y, G - All Ages, gb/U, gb/0+, E, gb/E, A, no/A"}
- {name: cr_uk, rating: "U, 0, 1, 01, 2, 02, 3, 03, 4, 04, 5, 05, 6, 06, G, TV-G, TV-Y, G - All Ages, gb/U, gb/Uc, gb/0+, gb/6+, gb/Kids & Family, E, gb/E, A, no/A"}
pg:
template:
- name: standard
- {name: cr_uk, rating: "gb/PG, gb/9+, TV-PG, TV-Y7, TV-Y7-FV, PG, 7, 07, 8, 08, 9, 09, 10, 11, PG - Children, no/5, no/05, no/6, no/06, no/7, no/07"}
- {name: cr_uk, rating: "gb/PG, gb/9+, gb/7, gb/7+, TV-PG, TV-Y7, TV-Y7-FV, PG, 7, 07, 8, 08, 9, 09, 10, 11, PG - Children, no/5, no/05, no/6, no/06, no/7, no/07"}
12:
template:
- name: standard
- {name: cr_uk, rating: "gb/12, 12, PG-13 - Teens 13 or older, no/9, no/09, no/10, no/11, no/12"}
- {name: cr_uk, rating: "gb/12, gb/A, gb/Caution, gb/G, PG-13 - Teens 13 or older, no/9, no/09, no/10, no/11, no/12"}
12a:
template:
@ -68,12 +68,12 @@ overlays:
15:
template:
- name: standard
- {name: cr_uk, rating: "gb/15, gb/14+, TV-14, 13, 14, 15, PG-13 - Teens 13 or older, no/15, no/16"}
- {name: cr_uk, rating: "gb/15, gb/14+, gb/16, gb/16+, gb/AA, TV-14, 13, 14, 15, PG-13 - Teens 13 or older, no/15, no/16"}
18:
template:
- name: standard
- {name: cr_uk, rating: "gb/18, MA-17, TVMA, TV-MA, R, 16, 17, 18, R - 17+ (violence & profanity), no/18"}
- {name: cr_uk, rating: "gb/18, gb/18+, MA-17, TVMA, TV-MA, R, 16, 17, 18, R - 17+ (violence & profanity), no/18"}
r18:
template:

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 21 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 10 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.3 KiB

After

Width:  |  Height:  |  Size: 7.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 13 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 13 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.3 KiB

After

Width:  |  Height:  |  Size: 7.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.5 KiB

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save