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

Conversation

Markh3tr
Copy link
Contributor

betterer hazard effects.
I'll write some better desc when I get to it

@Markh3tr Markh3tr changed the title Medical Conditions progress Medical Conditions May 31, 2024
Markh3tr and others added 12 commits June 1, 2024 00:47
@Markh3tr
More MedicalCondition Shit
6136ce8
@Markh3tr
Merge remote-tracking branch 'origin/medical-conditions' into medical…
cf085ad 
…-conditions
@Markh3tr
Merge branch 'refs/heads/1.20.1' into medical-conditions
71133e2 
# Conflicts:
#	src/main/java/com/gregtechceu/gtceu/api/data/chemical/material/properties/HazardProperty.java
#	src/main/java/com/gregtechceu/gtceu/forge/ForgeCommonEventListener.java
@Markh3tr
removed non-existing import
6fb74e9
@Markh3tr
shit actually does smth now
def1b1a
@screret
Merge branch 'refs/heads/1.20.1' into sc/medical-conditions-help
14c7400 
# Conflicts:
#	src/main/java/com/gregtechceu/gtceu/api/data/chemical/material/Material.java
#	src/main/java/com/gregtechceu/gtceu/common/data/GTItems.java
@screret
complete work on medical conditions
9b030ea
@screret
add more commands for medical conditions
98288ec
@screret
run datagen
507e0a3
@screret
add death messages for all medical conditions
0dfbf18
@screret
apply spotless
dd845c6
@Markh3tr
Merge pull request #1 from GregTechCEu/sc/medical-conditions-help
bb48e09 
medical conditions help
@Markh3tr Markh3tr marked this pull request as ready for review June 7, 2024 20:28
@Markh3tr Markh3tr requested a review from a team as a code owner June 7, 2024 20:28
mikerooni
mikerooni reviewed Jun 8, 2024
View reviewed changes
Copy link
Member

@mikerooni mikerooni left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've left a suggestion for improving formatting in a hard to read place, but other than that it looks good to me so far!

src/main/java/com/gregtechceu/gtceu/api/data/medicalcondition/MedicalCondition.java Outdated Show resolved Hide resolved
src/main/java/com/gregtechceu/gtceu/api/data/medicalcondition/Symptom.java Outdated Show resolved Hide resolved
stanieldev
stanieldev reviewed Jun 9, 2024
View reviewed changes
Copy link
Member

@stanieldev stanieldev left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

screret
screret approved these changes Jun 11, 2024
View reviewed changes
Copy link
Member

@screret screret left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it looked good to @stanieldev and @mikerooni so LGTM

@YoungOnionMC
Copy link
Contributor

looks good to merge

@screret screret merged commit e6ee26d into GregTechCEu:1.20.1 Jun 12, 2024
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mikerooni mikerooni mikerooni left review comments

@stanieldev stanieldev stanieldev left review comments

@screret screret screret approved these changes

@YoungOnionMC YoungOnionMC YoungOnionMC approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@Markh3tr @YoungOnionMC @stanieldev @screret @mikerooni