BallOfEnergy
e7b5240a9d
Merge remote-tracking branch 'upstream/master' into Optimization
...
# Conflicts:
# src/main/java/com/hbm/tileentity/bomb/TileEntityNukeBalefire.java
# src/main/java/com/hbm/tileentity/machine/TileEntityAshpit.java
# src/main/java/com/hbm/tileentity/machine/TileEntityChungus.java
# src/main/java/com/hbm/tileentity/machine/TileEntityCondenser.java
# src/main/java/com/hbm/tileentity/machine/TileEntityCore.java
# src/main/java/com/hbm/tileentity/machine/TileEntityDiFurnace.java
# src/main/java/com/hbm/tileentity/machine/TileEntityDiFurnaceRTG.java
# src/main/java/com/hbm/tileentity/machine/TileEntityElectrolyser.java
# src/main/java/com/hbm/tileentity/machine/TileEntityFurnaceIron.java
# src/main/java/com/hbm/tileentity/machine/TileEntityFurnaceSteel.java
# src/main/java/com/hbm/tileentity/machine/TileEntityHeatBoiler.java
# src/main/java/com/hbm/tileentity/machine/TileEntityHeatBoilerIndustrial.java
# src/main/java/com/hbm/tileentity/machine/TileEntityHeaterHeatex.java
# src/main/java/com/hbm/tileentity/machine/TileEntityMachineAutosaw.java
# src/main/java/com/hbm/tileentity/machine/TileEntityMachineCombustionEngine.java
# src/main/java/com/hbm/tileentity/machine/TileEntityMachineCompressor.java
# src/main/java/com/hbm/tileentity/machine/TileEntityMachineDiesel.java
# src/main/java/com/hbm/tileentity/machine/TileEntityMachineEPress.java
# src/main/java/com/hbm/tileentity/machine/TileEntityMachineHephaestus.java
# src/main/java/com/hbm/tileentity/machine/TileEntityMachineMixer.java
# src/main/java/com/hbm/tileentity/machine/TileEntityMachinePlasmaHeater.java
# src/main/java/com/hbm/tileentity/machine/TileEntityMachinePress.java
# src/main/java/com/hbm/tileentity/machine/TileEntityMachinePumpBase.java
# src/main/java/com/hbm/tileentity/machine/TileEntityMachineRadGen.java
# src/main/java/com/hbm/tileentity/machine/TileEntityMachineRadiolysis.java
# src/main/java/com/hbm/tileentity/machine/TileEntityMachineSchrabidiumTransmutator.java
# src/main/java/com/hbm/tileentity/machine/TileEntityMachineSolderingStation.java
# src/main/java/com/hbm/tileentity/machine/TileEntityMachineStrandCaster.java
# src/main/java/com/hbm/tileentity/machine/TileEntityMachineTurbofan.java
# src/main/java/com/hbm/tileentity/machine/TileEntitySoyuzLauncher.java
# src/main/java/com/hbm/tileentity/machine/TileEntitySteamEngine.java
# src/main/java/com/hbm/tileentity/machine/oil/TileEntityMachineCatalyticCracker.java
# src/main/java/com/hbm/tileentity/machine/oil/TileEntityMachineCatalyticReformer.java
# src/main/java/com/hbm/tileentity/machine/oil/TileEntityMachineCoker.java
# src/main/java/com/hbm/tileentity/machine/oil/TileEntityMachineGasFlare.java
# src/main/java/com/hbm/tileentity/machine/oil/TileEntityMachineLiquefactor.java
# src/main/java/com/hbm/tileentity/machine/oil/TileEntityMachineRefinery.java
# src/main/java/com/hbm/tileentity/machine/oil/TileEntityMachineSolidifier.java
# src/main/java/com/hbm/tileentity/machine/oil/TileEntityMachineVacuumDistill.java
# src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKConsole.java
# src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKControlAuto.java
# src/main/java/com/hbm/tileentity/machine/storage/TileEntityMassStorage.java
# src/main/java/com/hbm/tileentity/network/TileEntityCraneRouter.java
# src/main/java/com/hbm/tileentity/network/TileEntityDroneCrate.java
# src/main/java/com/hbm/tileentity/network/TileEntityDroneRequester.java
# src/main/java/com/hbm/tileentity/turret/TileEntityTurretFritz.java
# src/main/java/com/hbm/tileentity/turret/TileEntityTurretMaxwell.java
# src/main/java/com/hbm/tileentity/turret/TileEntityTurretRichard.java
# src/main/java/com/hbm/tileentity/turret/TileEntityTurretSentry.java
# src/main/java/com/hbm/tileentity/turret/TileEntityTurretTauon.java
2024-09-18 19:07:46 -05:00
Boblet
3a81e79554
*pipe falling sound effect*
2024-09-17 15:47:50 +02:00
HbmMods
23471b1ad1
Merge branch 'master' into more-more-qol
2024-09-13 08:12:03 +02:00
BallOfEnergy
f8e6a60d0f
holy shit what the fuck am i smoking
2024-09-06 21:59:06 -05:00
Bob
13ffc6a66a
refactor, new keybind system
2024-09-02 22:39:59 +02:00
70000hp
5de273b5ba
five million billion impls
...
hopefully all fluid impls done outside of the rbmk stuff
Also implemented copy pasting of molten metals, copying from anything that holds molten metal, and pasting into outlets for filters
2024-08-24 14:19:54 -04:00
Bob
44585d3c8b
baa
2024-07-24 13:31:25 +02:00
HbmMods
9b0bd4d180
Merge pull request #1576 from 70000hp/electrolyzer-electric-boogaloo
...
Electrolyzer improvements part 2
2024-07-11 16:06:06 +02:00
Boblet
ef228577d9
the heinous slop
2024-07-10 16:33:33 +02:00
70000hp
8c7b359815
all my homies hate dust
2024-07-09 12:35:01 -04:00
70000hp
3120268a64
Electrolyzer Improvements part 1
...
Changes:
Halfed recipe time for water/heavy water electrolysis
Added ore slop electrolysis recipe
Added electrolyzer overdrive support
Rebalanced the power savings upgrade
speed and overdrive upgrades now make the electrolyzer pour out faster
2024-07-08 10:16:15 -04:00
Bob
b661b89334
SISTOR! DID YOU USE ALL MY DIAMONDS TO MAKE JUKEBOXES?
...
yeag
2024-04-09 20:57:33 +02:00
Boblet
c19c8ac4f4
the yapping never ends
2024-02-22 16:52:38 +01:00
Boblet
041b768eda
brick by brick, suck my
2024-01-29 09:24:25 +01:00
Boblet
a67faa99df
muffler 2: the remufflering
2024-01-22 14:43:05 +01:00
Bob
1d92906dd7
upgrade crap, funny new stamps
2023-12-10 18:58:26 +01:00
Bob
afd75b26af
assets, fixes
2023-08-09 22:28:14 +02:00
Bob
ef44b79f83
suffering builds character
2023-08-05 16:33:23 +02:00
Bob
77dc34c5a8
mitty!
2023-08-04 15:01:58 +02:00
Bob
a869a57ff2
NEI handlers for custom machines, nether bedrock ores, electrolyser crap
2023-07-31 20:45:57 +02:00
Bob
647c837909
and now for something completely different
2023-07-30 19:00:35 +02:00
Vaern
77cc85efe1
CRUSH!
2023-02-23 10:02:41 -08:00
Vaern
be10276e18
i'm not gonna sugarcoat it
...
https://youtu.be/E-54I6loV40?t=266
2023-02-22 19:41:11 -08:00
Boblet
8c4495741c
new fillable item system, armor slots for mod table
2022-08-18 11:02:54 +02:00
Boblet
bc98b85c19
fluid IO stuff once again, press preheater
2022-04-21 16:11:28 +02:00
Pheonix
afe7188b29
yet more electrolysis funnies
2022-04-09 23:28:35 +01:00
Pheonix
48e6a08fcd
finally beginning the electrolyser
2022-04-08 11:16:57 +01:00
