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 |
|
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 |
|
Bob
|
aa8e492610
|
molysite, mud hole
|
2024-01-21 00:28:26 +01:00 |
|
Bob
|
f254756c3d
|
bolts, now with revolutionary gregtech compat
|
2024-01-05 23:33:11 +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 |
|
Bob
|
8037893637
|
that should hopefully resolve some garbage
|
2021-12-29 22:57:45 +01:00 |
|
Boblet
|
5b8d478c22
|
The great energy massacre part 3
|
2021-11-17 16:45:56 +01:00 |
|
Boblet
|
28e0e9ce19
|
RBMK profiling, fixed moderated rods reflecting, cleaned up RadGen fuels
|
2021-11-05 15:09:03 +01:00 |
|
Bob
|
c0fee87503
|
reworked the RadGen, updated swords, fixed hopper IO
|
2021-10-17 22:03:25 +02:00 |
|
Bob
|
0bbf99b47f
|
finishing up the armor mods, some new radiation funnies
|
2021-01-31 21:18:24 +01:00 |
|
HbmMods
|
bdc0cd4292
|
let's just hope that didn't break everything
|
2020-06-22 21:31:20 +02:00 |
|