4366 Commits

Author SHA1 Message Date
BallOfEnergy
8608796a09 ok i want this
listen ok im proud of them and i dont want them to fade
2025-03-19 20:44:39 -05: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
5a9f3e75dc YOU KNOW HOW WE DO IT 2025-03-19 16:28:55 +01:00
Bob
ccc80781b2 ok that's it i've had enough 2025-03-18 21:20:57 +01:00
Boblet
7b80e9fb64 oh, in the distance i could see a pale light 2025-03-18 16:53:41 +01:00
Boblet
360daaa524 Merge branch 'master' of https://github.com/HbmMods/Hbm-s-Nuclear-Tech-GIT 2025-03-17 17:00:12 +01:00
Boblet
b5166ca517 augh 2025-03-17 17:00:07 +01:00
HbmMods
850679ca94
Merge pull request #1982 from KellenHurrey/master
Added a keybind for toggling the magnet armor modifications
2025-03-17 08:09:59 +01:00
HbmMods
11e9bc22ed
Merge pull request #1985 from Toshayo/master
Support for more unusual pylons
2025-03-17 08:09:03 +01:00
Bob
6d1165ba33 guh 2025-03-16 20:28:44 +01:00
KellenHurrey
a6f3cd54eb
Merge branch 'HbmMods:master' into master 2025-03-14 09:34:02 -07:00
Boblet
900f8e6959 flowing my creek so hard rn you wouldn't believe 2025-03-14 14:28:13 +01:00
KellenHurrey
86a805bd92
Merge branch 'HbmMods:master' into master 2025-03-13 21:39:31 -07:00
Toshayo
98f4b22a19
Upgraded base pylon code to support more unusual pylon types 2025-03-13 23:10:08 +01:00
Toshayo
5ead78349c
Updated TileEntityPylonBase and RenderPylonBase according .editorconfig 2025-03-13 23:08:19 +01:00
Boblet
3c2ddf4d64 *vomits* 2025-03-13 16:58:15 +01:00
KellenHurrey
f461851228 magnet keybinds 2025-03-12 12:30:08 -07:00
HbmMods
2bdbfda243
Merge pull request #1981 from KellenHurrey/master
There i fixed chunkloading drones
2025-03-12 09:07:22 +01:00
KellenHurrey
d1e4d1572f wholy shit i actually fixed chunkloading drones (and added a new util class) 2025-03-11 22:28:00 -07:00
Bob
20cb0f6f5d ba-dee-ya, say do u rember? ba-dee-ya, wen u feeled happy
ba-dee-ya, alway rember happy day!
2025-03-10 21:56:35 +01:00
Boblet
565d5c1129 go go gadget: detonate nutsack 2025-03-10 16:57:02 +01:00
Bob
0ca1be3d6f goober 2025-03-09 22:03:34 +01:00
BallOfEnergy
ac81021ddf small fix 2025-03-08 17:34:08 -06:00
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
HbmMods
3da9f7c56f
Merge pull request #1973 from MellowArpeggiation/master
Fix comically long 9mm reload animation snapping
2025-03-07 08:05:23 +01:00
George Paton
df5253df1b
Merge branch 'HbmMods:master' into master 2025-03-07 16:50:40 +11:00
George Paton
1afe84a871 shit idiot brain fungus the sequel 2025-03-07 16:49:56 +11:00
Boblet
5d24e76601 compat for (hopefully) robust external recipe registering 2025-03-06 14:25:30 +01:00
Bob
a78dae4a8e alright i'm tired 2025-03-05 21:58:20 +01:00
HbmMods
23928d3d7b
Merge pull request #1970 from KellenHurrey/master
Make RBMK Rods actually be a SimpleComponent
2025-03-05 18:56:50 +01:00
Boblet
e21fe3eecc config crap 2025-03-05 16:57:50 +01:00
KellenHurrey
3bf526419e
Make RBMK Rods actually be a SimpleComponent 2025-03-04 17:23:43 -08:00
Boblet
ed4421b2e2 burned old textures, better sludge 2025-03-04 16:50:33 +01:00
HbmMods
5a9b65095d
Merge pull request #1965 from Toshayo/master
Redstone-over-Radio OpenComputers integration + Mining satellite NEI handler
2025-03-03 20:20:06 +01:00
Boblet
00cacbbadc damage fix, mas36 anim error, server config command 2025-03-03 16:05:28 +01:00
Toshayo
228fbf506d
Added satellite NEI handler 2025-03-03 11:20:40 +01:00
Toshayo
d13d0679b7
Added OpenComputers integration for redstone-over-radio receiver/transmitter 2025-03-03 11:20:40 +01:00
Bob
1238933bca yeag 1.0.27_X5257 2025-03-02 22:49:29 +01:00
HbmMods
3a5c943c0a
Merge pull request #1962 from MellowArpeggiation/master
fix vertibirds spawning unburied
2025-03-01 09:47:27 +01:00
George Paton
18d21a0f13 fix vertibirds spawning unburied 2025-03-01 10:40:44 +11:00
HbmMods
299f514f99
Merge pull request #1960 from 70000hp/windows-95
rotary furnace fuel thing
2025-02-28 08:31:19 +01:00
HbmMods
4c2639ecf4
Merge pull request #1961 from MellowArpeggiation/master
Performance boost for RBMKs (thanks DEKO)
2025-02-28 08:28:48 +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
Boblet
fb414ad80a yes we know your name now fuck off 2025-02-27 16:38:40 +01:00
HbmMods
3ae27afe4d
Merge pull request #1959 from Vaern/master
spent casings prrrrrr!!!
2025-02-27 10:30:24 +01:00
HbmMods
fa93b944b5
Merge pull request #1958 from MellowArpeggiation/master
Fix #1918 - RBMKs turning off when chunks unload, a world is quit, or a dimension unloads
2025-02-27 10:27:15 +01:00
Vaern
e6aa3f232d remove unused imports 2025-02-26 23:42:07 -08:00