From f88dc3fbe1e9d2c86dfd1be975096ef67fda93a0 Mon Sep 17 00:00:00 2001
From: "Collin M. Barrett" <collinbarrett@users.noreply.github.com>
Date: Sun, 11 Feb 2018 08:16:06 -0600
Subject: [PATCH] add 1Hosts

closes #186
---
 data/FilterList.json           | 34 ++++++++++++++++++
 data/FilterListMaintainer.json |  8 +++++
 data/Maintainer.json           |  7 ++++
 data/Merge.json                | 64 ++++++++++++++++++++++++++++++++++
 4 files changed, 113 insertions(+)

diff --git a/data/FilterList.json b/data/FilterList.json
index cdf59909b..78d334352 100644
--- a/data/FilterList.json
+++ b/data/FilterList.json
@@ -5234,5 +5234,39 @@
     "submissionUrl": null,
     "syntaxId": 1,
     "viewUrl": "https://raw.githubusercontent.com/hoshsadiq/adblock-nocoin-list/master/hosts.txt"
+  },
+  {
+    "id": 309,
+    "description": "A merged hosts file from a variety of other lists.",
+    "descriptionSourceUrl": null,
+    "discontinuedDate": null,
+    "donateUrl": null,
+    "emailAddress": "badmojr@gmail.com",
+    "forumUrl": "https://forum.xda-developers.com/android/general/badmojr-one-host-file-to-block-t3713360",
+    "homeUrl": "https://forum.xda-developers.com/android/general/badmojr-one-host-file-to-block-t3713360",
+    "issuesUrl": null,
+    "licenseId": 5,
+    "name": "1Hosts",
+    "policyUrl": null,
+    "submissionUrl": null,
+    "syntaxId": 1,
+    "viewUrl": "http://1hosts.cf/"
+  },
+  {
+    "id": 310,
+    "description": "A small supplement list for 1Hosts.",
+    "descriptionSourceUrl": null,
+    "discontinuedDate": null,
+    "donateUrl": null,
+    "emailAddress": "badmojr@gmail.com",
+    "forumUrl": "https://forum.xda-developers.com/android/general/badmojr-one-host-file-to-block-t3713360",
+    "homeUrl": "https://forum.xda-developers.com/android/general/badmojr-one-host-file-to-block-t3713360",
+    "issuesUrl": null,
+    "licenseId": 5,
+    "name": "1Hosts Addon",
+    "policyUrl": null,
+    "submissionUrl": null,
+    "syntaxId": 2,
+    "viewUrl": "http://1hosts.cf/addon/"
   }
 ]
\ No newline at end of file
diff --git a/data/FilterListMaintainer.json b/data/FilterListMaintainer.json
index 7fd7f8ea9..1cd923415 100644
--- a/data/FilterListMaintainer.json
+++ b/data/FilterListMaintainer.json
@@ -166,5 +166,13 @@
   {
     "filterListId": 27,
     "maintainerId": 24
+  },
+  {
+    "filterListId": 309,
+    "maintainerId": 25
+  },
+  {
+    "filterListId": 310,
+    "maintainerId": 25
   }
 ]
\ No newline at end of file
diff --git a/data/Maintainer.json b/data/Maintainer.json
index c4b508126..52f11ab88 100644
--- a/data/Maintainer.json
+++ b/data/Maintainer.json
@@ -159,5 +159,12 @@
     "homeUrl": "https://github.com/metaphoricgiraffe",
     "name": "metaphoricgiraffe",
     "twitterHandle": null
+  },
+  {
+    "id": 25,
+    "emailAddress": "badmojr@gmail.com",
+    "homeUrl": "https://forum.xda-developers.com/member.php?u=8758244",
+    "name": "badmojr",
+    "twitterHandle": null
   }
 ]
\ No newline at end of file
diff --git a/data/Merge.json b/data/Merge.json
index 96f33dbae..ade38a741 100644
--- a/data/Merge.json
+++ b/data/Merge.json
@@ -90,5 +90,69 @@
   {
     "mergeFilterListId": 13,
     "upstreamFilterListId": 301
+  },
+  {
+    "mergeFilterListId": 309,
+    "upstreamFilterListId": 47
+  },
+  {
+    "mergeFilterListId": 309,
+    "upstreamFilterListId": 282
+  },
+  {
+    "mergeFilterListId": 309,
+    "upstreamFilterListId": 179
+  },
+  {
+    "mergeFilterListId": 309,
+    "upstreamFilterListId": 17
+  },
+  {
+    "mergeFilterListId": 309,
+    "upstreamFilterListId": 276
+  },
+  {
+    "mergeFilterListId": 309,
+    "upstreamFilterListId": 35
+  },
+  {
+    "mergeFilterListId": 309,
+    "upstreamFilterListId": 32
+  },
+  {
+    "mergeFilterListId": 309,
+    "upstreamFilterListId": 206
+  },
+  {
+    "mergeFilterListId": 309,
+    "upstreamFilterListId": 255
+  },
+  {
+    "mergeFilterListId": 309,
+    "upstreamFilterListId": 226
+  },
+  {
+    "mergeFilterListId": 309,
+    "upstreamFilterListId": 54
+  },
+  {
+    "mergeFilterListId": 309,
+    "upstreamFilterListId": 99
+  },
+  {
+    "mergeFilterListId": 309,
+    "upstreamFilterListId": 170
+  },
+  {
+    "mergeFilterListId": 309,
+    "upstreamFilterListId": 80
+  },
+  {
+    "mergeFilterListId": 309,
+    "upstreamFilterListId": 81
+  },
+  {
+    "mergeFilterListId": 309,
+    "upstreamFilterListId": 138
   }
 ]
\ No newline at end of file