3168 Commits

Author SHA1 Message Date
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
c60f5cf400 been livin' livid in a mirror maze 2024-12-15 20:50:16 +01:00
Bob
28ae1df25e now that was a rather productive segment 2024-12-14 22:05:48 +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
Bob
c8fe1f3423 my bals 2024-12-12 21:44:32 +01:00
Boblet
bbce45170e why is it called land-mine when it doesn't even belong to me 2024-12-12 16:37:05 +01:00
Boblet
fbe97e8d79 people turn off PVP? 2024-12-11 16:06:51 +01:00
Boblet
7695c189ea too late to turn tail, too good to fail 2024-12-09 16:12:09 +01:00
Bob
f49b832c96 fuck 2024-12-08 22:30:42 +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
096c4f4941 hawk tuah 2: eagle tuah 2024-12-05 16:33:13 +01:00
Bob
938d9935bf infrared laser heat ray fuck 2024-12-04 23:30:53 +01:00
Boblet
3e8000a166 get skullanized, idiot 2024-12-04 15:50:59 +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
663f08be56 lasers now turn entities into confetti 2024-12-03 16:40:56 +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
2690b3e96f i want a woman who straight up fucking kills me 2024-11-29 15:05:36 +01:00
Boblet
38ecb23a8e more stupid shit 2024-11-28 16:59:33 +01:00
Bob
dcdc2d9032 yes that deserves its own commit 2024-11-27 23:11:13 +01:00
Boblet
78fa7b2355 variants n shit 2024-11-27 16:49:44 +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
Bob
e3d8919df5 bullets now determine projectile type, not the guns 2024-11-24 15:44:40 +01:00
Bob
24e0aff405 trotty did nothing wrong 2024-11-23 23:01:38 +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
3d1ff54dd7 uh oh 2024-11-19 14:43:49 -06: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
98ed3fad91 more bolter crap, various fixes 2024-11-18 23:22:15 +01:00
Bob
86e5cd71ce imaginary technique: blunt force trauma 2024-11-17 20:10:30 +01:00
Bob
25b0f19fc7 localization 2024-11-16 22:57:17 +01:00
Bob
9e5724fc5f rather death do us part than shit do its fart 2024-11-16 20:55:43 +01:00
Bob
d66b75b76c "i was in the war" congratulations, i'm gonna be in the next one and
they have laser beams now
2024-11-14 22:50:38 +01:00
Boblet
5e57c86f57 the incredibly impractical mechanism 2024-11-14 16:36: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
Bob
ddcb554664 boilerplate crap so i can pretend like i was productive today 2024-11-13 19:09:47 +01:00
HbmMods
e95123c359
Merge pull request #1763 from MellowArpeggiation/master
inspect, jammed, and dry fire animations for SPAS-12
2024-11-13 08:07:56 +01:00
George Paton
586d71911b add Steyr animations 2024-11-13 18:03:33 +11:00
George Paton
08a72afecc add audio to inspect and jammed SPAS-12 animations 2024-11-13 10:07:08 +11:00
Boblet
19bce7c342 explosive fucking buckshot from a peneumatic warhead yeeter 2024-11-12 16:24:31 +01:00
George Paton
26148a277d inspect, jammed, and dry fire animations for SPAS-12 2024-11-12 12:18:11 +11:00