diff --git a/core/assets/maps/three.msav b/core/assets/maps/three.msav index d9b9ab4123..5f308e88e6 100644 Binary files a/core/assets/maps/three.msav and b/core/assets/maps/three.msav differ diff --git a/core/assets/maps/three__.msav b/core/assets/maps/three__.msav deleted file mode 100644 index 7b2d4f7629..0000000000 Binary files a/core/assets/maps/three__.msav and /dev/null differ diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index b1768f8ed9..ec5aec3958 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -1318,6 +1318,7 @@ public class Blocks{ craftTime = 60f * 2f; outputLiquid = new LiquidStack(Liquids.gallium, 1f / 60f); + //TODO NOT scrap outputItem = new ItemStack(Items.scrap, 1); }}; diff --git a/gradle.properties b/gradle.properties index 85f821cf22..8203cf679e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -25,4 +25,4 @@ org.gradle.caching=true #used for slow jitpack builds; TODO see if this actually works org.gradle.internal.http.socketTimeout=100000 org.gradle.internal.http.connectionTimeout=100000 -archash=0ed3a81119 +archash=59577c8222