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
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
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
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
Bob
a71d7972ec
fluid pressure stat
2023-05-14 17:51:35 +02:00
BallOfEnergy1
54be75f71f
Finished up most OC compatibility, tested and ready for merge.
2023-03-16 16:50:49 -05:00
Vaern
88cdc7919c
Merge branch 'master' into main
2023-02-23 10:08:09 -08: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
Vaern
a4b067616a
fixes
2023-02-15 11:28:43 -08:00
Vaern
0cfcbf1a97
zox rod changes
...
untested
2023-02-15 09:24:04 -08:00
Vaern
7a4cad0923
Moved ZIRNOX rods to itemenummulti fully
...
the lord is my shepherd; i shall not want
2023-02-14 23:00:22 -08:00
Vaern
8b2a304e62
start of moving zirnox, other rods to enummulti
2023-02-14 15:04:53 -08:00
Voxelstice
ed43221197
some more opencomputers stuff
2023-01-16 17:58:45 +03:00
Boblet
084f5abd19
funny water plant, configurable blast furnace IO sides, shredder IO fix
2022-10-25 16:10:02 +02: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
Voxelstice
e93a1f93b1
getSteam function
2022-07-10 04:43:07 +10:00
HbmMods
407e00f70f
Merge pull request #636 from Vaern/hough
...
ZIRNOX Stuff, mostly
2022-06-24 11:42:06 +02:00
Vaern
1d9c4fec33
amongusamongusamongusamongusamongusamongusamongusamongusamongusamongusam
2022-06-23 15:15:25 -07:00
Boblet
fde92737eb
formatting
2022-06-23 08:26:05 +02:00
HbmMods
aa9cd95681
Merge branch 'pr603' into master
2022-06-23 08:10:17 +02:00
Vaern
aa7e20f3e2
localization & input fixes, fuel radiation modifier changed
2022-06-20 13:45:45 -07:00
Vaern
0c34901864
ZIRNOX stuff + lil bit of Igen
...
Added Mox ZFB rods for fast technetium breeding (50k ticks); Increased the lifetimes for almost all ZIRNOX fuels by approximately 2, along with minor changes to heat values; reduced buffs to boosted presto logs in the IGen: shouldn't be *as* broken anymore, but still nowhere near unremarkable; Added Hopper IO functionality to the ZIRNOX; Changed ZIRNOX and destroyed variant's model textures slightly
2022-06-19 22:23:18 -07:00
Voxelstice
fe2df764dd
if this doesnt fix the conflict i dont know what i will do
2022-05-23 13:25:57 +10:00
Boblet
3fed1d8d8d
ported a few more machines to the new fluid API
2022-05-20 14:43:45 +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
Voxelstice
46adbf3273
Update TileEntityReactorZirnox.java
2022-05-13 16:20:40 +10: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
Vaern
2734b0ed92
MKU + Final Zirnox Balancing
2022-02-06 17:31:02 -08:00
Vaern
7c938db267
a
2022-02-05 09:40:28 -08:00
Vaern
4c8f951f25
my balls
2022-02-05 09:38:13 -08:00
Vaern
e8034a86b0
Hell yeah!
...
The ZIRNOX Rework works, the gas cent nei handler works, the hazard issue should probably work, the guis should work
2022-02-01 19:51:33 -08:00
Bob
de6663fea9
balancing memery, fixed AoE axes breaking bedrock for good
2022-01-18 23:34:26 +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
Vaern
5937794baf
trolling
2022-01-06 15:58:42 -08:00
Vaern
e1b9c6f6f5
bit of fixes
2022-01-05 18:29:32 -08:00
Vaern
97d0a67eef
Achievements!
...
now with an actual progression and even more witty descriptions
2021-12-21 17:28:00 -08:00
Vaern
86be818cfc
Zirnox fixed!
...
hurrah
2021-12-11 11:40:14 -08:00
Bob
9ba3dbb792
fixed depleted fuel disappearing out of the ZIRNOX and spent fuel pool
2021-12-01 21:43:05 +01:00
Vaern
61aea864fa
steam function fixed once and for all
2021-11-28 14:27:22 -08:00
