Skip to content
This repository has been archived by the owner on May 24, 2024. It is now read-only.

Forge of the Gods #225

Merged
merged 176 commits into from
Mar 11, 2024
Merged

Forge of the Gods #225

merged 176 commits into from
Mar 11, 2024

Commits on Mar 15, 2023

  1. Initial commit

    @GDCloudstrike
    GDCloudstrike committed Mar 15, 2023
    Configuration menu
    Copy the full SHA
    8e81429 View commit details
    Browse the repository at this point in the history

  2. Graviton Modulation Casings

    @GDCloudstrike
    GDCloudstrike committed Mar 15, 2023
    Configuration menu
    Copy the full SHA
    1a75eab View commit details
    Browse the repository at this point in the history

Commits on Mar 16, 2023

  1. It forms

    @GDCloudstrike
    GDCloudstrike committed Mar 16, 2023
    Configuration menu
    Copy the full SHA
    926f869 View commit details
    Browse the repository at this point in the history

Commits on Mar 19, 2023

  1. testing cursed things, will rework soon

    @GDCloudstrike
    GDCloudstrike committed Mar 19, 2023
    Configuration menu
    Copy the full SHA
    8e4dcc8 View commit details
    Browse the repository at this point in the history

  2. test better recipe check

    @GDCloudstrike
    GDCloudstrike committed Mar 19, 2023
    Configuration menu
    Copy the full SHA
    0a1fee9 View commit details
    Browse the repository at this point in the history

  3. get rid of cursed stuff

    @GDCloudstrike
    GDCloudstrike committed Mar 19, 2023
    Configuration menu
    Copy the full SHA
    8e31d93 View commit details
    Browse the repository at this point in the history

Commits on Mar 21, 2023

  1. fix OC

    @GDCloudstrike
    GDCloudstrike committed Mar 21, 2023
    Configuration menu
    Copy the full SHA
    74f4297 View commit details
    Browse the repository at this point in the history

Commits on Mar 26, 2023

  1. parameter shenanigans

    @GDCloudstrike
    GDCloudstrike committed Mar 26, 2023
    Configuration menu
    Copy the full SHA
    8d34172 View commit details
    Browse the repository at this point in the history

  2. fuel input hatch

    @GDCloudstrike
    GDCloudstrike committed Mar 26, 2023
    Configuration menu
    Copy the full SHA
    13af4e7 View commit details
    Browse the repository at this point in the history

Commits on Mar 28, 2023

  1. redo fuel drain

    @GDCloudstrike
    GDCloudstrike committed Mar 28, 2023
    Configuration menu
    Copy the full SHA
    9d1beca View commit details
    Browse the repository at this point in the history

Commits on Apr 11, 2023

  1. fluid output

    @GDCloudstrike
    GDCloudstrike committed Apr 11, 2023
    Configuration menu
    Copy the full SHA
    514113f View commit details
    Browse the repository at this point in the history

Commits on Apr 27, 2023

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

    # Conflicts:
#	dependencies.gradle
    @GDCloudstrike
    GDCloudstrike committed Apr 27, 2023
    Configuration menu
    Copy the full SHA
    38d356c View commit details
    Browse the repository at this point in the history

Commits on May 2, 2023

  1. Merge branch 'master' into GodForge

    @GDCloudstrike
    GDCloudstrike committed May 2, 2023
    Configuration menu
    Copy the full SHA
    141f351 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into GodForge

    @GDCloudstrike
    GDCloudstrike committed May 2, 2023
    Configuration menu
    Copy the full SHA
    ba6f393 View commit details
    Browse the repository at this point in the history

Commits on May 5, 2023

  1. add blocks

    @GDCloudstrike
    GDCloudstrike committed May 5, 2023
    Configuration menu
    Copy the full SHA
    f6878fc View commit details
    Browse the repository at this point in the history

  2. run on preload

    @GDCloudstrike
    GDCloudstrike committed May 5, 2023
    Configuration menu
    Copy the full SHA
    b71c8fe View commit details
    Browse the repository at this point in the history

  3. dependency bump

    @GDCloudstrike
    GDCloudstrike committed May 5, 2023
    Configuration menu
    Copy the full SHA
    6cde9e2 View commit details
    Browse the repository at this point in the history

  4. preliminary structure works

    @GDCloudstrike
    GDCloudstrike committed May 5, 2023
    Configuration menu
    Copy the full SHA
    e2bbfca View commit details
    Browse the repository at this point in the history

