p_monsalvete b1d42ee00b Merge remote-tracking branch 'origin/systems_catalog_improvement' into systems_catalog_improvement ... # Conflicts: # hub/catalog_factories/data_models/energy_systems/electrical_storage_system.py # hub/catalog_factories/data_models/energy_systems/energy_storage_system.py # hub/catalog_factories/data_models/energy_systems/thermal_storage_system.py		2023-08-29 12:25:04 -04:00
cerc_hub.egg-info	Correct trimesh dependency	2023-07-24 12:33:24 -04:00
hub	Merge remote-tracking branch 'origin/systems_catalog_improvement' into systems_catalog_improvement	2023-08-29 12:25:04 -04:00
tests	energy_storage_system.py is modified and inherited by thermal_storage_system.py and electrical_storage_system.py	2023-08-29 11:45:02 -04:00
.gitignore	added .gitignore to always ignore .idea	2023-08-11 10:18:33 -04:00
pyproject.toml	Partial correction of persistence	2023-01-31 13:11:39 -05:00
requirements.txt	Additional changes, the db_control building info need to be changed	2023-07-28 14:55:06 -04:00
setup.py	correct setup.py	2023-08-08 12:45:19 -04:00