3959 Commits

Author SHA1 Message Date
BallOfEnergy
42e200ac7a just some final tweaks to make sure that I don't fuck anything up 2024-10-13 17:04:36 -05:00
BallOfEnergy
60536af06c Merge remote-tracking branch 'upstream/master' into Optimization 2024-10-13 15:51:07 -05:00
BallOfEnergy
b63ff682fd Small fixes 2024-10-13 15:50:00 -05:00
BallOfEnergy
94c97bc87a bug fixes part 2
(both me and radium did testing)
2024-10-13 15:27:40 -05:00
Bob
047ebfe8aa better explosion particle effects, flamethrower sound loop 2024-10-13 19:49:31 +02:00
HbmMods
1927110709
Merge pull request #1729 from MellowArpeggiation/master
two bees, or not two bees
2024-10-13 17:07:34 +02:00
HbmMods
c8444cb8b7
Merge branch 'master' into master 2024-10-13 17:07:26 +02:00
Bob
ceb9abbec4 extremely shitty animations 2024-10-13 17:06:46 +02:00
BallOfEnergy
e3cf157501 bug fixes part 1
(thank you radium)
2024-10-13 00:27:55 -05:00
BallOfEnergy
5c909e156f there i fixed it :woo: 2024-10-12 22:32:58 -05:00
BallOfEnergy
ccebbbca24 Holy SHIT! i think i fixed it 2024-10-12 22:14:08 -05:00
BallOfEnergy
4d489bc938 Merge remote-tracking branch 'upstream/master' into Optimization 2024-10-12 22:13:39 -05:00
Bob
44b1604992 eh hehehehehe, fire, FIRE! 2024-10-13 01:05:06 +02:00
George Paton
e57136dc0b yeeth 2024-10-11 22:18:09 +11:00
George Paton
2e2910c2ec
Merge branch 'HbmMods:master' into master 2024-10-11 12:56:52 +11:00
George Paton
c076d4f99b bees v2 2024-10-11 12:56:22 +11:00
BallOfEnergy
063ab4032f yeah these are commits from like a month ago idk what any of this is 2024-10-10 19:44:30 -05:00
BallOfEnergy
88f5ac1cf1 Merge remote-tracking branch 'upstream/master' into Optimization
# Conflicts:
#	src/main/java/com/hbm/tileentity/TileEntityMachineBase.java
#	src/main/java/com/hbm/tileentity/machine/TileEntityHeaterElectric.java
#	src/main/java/com/hbm/tileentity/machine/TileEntityMachineSolderingStation.java
#	src/main/java/com/hbm/tileentity/machine/TileEntityPWRController.java
#	src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityCraneConsole.java
#	src/main/java/com/hbm/tileentity/network/TileEntityCraneGrabber.java
2024-10-10 19:41:23 -05:00
Bob
19cfc54dee grenade tweaks 2024-10-10 23:21:39 +02:00
Boblet
6d924cbdc5 the rim flappe on a bongfish is mated to the bungus of its fuccbone.
the scrotewad is only present on females above the pootsack (see: snogbag).
2024-10-10 16:53:11 +02:00
HbmMods
ba638e947a
Merge pull request #1727 from MellowArpeggiation/master
BONGO BONGO BONGO I DON'T WANNA LEAVE THE CONGO
2024-10-10 08:04:16 +02:00
George Paton
7c35b1923a Add Congo Lake inspect, jammed, and equip animations, also:
* fix importer breaking nested object offsets (for things like MagPlate inside Mag)
* fix sqrt3d throwing NaN on negative inputs
* >:3
2024-10-10 14:14:11 +11:00
Bob
c7ced50e67 DAY AND NIGHT 2024-10-09 23:19:54 +02:00
Boblet
66711f963e nothing productive for today 2024-10-09 16:25:43 +02:00
Bob
f2b64a82fe cursed 60s quad barrel shotgun from hell 2024-10-09 00:20:08 +02:00
HbmMods
7b127888c8
Merge pull request #1725 from MellowArpeggiation/master
Fixes to bezier fcurves
2024-10-08 20:13:25 +02:00
Boblet
86918a33e6 thorium recipe autogen 2024-10-08 16:54:52 +02:00
George Paton
9f56791abf fixes:
* NaN in `solveCubic`
* degenerate fcurves now autofix
* fix missing swizzle multiplier on export
2024-10-08 22:23:31 +11:00
HbmMods
7e9ee47d47
Merge pull request #1724 from MellowArpeggiation/master
Add support for all Blender f-curve functionality
2024-10-08 10:17:48 +02:00
George Paton
142fec169e taces -> spabs 2024-10-08 19:10:17 +11:00
George Paton
9ae58dfdb3 Support for ALL Blender fcurve functionality!! 2024-10-08 19:07:57 +11:00
Bob
6b0835f19c some very pissed off bees 2024-10-07 22:49:04 +02:00
Bob
41d8fa7478 the PWR longening 2024-10-07 20:22:48 +02:00
Boblet
5819711586 casing smoke is no longer bound to the casing config 2024-10-07 16:47:38 +02:00
HbmMods
060a21a949
Merge pull request #1722 from Vaern/hbm
swarm of angry bees
2024-10-06 22:55:43 +02:00
Vaern
78a33ddedf american 180 model + texture 2024-10-06 13:51:13 -07:00
Bob
cdec9d074d greasy joe, horse leg and 🅱️untsman 2024-10-06 22:37:16 +02:00
HbmMods
fef2074a09
Merge pull request #1715 from abel1502/abel-tiny-silex
Quick way to do #1713
2024-10-04 11:34:25 +02:00
Bob
de238ca0e0 🅱️enry 2024-10-03 21:29:20 +02:00
Boblet
c8d40f0d35 offsets and casing ejection sillies 2024-10-03 16:28:15 +02:00
abel1502
591864a406
Quick way to solve #1713 2024-10-03 13:56:33 +03:00
HbmMods
109e710112
Merge pull request #1712 from abel1502/abel-rbmk-crane
Make RBMK crane rotatable
2024-10-03 08:05:47 +02:00
Bob
59254c7179 the horngus of a dongfish 2024-10-02 22:02:19 +02:00
Boblet
ea895daa85 shells and casings 2024-10-02 16:58:12 +02:00
abel1502
5944999cf9
Fix rbmk crane rotation 2024-10-02 16:21:33 +03:00
abel1502
8da78f6895
Make RBMK crane rotatable visually 2024-10-02 14:07:32 +03:00
Bob
75df8fb945 ATLAS 2024-10-01 21:35:43 +02:00
Boblet
0bdfe286e4 shapes 2024-10-01 16:56:39 +02:00
HbmMods
a4e321f4c9
Merge pull request #1710 from abel1502/abel-strand-caster
Improve strand caster
2024-10-01 07:55:52 +02:00
abel1502
4b59c55c5a
Remove the upgrade, just change the caster 2024-10-01 00:18:24 +03:00