Merge remote-tracking branch 'upstream/master'

.github/PULL_REQUEST_TEMPLATE.md

+Please provide the following information:
+
+ - Link to your code repository:
+ - Link to the tags page with at least one [semver](http://semver.org) tag: 
+
+Also make sure you:
+
+ 1. Used `"tags": true` and not `"branch": "master"` ([versioning docs](https://packagecontrol.io/docs/submitting_a_package#Step_4))
+ 2. Ran the tests ([tests docs](https://packagecontrol.io/docs/submitting_a_package#Step_7))

channel.json

@@ -123,7 +123,6 @@
 		"https://raw.githubusercontent.com/wuub/SublimeREPL/master/packages.json",
 		"https://raw.githubusercontent.com/x3ns/x3-alpha-theme/master/packages.json",
 		"https://raw.githubusercontent.com/xgenvn/InputHelper/master/packages.json",
-		"https://raw.githubusercontent.com/yangsu/sublime-octopress/master/packages.json",
 		"https://raw.githubusercontent.com/zfkun/sublime-kissy-snippets/master/packages.json",
 		"https://s3.amazonaws.com/wallaby-downloads/sublime/packages.json",
 		"https://sequoiastudios.io/sublime_packages/packages.json",

repository/0-9.json

@@ -45,6 +45,17 @@
 				}
 			]
 		},
+		{
+			"name": "3D Tool Syntax Hilight",
+			"details": "https://github.com/leoheck/sublime-3d-tool/",
+			"labels": ["3d-tool", "burst-mode", "async"],
+			"releases": [
+				{
+					"sublime_text": "*",
+					"tags": true
+				}
+			]
+		},
 		{
 			"name": "42 Headers",
 			"details": "https://github.com/Globidev/Sublime-Text-42-Headers",

repository/dependencies.json

@@ -595,9 +595,9 @@
 				{
 					"sublime_text": "*",
 					"platforms": ["linux"],
-					"version": "1.0.1",
-					"url": "http://packagecontrol.io/ssl/1.0.1/ssl-linux.sublime-package",
-					"sha256": "862d061cbe666777cd1e9cd1cbc7c82f48ad8897dbb68332975f3edf5ce0f38d"
+					"version": "1.0.2",
+					"url": "http://packagecontrol.io/ssl/1.0.2/ssl-linux.sublime-package",
+					"sha256": "23f35f64458a0a14c99b1bb1bbc3cb04794c7361c4940e0a638d40f038acd377"
 				}
 			]
 		},

repository/n.json

@@ -696,7 +696,7 @@
 			"labels": ["language syntax", "nsis", "build system"],
 			"releases": [
 				{
-					"sublime_text": "<3000",
+					"sublime_text": "<3103",
 					"tags": "st2-"
 				},
 				{

repository/o.json

@@ -130,6 +130,17 @@
 				}
 			]
 		},
+		{
+			"name": "Octopress Snippets",
+			"details": "https://github.com/yangsu/sublime-octopress",
+			"labels": ["snippets"],
+			"releases": [
+				{
+					"sublime_text": "*",
+					"tags": true
+				}
+			]
+		},
 		{
 			"name": "Oddly",
 			"details": "https://github.com/laktak/sublime-oddly",

repository/s.json

@@ -586,11 +586,11 @@
 		},
 		{
 			"name": "ScummC",
-			"details": "https://github.com/idleberg/ScummC-Sublime-Text",
+			"details": "https://github.com/idleberg/sublime-scummc",
 			"labels": ["auto-complete"],
 			"releases": [
 				{
-					"sublime_text": "<3000",
+					"sublime_text": "<3103",
 					"tags": "st2-"
 				},
 				{
@@ -1341,6 +1341,19 @@
 				}
 			]
 		},
+		{
+			"name": "SideBarEnhancements",
+			"details": "https://github.com/titoBouzout/SideBarEnhancements",		
+			"readme": "https://raw.githubusercontent.com/titoBouzout/SideBarEnhancements/st3/readme.md",		
+			"donate": "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=DD4SL2AHYJGBW",		
+			"labels": ["sidebar", "folder", "directory", "file", "clipboard"],		
+			"releases": [		
+				{		
+					"sublime_text": ">=3000",
+					"tags":true
+				}		
+			]
+		},
 		{
 			"name": "SidebarSeparator",
 			"details": "https://github.com/ekazyam/SidebarSeparator",