Something went wrong on our end
Forked from
VECTO / VECTO Sim
2079 commits behind the upstream repository.
-
Markus QUARITSCH authored
Merge branch 'merge/VectoFurtherDeveropment' into feature/VECTO-1190-declaration-mode-for-heavy-buses # Conflicts: # .gitignore # VECTO/GUI/VectoJobForm.vb # VECTO/Input Files/Engine.vb # VECTO/OutputData/JSONFileWriter.vb # VectoCommon/VectoCommon/InputData/DeclarationInputData.cs # VectoCommon/VectoCommon/Resources/XMLNames.resx # VectoCore/VectoCore/InputData/FileIO/JSON/JSONComponentInputData.cs # VectoCore/VectoCore/InputData/FileIO/JSON/JSONVehicleData.cs # VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationVehicleDataProvider.cs # VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/XMLEngineeringDriverDataProvider.cs # VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapterTruck.cs # VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeVectoRunDataFactory.cs # VectoCore/VectoCore/Models/Declaration/DeclarationData.cs # VectoCore/VectoCore/Models/Declaration/LookupData.cs # VectoCore/VectoCore/Models/Declaration/TruckSegments.cs # VectoCore/VectoCore/Models/Simulation/Impl/PowertrainBuilder.cs # VectoCore/VectoCore/Models/SimulationComponent/Impl/CombustionEngine.cs # VectoCore/VectoCore/OutputData/IModalDataContainer.cs # VectoCore/VectoCore/OutputData/ModalDataContainer.cs # VectoCore/VectoCore/OutputData/XML/XMLDeclarationReport.cs # VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.0.xsd # VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.xsd # VectoCore/VectoCore/Utils/XMLDefinitions.cs # VectoCore/VectoCore/VectoCore.csproj # VectoCore/VectoCoreTest/FileIO/JsonReadTest.cs # VectoCore/VectoCoreTest/Integration/CoachAdvancedAuxPowertrain.cs # VectoCore/VectoCoreTest/Models/WHRMapReaderTest.cs # VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.3/vehicle_sampleDualModeDualFuel.xml # VectoCore/VectoCoreTest/Utils/MockModalDataContainer.cs # VectoCore/VectoCoreTest/VectoCoreTest.csproj # VectoCore/VectoXML.spp
Markus QUARITSCH authoredMerge branch 'merge/VectoFurtherDeveropment' into feature/VECTO-1190-declaration-mode-for-heavy-buses # Conflicts: # .gitignore # VECTO/GUI/VectoJobForm.vb # VECTO/Input Files/Engine.vb # VECTO/OutputData/JSONFileWriter.vb # VectoCommon/VectoCommon/InputData/DeclarationInputData.cs # VectoCommon/VectoCommon/Resources/XMLNames.resx # VectoCore/VectoCore/InputData/FileIO/JSON/JSONComponentInputData.cs # VectoCore/VectoCore/InputData/FileIO/JSON/JSONVehicleData.cs # VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationVehicleDataProvider.cs # VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/XMLEngineeringDriverDataProvider.cs # VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapterTruck.cs # VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeVectoRunDataFactory.cs # VectoCore/VectoCore/Models/Declaration/DeclarationData.cs # VectoCore/VectoCore/Models/Declaration/LookupData.cs # VectoCore/VectoCore/Models/Declaration/TruckSegments.cs # VectoCore/VectoCore/Models/Simulation/Impl/PowertrainBuilder.cs # VectoCore/VectoCore/Models/SimulationComponent/Impl/CombustionEngine.cs # VectoCore/VectoCore/OutputData/IModalDataContainer.cs # VectoCore/VectoCore/OutputData/ModalDataContainer.cs # VectoCore/VectoCore/OutputData/XML/XMLDeclarationReport.cs # VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.0.xsd # VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.xsd # VectoCore/VectoCore/Utils/XMLDefinitions.cs # VectoCore/VectoCore/VectoCore.csproj # VectoCore/VectoCoreTest/FileIO/JsonReadTest.cs # VectoCore/VectoCoreTest/Integration/CoachAdvancedAuxPowertrain.cs # VectoCore/VectoCoreTest/Models/WHRMapReaderTest.cs # VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.3/vehicle_sampleDualModeDualFuel.xml # VectoCore/VectoCoreTest/Utils/MockModalDataContainer.cs # VectoCore/VectoCoreTest/VectoCoreTest.csproj # VectoCore/VectoXML.spp
Code owners
Assign users and groups as approvers for specific file changes. Learn more.