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 |
|
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 |
|
Boblet
|
8bcdd0cc89
|
the heinous sludge has consumed my brain
|
2025-01-16 16:52:33 +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 |
|
Bob
|
c34c412810
|
top 5 videos
|
2025-01-06 19:56:48 +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 |
|
BallOfEnergy
|
803320d118
|
Merge remote-tracking branch 'upstream/master' into Optimization
# Conflicts:
# src/main/java/com/hbm/main/ResourceManager.java
|
2024-12-27 17:57:20 -06:00 |
|
Bob
|
dbcb2e2aa2
|
spontaneous comeback
|
2024-12-28 00:16:38 +01: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
|
89a3a1f9bc
|
fixes
|
2024-12-27 01:01:51 +01:00 |
|
Bob
|
d7776b52d5
|
roblox death sound
|
2024-12-23 23:56:43 +01:00 |
|
Bob
|
6e44aeea8d
|
return the slab, or suffer my curse
|
2024-12-23 01:01:29 +01:00 |
|