Bob
|
d6c15c8ff2
|
the malicious gigglefish from the silly dimension
|
2025-03-23 21:46:56 +01:00 |
|
Bob
|
737fb1e432
|
go go gadget HIV
|
2025-03-22 23:29:02 +01:00 |
|
BallOfEnergy
|
c73ec3a0ac
|
i fucked around, i found out
this shit WORKS
|
2025-03-19 13:31:56 -05:00 |
|
BallOfEnergy
|
0a59fa86a0
|
Merge remote-tracking branch 'upstream/master' into Optimization
# Conflicts:
# src/main/java/api/hbm/fluid/IFluidConnector.java
# src/main/java/api/hbm/fluid/IFluidUser.java
# src/main/java/com/hbm/tileentity/machine/TileEntityWatz.java
# src/main/java/com/hbm/tileentity/machine/storage/TileEntityMachineFluidTank.java
|
2025-03-19 13:28:38 -05:00 |
|
Boblet
|
565d5c1129
|
go go gadget: detonate nutsack
|
2025-03-10 16:57:02 +01:00 |
|
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 |
|
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 |
|
darkalit
|
4a95dc1240
|
Return OC integration with Energy storage block
|
2025-02-07 23:57:28 +02:00 |
|
Boblet
|
4024249bec
|
deplorable gollompus
|
2025-01-21 16:44:09 +01: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 |
|
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
|
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
|
063ab4032f
|
yeah these are commits from like a month ago idk what any of this is
|
2024-10-10 19:44:30 -05: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 |
|
Boblet
|
3a81e79554
|
*pipe falling sound effect*
|
2024-09-17 15:47:50 +02:00 |
|
HbmMods
|
23471b1ad1
|
Merge branch 'master' into more-more-qol
|
2024-09-13 08:12:03 +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 |
|
70000hp
|
b5f2bb3355
|
Merge branch 'master' into more-more-qol
|
2024-08-30 17:34:39 -04:00 |
|
Boblet
|
a391eda01d
|
legalize 70 ton liquid fuel rocket engines
|
2024-08-26 16:15:08 +02:00 |
|
George Paton
|
0115928304
|
fix missing FENSU sync (soz bob)
|
2024-08-22 09:48:21 +10:00 |
|
Boblet
|
b8d24b5c2d
|
battery packs
|
2024-08-20 16:30:15 +02:00 |
|
George Paton
|
f58d97c007
|
switch TEMachineBattery to bytebuf
|
2024-08-16 21:57:42 +10:00 |
|
70000hp
|
54ec5e7028
|
Merge branch 'master' into more-more-qol
|
2024-08-12 17:44:05 -04:00 |
|
70000hp
|
1495dfc2b5
|
pain
|
2024-08-12 17:38:15 -04:00 |
|
Boblet
|
d70ea038a0
|
an big slappy
|
2024-08-12 16:26:09 +02:00 |
|
70000hp
|
90d552c03a
|
the power of friendship isn't working anymore
I need to kill this motherfucker
|
2024-08-03 19:26:15 -04:00 |
|
Boblet
|
f8465b5071
|
flixes
|
2024-07-15 13:11:13 +02:00 |
|
70000hp
|
7f666ecaff
|
Fixed items with meta not working + mass storage support
|
2024-07-10 13:38:45 -04:00 |
|
BallOfEnergy
|
e1226c94be
|
sowwy
|
2024-07-02 02:44:06 -05:00 |
|
BallOfEnergy
|
7022dcd1af
|
fix issues with artillery proxy OC compat
also fix a big sound system issue where other mods would run out of sound memory on the sound card if they loaded after NTM reserved 1000 CHANNELS
|
2024-06-28 14:37:28 -05:00 |
|
BallOfEnergy
|
6e5b689ed2
|
New OC Compatibility system!
|
2024-06-13 20:01:10 -05:00 |
|
George Paton
|
2960c29918
|
Add ByteBuf string reader/writer, and migrate the biggest CPU time offenders to ByteBuf packets
|
2024-06-07 18:20:43 +10:00 |
|
Boblet
|
ad45288d5f
|
the soldering
|
2024-06-06 15:42:51 +02:00 |
|
Bob
|
9eaeddca32
|
that oughta do it
|
2024-04-20 17:30:33 +02:00 |
|
Boblet
|
673628bc02
|
just keep whacking it until it behaves
|
2024-04-15 13:30:23 +02:00 |
|
Boblet
|
9c7a96d867
|
CRUSHIN' CRUSHIN' (the second)
|
2024-04-12 09:42:23 +02:00 |
|
Boblet
|
ba58f42ef2
|
I will kill Horse Ronald Reagan when I become 23 years old
|
2024-04-10 16:10:55 +02:00 |
|
Boblet
|
c9c6549340
|
everything is falling the fuck apart
|
2024-04-09 16:55:53 +02:00 |
|
Boblet
|
7429327034
|
making use of the pollution tag
|
2024-03-12 16:32:54 +01:00 |
|
Boblet
|
675838eec7
|
more energy control compat stuff
|
2024-02-15 16:10:53 +01:00 |
|
Boblet
|
a8acfafebf
|
polluting fluid trait, more oil work
|
2024-02-07 16:44:07 +01:00 |
|
Bob
|
67980608ac
|
oops
|
2024-01-28 21:37:40 +01:00 |
|
Boblet
|
a67faa99df
|
muffler 2: the remufflering
|
2024-01-22 14:43:05 +01:00 |
|
Bob
|
32a658bd12
|
reda!
|
2024-01-14 18:56:25 +01:00 |
|
Boblet
|
a647f93f15
|
incinerated old garbage
|
2024-01-11 16:35:55 +01:00 |
|
Boblet
|
65412f0c89
|
oop forgot to push this
|
2023-12-19 08:02:11 +01:00 |
|
BallOfEnergy
|
d4f8de4a54
|
Finishing touches.
|
2023-11-30 18:45:13 -06:00 |
|