1337 Commits

Author SHA1 Message Date
Boblet
1193b0f51f spring cleaning 2025-04-15 16:28:06 +02:00
George Paton
0338c6a8fd only delete connected conveyors, and only when crouching 2025-04-15 13:57:33 +10:00
Bob
624bb35b72 sure, why not 2025-04-12 16:37:40 +02:00
Bob
1f6d4bf55b the part i forgot to push 2025-04-11 19:26:33 +02:00
Boblet
98bc692d29 this is the last fucking refactor PR 2025-04-09 11:53:16 +02:00
Boblet
e23636044a moderate amounts of tomfoolery 2025-04-04 15:04:00 +02:00
HbmMods
4aa7d195c0
Merge pull request #2036 from EverMine/master
Models refactoring, bugfixes
2025-04-02 09:40:58 +02:00
IOcmet
484ff585d1
I forgot to make it static 2025-04-01 20:37:23 +03:00
ItsMakar
bfede6d87b Refactor models, fix ModelArmorBase compatibility with SkinPort and Galacticraft 2025-04-01 13:06:57 +03:00
HbmMods
7fe7960dba
Merge pull request #2035 from Vaern/texture-test
added lightstone, variants, recipes, stairs, slabs
2025-03-31 22:22:21 +02:00
Vaern
c629b1e79b added lightstone, variants, recipes, stairs, slabs 2025-03-31 11:48:56 -07:00
George Paton
f465758bfd whoops that was meant to be _client side_ 2025-03-31 18:27:25 +11:00
George Paton
e02142d255 new conveyor wand item that masquerades as a conveyor block, performing autoplacement! (from downstream spacefork) 2025-03-31 18:19:34 +11:00
HbmMods
f43cf194cd
Merge pull request #2022 from BallOfEnergy1/Optimization
Toolbox Flixes!
2025-03-31 08:01:00 +02:00
Bob
3323356c73 waser wifle 2025-03-30 23:08:05 +02:00
BallOfEnergy
fa6d2a4e56 Fix rare crash related to toolboxing with a null NBT.
Fix toolboxes not popping when swapping hotbars, even when >6KB limit.
2025-03-28 18:31:31 -05:00
BallOfEnergy
b1a778c949 Merge remote-tracking branch 'upstream/master' into Optimization 2025-03-28 18:06:33 -05:00
BallOfEnergy
e9376c788c oh i kinda want this changed
one less warning lmao
2025-03-27 21:17:16 -05:00
BallOfEnergy
e79eae78a7 am I stupid?
Fix a few issues related to naming.
Fix toolboxes blocking all radiation.
Add toolbox tooltip.
Swap toolbox operations; clicking now swaps hotbars and shift-clicking opens the inventory for easier access (recommended by Mellow).
2025-03-27 21:16:29 -05:00
George Paton
2c4dc279b6 Merge branch 'master' into rbmk-crafting 2025-03-28 11:21:57 +11:00
Bob
f177c8899a i feel so shrigma 2025-03-27 22:12:19 +01:00
Boblet
f9f1e1c73e go go gadget: replace uterus with 30lb bowling ball 2025-03-27 16:02:35 +01:00
LegendaryDoge30
300f005de4 flux
added a single parenthesis to the thorium rbmk fuel flux function
2025-03-26 18:18:39 +01:00
Boblet
9943a73f2a groundbreaking changes 2025-03-26 16:53:07 +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
George Paton
86ce0f6509 if rod is hot, only show cooling recipe, if rod is cold, show only disassembly recipe 2025-03-26 11:50:35 +11:00
Boblet
b90741f640 you've creeked your last flow, pardner 2025-03-25 15:48:29 +01:00
George Paton
a2f5eeada7 Add crafting recipes for RBMK fuel cooling, rod disassembly, and waste decaying 2025-03-25 16:42:00 +11:00
George Paton
dfd5d2c2a6 They Came From OUTER SPACE 2025-03-25 10:29:21 +11:00
HbmMods
4c58d9a084
Merge pull request #2005 from BallOfEnergy1/Optimization
Toolboxes!
2025-03-24 08:09:17 +01:00
Bob
d6c15c8ff2 the malicious gigglefish from the silly dimension 2025-03-23 21:46:56 +01:00
Bob
737fb1e432 go go gadget HIV 2025-03-22 23:29:02 +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
Boblet
3ac7a8cdd6 i cast: testicular contortion 2025-03-21 15:21:32 +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
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
Boblet
7b80e9fb64 oh, in the distance i could see a pale light 2025-03-18 16:53:41 +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
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