25 Commits

Author SHA1 Message Date
Boblet
900f8e6959 flowing my creek so hard rn you wouldn't believe 2025-03-14 14:28:13 +01:00
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
Boblet
a67faa99df muffler 2: the remufflering 2024-01-22 14:43:05 +01:00
Boblet
8dde233a5b i should kill myself 2024-01-08 16:46:39 +01:00
Boblet
57059d6a5e exposure chamber stuff 2023-11-29 15:46:08 +01:00
Boblet
edbe256217 fixes 2023-08-28 16:45:17 +02:00
Bob
a71d7972ec fluid pressure stat 2023-05-14 17:51:35 +02:00
Bob
d0854bb795 oh yeah 2023-04-23 22:00:59 +02:00
Bob
43c43eb14f watz fuel stats, more construction recipes 2023-04-22 16:00:07 +02:00
Bob
cc2833098f bolt gun 2023-04-16 21:28:45 +02:00
Bob
ba02c7fa9e watz fixes, most remaining functionality, NBT and IO 2023-04-15 17:46:50 +02:00
Boblet
8244747692 compat recipes, watz pump functionality, IO filter 2023-04-04 16:28:21 +02:00
Boblet
cd319ef44d experimental particle crap, watz item IO 2023-03-28 16:54:15 +02:00
Boblet
f0fe4119f5 watz pellet depletion 2023-03-27 16:32:23 +02:00
Boblet
295d4c489a watz fluid IO 2023-03-24 15:18:10 +01:00
Bob
0a2edf189d watz tank sharing, missinng mutable texture crash fix 2023-03-23 23:10:32 +01:00
Boblet
4d1e902981 small fixes, watz heat/flux functionality 2023-03-23 16:04:10 +01:00
Bob
1901eb317a watz GUI stuff 2023-03-22 21:02:27 +01:00
Bob
3453929d86 fixes 2023-03-21 21:48:52 +01:00
Bob
721edd302b some watz overhaul stuff 2021-08-19 00:04:07 +02:00