BallOfEnergy
|
0a59fa86a0
|
Merge remote-tracking branch 'upstream/master' into Optimization
# Conflicts:
# src/main/java/api/hbm/fluid/IFluidConnector.java
# src/main/java/api/hbm/fluid/IFluidUser.java
# src/main/java/com/hbm/tileentity/machine/TileEntityWatz.java
# src/main/java/com/hbm/tileentity/machine/storage/TileEntityMachineFluidTank.java
|
2025-03-19 13:28:38 -05:00 |
|
Bob
|
ccc80781b2
|
ok that's it i've had enough
|
2025-03-18 21:20:57 +01:00 |
|
Boblet
|
900f8e6959
|
flowing my creek so hard rn you wouldn't believe
|
2025-03-14 14:28:13 +01:00 |
|
Bob
|
20cb0f6f5d
|
ba-dee-ya, say do u rember? ba-dee-ya, wen u feeled happy
ba-dee-ya, alway rember happy day!
|
2025-03-10 21:56:35 +01:00 |
|
BallOfEnergy
|
52b781ea9f
|
Merge remote-tracking branch 'upstream/master' into Optimization
# Conflicts:
# src/main/java/api/hbm/energymk2/IEnergyReceiverMK2.java
# src/main/java/com/hbm/items/weapon/ItemAmmoArty.java
# src/main/java/com/hbm/items/weapon/sedna/factory/ConfettiUtil.java
# src/main/java/com/hbm/tileentity/machine/TileEntityMachineRotaryFurnace.java
|
2025-03-07 22:06:13 -06:00 |
|
Boblet
|
ed4421b2e2
|
burned old textures, better sludge
|
2025-03-04 16:50:33 +01:00 |
|
BallOfEnergy
|
aceb313fec
|
Merge remote-tracking branch 'refs/remotes/upstream/master' into Optimization
# Conflicts:
# src/main/java/com/hbm/handler/WeaponAbility.java
# src/main/java/com/hbm/items/weapon/sedna/factory/Orchestras.java
# src/main/java/com/hbm/tileentity/TileEntityLoadedBase.java
# src/main/java/com/hbm/tileentity/machine/TileEntityMachineRotaryFurnace.java
|
2025-02-09 18:02:29 -06:00 |
|
George Paton
|
3dbe648ebe
|
bring NBTStructures to NTMain!
|
2025-02-09 18:39:15 +11:00 |
|
George Paton
|
a581cb74d0
|
Refueling Station! Refuels armor, attached armor mods, and any held items! Now Black Mesa themed!
|
2025-02-03 10:38:47 +11:00 |
|
Boblet
|
98aea38025
|
hey lois look i'm a commit message
|
2025-01-31 15:24:14 +01:00 |
|
BallOfEnergy
|
642945e7ac
|
Merge branch 'HbmMods:master' into Optimization
|
2025-01-13 08:16:55 -06:00 |
|
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 |
|
Bob
|
401005c3d8
|
you know how we do it
|
2025-01-13 00:24:50 +01:00 |
|
Boblet
|
9ef98691f6
|
do the yoinky sploinky
|
2025-01-07 16:44:33 +01:00 |
|
Vaern
|
faf57d6b9c
|
Merge remote-tracking branch 'HbmMods/master' into phosphor
|
2025-01-06 13:12:04 -08: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
|
1bccba82bb
|
god giveth, and god taketh away
|
2024-12-23 21:31:33 +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
|
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
|
c8fe1f3423
|
my bals
|
2024-12-12 21:44:32 +01:00 |
|
Bob
|
b8325218a8
|
🅱️alls
|
2024-12-01 00:52:17 +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 |
|
Boblet
|
e6bbd63267
|
ow
|
2024-11-04 16:59:46 +01: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 |
|
Boblet
|
8f2471986b
|
foundry tweaks, removed more unused crap
|
2024-10-23 16:21:59 +02:00 |
|
Boblet
|
805c06c802
|
in HEAT
|
2024-10-18 14:13:04 +02:00 |
|
Boblet
|
a9838aedd9
|
added new explosion effects to more bombs, grabber improvements
|
2024-10-14 16:48:16 +02:00 |
|
Bob
|
ee895c9bfc
|
WAR
|
2024-09-26 21:33:17 +02:00 |
|
Boblet
|
f7e804094c
|
it's recoil!
|
2024-09-26 14:05:48 +02:00 |
|
George Paton
|
8bbed76758
|
Basalt side textures
|
2024-09-26 12:50:49 +10:00 |
|
George Paton
|
5223998fcb
|
middle click fixerrrr
|
2024-09-26 12:48:47 +10:00 |
|
abel1502
|
c5fa0c5d2b
|
Fix builder's choice concrete tooltip
|
2024-09-23 18:41:57 +03:00 |
|
Boblet
|
b65dd8ef88
|
minor recipe changes
|
2024-09-19 16:57:14 +02:00 |
|
Bob
|
bc2c2960e3
|
:PainB:
|
2024-09-18 21:10:11 +02:00 |
|
Boblet
|
3a81e79554
|
*pipe falling sound effect*
|
2024-09-17 15:47:50 +02:00 |
|
Bob
|
ee8089ddf4
|
my ass is heavy
|
2024-09-15 22:45:57 +02:00 |
|
Boblet
|
c64ca0d40c
|
more gun code
|
2024-09-04 16:48:58 +02:00 |
|
Boblet
|
85e3e50d54
|
ore density scanner HUD fix
|
2024-08-27 15:42:57 +02:00 |
|
Boblet
|
a391eda01d
|
legalize 70 ton liquid fuel rocket engines
|
2024-08-26 16:15:08 +02:00 |
|
Bob
|
1caeec5ea9
|
d(err)ick
|
2024-08-18 21:00:27 +02:00 |
|
Boblet
|
6011e9df98
|
bedrock sellafite
|
2024-08-14 15:45:58 +02:00 |
|
Boblet
|
1523547467
|
removed more crap
|
2024-08-13 11:21:44 +02:00 |
|
Boblet
|
d70ea038a0
|
an big slappy
|
2024-08-12 16:26:09 +02:00 |
|
Bob
|
c560c7d580
|
missiles with more oomph
|
2024-08-10 23:10:28 +02:00 |
|
Bob
|
4aa87bc009
|
just fuck em
|
2024-08-07 00:11:18 +02:00 |
|
Bob
|
9ebcab3244
|
fixes, plushies
|
2024-08-05 00:47:32 +02:00 |
|
Boblet
|
8e767e51e3
|
ultra shit sounds
|
2024-07-19 11:56:38 +02:00 |
|