Commits on Jun 14, 2023

  1. fix some misc things

    @GDCloudstrike
    GDCloudstrike committed Jun 14, 2023
    Configuration menu
    Copy the full SHA
    d7d75ac View commit details
    Browse the repository at this point in the history

Commits on Jun 15, 2023

  1. New class

    @TheEpicGamer274
    TheEpicGamer274 committed Jun 15, 2023
    Configuration menu
    Copy the full SHA
    e13496e View commit details
    Browse the repository at this point in the history

  2. Fix build issue

    @GTNH-Colen
    GTNH-Colen committed Jun 15, 2023
    Configuration menu
    Copy the full SHA
    c25606f View commit details
    Browse the repository at this point in the history

  3. 1 hatch

    @GDCloudstrike
    GDCloudstrike committed Jun 15, 2023
    Configuration menu
    Copy the full SHA
    fcb312f View commit details
    Browse the repository at this point in the history

Commits on Jun 16, 2023

  1. Cleaning up code with seperate class for structure string

    @TheEpicGamer274
    TheEpicGamer274 committed Jun 16, 2023
    Configuration menu
    Copy the full SHA
    5e34d42 View commit details
    Browse the repository at this point in the history

  2. start on modules

    @GDCloudstrike
    GDCloudstrike committed Jun 16, 2023
    Configuration menu
    Copy the full SHA
    372474c View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'origin/GodForge' into GodForge

    @GDCloudstrike
    GDCloudstrike committed Jun 16, 2023
    Configuration menu
    Copy the full SHA
    2ee1ef3 View commit details
    Browse the repository at this point in the history

Commits on Jun 17, 2023

  1. Spotless + Smelting Module Class + BaseModule Changes

    @TheEpicGamer274
    TheEpicGamer274 committed Jun 17, 2023
    Configuration menu
    Copy the full SHA
    3f1edf2 View commit details
    Browse the repository at this point in the history

Commits on Jun 18, 2023

  1. Remove useless import

    @TheEpicGamer274
    TheEpicGamer274 committed Jun 18, 2023
    Configuration menu
    Copy the full SHA
    7d4d104 View commit details
    Browse the repository at this point in the history

