diff --git a/core/src/mindustry/content/UnitTypes.java b/core/src/mindustry/content/UnitTypes.java index bec005710a..c95ec8a367 100644 --- a/core/src/mindustry/content/UnitTypes.java +++ b/core/src/mindustry/content/UnitTypes.java @@ -1789,7 +1789,7 @@ public class UnitTypes implements ContentList{ shootY = 6f; beamWidth = 0.8f; mirror = false; - repairSpeed = 0.7f; + repairSpeed = 0.75f; bullet = new BulletType(){{ maxRange = 120f; @@ -1835,8 +1835,8 @@ public class UnitTypes implements ContentList{ speed = 0f; - splashDamage = 50f; - splashDamageRadius = 40f; + splashDamage = 55f; + splashDamageRadius = 45f; }}; }}); }}; diff --git a/core/src/mindustry/mod/Mods.java b/core/src/mindustry/mod/Mods.java index 43845886d7..e53de0a4ad 100644 --- a/core/src/mindustry/mod/Mods.java +++ b/core/src/mindustry/mod/Mods.java @@ -267,6 +267,7 @@ public class Mods implements Loadable{ TextureFilter filter = Core.settings.getBool("linear") ? TextureFilter.linear : TextureFilter.nearest; + Time.mark(); //generate new icons for(Seq arr : content.getContentMap()){ arr.each(c -> { @@ -277,6 +278,7 @@ public class Mods implements Loadable{ } }); } + Log.debug("Time to generate icons: @", Time.elapsed()); //dispose old atlas data Core.atlas = packer.flush(filter, new TextureAtlas()); @@ -287,7 +289,7 @@ public class Mods implements Loadable{ packer.dispose(); packer = null; - Log.debug("Time to update textures: @", Time.elapsed()); + Log.debug("Total time to generate & flush textures synchronously: @", Time.elapsed()); } private PageType getPage(AtlasRegion region){ diff --git a/gradle.properties b/gradle.properties index fe39d88e46..52e61753e2 100644 --- a/gradle.properties +++ b/gradle.properties @@ -11,4 +11,4 @@ android.useAndroidX=true #used for slow jitpack builds; TODO see if this actually works http.socketTimeout=80000 http.connectionTimeout=80000 -archash=f31d58eac8bf5f1f674b0d6219c1e34ba54de2cc +archash=4582339cd9052be86141fbacf2f2180b09eb585c