Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3

Conflicts:
	changelog-old
	json/archives.json
	src/Monitoring/ThreadUpdater.coffee

LICENSE

@@ -1,5 +1,5 @@
 /*
-* 4chan X - Version 1.2.2 - 2013-05-11
+* 4chan X - Version 1.2.2 - 2013-05-12
 *
 * Licensed under the MIT license.
 * https://github.com/seaweedchan/4chan-x/blob/master/LICENSE

builds/4chan-X.js

@@ -19,7 +19,7 @@
 // @icon         data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwAgMAAAAqbBEUAAAACVBMVEUAAGcAAABmzDNZt9VtAAAAAXRSTlMAQObYZgAAAHFJREFUKFOt0LENACEIBdBv4Qju4wgWanEj3D6OcIVMKaitYHEU/jwTCQj8W75kiVCSBvdQ5/AvfVHBin11BgdRq3ysBgfwBDRrj3MCIA+oAQaku/Q1cNctrAmyDl577tOThYt/Y1RBM4DgOHzM0HFTAyLukH/cmRnqAAAAAElFTkSuQmCC
 // ==/UserScript==
 /*
-* 4chan X - Version 1.2.2 - 2013-05-11
+* 4chan X - Version 1.2.2 - 2013-05-12
 *
 * Licensed under the MIT license.
 * https://github.com/seaweedchan/4chan-x/blob/master/LICENSE

builds/4chan-X.user.js

@@ -19,7 +19,7 @@
 // @icon         data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwAgMAAAAqbBEUAAAACVBMVEUAAGcAAABmzDNZt9VtAAAAAXRSTlMAQObYZgAAAHFJREFUKFOt0LENACEIBdBv4Qju4wgWanEj3D6OcIVMKaitYHEU/jwTCQj8W75kiVCSBvdQ5/AvfVHBin11BgdRq3ysBgfwBDRrj3MCIA+oAQaku/Q1cNctrAmyDl577tOThYt/Y1RBM4DgOHzM0HFTAyLukH/cmRnqAAAAAElFTkSuQmCC
 // ==/UserScript==
 /*
-* 4chan X - Version 1.2.2 - 2013-05-11
+* 4chan X - Version 1.2.2 - 2013-05-12
 *
 * Licensed under the MIT license.
 * https://github.com/seaweedchan/4chan-x/blob/master/LICENSE

builds/crx/script.js

@@ -1,6 +1,6 @@
 // Generated by CoffeeScript
 /*
-* 4chan X - Version 1.2.2 - 2013-05-11
+* 4chan X - Version 1.2.2 - 2013-05-12
 *
 * Licensed under the MIT license.
 * https://github.com/seaweedchan/4chan-x/blob/master/LICENSE

json/archives.json

@@ -0,0 +1,109 @@
+[{
+  "uid": 0,
+  "name": "Foolz",
+  "domain": "archive.foolz.us",
+  "http": true,
+  "https": true,
+  "software": "foolfuuka",
+  "boards": ["a", "co", "gd", "jp", "m", "q", "sp", "tg", "tv", "vp", "vr", "wsg"],
+  "files": ["a", "gd", "jp", "m", "q", "tg", "vp", "vr", "wsg"]
+}, {
+  "uid": 1,
+  "name": "NSFW Foolz",
+  "domain": "nsfw.foolz.us",
+  "http": true,
+  "https": true,
+  "software": "foolfuuka",
+  "boards": ["u"],
+  "files": ["u"]
+}, {
+  "uid": 2,
+  "name": "The Dark Cave",
+  "domain": "archive.thedarkcave.org",
+  "http": true,
+  "https": true,
+  "software": "foolfuuka",
+  "boards": ["c", "int", "out", "po"],
+  "files": ["c", "po"]
+}, {
+  "uid": 3,
+  "name": "4plebs",
+  "domain": "archive.4plebs.org",
+  "http": true,
+  "https": false,
+  "software": "foolfuuka",
+  "boards": ["hr", "tg", "tv", "x"],
+  "files": ["hr", "tg", "tv", "x"]
+}, {
+  "uid": 4,
+  "name": "Nyafuu",
+  "domain": "archive.nyafuu.org",
+  "http": true,
+  "https": true,
+  "software": "foolfuuka",
+  "boards": ["c", "w", "wg"],
+  "files": ["c", "w", "wg"]
+}, {
+  "uid": 5,
+  "name": "Love is Over",
+  "domain": "loveisover.me",
+  "http": true,
+  "https": true,
+  "software": "foolfuuka",
+  "boards": ["d", "h", "v"],
+  "files": ["d", "h", "v"]
+}, {
+  "uid": 6,
+  "name": "nth-chan",
+  "domain": "nth.pensivenonsen.se",
+  "http": true,
+  "https": false,
+  "software": "foolfuuka",
+  "boards": ["vg"],
+  "files": ["vg"]
+}, {
+  "uid": 11,
+  "name": "Foolz a Shit",
+  "domain": "archive.foolzashit.com",
+  "http": true,
+  "https": true,
+  "software": "foolfuuka",
+  "boards": ["adv", "asp", "cm", "e", "i", "lgbt", "n", "o", "p", "s", "s4s", "t", "trv", "y"],
+  "files": ["adv", "asp", "cm", "e", "i", "lgbt", "n", "o", "p", "s", "s4s", "t", "trv", "y"]
+}, {
+  "uid": 7,
+  "name": "Install Gentoo",
+  "domain": "archive.installgentoo.net",
+  "http": true,
+  "https": true,
+  "software": "fuuka",
+  "boards": ["diy", "g", "sci"],
+  "files": []
+}, {
+  "uid": 8,
+  "name": "Rebecca Black Tech",
+  "domain": "rbt.asia",
+  "http": true,
+  "https": true,
+  "software": "fuuka",
+  "boards": ["cgl", "g", "mu", "w"],
+  "files": ["cgl", "g", "mu", "w"]
+}, {
+  "uid": 9,
+  "name": "Heinessen",
+  "domain": "archive.heinessen.com",
+  "http": true,
+  "https": false,
+  "software": "fuuka",
+  "boards": ["an", "fit", "k", "mlp", "r9k", "toy", "x"],
+  "files": ["an", "k", "toy", "x"]
+}, {
+  "uid": 10,
+  "name": "warosu",
+  "domain": "fuuka.warosu.org",
+  "http": true,
+  "https": true,
+  "software": "fuuka",
+  "boards": ["3", "cgl", "ck", "fa", "ic", "jp", "lit", "q", "s4s", "tg", "vr"],
+  "files": ["3", "cgl", "ck", "fa", "ic", "jp", "lit", "q", "s4s", "vr"]
+}]

src/Miscellaneous/ExpandThread.coffee

@@ -94,4 +94,4 @@ ExpandThread =
     Main.callbackNodes Post, posts
     $.after a, nodes
 
-    Fourchan.parseThread thread.ID, 1, nodes.length
+    Fourchan.parseThread thread.ID, 1, nodes.length