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
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
ba58f42ef2
I will kill Horse Ronald Reagan when I become 23 years old
2024-04-10 16:10:55 +02:00
Boblet
a67faa99df
muffler 2: the remufflering
2024-01-22 14:43:05 +01:00
Bob
65ed6a4f9a
helium 4 plasma
2023-07-01 21:43:29 +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
Boblet
1ab40869b0
GUI stuff, fluid API for plasma heater, boxduct inv rendering
2022-11-25 14:28:29 +01:00
Boblet
8c4495741c
new fillable item system, armor slots for mod table
2022-08-18 11:02:54 +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
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
1b18c5d810
cable connector model, a lot of energy net fixes
2021-12-02 22:46:03 +01:00
Bob
fa78371f2b
fixed a lot of the new power garbage, better pylons
2021-11-20 15:57:19 +01:00
Boblet
5b8d478c22
The great energy massacre part 3
2021-11-17 16:45:56 +01:00
Boblet
2471777d04
lunar miner, helium plasma
2021-11-03 09:17:53 +01:00
Bob
fe3a1adfea
NEI SILEX handler, rebalanced hazmats, liquidator suit, more block rads
2021-03-28 02:35:25 +01:00
Bob
4a3b6e6026
custom missile turbines, more ItemHazard improvements, updated to JDK1.8
2021-03-25 22:49:04 +01:00
Bob
d54e882ae5
more igen work, an actual turning dial, more inventory 3d models
2020-10-16 23:54:52 +02:00
Bob
4589e3aaea
more work on the fusion reactor & plasma heater, vaporwave
2020-08-26 23:53:06 +02:00
Bob
e921ba17d2
æügh
2020-08-23 23:10:36 +02:00
Bob
e829d75b28
a bit of work on the ITER, TE for the trapped brick
2020-08-23 00:01:28 +02:00
Bob
fbf5ba8439
more ITER work, some balls-o-tron shenanigans
2020-08-22 00:16:53 +02:00
Bob
c47c2084d0
bottomless battery, maskman spawn condition, some general improvements
2020-08-16 20:49:56 +02:00
