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

issue 116 fix #166

Merged
merged 3 commits into from
Feb 25, 2025
Merged

issue 116 fix #166

merged 3 commits into from
Feb 25, 2025

Conversation

WilsonGoins
Copy link
Collaborator

addresses issue 116 and also makes a change to the vending machine animations in w0_d1

addresses issue 116 and also makes a change to the vending machine animations in w0_d1
Copy link
Collaborator

@nickv779 nickv779 left a comment

Choose a reason for hiding this comment

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

remove the extraneous files added, and you need to implement the animations for vending machine when you are nice (so far it looks to just be implemented for the mean branch)

This reverts commit b53bb13.
removed the .idea and .iml files that were mistakenly pushed. update the .gitignore to protect from this in the future. copy and pasted old changes and added in new changes from nick's feedback
@WilsonGoins
Copy link
Collaborator Author

WilsonGoins commented Feb 23, 2025

remove the extraneous files added, and you need to implement the animations for vending machine when you are nice (so far it looks to just be implemented for the mean branch)

should be good now. had to revert my commit bc i couldn't figure out how to delete the idea and iml files. i updated the gitignore to not commit those in the future, I think it's something intelliJ does automatically. my bad. I also added animations to a conversation with Python in Day 3 in CC on thursday and so I included that in here. lmk if i did this wrong, I'm super scuffed on git rn

Copy link
Collaborator

@nickv779 nickv779 left a comment

Choose a reason for hiding this comment

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

awesome sauce

@nickv779 nickv779 merged commit 6b70906 into ufosc:main Feb 25, 2025
1 check passed
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.

2 participants