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

AE2 Compatibility #5378

Open
wants to merge 24 commits into
base: develop
Choose a base branch
from
Open

AE2 Compatibility #5378

wants to merge 24 commits into from

Commits on Apr 21, 2023

  1. the beginning of AE2 Compact 

    starting with texture and naming
    @ZZZank
    ZZZank committed Apr 21, 2023
    Configuration menu
    Copy the full SHA
    4f2dc73 View commit details
    Browse the repository at this point in the history

  2. hiding redundant items[在JEI中隐藏多余物品与方块] 

    需要配合下一个commit使用
    @ZZZank
    ZZZank committed Apr 21, 2023
    Configuration menu
    Copy the full SHA
    1ae03ca View commit details
    Browse the repository at this point in the history

  3. basic resources, more complete hiding 

    [基础资源，以及完善的隐藏手段]
    @ZZZank
    ZZZank committed Apr 21, 2023
    Configuration menu
    Copy the full SHA
    84d1e59 View commit details
    Browse the repository at this point in the history

Commits on Apr 22, 2023

  1. Conversion between ae and rs

    @ZZZank
    ZZZank committed Apr 22, 2023
    Configuration menu
    Copy the full SHA
    269a11c View commit details
    Browse the repository at this point in the history

  2. Fix id, sky stone production

    @ZZZank
    ZZZank committed Apr 22, 2023
    Configuration menu
    Copy the full SHA
    ce68b83 View commit details
    Browse the repository at this point in the history

  3. AE2 config file

    @ZZZank
    ZZZank committed Apr 22, 2023
    Configuration menu
    Copy the full SHA
    508f100 View commit details
    Browse the repository at this point in the history

Commits on Apr 23, 2023

  1. blocks, and glass cable

    @ZZZank
    ZZZank committed Apr 23, 2023
    Configuration menu
    Copy the full SHA
    48dd2a9 View commit details
    Browse the repository at this point in the history

  2. fix export_bus recipe

    @ZZZank
    ZZZank committed Apr 23, 2023
    Configuration menu
    Copy the full SHA
    934a8a9 View commit details
    Browse the repository at this point in the history

  3. Fluid related blocks, and disable small cells

    @ZZZank
    ZZZank committed Apr 23, 2023
    Configuration menu
    Copy the full SHA
    f9372d5 View commit details
    Browse the repository at this point in the history

  4. wait what happened to my codespace

    @ZZZank
    ZZZank committed Apr 23, 2023
    Configuration menu
    Copy the full SHA
    d19a189 View commit details
    Browse the repository at this point in the history

  5. rebalance energy usage

    @ZZZank
    ZZZank committed Apr 23, 2023
    Configuration menu
    Copy the full SHA
    12dd2cc View commit details
    Browse the repository at this point in the history

  6. 8x glasscable, and small fixes

    @ZZZank
    ZZZank committed Apr 23, 2023
    Configuration menu
    Copy the full SHA
    087b423 View commit details
    Browse the repository at this point in the history

  7. fix wrong name

    @ZZZank
    ZZZank committed Apr 23, 2023
    Configuration menu
    Copy the full SHA
    f7b6212 View commit details
    Browse the repository at this point in the history

Commits on Apr 28, 2023

  1. use one variable to decrease calc

    @ZZZank
    ZZZank committed Apr 28, 2023
    Configuration menu
    Copy the full SHA
    a42118a View commit details
    Browse the repository at this point in the history

  2. spatial components

    @ZZZank
    ZZZank committed Apr 28, 2023
    Configuration menu
    Copy the full SHA
    6be8672 View commit details
    Browse the repository at this point in the history

  3. p2p::memory card

    @ZZZank
    ZZZank committed Apr 28, 2023
    Configuration menu
    Copy the full SHA
    d7431cf View commit details
    Browse the repository at this point in the history

  4. items::speed card

    @ZZZank
    ZZZank committed Apr 28, 2023
    Configuration menu
    Copy the full SHA
    5c9fe95 View commit details
    Browse the repository at this point in the history

  5. remove todo

    @ZZZank
    ZZZank committed Apr 28, 2023
    Configuration menu
    Copy the full SHA
    bfad948 View commit details
    Browse the repository at this point in the history

Commits on May 5, 2023

  1. change energy acceptor recipe

    @ZZZank
    ZZZank committed May 5, 2023
    Configuration menu
    Copy the full SHA
    4bd77f6 View commit details
    Browse the repository at this point in the history

Commits on May 18, 2023

  1. interface, molecular_assembler and blank_pattern

    @ZZZank
    ZZZank committed May 18, 2023
    Configuration menu
    Copy the full SHA
    173e567 View commit details
    Browse the repository at this point in the history

Commits on May 22, 2023

  1. oh i just found this typo error

    @ZZZank
    ZZZank committed May 22, 2023
    Configuration menu
    Copy the full SHA
    4ca5777 View commit details
    Browse the repository at this point in the history

Commits on May 23, 2023

  1. Some standardization

    @ZZZank
    ZZZank committed May 23, 2023
    Configuration menu
    Copy the full SHA
    66a34f9 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'EnigmaticaModpacks:develop' into develop

    @ZZZank
    ZZZank committed May 23, 2023
    Configuration menu
    Copy the full SHA
    9b12196 View commit details
    Browse the repository at this point in the history

Commits on Jun 9, 2023

  1. Merge branch 'EnigmaticaModpacks:develop' into develop

    @ZZZank
    ZZZank committed Jun 9, 2023
    Configuration menu
    Copy the full SHA
    83d8d83 View commit details
    Browse the repository at this point in the history