Dev Merge

custom_formats/1080p Bluray.yml

@@ -13,4 +13,9 @@ conditions:
   required: true
   source: bluray
   type: source
+- name: Not Remux
+  type: release_title
+  required: true
+  negate: true
+  pattern: Remux
 tests: []

custom_formats/1080p Quality Tier 1.yml

@@ -11,11 +11,21 @@ conditions:
   required: true
   resolution: 1080p
   type: resolution
-- name: Not WEB-DL
-  type: source
-  required: true
+- name: Not Remux
   negate: true
-  source: web_dl
+  pattern: Remux
+  required: true
+  type: release_title
+- name: Bluray
+  type: source
+  required: false
+  negate: false
+  source: bluray
+- name: WEBRip
+  negate: false
+  required: false
+  source: webrip
+  type: source
 - name: DON
   negate: false
   pattern: DON

custom_formats/1080p Quality Tier 2.yml

@@ -11,10 +11,20 @@ conditions:
   required: true
   resolution: 1080p
   type: resolution
-- name: Not WEB-DL
+- name: Not Remux
   negate: true
+  pattern: Remux
   required: true
-  source: web_dl
+  type: release_title
+- name: Bluray
+  type: source
+  required: false
+  negate: false
+  source: bluray
+- name: WEBRip
+  negate: false
+  required: false
+  source: webrip
   type: source
 - name: c0kE
   negate: false

custom_formats/1080p Quality Tier 3.yml

@@ -11,11 +11,21 @@ conditions:
   required: true
   resolution: 1080p
   type: resolution
-- name: Not WEB-DL
-  type: source
-  required: true
+- name: Not Remux
   negate: true
-  source: web_dl
+  pattern: Remux
+  required: true
+  type: release_title
+- name: Bluray
+  negate: false
+  required: false
+  source: bluray
+  type: source
+- name: WEBRip
+  negate: false
+  required: false
+  source: webrip
+  type: source
 - name: CRiSC
   negate: false
   pattern: CRiSC

custom_formats/1080p Quality Tier 4.yml

@@ -11,10 +11,20 @@ conditions:
   required: true
   resolution: 1080p
   type: resolution
-- name: Not WEB-DL
+- name: Not Remux
   negate: true
+  pattern: Remux
   required: true
-  source: web_dl
+  type: release_title
+- name: Bluray
+  negate: false
+  required: false
+  source: bluray
+  type: source
+- name: WEBRip
+  negate: false
+  required: false
+  source: webrip
   type: source
 - name: BMF
   negate: false

custom_formats/1080p Quality Tier 5.yml

@@ -11,21 +11,31 @@ conditions:
   required: true
   resolution: 1080p
   type: resolution
-- name: Not WEB-DL
+- name: Not Remux
   negate: true
+  pattern: Remux
   required: true
-  source: web_dl
+  type: release_title
+- name: Bluray
+  negate: false
+  required: false
+  source: bluray
   type: source
-- name: Not DVD
-  negate: true
-  required: true
-  source: dvd
+- name: WEBRip
+  negate: false
+  required: false
+  source: webrip
   type: source
 - name: AJP69
   negate: false
   pattern: AJP69
   required: false
   type: release_group
+- name: ATELiER
+  negate: false
+  pattern: ATELiER
+  required: false
+  type: release_group
 - name: BV
   negate: false
   pattern: BV
@@ -111,6 +121,11 @@ conditions:
   pattern: hdalx
   required: false
   type: release_group
+- name: HDC
+  negate: false
+  pattern: HDC
+  required: false
+  type: release_group
 - name: iON
   negate: false
   pattern: iON
@@ -121,6 +136,11 @@ conditions:
   pattern: KASHMiR
   required: false
   type: release_group
+- name: Kitsune
+  negate: false
+  pattern: Kitsune
+  required: false
+  type: release_group
 - name: LEGi0N
   negate: false
   pattern: LEGi0N
@@ -186,6 +206,11 @@ conditions:
   pattern: PTer
   required: false
   type: release_group
+- name: REBORN
+  negate: false
+  pattern: REBORN
+  required: false
+  type: release_group
 - name: rightSIZE
   negate: false
   pattern: rightSIZE
@@ -211,11 +236,21 @@ conditions:
   pattern: SiMPLE
   required: false
   type: release_group
