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

Dependency Updates (Ready) #83

Merged
merged 4 commits into from Nov 2, 2017
Merged

Dependency Updates (Ready) #83

merged 4 commits into from Nov 2, 2017

Conversation

CDAGaming
Copy link
Contributor

@CDAGaming CDAGaming commented Oct 24, 2017

This PR Patches a .gitignore error where some files generated by IDEA make it past The ignore file, as well as updating Forge and MCP Mappings, and HWYLA also

@CDAGaming CDAGaming changed the title Dependency Update (WIP) Dependency Updates (Ready) Nov 2, 2017
@CDAGaming
Copy link
Contributor Author

Clear to Merge now :)

*I can remove this if it ends up breaking stuff*
(Auto-Generated by IntelliJ IDEA)
@Darkhax
Copy link
Member

Darkhax commented Nov 2, 2017

This is a very weird PR. You make a lot of changes that go beyond the initial scope of the PR, and some style changes that are not consistent with the rest of the mod, and my other mods. I don't want your work to go to waste so I am still going to merge, just something to keep in mind.

@Darkhax Darkhax merged commit ed9b560 into Darkhax-Minecraft:master Nov 2, 2017
@CDAGaming
Copy link
Contributor Author

Yea, I think most changes were from the code cleanup, which is a command included in IntelliJ. It was also Optional, but I included it just for simplicity. Next time, I'll keep it in mind and I should've also asked if you'd want that cleanup with this PR or rather in a seperate PR

@CDAGaming
Copy link
Contributor Author

There was one more thing I was going to include in the PR, which was an Upgrade to Gradle from 4.2/4.2.1 to 4.3-bin, so that will be coming later today, just a heads up

@CDAGaming CDAGaming mentioned this pull request Nov 2, 2017
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.

None yet

2 participants