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

Medical Conditions #1343

Merged
merged 26 commits into from
Jun 12, 2024
Merged

Medical Conditions #1343

merged 26 commits into from
Jun 12, 2024

Commits on May 29, 2024

  1. Medical Conditions progress 

    This won't compile because WIP
    @Markh3tr
    Markh3tr committed May 29, 2024
    Configuration menu
    Copy the full SHA
    beb3144 View commit details
    Browse the repository at this point in the history

Commits on May 30, 2024

  1. Merge branch 'GregTechCEu:1.20.1' into medical-conditions

    @Markh3tr
    Markh3tr authored May 30, 2024
    Configuration menu
    Copy the full SHA
    8d3df2f View commit details
    Browse the repository at this point in the history

Commits on May 31, 2024

  1. More MedicalCondition Shit

    @Markh3tr
    Markh3tr committed May 31, 2024
    Configuration menu
    Copy the full SHA
    6136ce8 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/medical-conditions' into medical… 

    …-conditions
    @Markh3tr
    Markh3tr committed May 31, 2024
    Configuration menu
    Copy the full SHA
    cf085ad View commit details
    Browse the repository at this point in the history

  3. Merge branch 'refs/heads/1.20.1' into medical-conditions 

    # Conflicts:
#	src/main/java/com/gregtechceu/gtceu/api/data/chemical/material/properties/HazardProperty.java
#	src/main/java/com/gregtechceu/gtceu/forge/ForgeCommonEventListener.java
    @Markh3tr
    Markh3tr committed May 31, 2024
    Configuration menu
    Copy the full SHA
    71133e2 View commit details
    Browse the repository at this point in the history

  4. removed non-existing import

    @Markh3tr
    Markh3tr committed May 31, 2024
    Configuration menu
    Copy the full SHA
    6fb74e9 View commit details
    Browse the repository at this point in the history

Commits on Jun 1, 2024

  1. shit actually does smth now

    @Markh3tr
    Markh3tr committed Jun 1, 2024
    Configuration menu
    Copy the full SHA
    def1b1a View commit details
    Browse the repository at this point in the history

Commits on Jun 7, 2024

  1. Merge branch 'refs/heads/1.20.1' into sc/medical-conditions-help 

    # Conflicts:
#	src/main/java/com/gregtechceu/gtceu/api/data/chemical/material/Material.java
#	src/main/java/com/gregtechceu/gtceu/common/data/GTItems.java
    @screret
    screret committed Jun 7, 2024
    Configuration menu
    Copy the full SHA
    14c7400 View commit details
    Browse the repository at this point in the history

  2. complete work on medical conditions

    @screret
    screret committed Jun 7, 2024
    Configuration menu
    Copy the full SHA
    9b030ea View commit details
    Browse the repository at this point in the history

  3. add more commands for medical conditions

    @screret
    screret committed Jun 7, 2024
    Configuration menu
    Copy the full SHA
    98288ec View commit details
    Browse the repository at this point in the history

  4. run datagen

    @screret
    screret committed Jun 7, 2024
    Configuration menu
    Copy the full SHA
    507e0a3 View commit details
    Browse the repository at this point in the history

  5. add death messages for all medical conditions

    @screret
    screret committed Jun 7, 2024
    Configuration menu
    Copy the full SHA
    0dfbf18 View commit details
    Browse the repository at this point in the history

  6. apply spotless

    @screret
    screret committed Jun 7, 2024
    Configuration menu
    Copy the full SHA
    dd845c6 View commit details
    Browse the repository at this point in the history

  7. Merge pull request #1 from GregTechCEu/sc/medical-conditions-help 

    medical conditions help
    @Markh3tr
    Markh3tr authored Jun 7, 2024
    Configuration menu
    Copy the full SHA
    bb48e09 View commit details
    Browse the repository at this point in the history

Commits on Jun 8, 2024

  1. add KJS accessors for medical conditions to allow creating new ones i… 

    …n KubeJS
    @screret
    screret committed Jun 8, 2024
    Configuration menu
    Copy the full SHA
    154407e View commit details
    Browse the repository at this point in the history

  2. add hunger as a symptom

    @screret
    screret committed Jun 8, 2024
    Configuration menu
    Copy the full SHA
    295e4f7 View commit details
    Browse the repository at this point in the history

  3. add carbon monoxide poisoning

    @screret
    screret committed Jun 8, 2024
    Configuration menu
    Copy the full SHA
    05091ec View commit details
    Browse the repository at this point in the history

  4. mixed system?

    @screret
    screret committed Jun 8, 2024
    Configuration menu
    Copy the full SHA
    887918d View commit details
    Browse the repository at this point in the history

  5. nvm no mixed system

    @screret
    screret committed Jun 8, 2024
    Configuration menu
    Copy the full SHA
    38fdc49 View commit details
    Browse the repository at this point in the history

  6. add environmental hazards (toggleable in config)

    @screret
    screret committed Jun 8, 2024
    Configuration menu
    Copy the full SHA
    1e56471 View commit details
    Browse the repository at this point in the history

  7. add air scrubbers for cleaning environmental hazards

    @screret
    screret committed Jun 8, 2024
    Configuration menu
    Copy the full SHA
    3002526 View commit details
    Browse the repository at this point in the history

  8. add particles

    @screret
    screret committed Jun 8, 2024
    Configuration menu
    Copy the full SHA
    7bc1c63 View commit details
    Browse the repository at this point in the history

  9. add vents for moving environmental hazards. 

    out of sight, out of mind
    @screret
    screret committed Jun 8, 2024
    Configuration menu
    Copy the full SHA
    9c71342 View commit details
    Browse the repository at this point in the history

Commits on Jun 9, 2024

  1. localized hazards (e.g. radiation)

    @screret
    screret committed Jun 9, 2024
    Configuration menu
    Copy the full SHA
    9ad0825 View commit details
    Browse the repository at this point in the history

Commits on Jun 11, 2024

  1. localized hazards shouldn't spread by default

    @screret
    screret committed Jun 11, 2024
    Configuration menu
    Copy the full SHA
    e34129a View commit details
    Browse the repository at this point in the history

Commits on Jun 12, 2024

  1. Merge branch '1.20.1' into medical-conditions

    @screret
    screret authored Jun 12, 2024
    Configuration menu
    Copy the full SHA
    e4a1d98 View commit details
    Browse the repository at this point in the history