Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Jp/#1617 energy calc updates #1626

Merged
merged 18 commits into from
May 22, 2019
Merged

Jp/#1617 energy calc updates #1626

merged 18 commits into from
May 22, 2019

Commits on Apr 4, 2019

  1. Remove vehicle energy opt in

    @JustinPihony
    JustinPihony committed Apr 4, 2019
    Configuration menu
    Copy the full SHA
    481c299 View commit details
    Browse the repository at this point in the history

  2. fmt

    @JustinPihony
    JustinPihony committed Apr 4, 2019
    Configuration menu
    Copy the full SHA
    31177c8 View commit details
    Browse the repository at this point in the history

  3. Oops - testing change reverted

    @JustinPihony
    JustinPihony committed Apr 4, 2019
    Configuration menu
    Copy the full SHA
    c3ec804 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' into jp/#1617-energy-calc-updates

    @JustinPihony
    JustinPihony authored Apr 4, 2019
    Configuration menu
    Copy the full SHA
    b4bb23c View commit details
    Browse the repository at this point in the history

  5. Merge branch 'master' into jp/#1617-energy-calc-updates

    @REASY
    REASY authored Apr 4, 2019
    Configuration menu
    Copy the full SHA
    0606b90 View commit details
    Browse the repository at this point in the history

Commits on Apr 5, 2019

  1. Don't gather full data if no vehicle file

    @JustinPihony
    JustinPihony committed Apr 5, 2019
    Configuration menu
    Copy the full SHA
    7609dd0 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into jp/#1617-energy-calc-updates

    @JustinPihony
    JustinPihony authored Apr 5, 2019
    Configuration menu
    Copy the full SHA
    3c8ee3d View commit details
    Browse the repository at this point in the history

Commits on Apr 17, 2019

  1. Merge

    @JustinPihony
    JustinPihony committed Apr 17, 2019
    Configuration menu
    Copy the full SHA
    7e2618b View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into jp/#1617-energy-calc-updates

    @JustinPihony
    JustinPihony authored Apr 17, 2019
    Configuration menu
    Copy the full SHA
    93b38ff View commit details
    Browse the repository at this point in the history

  3. Merge branch 'develop' into jp/#1617-energy-calc-updates

    @JustinPihony
    JustinPihony authored Apr 17, 2019
    Configuration menu
    Copy the full SHA
    91d7f7e View commit details
    Browse the repository at this point in the history

Commits on Apr 18, 2019

  1. Merge branch 'develop' into jp/#1617-energy-calc-updates

    @JustinPihony
    JustinPihony authored Apr 18, 2019
    Configuration menu
    Copy the full SHA
    d96a6b4 View commit details
    Browse the repository at this point in the history

Commits on Apr 19, 2019

  1. Merge branch 'develop' into jp/#1617-energy-calc-updates

    @JustinPihony
    JustinPihony authored Apr 19, 2019
    Configuration menu
    Copy the full SHA
    fada666 View commit details
    Browse the repository at this point in the history

Commits on Apr 28, 2019

  1. Manual merge

    @JustinPihony
    JustinPihony committed Apr 28, 2019
    Configuration menu
    Copy the full SHA
    7d30826 View commit details
    Browse the repository at this point in the history

  2. Make vehicle energy fallbacks smarter

    @JustinPihony
    JustinPihony committed Apr 28, 2019
    Configuration menu
    Copy the full SHA
    903b870 View commit details
    Browse the repository at this point in the history

  3. Simplifying diff

    @JustinPihony
    JustinPihony committed Apr 28, 2019
    Configuration menu
    Copy the full SHA
    4acc0e7 View commit details
    Browse the repository at this point in the history

  4. Simplifying diff

    @JustinPihony
    JustinPihony committed Apr 28, 2019
    Configuration menu
    Copy the full SHA
    c2999e4 View commit details
    Browse the repository at this point in the history

Commits on May 21, 2019

  1. Merge (manual ChoosesMode and regen BeamConfig)

    @JustinPihony
    JustinPihony committed May 21, 2019
    Configuration menu
    Copy the full SHA
    95759f1 View commit details
    Browse the repository at this point in the history

  2. Merge (manual ChoosesMode and regen BeamConfig)

    @JustinPihony
    JustinPihony committed May 21, 2019
    Configuration menu
    Copy the full SHA
    d820a8d View commit details
    Browse the repository at this point in the history