CL-2021.2.3 <TheoryOfNekomata@VALHALLA Merge branch 'master'

Conflicts: colors/_@user_Darcula.icls
3 роки тому · 618238fec9
--- a/colors/_@user_Darcula.icls
+++ b/colors/_@user_Darcula.icls
@@ -3,7 +3,7 @@
    <property name="created">2018-04-15T18:12:58</property>
    <property name="ide">WebStorm</property>
    <property name="ideVersion">2018.1.1.0.0</property>
    <property name="modified">2021-12-04T09:31:03</property>
    <property name="modified">2021-12-04T09:29:32</property>
    <property name="originalScheme">Darcula</property>
  </metaInfo>
  <colors>
--- a/databaseSettings.xml
+++ b/databaseSettings.xml
@@ -1,47 +0,0 @@
 <application>
  <component name="DatabaseSettings" version="7">
    <text-mode>
      <parameter-patterns>
        <parameter-pattern value="#(\w+)#" in-scripts="true" scope="XML" predefined="#name#" />
        <parameter-pattern value="(?&lt;=\W|\A)\$(\d+|[a-zA-Z_](?:\w|\.)*)\$?(?=\W|\z)" in-scripts="true" scope="*,-SQL" predefined="$a.b.c$?" />
        <parameter-pattern value="(?&lt;=\W|\A)#(\d+|[a-zA-Z_](?:\w|\.)*)#?(?=\W|\z)" in-scripts="true" scope="*,-SQL" predefined="#a.b.c#?" />
        <parameter-pattern value="%\((\w+)\)s" in-scripts="true" scope="Python" predefined="%(name)s" />
        <parameter-pattern value="%\w+" in-scripts="true" scope="JAVA,Python,PHP" predefined="%name" />
        <parameter-pattern value="\$\{([^\{\}]*)\}" in-scripts="true" predefined="${name}" />
        <parameter-pattern value="\$\(([^\)]+)\)" in-scripts="true" predefined="$(name)" />
      </parameter-patterns>
    </text-mode>
    <csv-formats>
      <csv-format name="CSV" id="Comma-separated (CSV)_id">
        <data>
          <record-format prefix="" suffix="" nullText="" quotationPolicy="as needed" valueSeparator="," recordSeparator="&#10;">
            <quotation>
              <quotes left="&quot;" right="&quot;" leftEscaped="&quot;&quot;" rightEscaped="&quot;&quot;" />
              <quotes left="'" right="'" leftEscaped="''" rightEscaped="''" />
            </quotation>
          </record-format>
        </data>
      </csv-format>
      <csv-format name="TSV" id="Tab-separated (TSV)_id">
        <data>
          <record-format prefix="" suffix="" nullText="" quotationPolicy="as needed" valueSeparator="&#9;" recordSeparator="&#10;">
            <quotation>
              <quotes left="&quot;" right="&quot;" leftEscaped="&quot;&quot;" rightEscaped="&quot;&quot;" />
              <quotes left="'" right="'" leftEscaped="''" rightEscaped="''" />
            </quotation>
          </record-format>
        </data>
      </csv-format>
      <csv-format name="Pipe-separated" id="Pipe-separated_id">
        <data>
          <record-format prefix="" suffix="" nullText="" quotationPolicy="as needed" valueSeparator="|" recordSeparator="&#10;">
            <quotation>
              <quotes left="&quot;" right="&quot;" leftEscaped="&quot;&quot;" rightEscaped="&quot;&quot;" />
              <quotes left="'" right="'" leftEscaped="''" rightEscaped="''" />
            </quotation>
          </record-format>
        </data>
      </csv-format>
    </csv-formats>
  </component>
 </application>
--- a/lightEdit.xml
+++ b/lightEdit.xml
@@ -1,17 +0,0 @@
 <application>
  <component name="LightEdit">
    <option name="supportedFilePatterns">
      <list>
        <option value="*.conf" />
        <option value="*.ini" />
        <option value="*.json" />
        <option value="*.log" />
        <option value="*.md" />
        <option value="*.sh" />
        <option value="*.txt" />
        <option value="*.xml" />
        <option value="*.yml" />
      </list>
    </option>
  </component>
 </application>
--- a/material_theme.xml
+++ b/material_theme.xml
@@ -15,7 +15,7 @@
    <option name="accentColor" value="eeca3f" />
    <option name="selectedTheme" value="CUSTOM" />
    <option name="userId" value="7a11f371:1686d9b67db:-8000" />
    <option name="version" value="6.9.1" />
    <option name="version" value="6.10.1" />
    <option name="stripedToolWindowsEnabled" value="true" />
  </component>
 </application>
--- a/trusted-paths.xml
+++ b/trusted-paths.xml
@@ -1,9 +0,0 @@
 <application>
  <component name="Trusted.Paths.Settings">
    <option name="TRUSTED_PATHS">
      <list>
        <option value="E:/Projects/Games" />
      </list>
    </option>
  </component>
 </application>
--- a/web-browsers.xml
+++ b/web-browsers.xml
@@ -1,3 +0,0 @@
 <application>
  <component name="WebBrowsersConfiguration" showHover="false" />
 </application>
