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 finale #3080

Merged
merged 112 commits into from
Sep 15, 2024
Merged

Godforge finale #3080

merged 112 commits into from
Sep 15, 2024

Commits on Sep 3, 2024

  1. remove multi-step and t4+ plasmas from exotic module plasma pool

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

  2. fix missing word

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

  3. Merge remote-tracking branch 'origin/master' into godforge_finale

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

Commits on Sep 4, 2024

  1. adjust upgrade costs

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

  2. Godforge Renderer (#3054)

    @CookieBrigade
    CookieBrigade committed Sep 4, 2024
    Configuration menu
    Copy the full SHA
    52eef47 View commit details
    Browse the repository at this point in the history

  3. another missing word

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

Commits on Sep 5, 2024

  1. Merge remote-tracking branch 'origin/godforge_finale' into godforge_f… 

    …inale
    @GDCloudstrike
    GDCloudstrike committed Sep 5, 2024
    Configuration menu
    Copy the full SHA
    164f9db View commit details
    Browse the repository at this point in the history

  2. fix auutobuild not working while formed

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

  3. output bus has to be ME variant

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

Commits on Sep 6, 2024

  1. fix dot

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

  2. fix first ring materializing out of nowhere when controller is broken

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

  3. spotless

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

  4. Merge remote-tracking branch 'origin/master' into godforge_finale

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

  5. Merge branch 'master' into godforge_finale

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

  6. Merge branch 'master' into godforge_finale

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

  7. Merge remote-tracking branch 'origin/master' into godforge_finale

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

  8. typo

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

  9. typo 213124

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

  10. Merge remote-tracking branch 'origin/godforge_finale' into godforge_f… 

    …inale
    @GDCloudstrike
    GDCloudstrike committed Sep 6, 2024
    Configuration menu
    Copy the full SHA
    c0e0eef View commit details
    Browse the repository at this point in the history

  11. fix recipes not loading

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

  12. Merge branch 'master' into godforge_finale

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

  13. load everything godforge related

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

  14. Merge remote-tracking branch 'origin/godforge_finale' into godforge_f… 

    …inale
    @GDCloudstrike
    GDCloudstrike committed Sep 6, 2024
    Configuration menu
    Copy the full SHA
    bae1c01 View commit details
    Browse the repository at this point in the history

  15. disable debug

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

  16. Merge branch 'master' into godforge_finale

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

Commits on Sep 7, 2024

  1. decouple exotic module automation from parallel

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

  2. enforce output bus and hatch on exotic module

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

  3. wrong module

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

  4. Merge remote-tracking branch 'origin/godforge_finale' into godforge_f… 

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

  5. Merge remote-tracking branch 'origin/master' into godforge_finale

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

  6. shuffle structurecheck around so it actually works

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

  7. Merge branch 'master' into godforge_finale

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

  8. Merge branch 'master' into godforge_finale

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

  9. Merge remote-tracking branch 'origin/master' into godforge_finale

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

  10. Merge remote-tracking branch 'origin/godforge_finale' into godforge_f… 

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

  11. adjust button textures a little

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

  12. Merge branch 'master' into godforge_finale

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

  13. Temp fix attempt (#3103)

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

  14. buff magmatter

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

  15. Merge remote-tracking branch 'origin/godforge_finale' into godforge_f… 

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

  16. Merge remote-tracking branch 'origin/master' into godforge_finale

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

  17. Gorge render attempt #2 (#3109)

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

  18. spotless

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

  19. lock render spawner behind debug mode

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

  20. add alternate phonon crystal solution recipe

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

Commits on Sep 8, 2024

  1. Gorge fixed with jank (#3111)

    @CookieBrigade
    CookieBrigade committed Sep 8, 2024
    Configuration menu
    Copy the full SHA
    5d21dc8 View commit details
    Browse the repository at this point in the history

  2. spotless

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

  3. Merge remote-tracking branch 'origin/master' into godforge_finale

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

  4. Merge branch 'master' into godforge_finale

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

  5. curium can be solidified now

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

  6. fix eu/t and parallel not resetting

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

  7. fix milestone window bg not resetting

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

  8. Merge branch 'master' into godforge_finale

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

  9. tie debug mode to config

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

  10. Gorge fixed with jank part 2 (#3129) 

    thats the name of the game
    @CookieBrigade
    CookieBrigade committed Sep 8, 2024
    Configuration menu
    Copy the full SHA
    1b259c3 View commit details
    Browse the repository at this point in the history

  11. Merge branch 'master' into godforge_finale

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

Commits on Sep 9, 2024

  1. Merge remote-tracking branch 'origin/master' into godforge_finale

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

  2. Merge remote-tracking branch 'origin/master' into godforge_finale

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

  3. missed oxygen plasma

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

  4. rework parallel bonus calcs a bit

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

  5. Fix upgrade window rendering, allow nei functions

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

  6. Merge remote-tracking branch 'origin/master' into godforge_finale

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

  7. Gorge stuttering fix (#3136)

    @CookieBrigade
    CookieBrigade committed Sep 9, 2024
    Configuration menu
    Copy the full SHA
    473d577 View commit details
    Browse the repository at this point in the history

  8. Merge remote-tracking branch 'origin/master' into godforge_finale

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

Commits on Sep 10, 2024

  1. Merge branch 'master' into godforge_finale

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

  2. decrease smelting module nei priority

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

  3. make upgrade deconstruction more lenient and fix some structure updat… 

    …e issues
    @GDCloudstrike
    GDCloudstrike committed Sep 10, 2024
    Configuration menu
    Copy the full SHA
    df32c89 View commit details
    Browse the repository at this point in the history

  4. display different text when respec-ing upgrades

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

  5. fix neighboring upgrades not being reset

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

  6. respec localization

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

  7. Merge remote-tracking branch 'origin/master' into godforge_finale

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

Commits on Sep 11, 2024

  1. make exotic module power consumption scale with parallel and add expe… 

    …cted inputs window
    @GDCloudstrike
    GDCloudstrike committed Sep 11, 2024
    Configuration menu
    Copy the full SHA
    9bcc50f View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/master' into godforge_finale

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

  3. Merge remote-tracking branch 'origin/master' into godforge_finale

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

  4. Merge branch 'master' into godforge_finale

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

Commits on Sep 12, 2024

  1. switch specialvalue to metadata and add alternate molten -> plasma re… 

    …cipes
    @GDCloudstrike
    GDCloudstrike committed Sep 12, 2024
    Configuration menu
    Copy the full SHA
    3a768f6 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/godforge_finale' into godforge_f… 

    …inale
    @GDCloudstrike
    GDCloudstrike committed Sep 12, 2024
    Configuration menu
    Copy the full SHA
    889930a View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'origin/master' into godforge_finale

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

  4. Merge branch 'master' into godforge_finale

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

  5. Merge branch 'master' into godforge_finale

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

  6. Merge branch 'master' into godforge_finale

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

  7. make plasma module use recipe metadata

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

  8. refactor exotic module processing logic a bit and add recipe reset bu… 

    …tton
    @GDCloudstrike
    GDCloudstrike committed Sep 12, 2024
    Configuration menu
    Copy the full SHA
    bae3f9e View commit details
    Browse the repository at this point in the history

  9. Merge remote-tracking branch 'origin/godforge_finale' into godforge_f… 

    …inale
    @GDCloudstrike
    GDCloudstrike committed Sep 12, 2024
    Configuration menu
    Copy the full SHA
    cc2e1fa View commit details
    Browse the repository at this point in the history

  10. Merge branch 'master' into godforge_finale

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

Commits on Sep 13, 2024

  1. Merge branch 'master' into godforge_finale

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

  2. Merge branch 'master' into godforge_finale

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

  3. Rewrite Helioflux Module, add NEI support (#3174)

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

  4. fix merge conflicts

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

  5. Merge remote-tracking branch 'origin/godforge_finale' into godforge_f… 

    …inale
    @GDCloudstrike
    GDCloudstrike committed Sep 13, 2024
    Configuration menu
    Copy the full SHA
    250b5e7 View commit details
    Browse the repository at this point in the history

  6. Merge remote-tracking branch 'origin/master' into godforge_finale

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

  7. Merge branch 'master' into godforge_finale

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

  8. add contributors window

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

  9. Merge remote-tracking branch 'origin/godforge_finale' into godforge_f… 

    …inale
    @GDCloudstrike
    GDCloudstrike committed Sep 13, 2024
    Configuration menu
    Copy the full SHA
    009f18a View commit details
    Browse the repository at this point in the history

  10. Merge branch 'master' into godforge_finale

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

Commits on Sep 14, 2024

  1. add crude lines

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

  2. Merge remote-tracking branch 'origin/godforge_finale' into godforge_f… 

    …inale
    @GDCloudstrike
    GDCloudstrike committed Sep 14, 2024
    Configuration menu
    Copy the full SHA
    27198c0 View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'origin/master' into godforge_finale

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

  4. Gorge render mem leak - hopeful fix (#3184)

    @CookieBrigade
    CookieBrigade committed Sep 14, 2024
    Configuration menu
    Copy the full SHA
    787b393 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'master' into godforge_finale

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

  6. Merge branch 'master' into godforge_finale

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

  7. fix duplicated molten module recipes

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

  8. Fix various UI issues 

    - fixed issues with upgrade line sync when completing/respecing upgrades
- fixed the panel not updating when you click another different button in the tree (havent figured out how to avoid repositioning the window yet but looking into it)
- fixed the indivudual upgrade window staying open when you close the upgrade tree window
    @serenibyss
    serenibyss committed Sep 14, 2024
    Configuration menu
    Copy the full SHA
    52b418d View commit details
    Browse the repository at this point in the history

  9. Merge branch 'master' into godforge_finale

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

  10. Merge branch 'master' into godforge_finale

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

  11. attempt to fix merge conflict

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

  12. attempt #2

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

  13. fix logic

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

  14. Merge remote-tracking branch 'origin/master' into godforge_finale 

    # Conflicts:
#	src/main/java/bartworks/MainMod.java
    @GDCloudstrike
    GDCloudstrike committed Sep 14, 2024
    Configuration menu
    Copy the full SHA
    69cb31a View commit details
    Browse the repository at this point in the history

Commits on Sep 15, 2024

  1. Merge branch 'master' into godforge_finale

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

  2. Merge branch 'master' into godforge_finale

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

  3. reviews

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