Merge branch 'devel'

SanPen · May 29, 2024 · 6707ea9 · 6707ea9
2 parents 80d858e + a42c7de
commit 6707ea9
Show file tree

Hide file tree

Showing 493 changed files with 207,643 additions and 76,595 deletions.
diff --git a/.gitignore b/.gitignore
@@ -18,6 +18,7 @@ __pycache__
 *.egg-info
 
 /src/tests/data/output/*.png
+/src/GridCal/Gui/Main/icons/.DS_Store
 
 Results.xlsx
 lynn5node.gridcal

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/Grids_and_profiles/grids/IEEE 14 zip costs.gridcal b/Grids_and_profiles/grids/IEEE 14 zip costs.gridcal