HbmMods
50edd0f04b
Merge pull request #1845 from Agarmal/m1tty-nvg
...
Fix effect conflicts with Night Vision Goggles in the M1TTY Environment Suit
2025-01-06 18:20:23 +01:00
Bob
ae431a3a9b
can a special weapon have a b-side?
2025-01-06 18:19:56 +01:00
BallOfEnergy
ec6cd544d2
An absolute ton of cleanup.
2025-01-04 01:04:57 -06:00
BallOfEnergy
c25f4c8d60
Fix /ntmpackets command registration.
...
Fix small race condition with a ReentrantLock.
2025-01-03 20:29:17 -06:00
Agarmal
8391255398
Fixed M1TTY Envsuit mod detection
2025-01-02 20:38:22 +01:00
BallOfEnergy
9a22c343c9
Chicago Pile fix ClassCastException.
2024-12-31 17:18:04 -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
BallOfEnergy
9d3a3b1fff
fucky wucky (kms)
2024-12-26 19:27:31 -06:00
Bob
89a3a1f9bc
fixes
2024-12-27 01:01:51 +01:00
Bob
d7776b52d5
roblox death sound
2024-12-23 23:56:43 +01:00
BallOfEnergy
90cfd37a31
an absolutely goofy command I'd say (also yet another failsafe, this time for a ton of packet discarding.)
2024-12-19 21:55:41 -06:00
BallOfEnergy
4f06914c39
Packet threading debug command!!
...
(Also packet threading config option)
2024-12-18 10:52:33 -06:00
BallOfEnergy
1ffebc5aa2
Merge remote-tracking branch 'origin/Optimization' into Optimization
2024-12-18 08:32:42 -06:00
BallOfEnergy
85743e85f4
More RAM optimizations with buffer releasing. Also fix a bug in RBMK processing and a few merge-related errors.
2024-12-18 08:32:30 -06:00
HbmMods
807f1a7525
Merge branch 'master' into Optimization
2024-12-17 11:38:41 +01:00
Boblet
9b149f3e3d
trash incineration
2024-12-17 11:37:37 +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
HbmMods
78d61348bf
Merge pull request #1767 from FOlkvangrField/Custom-fluid-pollution-fix
...
Custom fluid traits fix
2024-12-16 16:08:51 +01:00
Boblet
ce3bff94eb
let's go to stalingrad, it will be fun
2024-12-16 15:59:41 +01:00
FOlkvangrField
d009f614d4
Merge branch 'master' into Custom-fluid-pollution-fix
2024-12-16 22:56:43 +08:00
Bob
da407e6b31
do you dare take a spookie dookie in the skoilet?
2024-12-07 22:48:32 +01:00
Boblet
096c4f4941
hawk tuah 2: eagle tuah
2024-12-05 16:33:13 +01:00
Boblet
3e8000a166
get skullanized, idiot
2024-12-04 15:50:59 +01:00
FOlkvangrField
146e19d463
custom fluid traits fix
...
Fixed some custom fluid traits buds, like the JSON output error of the polluting trait and the java.lang.InstantiationException issue of the PWRModerator and Pheromone traits. Mean while, the hot reload function of hbmFluidTypes.json and hbmFluidTraits.json has been added.
2024-11-14 21:13:13 +08:00
BallOfEnergy
e3e306b24f
small flixes
2024-11-09 23:33:50 -06:00
BallOfEnergy
4bd6f0df53
More shit, also precompiled packets.
...
also holy shit the whitespace changes, intelliJ wanted to optimize the imports and refactored a ton of whitespace in the process.
2024-11-09 17:04:19 -06:00
BallOfEnergy
970485f68c
there's actually so many optimizations here that it'd be impossible for be to explain them all
2024-11-04 21:34:48 -06:00
BallOfEnergy
02e9219b2e
Merge remote-tracking branch 'upstream/master' into Optimization
...
# Conflicts:
# src/main/java/com/hbm/extprop/HbmLivingProps.java
# src/main/java/com/hbm/handler/EntityEffectHandler.java
2024-11-02 15:58:54 -05:00
Bob
a0f6f56279
yet more gun crap
2024-11-02 14:16:44 +01:00
Bob
a37dd9e639
better afterburn mechanics
2024-10-28 22:15:34 +01:00
BallOfEnergy
73aff1d158
Merge branch 'HbmMods:master' into Optimization
2024-10-27 23:07:17 -05:00
BallOfEnergy
6443a4c391
Make ExtPropPacket ByteBuf based, along with some other performance improvements such as removing debug fluid net code and making RBMKDials more accepting of new gamerules.
2024-10-27 23:06:40 -05:00
Bob
55bced3b3e
fucked up evil weapons
2024-10-27 19:02:46 +01:00
BallOfEnergy
b63ff682fd
Small fixes
2024-10-13 15:50:00 -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
Boblet
5819711586
casing smoke is no longer bound to the casing config
2024-10-07 16:47:38 +02:00
Bob
6cddb3e238
NEI stuff, textures
2024-09-30 22:12:21 +02:00
Bob
b2c2ce9e4e
casing ejectors, bullet ricochet
2024-09-23 22:39:38 +02:00
Boblet
fcf0f0d2d9
yet more gun stuff!
2024-09-20 15:03:52 +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
bad3d3f031
Merge branch 'HbmMods:master' into Optimization
2024-09-12 13:06:30 -05:00
70000hp
2b221c880b
e
...
Adds a config for 528 nether burning, and makes nether burning only affect players
2024-09-09 16:04:39 -04:00
BallOfEnergy
2706fd2a0c
Merge branch 'HbmMods:master' into Optimization
2024-09-08 14:16:06 -05:00
Bob
5d1d96e436
the almighty state machine
2024-09-08 17:45:57 +02:00
BallOfEnergy
7b65e45663
Unused import cleaning!
2024-09-06 22:31:27 -05:00
BallOfEnergy
1195f28d8e
holy shit im done (part 2)
2024-09-06 22:04:19 -05:00
