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
Bob
fd04bf9b3f
a whole lot of nothing
2025-02-16 23:16:26 +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
19af9d769d
Fix #4 .
...
Fix timed bombs not showing a time.
2025-01-08 20:48:53 -06:00
BallOfEnergy
ec6cd544d2
An absolute ton of cleanup.
2025-01-04 01:04:57 -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
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
BallOfEnergy
7b65e45663
Unused import cleaning!
2024-09-06 22:31:27 -05: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
BallOfEnergy
47657366cc
the ByteBuf shenanigans begin!!
2024-09-06 21:59:06 -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
70000hp
5de273b5ba
five million billion impls
...
hopefully all fluid impls done outside of the rbmk stuff
Also implemented copy pasting of molten metals, copying from anything that holds molten metal, and pasting into outlets for filters
2024-08-24 14:19:54 -04:00
Boblet
b8d24b5c2d
battery packs
2024-08-20 16:30:15 +02:00
Bob
3aef7e1577
i love to drink oil
2024-08-15 20:38:22 +02:00
Boblet
d70ea038a0
an big slappy
2024-08-12 16:26:09 +02: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
BallOfEnergy
b6125ac24f
ITER/fusion compat done
...
blankets, fluid, energy, everything!
2024-06-12 16:30:29 -05:00
BallOfEnergy
45cdf2c823
launch pad compat!!
...
ITER compat and ICF compat next probably
2024-06-12 16:18:25 -05:00
BallOfEnergy
7f652931a0
begin work on launch pad compat (again)
2024-06-11 22:10:31 -05:00
Vaern
6f86dc4db2
preliminary changes
2024-05-26 23:02:54 -07:00
Boblet
17a9d824aa
some fixes, smeltable diamonds and emeralds
2024-04-17 11:32:41 +02:00
HbmMods
1f271f6b23
Merge pull request #1432 from HbmMods/TSPA
...
guess what TSPA stands for
2024-04-14 14:23:06 +02:00
Bob
b661b89334
SISTOR! DID YOU USE ALL MY DIAMONDS TO MAKE JUKEBOXES?
...
yeag
2024-04-09 20:57:33 +02:00
Boblet
c9c6549340
everything is falling the fuck apart
2024-04-09 16:55:53 +02:00
Boblet
2c1c56a037
more cleanup, configs
2024-03-22 15:09:21 +01:00
Bob
9cf673206a
flash! bam! alakazam!
2024-03-17 17:31:50 +01:00
Bob
98115ac784
i forgor
2024-03-05 21:41:56 +01:00
Bob
08812a700e
the malicious gigglefish from the silly dimension
2024-03-04 21:08:31 +01:00
Boblet
23e58c7e1d
0000000000
2024-03-04 16:44:34 +01:00
Boblet
b30bb8ae15
last bit of EC compat stuff
2024-02-21 16:31:34 +01:00
BallOfEnergy
0b79e3c29a
oops useless imports
2024-02-20 20:12:50 -06:00
BallOfEnergy
5ce1b997b3
small bug fix
2024-02-20 20:03:45 -06:00
Boblet
79d57071b7
fixes, flixes and foxes
2024-02-19 15:55:48 +01:00
Bob
cc5371a761
no more instant loading
2024-02-18 21:13:15 +01:00
Bob
b922c79b35
and then this
2024-02-18 18:22:10 +01:00
HbmMods
1811a41fd5
Merge pull request #1340 from MellowArpeggiation/master
...
Old-school Super Shotgun animations
2024-02-18 17:55:02 +01:00
Bob
7ad017ec8e
eeeeeeee macarena!
2024-02-18 17:52:42 +01:00
George Paton
be17321013
Merge branch 'HbmMods:master' into master
2024-02-18 17:29:31 +11:00
Bob
65cda2b65b
almost forgot about this one
2024-02-16 22:07:17 +01:00
Bob
ca2505dad0
launch pad textures, silo launch pad
2024-02-14 21:29:08 +01:00
Boblet
786ced191b
launch pad condensation for LOXY rockets
2024-02-14 15:38:25 +01:00
George Paton
9ff31388c8
Make worldgen mines be inactive until a player comes within 25 blocks, this has two effects:
...
* Far away worldgen mines won't be triggered by mobs
* You can hear an activation beep (once), giving you an indication of their existence
2024-02-14 17:21:07 +11:00
Bob
82ec052d27
launch pad GUI, crash fix
2024-02-13 20:37:44 +01:00
Boblet
daaf50efd4
the malicious gigglefish from the silly dimension
2024-02-13 14:01:01 +01:00
