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

Backend: De-Duplication #3063

Open
wants to merge 7 commits into
base: beta
Choose a base branch
from

Conversation

DavidArthurCole
Copy link
Contributor

@DavidArthurCole DavidArthurCole commented Dec 14, 2024

What

Fixes a couple miscellaneous instances of duplicated code fragments.
Moves some EstimatedItemValueCalculator values to repo (310 - already merged?)
Also fixes a weird detekt error that didn't appear until I refactored EffectItemUtils -> EffectUtils, which shouldn't have affected it, but idk.

exclude_from_changelog

@github-actions github-actions bot added the Backend A backend pull request that will be merged soon label Dec 14, 2024
@hannibal002 hannibal002 added this to the Version 0.29 milestone Dec 14, 2024
@github-actions github-actions bot added the Merge Conflicts There are open merge conflicts with the beta branch. label Dec 20, 2024
Copy link

This pull request has conflicts with the base branch "beta". Please resolve those so we can test out your changes.

Copy link

Conflicts have been resolved! 🎉

@github-actions github-actions bot removed the Merge Conflicts There are open merge conflicts with the beta branch. label Dec 20, 2024
@DavidArthurCole
Copy link
Contributor Author

This is technically "dependent" on #310, as I extracted some of the "move to repo" todo changes out of #3061, however it looks like that might've already been merged?

@hannibal002
Copy link
Owner

This is technically "dependent" on #310, as I extracted some of the "move to repo" todo changes out of #3061, however it looks like that might've already been merged?

yes, this got merged. i expected to merge #3061 as well, since all the backend changes are looking fire there

Copy link

This pull request has conflicts with the base branch "beta". Please resolve those so we can test out your changes.

@github-actions github-actions bot added the Merge Conflicts There are open merge conflicts with the beta branch. label Dec 25, 2024
Copy link

Conflicts have been resolved! 🎉

@github-actions github-actions bot removed the Merge Conflicts There are open merge conflicts with the beta branch. label Dec 25, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Backend A backend pull request that will be merged soon
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants