4411 Commits

Author SHA1 Message Date
HbmMods
473bdd67c4
Merge pull request #2006 from Lazzzycatwastaken/AAAAAAAAAAAAAAA
Ocean structures
2025-03-26 09:37:27 +01:00
HbmMods
4e08e107a8
Merge pull request #2012 from MellowArpeggiation/master
More NBTStructure improvements from OUTER SPACE
2025-03-26 09:28:00 +01:00
HbmMods
088a640d8f
Merge pull request #2014 from Toshayo/master
Fixed crate item movement prevention applying to all held items
2025-03-26 09:25:16 +01:00
Toshayo
ca8a7a72f9
Fixed crate item movement prevention applying to all held items (let me move this coal powder) 2025-03-25 21:13:23 +01:00
Boblet
b90741f640 you've creeked your last flow, pardner 2025-03-25 15:48:29 +01:00
George Paton
20bd424cd4 fix rare crash when generating structures 2025-03-25 12:23:18 +11:00
George Paton
dfd5d2c2a6 They Came From OUTER SPACE 2025-03-25 10:29:21 +11:00
Lazzzycatwastaken
d625a9a9d9 Fixed doors on oil rig,
Fixed waterlogging on aircraft carrier
Balanced loot on aircraft carrier
Removed derrick from oil rig and made it a purely cosmetic build
removed asphalt from carrier because it made you 100x faster in water, and flung you across half the ocean.
2025-03-24 22:12:11 +01:00
Lazzzycat
375b4581e5
Merge branch 'HbmMods:master' into AAAAAAAAAAAAAAA 2025-03-24 20:53:31 +01:00
Lazzzycatwastaken
7731b4c1e8 Fixed boat deleting blocks under it or sum 2025-03-24 17:39:11 +01:00
Boblet
79d3b0cbb7 the infinite agony generator 1.0.27_X5279 2025-03-24 16:01:13 +01:00
Boblet
7146e20fb3 f u c k 2025-03-24 10:38:15 +01:00
HbmMods
659bd662bf
Merge pull request #2011 from MellowArpeggiation/master
fix switching barrel types not updating fluid net
2025-03-24 10:34:27 +01:00
George Paton
177e5a245e dingleberry blues 2025-03-24 20:00:01 +11:00
George Paton
b5d76afb8c fix switching barrel types not updating fluid net 2025-03-24 19:56:04 +11:00
HbmMods
4c58d9a084
Merge pull request #2005 from BallOfEnergy1/Optimization
Toolboxes!
2025-03-24 08:09:17 +01:00
HbmMods
5e9399a696
Merge pull request #2010 from MellowArpeggiation/master
Fix fluidnet bugs
2025-03-24 07:54:55 +01:00
George Paton
141e80bfcb batteries and fluid tanks now block propagation if not set to buffer mode (which the player can circumvent by cabling/piping around them, which gives them the choice of behaviour, and is more intuitive) 2025-03-24 16:09:56 +11:00
George Paton
62485c6854 fluid tank handling updated to match energy storage blocks, allowing for more consistent tank leveling behaviour 2025-03-24 15:05:56 +11:00
George Paton
f00f2c7ca3 fix compat shim incorrectly subscribing receiving tanks 2025-03-24 12:25:06 +11:00
George Paton
6db42e6d4b fix fluid valves not deactivating (was clearing power net rather than fluid net connections) 2025-03-24 11:49:53 +11:00
Bob
d6c15c8ff2 the malicious gigglefish from the silly dimension 1.0.27_X5278 2025-03-23 21:46:56 +01:00
Lazzzycatwastaken
6ceba52f95 Added beached patrol boat 2025-03-23 18:12:26 +01:00
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
Bob
737fb1e432 go go gadget HIV 2025-03-22 23:29:02 +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
BallOfEnergy
9839107c4e New GUI, also some index fixes. 2025-03-22 13:07:04 -05:00
BallOfEnergy
b139e084fb Merge remote-tracking branch 'upstream/master' into Optimization 2025-03-22 00:12:50 -05:00
BallOfEnergy
f27234879f BOO! surprise feature!
Completely revamped toolboxes, now they swap hotbars!
2025-03-22 00:12:32 -05: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
725baf37ff Merge remote-tracking branch 'upstream/master' into Optimization 2025-03-19 22:01:34 -05: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