Selaa lähdekoodia

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

Conflicts:
	NewUIInfoService.xml
	colors/_@user_Darcula.icls
	material_theme.xml
master
TheoryOfNekomata 1 vuosi sitten
vanhempi
commit
154269eabd
7 muutettua tiedostoa jossa 63 lisäystä ja 13 poistoa
  1. +1
    -2
      NewUIInfoService.xml
  2. +7
    -0
      _mac/toolchains.xml
  3. +39
    -6
      colors/TheoryOfNekomata.icls
  4. +4
    -4
      colors/_@user_Darcula.icls
  5. +6
    -0
      github-copilot.xml
  6. +1
    -1
      material_theme.xml
  7. +5
    -0
      settingsSync.xml

+ 1
- 2
NewUIInfoService.xml Näytä tiedosto

@@ -1,6 +1,5 @@
<application>
<component name="NewUIInfoState"><![CDATA[{
"numberNotificationShowed": 1,
"enableNewUIDate": "2022-12-11T16:28:30.876810500"
"enableNewUIDate": "2022-12-21T16:22:56.893284200"
}]]></component>
</application>

+ 7
- 0
_mac/toolchains.xml Näytä tiedosto

@@ -0,0 +1,7 @@
<application>
<component name="CPPToolchains" version="8">
<toolchains detectedVersion="5">
<toolchain name="Default" toolSetKind="SYSTEM_UNIX_TOOLSET" debuggerKind="BUNDLED_LLDB" />
</toolchains>
</component>
</application>

+ 39
- 6
colors/TheoryOfNekomata.icls Näytä tiedosto

@@ -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">2022-03-28T12:49:26</property>
<property name="modified">2023-01-19T17:10:31</property>
<property name="originalScheme">TheoryOfNekomata copy</property>
</metaInfo>
<console-font>
@@ -24,12 +24,26 @@
<option name="CONSOLE_BACKGROUND_KEY" value="" />
<option name="DELETED_LINES_COLOR" value="747474" />
<option name="DOCUMENTATION_COLOR" value="515151" />
<option name="FILESTATUS_ADDED" value="74f95e" />
<option name="FILESTATUS_IDEA_FILESTATUS_IGNORED" value="666666" />
<option name="FILESTATUS_ADDED" value="c3e887" />
<option name="FILESTATUS_DELETED" value="f77669" />
<option name="FILESTATUS_HIJACKED" value="ffcb6b" />
<option name="FILESTATUS_IDEA_FILESTATUS_DELETED_FROM_FILE_SYSTEM" value="6c6c6c" />
<option name="FILESTATUS_IDEA_FILESTATUS_IGNORED" value="848504" />
<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="666666" />
<option name="FILESTATUS_MODIFIED" value="eed371" />
<option name="FILESTATUS_UNKNOWN" value="ff66c6" />
<option name="FILESTATUS_addedOutside" value="a8ee36" />
<option name="FILESTATUS_MERGED" value="9876aa" />
<option name="FILESTATUS_MODIFIED" value="eac651" />
<option name="FILESTATUS_NOT_CHANGED_IMMEDIATE" value="80cbc4" />
<option name="FILESTATUS_NOT_CHANGED_RECURSIVE" value="80cbc4" />
<option name="FILESTATUS_OBSOLETE" value="ffcb6b" />
<option name="FILESTATUS_SUPPRESSED" value="546e7a" />
<option name="FILESTATUS_SWITCHED" value="f77669" />
<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="GUTTER_BACKGROUND" value="222222" />
<option name="INDENT_GUIDE" value="444444" />
<option name="LEFT_GUTTER_BACKGROUND" value="8a8a8a" />
@@ -446,6 +460,25 @@
<option name="FOREGROUND" value="ffa1c9" />
</value>
</option>
<option name="ELIXIR_ALIAS" baseAttributes="DEFAULT_CLASS_NAME" />
<option name="ELIXIR_BRACES" baseAttributes="DEFAULT_BRACES" />
<option name="ELIXIR_BRACKET" baseAttributes="DEFAULT_BRACKETS" />
<option name="ELIXIR_CALLBACK" baseAttributes="ELIXIR_SPECIFICATION" />
<option name="ELIXIR_CHAR_LIST" baseAttributes="DEFAULT_STRING" />
<option name="ELIXIR_CHAR_TOKEN" baseAttributes="DEFAULT_ENTITY" />
<option name="ELIXIR_EXPRESSION_SUBSTITUTION_MARK" baseAttributes="DEFAULT_BRACES" />
<option name="ELIXIR_IGNORED_VARIABLE" baseAttributes="ELIXIR_VARIABLE" />
<option name="ELIXIR_MACRO_CALL" baseAttributes="ELIXIR_FUNCTION_CALL" />
<option name="ELIXIR_MAP" baseAttributes="DEFAULT_BRACES" />
<option name="ELIXIR_OPERATION_SIGN" baseAttributes="DEFAULT_OPERATION_SIGN" />
<option name="ELIXIR_PARAMETER" baseAttributes="DEFAULT_PARAMETER" />
<option name="ELIXIR_PARENTHESES" baseAttributes="DEFAULT_PARENTHS" />
<option name="ELIXIR_SPECIFICATION" baseAttributes="DEFAULT_FUNCTION_DECLARATION" />
<option name="ELIXIR_STRUCT" baseAttributes="ELIXIR_MAP" />
<option name="ELIXIR_VARIABLE" baseAttributes="DEFAULT_LOCAL_VARIABLE" />
<option name="ERL_MACRO" baseAttributes="DEFAULT_STATIC_FIELD" />
<option name="ERL_RECORDS" baseAttributes="DEFAULT_INSTANCE_FIELD" />
<option name="ERL_VARIABLES" baseAttributes="DEFAULT_GLOBAL_VARIABLE" />
<option name="ERRORS_ATTRIBUTES">
<value>
<option name="EFFECT_COLOR" value="ff0000" />


+ 4
- 4
colors/_@user_Darcula.icls Näytä tiedosto

@@ -1,22 +1,22 @@
<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-19T17:11:26</property>
<property name="modified">2023-01-19T17:10:32</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="80cbc4" />
<option name="FILESTATUS_MODIFIED" value="eac651" />
<option name="FILESTATUS_NOT_CHANGED_IMMEDIATE" value="80cbc4" />
<option name="FILESTATUS_NOT_CHANGED_RECURSIVE" value="80cbc4" />
<option name="FILESTATUS_OBSOLETE" value="ffcb6b" />
<option name="FILESTATUS_SUPPRESSED" value="546e7a" />
<option name="FILESTATUS_SWITCHED" value="f77669" />
<option name="FILESTATUS_UNKNOWN" value="f77669" />
<option name="FILESTATUS_modifiedOutside" value="f3db88" />
</colors>
</scheme>

+ 6
- 0
github-copilot.xml Näytä tiedosto

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

+ 1
- 1
material_theme.xml Näytä tiedosto

@@ -16,6 +16,6 @@
<option name="accentColor" value="eeca3f" />
<option name="selectedTheme" value="CUSTOM" />
<option name="userId" value="7a11f371:1686d9b67db:-8000" />
<option name="version" value="8.4.0" />
<option name="version" value="8.4.1" />
</component>
</application>

+ 5
- 0
settingsSync.xml Näytä tiedosto

@@ -1,5 +1,10 @@
<application>
<component name="SettingsSyncSettings">
<option name="disabledCategories">
<list>
<option value="UI" />
</list>
</option>
<option name="migrationFromOldStorageChecked" value="true" />
</component>
</application>

Ladataan…
Peruuta
Tallenna