diff --git a/data/FilterList.json b/data/FilterList.json index 72ef82510..1bc69ce46 100644 --- a/data/FilterList.json +++ b/data/FilterList.json @@ -6730,5 +6730,23 @@ "submissionUrl": null, "syntaxId": 3, "viewUrl": "https://raw.githubusercontent.com/Hubird-au/Adversity/master/Extreme-Measures.txt" + }, + { + "id": 375, + "description": "A comprehensive, all-in-one adblock list for thorough blocking of trackers, popup ads, ads, unwanted cookies, fake news, cookie warning messages, unwanted comment sections, crypto-coin mining, YouTube clutter and social network hassles.", + "descriptionSourceUrl": "https://hl2guide.github.io/All-in-One-Customized-Adblock-List/", + "discontinuedDate": null, + "donateUrl": null, + "emailAddress": null, + "forumUrl": null, + "homeUrl": "https://hl2guide.github.io/All-in-One-Customized-Adblock-List/", + "issuesUrl": "https://github.com/hl2guide/All-in-One-Customized-Adblock-List/issues", + "licenseId": 2, + "name": "All-in-One Customized Adblock List", + "policyUrl": null, + "publishedDate": "2018-02-17T00:00:00", + "submissionUrl": null, + "syntaxId": 3, + "viewUrl": "https://raw.githubusercontent.com/hl2guide/All-in-One-Customized-Adblock-List/master/deanoman-adblocklist.txt" } ] \ No newline at end of file diff --git a/data/FilterListMaintainer.json b/data/FilterListMaintainer.json index 890b730d8..5aa609da4 100644 --- a/data/FilterListMaintainer.json +++ b/data/FilterListMaintainer.json @@ -538,5 +538,9 @@ { "filterListId": 374, "maintainerId": 53 + }, + { + "filterListId": 375, + "maintainerId": 54 } ] \ No newline at end of file diff --git a/data/Maintainer.json b/data/Maintainer.json index 3c243d2fa..24e124fcc 100644 --- a/data/Maintainer.json +++ b/data/Maintainer.json @@ -362,5 +362,12 @@ "homeUrl": "https://github.com/Hubird-au", "name": "Hubird-au", "twitterHandle": null + }, + { + "id": 54, + "emailAddress": null, + "homeUrl": "https://github.com/hl2guide", + "name": "deanoman", + "twitterHandle": null } ] \ No newline at end of file diff --git a/data/Merge.json b/data/Merge.json index c1ae1b1de..57a2f1735 100644 --- a/data/Merge.json +++ b/data/Merge.json @@ -246,5 +246,77 @@ { "mergeFilterListId": 371, "upstreamFilterListId": 232 + }, + { + "mergeFilterListId": 375, + "upstreamFilterListId": 2 + }, + { + "mergeFilterListId": 375, + "upstreamFilterListId": 18 + }, + { + "mergeFilterListId": 375, + "upstreamFilterListId": 19 + }, + { + "mergeFilterListId": 375, + "upstreamFilterListId": 27 + }, + { + "mergeFilterListId": 375, + "upstreamFilterListId": 38 + }, + { + "mergeFilterListId": 375, + "upstreamFilterListId": 70 + }, + { + "mergeFilterListId": 375, + "upstreamFilterListId": 71 + }, + { + "mergeFilterListId": 375, + "upstreamFilterListId": 97 + }, + { + "mergeFilterListId": 375, + "upstreamFilterListId": 99 + }, + { + "mergeFilterListId": 375, + "upstreamFilterListId": 148 + }, + { + "mergeFilterListId": 375, + "upstreamFilterListId": 174 + }, + { + "mergeFilterListId": 375, + "upstreamFilterListId": 183 + }, + { + "mergeFilterListId": 375, + "upstreamFilterListId": 184 + }, + { + "mergeFilterListId": 375, + "upstreamFilterListId": 214 + }, + { + "mergeFilterListId": 375, + "upstreamFilterListId": 232 + }, + { + "mergeFilterListId": 375, + "upstreamFilterListId": 247 + }, + { + "mergeFilterListId": 375, + "upstreamFilterListId": 279 + }, + { + "mergeFilterListId": 375, + "upstreamFilterListId": 307 } ] \ No newline at end of file