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

Merged
merged 55 commits into from
Oct 3, 2024
Merged

Godforge encore #3213

merged 55 commits into from
Oct 3, 2024

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 authored 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 authored 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

Commits on Sep 24, 2024

  1. Merge branch 'master' into godforge-encore

    @Dream-Master
    Dream-Master authored Sep 24, 2024
    Configuration menu
    Copy the full SHA
    abbd06a View commit details
    Browse the repository at this point in the history

Commits on Sep 25, 2024

  1. add rainbow mode

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

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

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

  3. fix color preview refreshing and attempt to fix structure weirdness

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

  4. Merge branch 'master' into godforge-encore

    @Dream-Master
    Dream-Master authored Sep 25, 2024
    Configuration menu
    Copy the full SHA
    dca16ad View commit details
    Browse the repository at this point in the history

  5. drain correct fluid amount

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

  6. mention wireless energy

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

Commits on Sep 27, 2024

  1. fix smelting module recipe time overflow issues

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

  2. fix fuel consumption rounding issues

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

Commits on Sep 28, 2024

  1. fix items in material window disappearing after restart

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

  2. rename infinity plasma to be consistent

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

  3. Merge branch 'master' into godforge-encore

    @Dream-Master
    Dream-Master authored Sep 28, 2024
    Configuration menu
    Copy the full SHA
    b8a5184 View commit details
    Browse the repository at this point in the history

Commits on Sep 29, 2024

  1. disable hatch filtering on exotic module

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

  2. fix autobuild rebuilding rings that already got absorbed

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

  3. fix typos

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

Commits on Sep 30, 2024

  1. fix minor text oversight

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

  2. fix e notation formatting on power milestone

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

  3. cleanup + refactor milestone formatting

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

  4. fix fuel config window textbox sync issues

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

  5. add red background

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

Commits on Oct 1, 2024

  1. restore post milestone hint text

    @serenibyss
    serenibyss committed Oct 1, 2024
    Configuration menu
    Copy the full SHA
    b8c0285 View commit details
    Browse the repository at this point in the history

  2. Fix structure tooltip detail 

    Closes GTNewHorizons/GT-New-Horizons-Modpack#17468
    @serenibyss
    serenibyss committed Oct 1, 2024
    Configuration menu
    Copy the full SHA
    6dd3dbe View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into godforge-encore

    @serenibyss
    serenibyss authored Oct 1, 2024
    Configuration menu
    Copy the full SHA
    6dbbd31 View commit details
    Browse the repository at this point in the history

  4. add general info window to all modules

    @serenibyss
    serenibyss committed Oct 1, 2024
    Configuration menu
    Copy the full SHA
    2513eb1 View commit details
    Browse the repository at this point in the history

Commits on Oct 2, 2024

  1. center primary upgrade text in individual upgrade window

    @serenibyss
    serenibyss committed Oct 2, 2024
    Configuration menu
    Copy the full SHA
    b865a34 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into godforge-encore

    @serenibyss
    serenibyss authored Oct 2, 2024
    Configuration menu
    Copy the full SHA
    8bb58b9 View commit details
    Browse the repository at this point in the history

Commits on Oct 3, 2024

  1. Merge branch 'master' into godforge-encore

    @serenibyss
    serenibyss authored Oct 3, 2024
    Configuration menu
    Copy the full SHA
    e12726d View commit details
    Browse the repository at this point in the history

  2. retexture celestial button bg

    @serenibyss
    serenibyss committed Oct 3, 2024
    Configuration menu
    Copy the full SHA
    f29efcf View commit details
    Browse the repository at this point in the history

  3. apply overflow fixes to molten module too

    @GDCloudstrike
    GDCloudstrike committed Oct 3, 2024
    Configuration menu
    Copy the full SHA
    c89aaf8 View commit details
    Browse the repository at this point in the history

  4. use reopenWindow

    @GDCloudstrike
    GDCloudstrike committed Oct 3, 2024
    Configuration menu
    Copy the full SHA
    e044e46 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'master' into godforge-encore

    @serenibyss
    serenibyss authored Oct 3, 2024
    Configuration menu
    Copy the full SHA
    bdd44f5 View commit details
    Browse the repository at this point in the history