diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6ebedc15f..0182f7b90 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,9 @@
### v1.14.16
+**v1.14.16.1** *(2019-12-30)* - [[Userscript](https://raw.githubusercontent.com/ccd0/4chan-x/1.14.16.1/builds/4chan-X-noupdate.user.js)] [[Chrome extension](https://raw.githubusercontent.com/ccd0/4chan-x/1.14.16.1/builds/4chan-X-noupdate.crx)]
+- Merge v1.14.15.3: Update location of archive list. #2520
+
**v1.14.16.0** *(2019-12-20)* - [[Userscript](https://raw.githubusercontent.com/ccd0/4chan-x/1.14.16.0/builds/4chan-X-noupdate.user.js)] [[Chrome extension](https://raw.githubusercontent.com/ccd0/4chan-x/1.14.16.0/builds/4chan-X-noupdate.crx)]
- Based on v1.14.15.2.
- Fix parsing of spoilered images on kissu.moe.
diff --git a/builds/4chan-X-beta.crx b/builds/4chan-X-beta.crx
index b62130e9f..f9c4a28e5 100644
Binary files a/builds/4chan-X-beta.crx and b/builds/4chan-X-beta.crx differ
diff --git a/builds/4chan-X-beta.meta.js b/builds/4chan-X-beta.meta.js
index 09f14e382..8c20cc8c2 100644
--- a/builds/4chan-X-beta.meta.js
+++ b/builds/4chan-X-beta.meta.js
@@ -1,6 +1,6 @@
// ==UserScript==
// @name 4chan X beta
-// @version 1.14.16.0
+// @version 1.14.16.1
// @minGMVer 1.14
// @minFFVer 26
// @namespace 4chan-X
@@ -76,7 +76,7 @@
// @connect 4chan.org
// @connect 4channel.org
// @connect 4cdn.org
-// @connect mayhemydg.github.io
+// @connect nstepien.github.io
// @connect archive.4plebs.org
// @connect archive.nyafuu.org
// @connect archive.rebeccablacktech.com
diff --git a/builds/4chan-X-beta.user.js b/builds/4chan-X-beta.user.js
index 773b41864..3e548f00b 100644
--- a/builds/4chan-X-beta.user.js
+++ b/builds/4chan-X-beta.user.js
@@ -1,6 +1,6 @@
// ==UserScript==
// @name 4chan X beta
-// @version 1.14.16.0
+// @version 1.14.16.1
// @minGMVer 1.14
// @minFFVer 26
// @namespace 4chan-X
@@ -76,7 +76,7 @@
// @connect 4chan.org
// @connect 4channel.org
// @connect 4cdn.org
-// @connect mayhemydg.github.io
+// @connect nstepien.github.io
// @connect archive.4plebs.org
// @connect archive.nyafuu.org
// @connect archive.rebeccablacktech.com
@@ -214,7 +214,7 @@ docSet = function() {
};
g = {
- VERSION: '1.14.16.0',
+ VERSION: '1.14.16.1',
NAMESPACE: '4chan X.',
sites: Object.create(null),
boards: Object.create(null)
@@ -481,7 +481,7 @@ Config = (function() {
'Custom Board Navigation': true
},
archives: {
- archiveLists: 'https://mayhemydg.github.io/archives.json/archives.json',
+ archiveLists: 'https://nstepien.github.io/archives.json/archives.json',
lastarchivecheck: 0,
archiveAutoUpdate: true
},
@@ -13418,6 +13418,11 @@ Settings = (function() {
set('boardnav', "[ toggle-all ]\na-replace\nc-replace\ng-replace\nk-replace\nv-replace\nvg-replace\nvr-replace\nck-replace\nco-replace\nfit-replace\njp-replace\nmu-replace\nsp-replace\ntv-replace\nvp-replace\n[external-text:\"FAQ\",\"https://github.com/ccd0/4chan-x/wiki/Frequently-Asked-Questions\"]");
}
}
+ if (compareString < '00001.00014.00016.00001') {
+ if (data['archiveLists'] != null) {
+ set('archiveLists', data['archiveLists'].replace('https://mayhemydg.github.io/archives.json/archives.json', 'https://nstepien.github.io/archives.json/archives.json'));
+ }
+ }
return changes;
},
loadSettings: function(data, cb) {
diff --git a/builds/4chan-X-noupdate.crx b/builds/4chan-X-noupdate.crx
index 9c1a51fef..a3575199f 100644
Binary files a/builds/4chan-X-noupdate.crx and b/builds/4chan-X-noupdate.crx differ
diff --git a/builds/4chan-X-noupdate.user.js b/builds/4chan-X-noupdate.user.js
index aa93e49cb..75ad6617c 100644
--- a/builds/4chan-X-noupdate.user.js
+++ b/builds/4chan-X-noupdate.user.js
@@ -1,6 +1,6 @@
// ==UserScript==
// @name 4chan X
-// @version 1.14.16.0
+// @version 1.14.16.1
// @minGMVer 1.14
// @minFFVer 26
// @namespace 4chan-X
@@ -76,7 +76,7 @@
// @connect 4chan.org
// @connect 4channel.org
// @connect 4cdn.org
-// @connect mayhemydg.github.io
+// @connect nstepien.github.io
// @connect archive.4plebs.org
// @connect archive.nyafuu.org
// @connect archive.rebeccablacktech.com
@@ -214,7 +214,7 @@ docSet = function() {
};
g = {
- VERSION: '1.14.16.0',
+ VERSION: '1.14.16.1',
NAMESPACE: '4chan X.',
sites: Object.create(null),
boards: Object.create(null)
@@ -481,7 +481,7 @@ Config = (function() {
'Custom Board Navigation': true
},
archives: {
- archiveLists: 'https://mayhemydg.github.io/archives.json/archives.json',
+ archiveLists: 'https://nstepien.github.io/archives.json/archives.json',
lastarchivecheck: 0,
archiveAutoUpdate: true
},
@@ -13418,6 +13418,11 @@ Settings = (function() {
set('boardnav', "[ toggle-all ]\na-replace\nc-replace\ng-replace\nk-replace\nv-replace\nvg-replace\nvr-replace\nck-replace\nco-replace\nfit-replace\njp-replace\nmu-replace\nsp-replace\ntv-replace\nvp-replace\n[external-text:\"FAQ\",\"https://github.com/ccd0/4chan-x/wiki/Frequently-Asked-Questions\"]");
}
}
+ if (compareString < '00001.00014.00016.00001') {
+ if (data['archiveLists'] != null) {
+ set('archiveLists', data['archiveLists'].replace('https://mayhemydg.github.io/archives.json/archives.json', 'https://nstepien.github.io/archives.json/archives.json'));
+ }
+ }
return changes;
},
loadSettings: function(data, cb) {
diff --git a/builds/4chan-X.crx b/builds/4chan-X.crx
index 3460b78ad..0503d4ff0 100644
Binary files a/builds/4chan-X.crx and b/builds/4chan-X.crx differ
diff --git a/builds/4chan-X.meta.js b/builds/4chan-X.meta.js
index 038271eba..120dfc9d6 100644
--- a/builds/4chan-X.meta.js
+++ b/builds/4chan-X.meta.js
@@ -1,6 +1,6 @@
// ==UserScript==
// @name 4chan X
-// @version 1.14.16.0
+// @version 1.14.16.1
// @minGMVer 1.14
// @minFFVer 26
// @namespace 4chan-X
@@ -76,7 +76,7 @@
// @connect 4chan.org
// @connect 4channel.org
// @connect 4cdn.org
-// @connect mayhemydg.github.io
+// @connect nstepien.github.io
// @connect archive.4plebs.org
// @connect archive.nyafuu.org
// @connect archive.rebeccablacktech.com
diff --git a/builds/4chan-X.user.js b/builds/4chan-X.user.js
index 30dcdc9f6..abba6b55e 100644
--- a/builds/4chan-X.user.js
+++ b/builds/4chan-X.user.js
@@ -1,6 +1,6 @@
// ==UserScript==
// @name 4chan X
-// @version 1.14.16.0
+// @version 1.14.16.1
// @minGMVer 1.14
// @minFFVer 26
// @namespace 4chan-X
@@ -76,7 +76,7 @@
// @connect 4chan.org
// @connect 4channel.org
// @connect 4cdn.org
-// @connect mayhemydg.github.io
+// @connect nstepien.github.io
// @connect archive.4plebs.org
// @connect archive.nyafuu.org
// @connect archive.rebeccablacktech.com
@@ -214,7 +214,7 @@ docSet = function() {
};
g = {
- VERSION: '1.14.16.0',
+ VERSION: '1.14.16.1',
NAMESPACE: '4chan X.',
sites: Object.create(null),
boards: Object.create(null)
@@ -481,7 +481,7 @@ Config = (function() {
'Custom Board Navigation': true
},
archives: {
- archiveLists: 'https://mayhemydg.github.io/archives.json/archives.json',
+ archiveLists: 'https://nstepien.github.io/archives.json/archives.json',
lastarchivecheck: 0,
archiveAutoUpdate: true
},
@@ -13418,6 +13418,11 @@ Settings = (function() {
set('boardnav', "[ toggle-all ]\na-replace\nc-replace\ng-replace\nk-replace\nv-replace\nvg-replace\nvr-replace\nck-replace\nco-replace\nfit-replace\njp-replace\nmu-replace\nsp-replace\ntv-replace\nvp-replace\n[external-text:\"FAQ\",\"https://github.com/ccd0/4chan-x/wiki/Frequently-Asked-Questions\"]");
}
}
+ if (compareString < '00001.00014.00016.00001') {
+ if (data['archiveLists'] != null) {
+ set('archiveLists', data['archiveLists'].replace('https://mayhemydg.github.io/archives.json/archives.json', 'https://nstepien.github.io/archives.json/archives.json'));
+ }
+ }
return changes;
},
loadSettings: function(data, cb) {
diff --git a/builds/4chan-X.zip b/builds/4chan-X.zip
index 471169ba6..cc79e7892 100644
Binary files a/builds/4chan-X.zip and b/builds/4chan-X.zip differ
diff --git a/builds/updates-beta.json b/builds/updates-beta.json
index c7471e47f..feb6f825b 100644
--- a/builds/updates-beta.json
+++ b/builds/updates-beta.json
@@ -3,7 +3,7 @@
"4chan-x@4chan-x.net": {
"updates": [
{
- "version": "1.14.16.0",
+ "version": "1.14.16.1",
"update_link": "https://www.4chan-x.net/builds/4chan-X-beta.crx"
}
]
diff --git a/builds/updates-beta.xml b/builds/updates-beta.xml
index 0bc1e0f17..6bd31314d 100644
--- a/builds/updates-beta.xml
+++ b/builds/updates-beta.xml
@@ -1,7 +1,7 @@
-
+
diff --git a/builds/updates.json b/builds/updates.json
index a7cccdec0..8a396be30 100644
--- a/builds/updates.json
+++ b/builds/updates.json
@@ -3,7 +3,7 @@
"4chan-x@4chan-x.net": {
"updates": [
{
- "version": "1.14.16.0",
+ "version": "1.14.16.1",
"update_link": "https://www.4chan-x.net/builds/4chan-X.crx"
}
]
diff --git a/builds/updates.xml b/builds/updates.xml
index 66f2c4f88..a53434ec7 100644
--- a/builds/updates.xml
+++ b/builds/updates.xml
@@ -1,7 +1,7 @@
-
+
diff --git a/version.json b/version.json
index da3ee073e..abc91af73 100644
--- a/version.json
+++ b/version.json
@@ -1,4 +1,4 @@
{
- "version": "1.14.16.0",
- "date": "2019-12-20T21:19:44.648Z"
+ "version": "1.14.16.1",
+ "date": "2019-12-30T04:34:00.057Z"
}
\ No newline at end of file