Skip to content

Commit c9862ce

Browse files
cpaulgilmancpaulgilman
committed
Merge branch 'develop' into sam-1426-parse-lat-lon
2 parents da1c4b0 + 3acd976 commit c9862ce

File tree

116 files changed

+1364922
-918
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

116 files changed

+1364922
-918
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ env:
88
# Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
99
BUILD_TYPE: Release
1010
DEFAULT_BRANCH: develop
11-
WX_VERSION: '3.2.6'
11+
WX_VERSION: '3.2.8.1'
1212

1313
jobs:
1414
build-ubuntu:

api/api_autogen/library/defaults/Battwatts_PVWattsBatteryCommercial.json renamed to api/api_autogen/library/defaults/Battery_PVWattsBatteryAllEquityPartnershipFlip.json

Lines changed: 494 additions & 11 deletions
Large diffs are not rendered by default.

‎api/api_autogen/library/defaults/Battery_PVWattsBatteryCommercial.json‎

Lines changed: 482 additions & 0 deletions
Large diffs are not rendered by default.

‎api/api_autogen/library/defaults/Battery_PVWattsBatteryHostDeveloper.json‎

Lines changed: 515 additions & 0 deletions
Large diffs are not rendered by default.

api/api_autogen/library/defaults/Battwatts_PVWattsBatteryHostDeveloper.json renamed to api/api_autogen/library/defaults/Battery_PVWattsBatteryLeveragedPartnershipFlip.json

Lines changed: 494 additions & 11 deletions
Large diffs are not rendered by default.

‎api/api_autogen/library/defaults/Battery_PVWattsBatteryMerchantPlant.json‎

Lines changed: 219440 additions & 0 deletions
Large diffs are not rendered by default.

‎api/api_autogen/library/defaults/Battery_PVWattsBatteryResidential.json‎

Lines changed: 478 additions & 0 deletions
Large diffs are not rendered by default.

api/api_autogen/library/defaults/Battwatts_PVWattsBatteryResidential.json renamed to api/api_autogen/library/defaults/Battery_PVWattsBatterySaleLeaseback.json

Lines changed: 494 additions & 11 deletions
Large diffs are not rendered by default.

api/api_autogen/library/defaults/Battwatts_PVWattsBatteryThirdParty.json renamed to api/api_autogen/library/defaults/Battery_PVWattsBatterySingleOwner.json

Lines changed: 494 additions & 11 deletions
Large diffs are not rendered by default.

‎api/api_autogen/library/defaults/Battery_PVWattsBatteryThirdParty.json‎

Lines changed: 478 additions & 0 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)