Bob
|
955a349793
|
pfft
|
2025-04-07 23:09:09 +02:00 |
|
Boblet
|
e23636044a
|
moderate amounts of tomfoolery
|
2025-04-04 15:04:00 +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 |
|
Bob
|
ee8089ddf4
|
my ass is heavy
|
2024-09-15 22:45:57 +02:00 |
|
BallOfEnergy
|
f8e6a60d0f
|
holy shit what the fuck am i smoking
|
2024-09-06 21:59:06 -05:00 |
|
70000hp
|
ffcce8d9bb
|
finishing touches
|
2024-08-29 20:14:29 -04:00 |
|
70000hp
|
c135700d7e
|
forgot about the fucking router compat
|
2024-08-27 15:34:07 -04:00 |
|
70000hp
|
90d552c03a
|
the power of friendship isn't working anymore
I need to kill this motherfucker
|
2024-08-03 19:26:15 -04:00 |
|
Boblet
|
f8465b5071
|
flixes
|
2024-07-15 13:11:13 +02:00 |
|
Boblet
|
01830fd877
|
as straightforward as the nordring
|
2024-07-12 14:56:47 +02:00 |
|
70000hp
|
7f666ecaff
|
Fixed items with meta not working + mass storage support
|
2024-07-10 13:38:45 -04:00 |
|
70000hp
|
518a949306
|
my bONES
|
2024-06-02 12:50:52 -04:00 |
|
Boblet
|
a67faa99df
|
muffler 2: the remufflering
|
2024-01-22 14:43:05 +01:00 |
|
Bob
|
a9ea9a4b1f
|
the ferocious sorter
|
2022-08-15 15:57:18 +02:00 |
|