BallOfEnergy
|
7a0ee15a7e
|
Merge branch 'HbmMods:master' into Optimization
|
2024-12-17 10:51:51 -06:00 |
|
Boblet
|
bfdc145eb0
|
smonking that fentanyl
|
2024-12-17 16:51:02 +01: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
|
7a16a8ba9f
|
Merge remote-tracking branch 'origin/Optimization' into Optimization
# Conflicts:
# src/main/java/com/hbm/main/ModEventHandlerClient.java
# src/main/java/com/hbm/util/CompatExternal.java
|
2024-12-16 18:25:14 -06: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 |
|
Boblet
|
ce3bff94eb
|
let's go to stalingrad, it will be fun
|
2024-12-16 15:59:41 +01:00 |
|
Bob
|
c60f5cf400
|
been livin' livid in a mirror maze
|
2024-12-15 20:50:16 +01:00 |
|
BallOfEnergy
|
99705897ed
|
Merge remote-tracking branch 'main/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/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/EntityDamageUtil.java
|
2024-12-13 12:04:21 -06:00 |
|
Boblet
|
fbe97e8d79
|
people turn off PVP?
|
2024-12-11 16:06:51 +01: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
|
ba855a8c0f
|
added high-power skeletonizer engine
|
2024-12-04 12:06:01 +01:00 |
|
Bob
|
49429c73d9
|
kill me
|
2024-12-03 22:27:09 +01:00 |
|
Boblet
|
3b0fe9c14b
|
don't work hard, work smart (while hard)
|
2024-12-02 14:07:38 +01:00 |
|
Bob
|
142f6a992d
|
ouugh
|
2024-12-01 20:10:43 +01:00 |
|
Bob
|
b8325218a8
|
🅱️alls
|
2024-12-01 00:52:17 +01:00 |
|
Boblet
|
38ecb23a8e
|
more stupid shit
|
2024-11-28 16:59:33 +01:00 |
|
Boblet
|
771938257c
|
fixes, tweaks and other crap
|
2024-11-25 16:54:25 +01:00 |
|
Bob
|
9192f1cf1b
|
now you're prepped to commit homicide
|
2024-11-24 21:12:41 +01:00 |
|
BallOfEnergy1
|
138e1955ef
|
Merge remote-tracking branch 'refs/remotes/upstream/master' into Optimization
# Conflicts:
# 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-11-21 16:10:02 -06:00 |
|
Bob
|
2a76a6af50
|
full set bonus handling
|
2024-11-21 22:15:03 +01:00 |
|
Boblet
|
d791e7e8e4
|
damage resistance handler crap
|
2024-11-21 16:45:59 +01:00 |
|
Boblet
|
4469efa601
|
damage handling crap
|
2024-11-20 16:48:37 +01:00 |
|
Voxelstice
|
83c209805f
|
The curse
registerTurretTargetingCondition now should work as intended
|
2024-11-20 17:36:23 +03:00 |
|
Boblet
|
ff405e5aeb
|
custom missile external compat
|
2024-11-20 09:30:02 +01:00 |
|
BallOfEnergy1
|
53f20f67a0
|
Merge remote-tracking branch 'refs/remotes/upstream/master' into Optimization
# Conflicts:
# src/main/java/com/hbm/main/ModEventHandlerClient.java
# src/main/java/com/hbm/main/ResourceManager.java
# src/main/java/com/hbm/util/EntityDamageUtil.java
|
2024-11-19 14:42:25 -06:00 |
|
Bob
|
86e5cd71ce
|
imaginary technique: blunt force trauma
|
2024-11-17 20:10:30 +01: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
|
354860c610
|
Merge branch 'HbmMods:master' into Optimization
|
2024-11-04 21:17:12 -06:00 |
|
Boblet
|
e6bbd63267
|
ow
|
2024-11-04 16:59:46 +01: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 |
|
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
|
10987bee2c
|
lockon funsies
|
2024-10-21 21:11:45 +02:00 |
|
BallOfEnergy
|
31c6809c65
|
Merge remote-tracking branch 'upstream/master' into Optimization
# Conflicts:
# src/main/java/com/hbm/main/ModEventHandlerRenderer.java
|
2024-10-20 12:54:06 -05:00 |
|
Boblet
|
a1401b47e2
|
my ass is bleeding
|
2024-10-16 17:00:07 +02:00 |
|
BallOfEnergy
|
4d489bc938
|
Merge remote-tracking branch 'upstream/master' into Optimization
|
2024-10-12 22:13:39 -05:00 |
|
Bob
|
44b1604992
|
eh hehehehehe, fire, FIRE!
|
2024-10-13 01:05:06 +02: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 |
|
Boblet
|
2584934e0b
|
ended endlessIDs
|
2024-09-26 11:25:11 +02:00 |
|
George Paton
|
70be7c4cf5
|
EndlessIDs compat
|
2024-09-26 12:27:07 +10:00 |
|
Boblet
|
0f277657db
|
bullet damage, armor pen, durability stats
|
2024-09-25 16:45:42 +02:00 |
|
Bob
|
1d92bcbf13
|
ball and powder torture
|
2024-09-24 23:53:14 +02:00 |
|
Boblet
|
36a02151bc
|
sure whatever
|
2024-09-24 16:13:39 +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
|
2a81e2c5a7
|
cleanup
|
2024-09-13 13:17:51 +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 |
|