Merge remote-tracking branch 'origin/master'

This commit is contained in:
Anuken
2022-06-08 09:27:25 -04:00
48 changed files with 69 additions and 9 deletions

View File

@@ -71,7 +71,7 @@ public class Blocks{
melter, separator, disassembler, sporePress, pulverizer, incinerator, coalCentrifuge,
//erekir
siliconArcFurnace, electrolyzer, oxidationChamber, atmosphericConcentrator, electricHeater, phaseHeater, heatRedirector, slagIncinerator,
siliconArcFurnace, electrolyzer, oxidationChamber, atmosphericConcentrator, electricHeater, slagHeater, phaseHeater, heatRedirector, slagIncinerator,
carbideCrucible, slagCentrifuge, surgeCrucible, cyanogenSynthesizer, phaseSynthesizer, heatReactor,
//sandbox
@@ -1251,6 +1251,20 @@ public class Blocks{
regionRotated1 = 1;
consumePower(50f / 60f);
}};
slagHeater = new HeatProducer("slag-heater"){{
requirements(Category.crafting, with(Items.tungsten, 50, Items.oxide, 20, Items.beryllium, 20));
researchCostMultiplier = 4f;
drawer = new DrawMulti(new DrawRegion("-bottom"), new DrawLiquidTile(Liquids.slag), new DrawDefault(), new DrawHeatOutput());
size = 3;
liquidCapacity = 40f;
rotateDraw = false;
regionRotated1 = 1;
consumeLiquid(Liquids.slag, 40f / 60f);
heatOutput = 6f;
}};
phaseHeater = new HeatProducer("phase-heater"){{
requirements(Category.crafting, with(Items.oxide, 30, Items.carbide, 30, Items.beryllium, 30));