forked from CleanroomMC/ModularUI
-
Notifications
You must be signed in to change notification settings - Fork 19
Sync upstream Christmas edition #86
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
Open
brachy84
wants to merge
35
commits into
master
Choose a base branch
from
sync-upstream
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
(cherry picked from commit 848d9e6)
(cherry picked from commit 7d98df2)
(cherry picked from commit a2fe569)
(cherry picked from commit 2d05eea)
(cherry picked from commit 57b58b3)
(cherry picked from commit 6f4e395)
* rework * javadoc n stuff * non extendable (cherry picked from commit cf3462d)
(cherry picked from commit f5a532e)
(cherry picked from commit acca035)
(cherry picked from commit 78a9e2d)
(cherry picked from commit 039f849)
(cherry picked from commit d4e989e)
(cherry picked from commit 924159a)
(cherry picked from commit 874dc5c)
(cherry picked from commit 425150d)
(cherry picked from commit 76675c1)
(cherry picked from commit 7f8be82)
(cherry picked from commit 86a01ef)
(cherry picked from commit 1a3f4d4)
…don't need any data (CleanroomMC#183) (cherry picked from commit 5d6a380)
…per graph (cherry picked from commit df4387a)
(cherry picked from commit b480bcc)
(cherry picked from commit b94603e)
(cherry picked from commit f9305bf)
(cherry picked from commit 8032022)
(cherry picked from commit fd78b39)
(cherry picked from commit 20e9a1c)
(cherry picked from commit fcc15a7)
(cherry picked from commit 6e2d04f)
(cherry picked from commit fda3bf7)
Member
|
im working on adapting this PR to work with out gt5u using maven local blah blah. a couple things need to change but after that it should be good to go, you will just have to give me a bit. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is a long one. Can't guarantee it wont break anything.