p_monsalvete 78f3921447 Merge branch 'main' into dhw ... # Conflicts: # hub/config/configuration.ini # hub/helpers/configuration_helper.py # hub/helpers/data/hft_function_to_hub_function.py		2023-03-20 11:30:06 -04:00
..
attributes	partial optimization	2023-03-17 12:54:52 -04:00
building_demand	added domestic hot water parameters in catalog and importers	2023-03-20 11:07:43 -04:00
energy_systems	Added heat pump energy demand and fossil fuel consumption results	2023-02-20 18:36:34 -05:00
greenery	packaging version	2023-01-24 10:51:50 -05:00
iot	Saved local changes	2023-02-19 14:04:11 -05:00
transport	packaging version	2023-01-24 10:51:50 -05:00
building.py	Starting line information dictionary	2023-02-24 15:15:27 -05:00
buildings_cluster.py	packaging version	2023-01-24 10:51:50 -05:00
bus_system.py	Clean up:	2023-01-26 07:41:56 -05:00
city_object.py	Merge branch 'main' into dhw	2023-03-20 11:30:06 -04:00
city_objects_cluster.py	packaging version	2023-01-24 10:51:50 -05:00
city.py	Correct small bug in merge city	2023-03-14 11:28:34 -04:00
energy_system.py	packaging version	2023-01-24 10:51:50 -05:00
fuel.py	Clean up:	2023-01-26 07:41:56 -05:00
lca_material.py	packaging version	2023-01-24 10:51:50 -05:00
level_of_detail.py	Added the full functionality to create meb	2023-02-08 13:40:06 -05:00
machine.py	Clean up:	2023-01-26 07:41:56 -05:00
network.py	Clean up:	2023-01-26 07:41:56 -05:00
parts_consisting_building.py	packaging version	2023-01-24 10:51:50 -05:00
vehicle.py	Clean up:	2023-01-26 07:41:56 -05:00