diff --git a/Krita/data/KRITA_RESOURCE_VERSION b/Krita/data/KRITA_RESOURCE_VERSION index 2906742..6d54bbd 100644 --- a/Krita/data/KRITA_RESOURCE_VERSION +++ b/Krita/data/KRITA_RESOURCE_VERSION @@ -1 +1 @@ -5.3.2.1 \ No newline at end of file +6.0.1 \ No newline at end of file diff --git a/Krita/data/gradients/1.svg b/Krita/data/gradients/1.svg new file mode 100644 index 0000000..1e052f8 --- /dev/null +++ b/Krita/data/gradients/1.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/Krita/data/input/clipstudiopaintcompatible.profile b/Krita/data/input/clipstudiopaintcompatible.profile index 637c724..f3a8b76 100644 --- a/Krita/data/input/clipstudiopaintcompatible.profile +++ b/Krita/data/input/clipstudiopaintcompatible.profile @@ -61,18 +61,18 @@ version=6 3={e;2;[];20;0;0} [Zoom Canvas] -0={7;2;[1000021,20];1;0;0} -1={8;2;[1000021,1000023];4;0;0} -10={6;1;[33];0;0;0} -11={8;2;[1000021,1000023,20];1;0;0} +0={5;1;[32];0;0;0} +1={2;1;[2b];0;0;0} +10={7;2;[1000021,20];1;0;0} +11={8;2;[1000021,1000023];4;0;0} 2={4;1;[31];0;0;0} 3={3;1;[20,1000023];0;0;0} 4={2;1;[1000021,20];0;0;0} 5={3;3;[];0;2;0} 6={2;3;[];0;1;0} 7={7;2;[1000021];4;0;0} -8={5;1;[32];0;0;0} -9={2;1;[2b];0;0;0} +8={6;1;[33];0;0;0} +9={8;2;[1000021,1000023,20];1;0;0} [Zoom and Rotate Canvas] 0={0;4;[];0;0;7} diff --git a/Krita/data/input/kritadefault.profile b/Krita/data/input/kritadefault.profile index 0362856..2ed6f21 100644 --- a/Krita/data/input/kritadefault.profile +++ b/Krita/data/input/kritadefault.profile @@ -61,18 +61,18 @@ version=6 3={3;2;[];20;0;0} [Zoom Canvas] -0={6;1;[33];0;0;0} -1={8;2;[1000021,1000023,20];1;0;0} -10={2;1;[2b];0;0;0} -11={4;1;[31];0;0;0} +0={5;1;[32];0;0;0} +1={8;2;[1000021,1000023];4;0;0} +10={6;1;[33];0;0;0} +11={8;2;[1000021,1000023,20];1;0;0} 2={3;1;[2d];0;0;0} 3={2;1;[3d];0;0;0} 4={3;3;[];0;2;0} 5={2;3;[];0;1;0} 6={7;2;[1000021];4;0;0} 7={7;2;[1000021,20];1;0;0} -8={5;1;[32];0;0;0} -9={8;2;[1000021,1000023];4;0;0} +8={2;1;[2b];0;0;0} +9={4;1;[31];0;0;0} [Zoom and Rotate Canvas] 0={0;4;[];0;0;7} diff --git a/Krita/data/input/painttoolsaicompatible.profile b/Krita/data/input/painttoolsaicompatible.profile index 76f3125..8804211 100644 --- a/Krita/data/input/painttoolsaicompatible.profile +++ b/Krita/data/input/painttoolsaicompatible.profile @@ -58,19 +58,19 @@ version=6 3={e;2;[];20;0;0} [Zoom Canvas] -0={2;1;[1000021,20];0;0;0} -1={3;1;[1000021,1000023,20];0;0;0} +0={6;1;[33];0;0;0} +1={1;2;[1000021,1000023,20];1;0;0} 10={0;2;[1000021,20];1;0;0} -11={2;3;[];0;1;0} -12={0;2;[1000021];4;0;0} +11={2;1;[1000021,20];0;0;0} +12={3;1;[1000021,1000023,20];0;0;0} 2={5;1;[32];0;0;0} 3={2;1;[2b];0;0;0} 4={4;1;[1000010];0;0;0} 5={3;1;[2d];0;0;0} 6={2;1;[3d];0;0;0} 7={3;3;[];0;2;0} -8={6;1;[33];0;0;0} -9={1;2;[1000021,1000023,20];1;0;0} +8={2;3;[];0;1;0} +9={0;2;[1000021];4;0;0} [Zoom and Rotate Canvas] 0={0;4;[];0;0;7} diff --git a/Krita/data/input/photoshopcompatible.profile b/Krita/data/input/photoshopcompatible.profile index 607bcd6..5fc1351 100644 --- a/Krita/data/input/photoshopcompatible.profile +++ b/Krita/data/input/photoshopcompatible.profile @@ -57,17 +57,17 @@ version=6 3={e;2;[];20;0;0} [Zoom Canvas] -0={1;2;[1000021,1000023,20];1;0;0} -1={0;2;[1000021,20];1;0;0} -10={5;1;[1000021,30];0;0;0} +0={5;1;[1000021,30];0;0;0} +1={0;2;[1000021];4;0;0} +10={2;3;[];0;1;0} 2={6;1;[];0;0;0} 3={3;3;[];0;2;0} 4={2;1;[3d];0;0;0} 5={3;1;[2d];0;0;0} 6={4;1;[1000021,31];0;0;0} 7={2;1;[2b];0;0;0} -8={2;3;[];0;1;0} -9={0;2;[1000021];4;0;0} +8={0;2;[1000021,20];1;0;0} +9={1;2;[1000021,1000023,20];1;0;0} [Zoom and Rotate Canvas] 0={0;4;[];0;0;7} diff --git a/Krita/data/input/seven.profile b/Krita/data/input/seven.profile index eb512d1..23fc799 100644 --- a/Krita/data/input/seven.profile +++ b/Krita/data/input/seven.profile @@ -59,18 +59,18 @@ version=6 3={0;4;[];0;0;2} [Zoom Canvas] -0={4;1;[31];0;0;0} -1={2;1;[2b];0;0;0} -10={8;2;[1000021,1000023,20];1;0;0} -11={6;1;[33];0;0;0} +0={7;2;[44];1;0;0} +1={7;2;[1000021];4;0;0} +10={4;1;[31];0;0;0} +11={2;1;[2b];0;0;0} 2={2;3;[];0;1;0} 3={3;3;[];0;2;0} 4={2;1;[3d];0;0;0} 5={3;1;[2d];0;0;0} 6={8;2;[1000020,44];1;0;0} 7={5;1;[32];0;0;0} -8={7;2;[44];1;0;0} -9={7;2;[1000021];4;0;0} +8={8;2;[1000021,1000023,20];1;0;0} +9={6;1;[33];0;0;0} [Zoom and Rotate Canvas] 0={0;4;[];0;0;7} diff --git a/Krita/data/input/tabletproforusewiththetabletproapplicationonwindows.profile b/Krita/data/input/tabletproforusewiththetabletproapplicationonwindows.profile index 5b51c90..fbc1fee 100644 --- a/Krita/data/input/tabletproforusewiththetabletproapplicationonwindows.profile +++ b/Krita/data/input/tabletproforusewiththetabletproapplicationonwindows.profile @@ -61,18 +61,18 @@ version=6 2={2;4;[];0;0;4} [Zoom Canvas] -0={3;1;[2d];0;0;0} -1={2;1;[3d];0;0;0} -10={0;2;[5a];1;0;0} -11={4;1;[31];0;0;0} +0={5;1;[32];0;0;0} +1={2;1;[2b];0;0;0} +10={3;1;[2d];0;0;0} +11={2;1;[3d];0;0;0} 2={3;3;[];0;2;0} 3={2;3;[];0;1;0} 4={0;2;[1000021];4;0;0} 5={6;1;[33];0;0;0} 6={1;2;[1000021,1000023,20];1;0;0} 7={0;2;[1000021,20];1;0;0} -8={5;1;[32];0;0;0} -9={2;1;[2b];0;0;0} +8={0;2;[5a];1;0;0} +9={4;1;[31];0;0;0} [Zoom and Rotate Canvas] 0={0;4;[];0;0;7} diff --git a/Krita/data/paintoppresets/f)_Texture_Spatter.0001.kpp b/Krita/data/paintoppresets/f)_Texture_Spatter.0001.kpp new file mode 100644 index 0000000..de22e8f Binary files /dev/null and b/Krita/data/paintoppresets/f)_Texture_Spatter.0001.kpp differ diff --git a/Krita/data/paintoppresets/f)_Texture_Spatter.0002.kpp b/Krita/data/paintoppresets/f)_Texture_Spatter.0002.kpp new file mode 100644 index 0000000..c7e18a1 Binary files /dev/null and b/Krita/data/paintoppresets/f)_Texture_Spatter.0002.kpp differ diff --git a/Krita/data/paintoppresets/f)_Texture_Spatter.kpp b/Krita/data/paintoppresets/f)_Texture_Spatter.kpp new file mode 100644 index 0000000..b5603ef Binary files /dev/null and b/Krita/data/paintoppresets/f)_Texture_Spatter.kpp differ diff --git a/Krita/data/paintoppresets/y)_Texture_Spatter.kpp b/Krita/data/paintoppresets/y)_Texture_Spatter.kpp new file mode 100644 index 0000000..725168f Binary files /dev/null and b/Krita/data/paintoppresets/y)_Texture_Spatter.kpp differ diff --git a/Krita/data/palettes/Gypsophila.0022.kpl b/Krita/data/palettes/Gypsophila.0022.kpl new file mode 100644 index 0000000..3d53209 Binary files /dev/null and b/Krita/data/palettes/Gypsophila.0022.kpl differ diff --git a/Krita/data/palettes/Gypsophila.0023.kpl b/Krita/data/palettes/Gypsophila.0023.kpl new file mode 100644 index 0000000..027384c Binary files /dev/null and b/Krita/data/palettes/Gypsophila.0023.kpl differ diff --git a/Krita/data/palettes/Gypsophila.0024.kpl b/Krita/data/palettes/Gypsophila.0024.kpl new file mode 100644 index 0000000..2b56de3 Binary files /dev/null and b/Krita/data/palettes/Gypsophila.0024.kpl differ diff --git a/Krita/data/palettes/Gypsophila.0025.kpl b/Krita/data/palettes/Gypsophila.0025.kpl new file mode 100644 index 0000000..6c2e1f7 Binary files /dev/null and b/Krita/data/palettes/Gypsophila.0025.kpl differ diff --git a/Krita/data/palettes/Gypsophila.0026.kpl b/Krita/data/palettes/Gypsophila.0026.kpl new file mode 100644 index 0000000..0a43598 Binary files /dev/null and b/Krita/data/palettes/Gypsophila.0026.kpl differ diff --git a/Krita/data/palettes/Gypsophila.0027.kpl b/Krita/data/palettes/Gypsophila.0027.kpl new file mode 100644 index 0000000..653945e Binary files /dev/null and b/Krita/data/palettes/Gypsophila.0027.kpl differ diff --git a/Krita/data/palettes/New_Palette.0001.kpl b/Krita/data/palettes/New_Palette.0001.kpl new file mode 100644 index 0000000..f8682f8 Binary files /dev/null and b/Krita/data/palettes/New_Palette.0001.kpl differ diff --git a/Krita/data/palettes/New_Palette.0002.kpl b/Krita/data/palettes/New_Palette.0002.kpl new file mode 100644 index 0000000..78f77de Binary files /dev/null and b/Krita/data/palettes/New_Palette.0002.kpl differ diff --git a/Krita/data/palettes/New_Palette.kpl b/Krita/data/palettes/New_Palette.kpl new file mode 100644 index 0000000..2267220 Binary files /dev/null and b/Krita/data/palettes/New_Palette.kpl differ diff --git a/Krita/data/pykrita/disable_quick_layer_search/__pycache__/__init__.cpython-313.pyc b/Krita/data/pykrita/disable_quick_layer_search/__pycache__/__init__.cpython-313.pyc index 3df6e60..5832ab2 100644 Binary files a/Krita/data/pykrita/disable_quick_layer_search/__pycache__/__init__.cpython-313.pyc and b/Krita/data/pykrita/disable_quick_layer_search/__pycache__/__init__.cpython-313.pyc differ diff --git a/Krita/data/pykrita/disable_quick_layer_search/__pycache__/disable_quick_layer_search.cpython-313.pyc b/Krita/data/pykrita/disable_quick_layer_search/__pycache__/disable_quick_layer_search.cpython-313.pyc index e648377..901bdc3 100644 Binary files a/Krita/data/pykrita/disable_quick_layer_search/__pycache__/disable_quick_layer_search.cpython-313.pyc and b/Krita/data/pykrita/disable_quick_layer_search/__pycache__/disable_quick_layer_search.cpython-313.pyc differ diff --git a/Krita/data/resourcecache.sqlite b/Krita/data/resourcecache.sqlite index abc67cf..64c9f6a 100644 Binary files a/Krita/data/resourcecache.sqlite and b/Krita/data/resourcecache.sqlite differ diff --git a/VSCode/keybindings.json b/VSCode/keybindings.json index 0456f25..f9406b2 100644 --- a/VSCode/keybindings.json +++ b/VSCode/keybindings.json @@ -1,143 +1,183 @@ -// Place your key bindings in this file to override the defaultsauto[] -[ - { - "key": "ctrl+shift+alt+c", - "command": "editor.action.transformToLowercase" - }, - { - "key": "ctrl+alt+c", - "command": "editor.action.transformToUppercase" - }, - { - "key": "ctrl+shift+tab", - "command": "workbench.action.quickOpenPreviousRecentlyUsedEditorInGroup", - "when": "!activeEditorGroupEmpty" - }, - { - "key": "ctrl+tab", - "command": "-workbench.action.quickOpenPreviousRecentlyUsedEditorInGroup", - "when": "!activeEditorGroupEmpty" - }, - { - "key": "ctrl+shift+tab", - "command": "workbench.action.quickOpenNavigateNextInEditorPicker", - "when": "inEditorsPicker && inQuickOpen" - }, - { - "key": "ctrl+tab", - "command": "-workbench.action.quickOpenNavigateNextInEditorPicker", - "when": "inEditorsPicker && inQuickOpen" - }, - { - "key": "ctrl+tab", - "command": "editor.action.indentLines", - "when": "editorTextFocus && !editorReadonly" - }, - { - "key": "ctrl+oem_6", - "command": "-editor.action.indentLines", - "when": "editorTextFocus && !editorReadonly" - }, - { - "key": "alt+left", - "command": "-workbench.action.quickInputBack", - "when": "inQuickOpen" - }, - { - "key": "alt+left", - "command": "-workbench.action.terminal.focusPreviousPane", - "when": "terminalFocus && terminalHasBeenCreated || terminalFocus && terminalProcessSupported" - }, - { - "key": "alt+left", - "command": "-workbench.action.navigateBack", - "when": "canNavigateBack" - }, - { - "key": "alt+left", - "command": "editor.action.moveCarretLeftAction" - }, - { - "key": "alt+right", - "command": "-workbench.action.navigateForward", - "when": "canNavigateForward" - }, - { - "key": "alt+right", - "command": "-workbench.action.terminal.focusNextPane", - "when": "terminalFocus && terminalHasBeenCreated || terminalFocus && terminalProcessSupported" - }, - { - "key": "alt+right", - "command": "editor.action.moveCarretRightAction" - }, - { - "key": "ctrl+shift+alt+s", - "command": "workbench.action.openRecent" - }, - { - "key": "ctrl+r", - "command": "-workbench.action.openRecent" - }, - { - "key": "ctrl+r", - "command": "workbench.action.reloadWindow" - }, - { - "key": "ctrl+r", - "command": "-workbench.action.reloadWindow", - "when": "isDevelopment" - }, - { - "key": "ctrl+shift+alt+x", - "command": "git.openChange", - "when": "workbench.explorer.fileView.active" - }, - { - "key": "ctrl+shift+alt+x", - "command": "git.openFile", - "when": "isInDiffEditor" - }, - { - "key": "alt+i tab", - "command": "editor.action.indentationToTabs" - }, - { - "key": "alt+i space", - "command": "editor.action.indentationToSpaces" - }, - { - "key": "ctrl+shift+alt+left", - "command": "workbench.action.navigateBack", - "when": "canNavigateBack" - }, - { - "key": "browserback", - "command": "-workbench.action.navigateBack", - "when": "canNavigateBack" - }, - { - "key": "ctrl+shift+alt+right", - "command": "workbench.action.navigateForward", - "when": "canNavigateForward" - }, - { - "key": "browserforward", - "command": "-workbench.action.navigateForward", - "when": "canNavigateForward" - }, - { - "key": "ctrl+alt+right", - "command": "-workbench.action.moveEditorToNextGroup" - }, - { - "key": "ctrl+shift+alt+right", - "command": "-cursorColumnSelectRight", - "when": "textInputFocus" - }, - { - "key": "ctrl+shift+alt+left", - "command": "-cursorColumnSelectLeft", - "when": "textInputFocus" - } +// Place your key bindings in this file to override the defaultsauto[] +[ + { + "key": "ctrl+shift+alt+c", + "command": "editor.action.transformToLowercase" + }, + { + "key": "ctrl+alt+c", + "command": "editor.action.transformToUppercase" + }, + { + "key": "ctrl+shift+tab", + "command": "workbench.action.quickOpenPreviousRecentlyUsedEditorInGroup", + "when": "!activeEditorGroupEmpty" + }, + { + "key": "ctrl+tab", + "command": "-workbench.action.quickOpenPreviousRecentlyUsedEditorInGroup", + "when": "!activeEditorGroupEmpty" + }, + { + "key": "ctrl+shift+tab", + "command": "workbench.action.quickOpenNavigateNextInEditorPicker", + "when": "inEditorsPicker && inQuickOpen" + }, + { + "key": "ctrl+tab", + "command": "-workbench.action.quickOpenNavigateNextInEditorPicker", + "when": "inEditorsPicker && inQuickOpen" + }, + { + "key": "ctrl+tab", + "command": "editor.action.indentLines", + "when": "editorTextFocus && !editorReadonly" + }, + { + "key": "ctrl+oem_6", + "command": "-editor.action.indentLines", + "when": "editorTextFocus && !editorReadonly" + }, + { + "key": "alt+left", + "command": "-workbench.action.quickInputBack", + "when": "inQuickOpen" + }, + { + "key": "alt+left", + "command": "-workbench.action.terminal.focusPreviousPane", + "when": "terminalFocus && terminalHasBeenCreated || terminalFocus && terminalProcessSupported" + }, + { + "key": "alt+left", + "command": "-workbench.action.navigateBack", + "when": "canNavigateBack" + }, + { + "key": "alt+left", + "command": "editor.action.moveCarretLeftAction" + }, + { + "key": "alt+right", + "command": "-workbench.action.navigateForward", + "when": "canNavigateForward" + }, + { + "key": "alt+right", + "command": "-workbench.action.terminal.focusNextPane", + "when": "terminalFocus && terminalHasBeenCreated || terminalFocus && terminalProcessSupported" + }, + { + "key": "alt+right", + "command": "editor.action.moveCarretRightAction" + }, + { + "key": "ctrl+shift+alt+s", + "command": "workbench.action.openRecent" + }, + { + "key": "ctrl+r", + "command": "-workbench.action.openRecent" + }, + { + "key": "ctrl+r", + "command": "workbench.action.reloadWindow" + }, + { + "key": "ctrl+r", + "command": "-workbench.action.reloadWindow", + "when": "isDevelopment" + }, + { + "key": "ctrl+shift+alt+x", + "command": "git.openChange", + "when": "workbench.explorer.fileView.active" + }, + { + "key": "ctrl+shift+alt+x", + "command": "git.openFile", + "when": "isInDiffEditor" + }, + { + "key": "alt+i tab", + "command": "editor.action.indentationToTabs" + }, + { + "key": "alt+i space", + "command": "editor.action.indentationToSpaces" + }, + { + "key": "ctrl+shift+alt+left", + "command": "workbench.action.navigateBack", + "when": "canNavigateBack" + }, + { + "key": "browserback", + "command": "-workbench.action.navigateBack", + "when": "canNavigateBack" + }, + { + "key": "ctrl+shift+alt+right", + "command": "workbench.action.navigateForward", + "when": "canNavigateForward" + }, + { + "key": "browserforward", + "command": "-workbench.action.navigateForward", + "when": "canNavigateForward" + }, + { + "key": "ctrl+alt+right", + "command": "-workbench.action.moveEditorToNextGroup" + }, + { + "key": "ctrl+shift+alt+right", + "command": "-cursorColumnSelectRight", + "when": "textInputFocus" + }, + { + "key": "ctrl+shift+alt+left", + "command": "-cursorColumnSelectLeft", + "when": "textInputFocus" + }, + { + "key": "ctrl+n", + "command": "-workbench.action.chat.newChat", + "when": "chatIsEnabled && inChat && chatLocation == 'panel'" + }, + { + "key": "ctrl+n", + "command": "-workbench.action.openChat", + "when": "chatIsEnabled && inChat && inChatEditor" + }, + { + "key": "ctrl+n", + "command": "-chatEditor.action.undoHunk", + "when": "chatEdits.cursorInChangeRange && chatEdits.hasEditorModifications && editorFocus && !chatEdits.isCurrentlyBeingModified || chatEdits.cursorInChangeRange && chatEdits.hasEditorModifications && notebookCellListFocused && !chatEdits.isCurrentlyBeingModified" + }, + { + "key": "ctrl+n", + "command": "-workbench.action.files.newUntitledFile" + }, + { + "key": "ctrl+n", + "command": "explorer.newFile" + }, + { + "key": "ctrl+shift+n", + "command": "-chatEditor.action.reject", + "when": "chatEdits.hasEditorModifications && editorFocus && !chatEdits.isCurrentlyBeingModified || chatEdits.hasEditorModifications && notebookEditorFocused && !chatEdits.isCurrentlyBeingModified" + }, + { + "key": "ctrl+shift+alt+w", + "command": "workbench.action.newWindow" + }, + { + "key": "ctrl+shift+n", + "command": "-workbench.action.newWindow" + }, + { + "key": "ctrl+shift+n", + "command": "explorer.newFolder" + } ] \ No newline at end of file diff --git a/VSCode/settings.json b/VSCode/settings.json index 2547b34..c56f560 100644 --- a/VSCode/settings.json +++ b/VSCode/settings.json @@ -150,4 +150,12 @@ "rust-analyzer.diagnostics.useRustcErrorCode": true, "rust-analyzer.assist.preferSelf": true, "explorer.confirmPasteNative": false, + "editor.detectIndentation": false, + "update.showReleaseNotes": false, + "editor.codeActionsOnSave": { + "source.organizeImports": "always" + }, + "editor.pasteAs.preferences": [ + "text.plain" + ], } \ No newline at end of file