浏览代码

WS-2022.3.1 <theoryofnekomata@CIPANGU.local Merge branch 'master'

Conflicts:
	colors/TheoryOfNekomata.icls
	colors/_@user_Darcula.icls
master
父节点
当前提交
b8b811f23e
共有 8 个文件被更改,包括 21 次插入8 次删除
  1. +1
    -1
      NewUIInfoService.xml
  2. +1
    -1
      colors/TheoryOfNekomata.icls
  3. +2
    -3
      colors/_@user_Darcula.icls
  4. +1
    -1
      csv-editor.xml
  5. +1
    -1
      editor-font.xml
  6. +1
    -1
      filetypes.xml
  7. +1
    -0
      github-copilot.xml
  8. +13
    -0
      keymapFlags.xml

+ 1
- 1
NewUIInfoService.xml 查看文件

@@ -1,5 +1,5 @@
<application>
<component name="NewUIInfoState"><![CDATA[{
"enableNewUIDate": "2023-01-04T10:50:28.262260"
"enableNewUIDate": "2022-12-21T16:22:56.893284200"
}]]></component>
</application>

+ 1
- 1
colors/TheoryOfNekomata.icls 查看文件

@@ -4,7 +4,7 @@
<property name="created">2021-07-05T06:47:16</property>
<property name="ide">AndroidStudio</property>
<property name="ideVersion">4.2.2.0</property>
<property name="modified">2023-01-22T18:12:23</property>
<property name="modified">2023-01-19T17:28:36</property>
<property name="originalScheme">TheoryOfNekomata copy</property>
</metaInfo>
<console-font>


+ 2
- 3
colors/_@user_Darcula.icls 查看文件

@@ -1,16 +1,15 @@
<scheme name="_@user_Darcula" version="142" parent_scheme="Darcula">
<metaInfo>
<property name="created">2022-12-11T15:56:44</property>
<property name="created">2023-01-19T17:08:39</property>
<property name="ide">WebStorm</property>
<property name="ideVersion">2022.3.0.0</property>
<property name="modified">2023-01-22T18:12:23</property>
<property name="modified">2023-01-19T17:28:36</property>
<property name="originalScheme">Darcula</property>
</metaInfo>
<colors>
<option name="FILESTATUS_ADDED" value="c3e887" />
<option name="FILESTATUS_DELETED" value="f77669" />
<option name="FILESTATUS_HIJACKED" value="ffcb6b" />
<option name="FILESTATUS_IGNORE.PROJECT_VIEW.IGNORED" value="cccccc" />
<option name="FILESTATUS_MODIFIED" value="eac651" />
<option name="FILESTATUS_NOT_CHANGED_IMMEDIATE" value="80cbc4" />
<option name="FILESTATUS_NOT_CHANGED_RECURSIVE" value="80cbc4" />


+ 1
- 1
csv-editor.xml 查看文件

@@ -1,5 +1,5 @@
<application>
<component name="CsvEditorSettings">
<option name="CURRENT_PLUGIN_VERSION" value="3.0.1-223" />
<option name="CURRENT_PLUGIN_VERSION" value="3.0.2-223" />
</component>
</application>

+ 1
- 1
editor-font.xml 查看文件

@@ -3,7 +3,7 @@
<option name="VERSION" value="1" />
<option name="FONT_SIZE" value="12" />
<option name="FONT_SIZE_2D" value="12.0" />
<option name="FONT_FAMILY" value="MonoLisa ss02 ss06 ss07 zero" />
<option name="FONT_FAMILY" value="MonoLisa" />
<option name="LINE_SPACING" value="0.85" />
</component>
</application>

+ 1
- 1
filetypes.xml 查看文件

@@ -3,7 +3,6 @@
<extensionMap>
<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" />
@@ -21,6 +20,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>

+ 1
- 0
github-copilot.xml 查看文件

@@ -1,5 +1,6 @@
<application>
<component name="github-copilot">
<option name="signinNotificationShown" value="true" />
<option name="showIdeCompletions" value="true" />
</component>
</application>

+ 13
- 0
keymapFlags.xml 查看文件

@@ -0,0 +1,13 @@
<application>
<component name="KeymapFlagsStorage">
<option name="keymapToDescriptor">
<map>
<entry key="Windows Proper Redo">
<value>
<list />
</value>
</entry>
</map>
</option>
</component>
</application>

正在加载...
取消
保存