Merge pull request #12 from scorpion/develop

v1.2.0
scorpion · Sep 30, 2020 · d9d1412 · d9d1412
2 parents 9309d96 + 74fc04c
commit d9d1412
Show file tree

Hide file tree

Showing 17 changed files with 147 additions and 782 deletions.
diff --git a/.idea/.name b/.idea/.name
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
diff --git a/.idea/inspectionProfiles/profiles_settings.xml b/.idea/inspectionProfiles/profiles_settings.xml
diff --git a/.idea/jsLibraryMappings.xml b/.idea/jsLibraryMappings.xml
diff --git a/.idea/libraries/psd_simpledi_node_modules.xml b/.idea/libraries/psd_simpledi_node_modules.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/.idea/psd-simpledi.iml → .idea/scorpion.iml b/.idea/psd-simpledi.iml → .idea/scorpion.iml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/.idea/watcherTasks.xml b/.idea/watcherTasks.xml