Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Anuken/Mindustry into campaign

Browse Source
This commit is contained in:
Anuken
2020-09-30 22:46:33 -04:00
parent 54c991e611 b15cdfef46
commit 4264b960cd
42 changed files with 89 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/mindustry/content/Blocks.java
View File

@@ -594,7 +594,7 @@ public class Blocks implements ContentList{
consumes.items(new ItemStack(Items.copper, 3), new ItemStack(Items.lead, 4), new ItemStack(Items.titanium, 2), new ItemStack(Items.silicon, 3));
}};
cryofluidMixer = new LiquidConverter("cryofluidmixer"){{
cryofluidMixer = new LiquidConverter("cryofluid-mixer"){{
requirements(Category.crafting, with(Items.lead, 65, Items.silicon, 40, Items.titanium, 60));
outputLiquid = new LiquidStack(Liquids.cryofluid, 0.2f);
craftTime = 120f;

4
core/src/mindustry/io/SaveFileReader.java
View File

@@ -49,7 +49,9 @@ public abstract class SaveFileReader{
"holostone-wall", "dacite-wall",
"rock", "boulder",
"snowrock", "snow-boulder",
"cliffs", "stone-wall"
"cliffs", "stone-wall",
"cryofluidmixer", "cryofluid-mixer"
);
protected final ReusableByteOutStream byteOutput = new ReusableByteOutStream();