116 Commits

Author SHA1 Message Date
BallOfEnergy
e38ce02ccf Upgrade rework, now with 3463% more caching!
(it was slow and needed a redo)
2024-10-14 22:00:39 -05:00
BallOfEnergy
94c97bc87a bug fixes part 2
(both me and radium did testing)
2024-10-13 15:27:40 -05:00
BallOfEnergy
063ab4032f yeah these are commits from like a month ago idk what any of this is 2024-10-10 19:44:30 -05:00
BallOfEnergy
88f5ac1cf1 Merge remote-tracking branch 'upstream/master' into Optimization
# Conflicts:
#	src/main/java/com/hbm/tileentity/TileEntityMachineBase.java
#	src/main/java/com/hbm/tileentity/machine/TileEntityHeaterElectric.java
#	src/main/java/com/hbm/tileentity/machine/TileEntityMachineSolderingStation.java
#	src/main/java/com/hbm/tileentity/machine/TileEntityPWRController.java
#	src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityCraneConsole.java
#	src/main/java/com/hbm/tileentity/network/TileEntityCraneGrabber.java
2024-10-10 19:41:23 -05:00
Bob
a6f694b7b3 GUNMETAL 2024-09-29 20:56:11 +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
Boblet
c3bc6c6bba flixes 2024-09-16 16:35:37 +02:00
Bob
ee8089ddf4 my ass is heavy 2024-09-15 22:45:57 +02:00
HbmMods
23471b1ad1
Merge branch 'master' into more-more-qol 2024-09-13 08:12:03 +02:00
BallOfEnergy
7b65e45663 Unused import cleaning! 2024-09-06 22:31:27 -05:00
Boblet
0809bc223f Merge master into branch Optimization, intelliJ couldn't do it, so I did it myself. 2024-09-06 22:05:50 -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
BallOfEnergy
47657366cc the ByteBuf shenanigans begin!! 2024-09-06 21:59:06 -05:00
Bob
13ffc6a66a refactor, new keybind system 2024-09-02 22:39:59 +02:00
70000hp
b5f2bb3355 Merge branch 'master' into more-more-qol 2024-08-30 17:34:39 -04: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
George Paton
9ee553fe14 Fix pumpjack tank sync 2024-08-19 12:25:24 +10:00
Bob
1caeec5ea9 d(err)ick 2024-08-18 21:00:27 +02: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
Bob
9ebcab3244 fixes, plushies 2024-08-05 00:47:32 +02:00
George Paton
2960c29918 Add ByteBuf string reader/writer, and migrate the biggest CPU time offenders to ByteBuf packets 2024-06-07 18:20:43 +10:00
Bob
b661b89334 SISTOR! DID YOU USE ALL MY DIAMONDS TO MAKE JUKEBOXES?
yeag
2024-04-09 20:57:33 +02:00
Boblet
c9c6549340 everything is falling the fuck apart 2024-04-09 16:55:53 +02:00
Boblet
866676f6f0 cleanup 2024-03-14 16:28:57 +01:00
Boblet
7429327034 making use of the pollution tag 2024-03-12 16:32:54 +01:00
Boblet
b30bb8ae15 last bit of EC compat stuff 2024-02-21 16:31:34 +01:00
Bob
7ad017ec8e eeeeeeee macarena! 2024-02-18 17:52:42 +01:00
Boblet
efa790fe75 life extender rework, more EC compat 2024-02-16 15:01:25 +01:00
Boblet
daaf50efd4 the malicious gigglefish from the silly dimension 2024-02-13 14:01:01 +01:00
Boblet
6f00c68051 tweaks, recipes, hydrotreater texture 2024-02-12 16:49:47 +01:00
Boblet
0de7b319bb oil oil oil oil oil 2024-02-06 16:07:13 +01:00
Boblet
bc0c64e27f desulfurized oils 2024-02-05 16:45:29 +01:00
Boblet
9965ada88f ough 2024-02-01 16:54:12 +01:00
Boblet
a67faa99df muffler 2: the remufflering 2024-01-22 14:43:05 +01:00
Boblet
f953d69ee6 spring cleaning 2023-12-20 16:40:22 +01:00
Bob
9448d51e02 fuck you 2023-12-10 21:15:53 +01:00
Bob
1d92906dd7 upgrade crap, funny new stamps 2023-12-10 18:58:26 +01:00
Bob
5081dccb19 tweaks, fixes, radar crap 2023-11-26 20:25:31 +01:00
Boblet
fcfa725f0b pipable exhaust 2023-06-30 11:57:28 +02:00
Bob
ff4b231be2 more compressor stuff 2023-06-22 21:02:19 +02:00
Boblet
4cd26174fb more pollution, igen defuckening part 4 2023-06-13 16:30:46 +02:00
Boblet
32ae24823a soot fog, hostile mob buffs, tiny mass storage, comparator output 2023-06-06 15:26:36 +02:00
Bob
41444173d2 fixed liquefactor being stupid 2023-06-05 21:50:45 +02:00
Bob
ecedb95d58 new concrete, sound fixes, additions, slag tap 2023-05-21 19:44:35 +02:00
Bob
a71d7972ec fluid pressure stat 2023-05-14 17:51:35 +02:00
Bob
30e2fef6b8 finished coker, tau remodel, biden blast 2023-04-30 17:03:33 +02:00
Bob
ba3a0a1669 coker texture, rendering, energy fix 2023-04-29 19:00:01 +02:00