Commits on Jun 19, 2023

  1. ...

    @TheEpicGamer274
    TheEpicGamer274 committed Jun 19, 2023
    Configuration menu
    Copy the full SHA
    71d890a View commit details
    Browse the repository at this point in the history

  2. protected

    @GDCloudstrike
    GDCloudstrike committed Jun 19, 2023
    Configuration menu
    Copy the full SHA
    fe85ad0 View commit details
    Browse the repository at this point in the history

  3. trying module things

    @GDCloudstrike
    GDCloudstrike committed Jun 19, 2023
    Configuration menu
    Copy the full SHA
    33299be View commit details
    Browse the repository at this point in the history

  4. add checkRecipe, remove some redundant stuff

    @GDCloudstrike
    GDCloudstrike committed Jun 19, 2023
    Configuration menu
    Copy the full SHA
    cd61a1e View commit details
    Browse the repository at this point in the history

  5. Merge remote-tracking branch 'origin/GodForge' into GodForge

    @GDCloudstrike
    GDCloudstrike committed Jun 19, 2023
    Configuration menu
    Copy the full SHA
    528a080 View commit details
    Browse the repository at this point in the history

  6. Initial commit

    @GDCloudstrike @TheEpicGamer274
    GDCloudstrike authored and TheEpicGamer274 committed Jun 19, 2023
    Configuration menu
    Copy the full SHA
    86d5c06 View commit details
    Browse the repository at this point in the history

  7. Graviton Modulation Casings

    @GDCloudstrike @TheEpicGamer274
    GDCloudstrike authored and TheEpicGamer274 committed Jun 19, 2023
    Configuration menu
    Copy the full SHA
    8a17786 View commit details
    Browse the repository at this point in the history

  8. It forms

    @GDCloudstrike @TheEpicGamer274
    GDCloudstrike authored and TheEpicGamer274 committed Jun 19, 2023
    Configuration menu
    Copy the full SHA
    4e5453e View commit details
    Browse the repository at this point in the history

  9. testing cursed things, will rework soon

    @GDCloudstrike @TheEpicGamer274
    GDCloudstrike authored and TheEpicGamer274 committed Jun 19, 2023
    Configuration menu
    Copy the full SHA
    a128f51 View commit details
    Browse the repository at this point in the history

  10. test better recipe check

    @GDCloudstrike @TheEpicGamer274
    GDCloudstrike authored and TheEpicGamer274 committed Jun 19, 2023
    Configuration menu
    Copy the full SHA
    5f35f89 View commit details
    Browse the repository at this point in the history

  11. get rid of cursed stuff

    @GDCloudstrike @TheEpicGamer274
    GDCloudstrike authored and TheEpicGamer274 committed Jun 19, 2023
    Configuration menu
    Copy the full SHA
    7676c40 View commit details
    Browse the repository at this point in the history

  12. fix OC

    @GDCloudstrike @TheEpicGamer274
    GDCloudstrike authored and TheEpicGamer274 committed Jun 19, 2023
    Configuration menu
    Copy the full SHA
    b8563c6 View commit details
    Browse the repository at this point in the history

  13. parameter shenanigans

    @GDCloudstrike @TheEpicGamer274
    GDCloudstrike authored and TheEpicGamer274 committed Jun 19, 2023
    Configuration menu
    Copy the full SHA
    e2ff845 View commit details
    Browse the repository at this point in the history

  14. fuel input hatch

    @GDCloudstrike @TheEpicGamer274
    GDCloudstrike authored and TheEpicGamer274 committed Jun 19, 2023
    Configuration menu
    Copy the full SHA
    2535abe View commit details
    Browse the repository at this point in the history

  15. redo fuel drain

    @GDCloudstrike @TheEpicGamer274
    GDCloudstrike authored and TheEpicGamer274 committed Jun 19, 2023
    Configuration menu
    Copy the full SHA
    f4976b7 View commit details
    Browse the repository at this point in the history

  16. fluid output

    @GDCloudstrike @TheEpicGamer274
    GDCloudstrike authored and TheEpicGamer274 committed Jun 19, 2023
    Configuration menu
    Copy the full SHA
    8c583d6 View commit details
    Browse the repository at this point in the history

  17. add blocks

    @GDCloudstrike @TheEpicGamer274
    GDCloudstrike authored and TheEpicGamer274 committed Jun 19, 2023
    Configuration menu
    Copy the full SHA
    5546023 View commit details
    Browse the repository at this point in the history

  18. run on preload

    @GDCloudstrike @TheEpicGamer274
    GDCloudstrike authored and TheEpicGamer274 committed Jun 19, 2023
    Configuration menu
    Copy the full SHA
    8ced422 View commit details
    Browse the repository at this point in the history

  19. preliminary structure works

    @GDCloudstrike @TheEpicGamer274
    GDCloudstrike authored and TheEpicGamer274 committed Jun 19, 2023
    Configuration menu
    Copy the full SHA
    6279594 View commit details
    Browse the repository at this point in the history

  20. fix some misc things

    @GDCloudstrike @TheEpicGamer274
    GDCloudstrike authored and TheEpicGamer274 committed Jun 19, 2023
    Configuration menu
    Copy the full SHA
    ff92fbf View commit details
    Browse the repository at this point in the history

  21. New class

    @TheEpicGamer274
    TheEpicGamer274 committed Jun 19, 2023
    Configuration menu
    Copy the full SHA
    f82d586 View commit details
    Browse the repository at this point in the history

  22. 1 hatch

    @GDCloudstrike @TheEpicGamer274
    GDCloudstrike authored and TheEpicGamer274 committed Jun 19, 2023
    Configuration menu
    Copy the full SHA
    e5431bb View commit details
    Browse the repository at this point in the history

  23. start on modules

    @GDCloudstrike @TheEpicGamer274
    GDCloudstrike authored and TheEpicGamer274 committed Jun 19, 2023
    Configuration menu
    Copy the full SHA
    9e72901 View commit details
    Browse the repository at this point in the history

  24. Fix build issue

    @GTNH-Colen @TheEpicGamer274
    GTNH-Colen authored and TheEpicGamer274 committed Jun 19, 2023
    Configuration menu
    Copy the full SHA
    909e599 View commit details
    Browse the repository at this point in the history

  25. Cleaning up code with seperate class for structure string

    @TheEpicGamer274
    TheEpicGamer274 committed Jun 19, 2023
    Configuration menu
    Copy the full SHA
    1548697 View commit details
    Browse the repository at this point in the history

  26. Spotless + Smelting Module Class + BaseModule Changes

    @TheEpicGamer274
    TheEpicGamer274 committed Jun 19, 2023
    Configuration menu
    Copy the full SHA
    ae5521a View commit details
    Browse the repository at this point in the history

  27. Remove useless import

    @TheEpicGamer274
    TheEpicGamer274 committed Jun 19, 2023
    Configuration menu
    Copy the full SHA
    f94c416 View commit details
    Browse the repository at this point in the history

  28. protected

    @GDCloudstrike @TheEpicGamer274
    GDCloudstrike authored and TheEpicGamer274 committed Jun 19, 2023
    Configuration menu
    Copy the full SHA
    3bc8b4b View commit details
    Browse the repository at this point in the history

  29. trying module things

    @GDCloudstrike @TheEpicGamer274
    GDCloudstrike authored and TheEpicGamer274 committed Jun 19, 2023
    Configuration menu
    Copy the full SHA
    8bc2978 View commit details
    Browse the repository at this point in the history

  30. add checkRecipe, remove some redundant stuff

    @GDCloudstrike @TheEpicGamer274
    GDCloudstrike authored and TheEpicGamer274 committed Jun 19, 2023
    Configuration menu
    Copy the full SHA
    8958e55 View commit details
    Browse the repository at this point in the history

  31. ...

    @TheEpicGamer274
    TheEpicGamer274 committed Jun 19, 2023
    Configuration menu
    Copy the full SHA
    4da2917 View commit details
    Browse the repository at this point in the history

  32. New Classes + Modules

    @TheEpicGamer274
    TheEpicGamer274 committed Jun 19, 2023
    Configuration menu
    Copy the full SHA
    9af8aba View commit details
    Browse the repository at this point in the history

  33. Merge remote-tracking branch 'origin/GodForge' into GodForge 

    # Conflicts:
