mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-02-05 00:17:33 +07:00
Code Issues Packages Projects Releases Wiki Activity

Water Extractor: Use metaglass to be consistent with pumps

Browse Source
This commit is contained in:
Anuken 2021-02-21 08:53:47 -05:00
parent a3bf39d86b
commit 0d287e6d59
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1285,7 +1285,7 @@ public class Blocks implements ContentList{
}}; }};
waterExtractor = new SolidPump("water-extractor"){{ waterExtractor = new SolidPump("water-extractor"){{
requirements(Category.production, with(Items.copper, 30, Items.graphite, 30, Items.lead, 30)); requirements(Category.production, with(Items.metaglass, 30, Items.graphite, 30, Items.lead, 30));
result = Liquids.water; result = Liquids.water;
pumpAmount = 0.11f; pumpAmount = 0.11f;
size = 2; size = 2;

3
desktop/src/mindustry/desktop/DesktopLauncher.java
View File

@ -64,8 +64,7 @@ public class DesktopLauncher extends ClientLauncher{
if(useSteam){ if(useSteam){
//delete leftover dlls //delete leftover dlls
Fi file = new Fi("."); for(Fi other : new Fi(".").parent().list()){
for(Fi other : file.parent().list()){
if(other.name().contains("steam") && (other.extension().equals("dll") || other.extension().equals("so") || other.extension().equals("dylib"))){ if(other.name().contains("steam") && (other.extension().equals("dll") || other.extension().equals("so") || other.extension().equals("dylib"))){
other.delete(); other.delete();
} }

2
gradle.properties
View File

@ -1,3 +1,3 @@
org.gradle.daemon=true org.gradle.daemon=true
org.gradle.jvmargs=-Xms256m -Xmx1024m org.gradle.jvmargs=-Xms256m -Xmx1024m
archash=1d7c415cd528ee0148fa2f498fcb1ec563528825 archash=7e4bc7e1c7c25bdf4321a22356f6ddb1943f6d60