-
Notifications
You must be signed in to change notification settings - Fork 64
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
Revert #6 "Latest Experimental Psychics" #109
Revert #6 "Latest Experimental Psychics" #109
Conversation
This reverts commit 79ad4c6.
I want a deploy stop when this is merged until the psyonics changes are back in the game. |
That's the idea, that is why this is a draft ATM |
Gonna get this out of draft so I can specifically test it |
I will be working with Fansana to edit the conflicting files. |
Psonic will still be in the game, nothing really will have change as this is a experimental feature, issue is that we cannot upstream merge until this is done. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Multiple tests have failed, please have those tests pass.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Test fails are legits, this will need to be resolved, and we will need to make sure nothing broke.
Yes, working on the files right now. Also considering just reverting all the way back to 6, and then PRing everything without 6, just to see what happens. |
(Really he's just tellling me what I need to do)
I am not completely sure if everything is reverted, but this seems to build without the conflicting files. Please look over it and make sure I'm not forgetting something or if it doesn't need any more editing. |
I will test it when i wake up. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
During test, this seem ready.
Do not merge, i will handle it, aka i left a tag for it.
This PR has been merged with #114 Meaning its will be added at the same time as the upstream merge. |
Description
This is a reversion of PR #6 to make merging upstream possible. I am doing this under the guidance of @DangerRevolution to see which files are conflicting.
This also includes a revert of PR #66 by @FoxxoTrystan
I have also recieved the guidance of @VMSolidus in the later half.
TODO
🆑 ShatteredSwords and FoxxoTrystan