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

Initial modification of how configs are handled for stonesense #120

Merged
merged 14 commits into from
Dec 28, 2024

Conversation

realSquidCoder
Copy link
Collaborator

Stonesense configs are now in the dfhack-configs folder when installed but the actual files are here in the stonesense repo

Stonesense configs are now in the dfhack-configs folder when installed but the actual files are all in the stonesense repo.
@realSquidCoder
Copy link
Collaborator Author

dont merge til i add changelog stuff btw, unless i should still make a seperate pr (doubtful)

@realSquidCoder
Copy link
Collaborator Author

Is there any more we need to do on this or can we get it merged? I'm hoping to start work on my larger config changes soon

realSquidCoder and others added 2 commits December 27, 2024 16:23
dont merge, i need toi fix the docs too
@realSquidCoder
Copy link
Collaborator Author

realSquidCoder commented Dec 27, 2024

should i update the docs or make a fresh PR for that?

edit: nvm i forgot which repo i was in

@realSquidCoder
Copy link
Collaborator Author

ok now im actually finished. ready to be merged if no other issues are found

@myk002
Copy link
Member

myk002 commented Dec 28, 2024

Is there any more we need to do on this or can we get it merged? I'm hoping to start work on my larger config changes soon

Remember, with git, you're never blocked. You can branch off of this PR branch and work on a dependent feature there. If more changes get made to this PR, the updates can be merged into the other branch.

We try to get to PRs expediently, but our life schedules don't always allow it. Small PRs can go through quickly, but larger or contentious PRs can take much longer. Patience is appreciated.

Copy link
Member

Choose a reason for hiding this comment

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

I think Lethosor mentioned this -- the file would make more sense as configs/init.txt -- there's no need to duplicate the stonesense path in this repo. As written, I think the file will end up as data/dfhack-config-defaults/stonesense/stonesense/init.txt

Copy link
Member

Choose a reason for hiding this comment

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

bump

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

nope i changed it awhile back and it does ...defaults/stonesense/init.txt

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

image
ignore config.json im testing a sub branch of this one

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

actually wait thy're both outdated

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

i'm missing a commit, hang on thx for catching that

@realSquidCoder realSquidCoder marked this pull request as draft December 28, 2024 17:33
@realSquidCoder realSquidCoder marked this pull request as ready for review December 28, 2024 18:02
Copy link
Member

@myk002 myk002 left a comment

Choose a reason for hiding this comment

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

comment on init.txt path is not addressed yet

@realSquidCoder
Copy link
Collaborator Author

should be fixed? hopefully?

@myk002 myk002 merged commit 5170fc1 into DFHack:master Dec 28, 2024
4 checks passed
@realSquidCoder realSquidCoder deleted the squid-configs-improvements branch December 28, 2024 19:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
No open projects
Status: Done
Development

Successfully merging this pull request may close these issues.

4 participants