# Conflicts:
#	CHANGELOG.md
#	README.md

# Conflicts:
#	inc/1e_inputs.gms

#Inlucdes further updates to reading input files

command line argument for variable input file name and location

See merge request !16

Adding documentation for command line arguments and a template for input data preparation before reading the GDX input file.

Adding a flag to enable time series form of transferLoss for transfer links. Changing the order of node and node_ in several places in the constraints that used p_gnn(grid, node, node, 'transferLoss').

Issue #62

Issue #62

Issue #62

Wheeling

See merge request !14

Fixing bugs in unit aggregation and the selection of unit efficiency approximations. It is now easier to skip some efficiency approximation levels.

Issue #135

Adding reserve_activation_duration and reserve_reactivation_time parameters

See merge request !13

A tool spec file apparently has to be in the same folder as the main program file.
Also changed 'includes_main_path' attributes in tool spec files to relative paths
(see #940).

# Conflicts:
#	.spinetoolbox/items/bb_parameters/filter_config.json
#	.spinetoolbox/items/bb_sets/filter_config.json
#	.spinetoolbox/project.json
#	spineToolbox.json
#	timeAndSamples_temp.inc
#	tools/bb1.3_to_spinedb.json
#	tools/bb_base_sets.json

Updating q_unitEqualityConstraint and q_unitGreaterThanConstraint

See merge request !12

Adding domain checking for a few parameters and sets

See merge request !11

Merge branch 'dev_BB_in_Spine_VabiSys' of https://gitlab.vtt.fi/backbone/backbone into dev_BB_in_Spine_VabiSys

# Conflicts:
#	tools/Convert_to_Bacbbone_parameter_names.json
#	tools/bb1.3_to_spinedb.json

Further changes, that may just be cosmetics (but I cannot easily see, since they are really long one liners)