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

Blue Shield & CCC locale fix #366

Merged
merged 8 commits into from
Jul 13, 2024
Merged

Blue Shield & CCC locale fix #366

merged 8 commits into from
Jul 13, 2024

Commits on Jun 13, 2024

  1. Lodaut locale locale locale.

    @quartuG3
    quartuG3 committed Jun 13, 2024
    Configuration menu
    Copy the full SHA
    cf56d33 View commit details
    Browse the repository at this point in the history

  2. BlueShield locale fix 

    Thx, Milen!
    @quartuG3
    quartuG3 committed Jun 13, 2024
    Configuration menu
    Copy the full SHA
    28c6462 View commit details
    Browse the repository at this point in the history

  3. Ligma medals

    @quartuG3
    quartuG3 committed Jun 13, 2024
    Configuration menu
    Copy the full SHA
    4cadc5e View commit details
    Browse the repository at this point in the history

  4. Merge branch 'arumoon-server' into Locale-Add-V2

    @quartuG3
    quartuG3 authored Jun 13, 2024
    Configuration menu
    Copy the full SHA
    7786098 View commit details
    Browse the repository at this point in the history

  5. From ligma to starshine

    @quartuG3
    quartuG3 committed Jun 13, 2024
    Configuration menu
    Copy the full SHA
    8f3671f View commit details
    Browse the repository at this point in the history

  6. Ueughhh

    @quartuG3
    quartuG3 committed Jun 13, 2024
    Configuration menu
    Copy the full SHA
    09c32f6 View commit details
    Browse the repository at this point in the history

Commits on Jun 18, 2024

  1. felinid locale transfer

    @quartuG3
    quartuG3 committed Jun 18, 2024
    Configuration menu
    Copy the full SHA
    1a4f288 View commit details
    Browse the repository at this point in the history

Commits on Jul 13, 2024

  1. Merge branch 'arumoon-server' of https://github.com/Workbench-Team/sp… 

    …ace-station-14 into Locale-Add-V2

# Conflicts:
#	Resources/Locale/ru-RU/preferences/loadout-groups.ftl
    @MilenVolf
    MilenVolf committed Jul 13, 2024
    Configuration menu
    Copy the full SHA
    d9e32d8 View commit details
    Browse the repository at this point in the history