530 Commits

Author SHA1 Message Date
BallOfEnergy
9839107c4e New GUI, also some index fixes. 2025-03-22 13:07:04 -05:00
BallOfEnergy
f27234879f BOO! surprise feature!
Completely revamped toolboxes, now they swap hotbars!
2025-03-22 00:12:32 -05:00
BallOfEnergy
725baf37ff Merge remote-tracking branch 'upstream/master' into Optimization 2025-03-19 22:01:34 -05:00
Bob
1538932316 guns are great, but why not make them better? 2025-03-19 22:13:42 +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
Boblet
5a9f3e75dc YOU KNOW HOW WE DO IT 2025-03-19 16:28:55 +01:00
Bob
ccc80781b2 ok that's it i've had enough 2025-03-18 21:20:57 +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
4972f4023a thorn glognuts for only 5 bintar 2025-02-11 16:46:14 +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
c49161ab39 Merge branch 'master' into moige 2025-02-03 10:44:17 +11:00
Bob
6027ad963b fuck off 2025-02-02 22:05:58 +01:00
Bob
0e0777f196 the rim flappe on a bongfish is mated to the bungus of its fuccbone.
the scrotewad is onyl present on females above the pootsack (see: snogbag).
2025-02-02 17:21:34 +01:00
George Paton
c4e973dc03 oops: fix sorter filter crash 2025-02-01 20:00:24 +11:00
George Paton
b6d4e95ec9 bedrock ore grade filters! 2025-02-01 19:35:46 +11:00
Bob
a074a4a249 the escape plan 2025-01-28 23:24:40 +01:00
Boblet
03639e2cdb i'm just gonna call this "gock" with no further context 2025-01-28 13:15:41 +01: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
Boblet
31eeb2ab94 heaven sent & hell bent 2025-01-22 16:55:52 +01:00
Boblet
4024249bec deplorable gollompus 2025-01-21 16:44:09 +01:00
Bob
6373c09081 PERFLUOROMETHYL WANTS TO KNOW YOUR LOCATION 2025-01-19 22:45:37 +01:00
Biohazard041
57bdd1fba0
Update GUIRBMKControlAuto.java
Typo :)
2025-01-13 23:28:17 -05: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
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
6e44aeea8d return the slab, or suffer my curse 2024-12-23 01:01:29 +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
Bob
f49b832c96 fuck 2024-12-08 22:30:42 +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
Boblet
cb14ffc638 shotshell recipes, some tweaks 2024-11-08 15:11:01 +01:00
BallOfEnergy
d056a845e0
Merge branch 'HbmMods:master' into Optimization 2024-11-07 14:46:11 -06:00
Boblet
b9787fa08e the mechanism 2024-11-07 15:50:14 +01:00
Bob
4f60e44f8e let me just *removes entire barrel* 2024-11-06 22:16:39 +01:00
Boblet
e64a21ffd3 recipe crap 2024-11-06 16:37:34 +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
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
Boblet
a1401b47e2 my ass is bleeding 2024-10-16 17:00:07 +02:00
Boblet
402690cb87 miserable mutant glyphids 2024-10-15 13:14:18 +02:00
BallOfEnergy
e38ce02ccf Upgrade rework, now with 3463% more caching!
(it was slow and needed a redo)
2024-10-14 22:00:39 -05:00
Bob
75df8fb945 ATLAS 2024-10-01 21:35:43 +02:00
Boblet
0bdfe286e4 shapes 2024-10-01 16:56:39 +02:00
Bob
a6f694b7b3 GUNMETAL 2024-09-29 20:56:11 +02:00
Boblet
3a81e79554 *pipe falling sound effect* 2024-09-17 15:47:50 +02:00
Bob
ee8089ddf4 my ass is heavy 2024-09-15 22:45:57 +02:00
Bob
7f91038b08 conveyor destroyer mode 2024-09-08 21:30:47 +02:00
Bob
13ffc6a66a refactor, new keybind system 2024-09-02 22:39:59 +02:00
Boblet
680678b5b2 🅱️attery 2024-08-19 16:38:29 +02:00
HbmMods
0e2b7e09b6
Merge branch 'master' into OC_bugfix 2024-08-19 15:10:57 +02:00
BallOfEnergy
84d2528464 kms (fix cutting off of refinery gui) 2024-08-18 15:17:20 -05:00