Merge branch 'develop' into feature/VECTO-1240-hybrid-powertrain
# Conflicts: # VectoCore/VectoCore/InputData/FileIO/JSON/JSONComponentInputData.cs # VectoCore/VectoCore/InputData/FileIO/JSON/JSONVehicleData.cs # VectoCore/VectoCore/OutputData/ModalDataContainer.cs # VectoCore/VectoCore/Resources/Declaration/CO2Standards/MissionProfileWeights.csv # VectoCore/VectoCore/VersionNumber.t4 # VectoCore/VectoCoreTest/VectoCoreTest.csproj
Showing
- Documentation/User Manual Source/Release Notes Vecto3.x.pdf 0 additions, 0 deletionsDocumentation/User Manual Source/Release Notes Vecto3.x.pdf
- Documentation/User Manual Source/Release Notes Vecto3.x.pptx 0 additions, 0 deletionsDocumentation/User Manual Source/Release Notes Vecto3.x.pptx
- Generic Vehicles/Declaration Mode/CompletedBus 31b2/CompletedBus_31b.vecto 0 additions, 0 deletions...Declaration Mode/CompletedBus 31b2/CompletedBus_31b.vecto
- Generic Vehicles/Declaration Mode/CompletedBus 31b2/primary_heavyBus group_P31_32_Smart_ES.PIF.xml 48 additions, 20 deletions...edBus 31b2/primary_heavyBus group_P31_32_Smart_ES.PIF.xml
- Generic Vehicles/Declaration Mode/CompletedBus 31b2/primary_heavyBus group_P31_32_Smart_ES.PIF_incl TC.xml 74 additions, 46 deletions...b2/primary_heavyBus group_P31_32_Smart_ES.PIF_incl TC.xml
- Generic Vehicles/Declaration Mode/CompletedBus 31b2/vecto_vehicle-completed_heavyBus_31b.xml 2 additions, 2 deletions...ompletedBus 31b2/vecto_vehicle-completed_heavyBus_31b.xml
- Generic Vehicles/Declaration Mode/CompletedBus 34f/primary_heavyBus group_P33_34_SmartPS.PIF.xml 45 additions, 17 deletions...etedBus 34f/primary_heavyBus group_P33_34_SmartPS.PIF.xml
- Generic Vehicles/Declaration Mode/CompletedBus 34f/vecto_vehicle-completed_heavyBus_34f.xml 2 additions, 2 deletions...CompletedBus 34f/vecto_vehicle-completed_heavyBus_34f.xml
- Generic Vehicles/Declaration Mode/CompletedBus 39a/vecto_vehicle-completed_heavyBus_39a.xml 2 additions, 2 deletions...CompletedBus 39a/vecto_vehicle-completed_heavyBus_39a.xml
- Generic Vehicles/Declaration Mode/Group 51/vecto_vehicle-medium_lorry_4x2F.xml 0 additions, 0 deletions...aration Mode/Group 51/vecto_vehicle-medium_lorry_4x2F.xml
- Generic Vehicles/Declaration Mode/Group 53/130kW Engine.veng 0 additions, 0 deletionsGeneric Vehicles/Declaration Mode/Group 53/130kW Engine.veng
- Generic Vehicles/Declaration Mode/Group 53/130kW_D_Engine_ML.vmap 0 additions, 0 deletions...Vehicles/Declaration Mode/Group 53/130kW_D_Engine_ML.vmap
- Generic Vehicles/Declaration Mode/Group 53/6 Gear manual transmission 0.791-5.375.vgbx 0 additions, 0 deletions...Mode/Group 53/6 Gear manual transmission 0.791-5.375.vgbx
- Generic Vehicles/Declaration Mode/Group 53/Axle_4x2_orig.vtlm 0 additions, 0 deletions...ric Vehicles/Declaration Mode/Group 53/Axle_4x2_orig.vtlm
- Generic Vehicles/Declaration Mode/Group 53/Gear_1.vtlm 0 additions, 0 deletionsGeneric Vehicles/Declaration Mode/Group 53/Gear_1.vtlm
- Generic Vehicles/Declaration Mode/Group 53/Gear_2.vtlm 0 additions, 0 deletionsGeneric Vehicles/Declaration Mode/Group 53/Gear_2.vtlm
- Generic Vehicles/Declaration Mode/Group 53/Gear_3.vtlm 0 additions, 0 deletionsGeneric Vehicles/Declaration Mode/Group 53/Gear_3.vtlm
- Generic Vehicles/Declaration Mode/Group 53/Gear_4.vtlm 0 additions, 0 deletionsGeneric Vehicles/Declaration Mode/Group 53/Gear_4.vtlm
- Generic Vehicles/Declaration Mode/Group 53/Gear_5.vtlm 0 additions, 0 deletionsGeneric Vehicles/Declaration Mode/Group 53/Gear_5.vtlm
- Generic Vehicles/Declaration Mode/Group 53/Gear_6.vtlm 0 additions, 0 deletionsGeneric Vehicles/Declaration Mode/Group 53/Gear_6.vtlm
Loading
Please register or sign in to comment