998 Commits

Author SHA1 Message Date
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
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
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
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
096c4f4941 hawk tuah 2: eagle tuah 2024-12-05 16:33:13 +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
78fa7b2355 variants n shit 2024-11-27 16:49:44 +01:00
Bob
9192f1cf1b now you're prepped to commit homicide 2024-11-24 21:12:41 +01:00
Bob
24e0aff405 trotty did nothing wrong 2024-11-23 23:01:38 +01: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
Boblet
5e57c86f57 the incredibly impractical mechanism 2024-11-14 16:36:59 +01:00
Bob
ddcb554664 boilerplate crap so i can pretend like i was productive today 2024-11-13 19:09:47 +01:00
George Paton
586d71911b add Steyr animations 2024-11-13 18:03:33 +11:00
Bob
6bd5c8577b finishing touches on the portable mass extinction machine 2024-11-11 21:23:23 +01:00
Boblet
062fe4205f legalize nuclear bombs 2024-11-11 16:46:46 +01:00
Bob
049bc8c31b go go gadget delete everything in this general area 2024-11-10 22:30:36 +01:00
BallOfEnergy
9409fba056 Merge remote-tracking branch 'upstream/master' into Optimization
# Conflicts:
#	src/main/java/com/hbm/main/ResourceManager.java
2024-11-09 17:09:17 -06:00
Bob
287569fe45 if you hold your foreskin shut while peeing you can do a charged shot 2024-11-09 22:53:29 +01:00
BallOfEnergy
d056a845e0
Merge branch 'HbmMods:master' into Optimization 2024-11-07 14:46:11 -06:00
Bob
4f60e44f8e let me just *removes entire barrel* 2024-11-06 22:16:39 +01:00
BallOfEnergy
88759fb504
Merge branch 'HbmMods:master' into Optimization 2024-11-05 17:53:19 -06:00
Bob
446f2f8c93 stg77 texture 2024-11-05 22:05:10 +01:00
BallOfEnergy
6516ff7aa2
Merge branch 'HbmMods:master' into Optimization 2024-11-05 14:12:38 -06:00
Boblet
1e37d14de2 delete .metadata they said, it'll fix caching issues they said 2024-11-05 16:07:53 +01:00
BallOfEnergy
354860c610
Merge branch 'HbmMods:master' into Optimization 2024-11-04 21:17:12 -06:00
Bob
9319fa4088 STG77 2024-11-04 22:13:10 +01:00
Boblet
e6bbd63267 ow 2024-11-04 16:59:46 +01:00
Bob
4aea1af8b5 there are spiders under my skin 2024-11-03 21:32:07 +01:00
Bob
40d5c05b64 :painB: 2024-11-02 23:45:29 +01: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
Bob
55bced3b3e fucked up evil weapons 2024-10-27 19:02:46 +01: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
17b667bf3d HUD pain 2024-10-26 01:13:09 +02:00
Boblet
f8de5314f6 it's funny because the gun that's called "broken" is unbreakable 2024-10-25 15:01:12 +02:00
Bob
b57102e4ce four cheese pizza 2024-10-24 21:53:06 +02:00
Boblet
f4018248f1 *BOOM!* *camera zoom noise* *BOOM!* *camera zoom noise* *BOOM!* 2024-10-24 16:36:29 +02:00