26 Commits

Author SHA1 Message Date
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
BallOfEnergy
1195f28d8e holy shit im done (part 2) 2024-09-06 22:04:19 -05:00
BallOfEnergy
f8e6a60d0f holy shit what the fuck am i smoking 2024-09-06 21:59:06 -05: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
b661b89334 SISTOR! DID YOU USE ALL MY DIAMONDS TO MAKE JUKEBOXES?
yeag
2024-04-09 20:57:33 +02:00
Boblet
a67faa99df muffler 2: the remufflering 2024-01-22 14:43:05 +01:00
Bob
a71d7972ec fluid pressure stat 2023-05-14 17:51:35 +02:00
Boblet
a397490424 power net tracker, fensu fix, dueterium tower rebalance 2023-05-11 16:55:07 +02:00
Bob
55b5ed578c fixes, briquettes, fluid gauges and paintable ducts, recipe changes 2022-12-11 16:47:34 +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
Vaern
54d0394fa0
RBMK rebalancing (#602)
* stuff

* Reverted HEP241 and americium fuels to their original value

* Changed plutonium pile rod's output + radiation values

The plutonium pile rod now outputs 2 RGP, 1 uranium billets instead of 3 RGP billets, with the change in radioactivity to reflect that. Considering the recent additions to the pile - and planned ones that allow for sophistication akin to Windscale and X-10 - it feels like a natural balancing change.

* Added adjustable segment sizes to seven segment displays,

made research reactor's control rod entry more noticeable and responsive

* Gave higher plutonium production to NU and MEU

Every other U-238 containing fuel has a fissile:fertile ratio of about 1:3, whilst NU and MEU have 1:12 and 1:6 respectively; as a result, there's going to be a higher chance of U-238 interacting with neutrons, meaning more plutonium. Since NU has a lower enrichment and therefore reactivity as well, its burnup will always be lower, leading to more weapons-grade Pu-239 overall compared to enriched fuels

* Deuterium + Tritium

* Added check to prevent constant power drain

when a deuterium machine cannot produce more heavy water, but still has enough input water and energy to process

* sorry, i'm clowning

* Fixed shadowed fields for deuterium machines

Deuterium towers did not consume the correct amount of energy, as a final called maxPower was used in the superclass instead of getMaxPower() directly

* Update ChemplantRecipes.java
2022-05-15 00:24:21 +02:00
Boblet
a77291528c configurable chemplant recipes 2022-04-28 13:21:51 +02:00
Boblet
2387cc13e7 some more fluid IO work 2022-04-19 16:16:04 +02:00
Bob
218b43933e some fixes, upgrade retexture 2022-04-14 23:43:27 +02:00
Boblet
db259a9fdc some fixes 2022-04-12 16:00:19 +02:00
Bob
00d066f493 models, fixes, funky concrete, literally just weed 2022-04-10 21:17:21 +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
Boblet
f39a6f9ca1 fixed deuterium machines, cable switch, added deprecation annotations 2021-11-18 15:59:54 +01:00
Boblet
5b8d478c22 The great energy massacre part 3 2021-11-17 16:45:56 +01:00
Bob
81ec62be2e deuterium extraction tower, bobbleheads 2021-11-09 00:04:07 +01:00