p_monsalvete 3f91da9f45 Merge remote-tracking branch 'origin/energy_system_central_data_model' into energy_system_central_data_model ... # Conflicts: # hub/imports/energy_systems/montreal_custom_energy_system_parameters.py		2023-10-06 04:13:32 -04:00
cerc_hub.egg-info	Correct trimesh dependency	2023-07-24 12:33:24 -04:00
hub	created a loop for generation systems in _associate_energy_systems	2023-10-05 16:18:08 -04:00
tests	Merge remote-tracking branch 'origin/energy_system_central_data_model' into energy_system_central_data_model	2023-10-06 04:13:32 -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	Merge remote-tracking branch 'origin/update_documentation'	2023-09-04 16:46:38 +02:00