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

Code Cleanup #437

Merged
merged 14 commits into from
Jul 26, 2024
Merged

Code Cleanup #437

merged 14 commits into from
Jul 26, 2024

Conversation

ItsEmpa
Copy link
Contributor

@ItsEmpa ItsEmpa commented Jul 6, 2024

pressed the funny reformat code button on intellij and let it do its thing

Signed-off-by: Empa <42304516+ItsEmpa@users.noreply.github.com>
@ItsEmpa
Copy link
Contributor Author

ItsEmpa commented Jul 6, 2024

most of the changes seem to be about indentation, trailing commas, imports, line length, and using = instead of return in kotlin classes when possible

@j10a1n15 j10a1n15 self-requested a review July 7, 2024 18:44
Copy link
Collaborator

@j10a1n15 j10a1n15 left a comment

Choose a reason for hiding this comment

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

i hated this with all my life
this took 40min

ItsEmpa added 3 commits July 7, 2024 22:26
Signed-off-by: Empa <42304516+ItsEmpa@users.noreply.github.com>
Signed-off-by: Empa <42304516+ItsEmpa@users.noreply.github.com>
Signed-off-by: Empa <42304516+ItsEmpa@users.noreply.github.com>
@ItsEmpa ItsEmpa requested a review from j10a1n15 July 7, 2024 20:37
ItsEmpa added 2 commits July 8, 2024 13:37
Signed-off-by: Empa <42304516+ItsEmpa@users.noreply.github.com>
Signed-off-by: Empa <42304516+ItsEmpa@users.noreply.github.com>
Copy link
Collaborator

@j10a1n15 j10a1n15 left a comment

Choose a reason for hiding this comment

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

Might have missed a few things since it's 5k difference

Copy link

This pull request has conflicts, please resolve those before the pull request can be reviewed.

j10a1n15 added 2 commits July 24, 2024 17:13
# Conflicts:
#	src/main/kotlin/me/partlysanestudios/partlysaneskies/config/psconfig/Config.kt
#	src/main/kotlin/me/partlysanestudios/partlysaneskies/features/debug/CrystalHollowsGemstoneMapper.kt
#	src/main/kotlin/me/partlysanestudios/partlysaneskies/features/themes/ThemeManager.kt
# Conflicts:
#	src/main/java/me/partlysanestudios/partlysaneskies/features/skills/SkillUpgradeRecommendation.java
#	src/main/kotlin/me/partlysanestudios/partlysaneskies/utils/StringUtils.kt
Copy link

Conflicts have been resolved!

Copy link

This pull request has conflicts, please resolve those before the pull request can be reviewed.

Copy link

Conflicts have been resolved!

Signed-off-by: J10a1n15 <45315647+j10a1n15@users.noreply.github.com>
Copy link
Member

@Su386yt Su386yt left a comment

Choose a reason for hiding this comment

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

All of the elementa things have to be put in line

feel free to call me out, murder, stalk or burn me for any of the stupid comments

@ItsEmpa ItsEmpa requested a review from Su386yt July 26, 2024 09:14
Copy link
Member

@Su386yt Su386yt left a comment

Choose a reason for hiding this comment

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

Net negative lines congratumalations

@Su386yt Su386yt merged commit 9ec1c47 into PartlySaneStudios:main Jul 26, 2024
2 checks passed
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