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
9a22c343c9
Chicago Pile fix ClassCastException.
2024-12-31 17:18:04 -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
1bccba82bb
god giveth, and god taketh away
2024-12-23 21:31:33 +01:00
Bob
6e44aeea8d
return the slab, or suffer my curse
2024-12-23 01:01:29 +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
Boblet
ce3bff94eb
let's go to stalingrad, it will be fun
2024-12-16 15:59:41 +01:00
Bob
c60f5cf400
been livin' livid in a mirror maze
2024-12-15 20:50:16 +01:00
Bob
f49b832c96
fuck
2024-12-08 22:30:42 +01:00
Boblet
096c4f4941
hawk tuah 2: eagle tuah
2024-12-05 16:33:13 +01:00
Bob
b8325218a8
🅱️ alls
2024-12-01 00:52:17 +01:00
Bob
86e5cd71ce
imaginary technique: blunt force trauma
2024-11-17 20:10:30 +01:00
BallOfEnergy
4bd6f0df53
More shit, also precompiled packets.
...
also holy shit the whitespace changes, intelliJ wanted to optimize the imports and refactored a ton of whitespace in the process.
2024-11-09 17:04:19 -06:00
BallOfEnergy
354860c610
Merge branch 'HbmMods:master' into Optimization
2024-11-04 21:17:12 -06:00
Boblet
e6bbd63267
ow
2024-11-04 16:59:46 +01:00
Bob
4aea1af8b5
there are spiders under my skin
2024-11-03 21:32:07 +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
abel1502
6cc1c09253
Fix drops
2024-11-01 01:24:21 +03:00
abel1502
2f0c25daf8
Allow harvesting statue_elb with a red key
2024-11-01 01:11:05 +03:00
Bob
a37dd9e639
better afterburn mechanics
2024-10-28 22:15:34 +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
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
Boblet
805c06c802
in HEAT
2024-10-18 14:13:04 +02:00
Boblet
402690cb87
miserable mutant glyphids
2024-10-15 13:14:18 +02:00
BallOfEnergy
e3cf157501
bug fixes part 1
...
(thank you radium)
2024-10-13 00:27:55 -05:00
BallOfEnergy
88f5ac1cf1
Merge remote-tracking branch 'upstream/master' into Optimization
...
# Conflicts:
# src/main/java/com/hbm/tileentity/TileEntityMachineBase.java
# src/main/java/com/hbm/tileentity/machine/TileEntityHeaterElectric.java
# src/main/java/com/hbm/tileentity/machine/TileEntityMachineSolderingStation.java
# src/main/java/com/hbm/tileentity/machine/TileEntityPWRController.java
# src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityCraneConsole.java
# src/main/java/com/hbm/tileentity/network/TileEntityCraneGrabber.java
2024-10-10 19:41:23 -05:00
Boblet
f7e804094c
it's recoil!
2024-09-26 14:05:48 +02:00
George Paton
b36cf4213f
Horizontal scaffolding
2024-09-26 12:51:29 +10:00
George Paton
8bbed76758
Basalt side textures
2024-09-26 12:50:49 +10:00
George Paton
df5df13396
Fix basalt ores and stalagmites/tites middle-clicking to sulfur
2024-09-26 12:49:40 +10:00
abel1502
9942632231
Fix TileEntityScaffoldDynamic
2024-09-23 16:21:57 +03:00
Bob
ca14f47cbc
the malicious gigglefish from the silly dimension
2024-09-19 21:59:18 +02:00
BallOfEnergy
e7b5240a9d
Merge remote-tracking branch 'upstream/master' into Optimization
...
# Conflicts:
# src/main/java/com/hbm/tileentity/bomb/TileEntityNukeBalefire.java
# src/main/java/com/hbm/tileentity/machine/TileEntityAshpit.java
# src/main/java/com/hbm/tileentity/machine/TileEntityChungus.java
# src/main/java/com/hbm/tileentity/machine/TileEntityCondenser.java
# src/main/java/com/hbm/tileentity/machine/TileEntityCore.java
# src/main/java/com/hbm/tileentity/machine/TileEntityDiFurnace.java
# src/main/java/com/hbm/tileentity/machine/TileEntityDiFurnaceRTG.java
# src/main/java/com/hbm/tileentity/machine/TileEntityElectrolyser.java
# src/main/java/com/hbm/tileentity/machine/TileEntityFurnaceIron.java
# src/main/java/com/hbm/tileentity/machine/TileEntityFurnaceSteel.java
# src/main/java/com/hbm/tileentity/machine/TileEntityHeatBoiler.java
# src/main/java/com/hbm/tileentity/machine/TileEntityHeatBoilerIndustrial.java
# src/main/java/com/hbm/tileentity/machine/TileEntityHeaterHeatex.java
# src/main/java/com/hbm/tileentity/machine/TileEntityMachineAutosaw.java
# src/main/java/com/hbm/tileentity/machine/TileEntityMachineCombustionEngine.java
# src/main/java/com/hbm/tileentity/machine/TileEntityMachineCompressor.java
# src/main/java/com/hbm/tileentity/machine/TileEntityMachineDiesel.java
# src/main/java/com/hbm/tileentity/machine/TileEntityMachineEPress.java
# src/main/java/com/hbm/tileentity/machine/TileEntityMachineHephaestus.java
# src/main/java/com/hbm/tileentity/machine/TileEntityMachineMixer.java
# src/main/java/com/hbm/tileentity/machine/TileEntityMachinePlasmaHeater.java
# src/main/java/com/hbm/tileentity/machine/TileEntityMachinePress.java
# src/main/java/com/hbm/tileentity/machine/TileEntityMachinePumpBase.java
# src/main/java/com/hbm/tileentity/machine/TileEntityMachineRadGen.java
# src/main/java/com/hbm/tileentity/machine/TileEntityMachineRadiolysis.java
# src/main/java/com/hbm/tileentity/machine/TileEntityMachineSchrabidiumTransmutator.java
# src/main/java/com/hbm/tileentity/machine/TileEntityMachineSolderingStation.java
# src/main/java/com/hbm/tileentity/machine/TileEntityMachineStrandCaster.java
# src/main/java/com/hbm/tileentity/machine/TileEntityMachineTurbofan.java
# src/main/java/com/hbm/tileentity/machine/TileEntitySoyuzLauncher.java
# src/main/java/com/hbm/tileentity/machine/TileEntitySteamEngine.java
# src/main/java/com/hbm/tileentity/machine/oil/TileEntityMachineCatalyticCracker.java
# src/main/java/com/hbm/tileentity/machine/oil/TileEntityMachineCatalyticReformer.java
# src/main/java/com/hbm/tileentity/machine/oil/TileEntityMachineCoker.java
# src/main/java/com/hbm/tileentity/machine/oil/TileEntityMachineGasFlare.java
# src/main/java/com/hbm/tileentity/machine/oil/TileEntityMachineLiquefactor.java
# src/main/java/com/hbm/tileentity/machine/oil/TileEntityMachineRefinery.java
# src/main/java/com/hbm/tileentity/machine/oil/TileEntityMachineSolidifier.java
# src/main/java/com/hbm/tileentity/machine/oil/TileEntityMachineVacuumDistill.java
# src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKConsole.java
# src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKControlAuto.java
# src/main/java/com/hbm/tileentity/machine/storage/TileEntityMassStorage.java
# src/main/java/com/hbm/tileentity/network/TileEntityCraneRouter.java
# src/main/java/com/hbm/tileentity/network/TileEntityDroneCrate.java
# src/main/java/com/hbm/tileentity/network/TileEntityDroneRequester.java
# src/main/java/com/hbm/tileentity/turret/TileEntityTurretFritz.java
# src/main/java/com/hbm/tileentity/turret/TileEntityTurretMaxwell.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
2024-09-18 19:07:46 -05:00
Bob
bc2c2960e3
:PainB:
2024-09-18 21:10:11 +02:00
Boblet
3a81e79554
*pipe falling sound effect*
2024-09-17 15:47:50 +02:00
Boblet
0809bc223f
Merge master into branch Optimization, intelliJ couldn't do it, so I did it myself.
2024-09-06 22:05:50 -05:00
BallOfEnergy
1195f28d8e
holy shit im done (part 2)
2024-09-06 22:04:19 -05:00
Bob
13ffc6a66a
refactor, new keybind system
2024-09-02 22:39:59 +02:00
Boblet
b8d24b5c2d
battery packs
2024-08-20 16:30:15 +02:00
Boblet
6011e9df98
bedrock sellafite
2024-08-14 15:45:58 +02:00
Boblet
1523547467
removed more crap
2024-08-13 11:21:44 +02:00
Bob
9ebcab3244
fixes, plushies
2024-08-05 00:47:32 +02:00
Bob
a016dd906a
fixes
2024-06-18 20:45:16 +02:00
George Paton
6ce3ff1a5c
guraeto daze
2024-06-11 11:24:57 +10:00
George Paton
7d26a51c6b
Fix funky placement issues
2024-06-07 14:25:46 +10:00
