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.

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

11.5.2 to master #1108

Merged
merged 7 commits into from
May 16, 2021
Merged

11.5.2 to master #1108

merged 7 commits into from
May 16, 2021

Commits on May 2, 2021

  1. Configuration menu
    Copy the full SHA
    af9e331 View commit details
    Browse the repository at this point in the history

Commits on May 9, 2021

  1. Merge pull request #1103 from CitiesSkylinesMods/hotfix/release-stabl…

    …e-11.5.2
    
    Version bump, compatibility fix for new BloodyPenguin's mod
    krzychu124 committed May 9, 2021
    Configuration menu
    Copy the full SHA
    835eddc View commit details
    Browse the repository at this point in the history

Commits on May 11, 2021

  1. Configuration menu
    Copy the full SHA
    6c315e8 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    85808b8 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    5d5eb9d View commit details
    Browse the repository at this point in the history

Commits on May 12, 2021

  1. Merge pull request #1105 from CitiesSkylinesMods/stable-11.5.2-cargoT…

    …ruckAI-fix
    
    Stable 11.5.2 cargo truck PF fix
    krzychu124 committed May 12, 2021
    Configuration menu
    Copy the full SHA
    1b4c437 View commit details
    Browse the repository at this point in the history

Commits on May 15, 2021

  1. Merge branch 'master' of https://github.com/krzychu124/Cities-Skyline…

    …s-Traffic-Manager-President-Edition into 11.5.2-to-master
    
    � Conflicts:
    �	TLM/SharedAssemblyInfo.cs
    �	TLM/TLM/Custom/AI/CustomCargoTruckAI.cs
    �	TLM/TLM/Custom/AI/CustomPostVanAI.cs
    �	TLM/TLM/Custom/PathFinding/CustomPathFind.cs
    �	TLM/TLM/TrafficManagerMod.cs
    krzychu124 committed May 15, 2021
    Configuration menu
    Copy the full SHA
    09d6b55 View commit details
    Browse the repository at this point in the history