1304 Commits

Author SHA1 Message Date
George Paton
18af968073 updated boble 2025-02-01 20:21:46 +11:00
Boblet
98aea38025 hey lois look i'm a commit message 2025-01-31 15:24:14 +01:00
Boblet
bc3e643f97 a touch too much 2025-01-28 16:37:59 +01:00
Boblet
03639e2cdb i'm just gonna call this "gock" with no further context 2025-01-28 13:15:41 +01:00
HbmMods
3649ed45cf
Merge pull request #1894 from MellowArpeggiation/master
Fix foundry channel clogs
2025-01-27 08:21:50 +01:00
George Paton
e65a98421f handle shovels and prevent any unforeseen issues (like if a channel gets separated by breaking/explosion) 2025-01-27 10:13:11 +11:00
Bob
15645648c5 sharticle accelerator 2025-01-26 22:09:21 +01:00
Bob
fb1e20c11f 🅱️all 🅱️usting 2025-01-25 20:25:01 +01:00
Bob
6373c09081 PERFLUOROMETHYL WANTS TO KNOW YOUR LOCATION 2025-01-19 22:45:37 +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
Bob
c34c412810 top 5 videos 2025-01-06 19:56:48 +01:00
HbmMods
cc1b56fa9f
Merge branch 'master' into master 2025-01-06 18:22:36 +01:00
HbmMods
301b66b4f7
Merge branch 'master' into Optimization 2025-01-05 22:39:26 +01:00
Bob
ba12143cc8 🅱️alls 2025-01-05 22:37:16 +01:00
Xenox003
c94292a667 feat: Add look overlay to Leviathan Turbine (aka. Big Chungus) 2025-01-02 00:10:38 +01:00
BallOfEnergy
9a22c343c9 Chicago Pile fix ClassCastException. 2024-12-31 17:18:04 -06: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
Bob
6e44aeea8d return the slab, or suffer my curse 2024-12-23 01:01:29 +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
c60f5cf400 been livin' livid in a mirror maze 2024-12-15 20:50:16 +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
Bob
f49b832c96 fuck 2024-12-08 22:30:42 +01:00
Boblet
096c4f4941 hawk tuah 2: eagle tuah 2024-12-05 16:33:13 +01:00
Bob
b8325218a8 🅱️alls 2024-12-01 00:52:17 +01: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
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
Bob
4aea1af8b5 there are spiders under my skin 2024-11-03 21:32:07 +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
HbmMods
8be3cd4943
Merge pull request #1751 from abel1502/abel-take-euphy-home
Allow collecting Euphy's statue with a red key
2024-11-02 14:19:09 +01:00
Bob
a0f6f56279 yet more gun crap 2024-11-02 14:16:44 +01:00
abel1502
6cc1c09253
Fix drops 2024-11-01 01:24:21 +03:00
abel1502
2f0c25daf8
Allow harvesting statue_elb with a red key 2024-11-01 01:11:05 +03:00
Bob
a37dd9e639 better afterburn mechanics 2024-10-28 22:15:34 +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
Boblet
8f2471986b foundry tweaks, removed more unused crap 2024-10-23 16:21:59 +02:00
Boblet
400e0b24ed there are chemicals in my food 2024-10-22 16:36:46 +02:00
Bob
10987bee2c lockon funsies 2024-10-21 21:11:45 +02:00
Bob
17b4a355e5 stinger crap 2024-10-20 20:39:25 +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