# Conflicts:
#	Libraries/VectoCommon.dll
#	Libraries/VectoCore.dll
#	Libraries/VectoHashing.dll

- update libraries to latest official version
- update build configuration

Implementing schema version 2.6, support for H2 ICE, B100

See merge request !3

write version 2.3 by default, use DEV version for H2 and B100 ICE

switching vecto engine and test project to .net framework 4.8 (necessary to use latest vecto core libraries)

Pull request #34: Correction of torque tolerances for family concept acc. to point 1.7.3 of Appendix 3 to Annex V

Merge in VECTO/vecto-engine from VECTO/gs_vecto-engine:bugfix/VECTO-1654-torque-tolerance-between-child-and-parent-full-load-curves to master

* commit '1fee60cc':
  Correction of torque tolerances for family concept acc. to point 1.7.3 of Appendix 3 to Annex V

Merge in VECTO/vecto-engine from VECTO/mq_vecto-engine:master to master

* commit 'da40e204':
  only set clipboard text if there is some text in the message window
  surround backgroundworker calculation with try/catch block and show dialog in case of an error
  bugfix writing/formatting values for XML caused by changing properties to nullable double

Merge in VECTO/vecto-engine from VECTO/gs_vecto-engine:bugfix/VECTO-1650-vecto-engine-gives-misleading-error-message to master

* commit '402f2c92':
  Bugfix in error message checking number of grid points at each speed step

Pull request #30: Bugfix/VECTO-1625 saving of empty or partly filled jobs in vecto engine 1.5.0.2708 not possible

Merge in VECTO/vecto-engine from bugfix/VECTO-1625-saving-of-empty-or-partly-filled-jobs-in-vecto-engine-1.5.0.2708-not-possible to master

* commit '40ef4c06':
  changed filepath handling
  Added methods to avoid wrong number entries into number input fields
  Changing the number properties to allow empty or partially filled job files

Pull request #29: correcting hash values of created files as the WHR correction factor can be lower than 1.0 now

Merge in VECTO/vecto-engine from VECTO/mq_vecto-engine:master to master

* commit 'bb0a9009':
  correcting hash values of created files as the WHR correction factor can be lower than 1.0 now

# Conflicts:
#	VECTO-Engine/cMAP0.vb

Merge in VECTO/vecto-engine from VECTO/mq_vecto-engine:develop to develop

* commit '2c9f746a':
  compiling new release
  updating build script for new VS version
  updating vecto core dll due to changes in XML schema
  update defines for version suffix

Merge branch 'develop' of https://citnet.tech.ec.europa.eu/CITnet/stash/scm/vecto/mq_vecto-engine into develop

Merge in VECTO/vecto-engine from VECTO/gs_vecto-engine:develop to develop

* commit '61804883':
  Update of user manual
  Implementation of special rules for limitation of WHTC correction factors for dual fuel engines (combined limitation to >=1 acc. to weighted energy share of fuels)

Implementation of special rules for limitation of WHTC correction factors for dual fuel engines (combined limitation to >=1 acc. to weighted energy share of fuels)

Arrangement of fuel elements in output in order of descending energy share of fuels

Merge in VECTO/vecto-engine from VECTO/mq_vecto-engine:develop to develop

* commit 'fb201300':
  added current vecto .dll's of vecto release 3.3.11.2675
  added test for single fuel WHR mech
  added test for dual fuel with WHR ice
  added test for single fuel whr ice
  reset whr ice checkbox if new input file gets selected
  updated the xml schema of  expected result xml's and added additional tests
  added json reader test
  closed xml file readers to prevent IOException
  finished xml v2.3 and v1.0 generation
  Code for xml 1.0 added, currently not tested yet
  Adaptation of the xml version 2.3 generation to the current version, and added the current .dlls
  if paths have already been selected, the corresponding path is opened again when the corresponding folder button is pressed
  put some calculations in seperate methods
  rewrite the current xml generation