117 Commits

Author SHA1 Message Date
BallOfEnergy
9fa148c218 just in case I disappear, here's particle threading and crate backpacks, along with spider crates, though opening a spider crate in the inventory will not spawn spiders yet. 2025-01-12 19:21:17 -06:00
BallOfEnergy
e1bdae1241 Merge remote-tracking branch 'upstream/master' into Optimization
# Conflicts:
#	src/main/java/com/hbm/blocks/ModBlocks.java
#	src/main/java/com/hbm/lib/HbmCollection.java
#	src/main/java/com/hbm/main/ClientProxy.java
#	src/main/java/com/hbm/main/MainRegistry.java
#	src/main/java/com/hbm/main/ModEventHandler.java
#	src/main/java/com/hbm/main/NEIConfig.java
#	src/main/java/com/hbm/util/LootGenerator.java
2024-12-26 19:43:36 -06:00
Bob
d7776b52d5 roblox death sound 2024-12-23 23:56:43 +01:00
Bob
340de04936 tweaks 2024-12-20 21:46:50 +01:00
BallOfEnergy
2776a6f347 Merge remote-tracking branch 'upstream/master' into Optimization
# Conflicts:
#	src/main/java/com/hbm/blocks/ModBlocks.java
#	src/main/java/com/hbm/handler/EntityEffectHandler.java
#	src/main/java/com/hbm/main/ClientProxy.java
#	src/main/java/com/hbm/main/CraftingManager.java
#	src/main/java/com/hbm/main/MainRegistry.java
#	src/main/java/com/hbm/main/ModEventHandlerClient.java
#	src/main/java/com/hbm/main/ModEventHandlerRenderer.java
#	src/main/java/com/hbm/main/NEIConfig.java
#	src/main/java/com/hbm/main/ResourceManager.java
#	src/main/java/com/hbm/tileentity/turret/TileEntityTurretBaseNT.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
#	src/main/java/com/hbm/util/CompatExternal.java
#	src/main/java/com/hbm/util/CrucibleUtil.java
#	src/main/java/com/hbm/util/EntityDamageUtil.java
2024-12-16 18:18:46 -06:00
Bob
da407e6b31 do you dare take a spookie dookie in the skoilet? 2024-12-07 22:48:32 +01:00
Boblet
ddaa086354 armor desc overhaul 2024-12-06 15:19:19 +01:00
Boblet
096c4f4941 hawk tuah 2: eagle tuah 2024-12-05 16:33:13 +01:00
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
5c909e156f there i fixed it :woo: 2024-10-12 22:32:58 -05:00
BallOfEnergy
ccebbbca24 Holy SHIT! i think i fixed it 2024-10-12 22:14:08 -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
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
HbmMods
23471b1ad1
Merge branch 'master' into more-more-qol 2024-09-13 08:12:03 +02: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
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
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
7896c0443a the death of RNG 2024-07-14 20:48:35 +02:00
Boblet
49bfc216e6 shit nobody asked for 2024-07-03 16:10:45 +02:00
BallOfEnergy
e1226c94be sowwy 2024-07-02 02:44:06 -05:00
BallOfEnergy
7022dcd1af fix issues with artillery proxy OC compat
also fix a big sound system issue where other mods would run out of sound memory on the sound card if they loaded after NTM reserved 1000 CHANNELS
2024-06-28 14:37:28 -05:00
BallOfEnergy
0a5c4271f4 smallest fixes ever 2024-06-27 21:25:26 -05:00
BallOfEnergy
6e5b689ed2 New OC Compatibility system! 2024-06-13 20:01:10 -05:00
BallOfEnergy
f1ed151f6b add distance check and begin work on radar OC compat!!!! 2024-06-10 22:35:23 -05:00
BallOfEnergy
f2ed1e897d welcome to the age of OC controlled turrets and artillery 2024-06-10 20:46:39 -05:00
Boblet
17a9d824aa some fixes, smeltable diamonds and emeralds 2024-04-17 11:32: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
Bob
b661b89334 SISTOR! DID YOU USE ALL MY DIAMONDS TO MAKE JUKEBOXES?
yeag
2024-04-09 20:57:33 +02:00
Bob
bc65f80501 removed more useless crap 2024-03-24 18:26:21 +01:00
Boblet
b2b0c79bb9 missing star control pieces, snowglobes, broken turret 2024-03-01 15:06:39 +01:00
Bob
7ad017ec8e eeeeeeee macarena! 2024-02-18 17:52:42 +01:00
Boblet
8878b3f9de arty sync fix 2024-02-08 16:28:12 +01:00
Boblet
a67faa99df muffler 2: the remufflering 2024-01-22 14:43:05 +01:00
Bob
4c3945c924 getting railed again 2024-01-06 22:59:40 +01:00
Bob
ca1cd3db17 and some more fixes 2023-12-25 00:08:26 +01:00
Bob
1d92906dd7 upgrade crap, funny new stamps 2023-12-10 18:58:26 +01:00
Bob
bdbb960db2 we gotta move these color TVs 2023-11-26 20:27:15 +01:00
Bob
353049c538 missile rewrite, terrain scan radar 2023-11-26 20:22:23 +01:00
Boblet
24a0fbffef ported all bullet effects to the NT system 2023-07-14 15:09:46 +02:00
Boblet
78cbce7a36 some untested turret compat stuff 2023-05-16 11:21:30 +02:00
Bob
30e2fef6b8 finished coker, tau remodel, biden blast 2023-04-30 17:03:33 +02:00
Bob
b0c757b09b funny gas recipes 2023-03-16 22:10:04 +01:00
Boblet
c775bb7803 re-did mini nuke code, cleaned up unused imports 2023-03-02 09:54:03 +01: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