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

Pulling upstream into master #7

Closed
wants to merge 7 commits into from
Closed

Pulling upstream into master #7

wants to merge 7 commits into from

Conversation

github-actions[bot]
Copy link

commit f62c993
Author: cheapie [email protected]
Date: Sun Feb 21 04:17:44 2021 -0600

Allow stacking of blank EEPROMs

commit 904f6d7
Author: cheapie [email protected]
Date: Sun Feb 21 04:16:20 2021 -0600

Add craft recipe for movestone

commit 896a256
Author: cheapie [email protected]
Date: Sun Feb 21 04:13:44 2021 -0600

Add alternate piezo recipe
Now uses a mese crystal fragment if quartz isn't installed

commit f0ce172
Author: cheapie [email protected]
Date: Sun Feb 21 03:50:59 2021 -0600

Split documentation from README out into separate files

commit 39a7904
Author: cheapie [email protected]
Date: Sun Feb 21 03:45:27 2021 -0600

Convert depends.txt to mod.conf

commit 05e870d
Author: cheapie [email protected]
Date: Sun Feb 21 03:42:11 2021 -0600

Add textures for movestone

commit e0c0b5b
Author: cheapie [email protected]
Date: Sun Feb 21 03:36:46 2021 -0600

Fix movestones not working in protected areas

@github-actions github-actions bot added the upstream Merging commits from upstream label Feb 21, 2021
@BuckarooBanzay BuckarooBanzay mentioned this pull request Feb 21, 2021
@BuckarooBanzay
Copy link
Member

i rebased this in #8, i hope i got all the changes 🤞

@OgelGames OgelGames closed this Feb 22, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
upstream Merging commits from upstream
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants