Boblet
691ff5c1d5
floppotron
2025-01-29 16:37:12 +01:00
BallOfEnergy
94c97bc87a
bug fixes part 2
...
(both me and radium did testing)
2024-10-13 15:27:40 -05: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
Boblet
c3bc6c6bba
flixes
2024-09-16 16:35:37 +02:00
BallOfEnergy
f8e6a60d0f
holy shit what the fuck am i smoking
2024-09-06 21:59:06 -05:00
70000hp
b5f2bb3355
Merge branch 'master' into more-more-qol
2024-08-30 17:34:39 -04: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
BallOfEnergy
b98f2350b6
man i was stupid (fix another bug with CCGT involving starting/stopping)
2024-08-11 23:40:50 -05:00
BallOfEnergy
d8f4b32c05
shit shit shit shit i forgot something
2024-08-11 22:50:31 -05:00
BallOfEnergy
c89f1b411f
ughhhh
...
ok I fixed some bugs with OC compat and added new refinery GUI
(bugs were in CCGT `setThrottle()` function and the TELEX `setSendingText()`)
2024-08-11 22:02:54 -05:00
BallOfEnergy
e1226c94be
sowwy
2024-07-02 02:44:06 -05:00
BallOfEnergy
6e5b689ed2
New OC Compatibility system!
2024-06-13 20:01:10 -05:00
Bob
da9c44e108
*throws 155 pound anvil at you*
2024-06-09 21:03:47 +02:00
Pvndols
2dd5400f8f
i eat batteries
...
tenfolded max power
2024-05-28 16:26:14 +02:00
Boblet
ba58f42ef2
I will kill Horse Ronald Reagan when I become 23 years old
2024-04-10 16:10:55 +02:00
Boblet
efa790fe75
life extender rework, more EC compat
2024-02-16 15:01:25 +01:00
Boblet
a67faa99df
muffler 2: the remufflering
2024-01-22 14:43:05 +01:00
BallOfEnergy
d4f8de4a54
Finishing touches.
2023-11-30 18:45:13 -06:00
BallOfEnergy
dd5786bb60
Gas turbine compat!!!
2023-11-28 21:46:05 -06:00
Bob
5e3a9480e1
huzzah
2023-10-01 17:33:27 +02:00
Boblet
82dafa437b
hopefully fixed the malicious gigglefish from the silly dimension
2023-09-08 15:20:54 +02:00
Bob
8bc1f73075
big smoke
2023-07-01 19:19:09 +02:00
Boblet
fcfa725f0b
pipable exhaust
2023-06-30 11:57:28 +02:00
Boblet
61132bd310
I REMBER
2023-06-29 16:08:32 +02:00
Bob
727a158ed1
bauxite, achievement stuff, fixes
2023-05-28 21:53:58 +02:00
Bob
ecedb95d58
new concrete, sound fixes, additions, slag tap
2023-05-21 19:44:35 +02:00
Bob
a71d7972ec
fluid pressure stat
2023-05-14 17:51:35 +02:00
Boblet
fe48a47c95
two-smack jack's signature weapon
2023-02-16 16:53:19 +01:00
Bob
f5ceaddfbb
explodable refinery yeah
2023-02-15 22:21:20 +01:00
Boblet
344dd55dfa
turbine temperature tweaks
2023-02-15 16:55:06 +01:00
Boblet
90b7ee2ab7
syngas, oxyhydrogen
2023-02-15 16:10:36 +01:00
Bob
84c28767db
loud man johnson
2023-02-13 22:41:35 +01:00
Boblet
ab9fc80e74
gas turbine time
2023-02-13 16:20:15 +01:00
