WS-2021.1.2 <TheoryOfNekomata@VALHALLA Merge branch 'master'

Conflicts:
	filetypes.xml

filetypes.xml

@@ -3,10 +3,13 @@
     <extensionMap>
       <mapping ext="babelrc" type="JSON" />
       <mapping ext="sequelizerc" type="JavaScript" />
-      <mapping pattern="LICENSE" type="PLAIN_TEXT" />
+      <mapping ext="gradle.kts" type="Kotlin" />
+      <mapping ext="main.kts" type="Kotlin" />
       <mapping pattern=".gitkeep" type="PLAIN_TEXT" />
       <mapping pattern=".gitmessage" type="PLAIN_TEXT" />
       <mapping pattern=".browserslistrc" type="PLAIN_TEXT" />
+      <mapping pattern="LICENSE" type="PLAIN_TEXT" />
+      <mapping ext="tsv" type="TSV" />
       <removed_mapping ext="apk" approved="true" type="ARCHIVE" />
       <removed_mapping ext="csv" approved="true" type="CSV" />
       <removed_mapping ext="ignore" approved="true" type="IgnoreLang file" />
@@ -14,8 +17,6 @@
       <removed_mapping ext="psd" approved="true" type="Image" />
       <removed_mapping pattern=".browserslistrc" approved="true" type="JSON" />
       <removed_mapping pattern=".sequelizerc" approved="true" type="JSON" />
-      <mapping ext="gradle.kts" type="Kotlin" />
-      <mapping ext="main.kts" type="Kotlin" />
     </extensionMap>
   </component>
 </application>