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

Fix for #16 #17

Merged
merged 3 commits into from
May 16, 2021
Merged

Fix for #16 #17

merged 3 commits into from
May 16, 2021

Conversation

Cervator
Copy link
Member

Commit history went a little funny between these two repos, unique module list editing in different places, but I think it should be okay? FlyingIslands is but isn't in the lineup already ... I dunno. Not the important part in any case and we can always tweak if needed.

Mostly it is the tiny path tweak that fixes #14 and goes with an associated engine PR.

@Cervator Cervator added the Category: Build/CI Requests, Issues and Changes targeting gradle, groovy, Jenkins, etc. label May 16, 2021
@keturn
Copy link
Contributor

keturn commented May 16, 2021

Hmm, this is a complication of accepting PRs sourced from Nanoware:develop

because we encourage force-pushing to Nanoware to try out new experiments

and, like, what are those other commits? were they really intended to be here in the main repo? if so, how did they get lost? accident, or were they proposed in some other PR and rejected?

@Cervator Cervator merged commit 1201741 into Terasology:develop May 16, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Category: Build/CI Requests, Issues and Changes targeting gradle, groovy, Jenkins, etc.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants