1294 Commits

Author SHA1 Message Date
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
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
Boblet
3c2ddf4d64 *vomits* 2025-03-13 16:58:15 +01:00
KellenHurrey
f461851228 magnet keybinds 2025-03-12 12:30:08 -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
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
Boblet
e21fe3eecc config crap 2025-03-05 16:57:50 +01:00
Boblet
ed4421b2e2 burned old textures, better sludge 2025-03-04 16:50:33 +01:00
Boblet
00cacbbadc damage fix, mas36 anim error, server config command 2025-03-03 16:05:28 +01:00
Bob
1238933bca yeag 2025-03-02 22:49:29 +01: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
Vaern
247f3eace8 finishing touches 2025-02-26 23:38:28 -08:00
Vaern
b789482f3d added initial rotvel to orchestras, flixes 2025-02-26 23:29:12 -08:00
Vaern
b3e8fad079 added initial rotational momentums to casingCreator
remind me tomorrow to set the rest of the constants n add a lil randomess
2025-02-26 00:21:06 -08: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
Vaern
c5c6beb453 Finished casing physics
added initial momentums as a test
2025-02-24 23:47:48 -08:00
Bob
0ccf81443a the malicious gigglefish from the silly dimension 2025-02-23 18:39:11 +01:00
Bob
fd04bf9b3f a whole lot of nothing 2025-02-16 23:16:26 +01:00
Boblet
b1d5540887 my quest for beans has taken me to many places 2025-02-14 15:08:45 +01:00
Boblet
4972f4023a thorn glognuts for only 5 bintar 2025-02-11 16:46:14 +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
2968d927bc
Merge branch 'master' into master 2025-02-10 08:02:24 +01:00
George Paton
c1a2f8d270 stack jetpack tanks to 16, and don't consume them if jetpack is already full 2025-02-10 11:43:30 +11: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
Bob
f74ce297f8 chromatic aberration 2025-02-08 23:19:33 +01:00
Toshayo
b462b30156
Night vision toggling with HUD 2025-02-07 13:07:39 +01: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
HbmMods
201689942a
Merge pull request #1905 from 70000hp/Aluminium-fifth-attempt-at-merging
Aluminium 2
2025-02-02 17:29:49 +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
d8ab0e7ecf 1000 lines of code 2025-01-30 16:01:05 +01:00
70000hp
6e3e702213 my bones 2025-01-29 16:32:23 -05:00
Bob
a074a4a249 the escape plan 2025-01-28 23:24:40 +01:00
Boblet
03639e2cdb i'm just gonna call this "gock" with no further context 2025-01-28 13:15:41 +01:00
Bob
15645648c5 sharticle accelerator 2025-01-26 22:09:21 +01:00