43 Commits

Author SHA1 Message Date
Toshayo
15fb0c1ad7
Improved steam turbine OpenComputers integration + documented 2025-05-09 16:35:36 +02:00
Toshayo
be2edd87d8
Fixed wrong tank type. getInfo returns input tank type and setType also works with input tank type 2025-05-09 16:18:41 +02: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
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
RosaTryp
5d394bac15 Merge remote-tracking branch 'upstream/master' into machine-configs 2024-08-21 18:16:23 +02:00
Bob
3aef7e1577 i love to drink oil 2024-08-15 20:38:22 +02:00
Boblet
d70ea038a0 an big slappy 2024-08-12 16:26:09 +02:00
RosaTryp
bcdd522464 Added config options for industrial steam turbine 2024-08-12 01:26:20 +02: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
Boblet
ba58f42ef2 I will kill Horse Ronald Reagan when I become 23 years old 2024-04-10 16:10:55 +02:00
Boblet
675838eec7 more energy control compat stuff 2024-02-15 16:10:53 +01:00
George Paton
17b4c52707 Add audio to the Fusion Reactor, with spool up/down 2024-01-23 17:14:03 +11:00
George Paton
13afe67eb3 Add operating sounds to large and chungus turbines 2024-01-23 15:36:49 +11: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
0f25aac3a2 back at it again with the OC compat
Now including:
Optimizations
Turbine Compat
Compat handler for general functions
other compat
2023-11-28 21:46:05 -06:00
Bob
a71d7972ec fluid pressure stat 2023-05-14 17:51:35 +02:00
Vaern
77cc85efe1 CRUSH! 2023-02-23 10:02:41 -08:00
Vaern
905fe32d22 And thy punishment...
is death!
2023-02-22 21:19:07 -08:00
Bob
9f3424120e fancier steel furnaces, fixed new fluid sys for some machines, strata 2022-12-01 22:07:11 +01:00
Boblet
3b858df7ba a tiny bit of fluid stuff 2022-11-15 16:00:33 +01:00
Bob
01aad6bc56 augh 2022-11-05 12:08:15 +01:00
Bob
3d765347dc redid all the turbines with the new fluid traits, electric heater 2022-10-09 21:00:50 +02:00
Boblet
8c4495741c new fillable item system, armor slots for mod table 2022-08-18 11:02:54 +02:00
Voxelstice
8dfe52b895
and the large turbine 2022-06-12 05:26:14 +10:00
Bob
eb01c8792f reverted fluid fuckery, unfucked the chemplant 2022-02-21 19:13:50 +01:00
Boblet
05892abbe7 removed dead code, started chemical plant rewrite, refactoring 2022-02-16 16:53:06 +01:00
Bob
134a594525 turbine tweaks, fixed some localizations 2022-01-25 22:33:12 +01:00
Bob
39d57c61a0 the lorax, i mean borax 2022-01-16 21:21:51 +01:00
Boblet
bd2063c86f The great fluid engoodening part 4
i think that's enough for today
2022-01-14 15:17:07 +01:00
Bob
4a395504cd just like 800 errors left
i will build a time machine, go back to the year 2017 and shoot my former self in the head
2022-01-11 23:40:34 +01:00
Boblet
5b8d478c22 The great energy massacre part 3 2021-11-17 16:45:56 +01:00
Boblet
352394ad20 cigarettes, indestructible nuclear waste entities 2021-09-24 14:27:40 +02:00
Boblet
af123ec386 528: compromise edition, UV lamp model, condenser, bedrock ore 2021-09-13 15:56:18 +02:00
Bob
f2e974e7d0 chungus 2021-06-10 22:45:16 +02:00
Bob
efc7865c0c i scream 2020-11-22 16:18:10 +01:00
Bob
651a8506cf some ammo related items 2020-09-10 19:31:35 +02:00
Bob
c1e0247c76 hot garbage 2020-08-30 23:23:44 +02:00
Bob
92e08033ca fusion reactor complete, thicc turbine, chunky breeding reactor 2020-08-28 23:35:16 +02:00