Merge branch 'master' into 1.16

docs/scarpet/resources/editors/idea/Idea.md

@@ -0,0 +1,16 @@
+# Custom Language Support for Intellij
+
+### Add scarpet to registered file types (`.sc` and `.scl`)
+
+![Settings -> File Types](/docs/scarpet/resources/media/idea_settings.png)
+
+### When adding use the following settings
+
+![Customize your settings](/docs/scarpet/resources/media/idea_customize.png)
+
+### Grab lists of keywords (1,2,3 and 4) from the following files:
+
+[1](/docs/scarpet/resources/editors/idea/1.txt)
+[2](/docs/scarpet/resources/editors/idea/2.txt)
+[3](/docs/scarpet/resources/editors/idea/3.txt)
+[4](/docs/scarpet/resources/editors/idea/4.txt)