#	dependencies.gradle
#	src/main/java/com/github/technus/tectech/loader/thing/MachineLoader.java
#	src/main/java/com/github/technus/tectech/thing/CustomItemList.java
    @TheEpicGamer274
    TheEpicGamer274 committed Jun 19, 2023
    Configuration menu
    Copy the full SHA
    b81275b View commit details
    Browse the repository at this point in the history

Commits on Jun 20, 2023

  1. Recipe Maps

    @TheEpicGamer274
    TheEpicGamer274 committed Jun 20, 2023
    Configuration menu
    Copy the full SHA
    9d1e6fd View commit details
    Browse the repository at this point in the history

  2. fix deps

    @TheEpicGamer274
    TheEpicGamer274 committed Jun 20, 2023
    Configuration menu
    Copy the full SHA
    62d8683 View commit details
    Browse the repository at this point in the history

  3. recipe map fixes

    @TheEpicGamer274
    TheEpicGamer274 committed Jun 20, 2023
    Configuration menu
    Copy the full SHA
    8fd49d6 View commit details
    Browse the repository at this point in the history

Commits on Jun 21, 2023

  1. make modules connect

    @GDCloudstrike
    GDCloudstrike committed Jun 21, 2023
    Configuration menu
    Copy the full SHA
    69186af View commit details
    Browse the repository at this point in the history

  2. spotless

    @GDCloudstrike
    GDCloudstrike committed Jun 21, 2023
    Configuration menu
    Copy the full SHA
    5163bcd View commit details
    Browse the repository at this point in the history

