Skip to content

[ref:seggan/feature/elektrikity] ELEKTRIKITY - #971

Merged
Seggan merged 117 commits into
idra/boilersfrom
seggan/feature/elektrikity
Sep 29, 2026
Merged

Seggan merged 117 commits into
idra/boilersfrom
seggan/feature/elektrikity

Conversation

@Seggan

@Seggan Seggan commented May 5, 2026 •

Copy link
Copy Markdown
Member

See #987 section "Foundational Pylon PR"

@Seggan

Seggan commented Jul 7, 2026

Copy link
Copy Markdown
Member Author

Quarries appear to now be trying to mine air? Not 100% sure if that was introduced by this PR

This is fine cause getBreakTicks returns null for air anyway. But I'll exclude it explicity.

Seggan added 3 commits July 7, 2026 16:35
…e/elektrikity

# Conflicts:
#	src/main/java/io/github/pylonmc/pylon/PylonFluids.java
#	src/main/resources/lang/en.yml
#	src/main/resources/recipes/minecraft/crafting_shaped.yml
@Seggan
Seggan requested a review from LordIdra August 25, 2026 16:47
@Seggan

Seggan commented Aug 25, 2026

Copy link
Copy Markdown
Member Author

Added displays/animations to every iron block machine except brick molder and pipe bender

@LordIdra LordIdra left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Missing fluid keys

Image

Capacitors do not appear to work

Comment thread src/main/resources/lang/en.yml Resolved
…e/elektrikity

# Conflicts:
#	src/main/java/io/github/pylonmc/pylon/PylonFluids.java
#	src/main/java/io/github/pylonmc/pylon/PylonRecipes.java
#	src/main/java/io/github/pylonmc/pylon/content/machines/cargo/CargoMeter.java
#	src/main/java/io/github/pylonmc/pylon/content/machines/diesel/machines/PalladiumCondenser.java
#	src/main/java/io/github/pylonmc/pylon/content/machines/fluid/FluidMeter.java
#	src/main/java/io/github/pylonmc/pylon/content/machines/fluid/PortableFluidTank.java
#	src/main/java/io/github/pylonmc/pylon/content/machines/simple/Collimator.java
#	src/main/java/io/github/pylonmc/pylon/content/machines/smelting/Bloomery.java
#	src/main/java/io/github/pylonmc/pylon/content/machines/smelting/SmelteryBurner.java
#	src/main/java/io/github/pylonmc/pylon/content/machines/smelting/SmelteryController.java
#	src/main/java/io/github/pylonmc/pylon/content/tools/HydraulicCannon.java
#	src/main/java/io/github/pylonmc/pylon/guide/HydraulicRefuelableItemsPage.java
#	src/main/java/io/github/pylonmc/pylon/recipes/SiloConverterRecipe.java
#	src/main/resources/lang/en.yml
@Seggan
Seggan requested a review from LordIdra September 16, 2026 20:47
@Seggan
Seggan merged commit 999b030 into master Sep 29, 2026
2 checks passed
@Seggan
Seggan deleted the seggan/feature/elektrikity branch September 29, 2026 19:39
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.

4 participants