diff --git a/CHANGELOG.md b/CHANGELOG.md
index a97f03ffe..50a4bd387 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,9 @@
### v1.14.12
+**v1.14.12.2** *(2019-08-09)* - [[Userscript](https://raw.githubusercontent.com/ccd0/4chan-x/1.14.12.2/builds/4chan-X-noupdate.user.js)] [[Chrome extension](https://raw.githubusercontent.com/ccd0/4chan-x/1.14.12.2/builds/4chan-X-noupdate.crx)]
+- Merge v1.14.11.3: Reduce default thread updater interval from 30 seconds to 5 seconds.
+
**v1.14.12.1** *(2019-08-07)* - [[Userscript](https://raw.githubusercontent.com/ccd0/4chan-x/1.14.12.1/builds/4chan-X-noupdate.user.js)] [[Chrome extension](https://raw.githubusercontent.com/ccd0/4chan-x/1.14.12.1/builds/4chan-X-noupdate.crx)]
- Merge v1.14.11.2: - Fix error from Catalog Links feature in native catalog when /f/ is in the custom board list. #2390
- Fix custom board links for boards without native catalog/archive being changed to nonexistent native catalog/archive links on catalog/archive pages. #2390
diff --git a/builds/4chan-X-beta.crx b/builds/4chan-X-beta.crx
index 44beb430c..7a91ebbf1 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 89041f13b..d3afa9f14 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.12.1
+// @version 1.14.12.2
// @minGMVer 1.14
// @minFFVer 26
// @namespace 4chan-X
diff --git a/builds/4chan-X-beta.user.js b/builds/4chan-X-beta.user.js
index 71c5f05bc..d9c7bc311 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.12.1
+// @version 1.14.12.2
// @minGMVer 1.14
// @minFFVer 26
// @namespace 4chan-X
@@ -199,7 +199,7 @@ docSet = function() {
};
g = {
- VERSION: '1.14.12.1',
+ VERSION: '1.14.12.2',
NAMESPACE: '4chan X.',
sites: Object.create(null),
boards: Object.create(null)
@@ -551,7 +551,7 @@ Config = (function() {
'Auto Update': [true, 'Automatically fetch new posts.'],
'Optional Increase': [false, 'Increase the intervals between updates on threads without new posts.']
},
- 'Interval': 30
+ 'Interval': 5
},
customCooldown: 0,
customCooldownEnabled: true,
diff --git a/builds/4chan-X-noupdate.crx b/builds/4chan-X-noupdate.crx
index ac9c776ee..10decc812 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 4b75015ba..d726b8518 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.12.1
+// @version 1.14.12.2
// @minGMVer 1.14
// @minFFVer 26
// @namespace 4chan-X
@@ -199,7 +199,7 @@ docSet = function() {
};
g = {
- VERSION: '1.14.12.1',
+ VERSION: '1.14.12.2',
NAMESPACE: '4chan X.',
sites: Object.create(null),
boards: Object.create(null)
@@ -551,7 +551,7 @@ Config = (function() {
'Auto Update': [true, 'Automatically fetch new posts.'],
'Optional Increase': [false, 'Increase the intervals between updates on threads without new posts.']
},
- 'Interval': 30
+ 'Interval': 5
},
customCooldown: 0,
customCooldownEnabled: true,
diff --git a/builds/4chan-X.crx b/builds/4chan-X.crx
index 3d4b0eadd..15742dba6 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 adaf46dcf..9a7bf8e49 100644
--- a/builds/4chan-X.meta.js
+++ b/builds/4chan-X.meta.js
@@ -1,6 +1,6 @@
// ==UserScript==
// @name 4chan X
-// @version 1.14.12.1
+// @version 1.14.12.2
// @minGMVer 1.14
// @minFFVer 26
// @namespace 4chan-X
diff --git a/builds/4chan-X.user.js b/builds/4chan-X.user.js
index 8bdc91303..f9f859ad4 100644
--- a/builds/4chan-X.user.js
+++ b/builds/4chan-X.user.js
@@ -1,6 +1,6 @@
// ==UserScript==
// @name 4chan X
-// @version 1.14.12.1
+// @version 1.14.12.2
// @minGMVer 1.14
// @minFFVer 26
// @namespace 4chan-X
@@ -199,7 +199,7 @@ docSet = function() {
};
g = {
- VERSION: '1.14.12.1',
+ VERSION: '1.14.12.2',
NAMESPACE: '4chan X.',
sites: Object.create(null),
boards: Object.create(null)
@@ -551,7 +551,7 @@ Config = (function() {
'Auto Update': [true, 'Automatically fetch new posts.'],
'Optional Increase': [false, 'Increase the intervals between updates on threads without new posts.']
},
- 'Interval': 30
+ 'Interval': 5
},
customCooldown: 0,
customCooldownEnabled: true,
diff --git a/builds/4chan-X.zip b/builds/4chan-X.zip
index 65e611b0e..73d9adccb 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 08a693586..c62901e9e 100644
--- a/builds/updates-beta.json
+++ b/builds/updates-beta.json
@@ -3,7 +3,7 @@
"4chan-x@4chan-x.net": {
"updates": [
{
- "version": "1.14.12.1",
+ "version": "1.14.12.2",
"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 7c013771f..b34cb7430 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 d60ff7df7..c8de6edfa 100644
--- a/builds/updates.json
+++ b/builds/updates.json
@@ -3,7 +3,7 @@
"4chan-x@4chan-x.net": {
"updates": [
{
- "version": "1.14.12.1",
+ "version": "1.14.12.2",
"update_link": "https://www.4chan-x.net/builds/4chan-X.crx"
}
]
diff --git a/builds/updates.xml b/builds/updates.xml
index 5c1757df7..c9ba27ca8 100644
--- a/builds/updates.xml
+++ b/builds/updates.xml
@@ -1,7 +1,7 @@
-
+
diff --git a/version.json b/version.json
index cbc590f12..ecfa055a0 100644
--- a/version.json
+++ b/version.json
@@ -1,4 +1,4 @@
{
- "version": "1.14.12.1",
- "date": "2019-08-07T06:42:33.803Z"
+ "version": "1.14.12.2",
+ "date": "2019-08-09T02:43:58.143Z"
}
\ No newline at end of file