Commits on Jun 22, 2023

  1. remove recipe functionality + misc cleanup

    @GDCloudstrike
    GDCloudstrike committed Jun 22, 2023
    Configuration menu
    Copy the full SHA
    e32e445 View commit details
    Browse the repository at this point in the history

  2. parallel parameter

    @GDCloudstrike
    GDCloudstrike committed Jun 22, 2023
    Configuration menu
    Copy the full SHA
    20cfc01 View commit details
    Browse the repository at this point in the history

  3. remove unneeded check

    @GDCloudstrike
    GDCloudstrike committed Jun 22, 2023
    Configuration menu
    Copy the full SHA
    9fdbb8f View commit details
    Browse the repository at this point in the history

  4. fix item to fluid conversion + remove parameter

    @GDCloudstrike
    GDCloudstrike committed Jun 22, 2023
    Configuration menu
    Copy the full SHA
    0b0cc32 View commit details
    Browse the repository at this point in the history

  5. outputs appear now

    @GDCloudstrike
    GDCloudstrike committed Jun 22, 2023
    Configuration menu
    Copy the full SHA
    ca7cb6b View commit details
    Browse the repository at this point in the history

  6. remove parallel param

    @GDCloudstrike
    GDCloudstrike committed Jun 22, 2023
    Configuration menu
    Copy the full SHA
    4282f5f View commit details
    Browse the repository at this point in the history

  7. improve scanner info

    @GDCloudstrike
    GDCloudstrike committed Jun 22, 2023
    Configuration menu
    Copy the full SHA
    dab9e77 View commit details
    Browse the repository at this point in the history

  8. parameter adjustment + add onRemoval

    @GDCloudstrike
    GDCloudstrike committed Jun 22, 2023
    Configuration menu
    Copy the full SHA
    13819a3 View commit details
    Browse the repository at this point in the history

  9. parameter followup

    @GDCloudstrike
    GDCloudstrike committed Jun 22, 2023
    Configuration menu
    Copy the full SHA
    20659e1 View commit details
    Browse the repository at this point in the history

Commits on Jun 23, 2023

  1. plasma module (almost) fully works

    @GDCloudstrike
    GDCloudstrike committed Jun 23, 2023
    Configuration menu
    Copy the full SHA
    df9ba98 View commit details
    Browse the repository at this point in the history

  2. attempt at fixing param

    @GDCloudstrike
    GDCloudstrike committed Jun 23, 2023
    Configuration menu
    Copy the full SHA
    a584826 View commit details
    Browse the repository at this point in the history

  3. Fixes & stuff

    @TheEpicGamer274
    TheEpicGamer274 committed Jun 23, 2023
    Configuration menu
    Copy the full SHA
    9dfa790 View commit details
    Browse the repository at this point in the history

  4. Recommendation fixes

    @TheEpicGamer274
    TheEpicGamer274 committed Jun 23, 2023
    Configuration menu
    Copy the full SHA
    44d93b2 View commit details
    Browse the repository at this point in the history

  5. tooltip upgrade

    @TheEpicGamer274
    TheEpicGamer274 committed Jun 23, 2023
    Configuration menu
    Copy the full SHA
    89d9ad7 View commit details
    Browse the repository at this point in the history

  6. Spotless for clean

    @TheEpicGamer274
    TheEpicGamer274 committed Jun 23, 2023
    Configuration menu
    Copy the full SHA
    586ba1b View commit details
    Browse the repository at this point in the history

  7. plasma recipe map

    @GDCloudstrike
    GDCloudstrike committed Jun 23, 2023
    Configuration menu
    Copy the full SHA
    ac4c858 View commit details
    Browse the repository at this point in the history

  8. recipe adder

    @GDCloudstrike
    GDCloudstrike committed Jun 23, 2023
    Configuration menu
    Copy the full SHA
    5bb9086 View commit details
    Browse the repository at this point in the history

  9. first recipes

    @GDCloudstrike
    GDCloudstrike committed Jun 23, 2023
    Configuration menu
    Copy the full SHA
    0c8eab8 View commit details
    Browse the repository at this point in the history

  10. use new recipe map

    @GDCloudstrike
    GDCloudstrike committed Jun 23, 2023
    Configuration menu
    Copy the full SHA
    6fe107c View commit details
    Browse the repository at this point in the history

  11. Recipe map change stuff

    @TheEpicGamer274
    TheEpicGamer274 committed Jun 23, 2023
    Configuration menu
    Copy the full SHA
    353082f View commit details
    Browse the repository at this point in the history

