601 Commits

Author SHA1 Message Date
pheo
395acea899 now you're thinking with OOP 2025-05-01 10:41:21 +01:00
pheo
152de687f2 terrible hacks, part 2 2025-04-29 21:57:53 +01:00
Boblet
5372884c50 i spilled my tomato sauce 2025-04-18 14:40:18 +02:00
Bob
624bb35b72 sure, why not 2025-04-12 16:37:40 +02:00
Boblet
345d6e8710 this machine can suck all day long 2025-04-10 16:41:31 +02:00
Bob
955a349793 pfft 2025-04-07 23:09:09 +02:00
Boblet
8ed0411a27 baby steps 2025-04-03 16:51:31 +02:00
Boblet
e2b3b480c1 creekflow crashing its mercedes into a mcdonalds 2025-04-01 16:50:55 +02:00
HbmMods
7fe7960dba
Merge pull request #2035 from Vaern/texture-test
added lightstone, variants, recipes, stairs, slabs
2025-03-31 22:22:21 +02:00
Vaern
c629b1e79b added lightstone, variants, recipes, stairs, slabs 2025-03-31 11:48:56 -07:00
George Paton
e02142d255 new conveyor wand item that masquerades as a conveyor block, performing autoplacement! (from downstream spacefork) 2025-03-31 18:19:34 +11:00
Lazzzycatwastaken
7e54c5478b Merge remote-tracking branch 'origin/AAAAAAAAAAAAAAA' into AAAAAAAAAAAAAAA 2025-03-30 00:36:18 +01:00
Lazzzycatwastaken
00f98ac456 Jamesh_2 Today at 22:03
Strapons work
ughhfhfd
2025-03-30 00:35:29 +01:00
Boblet
f9f1e1c73e go go gadget: replace uterus with 30lb bowling ball 2025-03-27 16:02:35 +01:00
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