Merge branch 'develop'

Author: deathaxe

icons/icons.json

@@ -325,6 +325,19 @@
 	"file_type_binary": {
 		"color": "graphite"
 	},
+	"file_type_biome": {
+		"aliases": [
+			{
+				"base": "source.json",
+				"extensions": [
+					"biome.json"
+				],
+				"name": "JSON (Biome)",
+				"scope": "source.json.biome"
+			}
+		],
+		"color": "yellow"
+	},
 	"file_type_blade": {
 		"color": "orange",
 		"syntaxes": [
@@ -390,31 +403,6 @@
 		],
 		"color": "yellow"
 	},
-	"file_type_cabal": {
-		"color": "blue",
-		"syntaxes": [
-			{
-				"extensions": [
-					"cabal",
-					"cabal.project"
-				],
-				"name": "Plain Text (Cabal)",
-				"scope": "source.cabal"
-			}
-		]
-	},
-	"file_type_cairo": {
-		"color": "graphite",
-		"syntaxes": [
-			{
-				"extensions": [
-					"cairo"
-				],
-				"name": "Plain Text (Cairo)",
-				"scope": "source.cairo"
-			}
-		]
-	},
 	"file_type_c": {
 		"color": "purple",
 		"syntaxes": [
@@ -450,6 +438,59 @@
 			}
 		]
 	},
+	"file_type_cabal": {
+		"color": "blue",
+		"syntaxes": [
+			{
+				"extensions": [
+					"cabal",
+					"cabal.project"
+				],
+				"name": "Plain Text (Cabal)",
+				"scope": "source.cabal"
+			}
+		]
+	},
+	"file_type_cad": {
+		"color": "orange",
+		"aliases": [
+			{
+				"extensions": [
+					"cad",
+					"stl",
+					"stp",
+					"step",
+					"wrl"
+				],
+				"name": "Plain Text (CAD)",
+				"scope": "text.plain.cad"
+			}
+		]
+	},
+	"file_type_caddy": {
+		"color": "blue",
+		"syntaxes": [
+			{
+				"extensions": [
+					"Caddyfile"
+				],
+				"name": "Plain Text (Caddyfile)",
+				"scope": "source.Caddyfile"
+			}
+		]
+	},
+	"file_type_cairo": {
+		"color": "graphite",
+		"syntaxes": [
+			{
+				"extensions": [
+					"cairo"
+				],
+				"name": "Plain Text (Cairo)",
+				"scope": "source.cairo"
+			}
+		]
+	},
 	"file_type_cf": {
 		"color": "cyan",
 		"syntaxes": [
@@ -499,6 +540,18 @@
 			}
 		]
 	},
+	"file_type_cname": {
+		"aliases": [
+			{
+				"extensions": [
+					"CNAME"
+				],
+				"name": "Plain Text (CNAME)",
+				"scope": "text.plain.cname"
+			}
+		],
+		"color": "sky"
+	},
 	"file_type_cobol": {
 		"color": "cyan",
 		"syntaxes": [
@@ -599,20 +652,6 @@
 			}
 		]
 	},
-	"file_type_cuda": {
-		"color": "green",
-		"syntaxes": [
-			{
-				"base": "source.c++",
-				"extensions": [
-					"cu",
-					"cuh"
-				],
-				"name": "C++ (Cuda)",
-				"scope": "source.cuda-c++, source.c++.cuda"
-			}
-		]
-	},
 	"file_type_cppheader": {
 		"aliases": [
 			{
@@ -678,60 +717,31 @@
 			}
 		]
 	},
-	"file_type_cython": {
-		"color": "yellow",
-		"syntaxes": [
-			{
-				"extensions": [
-					"pyx",
-					"pxi",
-					"pxd"
-				],
-				"name": "Plain Text (Cython)",
-				"scope": "source.cython"
-			}
-		]
-	},
-	"file_type_cad": {
-		"color": "orange",
-		"aliases": [
-			{
-				"extensions": [
-					"cad",
-					"stl",
-					"stp",
-					"step",
-					"wrl"
-				],
-				"name": "Plain Text (CAD)",
-				"scope": "text.plain.cad"
-			}
-		]
-	},
-	"file_type_caddy": {
-		"color": "blue",
+	"file_type_cuda": {
+		"color": "green",
 		"syntaxes": [
 			{
+				"base": "source.c++",
 				"extensions": [
-					"Caddyfile"
+					"cu",
+					"cuh"
 				],
-				"name": "Plain Text (Caddyfile)",
-				"scope": "source.Caddyfile"
+				"name": "C++ (Cuda)",
+				"scope": "source.cuda-c++, source.c++.cuda"
 			}
 		]
 	},
-	"file_type_email": {
-		"color": "graphite",
+	"file_type_cython": {
+		"color": "yellow",
 		"syntaxes": [
 			{
 				"extensions": [
-					"eml",
-					"msg",
-					"mbx",
-					"mboxz"
+					"pyx",
+					"pxi",
+					"pxd"
 				],
-				"name": "Plain Text (Email)",
-				"scope": "text.email, text.eml"
+				"name": "Plain Text (Cython)",
+				"scope": "source.cython"
 			}
 		]
 	},
@@ -879,6 +889,21 @@
 			}
 		]
 	},
+	"file_type_email": {
+		"color": "graphite",
+		"syntaxes": [
+			{
+				"extensions": [
+					"eml",
+					"msg",
+					"mbx",
+					"mboxz"
+				],
+				"name": "Plain Text (Email)",
+				"scope": "text.email, text.eml"
+			}
+		]
+	},
 	"file_type_ember": {
 		"color": "green",
 		"syntaxes": [
@@ -1693,6 +1718,19 @@
 			}
 		]
 	},
+	"file_type_llvm": {
+		"aliases": [
+			{
+				"base": "source.yaml",
+				"extensions": [
+					".clang-format"
+				],
+				"name": "YAML (clang-format)",
+				"scope": "source.yaml.clang-format"
+			}
+		],
+		"color": "blue"
+	},
 	"file_type_lock": {
 		"aliases": [
 			{
@@ -1768,6 +1806,20 @@
 			}
 		]
 	},
+	"file_type_maven": {
+		"aliases": [
+			{
+				"base": "text.xml",
+				"extensions": [
+					".flattened-pom.xml",
+					"pom.xml"
+				],
+				"name": "POM (Maven)",
+				"scope": "text.xml.maven"
+			}
+		],
+		"color": "red"
+	},
 	"file_type_maya": {
 		"color": "cyan",
 		"syntaxes": [