p_monsalvete 91e2794a8b Merge remote-tracking branch 'origin/idf_lights' into idf_lights ... # Conflicts: # hub/catalog_factories/usage/nrcan_catalog.py # hub/exports/building_energy/idf.py		2023-05-03 11:50:59 -04:00
..
building_energy	Merge remote-tracking branch 'origin/idf_lights' into idf_lights	2023-05-03 11:50:59 -04:00
energy_systems	Clean up:	2023-01-26 07:41:56 -05:00
formats	complete peak loads calculation	2023-05-01 10:37:51 -04:00
db_factory.py	Reintroduce function in business logic	2023-03-13 14:41:25 -04:00
energy_building_exports_factory.py	Partial correction for peakloads	2023-04-27 10:59:03 -04:00
energy_systems_factory.py	packaging version	2023-01-24 10:51:50 -05:00
exports_factory.py	partial re-implementation of geojson read.	2023-05-01 18:05:09 -04:00
user_factory.py	Completed changes for new models	2023-02-22 22:45:33 -05:00