4383 Commits

Author SHA1 Message Date
Lazzzycatwastaken
9806d53b45 forgorred to commit ts 2025-03-23 16:25:36 +01:00
Lazzzycatwastaken
7d642f155c Fixed retardation code
Oilrig building upgraded and made it spawn always on the same Y
2025-03-23 16:17:16 +01:00
Lazzzycatwastaken
eb8971dc2e Added oil rig.
Made all structures rarer (via null spawn weight)
2025-03-23 13:27:38 +01:00
Lazzzycatwastaken
e318c83023 Yes i've planted the oil rig malware bob 👿 2025-03-23 00:47:32 +01:00
Lazzzycatwastaken
8bb91eda3c Oil Rig item pool 2025-03-22 21:33:25 +01:00
Lazzzycatwastaken
7ae8693841 Sunken Aircraft Carrier structure added. 2025-03-22 19:10:06 +01:00
HbmMods
07618f6a60
Merge pull request #2002 from EverMine/master
Add missing adding to neiShredderRecipes in CompatRecipeRegistry
2025-03-21 19:23:31 +01:00
ItsMakar
cf5e0e7d12 No fucking way i did that mistake 2025-03-21 17:52:00 +02:00
ItsMakar
291a34103a Add missing adding to neiShredderRecipes in CompatRecipeRegistry 2025-03-21 16:42:49 +02:00
Boblet
3ac7a8cdd6 i cast: testicular contortion 2025-03-21 15:21:32 +01:00
HbmMods
fc716379c9
Merge pull request #2001 from Vaern/master
G3 Attachments
2025-03-21 07:55:42 +01:00
HbmMods
4ceadec5c6
Merge branch 'master' into master 2025-03-21 07:55:32 +01:00
HbmMods
ffa8a0c5bb
Merge pull request #1998 from BallOfEnergy1/Optimization
Crates, but backpacks!
2025-03-21 07:51:46 +01:00
Vaern
4ef77bad1f added g3 attachments, fixed g3 model, changed/fixed anims + orchestra 2025-03-20 22:17:32 -07:00
Bob
9f0fd19ef8 the good shit 2025-03-20 22:57:39 +01:00
Boblet
51b7c71534 good god, we gonna rock down to electric avenue 2025-03-20 15:42:37 +01:00
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
Bob
1538932316 guns are great, but why not make them better? 2025-03-19 22:13:42 +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
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