diff --git a/CHANGELOG.md b/CHANGELOG.md index 574477dba..cbf731a4d 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,9 @@ The links to individual versions below are to copies of the script with the upda ### v1.10.5 +**v1.10.5.1** *(2015-03-15)* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.10.5.1/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.10.5.1/builds/4chan-X-noupdate.crx "Chromium version")] +- Merge v1.10.4.7: Fix maximum updater interval when `Optional Increase` is enabled. + **v1.10.5.0** *(2015-03-15)* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.10.5.0/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.10.5.0/builds/4chan-X-noupdate.crx "Chromium version")] - Based on v1.10.4.6. - (vampiricwulf) Activate native extension's Flash embedding on /f/ (option: `Enable Native Flash Embedding`). diff --git a/builds/4chan-X-beta.crx b/builds/4chan-X-beta.crx index 1c250b5af..f69dd7c7c 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 717f46af5..1690cc4c6 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.10.5.0 +// @version 1.10.5.1 // @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 2c0c653fc..d3bc00108 100644 --- a/builds/4chan-X-beta.user.js +++ b/builds/4chan-X-beta.user.js @@ -1,7 +1,7 @@ // Generated by CoffeeScript // ==UserScript== // @name 4chan X beta -// @version 1.10.5.0 +// @version 1.10.5.1 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -395,7 +395,7 @@ doc = d.documentElement; g = { - VERSION: '1.10.5.0', + VERSION: '1.10.5.1', NAMESPACE: '4chan X.', NAME: '4chan X', FAQ: 'https://github.com/ccd0/4chan-x/wiki/Frequently-Asked-Questions', @@ -12215,7 +12215,7 @@ } interval = ThreadUpdater.interval; if (Conf['Optional Increase']) { - limit = d.hidden ? 7 : 10; + limit = d.hidden ? 10 : 5; j = Math.min(ThreadUpdater.outdateCount, limit); cur = (Math.floor(interval * 0.1) || 1) * j * j; ThreadUpdater.seconds = $.minmax(cur, interval, 300); diff --git a/builds/4chan-X-noupdate.crx b/builds/4chan-X-noupdate.crx index daad0647d..5f5b3e87a 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 1ff022f84..4a7c7b9e4 100644 --- a/builds/4chan-X-noupdate.user.js +++ b/builds/4chan-X-noupdate.user.js @@ -1,7 +1,7 @@ // Generated by CoffeeScript // ==UserScript== // @name 4chan X -// @version 1.10.5.0 +// @version 1.10.5.1 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -394,7 +394,7 @@ doc = d.documentElement; g = { - VERSION: '1.10.5.0', + VERSION: '1.10.5.1', NAMESPACE: '4chan X.', NAME: '4chan X', FAQ: 'https://github.com/ccd0/4chan-x/wiki/Frequently-Asked-Questions', @@ -12214,7 +12214,7 @@ } interval = ThreadUpdater.interval; if (Conf['Optional Increase']) { - limit = d.hidden ? 7 : 10; + limit = d.hidden ? 10 : 5; j = Math.min(ThreadUpdater.outdateCount, limit); cur = (Math.floor(interval * 0.1) || 1) * j * j; ThreadUpdater.seconds = $.minmax(cur, interval, 300); diff --git a/builds/4chan-X.crx b/builds/4chan-X.crx index cfdbbfb5f..ba8641ab9 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 1eca62781..ca7c8b410 100644 --- a/builds/4chan-X.meta.js +++ b/builds/4chan-X.meta.js @@ -1,6 +1,6 @@ // ==UserScript== // @name 4chan X -// @version 1.10.5.0 +// @version 1.10.5.1 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X diff --git a/builds/4chan-X.user.js b/builds/4chan-X.user.js index 4b5055787..eef6503e8 100644 --- a/builds/4chan-X.user.js +++ b/builds/4chan-X.user.js @@ -1,7 +1,7 @@ // Generated by CoffeeScript // ==UserScript== // @name 4chan X -// @version 1.10.5.0 +// @version 1.10.5.1 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -395,7 +395,7 @@ doc = d.documentElement; g = { - VERSION: '1.10.5.0', + VERSION: '1.10.5.1', NAMESPACE: '4chan X.', NAME: '4chan X', FAQ: 'https://github.com/ccd0/4chan-x/wiki/Frequently-Asked-Questions', @@ -12215,7 +12215,7 @@ } interval = ThreadUpdater.interval; if (Conf['Optional Increase']) { - limit = d.hidden ? 7 : 10; + limit = d.hidden ? 10 : 5; j = Math.min(ThreadUpdater.outdateCount, limit); cur = (Math.floor(interval * 0.1) || 1) * j * j; ThreadUpdater.seconds = $.minmax(cur, interval, 300); diff --git a/builds/4chan-X.zip b/builds/4chan-X.zip index 2b8700c86..80b842978 100644 Binary files a/builds/4chan-X.zip and b/builds/4chan-X.zip differ diff --git a/builds/updates-beta.xml b/builds/updates-beta.xml index 011b211fe..99f084424 100644 --- a/builds/updates-beta.xml +++ b/builds/updates-beta.xml @@ -1,7 +1,7 @@ - + diff --git a/builds/updates.xml b/builds/updates.xml index cc60b2b57..832cd329b 100644 --- a/builds/updates.xml +++ b/builds/updates.xml @@ -1,7 +1,7 @@ - + diff --git a/package.json b/package.json index 260044418..9d9e54ebd 100755 --- a/package.json +++ b/package.json @@ -3,8 +3,8 @@ "description": "Cross-browser userscript for maximum lurking on 4chan.", "meta": { "name": "4chan X", - "version": "1.10.5.0", - "date": "2015-03-15T19:30:08.316Z", + "version": "1.10.5.1", + "date": "2015-03-16T04:25:20.752Z", "repo": "https://github.com/ccd0/4chan-x/", "page": "https://github.com/ccd0/4chan-x", "downloads": "https://ccd0.github.io/4chan-x/builds/",