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

Update Credits #1426

Closed
wants to merge 1 commit into from
Closed

Conversation

github-actions[bot]
Copy link
Contributor

@github-actions github-actions bot commented Jan 5, 2025

This is an automated Pull Request. This PR updates the GitHub contributors in the credits section.

@github-actions github-actions bot added the Status: Merge Conflict FIX YOUR PR AAAGH label Jan 11, 2025
Copy link
Contributor Author

This pull request has conflicts, please resolve those before we can evaluate the pull request.

angelofallars pushed a commit to angelofallars/Einstein-Engines that referenced this pull request Feb 1, 2025
* make changes

* fix yaml linter bug

* locales

* consolidations

* fix DeltaV comment appearing in uplink

* e

* Update emag.yml

Signed-off-by: WarMechanic <[email protected]>

* emag invalid target locale

* change id 'airlockaccessoverride' to 'doorjack'

* name consolidations + doorjack sprite

* Update Resources/Locale/en-US/deltav/store/uplink-catalog.ftl

Co-authored-by: DEATHB4DEFEAT <[email protected]>
Signed-off-by: WarMechanic <[email protected]>

* Update Resources/Locale/en-US/store/uplink-catalog.ftl

Co-authored-by: DEATHB4DEFEAT <[email protected]>
Signed-off-by: WarMechanic <[email protected]>

* Update Resources/Locale/en-US/emag/emag.ftl

Co-authored-by: DEATHB4DEFEAT <[email protected]>
Signed-off-by: WarMechanic <[email protected]>

* Update Resources/Prototypes/DeltaV/Catalog/uplink_catalog.yml

Co-authored-by: DEATHB4DEFEAT <[email protected]>
Signed-off-by: WarMechanic <[email protected]>

* Update Resources/Prototypes/DeltaV/Entities/Objects/Tools/emag.yml

Co-authored-by: DEATHB4DEFEAT <[email protected]>
Signed-off-by: WarMechanic <[email protected]>

* deltanedas

---------

Signed-off-by: WarMechanic <[email protected]>
Co-authored-by: DEATHB4DEFEAT <[email protected]>
angelofallars pushed a commit to angelofallars/Einstein-Engines that referenced this pull request Feb 1, 2025
* make changes

* fix yaml linter bug

* locales

* consolidations

* fix DeltaV comment appearing in uplink

* e

* Update emag.yml

Signed-off-by: WarMechanic <[email protected]>

* emag invalid target locale

* change id 'airlockaccessoverride' to 'doorjack'

* name consolidations + doorjack sprite

* Update Resources/Locale/en-US/deltav/store/uplink-catalog.ftl

Co-authored-by: DEATHB4DEFEAT <[email protected]>
Signed-off-by: WarMechanic <[email protected]>

* Update Resources/Locale/en-US/store/uplink-catalog.ftl

Co-authored-by: DEATHB4DEFEAT <[email protected]>
Signed-off-by: WarMechanic <[email protected]>

* Update Resources/Locale/en-US/emag/emag.ftl

Co-authored-by: DEATHB4DEFEAT <[email protected]>
Signed-off-by: WarMechanic <[email protected]>

* Update Resources/Prototypes/DeltaV/Catalog/uplink_catalog.yml

Co-authored-by: DEATHB4DEFEAT <[email protected]>
Signed-off-by: WarMechanic <[email protected]>

* Update Resources/Prototypes/DeltaV/Entities/Objects/Tools/emag.yml

Co-authored-by: DEATHB4DEFEAT <[email protected]>
Signed-off-by: WarMechanic <[email protected]>

* deltanedas

---------

Signed-off-by: WarMechanic <[email protected]>
Co-authored-by: DEATHB4DEFEAT <[email protected]>
angelofallars pushed a commit to angelofallars/Einstein-Engines that referenced this pull request Feb 1, 2025
* make changes

* fix yaml linter bug

* locales

* consolidations

* fix DeltaV comment appearing in uplink

* e

* Update emag.yml

Signed-off-by: WarMechanic <[email protected]>

* emag invalid target locale

* change id 'airlockaccessoverride' to 'doorjack'

* name consolidations + doorjack sprite

* Update Resources/Locale/en-US/deltav/store/uplink-catalog.ftl

Co-authored-by: DEATHB4DEFEAT <[email protected]>
Signed-off-by: WarMechanic <[email protected]>

* Update Resources/Locale/en-US/store/uplink-catalog.ftl

Co-authored-by: DEATHB4DEFEAT <[email protected]>
Signed-off-by: WarMechanic <[email protected]>

* Update Resources/Locale/en-US/emag/emag.ftl

Co-authored-by: DEATHB4DEFEAT <[email protected]>
Signed-off-by: WarMechanic <[email protected]>

* Update Resources/Prototypes/DeltaV/Catalog/uplink_catalog.yml

Co-authored-by: DEATHB4DEFEAT <[email protected]>
Signed-off-by: WarMechanic <[email protected]>

* Update Resources/Prototypes/DeltaV/Entities/Objects/Tools/emag.yml

Co-authored-by: DEATHB4DEFEAT <[email protected]>
Signed-off-by: WarMechanic <[email protected]>

* deltanedas

---------

Signed-off-by: WarMechanic <[email protected]>
Co-authored-by: DEATHB4DEFEAT <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Status: Merge Conflict FIX YOUR PR AAAGH
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants