277 Commits

Author SHA1 Message Date
BallOfEnergy
a226685e21 Merge remote-tracking branch 'upstream/master' into Optimization
# Conflicts:
#	src/main/java/com/hbm/main/ModEventHandlerRenderer.java
#	src/main/java/com/hbm/tileentity/machine/TileEntityPWRController.java
2024-10-26 21:17:33 -05:00
Bob
17b667bf3d HUD pain 2024-10-26 01:13:09 +02:00
Boblet
8f2471986b foundry tweaks, removed more unused crap 2024-10-23 16:21:59 +02: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
75df8fb945 ATLAS 2024-10-01 21:35:43 +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
BallOfEnergy
bc0d1059d8 i want to kill myself ❤️ 2024-09-06 21:59:03 -05:00
BallOfEnergy
e32f67c2b2 this is fucking insane dude
RBMK optimization update soon!!!!!!!
2024-09-06 21:55:28 -05:00
Bob
13ffc6a66a refactor, new keybind system 2024-09-02 22:39:59 +02:00
Boblet
b8d24b5c2d battery packs 2024-08-20 16:30:15 +02:00
Boblet
d70ea038a0 an big slappy 2024-08-12 16:26:09 +02:00
Boblet
49bfc216e6 shit nobody asked for 2024-07-03 16:10:45 +02:00
Bob
da9c44e108 *throws 155 pound anvil at you* 2024-06-09 21:03:47 +02:00
Boblet
14c5941bab even more throughput 2024-06-05 12:11:18 +02:00
Boblet
8618de3f1c guh 2024-06-04 16:25:19 +02:00
Boblet
c93ff4faaf comically expensive 2024-06-03 15:41:22 +02:00
Bob
8217dcfb1f shut the fuck up 2024-05-26 21:16:43 +02:00
Bob
b1fd87cae4 recipes, soldering station automation 2024-05-25 20:53:41 +02:00
Boblet
7dfba03dff the wire re-wireing 2024-05-24 15:03:17 +02:00
Bob
41f9b41ef9 sold(i)er TF2 2024-05-23 23:12:29 +02:00
Bob
f39b5a0e2c crushin' crushin' (the second) 2024-05-20 19:28:46 +02:00
Bob
d6a364515e more arc furnace crap 2024-05-19 23:43:31 +02:00
Bob
19a0bb0132 stats, fixes 2024-05-14 21:05:22 +02:00
Boblet
5558b8c2a7 finished pellet press, textures 2024-05-10 14:29:48 +02:00
Boblet
ffd0b19620 ICF pellet press 2024-05-08 16:36:47 +02:00
Boblet
ed79ad396e pellet stats 2024-05-06 15:49:48 +02:00
Bob
d88dd38f20 ignition! 2024-05-05 18:44:41 +02:00
HbmMods
1f271f6b23
Merge pull request #1432 from HbmMods/TSPA
guess what TSPA stands for
2024-04-14 14:23:06 +02:00
Boblet
c9c6549340 everything is falling the fuck apart 2024-04-09 16:55:53 +02:00
Bob
f904636517 we're in a rush now 2024-03-31 21:55:59 +02:00
Bob
62d6408558 the shell re-shellening 2024-03-30 22:05:46 +01:00
Boblet
b63f029105 assembler config now uses the new system 2024-02-21 09:52:42 +01:00
George Paton
72a252194a Add a new "unsiphonable" fluid trait instead of using a static list 2024-02-06 18:07:21 +11:00
George Paton
05a087bce4 you know what *unsiphons your water* 2024-02-06 17:40:51 +11:00
George Paton
bcb8a48620 you know what *siphons your gas* 2024-02-06 14:52:06 +11:00
Bob
c6450d78b2 and all that 2024-01-22 21:05:09 +01:00
Boblet
a67faa99df muffler 2: the remufflering 2024-01-22 14:43:05 +01:00
Boblet
5618be2d63 missile rendering, fixes 2024-01-15 15:51:26 +01:00
Boblet
6b34f06324 faster chemplant ejector 2024-01-12 14:20:34 +01:00
Boblet
8dde233a5b i should kill myself 2024-01-08 16:46:39 +01:00
HbmMods
3d319a1b15
Merge pull request #1265 from 70000hp/just-kill-me-already
The Entire Glyphid Update
2023-12-13 10:09:53 +01:00
Bob
1d92906dd7 upgrade crap, funny new stamps 2023-12-10 18:58:26 +01:00
70000hp
0d33363eaf an unspeakably large commit
Contains the whole fucking glyphid PR. ill tell why later
2023-12-07 19:51:26 -05:00
Bob
8dc217b5f7 i ate poisoned grilled cheeses and now i am dying 2023-12-06 20:08:24 +01:00
Bob
5081dccb19 tweaks, fixes, radar crap 2023-11-26 20:25:31 +01:00
Boblet
ba61cc42a8 quick gordon, the mcgriddle is still on the menu! 2023-11-02 14:12:39 +01:00
Boblet
89638ae817 and now for custom fluids 2023-10-04 15:26:17 +02:00
Bob
9528ce8afe redcoil fix, no more shredding of blocks with the "Any" prefix, GUIs 2023-09-24 20:31:04 +02:00
Bob
8ce3e9837b "today i will get shit done" and other jokes you can tell yourself 2023-09-17 20:11:53 +02:00