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

Block Extension QSL #100

Draft
wants to merge 15 commits into
base: 1.18
Choose a base branch
from
Draft

Block Extension QSL #100

wants to merge 15 commits into from

Commits on Apr 17, 2022

  1. First QuiltBlock impl, multi-block property Proxying

    @Azagwen
    Azagwen committed Apr 17, 2022
    Configuration menu
    Copy the full SHA
    9903756 View commit details
    Browse the repository at this point in the history

  2. Help I'm stupid

    @Azagwen
    Azagwen committed Apr 17, 2022
    Configuration menu
    Copy the full SHA
    1144ed2 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'QuiltMC:1.18' into 1.18

    @Azagwen
    Azagwen authored Apr 17, 2022
    Configuration menu
    Copy the full SHA
    c23f5b1 View commit details
    Browse the repository at this point in the history

  4. QuiltBlock Impl changes, I also hate my lfie because Blockstates

    @Azagwen
    Azagwen committed Apr 17, 2022
    Configuration menu
    Copy the full SHA
    4c109c8 View commit details
    Browse the repository at this point in the history

Commits on Apr 19, 2022

  1. move comments around

    @Azagwen
    Azagwen committed Apr 19, 2022
    Configuration menu
    Copy the full SHA
    e7679ac View commit details
    Browse the repository at this point in the history

Commits on Apr 22, 2022

  1. added a way to copy default states from proxies + a way to safely get… 

    … a property from a block with proxies, without crashing the game if the peroperty doesn't exist.
    @Azagwen
    Azagwen committed Apr 22, 2022
    Configuration menu
    Copy the full SHA
    0adaeb5 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'QuiltMC:1.18' into 1.18

    @Azagwen
    Azagwen authored Apr 22, 2022
    Configuration menu
    Copy the full SHA
    dd6c73d View commit details
    Browse the repository at this point in the history

  3. removed obsolete TODOs

    @Azagwen
    Azagwen committed Apr 22, 2022
    Configuration menu
    Copy the full SHA
    d1b3757 View commit details
    Browse the repository at this point in the history

Commits on Apr 23, 2022

  1. Make createProxy use generic types for Settings 

    Co-authored-by: LambdAurora <[email protected]>
    @Azagwen @LambdAurora
    Azagwen and LambdAurora authored Apr 23, 2022
    Configuration menu
    Copy the full SHA
    cd547e7 View commit details
    Browse the repository at this point in the history

  2. Don't use stuff reminiscent from the before diamond generic Java vers… 

    …ions.


Sorry, I didn't know 😔

Co-authored-by: LambdAurora <[email protected]>
    @Azagwen @LambdAurora
    Azagwen and LambdAurora authored Apr 23, 2022
    Configuration menu
    Copy the full SHA
    c1ccef9 View commit details
    Browse the repository at this point in the history

  3. Attempt to generify "getProxyDefaultState", renamed to "mergeStates" 

    Fix Block Mixin name to fit naming conventions
    @Azagwen
    Azagwen committed Apr 23, 2022
    Configuration menu
    Copy the full SHA
    10a9f36 View commit details
    Browse the repository at this point in the history

  4. Merge remote-tracking branch 'origin/1.18' into 1.18

    @Azagwen
    Azagwen committed Apr 23, 2022
    Configuration menu
    Copy the full SHA
    cc44490 View commit details
    Browse the repository at this point in the history

  5. Ran "applyLicenses", help why is my commit containing 31 changed files-

    @Azagwen
    Azagwen committed Apr 23, 2022
    Configuration menu
    Copy the full SHA
    ced6af5 View commit details
    Browse the repository at this point in the history

  6. update mergeStates javadoc comment

    @Azagwen
    Azagwen committed Apr 23, 2022
    Configuration menu
    Copy the full SHA
    5ece6c5 View commit details
    Browse the repository at this point in the history

Commits on Apr 24, 2022

  1. Merge branch 'QuiltMC:1.18' into 1.18

    @Azagwen
    Azagwen authored Apr 24, 2022
    Configuration menu
    Copy the full SHA
    1586665 View commit details
    Browse the repository at this point in the history