Просмотр исходного кода

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

Conflicts:
	colors/_@user_Darcula.icls
master
TheoryOfNekomata 1 год назад
Родитель
Сommit
575522ece2
7 измененных файлов: 13 добавлений и 8 удалений
  1. +0
    -1
      baseRefactoring.xml
  2. +4
    -1
      colors/_@user_Darcula.icls
  3. +1
    -1
      databaseDrivers.xml
  4. +2
    -2
      editor-font.xml
  5. +0
    -1
      editor.xml
  6. +0
    -1
      material_theme.xml
  7. +6
    -1
      nodejs.xml

+ 0
- 1
baseRefactoring.xml Просмотреть файл

@@ -1,6 +1,5 @@
<application> <application>
<component name="BaseRefactoringSettings"> <component name="BaseRefactoringSettings">
<option name="RENAME_SEARCH_IN_COMMENTS_FOR_FILE" value="false" /> <option name="RENAME_SEARCH_IN_COMMENTS_FOR_FILE" value="false" />
<option name="MOVE_SEARCH_FOR_REFERENCES_FOR_FILE" value="false" />
</component> </component>
</application> </application>

+ 4
- 1
colors/_@user_Darcula.icls Просмотреть файл

@@ -3,7 +3,7 @@
<property name="created">2018-04-15T18:12:58</property> <property name="created">2018-04-15T18:12:58</property>
<property name="ide">WebStorm</property> <property name="ide">WebStorm</property>
<property name="ideVersion">2018.1.1.0.0</property> <property name="ideVersion">2018.1.1.0.0</property>
<property name="modified">2022-12-11T15:40:24</property>
<property name="modified">2022-12-02T09:24:49</property>
<property name="originalScheme">Darcula</property> <property name="originalScheme">Darcula</property>
</metaInfo> </metaInfo>
<colors> <colors>
@@ -15,6 +15,9 @@
<option name="FILESTATUS_IDEA_FILESTATUS_MERGED_WITH_BOTH_CONFLICTS" value="ff0000" /> <option name="FILESTATUS_IDEA_FILESTATUS_MERGED_WITH_BOTH_CONFLICTS" value="ff0000" />
<option name="FILESTATUS_IDEA_FILESTATUS_MERGED_WITH_CONFLICTS" value="ff0000" /> <option name="FILESTATUS_IDEA_FILESTATUS_MERGED_WITH_CONFLICTS" value="ff0000" />
<option name="FILESTATUS_IDEA_FILESTATUS_MERGED_WITH_PROPERTY_CONFLICTS" value="ff0000" /> <option name="FILESTATUS_IDEA_FILESTATUS_MERGED_WITH_PROPERTY_CONFLICTS" value="ff0000" />
<option name="FILESTATUS_IDEA_SVN_FILESTATUS_EXTERNAL" value="72a038" />
<option name="FILESTATUS_IDEA_SVN_FILESTATUS_OBSTRUCTED" value="727238" />
<option name="FILESTATUS_IDEA_SVN_REPLACED" value="c3e887" />
<option name="FILESTATUS_IGNORE.PROJECT_VIEW.IGNORED" value="666666" /> <option name="FILESTATUS_IGNORE.PROJECT_VIEW.IGNORED" value="666666" />
<option name="FILESTATUS_MERGED" value="7503dc" /> <option name="FILESTATUS_MERGED" value="7503dc" />
<option name="FILESTATUS_MODIFIED" value="80cbc4" /> <option name="FILESTATUS_MODIFIED" value="80cbc4" />


+ 1
- 1
databaseDrivers.xml Просмотреть файл

@@ -1,7 +1,7 @@
<application> <application>
<component name="LocalDatabaseDriverManager" version="201"> <component name="LocalDatabaseDriverManager" version="201">
<driver id="sqlite.xerial"> <driver id="sqlite.xerial">
<artifact id="Xerial SQLiteJDBC" name="Xerial SQLiteJDBC" use="true" version="3.36.0.3" />
<artifact id="Xerial SQLiteJDBC" name="Xerial SQLiteJDBC" use="true" version="3.39.2" />
</driver> </driver>
</component> </component>
</application> </application>

+ 2
- 2
editor-font.xml Просмотреть файл

@@ -1,8 +1,8 @@
<application> <application>
<component name="DefaultFont"> <component name="DefaultFont">
<option name="VERSION" value="1" /> <option name="VERSION" value="1" />
<option name="FONT_SIZE" value="10" />
<option name="FONT_SIZE_2D" value="10.2" />
<option name="FONT_SIZE" value="12" />
<option name="FONT_SIZE_2D" value="12.0" />
<option name="FONT_FAMILY" value="MonoLisa" /> <option name="FONT_FAMILY" value="MonoLisa" />
<option name="FONT_REGULAR_SUB_FAMILY" value="Regular" /> <option name="FONT_REGULAR_SUB_FAMILY" value="Regular" />
<option name="FONT_BOLD_SUB_FAMILY" value="Bold" /> <option name="FONT_BOLD_SUB_FAMILY" value="Bold" />


+ 0
- 1
editor.xml Просмотреть файл

@@ -4,7 +4,6 @@
<option name="IS_ENSURE_NEWLINE_AT_EOF" value="true" /> <option name="IS_ENSURE_NEWLINE_AT_EOF" value="true" />
<option name="SHOW_BREADCRUMBS" value="false" /> <option name="SHOW_BREADCRUMBS" value="false" />
<option name="IS_BLOCK_CURSOR" value="true" /> <option name="IS_BLOCK_CURSOR" value="true" />
<option name="IS_WHITESPACES_SHOWN" value="true" />
</component> </component>
<component name="JSEditorOptions"> <component name="JSEditorOptions">
<option name="START_STRING_INTERPOLATION_ON_TYPING" value="true" /> <option name="START_STRING_INTERPOLATION_ON_TYPING" value="true" />


+ 0
- 1
material_theme.xml Просмотреть файл

@@ -1,7 +1,6 @@
<application> <application>
<component name="MaterialThemeConfig"> <component name="MaterialThemeConfig">
<option name="customTreeIndentEnabled" value="true" /> <option name="customTreeIndentEnabled" value="true" />
<option name="allowDataCollection" value="true" />
<option name="autoResetColorScheme" value="true" /> <option name="autoResetColorScheme" value="true" />
<option name="compactSidebar" value="true" /> <option name="compactSidebar" value="true" />
<option name="isCustomTreeIndentEnabled" value="true" /> <option name="isCustomTreeIndentEnabled" value="true" />


+ 6
- 1
nodejs.xml Просмотреть файл

@@ -1,5 +1,10 @@
<application> <application>
<component name="NodeJsLocalInterpreterManager"> <component name="NodeJsLocalInterpreterManager">
<local-interpreter path="C:/Program Files/nodejs/node.exe" />
<local-interpreter path="C:/Program Files/nodejs/node.exe">
<version-cache version="16.13.1" last-modified="1660032153074" />
</local-interpreter>
</component>
<component name="WslNodeInterpreterManager">
<wsl-interpreter distribution="Manjaro" path="/home/theoryofnekomata/.nvm/versions/node/v16.13.1/bin/node" />
</component> </component>
</application> </application>

Загрузка…
Отмена
Сохранить