1191 Commits

Author SHA1 Message Date
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
BallOfEnergy
a226685e21 Merge remote-tracking branch 'upstream/master' into Optimization
# Conflicts:
#	src/main/java/com/hbm/main/ModEventHandlerRenderer.java
#	src/main/java/com/hbm/tileentity/machine/TileEntityPWRController.java
2024-10-26 21:17:33 -05:00
Bob
17b667bf3d HUD pain 2024-10-26 01:13:09 +02:00
Boblet
8f2471986b foundry tweaks, removed more unused crap 2024-10-23 16:21:59 +02:00
Bob
17b4a355e5 stinger crap 2024-10-20 20:39:25 +02: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
Bob
b72a52ef69 imagine looking at indev values and going "yeah this is definitely final
imagine being this much of a fucking idiot, but good thing we aren't that stupid, right? good thing we aren't complete fucking retards who stir though code that is in active development, pick out temporary inconsistencies and then going "oh well the dev must clearly be an idiot, how else could you explain that?", good thing we are reasonable people who aren't this fucking stupid, right?
2024-10-19 21:48:29 +02:00
Bob
09d11d49da explosive yeeter 2024-10-17 22:22:54 +02:00
Boblet
d271382265 liquid lead cooling (preliminary version, not balanced, no need to yell) 2024-10-17 16:28:54 +02: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
047ebfe8aa better explosion particle effects, flamethrower sound loop 2024-10-13 19:49:31 +02:00
Bob
44b1604992 eh hehehehehe, fire, FIRE! 2024-10-13 01:05:06 +02:00
Boblet
86918a33e6 thorium recipe autogen 2024-10-08 16:54:52 +02:00
Bob
6b0835f19c some very pissed off bees 2024-10-07 22:49:04 +02:00
Boblet
5819711586 casing smoke is no longer bound to the casing config 2024-10-07 16:47:38 +02:00
Bob
cdec9d074d greasy joe, horse leg and 🅱️untsman 2024-10-06 22:37:16 +02:00
HbmMods
fef2074a09
Merge pull request #1715 from abel1502/abel-tiny-silex
Quick way to do #1713
2024-10-04 11:34:25 +02:00
Boblet
c8d40f0d35 offsets and casing ejection sillies 2024-10-03 16:28:15 +02:00
abel1502
591864a406
Quick way to solve #1713 2024-10-03 13:56:33 +03:00
Boblet
ea895daa85 shells and casings 2024-10-02 16:58:12 +02: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