Commits on Jun 24, 2023

  1. recipe map fixes

    @TheEpicGamer274
    TheEpicGamer274 committed Jun 24, 2023
    Configuration menu
    Copy the full SHA
    c7fd3ef View commit details
    Browse the repository at this point in the history

  2. some quick fixes

    @TheEpicGamer274
    TheEpicGamer274 committed Jun 24, 2023
    Configuration menu
    Copy the full SHA
    8a9a60c View commit details
    Browse the repository at this point in the history

  3. Spotless

    @TheEpicGamer274
    TheEpicGamer274 committed Jun 24, 2023
    Configuration menu
    Copy the full SHA
    57c74d3 View commit details
    Browse the repository at this point in the history

Commits on Jun 27, 2023

  1. fix null checks

    @GDCloudstrike
    GDCloudstrike committed Jun 27, 2023
    Configuration menu
    Copy the full SHA
    6cede20 View commit details
    Browse the repository at this point in the history

  2. batch size

    @GDCloudstrike
    GDCloudstrike committed Jun 27, 2023
    Configuration menu
    Copy the full SHA
    98965e0 View commit details
    Browse the repository at this point in the history

  3. add input separation

    @GDCloudstrike
    GDCloudstrike committed Jun 27, 2023
    Configuration menu
    Copy the full SHA
    36e1ede View commit details
    Browse the repository at this point in the history

  4. add batch mode parameter and functionality

    @GDCloudstrike
    GDCloudstrike committed Jun 27, 2023
    Configuration menu
    Copy the full SHA
    e243a21 View commit details
    Browse the repository at this point in the history

  5. spotless

    @GDCloudstrike
    GDCloudstrike committed Jun 27, 2023
    Configuration menu
    Copy the full SHA
    04e9e69 View commit details
    Browse the repository at this point in the history

Commits on Jun 29, 2023

  1. first recipe addition loops

    @GDCloudstrike
    GDCloudstrike committed Jun 29, 2023
    Configuration menu
    Copy the full SHA
    e8f1a19 View commit details
    Browse the repository at this point in the history

Commits on Jul 10, 2023

  1. start on ui (add button)

    @GDCloudstrike
    GDCloudstrike committed Jul 10, 2023
    Configuration menu
    Copy the full SHA
    ac7d534 View commit details
    Browse the repository at this point in the history

  2. spotless

    @GDCloudstrike
    GDCloudstrike committed Jul 10, 2023
    Configuration menu
    Copy the full SHA
    df6c707 View commit details
    Browse the repository at this point in the history

  3. add rendering block

    @GDCloudstrike
    GDCloudstrike committed Jul 10, 2023
    Configuration menu
    Copy the full SHA
    9945506 View commit details
    Browse the repository at this point in the history

  4. render tile

    @GDCloudstrike
    GDCloudstrike committed Jul 10, 2023
    Configuration menu
    Copy the full SHA
    1554966 View commit details
    Browse the repository at this point in the history

  5. more rendering

    @GDCloudstrike
    GDCloudstrike committed Jul 10, 2023
    Configuration menu
    Copy the full SHA
    1ab889d View commit details
    Browse the repository at this point in the history

  6. summon render block

    @GDCloudstrike
    GDCloudstrike committed Jul 10, 2023
    Configuration menu
    Copy the full SHA
    358b8f1 View commit details
    Browse the repository at this point in the history

  7. spotless again

    @GDCloudstrike
    GDCloudstrike committed Jul 10, 2023
    Configuration menu
    Copy the full SHA
    ceadf65 View commit details
    Browse the repository at this point in the history

  8. greyscale

    @GDCloudstrike
    GDCloudstrike committed Jul 10, 2023
    Configuration menu
    Copy the full SHA
    07900f2 View commit details
    Browse the repository at this point in the history

  9. lighter

    @GDCloudstrike
    GDCloudstrike committed Jul 10, 2023
    Configuration menu
    Copy the full SHA
    88a250e View commit details
    Browse the repository at this point in the history

  10. why is rendering a pain

    @BlueWeabo
    BlueWeabo committed Jul 10, 2023
    Configuration menu
    Copy the full SHA
    d6fe23d View commit details
    Browse the repository at this point in the history

