-
Notifications
You must be signed in to change notification settings - Fork 82
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
Remerge updated binary puzzle, proof editor, puzzle editor, home panel, bug fixes #859
Conversation
My fork doesn't have a dev branch, and I accidentally committed directly to the main repository's branch. I reverted the commits so that no files were changed. |
Automated Java code formatting changes
For some reason, the autoformatter's changes cause a merge conflict in every file where it shifts around one or two words in a comment. When I try to override all the merge conflicts in the terminal, it seems like it directly commits to master, which I don't want to do. I'll see if there is an alternative way to merge, but if I can't find something by next week, I'll just commit the autoformatter merges directly to master. |
'c' is found using LegupUtils.getClasses("edu.rpi.legup.puzzle"), so it will start with it. Fixes issue with STT rules not showing up.
Looks good, this merge should bring back the summer semester changes to master. |
Description
Merge updated binary puzzle, including new rules, images, functionality.
New look and functionality for proof editor.
New look and functionality for puzzle editor.
Revised home panel.
Many bug fixes throughout the engine
Continuation merge from #852.
Type of change
How Has This Been Tested?
The master branch was stable before reverting the merge. There have been no other commits.
Checklist: