1620 Commits

Author SHA1 Message Date
BallOfEnergy
c6ca31eb23 what was i doing again?
seriously someone idk what i was doing
help
2025-03-08 17:26:12 -06: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
KellenHurrey
3bf526419e
Make RBMK Rods actually be a SimpleComponent 2025-03-04 17:23:43 -08:00
Toshayo
d13d0679b7
Added OpenComputers integration for redstone-over-radio receiver/transmitter 2025-03-03 11:20:40 +01:00
HbmMods
299f514f99
Merge pull request #1960 from 70000hp/windows-95
rotary furnace fuel thing
2025-02-28 08:31:19 +01:00
George Paton
dc70967279 death by one million hashmap lookups (68ms -> 8ms over 60 seconds) 2025-02-28 11:56:03 +11:00
70000hp
1574f90a4d Merge branch 'master' into windows-95 2025-02-27 16:59:03 -05:00
George Paton
bb84ebe209 Fix #1918 - make sure node caching is per world, remove nodes from cache correctly, and prevent unloading dimensions immediately ceasing all reactivity. Also fixes rod information not updating unless the GUI is open 2025-02-26 15:38:31 +11:00
Bob
0ccf81443a the malicious gigglefish from the silly dimension 2025-02-23 18:39:11 +01:00
Dosh
b28cb312dc
fixed rotary furnace not saving output material 2025-02-20 16:39:19 +11:00
Dosh
c12948b330
automatic formatting 2025-02-20 16:37:50 +11:00
Bob
fd04bf9b3f a whole lot of nothing 2025-02-16 23:16:26 +01:00
Boblet
4aaf3ec864 new objective: kill ronald reagan 2025-02-13 16:45:38 +01:00
70000hp
3a7e974541 adjustments 2025-02-11 18:17:29 -05:00
70000hp
89fe899f2a Rotary Furnace Fuel Tweak
Better fuels speed up the rotary furnace, but require more steam
Steam requirements scale with speed nonlinearly, being x^1.5
2025-02-11 17:50:35 -05:00
Boblet
614f5db7dc fuck! 2025-02-10 16:53:37 +01:00
HbmMods
6043d1df80
Merge pull request #1934 from MellowArpeggiation/moige
NBT Structures + new Meteor Dungeon + bonus stuff
2025-02-10 08:57:53 +01:00
HbmMods
27afb9eb7b
Merge pull request #1930 from darkalit/master
Return OC integration with Energy storage block
2025-02-10 08:06:44 +01: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
Bob
5341f5d255 EOTT 2025-02-09 18:38:30 +01:00
George Paton
4fb7df8b3e Merge branch 'master' into moige 2025-02-09 18:39:57 +11:00
George Paton
3dbe648ebe bring NBTStructures to NTMain! 2025-02-09 18:39:15 +11:00
darkalit
4a95dc1240 Return OC integration with Energy storage block 2025-02-07 23:57:28 +02:00
Boblet
b60db5b911 pain 2025-02-06 16:48:29 +01:00
Dosh
5f1a4509f2
PA Detector fixes and improved diagnostics 2025-02-07 00:08:31 +11:00
Boblet
bd59ae5970 flixes 2025-02-05 16:45:49 +01:00
Boblet
a814e581b9 time to eat 40lbs of dynamite then die 2025-02-03 16:24:41 +01:00
George Paton
c49161ab39 Merge branch 'master' into moige 2025-02-03 10:44:17 +11:00
George Paton
a581cb74d0 Refueling Station! Refuels armor, attached armor mods, and any held items! Now Black Mesa themed! 2025-02-03 10:38:47 +11:00
Bob
6027ad963b fuck off 2025-02-02 22:05:58 +01:00
Bob
0e0777f196 the rim flappe on a bongfish is mated to the bungus of its fuccbone.
the scrotewad is onyl present on females above the pootsack (see: snogbag).
2025-02-02 17:21:34 +01:00
Boblet
98aea38025 hey lois look i'm a commit message 2025-01-31 15:24:14 +01:00
Boblet
691ff5c1d5 floppotron 2025-01-29 16:37:12 +01:00
Bob
a074a4a249 the escape plan 2025-01-28 23:24:40 +01:00
Boblet
bc3e643f97 a touch too much 2025-01-28 16:37:59 +01:00
Boblet
841864e368 the blombus 2025-01-27 16:55:41 +01:00
HbmMods
64f5bbe4bb
Merge pull request #1891 from t3435ryt/oc-compat
Add OpenComputers Compatibility for Combustion Engine 2
2025-01-27 08:24:03 +01:00
HbmMods
3649ed45cf
Merge pull request #1894 from MellowArpeggiation/master
Fix foundry channel clogs
2025-01-27 08:21:50 +01:00
George Paton
e65a98421f handle shovels and prevent any unforeseen issues (like if a channel gets separated by breaking/explosion) 2025-01-27 10:13:11 +11:00
Bob
15645648c5 sharticle accelerator 2025-01-26 22:09:21 +01:00
George Paton
8634d63625 Prevent contiguous foundry channels from accepting different materials until fully emptied, preventing clogs 2025-01-26 12:31:35 +11:00
Bob
fb1e20c11f 🅱️all 🅱️usting 2025-01-25 20:25:01 +01:00
t3435ryt
0222ebfaf9 Fix stupidity 2025-01-24 20:42:44 -05:00
t3435ryt
1274fdcbac Add OpenComputers Compatibility for Combustion Engine 2025-01-24 20:09:36 -05:00
Boblet
11e96c08c0 porting of the ports 2025-01-23 16:49:42 +01:00
Boblet
31eeb2ab94 heaven sent & hell bent 2025-01-22 16:55:52 +01:00
Boblet
4024249bec deplorable gollompus 2025-01-21 16:44:09 +01:00
HbmMods
2d007e836f
Merge pull request #1873 from Agarmal/OpenComputers-Better-Integration
Add vent carbon dioxide function in Zirnox for OpenComputers
2025-01-20 08:10:37 +01:00
Bob
6373c09081 PERFLUOROMETHYL WANTS TO KNOW YOUR LOCATION 2025-01-19 22:45:37 +01:00
Boblet
986276428e no 2025-01-17 15:20:28 +01:00