2805 Commits

Author SHA1 Message Date
Vaern
bd06c6ec8b hh 2023-08-28 15:35:12 -07:00
Vaern
ad8df5789d Merge remote-tracking branch 'HbmMods/master' 2023-08-26 09:04:59 -07:00
HbmMods
9f99034e96
Merge pull request #1164 from MartinTheDragon/curving-conveyor-cranes
Make conveyor crane I/O sides configurable
2023-08-26 15:42:49 +02:00
HbmMods
954e80d36e
Merge pull request #1163 from BallOfEnergy1/master
More OC Compatibility!
2023-08-26 15:41:06 +02:00
Bob
21a7337b9f recipes, mug PWR cooling 2023-08-26 15:40:10 +02:00
MartinTheDragon
a050ce51da
Make conveyor crane I/O sides configurable
Right click with a screwdriver to change output direction,
shift-right-click to change input direction.

The ton of textures were made by 70k

Co-authored-by: 70000hp <105080577+70000hp@users.noreply.github.com>
2023-08-26 15:31:02 +02:00
BallOfEnergy
dad189a24f better component name 2023-08-26 03:57:20 -05:00
BallOfEnergy
7e281069a7 Merge remote-tracking branch 'origin/master' 2023-08-26 03:54:50 -05:00
BallOfEnergy
93485afafe was testing something (forgot to remove an import) 2023-08-26 03:54:44 -05:00
BallOfEnergy
ae4122b46c
Merge branch 'HbmMods:master' into master 2023-08-26 03:51:46 -05:00
BallOfEnergy
f3c27c02e5 More Opencomputers compatibility!
:woo:
2023-08-26 03:47:34 -05:00
Bob
65587e7db7 PWR breeder rods, rod recycling, creative stirling 2023-08-25 21:48:45 +02:00
Bob
2928f832a3 fixes, flixes, adjustments
https://cdn.discordapp.com/attachments/979089797404565504/1144343034222350386/image.png
2023-08-24 22:04:11 +02:00
Boblet
549ecc0917 fancier PWR gauges, larger PWRs, fixes, finite corium fluid 2023-08-24 16:38:55 +02:00
HbmMods
a4a570b10a
Merge pull request #1159 from Vaern/resistance
Resistance Rework !!
2023-08-24 07:42:38 +02:00
HbmMods
1a0f4d6b10
Merge pull request #1145 from BallOfEnergy1/master
Fixed a small bug with the fluid burner.
2023-08-24 07:38:12 +02:00
Bob
5832d5dc2f torex condensation ring 2023-08-23 21:42:04 +02:00
Boblet
5cc3d38906 wabba dee 2023-08-23 15:50:20 +02:00
Vaern
fb3f08acd5 it took half an hour cuz gitkraken, the repo, and the av shat themselves
what a modern wonder
2023-08-22 21:07:59 -07:00
Vaern
3ebf9899a4 h 2023-08-22 20:48:17 -07:00
Bob
d3b559bd61 finished PWR ports, recipes 2023-08-22 21:10:24 +02:00
BallOfEnergy
6b62d7c295
Merge branch 'HbmMods:master' into master 2023-08-22 09:34:45 -05:00
Vaern
0609cd524c Merge remote-tracking branch 'HbmMods/master' 2023-08-21 18:50:13 -07:00
Bob
35b18dda34 do the bugshaker 2023-08-21 23:07:47 +02:00
Bob
450e519234 TOREX flash overlay 2023-08-21 22:09:54 +02:00
Boblet
ae44c8a2a4 sodalite, heatable heavy water, sodium 2023-08-21 16:04:25 +02:00
Bob
05f45e8a76 PWR controllability 2023-08-20 19:23:35 +02:00
Vaern
b6eaf25b99 i'm too tired
dr kel larping
2023-08-18 18:13:00 -07:00
Boblet
a7b741fe48 PWR heat transfer 2023-08-18 14:18:24 +02:00
Vaern
1cfef371ed Merge remote-tracking branch 'HbmMods/master' 2023-08-17 16:33:33 -07:00
Bob
24b883ec92 we have fission! 2023-08-17 22:00:35 +02:00
Boblet
fb97ffc88d PWR fuel, atomized primers 2023-08-17 15:42:53 +02:00
HbmMods
540183181f
Merge pull request #1151 from re7gog/master
Fixes for Crucible (Thermos fork)
2023-08-17 07:33:50 +02:00
Vaern
40af290153 mhmm 2023-08-16 20:44:32 -07:00
Vaern
b5df3b0979 Merge remote-tracking branch 'HbmMods/master' 2023-08-16 15:52:16 -07:00
Bob
0332853822 PWR GUI work, error messages, pre-calculation 2023-08-16 20:56:57 +02:00
Boblet
f7dd3a0a93 more PWR crap 2023-08-16 16:21:11 +02:00
Григорий Величко
cb0eb4271b
Fix hbmpollution.dat file on Crucible and probably Thermos 2023-08-16 15:24:51 +03:00
Григорий Величко
f912e572f7
Fix Thermos preventer on Crucible 2023-08-16 15:17:26 +03:00
Vaern
ff85ddfb16 containrs!!! 2023-08-15 21:23:59 -07:00
Vaern
72f892b7dd Merge remote-tracking branch 'HbmMods/master' 2023-08-15 18:16:18 -07:00
Bob
3c6e7920b5 PWR preparation 2023-08-15 20:42:48 +02:00
Bob
35d9e49f23 block drop fix for fallout effects 2023-08-14 20:11:26 +02:00
Boblet
6b381821b8 FENSU and DFC fixes 2023-08-14 16:40:14 +02:00
Vaern
474278cb1b Merge remote-tracking branch 'HbmMods/master' 2023-08-13 17:21:08 -07:00
BallOfEnergy
5205c57deb Merge remote-tracking branch 'origin/master' 2023-08-13 18:39:57 -05:00
BallOfEnergy
b9b48f5a60 Fixing minor bug where the fluid burner would produce soot even when there was no fluid to consume. 2023-08-13 18:39:23 -05:00
Bob
157456a0c8 ashpit 1.0.27X4690 2023-08-13 21:04:12 +02:00
Bob
27648ca7a6 lanterns, heating oven connection fix 2023-08-12 22:46:59 +02:00
Vaern
10ab382cf6 shit 2023-08-11 22:22:11 -07:00