Parcourir la source
WS-2023.2.2 <TheoryOfNekomata@Hydra Merge branch 'master'
# Conflicts: # colors/TheoryOfNekomata.icls # colors/_@user_Darcula.icls # web-types-npm-loader.xmlmaster
TheoryOfNekomata
il y a 1 mois
8 fichiers modifiés avec 12 ajouts et 6 suppressions
-
+1 -1colors/TheoryOfNekomata.icls
-
BINcolors/_@user_Darcula.icls
-
+2 -0filetypes.xml
-
+0 -1ide.general.xml
-
+2 -2markdown.xml
-
+1 -1material_theme.xml
-
+5 -0overrideFileTypes.xml
-
+1 -1web-types-npm-loader.xml
+ 1
- 1
colors/TheoryOfNekomata.icls
Voir le fichier
| @@ -941,4 +941,4 @@ | |||||
| </value> | </value> | ||||
| </option> | </option> | ||||
| </attributes> | </attributes> | ||||
| </scheme> | |||||
| </scheme> | |||||
BIN
colors/_@user_Darcula.icls
Voir le fichier
+ 2
- 0
filetypes.xml
Voir le fichier
| @@ -11,6 +11,8 @@ | |||||
| <mapping pattern=".gitkeep" type="PLAIN_TEXT" /> | <mapping pattern=".gitkeep" type="PLAIN_TEXT" /> | ||||
| <mapping pattern=".browserslistrc" type="PLAIN_TEXT" /> | <mapping pattern=".browserslistrc" type="PLAIN_TEXT" /> | ||||
| <mapping ext="py" type="PLAIN_TEXT" /> | <mapping ext="py" type="PLAIN_TEXT" /> | ||||
| <mapping ext="musicxml" type="XML" /> | |||||
| <mapping ext="mei" type="XML" /> | |||||
| <removed_mapping ext="apk" approved="true" type="ARCHIVE" /> | <removed_mapping ext="apk" approved="true" type="ARCHIVE" /> | ||||
| <removed_mapping ext="csv" approved="true" type="CSV" /> | <removed_mapping ext="csv" approved="true" type="CSV" /> | ||||
| <removed_mapping ext="dockerignore" approved="true" type="DockerIgnore file" /> | <removed_mapping ext="dockerignore" approved="true" type="DockerIgnore file" /> | ||||
+ 0
- 1
ide.general.xml
Voir le fichier
| @@ -8,7 +8,6 @@ | |||||
| <entry key="ide.experimental.ui" value="true" /> | <entry key="ide.experimental.ui" value="true" /> | ||||
| <entry key="ide.balloon.shadow.size" value="0" /> | <entry key="ide.balloon.shadow.size" value="0" /> | ||||
| <entry key="ide.experimental.ui.inter.font" value="false" /> | <entry key="ide.experimental.ui.inter.font" value="false" /> | ||||
| <entry key="debugger.new.tool.window.layout" value="false" /> | |||||
| <entry key="idea.plugins.compatible.build" value="" /> | <entry key="idea.plugins.compatible.build" value="" /> | ||||
| <entry key="ide.editor.tab.selection.animation" value="true" /> | <entry key="ide.editor.tab.selection.animation" value="true" /> | ||||
| <entry key="ide.new.editor.tabs.vertical.borders" value="true" /> | <entry key="ide.new.editor.tabs.vertical.borders" value="true" /> | ||||
+ 2
- 2
markdown.xml
Voir le fichier
| @@ -1,5 +1,5 @@ | |||||
| <application> | <application> | ||||
| <component name="MarkdownApplicationSettings"> | |||||
| <MarkdownCssSettings /> | |||||
| <component name="MarkdownCodeInsightSettings"> | |||||
| <option name="renumberListsOnType" value="true" /> | |||||
| </component> | </component> | ||||
| </application> | </application> | ||||
+ 1
- 1
material_theme.xml
Voir le fichier
| @@ -6,6 +6,6 @@ | |||||
| <option name="accentColor" value="eeca3f" /> | <option name="accentColor" value="eeca3f" /> | ||||
| <option name="selectedTheme" value="CUSTOM" /> | <option name="selectedTheme" value="CUSTOM" /> | ||||
| <option name="userId" value="-7da661d8:18b4bcebeef:-8000" /> | <option name="userId" value="-7da661d8:18b4bcebeef:-8000" /> | ||||
| <option name="version" value="8.12.2" /> | |||||
| <option name="version" value="8.12.6" /> | |||||
| </component> | </component> | ||||
| </application> | </application> | ||||
+ 5
- 0
overrideFileTypes.xml
Voir le fichier
| @@ -0,0 +1,5 @@ | |||||
| <application> | |||||
| <component name="OverrideFileTypeManager"> | |||||
| <file url="file://$USER_HOME$/Projects/piano-notes-book/src/assets/haydn.mei" value="XML" /> | |||||
| </component> | |||||
| </application> | |||||
+ 1
- 1
web-types-npm-loader.xml
Voir le fichier
| @@ -117,4 +117,4 @@ | |||||
| <package name="lit" /> | <package name="lit" /> | ||||
| </enabled> | </enabled> | ||||
| </component> | </component> | ||||
| </application> | |||||
| </application> | |||||