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 |
|
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
|
efa790fe75
|
life extender rework, more EC compat
|
2024-02-16 15:01:25 +01:00 |
|
fedoraman737
|
760d7e9456
|
Update TileEntityReactorResearch.java
Updated line 435 - last argument in clamp_double changed to 1.0
|
2024-02-07 22:40:45 -06:00 |
|
Boblet
|
a67faa99df
|
muffler 2: the remufflering
|
2024-01-22 14:43:05 +01:00 |
|
BallOfEnergy
|
533c87eb1a
|
Large update to direct calls and limits for pulling values.
|
2023-11-28 21:46:15 -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 |
|
HbmMods
|
8944744142
|
Merge pull request #1247 from Ice-Arrow/master
Make the research reactor compatible with IC2's water changes
|
2023-11-26 20:26:05 +01:00 |
|
BallOfEnergy
|
3ab84d4f8a
|
Percentage my beloved
|
2023-06-11 22:31:53 -05:00 |
|
BallOfEnergy1
|
54be75f71f
|
Finished up most OC compatibility, tested and ready for merge.
|
2023-03-16 16:50:49 -05: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 |
|
Voxelstice
|
ed43221197
|
some more opencomputers stuff
|
2023-01-16 17:58:45 +03:00 |
|
Boblet
|
9bcb388d92
|
colored scaffolds, spring cleaning
|
2022-12-15 11:25:08 +01:00 |
|
Boblet
|
8c4495741c
|
new fillable item system, armor slots for mod table
|
2022-08-18 11:02:54 +02:00 |
|
Boblet
|
fde92737eb
|
formatting
|
2022-06-23 08:26:05 +02:00 |
|
Voxelstice
|
24ef4617b9
|
Update TileEntityReactorResearch.java
|
2022-05-13 16:22:16 +10:00 |
|
Vaern
|
ee74a4f65e
|
changed spicy lead, added pu238be plate fuel, rebalancing
i'm slightly tilted, since i had to change pb-200 to pb-209, but on the other hand it allows for it to be spicy af
|
2022-01-11 21:04:46 -08:00 |
|
Vaern
|
58502b4b23
|
ah
|
2022-01-02 21:17:43 -08:00 |
|
Vaern
|
26e1c36dac
|
stuff
|
2022-01-01 14:15:42 -08:00 |
|
Vaern
|
e0fb379b53
|
breeding reactor funnies
|
2021-12-31 23:20:59 -08:00 |
|