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

Groups Refactor #136

Draft
wants to merge 6 commits into
base: 1.20.x
Choose a base branch
from
Draft

Groups Refactor #136

wants to merge 6 commits into from

Commits on Nov 9, 2023

  1. Add context menu base for group editing

    @ThatGravyBoat
    ThatGravyBoat committed Nov 9, 2023
    Configuration menu
    Copy the full SHA
    5072d77 View commit details
    Browse the repository at this point in the history

  2. Migrate to json for groups and add icon editing

    @ThatGravyBoat
    ThatGravyBoat committed Nov 9, 2023
    Configuration menu
    Copy the full SHA
    f66210c View commit details
    Browse the repository at this point in the history

Commits on Nov 11, 2023

  1. Add name editing

    @ThatGravyBoat
    ThatGravyBoat committed Nov 11, 2023
    Configuration menu
    Copy the full SHA
    c332833 View commit details
    Browse the repository at this point in the history

Commits on Jan 16, 2024

  1. Merge branch '1.20.x' into feat/groups-refactor 

    # Conflicts:
#	common/src/main/java/earth/terrarium/heracles/client/screens/quests/GroupsList.java
#	common/src/main/java/earth/terrarium/heracles/common/handlers/quests/QuestHandler.java
#	common/src/main/java/earth/terrarium/heracles/common/network/NetworkHandler.java
#	common/src/main/java/earth/terrarium/heracles/common/network/packets/groups/CreateGroupPacket.java
#	common/src/main/java/earth/terrarium/heracles/common/network/packets/groups/DeleteGroupPacket.java
#	common/src/main/java/earth/terrarium/heracles/common/network/packets/quests/SyncQuestsPacket.java
#	common/src/main/java/earth/terrarium/heracles/common/utils/ModUtils.java
#	gradle.properties
    @ThatGravyBoat
    ThatGravyBoat committed Jan 16, 2024
    Configuration menu
    Copy the full SHA
    3dd99d0 View commit details
    Browse the repository at this point in the history

  2. Merge and add ordering

    @ThatGravyBoat
    ThatGravyBoat committed Jan 16, 2024
    Configuration menu
    Copy the full SHA
    b236d0f View commit details
    Browse the repository at this point in the history

  3. Fix inconsistent selecting with group editing

    @ThatGravyBoat
    ThatGravyBoat committed Jan 16, 2024
    Configuration menu
    Copy the full SHA
    5a886fc View commit details
    Browse the repository at this point in the history