Commits on Jul 23, 2023

  1. fix merge conflicts

    @GDCloudstrike
    GDCloudstrike committed Jul 23, 2023
    Configuration menu
    Copy the full SHA
    16260a4 View commit details
    Browse the repository at this point in the history

  2. is this the conflict?

    @GDCloudstrike
    GDCloudstrike committed Jul 23, 2023
    Configuration menu
    Copy the full SHA
    480fe2e View commit details
    Browse the repository at this point in the history

  3. spotless

    @GDCloudstrike
    GDCloudstrike committed Jul 23, 2023
    Configuration menu
    Copy the full SHA
    e5176c4 View commit details
    Browse the repository at this point in the history

Commits on Jul 25, 2023

  1. merge conflict again :pensib:

    @GDCloudstrike
    GDCloudstrike committed Jul 25, 2023
    Configuration menu
    Copy the full SHA
    8d09b55 View commit details
    Browse the repository at this point in the history

  2. start on upgrade gui

    @GDCloudstrike
    GDCloudstrike committed Jul 25, 2023
    Configuration menu
    Copy the full SHA
    5cb3c82 View commit details
    Browse the repository at this point in the history

Commits on Aug 2, 2023

  1. more upgrade gui things

    @GDCloudstrike
    GDCloudstrike committed Aug 2, 2023
    Configuration menu
    Copy the full SHA
    6101ccd View commit details
    Browse the repository at this point in the history

Commits on Aug 3, 2023

  1. saving

    @TheEpicGamer274
    TheEpicGamer274 committed Aug 3, 2023
    Configuration menu
    Copy the full SHA
    38eb8f2 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/GodForge' into GodForge

    @TheEpicGamer274
    TheEpicGamer274 committed Aug 3, 2023
    Configuration menu
    Copy the full SHA
    a2ea9ca View commit details
    Browse the repository at this point in the history

Commits on Dec 4, 2023

  1. Merge branch 'master' into GodForge 

    # Conflicts:
#	dependencies.gradle
#	src/main/java/com/github/technus/tectech/TecTech.java
#	src/main/java/com/github/technus/tectech/loader/recipe/BaseRecipeLoader.java
#	src/main/java/com/github/technus/tectech/loader/thing/MachineLoader.java
#	src/main/java/com/github/technus/tectech/proxy/ClientProxy.java
#	src/main/java/com/github/technus/tectech/recipe/TT_recipe.java
#	src/main/java/com/github/technus/tectech/recipe/TT_recipeAdder.java
#	src/main/java/com/github/technus/tectech/thing/CustomItemList.java
#	src/main/java/com/github/technus/tectech/thing/block/RenderEyeOfHarmony.java
#	src/main/java/com/github/technus/tectech/thing/casing/TT_Container_Casings.java
#	src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_MetaTileEntity_MultiblockBase_EM.java
    @GDCloudstrike
    GDCloudstrike committed Dec 4, 2023
    Configuration menu
    Copy the full SHA
    c460651 View commit details
    Browse the repository at this point in the history

Commits on Dec 5, 2023

  1. resolve merge conflicts & crashes

    @GDCloudstrike
    GDCloudstrike committed Dec 5, 2023
    Configuration menu
    Copy the full SHA
    2e190ae View commit details
    Browse the repository at this point in the history

Commits on Dec 10, 2023

  1. redo added blocks + add new ones + some tooltip stuff

    @GDCloudstrike
    GDCloudstrike committed Dec 10, 2023
    Configuration menu
    Copy the full SHA
    6d4c33d View commit details
    Browse the repository at this point in the history

Commits on Dec 11, 2023

  1. more tooltip stuff

    @GDCloudstrike
    GDCloudstrike committed Dec 11, 2023
    Configuration menu
    Copy the full SHA
    cc2f27e View commit details
    Browse the repository at this point in the history

Commits on Jan 24, 2024

  1. one more casing

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

  2. forgot this

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

  3. redo module processing logic

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

Commits on Jan 25, 2024

  1. migrate to wirelessNetworkManager

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

  2. quark gluon -> exotic

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

  3. forgot achievements

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

