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.

Sign up for GitHub

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

Jump to bottom

Added 2 missing researches #2907

Merged
merged 10 commits into from
Mar 28, 2021
Merged

Added 2 missing researches #2907

merged 10 commits into from
Mar 28, 2021

Conversation

Sfiguz7
Copy link
Member

@Sfiguz7 Sfiguz7 commented Mar 25, 2021 •
edited
Loading

Description

Researches for tier II electric machines and coal/lava gens were missing. I added them in

Changes

Added 2 researches, moved Electric Ore Grinder II to the tier II machines research

Related Issues

N/A

Checklist

  • I have fully tested the proposed changes and promise that they will not break everything into chaos.
  • I have also tested the proposed changes in combination with various popular addons and can confirm my changes do not break them.
  • I followed the existing code standards and didn't mess up the formatting.
  • I did my best to add documentation to any public classes or methods I added.
  • I have added Nonnull and Nullable annotations to my methods to indicate their behaviour for null values
  • I added sufficient Unit Tests to cover my code.

@Sfiguz7 Sfiguz7 requested a review from a team as a code owner March 25, 2021 20:01
@TheBusyBiscuit
Copy link
Member

Also, you forgot to add the names to the researches_en.yml :LUL:
Thank my past self for making a Unit Test to spot this :P

@TheBusyBiscuit TheBusyBiscuit added the ✨ Fix This Pull Request fixes an issue. label Mar 26, 2021
TheBusyBiscuit
TheBusyBiscuit previously approved these changes Mar 26, 2021
View reviewed changes
Copy link
Member

@TheBusyBiscuit TheBusyBiscuit left a comment

Choose a reason for hiding this comment

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

LGTM

src/main/java/io/github/thebusybiscuit/slimefun4/implementation/setup/ResearchSetup.java Outdated Show resolved Hide resolved
@TheBusyBiscuit TheBusyBiscuit self-assigned this Mar 26, 2021
@TheBusyBot TheBusyBot added the ⚡ Merge Conflicts This Pull Request has merged conflicts which need to be resolved! label Mar 27, 2021
WalshyDev
WalshyDev approved these changes Mar 28, 2021
View reviewed changes
Copy link
Member

@WalshyDev WalshyDev left a comment

Choose a reason for hiding this comment

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

LGTM

@TheBusyBiscuit TheBusyBiscuit removed the ⚡ Merge Conflicts This Pull Request has merged conflicts which need to be resolved! label Mar 28, 2021
@TheBusyBiscuit TheBusyBiscuit merged commit d7e236a into Slimefun:master Mar 28, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@TheBusyBiscuit TheBusyBiscuit TheBusyBiscuit approved these changes

@WalshyDev WalshyDev WalshyDev approved these changes

Assignees

@TheBusyBiscuit TheBusyBiscuit

@WalshyDev WalshyDev

Labels
✨ Fix This Pull Request fixes an issue.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@Sfiguz7 @TheBusyBiscuit @WalshyDev @TheBusyBot