--- a/wsl.distributions.xml
+++ b/wsl.distributions.xml
@@ -1,128 +0,0 @@
 <application>
  <component name="WslDistributionsService" version="1">
    <descriptors>
      <set>
        <descriptor>
          <id>DEBIAN</id>
          <microsoft-id>Debian</microsoft-id>
          <executable-path>debian.exe</executable-path>
          <presentable-name>Debian GNU/Linux</presentable-name>
        </descriptor>
        <descriptor>
          <id>KALI</id>
          <microsoft-id>kali-linux</microsoft-id>
          <executable-path>kali.exe</executable-path>
          <presentable-name>Kali Linux</presentable-name>
        </descriptor>
        <descriptor>
          <id>OPENSUSE42</id>
          <microsoft-id>openSUSE-42</microsoft-id>
          <executable-path>opensuse-42.exe</executable-path>
          <presentable-name>openSUSE Leap 42</presentable-name>
        </descriptor>
        <descriptor>
          <id>SLES12</id>
          <microsoft-id>SLES-12</microsoft-id>
          <executable-path>sles-12.exe</executable-path>
          <presentable-name>SUSE Linux Enterprise Server 12</presentable-name>
        </descriptor>
        <descriptor>
          <id>SLES15</id>
          <microsoft-id>SLES-15</microsoft-id>
          <executable-path>sles-15.exe</executable-path>
          <presentable-name>SUSE Linux Enterprise Server 15</presentable-name>
        </descriptor>
        <descriptor>
          <id>SLES-15-SP1</id>
          <microsoft-id>SLES-15-SP1</microsoft-id>
          <executable-path>SLES-15-SP1.exe</executable-path>
          <presentable-name>SUSE Linux Enterprise Server 15 SP1</presentable-name>
        </descriptor>
        <descriptor>
          <id>SUSE-Linux-Enterprise-Server-15-SP2</id>
          <microsoft-id>SUSE-Linux-Enterprise-Server-15-SP2</microsoft-id>
          <executable-path>SUSE-Linux-Enterprise-Server-15-SP2.exe</executable-path>
          <presentable-name>SUSE Linux Enterprise Server 15 SP2</presentable-name>
        </descriptor>
        <descriptor>
          <id>OPENSUSE15</id>
          <microsoft-id>openSUSE-Leap-15</microsoft-id>
          <executable-path>openSUSE-Leap-15.exe</executable-path>
          <presentable-name>openSUSE Leap 15</presentable-name>
        </descriptor>
        <descriptor>
          <id>OPENSUSE15-1</id>
          <microsoft-id>openSUSE-Leap-15-1</microsoft-id>
          <executable-path>openSUSE-Leap-15-1.exe</executable-path>
          <presentable-name>openSUSE Leap 15.1</presentable-name>
        </descriptor>
        <descriptor>
          <id>OPENSUSE15.2</id>
          <microsoft-id>openSUSE-Leap-15.2</microsoft-id>
          <executable-path>openSUSE-Leap-15.2.exe</executable-path>
          <presentable-name>openSUSE Leap 15.2</presentable-name>
        </descriptor>
        <descriptor>
          <id>UBUNTU</id>
          <microsoft-id>Ubuntu</microsoft-id>
          <executable-path>ubuntu.exe</executable-path>
          <presentable-name>Ubuntu</presentable-name>
        </descriptor>
        <descriptor>
          <id>UBUNTU1604</id>
          <microsoft-id>Ubuntu-16.04</microsoft-id>
          <executable-path>ubuntu1604.exe</executable-path>
          <presentable-name>Ubuntu 16.04</presentable-name>
        </descriptor>
        <descriptor>
          <id>UBUNTU1804</id>
          <microsoft-id>Ubuntu-18.04</microsoft-id>
          <executable-path>ubuntu1804.exe</executable-path>
          <presentable-name>Ubuntu 18.04</presentable-name>
        </descriptor>
        <descriptor>
          <id>UBUNTU2004</id>
          <microsoft-id>Ubuntu-20.04</microsoft-id>
          <executable-path>ubuntu2004.exe</executable-path>
          <presentable-name>Ubuntu 20.04</presentable-name>
        </descriptor>
        <descriptor>
          <id>Ubuntu-CommPrev</id>
          <microsoft-id>Ubuntu-CommPrev</microsoft-id>
          <executable-path>ubuntupreview.exe</executable-path>
          <presentable-name>Ubuntu on Windows Community Preview</presentable-name>
        </descriptor>
        <descriptor>
          <id>PENGWIN</id>
          <microsoft-id>WLinux</microsoft-id>
          <executable-path>pengwin.exe</executable-path>
          <presentable-name>Pengwin</presentable-name>
        </descriptor>
        <descriptor>
          <id>PENGWIN_ENTERPRISE</id>
          <microsoft-id>WLE</microsoft-id>
          <executable-path>wle.exe</executable-path>
          <presentable-name>Pengwin Enterprise</presentable-name>
        </descriptor>
        <descriptor>
          <id>fedoraremix</id>
          <microsoft-id>fedoraremix</microsoft-id>
          <executable-path>fedoraremix.exe</executable-path>
          <presentable-name>Fedora Remix for WSL</presentable-name>
        </descriptor>
        <descriptor>
          <id>ARCH</id>
          <microsoft-id>Arch</microsoft-id>
          <executable-path>Arch.exe</executable-path>
          <presentable-name>Arch Linux</presentable-name>
        </descriptor>
        <descriptor>
          <id>WLINUX</id>
          <microsoft-id>WLinux</microsoft-id>
          <executable-path>wlinux.exe</executable-path>
          <presentable-name>WLinux</presentable-name>
        </descriptor>
      </set>
    </descriptors>
  </component>
 </application>