25 Commits

Author SHA1 Message Date
Boblet
4d6a92e015 i think i may have creeked my flow 2025-10-15 15:13:59 +02:00
Boblet
00cacbbadc damage fix, mas36 anim error, server config command 2025-03-03 16:05:28 +01:00
Bob
15645648c5 sharticle accelerator 2025-01-26 22:09:21 +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
Bob
49429c73d9 kill me 2024-12-03 22:27:09 +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
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
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
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
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
Boblet
503b3b15d7 making the voices stop - angle grinder edition 2024-05-15 15:06:08 +02:00
Bob
24ef4cb0ca power gauge, fixes 2023-09-16 19:46:56 +02:00
Boblet
de028bb5e1 UAC pistol, damage util crap, mk5 fix 2023-07-10 15:48:09 +02:00
Boblet
3eee7bfe58 X3962: Mistake Edition
v1v1v1v1v1v1v1v1v1v1v1v1v1v1v1v1v1v1v1v1
2021-08-16 10:14:09 +02:00
Bob
a4f469fab6 microwave johnson 2021-06-15 23:59:23 +02:00
Bob
3ae4c3757a the full CIWS experience 2021-03-21 21:42:52 +01:00