Переглянути джерело

CL-2022.3.2 <theoryofnekomata@CIPANGU.local Merge branch 'master'

master
TheoryOfNekomata 1 рік тому
джерело
коміт
99ecaec430
7 змінених файлів з 16 додано та 11 видалено
  1. +2
    -1
      _windows/toolchains.xml
  2. +1
    -1
      colors/TheoryOfNekomata.icls
  3. +4
    -4
      colors/_@user_Darcula.icls
  4. +3
    -3
      colors/_@user_Default.icls
  5. +1
    -1
      filetypes.xml
  6. +5
    -0
      ocRefactoring.xml
  7. +0
    -1
      ui.lnf.xml

+ 2
- 1
_windows/toolchains.xml Переглянути файл

@@ -1,9 +1,10 @@
<application>
<component name="CPPToolchains" version="6">
<component name="CPPToolchains" version="8">
<toolchains detectedVersion="5">
<toolchain name="Visual Studio" toolSetKind="MSVC" toolSetPath="C:\Program Files (x86)\Microsoft Visual Studio\2019\Community" customCCompilerPath="C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Tools\Llvm\bin\clang-cl.exe" customCXXCompilerPath="C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Tools\Llvm\bin\clang-cl.exe" debuggerKind="BUNDLED_LLDB">
<toolSetOption type="msvc.arch" value="x86_amd64" />
</toolchain>
<toolchain name="Based" toolSetKind="SYSTEM_WINDOWS_TOOLSET" customCMakePath="C:\Program Files\CMake\bin\cmake.exe" customMakePath="ninja.exe" customCCompilerPath="C:\Program Files\LLVM\bin\clang-cl.exe" customCXXCompilerPath="C:\Program Files\LLVM\bin\clang-cl.exe" debuggerKind="BUNDLED_GDB" />
</toolchains>
</component>
</application>

+ 1
- 1
colors/TheoryOfNekomata.icls Переглянути файл

@@ -4,7 +4,7 @@
<property name="created">2023-02-23T14:55:53</property>
<property name="ide">WebStorm</property>
<property name="ideVersion">2022.3.1.0.0</property>
<property name="modified">2023-02-25T11:53:12</property>
<property name="modified">2023-03-01T16:14:58</property>
<property name="originalScheme">TheoryOfNekomata</property>
</metaInfo>
<console-font>


+ 4
- 4
colors/_@user_Darcula.icls Переглянути файл

@@ -1,9 +1,9 @@
<scheme name="_@user_Darcula" version="142" parent_scheme="Darcula">
<metaInfo>
<property name="created">2023-02-23T14:56:22</property>
<property name="ide">WebStorm</property>
<property name="ideVersion">2022.3.2.0.0</property>
<property name="modified">2023-02-25T11:53:12</property>
<property name="created">2023-03-01T16:14:20</property>
<property name="ide">CLion</property>
<property name="ideVersion">2022.3.0.0</property>
<property name="modified">2023-03-01T16:14:58</property>
<property name="originalScheme">Darcula</property>
</metaInfo>
<colors>


+ 3
- 3
colors/_@user_Default.icls Переглянути файл

@@ -3,7 +3,7 @@
<property name="created">2019-08-26T12:03:47</property>
<property name="ide">WebStorm</property>
<property name="ideVersion">2019.2.1.0.0</property>
<property name="modified">2023-02-25T11:53:12</property>
<property name="modified">2023-02-27T18:11:39</property>
<property name="originalScheme">Default</property>
</metaInfo>
<colors>
@@ -15,7 +15,7 @@
<option name="FILESTATUS_IDEA_FILESTATUS_MERGED_WITH_BOTH_CONFLICTS" value="d5756c" />
<option name="FILESTATUS_IDEA_FILESTATUS_MERGED_WITH_CONFLICTS" value="d5756c" />
<option name="FILESTATUS_IDEA_FILESTATUS_MERGED_WITH_PROPERTY_CONFLICTS" value="d5756c" />
<option name="FILESTATUS_IGNORE.PROJECT_VIEW.IGNORED" value="cccccc" />
<option name="FILESTATUS_IGNORE.PROJECT_VIEW.IGNORED" value="666666" />
<option name="FILESTATUS_MERGED" value="9876aa" />
<option name="FILESTATUS_MODIFIED" value="80cbc4" />
<option name="FILESTATUS_NOT_CHANGED_IMMEDIATE" value="80cbc4" />
@@ -26,6 +26,6 @@
<option name="FILESTATUS_UNKNOWN" value="f77669" />
<option name="FILESTATUS_addedOutside" value="629755" />
<option name="FILESTATUS_changelistConflict" value="d5756c" />
<option name="FILESTATUS_modifiedOutside" value="f3db88" />
<option name="FILESTATUS_modifiedOutside" value="6897bb" />
</colors>
</scheme>

+ 1
- 1
filetypes.xml Переглянути файл

@@ -4,7 +4,6 @@
<mapping pattern="configure" type="AUTO_DETECTED" />
<mapping pattern="cucumber-js" type="AUTO_DETECTED" />
<mapping ext="babelrc" type="JSON" />
<mapping ext="sequelizerc" type="JavaScript" />
<mapping pattern=".gitmessage" type="PLAIN_TEXT" />
<mapping pattern="LICENSE" type="PLAIN_TEXT" />
<mapping pattern=".nvmrc" type="PLAIN_TEXT" />
@@ -22,6 +21,7 @@
<removed_mapping pattern=".sequelizerc" approved="true" type="JSON" />
<mapping ext="gradle.kts" type="Kotlin" />
<mapping ext="main.kts" type="Kotlin" />
<mapping ext="sequelizerc" type="JavaScript" />
</extensionMap>
</component>
</application>

+ 5
- 0
ocRefactoring.xml Переглянути файл

@@ -0,0 +1,5 @@
<application>
<component name="OCRefactoringSettings">
<option name="RENAME_ASSOCIATED_FILES" value="false" />
</component>
</application>

+ 0
- 1
ui.lnf.xml Переглянути файл

@@ -1,6 +1,5 @@
<application>
<component name="UISettings">
<option name="OPEN_IN_PREVIEW_TAB_IF_POSSIBLE" value="true" />
<option name="OVERRIDE_NONIDEA_LAF_FONTS" value="true" />
</component>
</application>

Завантаження…
Відмінити
Зберегти