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

Godforge encore #3213

Draft
wants to merge 24 commits into
base: master
Choose a base branch
from
Draft

Godforge encore #3213

wants to merge 24 commits into from
+458 −140

Commits on Sep 17, 2024

  1. Fix a few exotic plasmas

    @serenibyss
    serenibyss committed Sep 17, 2024
    Configuration menu
    Copy the full SHA
    93e4af9 View commit details
    Browse the repository at this point in the history

  2. Attempt to fix fuel draining issue with some hatch types 

    Needs testing
    @serenibyss
    serenibyss committed Sep 17, 2024
    Configuration menu
    Copy the full SHA
    a005016 View commit details
    Browse the repository at this point in the history

  3. close individual milestone popup on milestone window close

    @serenibyss
    serenibyss committed Sep 17, 2024
    Configuration menu
    Copy the full SHA
    d2b55c2 View commit details
    Browse the repository at this point in the history

  4. Fix windows relocating on reopen 

    Requires GTNewHorizons/ModularUI#80 to function properly, but not to compile
    @serenibyss
    serenibyss committed Sep 17, 2024
    Configuration menu
    Copy the full SHA
    180709d View commit details
    Browse the repository at this point in the history

  5. Merge branch 'master' into godforge-encore

    @Dream-Master
    Dream-Master committed Sep 17, 2024
    Configuration menu
    Copy the full SHA
    cd35189 View commit details
    Browse the repository at this point in the history

  6. fix nei magmatter amount

    @GDCloudstrike
    GDCloudstrike committed Sep 17, 2024
    Configuration menu
    Copy the full SHA
    5d01167 View commit details
    Browse the repository at this point in the history

Commits on Sep 19, 2024

  1. update mui

    @serenibyss
    serenibyss committed Sep 19, 2024
    Configuration menu
    Copy the full SHA
    ba7a6b2 View commit details
    Browse the repository at this point in the history

  2. fix respec logic

    @GDCloudstrike
    GDCloudstrike committed Sep 19, 2024
    Configuration menu
    Copy the full SHA
    ae90bc8 View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'origin/godforge-encore' into godforge-e… 

    …ncore
    @GDCloudstrike
    GDCloudstrike committed Sep 19, 2024
    Configuration menu
    Copy the full SHA
    ec466ed View commit details
    Browse the repository at this point in the history

Commits on Sep 20, 2024

  1. Fix a few exotic plasmas

    @serenibyss
    serenibyss committed Sep 20, 2024
    Configuration menu
    Copy the full SHA
    6b0d235 View commit details
    Browse the repository at this point in the history

  2. Attempt to fix fuel draining issue with some hatch types 

    Needs testing
    @serenibyss
    serenibyss committed Sep 20, 2024
    Configuration menu
    Copy the full SHA
    9709dd5 View commit details
    Browse the repository at this point in the history

  3. close individual milestone popup on milestone window close

    @serenibyss
    serenibyss committed Sep 20, 2024
    Configuration menu
    Copy the full SHA
    d59feb7 View commit details
    Browse the repository at this point in the history

  4. Fix windows relocating on reopen 

    Requires GTNewHorizons/ModularUI#80 to function properly, but not to compile
    @serenibyss
    serenibyss committed Sep 20, 2024
    Configuration menu
    Copy the full SHA
    01e0222 View commit details
    Browse the repository at this point in the history

  5. fix nei magmatter amount

    @GDCloudstrike @serenibyss
    GDCloudstrike authored and serenibyss committed Sep 20, 2024
    Configuration menu
    Copy the full SHA
    0a6c4a7 View commit details
    Browse the repository at this point in the history

  6. fix respec logic

    @GDCloudstrike @serenibyss
    GDCloudstrike authored and serenibyss committed Sep 20, 2024
    Configuration menu
    Copy the full SHA
    7d1d4ea View commit details
    Browse the repository at this point in the history

  7. Add dev debug upgrade items

    @serenibyss
    serenibyss committed Sep 20, 2024
    Configuration menu
    Copy the full SHA
    7fb95fc View commit details
    Browse the repository at this point in the history

  8. shift click to insta-complete upgrade, rclick to respec

    @serenibyss
    serenibyss committed Sep 20, 2024
    Configuration menu
    Copy the full SHA
    d67e02e View commit details
    Browse the repository at this point in the history

  9. Merge remote-tracking branch 'origin/godforge-encore' into godforge-e… 

    …ncore

# Conflicts:
#	dependencies.gradle
#	src/main/java/tectech/thing/metaTileEntity/multi/MTEForgeOfGods.java
    @GDCloudstrike
    GDCloudstrike committed Sep 20, 2024
    Configuration menu
    Copy the full SHA
    4494ba2 View commit details
    Browse the repository at this point in the history

Commits on Sep 21, 2024

  1. add name for start upgrade

    @GDCloudstrike
    GDCloudstrike committed Sep 21, 2024
    Configuration menu
    Copy the full SHA
    4fd069c View commit details
    Browse the repository at this point in the history

  2. improve start upgrade name

    @serenibyss
    serenibyss committed Sep 21, 2024
    Configuration menu
    Copy the full SHA
    49eb488 View commit details
    Browse the repository at this point in the history

  3. 😶

    @serenibyss
    serenibyss committed Sep 21, 2024
    Configuration menu
    Copy the full SHA
    f751351 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' into godforge-encore

    @serenibyss
    serenibyss committed Sep 21, 2024
    Configuration menu
    Copy the full SHA
    017ca8c View commit details
    Browse the repository at this point in the history

Commits on Sep 22, 2024

  1. add cosmetics window

    @GDCloudstrike
    GDCloudstrike committed Sep 22, 2024
    Configuration menu
    Copy the full SHA
    c60a842 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/godforge-encore' into godforge-e… 

    …ncore

# Conflicts:
#	src/main/java/tectech/thing/metaTileEntity/multi/MTEForgeOfGods.java
#	src/main/resources/assets/tectech/lang/en_US.lang
    @GDCloudstrike
    GDCloudstrike committed Sep 22, 2024
    Configuration menu
    Copy the full SHA
    2274f06 View commit details
    Browse the repository at this point in the history