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

Enemies and Allies Content Port #956

Merged
merged 17 commits into from
Sep 26, 2024
Merged

Enemies and Allies Content Port #956

merged 17 commits into from
Sep 26, 2024

Commits on Sep 23, 2024

  1. batch changes 

    batch of changes I made for Floof station ported over to the upstream branch
    @fenndragon
    fenndragon committed Sep 23, 2024
    Configuration menu
    Copy the full SHA
    913c84c View commit details
    Browse the repository at this point in the history

  2. folder moved 

    folders moved appropriately
    @fenndragon
    fenndragon committed Sep 23, 2024
    Configuration menu
    Copy the full SHA
    b0205c0 View commit details
    Browse the repository at this point in the history

  3. fix 

    fixed file structure
    @fenndragon
    fenndragon committed Sep 23, 2024
    Configuration menu
    Copy the full SHA
    3824ed6 View commit details
    Browse the repository at this point in the history

Commits on Sep 24, 2024

  1. Merge branch 'master' into floof-station-contributions

    @fenndragon
    fenndragon authored Sep 24, 2024
    Configuration menu
    Copy the full SHA
    8cfea29 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'Simple-Station:master' into master

    @fenndragon
    fenndragon authored Sep 24, 2024
    Configuration menu
    Copy the full SHA
    74af8c4 View commit details
    Browse the repository at this point in the history

  3. Update xenopet.yml 

    fix

Signed-off-by: fenndragon <[email protected]>
    @fenndragon
    fenndragon authored Sep 24, 2024
    Configuration menu
    Copy the full SHA
    ed9b116 View commit details
    Browse the repository at this point in the history

Commits on Sep 25, 2024

  1. Merge branch 'master' into floof-station-contributions

    @fenndragon
    fenndragon committed Sep 25, 2024
    Configuration menu
    Copy the full SHA
    9159b70 View commit details
    Browse the repository at this point in the history

  2. Update vent-critters.ftl 

    adding proper event messages

Signed-off-by: fenndragon <[email protected]>
    @fenndragon
    fenndragon authored Sep 25, 2024
    Configuration menu
    Copy the full SHA
    6c1436f View commit details
    Browse the repository at this point in the history

  3. Update xenopet.yml 

    added 3 more spawn types for vent critters 

Signed-off-by: fenndragon <[email protected]>
    @fenndragon
    fenndragon authored Sep 25, 2024
    Configuration menu
    Copy the full SHA
    6d9251b View commit details
    Browse the repository at this point in the history

  4. Update vent-critters.ftl 

    added all event text 

Signed-off-by: fenndragon <[email protected]>
    @fenndragon
    fenndragon authored Sep 25, 2024
    Configuration menu
    Copy the full SHA
    8d1a284 View commit details
    Browse the repository at this point in the history

  5. Update xeno.yml 

    Signed-off-by: fenndragon <[email protected]>
    @fenndragon
    fenndragon authored Sep 25, 2024
    Configuration menu
    Copy the full SHA
    08287ac View commit details
    Browse the repository at this point in the history

  6. Update xenopet.yml 

    Signed-off-by: fenndragon <[email protected]>
    @fenndragon
    fenndragon authored Sep 25, 2024
    Configuration menu
    Copy the full SHA
    d714f5e View commit details
    Browse the repository at this point in the history

  7. Merge branch 'master' into floof-station-contributions

    @FoxxoTrystan
    FoxxoTrystan authored Sep 25, 2024
    Configuration menu
    Copy the full SHA
    8b10ddf View commit details
    Browse the repository at this point in the history

  8. found it 

    capitalized the sprite target

Signed-off-by: SleepyScarecrow <[email protected]>
    @SleepyScarecrow
    SleepyScarecrow authored Sep 25, 2024
    Configuration menu
    Copy the full SHA
    db77af7 View commit details
    Browse the repository at this point in the history

  9. Update Rslimes.yml 

    Signed-off-by: fenndragon <[email protected]>
    @fenndragon
    fenndragon authored Sep 25, 2024
    Configuration menu
    Copy the full SHA
    143d0ee View commit details
    Browse the repository at this point in the history

  10. Update elemental.yml 

    Signed-off-by: fenndragon <[email protected]>
    @fenndragon
    fenndragon authored Sep 25, 2024
    Configuration menu
    Copy the full SHA
    68095ac View commit details
    Browse the repository at this point in the history

  11. Update Rslimes.yml 

    Signed-off-by: fenndragon <[email protected]>
    @fenndragon
    fenndragon authored Sep 25, 2024
    Configuration menu
    Copy the full SHA
    28d3e2b View commit details
    Browse the repository at this point in the history