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

Restyle Osmotic Enchanter doesn't lose your settings when you add/remove a wand before starting enchantment #1055

Open
wants to merge 7 commits into
base: 1.7-final
Choose a base branch
from

Conversation

restyled-io[bot]
Copy link
Contributor

@restyled-io restyled-io bot commented Jan 12, 2022

A duplicate of #1054 with additional commits that automatically address
incorrect style, created by Restyled.

⚠️ Even though this PR is not a Fork, it contains outside contributions.
Please review accordingly.

Since the original Pull Request was opened as a fork in a contributor's
repository, we are unable to create a Pull Request branching from it with only
the style fixes.

The following Restylers made fixes:

To incorporate these changes, you can either:

  1. Merge this Pull Request instead of the original, or

  2. Ask your contributor to locally incorporate these commits and push them to
    the original Pull Request

    Expand for example instructions
    ```console
    git remote add upstream https://github.com/Thaumic-Tinkerer/ThaumicTinkerer.git
    git fetch upstream pull/<this PR number>/head
    git merge --ff-only FETCH_HEAD
    git push
    ```
    

NOTE: As work continues on the original Pull Request, this process will
re-run and update (force-push) this Pull Request with updated style fixes as
necessary. If the style is fixed manually at any point (i.e. this process finds
no fixes to make), this Pull Request will be closed automatically.

Sorry if this was unexpected. To disable it, see our documentation.

SarahKirksey and others added 3 commits January 11, 2022 19:13
…nd before starting enchantment

Revert "Osmotic Enchanter doesn't lose your settings when you add/remove a wand before starting enchantment"

This reverts commit 6eb0013.

Revert "Revert "Osmotic Enchanter doesn't lose your settings when you add/remove a wand before starting enchantment""

This reverts commit 01f6bd80f2511bccee723a396c1b74381c3b410f.
@restyled-io restyled-io bot force-pushed the restyled/1.7-final-OsmoticEnchanterWandTweak branch from 08db3e1 to 4a73e7e Compare January 13, 2022 03:13
SarahKirksey and others added 2 commits January 14, 2022 09:04
For some unidentified reason, the last attempt broke the enchanter entirely. This approach should function as intended and offer better performance.
@restyled-io restyled-io bot force-pushed the restyled/1.7-final-OsmoticEnchanterWandTweak branch from 4a73e7e to 48664af Compare January 14, 2022 17:04
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