+- name: SoLaR
+  negate: false
+  pattern: SoLaR
+  required: false
+  type: release_group
 - name: SOP
   negate: false
   pattern: SOP
   required: false
   type: release_group
+- name: SPHD
+  negate: false
+  pattern: SPHD
+  required: false
+  type: release_group
 - name: TBB
   negate: false
   pattern: TBB
@@ -226,6 +261,16 @@ conditions:
   pattern: TDD
   required: false
   type: release_group
+- name: TeamSyndicate
+  type: release_group
+  required: false
+  negate: false
+  pattern: TeamSyndicate
+- name: TnP
+  negate: false
+  pattern: TnP
+  required: false
+  type: release_group
 - name: VLAD
   negate: false
   pattern: VLAD
@@ -236,6 +281,11 @@ conditions:
   pattern: W4NK3R
   required: false
   type: release_group
+- name: WiKi
+  negate: false
+  pattern: WiKi
+  required: false
+  type: release_group
 - name: xander
   negate: false
   pattern: xander

custom_formats/2160p Quality Tier 3.yml

@@ -15,21 +15,26 @@ conditions:
   required: true
   source: bluray
   type: source
-- name: Chotab
+- name: BV
   negate: false
-  pattern: Chotab
+  pattern: BV
   required: false
   type: release_group
-- name: Kitsune
+- name: Chotab
   negate: false
-  pattern: Kitsune
+  pattern: Chotab
   required: false
   type: release_group
 - name: REBORN
   negate: false
   pattern: REBORN
   required: false
   type: release_group
+- name: SoLaR
+  negate: false
+  pattern: SoLaR
+  required: false
+  type: release_group
 - name: W4NK3R
   negate: false
   pattern: W4NK3R

custom_formats/2160p Quality Tier 4.yml

@@ -21,15 +21,25 @@ conditions:
   required: false
   type: release_group
 - name: DEPTH
-  type: release_group
-  required: false
   negate: false
   pattern: DEPTH
+  required: false
+  type: release_group
+- name: HiDt
+  negate: false
+  pattern: HiDt
+  required: false
+  type: release_group
 - name: iFT
   negate: false
   pattern: iFT
   required: false
   type: release_group
+- name: Kitsune
+  type: release_group
+  required: false
+  negate: false
+  pattern: Kitsune
 - name: NCmt
   negate: false
   pattern: NCmt

custom_formats/2160p Quality Tier 6.yml

@@ -160,11 +160,6 @@ conditions:
   pattern: SMAHAWUG
   required: false
   type: release_group
-- name: SoLaR
-  negate: false
-  pattern: SoLaR
-  required: false
-  type: release_group
 - name: SPECTACLE
   negate: false
   pattern: SPECTACLE

custom_formats/720p Quality Tier 1.yml

@@ -11,11 +11,16 @@ conditions:
   required: true
   resolution: 720p
   type: resolution
-- name: Not WEB-DL
-  negate: true
-  required: true
-  source: web_dl
+- name: Bluray
+  negate: false
+  required: false
+  source: bluray
   type: source
+- name: WEBRip
+  type: source
+  required: false
+  negate: false
+  source: webrip
 - name: DON
   negate: false
   pattern: DON

custom_formats/720p Quality Tier 2.yml

@@ -11,10 +11,15 @@ conditions:
   required: true
   resolution: 720p
   type: resolution
-- name: Not WEB-DL
-  negate: true
-  required: true
-  source: web_dl
+- name: Bluray
+  negate: false
+  required: false
+  source: bluray
+  type: source
+- name: WEBRip
+  negate: false
+  required: false
+  source: webrip
   type: source
 - name: CRiSC
   negate: false
@@ -56,6 +61,11 @@ conditions:
   pattern: VietHD
   required: false
   type: release_group
+- name: ZoroSenpai
+  type: release_group
+  required: false
+  negate: false
+  pattern: ZoroSenpai
 - name: ZQ
   negate: false
   pattern: ZQ

custom_formats/720p Quality Tier 3.yml

@@ -11,11 +11,16 @@ conditions:
   required: true
   resolution: 720p
   type: resolution
-- name: Not WEB-DL
-  negate: true
-  required: true
-  source: web_dl
+- name: Bluray
+  negate: false
+  required: false
+  source: bluray
   type: source
+- name: WEBRip
+  type: source
+  required: false
+  negate: false
+  source: webrip
 - name: BMF
   negate: false
   pattern: BMF