486 Commits

Author SHA1 Message Date
Boblet
3faed14975 furnace fix, fallout JSON config 2022-06-28 16:41:49 +02:00
Bob
10c9f7a121 FEnSU fix, power priorisation 2022-06-27 23:31:00 +02:00
Bob
e15f6d5d55 finished arty, conveyor improvements, chute fixes 2022-06-26 21:44:22 +02:00
HbmMods
407e00f70f
Merge pull request #636 from Vaern/hough
ZIRNOX Stuff, mostly
2022-06-24 11:42:06 +02:00
Boblet
2b59d8709e PR cleanup 2022-06-24 08:16:08 +02:00
HbmMods
bf2224b880
Merge pull request #641 from Adam29Adam29/master
Electric Furnace Rework
2022-06-24 08:10:45 +02:00
Vaern
1d9c4fec33 amongusamongusamongusamongusamongusamongusamongusamongusamongusamongusam 2022-06-23 15:15:25 -07:00
Boblet
fde92737eb formatting 2022-06-23 08:26:05 +02:00
HbmMods
aa9cd95681
Merge branch 'pr603' into master 2022-06-23 08:10:17 +02:00
Adam
8138382c15
Tile entity Furnace file 2022-06-22 20:57:27 +02:00
Adam
c380b7f84f
Merge branch 'HbmMods:master' into master 2022-06-22 20:45:04 +02:00
Boblet
aebcf90026 iron furnace fix, artillery shells 2022-06-22 16:58:48 +02:00
Adam
093da728d2
i want to combust 2: electric boogaloo 2022-06-21 20:05:03 +02:00
Adam
c8c9d4af7e
i want to combust 2022-06-21 18:02:52 +02:00
Boblet
2952e175b5 fixes and fusion power ports 2022-06-21 16:56:51 +02:00
Vaern
aa7e20f3e2 localization & input fixes, fuel radiation modifier changed 2022-06-20 13:45:45 -07:00
Adam
879741a17c
progress bar issues 2022-06-20 22:33:04 +02:00
Boblet
e1b75a315e IO fixes, some arty work 2022-06-20 17:00:41 +02:00
Vaern
0c34901864 ZIRNOX stuff + lil bit of Igen
Added Mox ZFB rods for fast technetium breeding (50k ticks); Increased the lifetimes for almost all ZIRNOX fuels by approximately 2, along with minor changes to heat values; reduced buffs to boosted presto logs in the IGen: shouldn't be *as* broken anymore, but still nowhere near unremarkable; Added Hopper IO functionality to the ZIRNOX; Changed ZIRNOX and destroyed variant's model textures slightly
2022-06-19 22:23:18 -07:00
Bob
86a531cebe more arty stuff, conveyor fixes, crane retexture 2022-06-19 19:44:30 +02:00
HbmMods
eb565f1b2f
Merge branch 'master' into GC-Rework-Pt2 2022-06-17 13:41:24 +02:00
Bob
caa6b31b93 finished iron furnace, artillery turret 2022-06-16 22:59:28 +02:00
Boblet
34d72b4f80 iron furnace, some universal code for solid fuels 2022-06-15 16:54:45 +02:00
Bob
c307d26752 iron furnace 2022-06-14 22:56:06 +02:00
Boblet
f003b2db08 some stuff™️ 2022-06-14 16:59:33 +02:00
Boblet
c50d01fedc fixes 2022-06-13 16:30:59 +02:00
HbmMods
fa176c6a5c
Merge pull request #623 from Voxelstice/turbine-anim
turbine blades now fade in/out when spinning
2022-06-12 20:48:58 +02:00
Bob
8c1275206c and all that jazz 2022-06-12 20:47:20 +02:00
Voxelstice
8dfe52b895
and the large turbine 2022-06-12 05:26:14 +10:00
Voxelstice
4bd1ccddf2
chungus 2022-06-12 05:24:46 +10:00
HbmMods
cd502ccf19
Merge pull request #619 from Vaern/RBMK-Stuff
Modified RBMK fuels, added effects for boron/foam on RBMK and ZIRNOX
2022-06-08 08:06:00 +02:00
Bob
67a9c91950 my head hurts 2022-06-07 21:08:11 +02:00
Vaern
cfe90f281a plenty more changes; RBMK rounding errors fixed 2022-06-05 20:32:47 -07:00
Vaern
671948754b Plenty of changes 2022-06-04 21:30:30 -07:00
Vaern
48c8ab84db Modified RBMK fuels, added effects for boron/foam on RBMK and ZIRNOX 2022-06-03 20:40:25 -07:00
Bob
e4c0336324 unbelievable, absolutely phenomenal 2022-06-01 21:16:09 +02:00
Bob
baff99e481 particles that are actual particles 2022-05-31 22:28:12 +02:00
Boblet
f0b211dbff mass storages keeping inventory when broken, recipes 2022-05-31 16:49:18 +02:00
Bob
943e243573 the ferocious crafter 2022-05-29 15:49:14 +02:00
Bob
0535d3c49f the man 2022-05-29 00:57:08 +02:00
Boblet
26bcbcf7e0 it's an autocrafter 2022-05-27 14:54:45 +02:00
Bob
c616a64500 mass storage 2022-05-26 23:29:11 +02:00
Boblet
c27d9e152e desh crates, cleaned up crate code terribleness 2022-05-25 16:37:29 +02:00
Bob
625b0c70ab dial for turning off meltdowns 2022-05-23 19:19:31 +02:00
Bob
93dee8ac82 fixes and fixes 2022-05-23 18:37:41 +02:00
Voxelstice
fe2df764dd
if this doesnt fix the conflict i dont know what i will do 2022-05-23 13:25:57 +10:00
Voxelstice
5b463d96d9
that didnt fix the conflict 2022-05-23 13:14:20 +10:00
Voxelstice
ac93e2c4b0
fix conflict 1 2022-05-23 13:12:06 +10:00
Bob
e4e4e00c30 recipes and sound loop fixes 2022-05-22 18:17:05 +02:00
Bob
ea9b41fce8 the lord yeeteth
and the lord yoinketh away
2022-05-21 21:29:45 +02:00