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.

Sign up for GitHub

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

Jump to bottom

Add permitted list of dimension for windmill #47

Merged
merged 16 commits into from
Oct 20, 2022
Merged

Add permitted list of dimension for windmill #47

merged 16 commits into from
Oct 20, 2022

Commits on Sep 11, 2022

  1. first push of windmill stuff

    @maggi373
    maggi373 committed Sep 11, 2022
    Configuration menu
    Copy the full SHA
    ec11b81 View commit details
    Browse the repository at this point in the history

Commits on Sep 13, 2022

  1. Merge pull request #38 from Thorfusion/1.7.10 

    Update windmill branch
    @maggi373
    maggi373 authored Sep 13, 2022
    Configuration menu
    Copy the full SHA
    6c446d8 View commit details
    Browse the repository at this point in the history

Commits on Oct 18, 2022

  1. Added Windmill Dimensional Checks 

    Windmill location is checked against the whitelist.
    @DrParadox7
    DrParadox7 committed Oct 18, 2022
    Configuration menu
    Copy the full SHA
    d011e01 View commit details
    Browse the repository at this point in the history

Commits on Oct 19, 2022

  1. Merge branch '1.7.10' into windmill

    @maggi373
    maggi373 authored Oct 19, 2022
    Configuration menu
    Copy the full SHA
    b80b233 View commit details
    Browse the repository at this point in the history

  2. invert whitelist to correct way

    @maggi373
    maggi373 committed Oct 19, 2022
    Configuration menu
    Copy the full SHA
    3877703 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'windmill' of https://github.com/Thorfusion/Mekanism-1.7… 

    ….10-Community-Edition into windmill
    @maggi373
    maggi373 committed Oct 19, 2022
    Configuration menu
    Copy the full SHA
    1a986c5 View commit details
    Browse the repository at this point in the history

  4. remove commented out dimid

    @maggi373
    maggi373 committed Oct 19, 2022
    Configuration menu
    Copy the full SHA
    e0a72af View commit details
    Browse the repository at this point in the history

  5. Update Mekanism.java

    @maggi373
    maggi373 committed Oct 19, 2022
    Configuration menu
    Copy the full SHA
    af54740 View commit details
    Browse the repository at this point in the history

  6. println on dimid

    @maggi373
    maggi373 committed Oct 19, 2022
    Configuration menu
    Copy the full SHA
    22d5679 View commit details
    Browse the repository at this point in the history

  7. fix error text for blocked dim

    @maggi373
    maggi373 committed Oct 19, 2022
    Configuration menu
    Copy the full SHA
    ab543ed View commit details
    Browse the repository at this point in the history

  8. fix conversion from string to integer

    @maggi373
    maggi373 committed Oct 19, 2022
    Configuration menu
    Copy the full SHA
    3c01fa0 View commit details
    Browse the repository at this point in the history

  9. cleanup of unused imports

    @maggi373
    maggi373 committed Oct 19, 2022
    Configuration menu
    Copy the full SHA
    2b76cf0 View commit details
    Browse the repository at this point in the history

  10. add config option for enabling whitelist for windmills

    @maggi373
    maggi373 committed Oct 19, 2022
    Configuration menu
    Copy the full SHA
    91d6c06 View commit details
    Browse the repository at this point in the history

  11. remove unused implementation

    @maggi373
    maggi373 committed Oct 19, 2022
    Configuration menu
    Copy the full SHA
    9e90805 View commit details
    Browse the repository at this point in the history

Commits on Oct 20, 2022

  1. add config for silicon sync

    @maggi373
    maggi373 committed Oct 20, 2022
    Configuration menu
    Copy the full SHA
    74e2e69 View commit details
    Browse the repository at this point in the history

  2. forgot to add siliconcompat config to commonproxy

    @maggi373
    maggi373 committed Oct 20, 2022
    Configuration menu
    Copy the full SHA
    dc997b4 View commit details
    Browse the repository at this point in the history