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.

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

Fusion display #16

Merged
merged 4 commits into from
Jul 5, 2021
Merged

Fusion display #16

merged 4 commits into from
Jul 5, 2021

Conversation

ALongStringOfNumbers
Copy link
Contributor

What:
Improves the display of the fusion reactor in JEI, adding a way to display the teiring by fusion reactor. This display is also open for addons to add to.

How solved:
Expands the FusionEUToStartProperty to take in the tier of the fusion reactor and a short display string to display in JEI. Also changes eu_to_start property to a long to match the fact that energy was changed to a long previously

Outcome:
Improves display of Fusion Reactors in JEI

Additional info:
java_2021-07-04_00-27-07

# Conflicts:
#	src/main/java/gregtech/common/items/MetaItem2.java
#	src/main/java/gregtech/loaders/recipe/ComponentRecipes.java
#	src/main/resources/assets/gregtech/lang/en_us.lang
# Conflicts:
#	src/main/java/gregtech/loaders/recipe/ComponentRecipes.java
@serenibyss serenibyss merged commit b9eda2a into master Jul 5, 2021
@serenibyss serenibyss deleted the fusionDisplay branch July 5, 2021 17:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants