Merge remote-tracking branch 'origin/master'

2020-06-10 11:58:32 +02:00 · 2020-06-10 11:58:32 +02:00 · 273aaa45fc
commit 273aaa45fc
parent f5b45dc7db 3c2c69a19b
80 changed files with 2 additions and 2 deletions
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@ -3,5 +3,5 @@
  <component name="JavaScriptSettings">
    <option name="languageLevel" value="ES6" />
  </component>
-  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.8 (AL-2020)" project-jdk-type="Python SDK" />
+  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.7 (AL-2020)" project-jdk-type="Python SDK" />
 </project>
--- a/.idea/wozek.iml
+++ b/.idea/wozek.iml
@ -4,7 +4,7 @@
    <content url="file://$MODULE_DIR$">
      <excludeFolder url="file://$MODULE_DIR$/venv" />
    </content>
-    <orderEntry type="jdk" jdkName="Python 3.8 (AL-2020)" jdkType="Python SDK" />
+    <orderEntry type="jdk" jdkName="Python 3.7 (AL-2020)" jdkType="Python SDK" />
    <orderEntry type="sourceFolder" forTests="false" />
  </component>
 </module>
--- a/pycache/assigning.cpython-37.pyc
+++ b/pycache/assigning.cpython-37.pyc
--- a/pycache/board.cpython-37.pyc
+++ b/pycache/board.cpython-37.pyc
--- a/pycache/coder.cpython-37.pyc
+++ b/pycache/coder.cpython-37.pyc
--- a/pycache/data.cpython-37.pyc
+++ b/pycache/data.cpython-37.pyc
--- a/pycache/field.cpython-37.pyc
+++ b/pycache/field.cpython-37.pyc
--- a/pycache/product.cpython-37.pyc
+++ b/pycache/product.cpython-37.pyc
--- a/pycache/shelf.cpython-37.pyc
+++ b/pycache/shelf.cpython-37.pyc
--- a/codes_recognizer/pycache/rocognizer.cpython-37.pyc
+++ b/codes_recognizer/pycache/rocognizer.cpython-37.pyc
--- a/img/shelves/black/black001.png
+++ b/img/shelves/black/black001.png
--- a/img/shelves/black/black010.png
+++ b/img/shelves/black/black010.png
--- a/img/shelves/black/black011.png
+++ b/img/shelves/black/black011.png
--- a/img/shelves/black/black100.png
+++ b/img/shelves/black/black100.png
--- a/img/shelves/black/black101.png
+++ b/img/shelves/black/black101.png
--- a/img/shelves/black/black110.png
+++ b/img/shelves/black/black110.png
--- a/img/shelves/black/black111.png
+++ b/img/shelves/black/black111.png
--- a/img/shelves/gold/gold001.png
+++ b/img/shelves/gold/gold001.png
--- a/img/shelves/gold/gold010.png
+++ b/img/shelves/gold/gold010.png
--- a/img/shelves/gold/gold011.png
+++ b/img/shelves/gold/gold011.png
--- a/img/shelves/gold/gold100.png
+++ b/img/shelves/gold/gold100.png
--- a/img/shelves/gold/gold101.png
+++ b/img/shelves/gold/gold101.png
--- a/img/shelves/gold/gold110.png
+++ b/img/shelves/gold/gold110.png
--- a/img/shelves/gold/gold111.png
+++ b/img/shelves/gold/gold111.png
--- a/img/shelves/purple/purple001.png
+++ b/img/shelves/purple/purple001.png
--- a/img/shelves/purple/purple010.png
+++ b/img/shelves/purple/purple010.png
--- a/img/shelves/purple/purple011.png
+++ b/img/shelves/purple/purple011.png
--- a/img/shelves/purple/purple100.png
+++ b/img/shelves/purple/purple100.png
--- a/img/shelves/purple/purple101.png
+++ b/img/shelves/purple/purple101.png
--- a/img/shelves/purple/purple110.png
+++ b/img/shelves/purple/purple110.png
--- a/img/shelves/purple/purple111.png
+++ b/img/shelves/purple/purple111.png
--- a/img/shelves/brown/brown001.png
+++ b/img/shelves/brown/brown001.png
--- a/img/shelves/brown/brown010.png
+++ b/img/shelves/brown/brown010.png
--- a/img/shelves/brown/brown011.png
+++ b/img/shelves/brown/brown011.png
--- a/img/shelves/brown/brown100.png
+++ b/img/shelves/brown/brown100.png
--- a/img/shelves/brown/brown101.png
+++ b/img/shelves/brown/brown101.png
--- a/img/shelves/brown/brown110.png
+++ b/img/shelves/brown/brown110.png
--- a/img/shelves/brown/brown111.png
+++ b/img/shelves/brown/brown111.png
--- a/img/shelves/blue/blue001.png
+++ b/img/shelves/blue/blue001.png
--- a/img/shelves/blue/blue010.png
+++ b/img/shelves/blue/blue010.png
--- a/img/shelves/blue/blue011.png
+++ b/img/shelves/blue/blue011.png
--- a/img/shelves/blue/blue100.png
+++ b/img/shelves/blue/blue100.png
--- a/img/shelves/blue/blue101.png
+++ b/img/shelves/blue/blue101.png
--- a/img/shelves/blue/blue110.png
+++ b/img/shelves/blue/blue110.png
--- a/img/shelves/blue/blue111.png
+++ b/img/shelves/blue/blue111.png
--- a/img/shelves/white/white001.png
+++ b/img/shelves/white/white001.png
--- a/img/shelves/white/white010.png
+++ b/img/shelves/white/white010.png
--- a/img/shelves/white/white011.png
+++ b/img/shelves/white/white011.png
--- a/img/shelves/white/white100.png
+++ b/img/shelves/white/white100.png
--- a/img/shelves/white/white101.png
+++ b/img/shelves/white/white101.png
--- a/img/shelves/white/white110.png
+++ b/img/shelves/white/white110.png
--- a/img/shelves/white/white111.png
+++ b/img/shelves/white/white111.png
--- a/img/shelves/red/red001.png
+++ b/img/shelves/red/red001.png
--- a/img/shelves/red/red010.png
+++ b/img/shelves/red/red010.png
--- a/img/shelves/red/red011.png
+++ b/img/shelves/red/red011.png
--- a/img/shelves/red/red100.png
+++ b/img/shelves/red/red100.png
--- a/img/shelves/red/red101.png
+++ b/img/shelves/red/red101.png
--- a/img/shelves/red/red110.png
+++ b/img/shelves/red/red110.png
--- a/img/shelves/red/red111.png
+++ b/img/shelves/red/red111.png
--- a/img/shelves/orange/orange001.png
+++ b/img/shelves/orange/orange001.png
--- a/img/shelves/orange/orange010.png
+++ b/img/shelves/orange/orange010.png
--- a/img/shelves/orange/orange011.png
+++ b/img/shelves/orange/orange011.png
--- a/img/shelves/orange/orange100.png
+++ b/img/shelves/orange/orange100.png
--- a/img/shelves/orange/orange101.png
+++ b/img/shelves/orange/orange101.png
--- a/img/shelves/orange/orange110.png
+++ b/img/shelves/orange/orange110.png
--- a/img/shelves/orange/orange111.png
+++ b/img/shelves/orange/orange111.png
--- a/img/shelves/yellow/yellow001.png
+++ b/img/shelves/yellow/yellow001.png
--- a/img/shelves/yellow/yellow010.png
+++ b/img/shelves/yellow/yellow010.png
--- a/img/shelves/yellow/yellow011.png
+++ b/img/shelves/yellow/yellow011.png
--- a/img/shelves/yellow/yellow100.png
+++ b/img/shelves/yellow/yellow100.png
--- a/img/shelves/yellow/yellow101.png
+++ b/img/shelves/yellow/yellow101.png
--- a/img/shelves/yellow/yellow110.png
+++ b/img/shelves/yellow/yellow110.png
--- a/img/shelves/yellow/yellow111.png
+++ b/img/shelves/yellow/yellow111.png
--- a/img/shelves/silver/silver001.png
+++ b/img/shelves/silver/silver001.png
--- a/img/shelves/silver/silver010.png
+++ b/img/shelves/silver/silver010.png
--- a/img/shelves/silver/silver011.png
+++ b/img/shelves/silver/silver011.png
--- a/img/shelves/silver/silver100.png
+++ b/img/shelves/silver/silver100.png
--- a/img/shelves/silver/silver101.png
+++ b/img/shelves/silver/silver101.png
--- a/img/shelves/silver/silver110.png
+++ b/img/shelves/silver/silver110.png
--- a/img/shelves/silver/silver111.png
+++ b/img/shelves/silver/silver111.png