Skip to content

ThingFilterContext and ISyncSimple#10

Merged
Zetrith merged 1 commit intorwmt:developmentfrom
Zetrith:thingfilters
Jul 6, 2023
Merged

ThingFilterContext and ISyncSimple#10
Zetrith merged 1 commit intorwmt:developmentfrom
Zetrith:thingfilters

Conversation

@Zetrith
Copy link
Copy Markdown
Member

@Zetrith Zetrith commented Jun 12, 2023

Moves the API code from rwmt/Multiplayer#387

SokyranTheDragon pushed a commit to SokyranTheDragon/MultiplayerAPI that referenced this pull request Jun 19, 2023
The usage of Harmony was a big oversight on my part which has now been corrected.

The removal of ThingFilterContext and ISyncSimple happened due to rwmt#10
@SokyranTheDragon
Copy link
Copy Markdown
Member

Looks like there's a conflict preventing the merge. I would have fixed those conflicts myself, however I can't seem to find a way to do it without discarding this PR and commit and then making my own.

I'm pretty sure this will also conflict with #9, however I believe that this one is of higher importance right now (as the one I've made still needs some changes to the rwmt/Multiplayer#381 to be ready) so I'll just handle that on my end once that happens.

@notfood
Copy link
Copy Markdown
Member

notfood commented Jun 20, 2023

Apparently it's a whitespace mismatch, Zetrith was going to update it

@SokyranTheDragon
Copy link
Copy Markdown
Member

When I looked at it it seemed it may have conflicted with f4c0de9 (#7)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants