1215 Commits

Author SHA1 Message Date
Boblet
98aea38025 hey lois look i'm a commit message 2025-01-31 15:24:14 +01: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
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
Bob
10f62b88e1 the malicious gigglefish from the silly dimension 2024-12-22 00:41:10 +01:00
BallOfEnergy
6ccb585c40
Merge branch 'HbmMods:master' into Optimization 2024-12-18 09:43:40 -06:00
Boblet
1930670e5f pins and needles 2024-12-18 16:37:11 +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
HbmMods
78d61348bf
Merge pull request #1767 from FOlkvangrField/Custom-fluid-pollution-fix
Custom fluid traits fix
2024-12-16 16:08:51 +01:00
Boblet
ce3bff94eb let's go to stalingrad, it will be fun 2024-12-16 15:59:41 +01:00
FOlkvangrField
d009f614d4
Merge branch 'master' into Custom-fluid-pollution-fix 2024-12-16 22:56:43 +08:00
Bob
c60f5cf400 been livin' livid in a mirror maze 2024-12-15 20:50:16 +01:00
Bob
28ae1df25e now that was a rather productive segment 2024-12-14 22:05:48 +01:00
Bob
c8fe1f3423 my bals 2024-12-12 21:44:32 +01:00
Bob
f49b832c96 fuck 2024-12-08 22:30:42 +01:00
Bob
da407e6b31 do you dare take a spookie dookie in the skoilet? 2024-12-07 22:48:32 +01:00
Boblet
38ecb23a8e more stupid shit 2024-11-28 16:59:33 +01:00
Bob
86e5cd71ce imaginary technique: blunt force trauma 2024-11-17 20:10:30 +01:00
Boblet
5e57c86f57 the incredibly impractical mechanism 2024-11-14 16:36:59 +01:00
FOlkvangrField
146e19d463 custom fluid traits fix
Fixed some custom fluid traits buds, like the JSON output error of the polluting trait and the java.lang.InstantiationException issue of the PWRModerator and Pheromone traits. Mean while, the hot reload function of hbmFluidTypes.json and hbmFluidTraits.json has been added.
2024-11-14 21:13:13 +08: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
Bob
7d88f73dc6 black powder effects 2024-11-07 22:00:56 +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
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
Boblet
2ddb61e5a4 clearly you don't own an M47 WP aerial bomb 2024-10-30 16:50:20 +01:00