diff --git a/.gitignore b/.gitignore index 0489545..a8c96d3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,8 @@ /target /.idea *.iml +/bin.py +python/dontlook.py expected_values.md /bin.py python/dontlook.py diff --git a/python/requirements_dev.txt b/python/requirements_dev.txt index 48f786b..96c3071 100644 --- a/python/requirements_dev.txt +++ b/python/requirements_dev.txt @@ -5,5 +5,9 @@ pytest-cov==3.0.0 mypy==0.941 dearpygui==1.8.0 PyYAML==6.0 +<<<<<<< HEAD rich==13.3.1 -pyinstaller==5.8.0 \ No newline at end of file +pyinstaller==5.8.0 +======= +rich==13.3.1 +>>>>>>> develop diff --git a/python/src/ffcraft_solver/resources/ffcraft_solver.ico b/python/src/ffcraft_solver/resources/ffcraft_solver.ico new file mode 100644 index 0000000..3b9f0cf Binary files /dev/null and b/python/src/ffcraft_solver/resources/ffcraft_solver.ico differ diff --git a/python/src/ffcraft_solver/resources/ffcraft_solver.png b/python/src/ffcraft_solver/resources/ffcraft_solver.png new file mode 100644 index 0000000..60a51ef Binary files /dev/null and b/python/src/ffcraft_solver/resources/ffcraft_solver.png differ