Bob
624bb35b72
sure, why not
2025-04-12 16:37:40 +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
Boblet
b8d24b5c2d
battery packs
2024-08-20 16:30:15 +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
Boblet
503b3b15d7
making the voices stop - angle grinder edition
2024-05-15 15:06:08 +02:00
70000hp
81a3c19e88
Added smokestack support to fluid burning lads
2024-05-10 16:52:38 -04:00
Boblet
ba58f42ef2
I will kill Horse Ronald Reagan when I become 23 years old
2024-04-10 16:10:55 +02:00
Boblet
c9c6549340
everything is falling the fuck apart
2024-04-09 16:55:53 +02:00
Boblet
7429327034
making use of the pollution tag
2024-03-12 16:32:54 +01:00
Boblet
675838eec7
more energy control compat stuff
2024-02-15 16:10:53 +01:00
Boblet
a67faa99df
muffler 2: the remufflering
2024-01-22 14:43:05 +01: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
1c7d8e41f0
leaded fuel pollution
2023-06-13 09:54:26 +02:00
Bob
668b3be77c
funny miner's helmet with headlamp
2023-03-25 00:37:14 +01:00
Bob
d787a9835c
little diesel guy
2023-03-24 20:34:17 +01: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
4985b2e550
invertable foundry filters, more machine configs
2022-11-04 15:08:17 +01:00
Bob
385a7cef83
steam engine model, some more config crap
2022-11-03 23:16:40 +01:00
Boblet
1c79e4b900
some compat crap
2022-08-29 16:32:55 +02:00
Boblet
8c4495741c
new fillable item system, armor slots for mod table
2022-08-18 11:02:54 +02:00
Boblet
ea16e518dc
rewrote the entire fluid trait system
...
ow
2022-08-16 11:28:34 +02:00
Bob
8779cb3032
the allmighty flare stack
2022-05-15 00:10:01 +02:00
Boblet
2387cc13e7
some more fluid IO work
2022-04-19 16:16:04 +02:00
Bob
0412ac6154
finished new RBMK column, more fluid IO stuff
2022-04-18 22:52:07 +02:00
Boblet
f62695bab1
more fluid net stuff, sulfuric acid bucket fix
2022-04-13 16:43:17 +02: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
Boblet
bdb012d11b
added efficiency tooltips to combustion engine blocks
2022-02-14 09:27:18 +01:00
Boblet
b17fb8f6e8
standardized fuel values (yay new fluid handler)
2022-02-04 13:42:48 +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
Bob
a77cf08818
igen 3: revenge of the sith
2021-12-05 20:33:56 +01:00
Boblet
bc3fd09b44
buffed combustion engines and geothermal w/ lava, more slime w/ beheader
2021-11-29 16:22:22 +01:00
Boblet
5b8d478c22
The great energy massacre part 3
2021-11-17 16:45:56 +01:00
Boblet
49369733f4
ethanol
2021-11-04 08:55:55 +01:00
Bob
c0fee87503
reworked the RadGen, updated swords, fixed hopper IO
2021-10-17 22:03:25 +02:00
Adam
66f0aff2aa
lpg fuel in diesel gen
2021-10-12 20:25:41 +02:00
Boblet
474d3fc020
black lung, leaded gasoline, more gas mask funnies
2021-09-08 15:16:13 +02:00
Bob
8971cafa39
some small fixes, decorative pipes
2021-05-13 01:25:34 +02:00
Bob
f8a7b3f393
billets and tritium lamps
2021-02-03 23:45:07 +01:00
Bob
a675750793
some code cleanup again, mufflers, radar API class
2020-08-03 20:15:45 +02:00
Bob
71a0123a28
schraranium, laser miner recipe, battery API
2020-07-08 21:32:52 +02:00
