BallOfEnergy
73aff1d158
Merge branch 'HbmMods:master' into Optimization
2024-10-27 23:07:17 -05:00
Bob
55bced3b3e
fucked up evil weapons
2024-10-27 19:02:46 +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
Boblet
f8de5314f6
it's funny because the gun that's called "broken" is unbreakable
2024-10-25 15:01:12 +02:00
Bob
b57102e4ce
four cheese pizza
2024-10-24 21:53:06 +02:00
Bob
867a6d38de
SHREDDER
2024-10-24 00:14:24 +02:00
Boblet
8f2471986b
foundry tweaks, removed more unused crap
2024-10-23 16:21:59 +02:00
Bob
8f135b80d5
.50, bacon medium grease
2024-10-22 22:06:11 +02:00
Boblet
400e0b24ed
there are chemicals in my food
2024-10-22 16:36:46 +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
be1b1c1df0
one shotgun, two shotgun
2024-10-19 00:32:07 +02:00
Bob
09d11d49da
explosive yeeter
2024-10-17 22:22:54 +02:00
Bob
7d2df857e6
spas12
2024-10-16 22:12:18 +02:00
Bob
ee1d3b37cd
micro uzi? wrong! macro uzi
2024-10-15 22:44:36 +02:00
BallOfEnergy
b4b9042065
Merge remote-tracking branch 'upstream/master' into Optimization
...
# Conflicts:
# src/main/java/com/hbm/tileentity/network/TileEntityCraneGrabber.java
2024-10-14 22:02:36 -05:00
Bob
8e3df0cc22
comically long pistol
2024-10-14 22:56:32 +02:00
BallOfEnergy
4d489bc938
Merge remote-tracking branch 'upstream/master' into Optimization
2024-10-12 22:13:39 -05:00
Bob
44b1604992
eh hehehehehe, fire, FIRE!
2024-10-13 01:05:06 +02: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
Bob
c7ced50e67
DAY AND NIGHT
2024-10-09 23:19:54 +02:00
Bob
f2b64a82fe
cursed 60s quad barrel shotgun from hell
2024-10-09 00:20:08 +02:00
Bob
6b0835f19c
some very pissed off bees
2024-10-07 22:49:04 +02:00
Bob
cdec9d074d
greasy joe, horse leg and 🅱️ untsman
2024-10-06 22:37:16 +02:00
Bob
de238ca0e0
🅱️ enry
2024-10-03 21:29:20 +02:00
Bob
59254c7179
the horngus of a dongfish
2024-10-02 22:02:19 +02: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
6cddb3e238
NEI stuff, textures
2024-09-30 22:12:21 +02:00
Bob
1d92bcbf13
ball and powder torture
2024-09-24 23:53:14 +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
HbmMods
23471b1ad1
Merge branch 'master' into more-more-qol
2024-09-13 08:12:03 +02:00
BallOfEnergy
bad3d3f031
Merge branch 'HbmMods:master' into Optimization
2024-09-12 13:06:30 -05:00
Bob
00f5e8e279
keybind bullshittery
2024-09-10 21:40:39 +02:00
Boblet
699a8759a7
removed a ton of unused crap
2024-09-10 16:44:34 +02:00
BallOfEnergy
2706fd2a0c
Merge branch 'HbmMods:master' into Optimization
2024-09-08 14:16:06 -05:00
HbmMods
59d54942a3
Merge pull request #1658 from 9Valjew/satunfuck
...
Xenium Resonator radar Compat
2024-09-08 17:47:07 +02:00
BallOfEnergy
bc0d1059d8
i want to kill myself ❤️
2024-09-06 21:59:03 -05:00
BallOfEnergy
639822b48d
hooolyyyy shiiiiiiiit
...
i finally fixed the bug!!!!!!!!!!
2024-09-06 21:56:18 -05:00
Boblet
32ab93f146
gun crap
2024-09-05 16:59:14 +02:00
Bob
13ffc6a66a
refactor, new keybind system
2024-09-02 22:39:59 +02:00
9Valjews
e01da0dc81
There was no fucking reason for it so be a seperate item I was just stupid
2024-08-31 23:46:46 +03:00
70000hp
b5f2bb3355
Merge branch 'master' into more-more-qol
2024-08-30 17:34:39 -04:00
Bob
d0725bb9f0
more battery packs
2024-08-20 23:18:54 +02:00
Boblet
b8d24b5c2d
battery packs
2024-08-20 16:30:15 +02:00
Bob
1caeec5ea9
d(err)ick
2024-08-18 21:00:27 +02:00
Boblet
8597eda40f
inventory peaks
2024-08-16 14:09:01 +02:00
Boblet
6011e9df98
bedrock sellafite
2024-08-14 15:45:58 +02:00