Commits on Jan 27, 2024

  1. adjust plasma module recipemap to prepare for upgrades

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

  2. migrate to nice mui gui

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

  3. some more plasma recipemap changes

    @GDCloudstrike
    GDCloudstrike committed Jan 27, 2024
    Configuration menu
    Copy the full SHA
    378dbaa View commit details
    Browse the repository at this point in the history

  4. eve more plasma recipemap changes, yay

    @GDCloudstrike
    GDCloudstrike committed Jan 27, 2024
    Configuration menu
    Copy the full SHA
    35e8967 View commit details
    Browse the repository at this point in the history

  5. everyone loves plasma recipemap changes

    @GDCloudstrike
    GDCloudstrike committed Jan 27, 2024
    Configuration menu
    Copy the full SHA
    231159d View commit details
    Browse the repository at this point in the history

  6. they never end, do they

    @GDCloudstrike
    GDCloudstrike committed Jan 27, 2024
    Configuration menu
    Copy the full SHA
    057c311 View commit details
    Browse the repository at this point in the history

Commits on Feb 5, 2024

  1. exotic module recipes (wip)

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

  2. exotic module recipe processing (mostly works)

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

Commits on Feb 6, 2024

  1. prevent duplicate materials

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

  2. make input sizes random

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

  3. fix gt++ material conversions

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

  4. nbt data things

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

Commits on Feb 11, 2024

  1. start on magmatter mode + misc stuff

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

  2. more magmatter work

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

Commits on Feb 13, 2024

  1. no need for putIfAbsent + added awdr and runite

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

  2. load recipemap from nbt

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

Commits on Feb 14, 2024

  1. getFluidsStored -> inputFluids

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

Commits on Feb 20, 2024

  1. add upgrades and make them scrollable

    @GDCloudstrike
    GDCloudstrike committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    f68751e View commit details
    Browse the repository at this point in the history

  2. assign window colors to upgrades

    @GDCloudstrike
    GDCloudstrike committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    c4da032 View commit details
    Browse the repository at this point in the history

Commits on Feb 21, 2024

  1. green background

    @GDCloudstrike
    GDCloudstrike committed Feb 21, 2024
    Configuration menu
    Copy the full SHA
    92f11e4 View commit details
    Browse the repository at this point in the history

  2. green background

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

Commits on Feb 23, 2024

  1. redo upgrade IDs and add boolean array for storing whether they are a… 

    …ctive
    @GDCloudstrike
    GDCloudstrike committed Feb 23, 2024
    Configuration menu
    Copy the full SHA
    9f6ecb6 View commit details
    Browse the repository at this point in the history

Commits on Feb 24, 2024

  1. implement system to restrict the order which upgrades can be bought in

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

Commits on Feb 25, 2024

  1. add split functionality

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

  2. switch to constants

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

Commits on Feb 27, 2024

  1. reset button tooltip + change texture of upgrade if active

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

Commits on Mar 4, 2024

  1. some cleanup + new fuel config

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

  2. button BGs, altered power switch + localisation

    @GDCloudstrike
    GDCloudstrike committed Mar 4, 2024
    Configuration menu
    Copy the full SHA
    153be36 View commit details
    Browse the repository at this point in the history

Commits on Mar 7, 2024

  1. fuel config window + save everything to nbt + random stuff

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

  2. new helper class + fuel calculations

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

  3. heat calculations + some molten module logic adjustments

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

Commits on Mar 9, 2024

  1. more calculations, fuel hatch removal, transfer values to modules, in… 

    …ternal fuel battery
    @GDCloudstrike
    GDCloudstrike committed Mar 9, 2024
    Configuration menu
    Copy the full SHA
    3be3c2f View commit details
    Browse the repository at this point in the history

  2. use values in module processing

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

  3. switch to UUID

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

  4. switch to numericWidget

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

Commits on Mar 10, 2024

  1. fix speedbonus being infinite sometimes

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

  2. move method over to godforgeMath + very minor exotic module changes

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

  3. remove this so it actually loads

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

  4. new texture

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

  5. switch to processInitialSettings

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

  6. remove wireless energy things

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

  7. add furnace mode

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

  8. mode localisation

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

Commits on Mar 11, 2024

  1. remove author tag

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

  2. scala bad (switch away from scala arrays)

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

  3. nuke all star imports (& godforge recipemap)

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

  4. minor wording changes

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

  5. add mod checks

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

  6. mod check

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

  7. revert star textures

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

  8. return widget

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

  9. dont return object types

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

  10. forgot I even enabled debug, whoops

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

  11. remove unnecessary GL11 calls

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