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

Move sourcing of SQUAD_CREATED event to RCON #243

Merged
merged 5 commits into from
Jan 2, 2023

Conversation

ect0s
Copy link
Contributor

@ect0s ect0s commented Jun 4, 2022

No description provided.

ect0s added 2 commits June 4, 2022 10:42
Move Squad Created To RCON rcon.js

Move Squad Created emitter to RCON index.js
Remove LogParser event Squad Created
bombitmanbomb added a commit to Squadbot-xyz/SquadJS that referenced this pull request Oct 13, 2022
https: //github.com/Team-Silver-Sphere/pull/243/commits/90ed90cb68316b07712f5b453201c40a29f7e24f
https: //github.com/Team-Silver-Sphere/pull/243/commits/b9f5766cc98dd90d9d72db988df5a85f939d5796
Co-Authored-By: ect0s <[email protected]>
@werewolfboy13
Copy link
Collaborator

@ect0s can you resolve the conflicts?

Thomas-Smyth
Thomas-Smyth previously approved these changes Jan 1, 2023
Copy link
Collaborator

@Thomas-Smyth Thomas-Smyth left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, just need to fix the merge conflicts.

squad-server/index.js Outdated Show resolved Hide resolved
@Thomas-Smyth Thomas-Smyth added core feature request Feature request related to the core SquadJS API minor Minor Change labels Jan 1, 2023
@Thomas-Smyth Thomas-Smyth changed the title Move Squad_Created to RCON Move sourcing of SQUAD_CREATED event to RCON Jan 1, 2023
@Thomas-Smyth Thomas-Smyth merged commit dc2bc1d into Team-Silver-Sphere:master Jan 2, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
core feature request Feature request related to the core SquadJS API minor Minor Change
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants