1308 Commits

Author SHA1 Message Date
BallOfEnergy
b139e084fb Merge remote-tracking branch 'upstream/master' into Optimization 2025-03-22 00:12:50 -05:00
BallOfEnergy
f27234879f BOO! surprise feature!
Completely revamped toolboxes, now they swap hotbars!
2025-03-22 00:12:32 -05:00
ItsMakar
291a34103a Add missing adding to neiShredderRecipes in CompatRecipeRegistry 2025-03-21 16:42:49 +02:00
HbmMods
ffa8a0c5bb
Merge pull request #1998 from BallOfEnergy1/Optimization
Crates, but backpacks!
2025-03-21 07:51:46 +01:00
Bob
9f0fd19ef8 the good shit 2025-03-20 22:57:39 +01: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
c73ec3a0ac i fucked around, i found out
this shit WORKS
2025-03-19 13:31:56 -05: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
Boblet
3c2ddf4d64 *vomits* 2025-03-13 16:58:15 +01:00
Boblet
565d5c1129 go go gadget: detonate nutsack 2025-03-10 16:57:02 +01:00
Bob
0ca1be3d6f goober 2025-03-09 22:03:34 +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
5d24e76601 compat for (hopefully) robust external recipe registering 2025-03-06 14:25:30 +01:00
Bob
a78dae4a8e alright i'm tired 2025-03-05 21:58:20 +01:00
Boblet
e21fe3eecc config crap 2025-03-05 16:57:50 +01:00
Bob
0ccf81443a the malicious gigglefish from the silly dimension 2025-02-23 18:39:11 +01:00
Boblet
d20c190c3e the de-genericizing 2025-02-20 16:55:46 +01:00
Boblet
4c82dfcdcb scraping out old crap 2025-02-19 16:37:17 +01:00
Boblet
c3eb6035aa deplorable gollompus 2025-02-18 16:21:38 +01:00
Boblet
18dfb21ca4 UNINOS 2025-02-17 16:59:17 +01:00
Boblet
4aaf3ec864 new objective: kill ronald reagan 2025-02-13 16:45:38 +01: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
4fb7df8b3e Merge branch 'master' into moige 2025-02-09 18:39:57 +11:00
Boblet
b60db5b911 pain 2025-02-06 16:48:29 +01:00
HbmMods
fe9808f621
Merge pull request #1924 from Dash1269/ntmain-pa-detector-fix
PA Detector fixes and improved diagnostics
2025-02-06 15:00:30 +01:00
Boblet
8522b584d4 undo all of the PA stuff 2025-02-06 15:00:19 +01:00
Dosh
5f1a4509f2
PA Detector fixes and improved diagnostics 2025-02-07 00:08:31 +11:00
Boblet
bd59ae5970 flixes 2025-02-05 16:45:49 +01: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
HbmMods
201689942a
Merge pull request #1905 from 70000hp/Aluminium-fifth-attempt-at-merging
Aluminium 2
2025-02-02 17:29:49 +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
70000hp
32d6a59991
Update ElectrolyserFluidRecipes.java 2025-02-01 11:43:27 -05: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
70000hp
dd84cf8f7c ratio engoodening 2 + fluorite instead of aluminium powder 2025-01-31 12:29:42 -05:00
Boblet
98aea38025 hey lois look i'm a commit message 2025-01-31 15:24:14 +01:00
70000hp
4e28272444 eh why not 2025-01-29 17:04:30 -05:00
70000hp
6e3e702213 my bones 2025-01-29 16:32:23 -05:00
Bob
a074a4a249 the escape plan 2025-01-28 23:24:40 +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
Boblet
841864e368 the blombus 2025-01-27 16:55: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