BallOfEnergy
|
0a59fa86a0
|
Merge remote-tracking branch 'upstream/master' into Optimization
# Conflicts:
# src/main/java/api/hbm/fluid/IFluidConnector.java
# src/main/java/api/hbm/fluid/IFluidUser.java
# src/main/java/com/hbm/tileentity/machine/TileEntityWatz.java
# src/main/java/com/hbm/tileentity/machine/storage/TileEntityMachineFluidTank.java
|
2025-03-19 13:28:38 -05:00 |
|
Bob
|
0ca1be3d6f
|
goober
|
2025-03-09 22:03:34 +01:00 |
|
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 |
|
70000hp
|
1574f90a4d
|
Merge branch 'master' into windows-95
|
2025-02-27 16:59:03 -05:00 |
|
Dosh
|
b28cb312dc
|
fixed rotary furnace not saving output material
|
2025-02-20 16:39:19 +11:00 |
|
Dosh
|
c12948b330
|
automatic formatting
|
2025-02-20 16:37:50 +11:00 |
|
70000hp
|
3a7e974541
|
adjustments
|
2025-02-11 18:17:29 -05:00 |
|
70000hp
|
89fe899f2a
|
Rotary Furnace Fuel Tweak
Better fuels speed up the rotary furnace, but require more steam
Steam requirements scale with speed nonlinearly, being x^1.5
|
2025-02-11 17:50:35 -05:00 |
|
BallOfEnergy
|
aceb313fec
|
Merge remote-tracking branch 'refs/remotes/upstream/master' into Optimization
# Conflicts:
# src/main/java/com/hbm/handler/WeaponAbility.java
# src/main/java/com/hbm/items/weapon/sedna/factory/Orchestras.java
# src/main/java/com/hbm/tileentity/TileEntityLoadedBase.java
# src/main/java/com/hbm/tileentity/machine/TileEntityMachineRotaryFurnace.java
|
2025-02-09 18:02:29 -06:00 |
|
Bob
|
5341f5d255
|
EOTT
|
2025-02-09 18:38:30 +01:00 |
|
BallOfEnergy
|
642945e7ac
|
Merge branch 'HbmMods:master' into Optimization
|
2025-01-13 08:16:55 -06:00 |
|
BallOfEnergy
|
9fa148c218
|
just in case I disappear, here's particle threading and crate backpacks, along with spider crates, though opening a spider crate in the inventory will not spawn spiders yet.
|
2025-01-12 19:21:17 -06:00 |
|
Boblet
|
d4c0cb017a
|
spoingus
|
2025-01-08 16:47:43 +01:00 |
|
Bob
|
ba12143cc8
|
🅱️alls
|
2025-01-05 22:37:16 +01:00 |
|
Boblet
|
a1401b47e2
|
my ass is bleeding
|
2024-10-16 17:00:07 +02:00 |
|
Bob
|
75df8fb945
|
ATLAS
|
2024-10-01 21:35:43 +02:00 |
|
Bob
|
6cddb3e238
|
NEI stuff, textures
|
2024-09-30 22:12:21 +02:00 |
|
Bob
|
a6f694b7b3
|
GUNMETAL
|
2024-09-29 20:56:11 +02:00 |
|
Bob
|
ee895c9bfc
|
WAR
|
2024-09-26 21:33:17 +02:00 |
|