fix(profile): revert merge conflict

This commit is contained in:
Seraphys 2025-03-16 15:00:47 -05:00 committed by GitHub
parent 344e33b1e6
commit 3e60dafb24
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 31 additions and 37 deletions

View File

@ -1,3 +1,22 @@
name: 2160p Balanced
description: "2160p Balanced targets consistent & immutable 2160p **HDR WEB-DLs w/\
\ Lossy Audio**. \n- Special considerations are given to **Balanced** groups who\
\ prioritize **streaming optimisation** over quality, falling somewhere around a\
\ tier 2 WEB-DL. This includes groups like **BHDStudio**, **HONE** and **hallowed**.\n\
- If no 2160p WEB-DL can be found, the profile will fall back to the 1080p Quality\
\ Profile.\n- Transparent 2160p Encodes (\xE0 la 2160p Quality) are not allowed\
\ as fallback since they are comparatively much larger than 2160p WEB-DLs"
tags:
- 2160p
- HDR
- x264
- h265
- Lossy Audio
- Balanced Focused
upgradesAllowed: true
minCustomFormatScore: 0
upgradeUntilScore: 600
minScoreIncrement: 1
custom_formats: custom_formats:
- name: 2160p Balanced Tier 1 - name: 2160p Balanced Tier 1
score: 1180 score: 1180
@ -125,8 +144,6 @@ custom_formats:
score: 5 score: 5
- name: SDR - name: SDR
score: -80 score: -80
- name: 2160p Bluray
score: -100
- name: 3D - name: 3D
score: -9999 score: -9999
- name: AV1 - name: AV1
@ -173,31 +190,18 @@ custom_formats:
score: -9999 score: -9999
- name: x265 (Missing) - name: x265 (Missing)
score: -9999 score: -9999
description: "2160p Balanced targets consistent & immutable 2160p **HDR WEB-DLs w/\
\ Lossy Audio**. \n- Special considerations are given to **Balanced** groups who\
\ prioritize **streaming optimisation** over quality, falling somewhere around a\
\ tier 2 WEB-DL. This includes groups like **BHDStudio**, **HONE** and **hallowed**.\n\
- If no 2160p WEB-DL can be found, the profile will fall back to the 1080p Quality\
\ Profile.\n- Transparent 2160p Encodes (\xE0 la 2160p Quality) are not allowed\
\ as fallback since they are comparatively much larger than 2160p WEB-DLs"
language: must_original
minCustomFormatScore: 0
minScoreIncrement: 1
name: 2160p Balanced
qualities: qualities:
- description: Balanced capable releases. Typically WEB-DL would be the overwhelming - id: -1
majority of releases, but there are occasional streaming optimised encodes that name: 2160p Balanced
should be preferred. description: Balanced capable releases. Typically WEB-DL would be the overwhelming majority of releases, but there are occasional streaming optimised encodes that should be preferred.
id: -1
name: Balanced Capable
qualities: qualities:
- id: 4 - id: 4
name: Bluray-2160p name: Bluray-2160p
- id: 5 - id: 5
name: WEBDL-2160p name: WEBDL-2160p
- description: Indistinguishable from source - id: -2
id: -2
name: 1080p Transparent name: 1080p Transparent
description: Indistinguishable from source
qualities: qualities:
- id: 10 - id: 10
name: Bluray-1080p name: Bluray-1080p
@ -205,9 +209,9 @@ qualities:
name: WEBDL-1080p name: WEBDL-1080p
- id: 11 - id: 11
name: WEBRip-1080p name: WEBRip-1080p
- description: Fallback to 720p when 1080p cannot be found. - id: -3
id: -3
name: 720p Fallback name: 720p Fallback
description: Fallback to 720p when 1080p cannot be found.
qualities: qualities:
- id: 13 - id: 13
name: Bluray-720p name: Bluray-720p
@ -215,9 +219,9 @@ qualities:
name: WEBDL-720p name: WEBDL-720p
- id: 15 - id: 15
name: WEBRip-720p name: WEBRip-720p
- description: Standard Definition Fallbacks - id: -4
id: -4
name: SD Fallback name: SD Fallback
description: Standard Definition Fallbacks
qualities: qualities:
- id: 22 - id: 22
name: DVD name: DVD
@ -227,18 +231,8 @@ qualities:
name: WEBRip-480p name: WEBRip-480p
- id: 24 - id: 24
name: SDTV name: SDTV
tags:
- 2160p
- HDR
- x264
- h265
- Lossy Audio
- Balanced Focused
upgradeUntilScore: 600
upgrade_until: upgrade_until:
description: Balanced capable releases. Typically WEB-DL would be the overwhelming
majority of releases, but there are occasional streaming optimised encodes that
should be preferred.
id: -1 id: -1
name: Balanced Capable name: 2160p Balanced
upgradesAllowed: true description: Balanced capable releases. Typically WEB-DL would be the overwhelming majority of releases, but there are occasional streaming optimised encodes that should be preferred.
language: must_original