BallOfEnergy 52b781ea9f Merge remote-tracking branch 'upstream/master' into Optimization ...

# Conflicts:
#	src/main/java/api/hbm/energymk2/IEnergyReceiverMK2.java
#	src/main/java/com/hbm/items/weapon/ItemAmmoArty.java
#	src/main/java/com/hbm/items/weapon/sedna/factory/ConfettiUtil.java
#	src/main/java/com/hbm/tileentity/machine/TileEntityMachineRotaryFurnace.java

2025-03-07 22:06:13 -06:00

..

container

Merge remote-tracking branch 'refs/remotes/upstream/master' into Optimization

2025-02-09 18:02:29 -06:00

fluid

alright i'm tired

2025-03-05 21:58:20 +01:00

gui

Merge remote-tracking branch 'upstream/master' into Optimization

2025-03-07 22:06:13 -06:00

material

Merge pull request #1905 from 70000hp/Aluminium-fifth-attempt-at-merging

2025-02-02 17:29:49 +01:00

recipes

compat for (hopefully) robust external recipe registering

2025-03-06 14:25:30 +01:00

FluidContainer.java

just like 800 errors left

2022-01-11 23:40:34 +01:00

FluidContainerRegistry.java

fixes, flixes and foxes

2024-02-19 15:55:48 +01:00

FluidStack.java

compressor recipes

2023-06-21 21:47:20 +02:00

OreDictManager.java

my bones

2025-01-29 16:32:23 -05:00

RecipesCommon.java

recipe crap

2024-11-06 16:37:34 +01:00

SlotCraftingOutput.java

artillery gas shells

2023-06-08 16:51:54 +02:00

SlotDeprecated.java

Modify GUIs for existing machines that require compressors

2024-04-10 10:21:33 +10:00

SlotNonRetarded.java

my ass is bleeding

2024-10-16 17:00:07 +02:00

SlotPattern.java

the man

2022-05-29 00:57:08 +02:00

SlotSmelting.java

detonator improvements, large pylon, more dynamite

2022-01-02 18:33:40 +01:00

SlotTakeOnly.java

fixed forge's broken ass item stats

2023-03-20 10:59:12 +01:00

SlotUpgrade.java

liquefactor machine

2022-01-30 00:20:59 +01:00

UpgradeManagerNT.java

Upgrade rework, now with 3463% more caching!

2024-10-14 22:00:39 -05:00