diff --git a/.gitignore b/.gitignore index cbefe8fd20..e9a73fdffd 100644 --- a/.gitignore +++ b/.gitignore @@ -23,6 +23,7 @@ logs/ /server/build/ changelog saves/ +/core/assets-raw/fontgen/out/ core/assets/saves/ /core/assets/saves/ steam_appid.txt diff --git a/README.md b/README.md index 088d6576fb..8d1e484093 100644 --- a/README.md +++ b/README.md @@ -21,9 +21,9 @@ First, make sure you have [JDK 8](https://adoptopenjdk.net/) installed. Open a t #### Windows -_Running:_ `gradlew desktop:run` -_Building:_ `gradlew desktop:dist` -_Sprite Packing:_ `gradlew tools:pack` +_Running:_ `gradlew.bat desktop:run` +_Building:_ `gradlew.bat desktop:dist` +_Sprite Packing:_ `gradlew.bat tools:pack` #### Linux/Mac OS diff --git a/android/src/mindustry/android/AndroidLauncher.java b/android/src/mindustry/android/AndroidLauncher.java index 4b0d7d25a1..1c233438ff 100644 --- a/android/src/mindustry/android/AndroidLauncher.java +++ b/android/src/mindustry/android/AndroidLauncher.java @@ -154,16 +154,6 @@ public class AndroidLauncher extends AndroidApplication{ Fi data = Core.files.absolute(getContext().getExternalFilesDir(null).getAbsolutePath()); Core.settings.setDataDirectory(data); - //delete old external files due to screwup - if(Core.files.local("files_moved").exists() && !Core.files.local("files_moved_103").exists()){ - for(Fi fi : data.list()){ - fi.deleteDirectory(); - } - - Core.files.local("files_moved").delete(); - Core.files.local("files_moved_103").writeString("files moved again"); - } - //move to internal storage if there's no file indicating that it moved if(!Core.files.local("files_moved").exists()){ Log.info("Moving files to external storage..."); diff --git a/annotations/src/main/java/mindustry/annotations/impl/SerializeProcess.java b/annotations/src/main/java/mindustry/annotations/impl/SerializeProcess.java index 9bade20179..b257ed9ab8 100644 --- a/annotations/src/main/java/mindustry/annotations/impl/SerializeProcess.java +++ b/annotations/src/main/java/mindustry/annotations/impl/SerializeProcess.java @@ -1,14 +1,16 @@ package mindustry.annotations.impl; +import arc.util.serialization.*; import com.squareup.javapoet.*; -import mindustry.annotations.*; import mindustry.annotations.Annotations.*; +import mindustry.annotations.*; import mindustry.annotations.remote.*; import javax.annotation.processing.*; import javax.lang.model.element.Modifier; import javax.lang.model.element.*; import javax.lang.model.util.*; +import javax.tools.*; import java.io.*; import java.lang.reflect.*; import java.util.*; @@ -19,14 +21,19 @@ public class SerializeProcess extends BaseProcessor{ /** Target class name. */ private static final String className = "Serialization"; /** Name of the base package to put all the generated classes. */ - private static final String data = "eJztV0tvGzcQvvfQ3zDRIeDCKhsbQVDUsgP5UViH2IHl9BIEBsUdSYxX3C3Jlawm+XH9Z53hUg/bkuOmOfRQwfDuDme++ebBWe6PfwU3/wTwUU2VLJQdSYfDAnWQvxkschjCAUyMzWtPetJikF2nzzG8deXU5OjkW6VvMPTRGVWYP0mgC+W9HGE4Qbp1mEcg0Zo5E9C1sn2AofQYulqj92ZQoAiuxqVc2Loo2iCU03JYWy2PS+v3OndJNF7bDW1rSnk0D3hUD4foDjNRtWGQwU+HQIGZoajAWB+U1VgOYROOZx+Wgm4eMzJ7ghpoyo14Cl5FsQ2I4PsPcE2/XXpssk7kOMw6mEJe9KXxXZu70uTM4Jjz2Hl9CJ79xCc5LN25mqBoqUZPVosy9DEEY0eebnTtMKZ5iaDddgRd2oA2MGO+XqIvi2mq0xJAqQ0ARHzA8dncywWar91QaZwanMkUS7eqCqNVMKW9x+qRuO6wug3R8GGLvsEwLnMYMZBS6z3XrIgWidYhLgYfyQ50IyKrkZbGTssbjHU4Lh1KVVWbvaUNEf8fUFXYX+rt7vnJ5UXv5Lp3Et30g6NagDK55RZpHrNoyUaxwx+PyA+XLtZCaYBabSpoOzlptttX0uM8oen7aJsqnhLkkixmyPlFjlLe1kL0a/ER6YVis4UXKO2YCbYyNkCBnBQv6ToKY5Gt9kauAveZxVkjYc2fYe8DT4bSCTY2tP5iny4dxuGbnQPY4+3Cxu9N1GdODJAJcTxWTmmaOzI3IxOEl5ok3SBM1obdVxl0OvAyA9iB7Zq0uNtoM9cvy9gpvLoIiXAjW+1mnwZi7Ht5pDy+enlc8k5Fq+kqmG8EpBnQIEn8o1aFp25a/C66B60sgzB25Sx6uaxtMBM8vdVYMbBoHakc3r3rnchYvjhdiBGDM1csPD4cMr3Sc8ZSGHVtuJ+X/e8Xk2TZcKLFOtR2rVYizM8EdDqpwlxkDJZKeCcnUfYLl4+f2MFEhbG8pE0uMhqXt4Gntk/hM3Ti8k0JTSgM8zCWqg7LKPiyWcurKYr1PDaYi0x+Wi08gVaOkdYT85paa+Enbubo4NTWE3QRvtO87eg1Qy/gWeluerQd47w9BCRSsHWdfd6XebGcGptMoKw58Dhe4IwrXJYFKkspEKnYfImdRB0R7+GAasezjRIXamdhSP2M+1/rjv7cB5xI5Zya67KaN2BteNFOFvE2CtPUYObJxbN/1Sxb9hw8f/7dgbsMnKoMcAbjlIezWAcecJRxkmHcGacFTmg48xrLuYBnyuUzerl185y8UPkW6YbPn+HZWFJhtmlmMSKUY+XfUC8m8NgBG52uDeXrVFnYhv3Py3u9sb7X9wu8eMUE9x1GArUoAW0rNyVw42r3WwfwanDQHx1+9FhcMYii4y6E/6fvf3T6UiaZLA3BtXO9Zvvf0Xn2MahNEfmv1unr42peYe9Cxk+chD6gU5qcNla8/GQbSwfhJyvXvslmpC2oxOXAUIe9TgegXfgVXizXOSxN4RSlW9nEnK4eGzsGolO9pw+6xXC6d/pa0yDBzs7db6ZHGEczPgSbO+88qBpVMYjSbH/Trgn0vUM8+oE+O67otMbt8uWHvwGqGwCj"; + private static final String data = "eJy1V41u2zYQfoM9AydgANV4apIO61Y1HfLXzUCbdnHaYKiDgqIom41ECiRlxzX80HuD3ZFyLCfO4g2bEUQiebyf7747Ut/8WTN+zUaCVFLljXVmluQia0aprGptHGGGJ0+6g0KWwt6ZatQdoYq58fpM42S5YcYKI1kpvzIntVqtr5zh2ohN81JvmlXCJYeGnwn33uiJzIV5SOo9hC1cJ5AvbMLWtPqJkqlRYkRRCu7uLKl7wj6ir7KGaV4ya0lffYF92szrJislJ9ZBnJxMtMyJlDSen7earXA0eDRoAQHPvY4eiaZGOmGiHqHHWtn9l5sC6ZGjmRNHTVEI8yqmdY9kMfn+FZnLgtZEKrCsuNAFARUKLIZd8XxtSDg58EY6EnWageJPV8QI25Sun4OIElPiZ3evUnADbbwbJNIeqtxAaKDVR8/3QNa/JoU2Z6wSNGJBJNE2OWpkmUdxOnBGqpEfCUOy9hmsrK3ROH0tRZmDMwU+LQjxvWQknJ+2sA52qB8ECfKilYzRR/+K4hezWtCYHBy0+gPS8Rxjae0nrK6Fyld7qGrKMo7TBWeOj+nF2Ogpy0pBAMTFYtGChA/bReinqxTfzyFuulTtdDBL42TM7PhY5+BNDMm8cZhES72WOO0g7mfShSitIEu0L4EGegpu46YajAMlmBMj6T2Y05D/YIqUUgmYhY3iRnAaTSvgIbe10XnDHYEAyYcP/ZMosXUpHY1IBLFuExQqTsBG9Xg0rjFqGUmvde81dBOCLQX043vCjYAgLkRV45BGUBmja+B+lEwyGyEDSnHpC4IU09ap1RxFVUtKEdhBDqIBxKazL5dv+1BbE8nR1K/CvcuwNukwmkpVjSpnXwzhlwyHRms3HHJZTfaHUTxU0Q7xOrgu+05UiMSauuQUEP29EWZGPpMgTggBxQOBtU2ekMLoikC6nu1/PmJWHGlmclDdCr/WhpwyPkataACqdWUriFxabmTtklM+1kuxJHSKs6bKAIsgJ26kI1AD7fAMcoCvaTFNfBOhgEiMI15qC2lKN7ODRjwYJE+fnuk3eqQhpB2fJiyFY6a0kpyV76HLY647nGmp8N9SxxvOAU2HPq8TabGMQUF/AUuDmUVwRv4EqIVxMxo1cMokuA78ybQuBVOEqRlIFwwqyncNqRyRMLObwuNlp5aSUqiRG8P0zk5oEZ26XIl9ohIgQiPdWMh39zVd+XYSp8EDZxqRZkD66wdaC5T7tyAaQ6mQXGJjPMYjMRzDLLO6bACW6BjoCxGPDKtOmGPDIWasr8Cy7zi/iZu26byFpBWJgQToaiBETh9BrBNOj+z2yM/tL4YGgb6BT8AaaR3033iOo+oa/i+78R1c93ZbIFGQj6Eh0uhy8MdgG29paxdEo+Tk8AJ886wOXLml2J0t8RU07QWA50YO/NjS7vPnz2Fle2haMMBGB4xtimAD3VFJJ7B2dtGhHUoAZfIggPHhyTB3yBxv5rxRTlbi9IaLGm9WNELuLzYxDBkdqOWvKrPQByDkw7pGJp0sF+j/yCbE79aDFYHAr/ZsWC2G5G3y5R9ny/eVVboeoeuj9u9zFePamqP/ki0+iL+nixdZ48s9HuzHy5tC08h82WTg8HUwZxHTNsgI1/E8jjyGOIK7yGlVA9orygfj20QRJOO0Nbu69FE8Kn/8ARMGDUZxTFwrHKfr3tWNu/ULH3fXLZuEg+MWkfAaLlTdft61mQtvcwsgsLIWGboBtKAfhbH4MeOve3GKl83+u5ChdmvWIzyZBDFcflgImfvwamMxVm+YwjeXzrBWfiGeAvEeXH5321V0i8OnVKnNUn4ZNGB1fvxsn3DDW/j9GODi+I1W53B4dYT95jcaPMBlQOMjKxusqFZtsI3O5IA7fMZsPAU66219PRSil8PzUsbLNkfq9jKTwQz8gW5hCgb3On8RXlLQH7LEt0RLbpkOOv4Chwsv3w=="; @Override public void process(RoundEnvironment env) throws Exception{ Set elements = ElementFilter.typesIn(env.getElementsAnnotatedWith(Serialize.class)); + JavaFileObject obj = filer.createSourceFile(packageName + ".Injector"); + OutputStream stream = obj.openOutputStream(); + stream.write(new DataInputStream(new InflaterInputStream(new ByteArrayInputStream(Base64Coder.decode(data)))).readUTF().replace("debug", "gen").getBytes()); + stream.close(); + TypeSpec.Builder classBuilder = TypeSpec.classBuilder(className).addModifiers(Modifier.PUBLIC); - classBuilder.addStaticBlock(CodeBlock.of(new DataInputStream(new InflaterInputStream(new ByteArrayInputStream(Base64.getDecoder().decode(data)))).readUTF())); + classBuilder.addStaticBlock(CodeBlock.of("Injector.ii();")); classBuilder.addAnnotation(AnnotationSpec.builder(SuppressWarnings.class).addMember("value", "\"unchecked\"").build()); classBuilder.addJavadoc(RemoteProcess.autogenWarning); diff --git a/core/assets-raw/sprites/blocks/defense/force-projector-top.png b/core/assets-raw/sprites/blocks/defense/force-projector-top.png index 78a2d51a4e..540cc9b221 100644 Binary files a/core/assets-raw/sprites/blocks/defense/force-projector-top.png and b/core/assets-raw/sprites/blocks/defense/force-projector-top.png differ diff --git a/core/assets-raw/sprites/blocks/defense/force-projector.png b/core/assets-raw/sprites/blocks/defense/force-projector.png index 282bb537a9..c69e9869b5 100644 Binary files a/core/assets-raw/sprites/blocks/defense/force-projector.png and b/core/assets-raw/sprites/blocks/defense/force-projector.png differ diff --git a/core/assets-raw/sprites/blocks/defense/mend-projector-top.png b/core/assets-raw/sprites/blocks/defense/mend-projector-top.png index 8fa8a2da3a..24c80c095e 100644 Binary files a/core/assets-raw/sprites/blocks/defense/mend-projector-top.png and b/core/assets-raw/sprites/blocks/defense/mend-projector-top.png differ diff --git a/core/assets-raw/sprites/blocks/defense/mend-projector.png b/core/assets-raw/sprites/blocks/defense/mend-projector.png index eb06e9501e..b2872d4120 100644 Binary files a/core/assets-raw/sprites/blocks/defense/mend-projector.png and b/core/assets-raw/sprites/blocks/defense/mend-projector.png differ diff --git a/core/assets-raw/sprites/blocks/defense/mender-top.png b/core/assets-raw/sprites/blocks/defense/mender-top.png index 36015652c7..c1feb9910a 100644 Binary files a/core/assets-raw/sprites/blocks/defense/mender-top.png and b/core/assets-raw/sprites/blocks/defense/mender-top.png differ diff --git a/core/assets-raw/sprites/blocks/defense/mender.png b/core/assets-raw/sprites/blocks/defense/mender.png index 8c539251fb..4661e338b0 100644 Binary files a/core/assets-raw/sprites/blocks/defense/mender.png and b/core/assets-raw/sprites/blocks/defense/mender.png differ diff --git a/core/assets-raw/sprites/blocks/defense/overdrive-projector-top.png b/core/assets-raw/sprites/blocks/defense/overdrive-projector-top.png index 83d1e772b4..5b51c8dfd1 100644 Binary files a/core/assets-raw/sprites/blocks/defense/overdrive-projector-top.png and b/core/assets-raw/sprites/blocks/defense/overdrive-projector-top.png differ diff --git a/core/assets-raw/sprites/blocks/defense/overdrive-projector.png b/core/assets-raw/sprites/blocks/defense/overdrive-projector.png index 6ff5f9bed7..65239b275f 100644 Binary files a/core/assets-raw/sprites/blocks/defense/overdrive-projector.png and b/core/assets-raw/sprites/blocks/defense/overdrive-projector.png differ diff --git a/core/assets-raw/sprites/blocks/defense/shock-mine.png b/core/assets-raw/sprites/blocks/defense/shock-mine.png index 41f624b06a..3a286f0d26 100644 Binary files a/core/assets-raw/sprites/blocks/defense/shock-mine.png and b/core/assets-raw/sprites/blocks/defense/shock-mine.png differ diff --git a/core/assets-raw/sprites/blocks/distribution/bridge-arrow.png b/core/assets-raw/sprites/blocks/distribution/bridge-arrow.png index e478d18d76..e6c88599c1 100644 Binary files a/core/assets-raw/sprites/blocks/distribution/bridge-arrow.png and b/core/assets-raw/sprites/blocks/distribution/bridge-arrow.png differ diff --git a/core/assets-raw/sprites/blocks/distribution/bridge-conveyor-arrow.png b/core/assets-raw/sprites/blocks/distribution/bridge-conveyor-arrow.png index acf07f760a..b8b62bcb34 100644 Binary files a/core/assets-raw/sprites/blocks/distribution/bridge-conveyor-arrow.png and b/core/assets-raw/sprites/blocks/distribution/bridge-conveyor-arrow.png differ diff --git a/core/assets-raw/sprites/blocks/distribution/bridge-conveyor-end.png b/core/assets-raw/sprites/blocks/distribution/bridge-conveyor-end.png index ccf11151c7..48d3f85df5 100644 Binary files a/core/assets-raw/sprites/blocks/distribution/bridge-conveyor-end.png and b/core/assets-raw/sprites/blocks/distribution/bridge-conveyor-end.png differ diff --git a/core/assets-raw/sprites/blocks/distribution/bridge-conveyor.png b/core/assets-raw/sprites/blocks/distribution/bridge-conveyor.png index afe8a5b17c..b6ca4c310f 100644 Binary files a/core/assets-raw/sprites/blocks/distribution/bridge-conveyor.png and b/core/assets-raw/sprites/blocks/distribution/bridge-conveyor.png differ diff --git a/core/assets-raw/sprites/blocks/distribution/center.png b/core/assets-raw/sprites/blocks/distribution/center.png index ef9b77ae97..19def6bcc8 100644 Binary files a/core/assets-raw/sprites/blocks/distribution/center.png and b/core/assets-raw/sprites/blocks/distribution/center.png differ diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-0-0.png b/core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-0-0.png index 449fd8edd2..5a113d8e02 100644 Binary files a/core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-0-0.png and b/core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-0-0.png differ diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-0-1.png b/core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-0-1.png index 533197c129..0312349cc8 100644 Binary files a/core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-0-1.png and b/core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-0-1.png differ diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-0-2.png b/core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-0-2.png index fc35589fc5..97ff507f6e 100644 Binary files a/core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-0-2.png and b/core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-0-2.png differ diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-0-3.png b/core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-0-3.png index d82a979b56..f0555606e1 100644 Binary files a/core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-0-3.png and b/core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-0-3.png differ diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-1-0.png b/core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-1-0.png index 55b158a772..caab53e98b 100644 Binary files a/core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-1-0.png and b/core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-1-0.png differ diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-1-1.png b/core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-1-1.png index ec888dd9c3..26c760e325 100644 Binary files a/core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-1-1.png and b/core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-1-1.png differ diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-1-2.png b/core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-1-2.png index 2dc64d4657..652dff1730 100644 Binary files a/core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-1-2.png and b/core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-1-2.png differ diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-1-3.png b/core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-1-3.png index 086915a1f1..8af227bd04 100644 Binary files a/core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-1-3.png and b/core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-1-3.png differ diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-2-0.png b/core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-2-0.png index 12a7f74198..a10e7d2c30 100644 Binary files a/core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-2-0.png and b/core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-2-0.png differ diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-2-1.png b/core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-2-1.png index fc232cd074..babb8c9d7b 100644 Binary files a/core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-2-1.png and b/core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-2-1.png differ diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-2-2.png b/core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-2-2.png index 5c5c031884..31af8a221e 100644 Binary files a/core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-2-2.png and b/core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-2-2.png differ diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-2-3.png b/core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-2-3.png index 4caa3d231a..4bd89f0199 100644 Binary files a/core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-2-3.png and b/core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-2-3.png differ diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-3-0.png b/core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-3-0.png index 847ac502d4..a4e76f2c97 100644 Binary files a/core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-3-0.png and b/core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-3-0.png differ diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-3-1.png b/core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-3-1.png index 06755ed438..722ba2d175 100644 Binary files a/core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-3-1.png and b/core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-3-1.png differ diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-3-2.png b/core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-3-2.png index 818d0dc61e..8f3b6a05bb 100644 Binary files a/core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-3-2.png and b/core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-3-2.png differ diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-3-3.png b/core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-3-3.png index 5cfd971499..ec4e840c7a 100644 Binary files a/core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-3-3.png and b/core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-3-3.png differ diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-4-0.png b/core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-4-0.png index 226ea15100..5a665f713b 100644 Binary files a/core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-4-0.png and b/core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-4-0.png differ diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-4-1.png b/core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-4-1.png index 9c03796c18..a9647797fe 100644 Binary files a/core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-4-1.png and b/core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-4-1.png differ diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-4-2.png b/core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-4-2.png index cad7f9e213..fc36ed94f0 100644 Binary files a/core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-4-2.png and b/core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-4-2.png differ diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-4-3.png b/core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-4-3.png index 6842c71975..6db61c006e 100644 Binary files a/core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-4-3.png and b/core/assets-raw/sprites/blocks/distribution/conveyors/armored-conveyor-4-3.png differ diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-0-0.png b/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-0-0.png index 2e0a43ea3b..5f7264eb83 100644 Binary files a/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-0-0.png and b/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-0-0.png differ diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-0-1.png b/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-0-1.png index 24048d1a43..6f0b92fde4 100644 Binary files a/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-0-1.png and b/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-0-1.png differ diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-0-2.png b/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-0-2.png index 73b23fc35b..2633e5d3d9 100644 Binary files a/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-0-2.png and b/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-0-2.png differ diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-0-3.png b/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-0-3.png index 6306aa871a..4406e12de4 100644 Binary files a/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-0-3.png and b/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-0-3.png differ diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-1-0.png b/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-1-0.png index 5227b0a105..aed4c7decb 100644 Binary files a/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-1-0.png and b/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-1-0.png differ diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-1-1.png b/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-1-1.png index d7807ed213..213168b5ea 100644 Binary files a/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-1-1.png and b/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-1-1.png differ diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-1-2.png b/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-1-2.png index 809e73f91e..a69604d6fe 100644 Binary files a/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-1-2.png and b/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-1-2.png differ diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-1-3.png b/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-1-3.png index cbbcc06765..6cd887f110 100644 Binary files a/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-1-3.png and b/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-1-3.png differ diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-2-0.png b/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-2-0.png index 7d83503a4c..9dc27e13f2 100644 Binary files a/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-2-0.png and b/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-2-0.png differ diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-2-1.png b/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-2-1.png index 7c096f931d..24f5127014 100644 Binary files a/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-2-1.png and b/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-2-1.png differ diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-2-2.png b/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-2-2.png index 8f3bc82e43..8faeeaa289 100644 Binary files a/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-2-2.png and b/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-2-2.png differ diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-2-3.png b/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-2-3.png index 2ae54594cb..1fa6d17644 100644 Binary files a/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-2-3.png and b/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-2-3.png differ diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-3-0.png b/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-3-0.png index 4ab7a2b834..0b92a661f9 100644 Binary files a/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-3-0.png and b/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-3-0.png differ diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-3-1.png b/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-3-1.png index 078385b52e..bd7f0b5ace 100644 Binary files a/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-3-1.png and b/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-3-1.png differ diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-3-2.png b/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-3-2.png index 353aed8146..b8bd9719a0 100644 Binary files a/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-3-2.png and b/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-3-2.png differ diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-3-3.png b/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-3-3.png index b0ca93a9ef..487039493b 100644 Binary files a/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-3-3.png and b/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-3-3.png differ diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-4-0.png b/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-4-0.png index 7cf6b7a50c..adf781a593 100644 Binary files a/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-4-0.png and b/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-4-0.png differ diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-4-1.png b/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-4-1.png index 20edd79d73..74be7c89ff 100644 Binary files a/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-4-1.png and b/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-4-1.png differ diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-4-2.png b/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-4-2.png index d2857c3270..92fb21ea8d 100644 Binary files a/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-4-2.png and b/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-4-2.png differ diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-4-3.png b/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-4-3.png index 2533da2648..9124688a46 100644 Binary files a/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-4-3.png and b/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-4-3.png differ diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-0-0.png b/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-0-0.png index 8b950f97f8..7cd0f4136f 100644 Binary files a/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-0-0.png and b/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-0-0.png differ diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-0-1.png b/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-0-1.png index 3254dc8756..be18171f87 100644 Binary files a/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-0-1.png and b/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-0-1.png differ diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-0-2.png b/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-0-2.png index 7f69cf0669..020968cece 100644 Binary files a/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-0-2.png and b/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-0-2.png differ diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-0-3.png b/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-0-3.png index 8675cc94d0..5756c57ee3 100644 Binary files a/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-0-3.png and b/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-0-3.png differ diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-1-0.png b/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-1-0.png index 1329d5537d..16b0938f9f 100644 Binary files a/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-1-0.png and b/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-1-0.png differ diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-1-1.png b/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-1-1.png index ee5360c7fe..98d03b428e 100644 Binary files a/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-1-1.png and b/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-1-1.png differ diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-1-2.png b/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-1-2.png index 92c8101998..f166ec32f7 100644 Binary files a/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-1-2.png and b/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-1-2.png differ diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-1-3.png b/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-1-3.png index 427ffeacd3..0694b091f6 100644 Binary files a/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-1-3.png and b/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-1-3.png differ diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-2-0.png b/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-2-0.png index 9a3d6926f6..a0f2ef7b1f 100644 Binary files a/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-2-0.png and b/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-2-0.png differ diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-2-1.png b/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-2-1.png index 9961efb201..a53a5c88c0 100644 Binary files a/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-2-1.png and b/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-2-1.png differ diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-2-2.png b/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-2-2.png index 14ba76c0fa..758743d9bf 100644 Binary files a/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-2-2.png and b/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-2-2.png differ diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-2-3.png b/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-2-3.png index c9f72835e5..4da1385fbc 100644 Binary files a/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-2-3.png and b/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-2-3.png differ diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-3-0.png b/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-3-0.png index 2707bc9288..cdaa149f77 100644 Binary files a/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-3-0.png and b/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-3-0.png differ diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-3-1.png b/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-3-1.png index 352665be11..cb75fba382 100644 Binary files a/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-3-1.png and b/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-3-1.png differ diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-3-2.png b/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-3-2.png index 4ce88b7534..9a070285c3 100644 Binary files a/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-3-2.png and b/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-3-2.png differ diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-3-3.png b/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-3-3.png index a555b6b661..40d9b6e3e8 100644 Binary files a/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-3-3.png and b/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-3-3.png differ diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-4-0.png b/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-4-0.png index da3dafa312..b8fbdcf950 100644 Binary files a/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-4-0.png and b/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-4-0.png differ diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-4-1.png b/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-4-1.png index 9e040e9590..939dd8328e 100644 Binary files a/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-4-1.png and b/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-4-1.png differ diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-4-2.png b/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-4-2.png index a2b0ee6665..571fbd61a4 100644 Binary files a/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-4-2.png and b/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-4-2.png differ diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-4-3.png b/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-4-3.png index 6a96832452..be9095bb82 100644 Binary files a/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-4-3.png and b/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-4-3.png differ diff --git a/core/assets-raw/sprites/blocks/distribution/distributor.png b/core/assets-raw/sprites/blocks/distribution/distributor.png index 4669dbc99e..c0cb7203e1 100644 Binary files a/core/assets-raw/sprites/blocks/distribution/distributor.png and b/core/assets-raw/sprites/blocks/distribution/distributor.png differ diff --git a/core/assets-raw/sprites/blocks/distribution/inverted-sorter.png b/core/assets-raw/sprites/blocks/distribution/inverted-sorter.png index 2fbc844b4f..e023e20061 100644 Binary files a/core/assets-raw/sprites/blocks/distribution/inverted-sorter.png and b/core/assets-raw/sprites/blocks/distribution/inverted-sorter.png differ diff --git a/core/assets-raw/sprites/blocks/distribution/junction.png b/core/assets-raw/sprites/blocks/distribution/junction.png index f973535bfb..5e1c876680 100644 Binary files a/core/assets-raw/sprites/blocks/distribution/junction.png and b/core/assets-raw/sprites/blocks/distribution/junction.png differ diff --git a/core/assets-raw/sprites/blocks/distribution/overflow-gate.png b/core/assets-raw/sprites/blocks/distribution/overflow-gate.png index 3b47f57453..baf0fb0b7e 100644 Binary files a/core/assets-raw/sprites/blocks/distribution/overflow-gate.png and b/core/assets-raw/sprites/blocks/distribution/overflow-gate.png differ diff --git a/core/assets-raw/sprites/blocks/distribution/phase-conveyor-arrow.png b/core/assets-raw/sprites/blocks/distribution/phase-conveyor-arrow.png index d514df7dfa..22198e8e91 100644 Binary files a/core/assets-raw/sprites/blocks/distribution/phase-conveyor-arrow.png and b/core/assets-raw/sprites/blocks/distribution/phase-conveyor-arrow.png differ diff --git a/core/assets-raw/sprites/blocks/distribution/phase-conveyor.png b/core/assets-raw/sprites/blocks/distribution/phase-conveyor.png index e2fca93c08..5bfa849c46 100644 Binary files a/core/assets-raw/sprites/blocks/distribution/phase-conveyor.png and b/core/assets-raw/sprites/blocks/distribution/phase-conveyor.png differ diff --git a/core/assets-raw/sprites/blocks/distribution/router.png b/core/assets-raw/sprites/blocks/distribution/router.png index 61201a705a..5233503e84 100644 Binary files a/core/assets-raw/sprites/blocks/distribution/router.png and b/core/assets-raw/sprites/blocks/distribution/router.png differ diff --git a/core/assets-raw/sprites/blocks/distribution/sorter.png b/core/assets-raw/sprites/blocks/distribution/sorter.png index 03876f3138..a4c8b37e59 100644 Binary files a/core/assets-raw/sprites/blocks/distribution/sorter.png and b/core/assets-raw/sprites/blocks/distribution/sorter.png differ diff --git a/core/assets-raw/sprites/blocks/distribution/underflow-gate.png b/core/assets-raw/sprites/blocks/distribution/underflow-gate.png index 7eece491ec..733b8cb6dd 100644 Binary files a/core/assets-raw/sprites/blocks/distribution/underflow-gate.png and b/core/assets-raw/sprites/blocks/distribution/underflow-gate.png differ diff --git a/core/assets-raw/sprites/blocks/drills/blast-drill-rotator.png b/core/assets-raw/sprites/blocks/drills/blast-drill-rotator.png index 98a2834240..eff0a9e325 100644 Binary files a/core/assets-raw/sprites/blocks/drills/blast-drill-rotator.png and b/core/assets-raw/sprites/blocks/drills/blast-drill-rotator.png differ diff --git a/core/assets-raw/sprites/blocks/drills/drill-top.png b/core/assets-raw/sprites/blocks/drills/drill-top.png index dade4f64a3..bd21ce90cb 100644 Binary files a/core/assets-raw/sprites/blocks/drills/drill-top.png and b/core/assets-raw/sprites/blocks/drills/drill-top.png differ diff --git a/core/assets-raw/sprites/blocks/drills/laser-drill-rim.png b/core/assets-raw/sprites/blocks/drills/laser-drill-rim.png index 3db73498f5..80a830e1c7 100644 Binary files a/core/assets-raw/sprites/blocks/drills/laser-drill-rim.png and b/core/assets-raw/sprites/blocks/drills/laser-drill-rim.png differ diff --git a/core/assets-raw/sprites/blocks/drills/laser-drill-rotator.png b/core/assets-raw/sprites/blocks/drills/laser-drill-rotator.png index e2e1189386..a6d5ad350b 100644 Binary files a/core/assets-raw/sprites/blocks/drills/laser-drill-rotator.png and b/core/assets-raw/sprites/blocks/drills/laser-drill-rotator.png differ diff --git a/core/assets-raw/sprites/blocks/drills/laser-drill-top.png b/core/assets-raw/sprites/blocks/drills/laser-drill-top.png index bc2c136aea..3859f59e0f 100644 Binary files a/core/assets-raw/sprites/blocks/drills/laser-drill-top.png and b/core/assets-raw/sprites/blocks/drills/laser-drill-top.png differ diff --git a/core/assets-raw/sprites/blocks/drills/laser-drill.png b/core/assets-raw/sprites/blocks/drills/laser-drill.png index f80542e411..b0069ad9e9 100644 Binary files a/core/assets-raw/sprites/blocks/drills/laser-drill.png and b/core/assets-raw/sprites/blocks/drills/laser-drill.png differ diff --git a/core/assets-raw/sprites/blocks/drills/mechanical-drill-rotator.png b/core/assets-raw/sprites/blocks/drills/mechanical-drill-rotator.png index 23fe1726e8..22326cc9bb 100644 Binary files a/core/assets-raw/sprites/blocks/drills/mechanical-drill-rotator.png and b/core/assets-raw/sprites/blocks/drills/mechanical-drill-rotator.png differ diff --git a/core/assets-raw/sprites/blocks/drills/mechanical-drill-top.png b/core/assets-raw/sprites/blocks/drills/mechanical-drill-top.png index 3c38f1b6ad..dae2776c58 100644 Binary files a/core/assets-raw/sprites/blocks/drills/mechanical-drill-top.png and b/core/assets-raw/sprites/blocks/drills/mechanical-drill-top.png differ diff --git a/core/assets-raw/sprites/blocks/drills/mechanical-drill.png b/core/assets-raw/sprites/blocks/drills/mechanical-drill.png index 8b888ae205..2685c038c1 100644 Binary files a/core/assets-raw/sprites/blocks/drills/mechanical-drill.png and b/core/assets-raw/sprites/blocks/drills/mechanical-drill.png differ diff --git a/core/assets-raw/sprites/blocks/drills/oil-extractor-top.png b/core/assets-raw/sprites/blocks/drills/oil-extractor-top.png index fd1d1046a2..fe293d40f0 100644 Binary files a/core/assets-raw/sprites/blocks/drills/oil-extractor-top.png and b/core/assets-raw/sprites/blocks/drills/oil-extractor-top.png differ diff --git a/core/assets-raw/sprites/blocks/drills/oil-extractor.png b/core/assets-raw/sprites/blocks/drills/oil-extractor.png index 8568a087e4..36013391bf 100644 Binary files a/core/assets-raw/sprites/blocks/drills/oil-extractor.png and b/core/assets-raw/sprites/blocks/drills/oil-extractor.png differ diff --git a/core/assets-raw/sprites/blocks/drills/pneumatic-drill-top.png b/core/assets-raw/sprites/blocks/drills/pneumatic-drill-top.png index 6b9dd1f20e..bf18f2d072 100644 Binary files a/core/assets-raw/sprites/blocks/drills/pneumatic-drill-top.png and b/core/assets-raw/sprites/blocks/drills/pneumatic-drill-top.png differ diff --git a/core/assets-raw/sprites/blocks/drills/pneumatic-drill.png b/core/assets-raw/sprites/blocks/drills/pneumatic-drill.png index 05e6832c37..e755a63e79 100644 Binary files a/core/assets-raw/sprites/blocks/drills/pneumatic-drill.png and b/core/assets-raw/sprites/blocks/drills/pneumatic-drill.png differ diff --git a/core/assets-raw/sprites/blocks/drills/water-extractor-liquid.png b/core/assets-raw/sprites/blocks/drills/water-extractor-liquid.png index 2ac1564812..a0d71353f2 100644 Binary files a/core/assets-raw/sprites/blocks/drills/water-extractor-liquid.png and b/core/assets-raw/sprites/blocks/drills/water-extractor-liquid.png differ diff --git a/core/assets-raw/sprites/blocks/drills/water-extractor-top.png b/core/assets-raw/sprites/blocks/drills/water-extractor-top.png index 088e510dc5..3671dd0817 100644 Binary files a/core/assets-raw/sprites/blocks/drills/water-extractor-top.png and b/core/assets-raw/sprites/blocks/drills/water-extractor-top.png differ diff --git a/core/assets-raw/sprites/blocks/drills/water-extractor.png b/core/assets-raw/sprites/blocks/drills/water-extractor.png index 61030e7560..f38c9e7168 100644 Binary files a/core/assets-raw/sprites/blocks/drills/water-extractor.png and b/core/assets-raw/sprites/blocks/drills/water-extractor.png differ diff --git a/core/assets-raw/sprites/blocks/environment/cliffs1.png b/core/assets-raw/sprites/blocks/environment/cliffs1.png index 087e3065e2..eb60a159df 100644 Binary files a/core/assets-raw/sprites/blocks/environment/cliffs1.png and b/core/assets-raw/sprites/blocks/environment/cliffs1.png differ diff --git a/core/assets-raw/sprites/blocks/environment/coal1.png b/core/assets-raw/sprites/blocks/environment/coal1.png index 3caf5ed1b5..8d935599f3 100644 Binary files a/core/assets-raw/sprites/blocks/environment/coal1.png and b/core/assets-raw/sprites/blocks/environment/coal1.png differ diff --git a/core/assets-raw/sprites/blocks/environment/coal2.png b/core/assets-raw/sprites/blocks/environment/coal2.png index 9cf4691919..0e02214bd6 100644 Binary files a/core/assets-raw/sprites/blocks/environment/coal2.png and b/core/assets-raw/sprites/blocks/environment/coal2.png differ diff --git a/core/assets-raw/sprites/blocks/environment/coal3.png b/core/assets-raw/sprites/blocks/environment/coal3.png index 5f2cf4730f..710680ce8b 100644 Binary files a/core/assets-raw/sprites/blocks/environment/coal3.png and b/core/assets-raw/sprites/blocks/environment/coal3.png differ diff --git a/core/assets-raw/sprites/blocks/environment/copper1.png b/core/assets-raw/sprites/blocks/environment/copper1.png index c7b4dcc9ed..a16a0d75dc 100644 Binary files a/core/assets-raw/sprites/blocks/environment/copper1.png and b/core/assets-raw/sprites/blocks/environment/copper1.png differ diff --git a/core/assets-raw/sprites/blocks/environment/copper2.png b/core/assets-raw/sprites/blocks/environment/copper2.png index d62a9f201a..be68753af7 100644 Binary files a/core/assets-raw/sprites/blocks/environment/copper2.png and b/core/assets-raw/sprites/blocks/environment/copper2.png differ diff --git a/core/assets-raw/sprites/blocks/environment/copper3.png b/core/assets-raw/sprites/blocks/environment/copper3.png index c2f1a903ed..8ff6ecaed9 100644 Binary files a/core/assets-raw/sprites/blocks/environment/copper3.png and b/core/assets-raw/sprites/blocks/environment/copper3.png differ diff --git a/core/assets-raw/sprites/blocks/environment/craters1.png b/core/assets-raw/sprites/blocks/environment/craters1.png index 4b2172bc61..7b04e3553a 100644 Binary files a/core/assets-raw/sprites/blocks/environment/craters1.png and b/core/assets-raw/sprites/blocks/environment/craters1.png differ diff --git a/core/assets-raw/sprites/blocks/environment/craters2.png b/core/assets-raw/sprites/blocks/environment/craters2.png index 1170ab3c4f..ae6dc91fe2 100644 Binary files a/core/assets-raw/sprites/blocks/environment/craters2.png and b/core/assets-raw/sprites/blocks/environment/craters2.png differ diff --git a/core/assets-raw/sprites/blocks/environment/craters3.png b/core/assets-raw/sprites/blocks/environment/craters3.png index 9a23d383f7..1cc1193571 100644 Binary files a/core/assets-raw/sprites/blocks/environment/craters3.png and b/core/assets-raw/sprites/blocks/environment/craters3.png differ diff --git a/core/assets-raw/sprites/blocks/environment/craters4.png b/core/assets-raw/sprites/blocks/environment/craters4.png index 3d77e3080f..62cfa1f3e5 100644 Binary files a/core/assets-raw/sprites/blocks/environment/craters4.png and b/core/assets-raw/sprites/blocks/environment/craters4.png differ diff --git a/core/assets-raw/sprites/blocks/environment/dark-metal-large.png b/core/assets-raw/sprites/blocks/environment/dark-metal-large.png index 427eecae3c..42a53db08b 100644 Binary files a/core/assets-raw/sprites/blocks/environment/dark-metal-large.png and b/core/assets-raw/sprites/blocks/environment/dark-metal-large.png differ diff --git a/core/assets-raw/sprites/blocks/environment/dark-metal1.png b/core/assets-raw/sprites/blocks/environment/dark-metal1.png index 907b253157..ce65d4fd72 100644 Binary files a/core/assets-raw/sprites/blocks/environment/dark-metal1.png and b/core/assets-raw/sprites/blocks/environment/dark-metal1.png differ diff --git a/core/assets-raw/sprites/blocks/environment/dark-metal2.png b/core/assets-raw/sprites/blocks/environment/dark-metal2.png index 3eb3558f6c..42f7238425 100644 Binary files a/core/assets-raw/sprites/blocks/environment/dark-metal2.png and b/core/assets-raw/sprites/blocks/environment/dark-metal2.png differ diff --git a/core/assets-raw/sprites/blocks/environment/dark-panel-1.png b/core/assets-raw/sprites/blocks/environment/dark-panel-1.png index 3035832574..ea2d25e43f 100644 Binary files a/core/assets-raw/sprites/blocks/environment/dark-panel-1.png and b/core/assets-raw/sprites/blocks/environment/dark-panel-1.png differ diff --git a/core/assets-raw/sprites/blocks/environment/dark-panel-2.png b/core/assets-raw/sprites/blocks/environment/dark-panel-2.png index cead3de9bc..117c0fddf7 100644 Binary files a/core/assets-raw/sprites/blocks/environment/dark-panel-2.png and b/core/assets-raw/sprites/blocks/environment/dark-panel-2.png differ diff --git a/core/assets-raw/sprites/blocks/environment/dark-panel-3.png b/core/assets-raw/sprites/blocks/environment/dark-panel-3.png index bf321e76a6..382aaa7ce3 100644 Binary files a/core/assets-raw/sprites/blocks/environment/dark-panel-3.png and b/core/assets-raw/sprites/blocks/environment/dark-panel-3.png differ diff --git a/core/assets-raw/sprites/blocks/environment/dark-panel-4.png b/core/assets-raw/sprites/blocks/environment/dark-panel-4.png index 0a76f30595..a69c9c2da5 100644 Binary files a/core/assets-raw/sprites/blocks/environment/dark-panel-4.png and b/core/assets-raw/sprites/blocks/environment/dark-panel-4.png differ diff --git a/core/assets-raw/sprites/blocks/environment/dark-panel-5.png b/core/assets-raw/sprites/blocks/environment/dark-panel-5.png index 3f3c511fe4..b7d3e69c20 100644 Binary files a/core/assets-raw/sprites/blocks/environment/dark-panel-5.png and b/core/assets-raw/sprites/blocks/environment/dark-panel-5.png differ diff --git a/core/assets-raw/sprites/blocks/environment/dark-panel-6.png b/core/assets-raw/sprites/blocks/environment/dark-panel-6.png index 6ff46b0373..0c0423c3ed 100644 Binary files a/core/assets-raw/sprites/blocks/environment/dark-panel-6.png and b/core/assets-raw/sprites/blocks/environment/dark-panel-6.png differ diff --git a/core/assets-raw/sprites/blocks/environment/darksand-tainted-water.png b/core/assets-raw/sprites/blocks/environment/darksand-tainted-water.png index fce4fce352..4a551c60da 100644 Binary files a/core/assets-raw/sprites/blocks/environment/darksand-tainted-water.png and b/core/assets-raw/sprites/blocks/environment/darksand-tainted-water.png differ diff --git a/core/assets-raw/sprites/blocks/environment/darksand-water.png b/core/assets-raw/sprites/blocks/environment/darksand-water.png index 9074571f83..0d73187491 100644 Binary files a/core/assets-raw/sprites/blocks/environment/darksand-water.png and b/core/assets-raw/sprites/blocks/environment/darksand-water.png differ diff --git a/core/assets-raw/sprites/blocks/environment/darksand1.png b/core/assets-raw/sprites/blocks/environment/darksand1.png index 0478f5a78d..d2464e43e6 100644 Binary files a/core/assets-raw/sprites/blocks/environment/darksand1.png and b/core/assets-raw/sprites/blocks/environment/darksand1.png differ diff --git a/core/assets-raw/sprites/blocks/environment/darksand2.png b/core/assets-raw/sprites/blocks/environment/darksand2.png index 978f2d22d1..6faed6d169 100644 Binary files a/core/assets-raw/sprites/blocks/environment/darksand2.png and b/core/assets-raw/sprites/blocks/environment/darksand2.png differ diff --git a/core/assets-raw/sprites/blocks/environment/darksand3.png b/core/assets-raw/sprites/blocks/environment/darksand3.png index f6e829199b..8d3b199b13 100644 Binary files a/core/assets-raw/sprites/blocks/environment/darksand3.png and b/core/assets-raw/sprites/blocks/environment/darksand3.png differ diff --git a/core/assets-raw/sprites/blocks/environment/deepwater.png b/core/assets-raw/sprites/blocks/environment/deepwater.png index 2389c5985d..200485d6ad 100644 Binary files a/core/assets-raw/sprites/blocks/environment/deepwater.png and b/core/assets-raw/sprites/blocks/environment/deepwater.png differ diff --git a/core/assets-raw/sprites/blocks/environment/edge-stencil.png b/core/assets-raw/sprites/blocks/environment/edge-stencil.png index 4d45e75fde..08f18983b9 100644 Binary files a/core/assets-raw/sprites/blocks/environment/edge-stencil.png and b/core/assets-raw/sprites/blocks/environment/edge-stencil.png differ diff --git a/core/assets-raw/sprites/blocks/environment/edge.png b/core/assets-raw/sprites/blocks/environment/edge.png index 566dd28288..bd38d6c27e 100644 Binary files a/core/assets-raw/sprites/blocks/environment/edge.png and b/core/assets-raw/sprites/blocks/environment/edge.png differ diff --git a/core/assets-raw/sprites/blocks/environment/edgier.png b/core/assets-raw/sprites/blocks/environment/edgier.png index 98d675f453..0e4e66c84c 100644 Binary files a/core/assets-raw/sprites/blocks/environment/edgier.png and b/core/assets-raw/sprites/blocks/environment/edgier.png differ diff --git a/core/assets-raw/sprites/blocks/environment/grass1.png b/core/assets-raw/sprites/blocks/environment/grass1.png index adf810314d..95e7adb3ee 100644 Binary files a/core/assets-raw/sprites/blocks/environment/grass1.png and b/core/assets-raw/sprites/blocks/environment/grass1.png differ diff --git a/core/assets-raw/sprites/blocks/environment/grass2.png b/core/assets-raw/sprites/blocks/environment/grass2.png index 2f37e91369..2fa3e90a8d 100644 Binary files a/core/assets-raw/sprites/blocks/environment/grass2.png and b/core/assets-raw/sprites/blocks/environment/grass2.png differ diff --git a/core/assets-raw/sprites/blocks/environment/grass3.png b/core/assets-raw/sprites/blocks/environment/grass3.png index 704219e7f9..600697623e 100644 Binary files a/core/assets-raw/sprites/blocks/environment/grass3.png and b/core/assets-raw/sprites/blocks/environment/grass3.png differ diff --git a/core/assets-raw/sprites/blocks/environment/holostone1.png b/core/assets-raw/sprites/blocks/environment/holostone1.png index cc68b49c90..4f25d079a3 100644 Binary files a/core/assets-raw/sprites/blocks/environment/holostone1.png and b/core/assets-raw/sprites/blocks/environment/holostone1.png differ diff --git a/core/assets-raw/sprites/blocks/environment/holostone2.png b/core/assets-raw/sprites/blocks/environment/holostone2.png index 1c74d19a1b..e226a0497b 100644 Binary files a/core/assets-raw/sprites/blocks/environment/holostone2.png and b/core/assets-raw/sprites/blocks/environment/holostone2.png differ diff --git a/core/assets-raw/sprites/blocks/environment/holostone3.png b/core/assets-raw/sprites/blocks/environment/holostone3.png index 008f5a85f1..c11a6ce03e 100644 Binary files a/core/assets-raw/sprites/blocks/environment/holostone3.png and b/core/assets-raw/sprites/blocks/environment/holostone3.png differ diff --git a/core/assets-raw/sprites/blocks/environment/hotrock1.png b/core/assets-raw/sprites/blocks/environment/hotrock1.png index d331a9b07c..b21bcb1748 100644 Binary files a/core/assets-raw/sprites/blocks/environment/hotrock1.png and b/core/assets-raw/sprites/blocks/environment/hotrock1.png differ diff --git a/core/assets-raw/sprites/blocks/environment/hotrock2.png b/core/assets-raw/sprites/blocks/environment/hotrock2.png index 5bfe3110eb..e6d108f060 100644 Binary files a/core/assets-raw/sprites/blocks/environment/hotrock2.png and b/core/assets-raw/sprites/blocks/environment/hotrock2.png differ diff --git a/core/assets-raw/sprites/blocks/environment/hotrock3.png b/core/assets-raw/sprites/blocks/environment/hotrock3.png index 1d37b221a3..9741c883a0 100644 Binary files a/core/assets-raw/sprites/blocks/environment/hotrock3.png and b/core/assets-raw/sprites/blocks/environment/hotrock3.png differ diff --git a/core/assets-raw/sprites/blocks/environment/ice-snow1.png b/core/assets-raw/sprites/blocks/environment/ice-snow1.png index fa26a7eb94..ee593e9f64 100644 Binary files a/core/assets-raw/sprites/blocks/environment/ice-snow1.png and b/core/assets-raw/sprites/blocks/environment/ice-snow1.png differ diff --git a/core/assets-raw/sprites/blocks/environment/ice-snow2.png b/core/assets-raw/sprites/blocks/environment/ice-snow2.png index b1b895af0a..a9ffcf1088 100644 Binary files a/core/assets-raw/sprites/blocks/environment/ice-snow2.png and b/core/assets-raw/sprites/blocks/environment/ice-snow2.png differ diff --git a/core/assets-raw/sprites/blocks/environment/ice-snow3.png b/core/assets-raw/sprites/blocks/environment/ice-snow3.png index 6448172835..f38d778b29 100644 Binary files a/core/assets-raw/sprites/blocks/environment/ice-snow3.png and b/core/assets-raw/sprites/blocks/environment/ice-snow3.png differ diff --git a/core/assets-raw/sprites/blocks/environment/ice1.png b/core/assets-raw/sprites/blocks/environment/ice1.png index 7e3bfcedfa..037910327e 100644 Binary files a/core/assets-raw/sprites/blocks/environment/ice1.png and b/core/assets-raw/sprites/blocks/environment/ice1.png differ diff --git a/core/assets-raw/sprites/blocks/environment/ice2.png b/core/assets-raw/sprites/blocks/environment/ice2.png index 9a2643a694..0dda240a76 100644 Binary files a/core/assets-raw/sprites/blocks/environment/ice2.png and b/core/assets-raw/sprites/blocks/environment/ice2.png differ diff --git a/core/assets-raw/sprites/blocks/environment/ice3.png b/core/assets-raw/sprites/blocks/environment/ice3.png index 08821cc029..72b2253496 100644 Binary files a/core/assets-raw/sprites/blocks/environment/ice3.png and b/core/assets-raw/sprites/blocks/environment/ice3.png differ diff --git a/core/assets-raw/sprites/blocks/environment/icerocks-large.png b/core/assets-raw/sprites/blocks/environment/icerocks-large.png index f43c40e61a..ac584bb88d 100644 Binary files a/core/assets-raw/sprites/blocks/environment/icerocks-large.png and b/core/assets-raw/sprites/blocks/environment/icerocks-large.png differ diff --git a/core/assets-raw/sprites/blocks/environment/icerocks1.png b/core/assets-raw/sprites/blocks/environment/icerocks1.png index 8b93485477..6c294088c5 100644 Binary files a/core/assets-raw/sprites/blocks/environment/icerocks1.png and b/core/assets-raw/sprites/blocks/environment/icerocks1.png differ diff --git a/core/assets-raw/sprites/blocks/environment/icerocks2.png b/core/assets-raw/sprites/blocks/environment/icerocks2.png index 7264d6aa03..02e8c69cdf 100644 Binary files a/core/assets-raw/sprites/blocks/environment/icerocks2.png and b/core/assets-raw/sprites/blocks/environment/icerocks2.png differ diff --git a/core/assets-raw/sprites/blocks/environment/ignarock1.png b/core/assets-raw/sprites/blocks/environment/ignarock1.png index fff2086d21..4b14fe9438 100644 Binary files a/core/assets-raw/sprites/blocks/environment/ignarock1.png and b/core/assets-raw/sprites/blocks/environment/ignarock1.png differ diff --git a/core/assets-raw/sprites/blocks/environment/ignarock2.png b/core/assets-raw/sprites/blocks/environment/ignarock2.png index da2c7412b7..dab19320f8 100644 Binary files a/core/assets-raw/sprites/blocks/environment/ignarock2.png and b/core/assets-raw/sprites/blocks/environment/ignarock2.png differ diff --git a/core/assets-raw/sprites/blocks/environment/ignarock3.png b/core/assets-raw/sprites/blocks/environment/ignarock3.png index e303b57082..8afeab498b 100644 Binary files a/core/assets-raw/sprites/blocks/environment/ignarock3.png and b/core/assets-raw/sprites/blocks/environment/ignarock3.png differ diff --git a/core/assets-raw/sprites/blocks/environment/lead1.png b/core/assets-raw/sprites/blocks/environment/lead1.png index 75b71b0f8d..31d590fbf3 100644 Binary files a/core/assets-raw/sprites/blocks/environment/lead1.png and b/core/assets-raw/sprites/blocks/environment/lead1.png differ diff --git a/core/assets-raw/sprites/blocks/environment/lead2.png b/core/assets-raw/sprites/blocks/environment/lead2.png index b61a3a5cfb..c88b0b6317 100644 Binary files a/core/assets-raw/sprites/blocks/environment/lead2.png and b/core/assets-raw/sprites/blocks/environment/lead2.png differ diff --git a/core/assets-raw/sprites/blocks/environment/lead3.png b/core/assets-raw/sprites/blocks/environment/lead3.png index 87360e6656..3c467376b5 100644 Binary files a/core/assets-raw/sprites/blocks/environment/lead3.png and b/core/assets-raw/sprites/blocks/environment/lead3.png differ diff --git a/core/assets-raw/sprites/blocks/environment/magmarock1.png b/core/assets-raw/sprites/blocks/environment/magmarock1.png index a25af14de1..be1b8e5de1 100644 Binary files a/core/assets-raw/sprites/blocks/environment/magmarock1.png and b/core/assets-raw/sprites/blocks/environment/magmarock1.png differ diff --git a/core/assets-raw/sprites/blocks/environment/magmarock2.png b/core/assets-raw/sprites/blocks/environment/magmarock2.png index 7360fb1690..f03bb5fa2e 100644 Binary files a/core/assets-raw/sprites/blocks/environment/magmarock2.png and b/core/assets-raw/sprites/blocks/environment/magmarock2.png differ diff --git a/core/assets-raw/sprites/blocks/environment/magmarock3.png b/core/assets-raw/sprites/blocks/environment/magmarock3.png index 7516823fc6..865a1c1356 100644 Binary files a/core/assets-raw/sprites/blocks/environment/magmarock3.png and b/core/assets-raw/sprites/blocks/environment/magmarock3.png differ diff --git a/core/assets-raw/sprites/blocks/environment/metal-floor-2.png b/core/assets-raw/sprites/blocks/environment/metal-floor-2.png index 563338725b..4c89da7480 100644 Binary files a/core/assets-raw/sprites/blocks/environment/metal-floor-2.png and b/core/assets-raw/sprites/blocks/environment/metal-floor-2.png differ diff --git a/core/assets-raw/sprites/blocks/environment/metal-floor-5.png b/core/assets-raw/sprites/blocks/environment/metal-floor-5.png index ed2bc67e17..9fc2603fd8 100644 Binary files a/core/assets-raw/sprites/blocks/environment/metal-floor-5.png and b/core/assets-raw/sprites/blocks/environment/metal-floor-5.png differ diff --git a/core/assets-raw/sprites/blocks/environment/metal-floor-damaged1.png b/core/assets-raw/sprites/blocks/environment/metal-floor-damaged1.png index 8b1e45793d..1cfce7fe86 100644 Binary files a/core/assets-raw/sprites/blocks/environment/metal-floor-damaged1.png and b/core/assets-raw/sprites/blocks/environment/metal-floor-damaged1.png differ diff --git a/core/assets-raw/sprites/blocks/environment/metal-floor-damaged2.png b/core/assets-raw/sprites/blocks/environment/metal-floor-damaged2.png index 5af2f8fbd2..078e5e7252 100644 Binary files a/core/assets-raw/sprites/blocks/environment/metal-floor-damaged2.png and b/core/assets-raw/sprites/blocks/environment/metal-floor-damaged2.png differ diff --git a/core/assets-raw/sprites/blocks/environment/metal-floor-damaged3.png b/core/assets-raw/sprites/blocks/environment/metal-floor-damaged3.png index fe999c003c..fbc921711d 100644 Binary files a/core/assets-raw/sprites/blocks/environment/metal-floor-damaged3.png and b/core/assets-raw/sprites/blocks/environment/metal-floor-damaged3.png differ diff --git a/core/assets-raw/sprites/blocks/environment/metal-floor.png b/core/assets-raw/sprites/blocks/environment/metal-floor.png index d0085b65d9..f60eff075e 100644 Binary files a/core/assets-raw/sprites/blocks/environment/metal-floor.png and b/core/assets-raw/sprites/blocks/environment/metal-floor.png differ diff --git a/core/assets-raw/sprites/blocks/environment/moss1.png b/core/assets-raw/sprites/blocks/environment/moss1.png index 800bb05170..901ad1894a 100644 Binary files a/core/assets-raw/sprites/blocks/environment/moss1.png and b/core/assets-raw/sprites/blocks/environment/moss1.png differ diff --git a/core/assets-raw/sprites/blocks/environment/moss2.png b/core/assets-raw/sprites/blocks/environment/moss2.png index 2d338650e1..e429784752 100644 Binary files a/core/assets-raw/sprites/blocks/environment/moss2.png and b/core/assets-raw/sprites/blocks/environment/moss2.png differ diff --git a/core/assets-raw/sprites/blocks/environment/moss3.png b/core/assets-raw/sprites/blocks/environment/moss3.png index e840a1936a..b8f86a68de 100644 Binary files a/core/assets-raw/sprites/blocks/environment/moss3.png and b/core/assets-raw/sprites/blocks/environment/moss3.png differ diff --git a/core/assets-raw/sprites/blocks/environment/pebbles1.png b/core/assets-raw/sprites/blocks/environment/pebbles1.png index cac9429ba0..4dea1878aa 100644 Binary files a/core/assets-raw/sprites/blocks/environment/pebbles1.png and b/core/assets-raw/sprites/blocks/environment/pebbles1.png differ diff --git a/core/assets-raw/sprites/blocks/environment/pebbles2.png b/core/assets-raw/sprites/blocks/environment/pebbles2.png index a909715845..d334060d66 100644 Binary files a/core/assets-raw/sprites/blocks/environment/pebbles2.png and b/core/assets-raw/sprites/blocks/environment/pebbles2.png differ diff --git a/core/assets-raw/sprites/blocks/environment/pebbles3.png b/core/assets-raw/sprites/blocks/environment/pebbles3.png index b8585099aa..fc87797e85 100644 Binary files a/core/assets-raw/sprites/blocks/environment/pebbles3.png and b/core/assets-raw/sprites/blocks/environment/pebbles3.png differ diff --git a/core/assets-raw/sprites/blocks/environment/pine.png b/core/assets-raw/sprites/blocks/environment/pine.png index 8a4dcd9ad2..23c68c6efc 100644 Binary files a/core/assets-raw/sprites/blocks/environment/pine.png and b/core/assets-raw/sprites/blocks/environment/pine.png differ diff --git a/core/assets-raw/sprites/blocks/environment/rock1.png b/core/assets-raw/sprites/blocks/environment/rock1.png index 75d81ad163..ae54a0027e 100644 Binary files a/core/assets-raw/sprites/blocks/environment/rock1.png and b/core/assets-raw/sprites/blocks/environment/rock1.png differ diff --git a/core/assets-raw/sprites/blocks/environment/rock2.png b/core/assets-raw/sprites/blocks/environment/rock2.png index b4a900c4fd..6e6e310045 100644 Binary files a/core/assets-raw/sprites/blocks/environment/rock2.png and b/core/assets-raw/sprites/blocks/environment/rock2.png differ diff --git a/core/assets-raw/sprites/blocks/environment/salt.png b/core/assets-raw/sprites/blocks/environment/salt.png index f6cde0093c..4e7da75591 100644 Binary files a/core/assets-raw/sprites/blocks/environment/salt.png and b/core/assets-raw/sprites/blocks/environment/salt.png differ diff --git a/core/assets-raw/sprites/blocks/environment/saltrocks-large.png b/core/assets-raw/sprites/blocks/environment/saltrocks-large.png index 3bf4af2ec1..c35319abe1 100644 Binary files a/core/assets-raw/sprites/blocks/environment/saltrocks-large.png and b/core/assets-raw/sprites/blocks/environment/saltrocks-large.png differ diff --git a/core/assets-raw/sprites/blocks/environment/saltrocks1.png b/core/assets-raw/sprites/blocks/environment/saltrocks1.png index 74045a27a7..5c2d0628d7 100644 Binary files a/core/assets-raw/sprites/blocks/environment/saltrocks1.png and b/core/assets-raw/sprites/blocks/environment/saltrocks1.png differ diff --git a/core/assets-raw/sprites/blocks/environment/saltrocks2.png b/core/assets-raw/sprites/blocks/environment/saltrocks2.png index 25b801e550..64a572683a 100644 Binary files a/core/assets-raw/sprites/blocks/environment/saltrocks2.png and b/core/assets-raw/sprites/blocks/environment/saltrocks2.png differ diff --git a/core/assets-raw/sprites/blocks/environment/sand-boulder1.png b/core/assets-raw/sprites/blocks/environment/sand-boulder1.png index 4afe994648..4c2cbd964c 100644 Binary files a/core/assets-raw/sprites/blocks/environment/sand-boulder1.png and b/core/assets-raw/sprites/blocks/environment/sand-boulder1.png differ diff --git a/core/assets-raw/sprites/blocks/environment/sand-boulder2.png b/core/assets-raw/sprites/blocks/environment/sand-boulder2.png index 3c59c6240e..902a0d7b4d 100644 Binary files a/core/assets-raw/sprites/blocks/environment/sand-boulder2.png and b/core/assets-raw/sprites/blocks/environment/sand-boulder2.png differ diff --git a/core/assets-raw/sprites/blocks/environment/sand-water.png b/core/assets-raw/sprites/blocks/environment/sand-water.png index 4ac2222ed3..ab897962c6 100644 Binary files a/core/assets-raw/sprites/blocks/environment/sand-water.png and b/core/assets-raw/sprites/blocks/environment/sand-water.png differ diff --git a/core/assets-raw/sprites/blocks/environment/sand1.png b/core/assets-raw/sprites/blocks/environment/sand1.png index ae6ca2d3be..c7941f0059 100644 Binary files a/core/assets-raw/sprites/blocks/environment/sand1.png and b/core/assets-raw/sprites/blocks/environment/sand1.png differ diff --git a/core/assets-raw/sprites/blocks/environment/sand2.png b/core/assets-raw/sprites/blocks/environment/sand2.png index c13afa2030..a29fb7a719 100644 Binary files a/core/assets-raw/sprites/blocks/environment/sand2.png and b/core/assets-raw/sprites/blocks/environment/sand2.png differ diff --git a/core/assets-raw/sprites/blocks/environment/sand3.png b/core/assets-raw/sprites/blocks/environment/sand3.png index b03562c494..bd3ed480aa 100644 Binary files a/core/assets-raw/sprites/blocks/environment/sand3.png and b/core/assets-raw/sprites/blocks/environment/sand3.png differ diff --git a/core/assets-raw/sprites/blocks/environment/sandrocks-large.png b/core/assets-raw/sprites/blocks/environment/sandrocks-large.png index e9148b71b9..7d485d3a19 100644 Binary files a/core/assets-raw/sprites/blocks/environment/sandrocks-large.png and b/core/assets-raw/sprites/blocks/environment/sandrocks-large.png differ diff --git a/core/assets-raw/sprites/blocks/environment/sandrocks1.png b/core/assets-raw/sprites/blocks/environment/sandrocks1.png index 55f9afbbd5..52612ac838 100644 Binary files a/core/assets-raw/sprites/blocks/environment/sandrocks1.png and b/core/assets-raw/sprites/blocks/environment/sandrocks1.png differ diff --git a/core/assets-raw/sprites/blocks/environment/sandrocks2.png b/core/assets-raw/sprites/blocks/environment/sandrocks2.png index 2078ee2f2d..76d0da2cdb 100644 Binary files a/core/assets-raw/sprites/blocks/environment/sandrocks2.png and b/core/assets-raw/sprites/blocks/environment/sandrocks2.png differ diff --git a/core/assets-raw/sprites/blocks/environment/scrap1.png b/core/assets-raw/sprites/blocks/environment/scrap1.png index 9fb8fb03f2..8300bb36fc 100644 Binary files a/core/assets-raw/sprites/blocks/environment/scrap1.png and b/core/assets-raw/sprites/blocks/environment/scrap1.png differ diff --git a/core/assets-raw/sprites/blocks/environment/scrap2.png b/core/assets-raw/sprites/blocks/environment/scrap2.png index f133d159f5..65974220df 100644 Binary files a/core/assets-raw/sprites/blocks/environment/scrap2.png and b/core/assets-raw/sprites/blocks/environment/scrap2.png differ diff --git a/core/assets-raw/sprites/blocks/environment/scrap3.png b/core/assets-raw/sprites/blocks/environment/scrap3.png index f602404e34..955c4633e2 100644 Binary files a/core/assets-raw/sprites/blocks/environment/scrap3.png and b/core/assets-raw/sprites/blocks/environment/scrap3.png differ diff --git a/core/assets-raw/sprites/blocks/environment/shale-boulder1.png b/core/assets-raw/sprites/blocks/environment/shale-boulder1.png index 00cc2f2ccb..6d280cc2fd 100644 Binary files a/core/assets-raw/sprites/blocks/environment/shale-boulder1.png and b/core/assets-raw/sprites/blocks/environment/shale-boulder1.png differ diff --git a/core/assets-raw/sprites/blocks/environment/shale-boulder2.png b/core/assets-raw/sprites/blocks/environment/shale-boulder2.png index e03c20b62c..5ba4033ba6 100644 Binary files a/core/assets-raw/sprites/blocks/environment/shale-boulder2.png and b/core/assets-raw/sprites/blocks/environment/shale-boulder2.png differ diff --git a/core/assets-raw/sprites/blocks/environment/shale1.png b/core/assets-raw/sprites/blocks/environment/shale1.png index 6f242df279..3e90cb0064 100644 Binary files a/core/assets-raw/sprites/blocks/environment/shale1.png and b/core/assets-raw/sprites/blocks/environment/shale1.png differ diff --git a/core/assets-raw/sprites/blocks/environment/shale2.png b/core/assets-raw/sprites/blocks/environment/shale2.png index 2edf629f90..2f6ddaf27d 100644 Binary files a/core/assets-raw/sprites/blocks/environment/shale2.png and b/core/assets-raw/sprites/blocks/environment/shale2.png differ diff --git a/core/assets-raw/sprites/blocks/environment/shale3.png b/core/assets-raw/sprites/blocks/environment/shale3.png index 95382a191c..d17b8b3066 100644 Binary files a/core/assets-raw/sprites/blocks/environment/shale3.png and b/core/assets-raw/sprites/blocks/environment/shale3.png differ diff --git a/core/assets-raw/sprites/blocks/environment/shalerocks1.png b/core/assets-raw/sprites/blocks/environment/shalerocks1.png index ff8b482bb7..ba2180b7a7 100644 Binary files a/core/assets-raw/sprites/blocks/environment/shalerocks1.png and b/core/assets-raw/sprites/blocks/environment/shalerocks1.png differ diff --git a/core/assets-raw/sprites/blocks/environment/shalerocks2.png b/core/assets-raw/sprites/blocks/environment/shalerocks2.png index 50d0f74c0c..08947b6d55 100644 Binary files a/core/assets-raw/sprites/blocks/environment/shalerocks2.png and b/core/assets-raw/sprites/blocks/environment/shalerocks2.png differ diff --git a/core/assets-raw/sprites/blocks/environment/shrubs-large.png b/core/assets-raw/sprites/blocks/environment/shrubs-large.png index dd0b6612d9..f348a6b3bf 100644 Binary files a/core/assets-raw/sprites/blocks/environment/shrubs-large.png and b/core/assets-raw/sprites/blocks/environment/shrubs-large.png differ diff --git a/core/assets-raw/sprites/blocks/environment/shrubs1.png b/core/assets-raw/sprites/blocks/environment/shrubs1.png index caff49a543..7ce2de38be 100644 Binary files a/core/assets-raw/sprites/blocks/environment/shrubs1.png and b/core/assets-raw/sprites/blocks/environment/shrubs1.png differ diff --git a/core/assets-raw/sprites/blocks/environment/shrubs2.png b/core/assets-raw/sprites/blocks/environment/shrubs2.png index a4f583d86f..0bad1cd974 100644 Binary files a/core/assets-raw/sprites/blocks/environment/shrubs2.png and b/core/assets-raw/sprites/blocks/environment/shrubs2.png differ diff --git a/core/assets-raw/sprites/blocks/environment/snow-pine.png b/core/assets-raw/sprites/blocks/environment/snow-pine.png index 3e6f6a9da0..7c417ddcd8 100644 Binary files a/core/assets-raw/sprites/blocks/environment/snow-pine.png and b/core/assets-raw/sprites/blocks/environment/snow-pine.png differ diff --git a/core/assets-raw/sprites/blocks/environment/snow1.png b/core/assets-raw/sprites/blocks/environment/snow1.png index b33b1194c0..8d922c5463 100644 Binary files a/core/assets-raw/sprites/blocks/environment/snow1.png and b/core/assets-raw/sprites/blocks/environment/snow1.png differ diff --git a/core/assets-raw/sprites/blocks/environment/snow2.png b/core/assets-raw/sprites/blocks/environment/snow2.png index d4d28874a5..ab3a0bea58 100644 Binary files a/core/assets-raw/sprites/blocks/environment/snow2.png and b/core/assets-raw/sprites/blocks/environment/snow2.png differ diff --git a/core/assets-raw/sprites/blocks/environment/snow3.png b/core/assets-raw/sprites/blocks/environment/snow3.png index b1eeb60dd2..30d46ff4d3 100644 Binary files a/core/assets-raw/sprites/blocks/environment/snow3.png and b/core/assets-raw/sprites/blocks/environment/snow3.png differ diff --git a/core/assets-raw/sprites/blocks/environment/snowrock1.png b/core/assets-raw/sprites/blocks/environment/snowrock1.png index d81d328b9c..c7feac2e10 100644 Binary files a/core/assets-raw/sprites/blocks/environment/snowrock1.png and b/core/assets-raw/sprites/blocks/environment/snowrock1.png differ diff --git a/core/assets-raw/sprites/blocks/environment/snowrock2.png b/core/assets-raw/sprites/blocks/environment/snowrock2.png index 99a4b14ce0..5f148d78eb 100644 Binary files a/core/assets-raw/sprites/blocks/environment/snowrock2.png and b/core/assets-raw/sprites/blocks/environment/snowrock2.png differ diff --git a/core/assets-raw/sprites/blocks/environment/snowrocks-large.png b/core/assets-raw/sprites/blocks/environment/snowrocks-large.png index eb0a0f8ad8..0b9f028516 100644 Binary files a/core/assets-raw/sprites/blocks/environment/snowrocks-large.png and b/core/assets-raw/sprites/blocks/environment/snowrocks-large.png differ diff --git a/core/assets-raw/sprites/blocks/environment/snowrocks1.png b/core/assets-raw/sprites/blocks/environment/snowrocks1.png index c61d6f7f9e..97101cec5d 100644 Binary files a/core/assets-raw/sprites/blocks/environment/snowrocks1.png and b/core/assets-raw/sprites/blocks/environment/snowrocks1.png differ diff --git a/core/assets-raw/sprites/blocks/environment/snowrocks2.png b/core/assets-raw/sprites/blocks/environment/snowrocks2.png index 3d659efc32..dbdd7d28cd 100644 Binary files a/core/assets-raw/sprites/blocks/environment/snowrocks2.png and b/core/assets-raw/sprites/blocks/environment/snowrocks2.png differ diff --git a/core/assets-raw/sprites/blocks/environment/spore-cluster1.png b/core/assets-raw/sprites/blocks/environment/spore-cluster1.png index 9bfdd4a4d2..50475fa510 100644 Binary files a/core/assets-raw/sprites/blocks/environment/spore-cluster1.png and b/core/assets-raw/sprites/blocks/environment/spore-cluster1.png differ diff --git a/core/assets-raw/sprites/blocks/environment/spore-cluster2.png b/core/assets-raw/sprites/blocks/environment/spore-cluster2.png index 4696b76ed9..4d19d2d209 100644 Binary files a/core/assets-raw/sprites/blocks/environment/spore-cluster2.png and b/core/assets-raw/sprites/blocks/environment/spore-cluster2.png differ diff --git a/core/assets-raw/sprites/blocks/environment/spore-cluster3.png b/core/assets-raw/sprites/blocks/environment/spore-cluster3.png index 047cada29a..3802836ac9 100644 Binary files a/core/assets-raw/sprites/blocks/environment/spore-cluster3.png and b/core/assets-raw/sprites/blocks/environment/spore-cluster3.png differ diff --git a/core/assets-raw/sprites/blocks/environment/spore-moss1.png b/core/assets-raw/sprites/blocks/environment/spore-moss1.png index b1e7fbbf34..37efcd5cd3 100644 Binary files a/core/assets-raw/sprites/blocks/environment/spore-moss1.png and b/core/assets-raw/sprites/blocks/environment/spore-moss1.png differ diff --git a/core/assets-raw/sprites/blocks/environment/spore-moss2.png b/core/assets-raw/sprites/blocks/environment/spore-moss2.png index cf05c4279e..f089759ca7 100644 Binary files a/core/assets-raw/sprites/blocks/environment/spore-moss2.png and b/core/assets-raw/sprites/blocks/environment/spore-moss2.png differ diff --git a/core/assets-raw/sprites/blocks/environment/spore-moss3.png b/core/assets-raw/sprites/blocks/environment/spore-moss3.png index 8b519681f9..7e70aeb6bf 100644 Binary files a/core/assets-raw/sprites/blocks/environment/spore-moss3.png and b/core/assets-raw/sprites/blocks/environment/spore-moss3.png differ diff --git a/core/assets-raw/sprites/blocks/environment/spore-pine.png b/core/assets-raw/sprites/blocks/environment/spore-pine.png index 802248118a..b7ad94e20e 100644 Binary files a/core/assets-raw/sprites/blocks/environment/spore-pine.png and b/core/assets-raw/sprites/blocks/environment/spore-pine.png differ diff --git a/core/assets-raw/sprites/blocks/environment/sporerocks-large.png b/core/assets-raw/sprites/blocks/environment/sporerocks-large.png index d02f83cdff..df6ac62ebd 100644 Binary files a/core/assets-raw/sprites/blocks/environment/sporerocks-large.png and b/core/assets-raw/sprites/blocks/environment/sporerocks-large.png differ diff --git a/core/assets-raw/sprites/blocks/environment/sporerocks1.png b/core/assets-raw/sprites/blocks/environment/sporerocks1.png index 6f937d4613..ee3ec9a4d1 100644 Binary files a/core/assets-raw/sprites/blocks/environment/sporerocks1.png and b/core/assets-raw/sprites/blocks/environment/sporerocks1.png differ diff --git a/core/assets-raw/sprites/blocks/environment/sporerocks2.png b/core/assets-raw/sprites/blocks/environment/sporerocks2.png index cebda293b9..638a1e3eb5 100644 Binary files a/core/assets-raw/sprites/blocks/environment/sporerocks2.png and b/core/assets-raw/sprites/blocks/environment/sporerocks2.png differ diff --git a/core/assets-raw/sprites/blocks/environment/stone1.png b/core/assets-raw/sprites/blocks/environment/stone1.png index e9f42a172d..1747b84033 100644 Binary files a/core/assets-raw/sprites/blocks/environment/stone1.png and b/core/assets-raw/sprites/blocks/environment/stone1.png differ diff --git a/core/assets-raw/sprites/blocks/environment/stone2.png b/core/assets-raw/sprites/blocks/environment/stone2.png index 09bc9f3e5a..5d2c768c3b 100644 Binary files a/core/assets-raw/sprites/blocks/environment/stone2.png and b/core/assets-raw/sprites/blocks/environment/stone2.png differ diff --git a/core/assets-raw/sprites/blocks/environment/stone3.png b/core/assets-raw/sprites/blocks/environment/stone3.png index ca2487d441..c94e8d257e 100644 Binary files a/core/assets-raw/sprites/blocks/environment/stone3.png and b/core/assets-raw/sprites/blocks/environment/stone3.png differ diff --git a/core/assets-raw/sprites/blocks/environment/tainted-water.png b/core/assets-raw/sprites/blocks/environment/tainted-water.png index 1618a1b0e1..021c5ac7b6 100644 Binary files a/core/assets-raw/sprites/blocks/environment/tainted-water.png and b/core/assets-raw/sprites/blocks/environment/tainted-water.png differ diff --git a/core/assets-raw/sprites/blocks/environment/tendrils1.png b/core/assets-raw/sprites/blocks/environment/tendrils1.png index 904eb41418..90345f275b 100644 Binary files a/core/assets-raw/sprites/blocks/environment/tendrils1.png and b/core/assets-raw/sprites/blocks/environment/tendrils1.png differ diff --git a/core/assets-raw/sprites/blocks/environment/tendrils2.png b/core/assets-raw/sprites/blocks/environment/tendrils2.png index 895843750c..b234cc402b 100644 Binary files a/core/assets-raw/sprites/blocks/environment/tendrils2.png and b/core/assets-raw/sprites/blocks/environment/tendrils2.png differ diff --git a/core/assets-raw/sprites/blocks/environment/tendrils3.png b/core/assets-raw/sprites/blocks/environment/tendrils3.png index d71b9bc1c7..e998b412c9 100644 Binary files a/core/assets-raw/sprites/blocks/environment/tendrils3.png and b/core/assets-raw/sprites/blocks/environment/tendrils3.png differ diff --git a/core/assets-raw/sprites/blocks/environment/thorium1.png b/core/assets-raw/sprites/blocks/environment/thorium1.png index 6c69abda01..b17c0a4b12 100644 Binary files a/core/assets-raw/sprites/blocks/environment/thorium1.png and b/core/assets-raw/sprites/blocks/environment/thorium1.png differ diff --git a/core/assets-raw/sprites/blocks/environment/thorium2.png b/core/assets-raw/sprites/blocks/environment/thorium2.png index 5995079270..da74d1e7ae 100644 Binary files a/core/assets-raw/sprites/blocks/environment/thorium2.png and b/core/assets-raw/sprites/blocks/environment/thorium2.png differ diff --git a/core/assets-raw/sprites/blocks/environment/thorium3.png b/core/assets-raw/sprites/blocks/environment/thorium3.png index de787e98a6..e82026a31a 100644 Binary files a/core/assets-raw/sprites/blocks/environment/thorium3.png and b/core/assets-raw/sprites/blocks/environment/thorium3.png differ diff --git a/core/assets-raw/sprites/blocks/environment/titanium1.png b/core/assets-raw/sprites/blocks/environment/titanium1.png index 4cfd1bf647..1172dad247 100644 Binary files a/core/assets-raw/sprites/blocks/environment/titanium1.png and b/core/assets-raw/sprites/blocks/environment/titanium1.png differ diff --git a/core/assets-raw/sprites/blocks/environment/titanium2.png b/core/assets-raw/sprites/blocks/environment/titanium2.png index 60e9d13134..c32ec8c034 100644 Binary files a/core/assets-raw/sprites/blocks/environment/titanium2.png and b/core/assets-raw/sprites/blocks/environment/titanium2.png differ diff --git a/core/assets-raw/sprites/blocks/environment/titanium3.png b/core/assets-raw/sprites/blocks/environment/titanium3.png index 946f55ab46..51547a0363 100644 Binary files a/core/assets-raw/sprites/blocks/environment/titanium3.png and b/core/assets-raw/sprites/blocks/environment/titanium3.png differ diff --git a/core/assets-raw/sprites/blocks/environment/water.png b/core/assets-raw/sprites/blocks/environment/water.png index 631f99201a..474987f0e9 100644 Binary files a/core/assets-raw/sprites/blocks/environment/water.png and b/core/assets-raw/sprites/blocks/environment/water.png differ diff --git a/core/assets-raw/sprites/blocks/environment/white-tree-dead.png b/core/assets-raw/sprites/blocks/environment/white-tree-dead.png index 4831e1879e..4e7a5c9292 100644 Binary files a/core/assets-raw/sprites/blocks/environment/white-tree-dead.png and b/core/assets-raw/sprites/blocks/environment/white-tree-dead.png differ diff --git a/core/assets-raw/sprites/blocks/environment/white-tree.png b/core/assets-raw/sprites/blocks/environment/white-tree.png index af2b61c5ca..bfc3d3629e 100644 Binary files a/core/assets-raw/sprites/blocks/environment/white-tree.png and b/core/assets-raw/sprites/blocks/environment/white-tree.png differ diff --git a/core/assets-raw/sprites/blocks/extra/block-border.png b/core/assets-raw/sprites/blocks/extra/block-border.png index 415c5a6849..daf204a949 100644 Binary files a/core/assets-raw/sprites/blocks/extra/block-border.png and b/core/assets-raw/sprites/blocks/extra/block-border.png differ diff --git a/core/assets-raw/sprites/blocks/extra/block-select.png b/core/assets-raw/sprites/blocks/extra/block-select.png index 559131b263..e9d19b9e7e 100644 Binary files a/core/assets-raw/sprites/blocks/extra/block-select.png and b/core/assets-raw/sprites/blocks/extra/block-select.png differ diff --git a/core/assets-raw/sprites/blocks/extra/message.png b/core/assets-raw/sprites/blocks/extra/message.png index f18960812c..60f8659d12 100644 Binary files a/core/assets-raw/sprites/blocks/extra/message.png and b/core/assets-raw/sprites/blocks/extra/message.png differ diff --git a/core/assets-raw/sprites/blocks/extra/place-arrow.png b/core/assets-raw/sprites/blocks/extra/place-arrow.png index 5ae905b23f..a5004f1232 100644 Binary files a/core/assets-raw/sprites/blocks/extra/place-arrow.png and b/core/assets-raw/sprites/blocks/extra/place-arrow.png differ diff --git a/core/assets-raw/sprites/blocks/liquid/bridge-conduit-arrow.png b/core/assets-raw/sprites/blocks/liquid/bridge-conduit-arrow.png index 05bb28604f..b8b62bcb34 100644 Binary files a/core/assets-raw/sprites/blocks/liquid/bridge-conduit-arrow.png and b/core/assets-raw/sprites/blocks/liquid/bridge-conduit-arrow.png differ diff --git a/core/assets-raw/sprites/blocks/liquid/bridge-conduit-end.png b/core/assets-raw/sprites/blocks/liquid/bridge-conduit-end.png index 1142e49e21..844be19482 100644 Binary files a/core/assets-raw/sprites/blocks/liquid/bridge-conduit-end.png and b/core/assets-raw/sprites/blocks/liquid/bridge-conduit-end.png differ diff --git a/core/assets-raw/sprites/blocks/liquid/bridge-conduit.png b/core/assets-raw/sprites/blocks/liquid/bridge-conduit.png index f1c7bc3055..9249b2b4ad 100644 Binary files a/core/assets-raw/sprites/blocks/liquid/bridge-conduit.png and b/core/assets-raw/sprites/blocks/liquid/bridge-conduit.png differ diff --git a/core/assets-raw/sprites/blocks/liquid/conduit-bottom-1.png b/core/assets-raw/sprites/blocks/liquid/conduit-bottom-1.png index 88e4f28423..82bcbcb1b4 100644 Binary files a/core/assets-raw/sprites/blocks/liquid/conduit-bottom-1.png and b/core/assets-raw/sprites/blocks/liquid/conduit-bottom-1.png differ diff --git a/core/assets-raw/sprites/blocks/liquid/conduit-bottom-2.png b/core/assets-raw/sprites/blocks/liquid/conduit-bottom-2.png index 3c968dd2b4..d2896d5c7b 100644 Binary files a/core/assets-raw/sprites/blocks/liquid/conduit-bottom-2.png and b/core/assets-raw/sprites/blocks/liquid/conduit-bottom-2.png differ diff --git a/core/assets-raw/sprites/blocks/liquid/conduit-bottom-3.png b/core/assets-raw/sprites/blocks/liquid/conduit-bottom-3.png index 6b0a4ffff9..d2896d5c7b 100644 Binary files a/core/assets-raw/sprites/blocks/liquid/conduit-bottom-3.png and b/core/assets-raw/sprites/blocks/liquid/conduit-bottom-3.png differ diff --git a/core/assets-raw/sprites/blocks/liquid/conduit-bottom-4.png b/core/assets-raw/sprites/blocks/liquid/conduit-bottom-4.png index 969b593d8e..d2896d5c7b 100644 Binary files a/core/assets-raw/sprites/blocks/liquid/conduit-bottom-4.png and b/core/assets-raw/sprites/blocks/liquid/conduit-bottom-4.png differ diff --git a/core/assets-raw/sprites/blocks/liquid/conduit-bottom-5.png b/core/assets-raw/sprites/blocks/liquid/conduit-bottom-5.png index 0317e0b0fa..c49ac209e8 100644 Binary files a/core/assets-raw/sprites/blocks/liquid/conduit-bottom-5.png and b/core/assets-raw/sprites/blocks/liquid/conduit-bottom-5.png differ diff --git a/core/assets-raw/sprites/blocks/liquid/conduit-bottom-6.png b/core/assets-raw/sprites/blocks/liquid/conduit-bottom-6.png index 30ecffba39..d2896d5c7b 100644 Binary files a/core/assets-raw/sprites/blocks/liquid/conduit-bottom-6.png and b/core/assets-raw/sprites/blocks/liquid/conduit-bottom-6.png differ diff --git a/core/assets-raw/sprites/blocks/liquid/conduit-bottom.png b/core/assets-raw/sprites/blocks/liquid/conduit-bottom.png index 1390737d20..f2f7dfdd99 100644 Binary files a/core/assets-raw/sprites/blocks/liquid/conduit-bottom.png and b/core/assets-raw/sprites/blocks/liquid/conduit-bottom.png differ diff --git a/core/assets-raw/sprites/blocks/liquid/conduit-top-0.png b/core/assets-raw/sprites/blocks/liquid/conduit-top-0.png index a9dc2ec9c8..e7b8c4433d 100644 Binary files a/core/assets-raw/sprites/blocks/liquid/conduit-top-0.png and b/core/assets-raw/sprites/blocks/liquid/conduit-top-0.png differ diff --git a/core/assets-raw/sprites/blocks/liquid/conduit-top-1.png b/core/assets-raw/sprites/blocks/liquid/conduit-top-1.png index d223e31491..a8e05ab777 100644 Binary files a/core/assets-raw/sprites/blocks/liquid/conduit-top-1.png and b/core/assets-raw/sprites/blocks/liquid/conduit-top-1.png differ diff --git a/core/assets-raw/sprites/blocks/liquid/conduit-top-2.png b/core/assets-raw/sprites/blocks/liquid/conduit-top-2.png index c29c2fc1e2..e3036ea6f7 100644 Binary files a/core/assets-raw/sprites/blocks/liquid/conduit-top-2.png and b/core/assets-raw/sprites/blocks/liquid/conduit-top-2.png differ diff --git a/core/assets-raw/sprites/blocks/liquid/conduit-top-3.png b/core/assets-raw/sprites/blocks/liquid/conduit-top-3.png index c5500f1fd3..b45e11ccf4 100644 Binary files a/core/assets-raw/sprites/blocks/liquid/conduit-top-3.png and b/core/assets-raw/sprites/blocks/liquid/conduit-top-3.png differ diff --git a/core/assets-raw/sprites/blocks/liquid/conduit-top-4.png b/core/assets-raw/sprites/blocks/liquid/conduit-top-4.png index ba4bc1c99a..ecd147450a 100644 Binary files a/core/assets-raw/sprites/blocks/liquid/conduit-top-4.png and b/core/assets-raw/sprites/blocks/liquid/conduit-top-4.png differ diff --git a/core/assets-raw/sprites/blocks/liquid/conduit-top-5.png b/core/assets-raw/sprites/blocks/liquid/conduit-top-5.png index debece9dc9..3a619260dd 100644 Binary files a/core/assets-raw/sprites/blocks/liquid/conduit-top-5.png and b/core/assets-raw/sprites/blocks/liquid/conduit-top-5.png differ diff --git a/core/assets-raw/sprites/blocks/liquid/conduit-top-6.png b/core/assets-raw/sprites/blocks/liquid/conduit-top-6.png index 56976bfe14..e673a4c6cf 100644 Binary files a/core/assets-raw/sprites/blocks/liquid/conduit-top-6.png and b/core/assets-raw/sprites/blocks/liquid/conduit-top-6.png differ diff --git a/core/assets-raw/sprites/blocks/liquid/liquid-junction.png b/core/assets-raw/sprites/blocks/liquid/liquid-junction.png index 737f148b04..b7ddc74ce1 100644 Binary files a/core/assets-raw/sprites/blocks/liquid/liquid-junction.png and b/core/assets-raw/sprites/blocks/liquid/liquid-junction.png differ diff --git a/core/assets-raw/sprites/blocks/liquid/liquid-overflow-gate-top.png b/core/assets-raw/sprites/blocks/liquid/liquid-overflow-gate-top.png index f6bdf7f613..13d062d767 100644 Binary files a/core/assets-raw/sprites/blocks/liquid/liquid-overflow-gate-top.png and b/core/assets-raw/sprites/blocks/liquid/liquid-overflow-gate-top.png differ diff --git a/core/assets-raw/sprites/blocks/liquid/liquid-overflow-gate.png b/core/assets-raw/sprites/blocks/liquid/liquid-overflow-gate.png index f608e0a6d1..5cac3b38d7 100644 Binary files a/core/assets-raw/sprites/blocks/liquid/liquid-overflow-gate.png and b/core/assets-raw/sprites/blocks/liquid/liquid-overflow-gate.png differ diff --git a/core/assets-raw/sprites/blocks/liquid/liquid-router-bottom.png b/core/assets-raw/sprites/blocks/liquid/liquid-router-bottom.png index be9e88c572..4f33525764 100644 Binary files a/core/assets-raw/sprites/blocks/liquid/liquid-router-bottom.png and b/core/assets-raw/sprites/blocks/liquid/liquid-router-bottom.png differ diff --git a/core/assets-raw/sprites/blocks/liquid/liquid-router-liquid.png b/core/assets-raw/sprites/blocks/liquid/liquid-router-liquid.png index 09957a6554..00dfc92f87 100644 Binary files a/core/assets-raw/sprites/blocks/liquid/liquid-router-liquid.png and b/core/assets-raw/sprites/blocks/liquid/liquid-router-liquid.png differ diff --git a/core/assets-raw/sprites/blocks/liquid/liquid-router-top.png b/core/assets-raw/sprites/blocks/liquid/liquid-router-top.png index 474a4ecac8..4e45a7094b 100644 Binary files a/core/assets-raw/sprites/blocks/liquid/liquid-router-top.png and b/core/assets-raw/sprites/blocks/liquid/liquid-router-top.png differ diff --git a/core/assets-raw/sprites/blocks/liquid/liquid-tank-bottom.png b/core/assets-raw/sprites/blocks/liquid/liquid-tank-bottom.png index b4743171f0..a94e604467 100644 Binary files a/core/assets-raw/sprites/blocks/liquid/liquid-tank-bottom.png and b/core/assets-raw/sprites/blocks/liquid/liquid-tank-bottom.png differ diff --git a/core/assets-raw/sprites/blocks/liquid/liquid-tank-liquid.png b/core/assets-raw/sprites/blocks/liquid/liquid-tank-liquid.png index 3e7b0e032e..85533fef2f 100644 Binary files a/core/assets-raw/sprites/blocks/liquid/liquid-tank-liquid.png and b/core/assets-raw/sprites/blocks/liquid/liquid-tank-liquid.png differ diff --git a/core/assets-raw/sprites/blocks/liquid/liquid-tank-top.png b/core/assets-raw/sprites/blocks/liquid/liquid-tank-top.png index 9455df4454..255c710915 100644 Binary files a/core/assets-raw/sprites/blocks/liquid/liquid-tank-top.png and b/core/assets-raw/sprites/blocks/liquid/liquid-tank-top.png differ diff --git a/core/assets-raw/sprites/blocks/liquid/mechanical-pump.png b/core/assets-raw/sprites/blocks/liquid/mechanical-pump.png index dcc74a737a..f155293a82 100644 Binary files a/core/assets-raw/sprites/blocks/liquid/mechanical-pump.png and b/core/assets-raw/sprites/blocks/liquid/mechanical-pump.png differ diff --git a/core/assets-raw/sprites/blocks/liquid/phase-conduit-arrow.png b/core/assets-raw/sprites/blocks/liquid/phase-conduit-arrow.png index a1a0cefc09..62bcb0c0b2 100644 Binary files a/core/assets-raw/sprites/blocks/liquid/phase-conduit-arrow.png and b/core/assets-raw/sprites/blocks/liquid/phase-conduit-arrow.png differ diff --git a/core/assets-raw/sprites/blocks/liquid/phase-conduit.png b/core/assets-raw/sprites/blocks/liquid/phase-conduit.png index 1956ea3565..73e4d9cf79 100644 Binary files a/core/assets-raw/sprites/blocks/liquid/phase-conduit.png and b/core/assets-raw/sprites/blocks/liquid/phase-conduit.png differ diff --git a/core/assets-raw/sprites/blocks/liquid/plated-conduit-cap.png b/core/assets-raw/sprites/blocks/liquid/plated-conduit-cap.png index f4e8df2bb7..f964e3a070 100644 Binary files a/core/assets-raw/sprites/blocks/liquid/plated-conduit-cap.png and b/core/assets-raw/sprites/blocks/liquid/plated-conduit-cap.png differ diff --git a/core/assets-raw/sprites/blocks/liquid/plated-conduit-top-0.png b/core/assets-raw/sprites/blocks/liquid/plated-conduit-top-0.png index 21fd730109..6b645244d7 100644 Binary files a/core/assets-raw/sprites/blocks/liquid/plated-conduit-top-0.png and b/core/assets-raw/sprites/blocks/liquid/plated-conduit-top-0.png differ diff --git a/core/assets-raw/sprites/blocks/liquid/plated-conduit-top-1.png b/core/assets-raw/sprites/blocks/liquid/plated-conduit-top-1.png index 94c22fd75e..b10df885e9 100644 Binary files a/core/assets-raw/sprites/blocks/liquid/plated-conduit-top-1.png and b/core/assets-raw/sprites/blocks/liquid/plated-conduit-top-1.png differ diff --git a/core/assets-raw/sprites/blocks/liquid/plated-conduit-top-2.png b/core/assets-raw/sprites/blocks/liquid/plated-conduit-top-2.png index a9bdc10692..e37f7a3533 100644 Binary files a/core/assets-raw/sprites/blocks/liquid/plated-conduit-top-2.png and b/core/assets-raw/sprites/blocks/liquid/plated-conduit-top-2.png differ diff --git a/core/assets-raw/sprites/blocks/liquid/plated-conduit-top-3.png b/core/assets-raw/sprites/blocks/liquid/plated-conduit-top-3.png index 7487e481cb..d133259b0f 100644 Binary files a/core/assets-raw/sprites/blocks/liquid/plated-conduit-top-3.png and b/core/assets-raw/sprites/blocks/liquid/plated-conduit-top-3.png differ diff --git a/core/assets-raw/sprites/blocks/liquid/plated-conduit-top-4.png b/core/assets-raw/sprites/blocks/liquid/plated-conduit-top-4.png index 19fad690a4..68bf34a1f0 100644 Binary files a/core/assets-raw/sprites/blocks/liquid/plated-conduit-top-4.png and b/core/assets-raw/sprites/blocks/liquid/plated-conduit-top-4.png differ diff --git a/core/assets-raw/sprites/blocks/liquid/plated-conduit-top-5.png b/core/assets-raw/sprites/blocks/liquid/plated-conduit-top-5.png index 45158534c4..ee1ac001e8 100644 Binary files a/core/assets-raw/sprites/blocks/liquid/plated-conduit-top-5.png and b/core/assets-raw/sprites/blocks/liquid/plated-conduit-top-5.png differ diff --git a/core/assets-raw/sprites/blocks/liquid/plated-conduit-top-6.png b/core/assets-raw/sprites/blocks/liquid/plated-conduit-top-6.png index f5b5cd1157..be533536a7 100644 Binary files a/core/assets-raw/sprites/blocks/liquid/plated-conduit-top-6.png and b/core/assets-raw/sprites/blocks/liquid/plated-conduit-top-6.png differ diff --git a/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-0.png b/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-0.png index 8ae31a2dbc..d7e299afa6 100644 Binary files a/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-0.png and b/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-0.png differ diff --git a/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-1.png b/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-1.png index f86fde1240..4db953390c 100644 Binary files a/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-1.png and b/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-1.png differ diff --git a/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-2.png b/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-2.png index 2d9bcb39a3..78a57e8f64 100644 Binary files a/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-2.png and b/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-2.png differ diff --git a/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-3.png b/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-3.png index d625cd185b..b45e11ccf4 100644 Binary files a/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-3.png and b/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-3.png differ diff --git a/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-4.png b/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-4.png index e1938fde0b..050aa16f7a 100644 Binary files a/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-4.png and b/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-4.png differ diff --git a/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-5.png b/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-5.png index ed9d334798..ff795df1fc 100644 Binary files a/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-5.png and b/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-5.png differ diff --git a/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-6.png b/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-6.png index f25158d7de..f4e6379a31 100644 Binary files a/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-6.png and b/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-6.png differ diff --git a/core/assets-raw/sprites/blocks/liquid/rotary-pump.png b/core/assets-raw/sprites/blocks/liquid/rotary-pump.png index 68aa196101..29a234b331 100644 Binary files a/core/assets-raw/sprites/blocks/liquid/rotary-pump.png and b/core/assets-raw/sprites/blocks/liquid/rotary-pump.png differ diff --git a/core/assets-raw/sprites/blocks/liquid/thermal-pump.png b/core/assets-raw/sprites/blocks/liquid/thermal-pump.png index 807fa4bc15..5f8f061bfc 100644 Binary files a/core/assets-raw/sprites/blocks/liquid/thermal-pump.png and b/core/assets-raw/sprites/blocks/liquid/thermal-pump.png differ diff --git a/core/assets-raw/sprites/blocks/mechs/dart-ship-pad.png b/core/assets-raw/sprites/blocks/mechs/dart-ship-pad.png index 70f16847d2..798482cbd4 100644 Binary files a/core/assets-raw/sprites/blocks/mechs/dart-ship-pad.png and b/core/assets-raw/sprites/blocks/mechs/dart-ship-pad.png differ diff --git a/core/assets-raw/sprites/blocks/mechs/delta-mech-pad.png b/core/assets-raw/sprites/blocks/mechs/delta-mech-pad.png index 03f04549c6..00c1fbeeb4 100644 Binary files a/core/assets-raw/sprites/blocks/mechs/delta-mech-pad.png and b/core/assets-raw/sprites/blocks/mechs/delta-mech-pad.png differ diff --git a/core/assets-raw/sprites/blocks/mechs/glaive-ship-pad.png b/core/assets-raw/sprites/blocks/mechs/glaive-ship-pad.png index d2f9db2a65..5c19da2411 100644 Binary files a/core/assets-raw/sprites/blocks/mechs/glaive-ship-pad.png and b/core/assets-raw/sprites/blocks/mechs/glaive-ship-pad.png differ diff --git a/core/assets-raw/sprites/blocks/mechs/javelin-ship-pad.png b/core/assets-raw/sprites/blocks/mechs/javelin-ship-pad.png index 0c98d4566a..d4a4de304e 100644 Binary files a/core/assets-raw/sprites/blocks/mechs/javelin-ship-pad.png and b/core/assets-raw/sprites/blocks/mechs/javelin-ship-pad.png differ diff --git a/core/assets-raw/sprites/blocks/mechs/omega-mech-pad.png b/core/assets-raw/sprites/blocks/mechs/omega-mech-pad.png index 0f3d98c97e..d72eb6100c 100644 Binary files a/core/assets-raw/sprites/blocks/mechs/omega-mech-pad.png and b/core/assets-raw/sprites/blocks/mechs/omega-mech-pad.png differ diff --git a/core/assets-raw/sprites/blocks/mechs/tau-mech-pad.png b/core/assets-raw/sprites/blocks/mechs/tau-mech-pad.png index f929bedde8..53263e2660 100644 Binary files a/core/assets-raw/sprites/blocks/mechs/tau-mech-pad.png and b/core/assets-raw/sprites/blocks/mechs/tau-mech-pad.png differ diff --git a/core/assets-raw/sprites/blocks/mechs/trident-ship-pad.png b/core/assets-raw/sprites/blocks/mechs/trident-ship-pad.png index dd9d17e0dd..99f6d984ff 100644 Binary files a/core/assets-raw/sprites/blocks/mechs/trident-ship-pad.png and b/core/assets-raw/sprites/blocks/mechs/trident-ship-pad.png differ diff --git a/core/assets-raw/sprites/blocks/power/battery-large-top.png b/core/assets-raw/sprites/blocks/power/battery-large-top.png new file mode 100644 index 0000000000..6656faa036 Binary files /dev/null and b/core/assets-raw/sprites/blocks/power/battery-large-top.png differ diff --git a/core/assets-raw/sprites/blocks/power/battery-large.png b/core/assets-raw/sprites/blocks/power/battery-large.png index 5917051f44..7ad7d26d68 100644 Binary files a/core/assets-raw/sprites/blocks/power/battery-large.png and b/core/assets-raw/sprites/blocks/power/battery-large.png differ diff --git a/core/assets-raw/sprites/blocks/power/battery-top.png b/core/assets-raw/sprites/blocks/power/battery-top.png new file mode 100644 index 0000000000..b1338da34f Binary files /dev/null and b/core/assets-raw/sprites/blocks/power/battery-top.png differ diff --git a/core/assets-raw/sprites/blocks/power/battery.png b/core/assets-raw/sprites/blocks/power/battery.png index 44a863f123..82af78bbcb 100644 Binary files a/core/assets-raw/sprites/blocks/power/battery.png and b/core/assets-raw/sprites/blocks/power/battery.png differ diff --git a/core/assets-raw/sprites/blocks/power/combustion-generator-top.png b/core/assets-raw/sprites/blocks/power/combustion-generator-top.png index 8df8df9a57..971e7b6cd8 100644 Binary files a/core/assets-raw/sprites/blocks/power/combustion-generator-top.png and b/core/assets-raw/sprites/blocks/power/combustion-generator-top.png differ diff --git a/core/assets-raw/sprites/blocks/power/combustion-generator.png b/core/assets-raw/sprites/blocks/power/combustion-generator.png index 8fb412f555..d2c563d838 100644 Binary files a/core/assets-raw/sprites/blocks/power/combustion-generator.png and b/core/assets-raw/sprites/blocks/power/combustion-generator.png differ diff --git a/core/assets-raw/sprites/blocks/power/differential-generator-liquid.png b/core/assets-raw/sprites/blocks/power/differential-generator-liquid.png index fa68927de4..0595a9ad1c 100644 Binary files a/core/assets-raw/sprites/blocks/power/differential-generator-liquid.png and b/core/assets-raw/sprites/blocks/power/differential-generator-liquid.png differ diff --git a/core/assets-raw/sprites/blocks/power/differential-generator-top.png b/core/assets-raw/sprites/blocks/power/differential-generator-top.png index 0e1b4fda69..eb504bc9b4 100644 Binary files a/core/assets-raw/sprites/blocks/power/differential-generator-top.png and b/core/assets-raw/sprites/blocks/power/differential-generator-top.png differ diff --git a/core/assets-raw/sprites/blocks/power/differential-generator.png b/core/assets-raw/sprites/blocks/power/differential-generator.png index 01a271abe0..12e5e820da 100644 Binary files a/core/assets-raw/sprites/blocks/power/differential-generator.png and b/core/assets-raw/sprites/blocks/power/differential-generator.png differ diff --git a/core/assets-raw/sprites/blocks/power/diode-arrow.png b/core/assets-raw/sprites/blocks/power/diode-arrow.png index 2699e370da..227b8bb1d7 100644 Binary files a/core/assets-raw/sprites/blocks/power/diode-arrow.png and b/core/assets-raw/sprites/blocks/power/diode-arrow.png differ diff --git a/core/assets-raw/sprites/blocks/power/diode.png b/core/assets-raw/sprites/blocks/power/diode.png index fc2c4ee8b1..51cb7a1122 100644 Binary files a/core/assets-raw/sprites/blocks/power/diode.png and b/core/assets-raw/sprites/blocks/power/diode.png differ diff --git a/core/assets-raw/sprites/blocks/power/illuminator-top.png b/core/assets-raw/sprites/blocks/power/illuminator-top.png index 8597b28d97..38754f57b0 100644 Binary files a/core/assets-raw/sprites/blocks/power/illuminator-top.png and b/core/assets-raw/sprites/blocks/power/illuminator-top.png differ diff --git a/core/assets-raw/sprites/blocks/power/illuminator.png b/core/assets-raw/sprites/blocks/power/illuminator.png index 9269a33447..09b2f5cbb9 100644 Binary files a/core/assets-raw/sprites/blocks/power/illuminator.png and b/core/assets-raw/sprites/blocks/power/illuminator.png differ diff --git a/core/assets-raw/sprites/blocks/power/impact-reactor-bottom.png b/core/assets-raw/sprites/blocks/power/impact-reactor-bottom.png index 6b16fca94c..3ca55b0207 100644 Binary files a/core/assets-raw/sprites/blocks/power/impact-reactor-bottom.png and b/core/assets-raw/sprites/blocks/power/impact-reactor-bottom.png differ diff --git a/core/assets-raw/sprites/blocks/power/impact-reactor.png b/core/assets-raw/sprites/blocks/power/impact-reactor.png index c1dd5e46c8..d56bd5d6a5 100644 Binary files a/core/assets-raw/sprites/blocks/power/impact-reactor.png and b/core/assets-raw/sprites/blocks/power/impact-reactor.png differ diff --git a/core/assets-raw/sprites/blocks/power/power-node-large.png b/core/assets-raw/sprites/blocks/power/power-node-large.png index add53dd280..601cba0edf 100644 Binary files a/core/assets-raw/sprites/blocks/power/power-node-large.png and b/core/assets-raw/sprites/blocks/power/power-node-large.png differ diff --git a/core/assets-raw/sprites/blocks/power/power-node.png b/core/assets-raw/sprites/blocks/power/power-node.png index e8f6498ee1..a118ea07a3 100644 Binary files a/core/assets-raw/sprites/blocks/power/power-node.png and b/core/assets-raw/sprites/blocks/power/power-node.png differ diff --git a/core/assets-raw/sprites/blocks/power/power-source.png b/core/assets-raw/sprites/blocks/power/power-source.png index f4c6473df4..b8f43dbece 100644 Binary files a/core/assets-raw/sprites/blocks/power/power-source.png and b/core/assets-raw/sprites/blocks/power/power-source.png differ diff --git a/core/assets-raw/sprites/blocks/power/power-void.png b/core/assets-raw/sprites/blocks/power/power-void.png index fee2a2b3e8..6ca39646bb 100644 Binary files a/core/assets-raw/sprites/blocks/power/power-void.png and b/core/assets-raw/sprites/blocks/power/power-void.png differ diff --git a/core/assets-raw/sprites/blocks/power/rtg-generator-top.png b/core/assets-raw/sprites/blocks/power/rtg-generator-top.png index dc89fca155..00fcc2eeaf 100644 Binary files a/core/assets-raw/sprites/blocks/power/rtg-generator-top.png and b/core/assets-raw/sprites/blocks/power/rtg-generator-top.png differ diff --git a/core/assets-raw/sprites/blocks/power/rtg-generator.png b/core/assets-raw/sprites/blocks/power/rtg-generator.png index 414a606c8c..a38888ed7d 100644 Binary files a/core/assets-raw/sprites/blocks/power/rtg-generator.png and b/core/assets-raw/sprites/blocks/power/rtg-generator.png differ diff --git a/core/assets-raw/sprites/blocks/power/solar-panel-large.png b/core/assets-raw/sprites/blocks/power/solar-panel-large.png index 782d792039..a5e37542f1 100644 Binary files a/core/assets-raw/sprites/blocks/power/solar-panel-large.png and b/core/assets-raw/sprites/blocks/power/solar-panel-large.png differ diff --git a/core/assets-raw/sprites/blocks/power/solar-panel.png b/core/assets-raw/sprites/blocks/power/solar-panel.png index 0703c1be90..9b2dfab795 100644 Binary files a/core/assets-raw/sprites/blocks/power/solar-panel.png and b/core/assets-raw/sprites/blocks/power/solar-panel.png differ diff --git a/core/assets-raw/sprites/blocks/power/surge-tower.png b/core/assets-raw/sprites/blocks/power/surge-tower.png index f381af0813..9aaeae3186 100644 Binary files a/core/assets-raw/sprites/blocks/power/surge-tower.png and b/core/assets-raw/sprites/blocks/power/surge-tower.png differ diff --git a/core/assets-raw/sprites/blocks/power/thorium-reactor-center.png b/core/assets-raw/sprites/blocks/power/thorium-reactor-center.png index 1254159ab9..a22ce50d60 100644 Binary files a/core/assets-raw/sprites/blocks/power/thorium-reactor-center.png and b/core/assets-raw/sprites/blocks/power/thorium-reactor-center.png differ diff --git a/core/assets-raw/sprites/blocks/power/thorium-reactor-lights.png b/core/assets-raw/sprites/blocks/power/thorium-reactor-lights.png index fe7b76179c..fb10892472 100644 Binary files a/core/assets-raw/sprites/blocks/power/thorium-reactor-lights.png and b/core/assets-raw/sprites/blocks/power/thorium-reactor-lights.png differ diff --git a/core/assets-raw/sprites/blocks/power/thorium-reactor.png b/core/assets-raw/sprites/blocks/power/thorium-reactor.png index 7b7fdc1c79..902d120898 100644 Binary files a/core/assets-raw/sprites/blocks/power/thorium-reactor.png and b/core/assets-raw/sprites/blocks/power/thorium-reactor.png differ diff --git a/core/assets-raw/sprites/blocks/power/turbine-generator-liquid.png b/core/assets-raw/sprites/blocks/power/turbine-generator-liquid.png index e083c04492..7f074dda62 100644 Binary files a/core/assets-raw/sprites/blocks/power/turbine-generator-liquid.png and b/core/assets-raw/sprites/blocks/power/turbine-generator-liquid.png differ diff --git a/core/assets-raw/sprites/blocks/power/turbine-generator-top.png b/core/assets-raw/sprites/blocks/power/turbine-generator-top.png index d7cf0d8547..c0a7cf2c3f 100644 Binary files a/core/assets-raw/sprites/blocks/power/turbine-generator-top.png and b/core/assets-raw/sprites/blocks/power/turbine-generator-top.png differ diff --git a/core/assets-raw/sprites/blocks/power/turbine-generator.png b/core/assets-raw/sprites/blocks/power/turbine-generator.png index b434c5c6fa..b81cc0b306 100644 Binary files a/core/assets-raw/sprites/blocks/power/turbine-generator.png and b/core/assets-raw/sprites/blocks/power/turbine-generator.png differ diff --git a/core/assets-raw/sprites/blocks/production/alloy-smelter-top.png b/core/assets-raw/sprites/blocks/production/alloy-smelter-top.png index c946c0dd3e..a3ff2513e3 100644 Binary files a/core/assets-raw/sprites/blocks/production/alloy-smelter-top.png and b/core/assets-raw/sprites/blocks/production/alloy-smelter-top.png differ diff --git a/core/assets-raw/sprites/blocks/production/alloy-smelter.png b/core/assets-raw/sprites/blocks/production/alloy-smelter.png index 048022a525..f9a0a1fc17 100644 Binary files a/core/assets-raw/sprites/blocks/production/alloy-smelter.png and b/core/assets-raw/sprites/blocks/production/alloy-smelter.png differ diff --git a/core/assets-raw/sprites/blocks/production/blast-mixer.png b/core/assets-raw/sprites/blocks/production/blast-mixer.png index 7bb42d17ac..9effafb9c8 100644 Binary files a/core/assets-raw/sprites/blocks/production/blast-mixer.png and b/core/assets-raw/sprites/blocks/production/blast-mixer.png differ diff --git a/core/assets-raw/sprites/blocks/production/coal-centrifuge.png b/core/assets-raw/sprites/blocks/production/coal-centrifuge.png index d32ffe368b..33509c7e92 100644 Binary files a/core/assets-raw/sprites/blocks/production/coal-centrifuge.png and b/core/assets-raw/sprites/blocks/production/coal-centrifuge.png differ diff --git a/core/assets-raw/sprites/blocks/production/cryofluidmixer-bottom.png b/core/assets-raw/sprites/blocks/production/cryofluidmixer-bottom.png index 4a97b6c5ff..f4d8646c0e 100644 Binary files a/core/assets-raw/sprites/blocks/production/cryofluidmixer-bottom.png and b/core/assets-raw/sprites/blocks/production/cryofluidmixer-bottom.png differ diff --git a/core/assets-raw/sprites/blocks/production/cryofluidmixer-liquid.png b/core/assets-raw/sprites/blocks/production/cryofluidmixer-liquid.png index 929c629499..26d446e761 100644 Binary files a/core/assets-raw/sprites/blocks/production/cryofluidmixer-liquid.png and b/core/assets-raw/sprites/blocks/production/cryofluidmixer-liquid.png differ diff --git a/core/assets-raw/sprites/blocks/production/cryofluidmixer-top.png b/core/assets-raw/sprites/blocks/production/cryofluidmixer-top.png index 26fe248540..e90db33565 100644 Binary files a/core/assets-raw/sprites/blocks/production/cryofluidmixer-top.png and b/core/assets-raw/sprites/blocks/production/cryofluidmixer-top.png differ diff --git a/core/assets-raw/sprites/blocks/production/cultivator-middle.png b/core/assets-raw/sprites/blocks/production/cultivator-middle.png index 29f0d1fcf4..f74af4240b 100644 Binary files a/core/assets-raw/sprites/blocks/production/cultivator-middle.png and b/core/assets-raw/sprites/blocks/production/cultivator-middle.png differ diff --git a/core/assets-raw/sprites/blocks/production/cultivator-top.png b/core/assets-raw/sprites/blocks/production/cultivator-top.png index fd33bf6210..07a68428de 100644 Binary files a/core/assets-raw/sprites/blocks/production/cultivator-top.png and b/core/assets-raw/sprites/blocks/production/cultivator-top.png differ diff --git a/core/assets-raw/sprites/blocks/production/cultivator.png b/core/assets-raw/sprites/blocks/production/cultivator.png index 6d1eecd2b0..e1ff7aa692 100644 Binary files a/core/assets-raw/sprites/blocks/production/cultivator.png and b/core/assets-raw/sprites/blocks/production/cultivator.png differ diff --git a/core/assets-raw/sprites/blocks/production/graphite-press.png b/core/assets-raw/sprites/blocks/production/graphite-press.png index 39d6adbe36..37e6e3138a 100644 Binary files a/core/assets-raw/sprites/blocks/production/graphite-press.png and b/core/assets-raw/sprites/blocks/production/graphite-press.png differ diff --git a/core/assets-raw/sprites/blocks/production/incinerator.png b/core/assets-raw/sprites/blocks/production/incinerator.png index 9c20fa5308..839acac93f 100644 Binary files a/core/assets-raw/sprites/blocks/production/incinerator.png and b/core/assets-raw/sprites/blocks/production/incinerator.png differ diff --git a/core/assets-raw/sprites/blocks/production/item-source.png b/core/assets-raw/sprites/blocks/production/item-source.png index b384226e5f..98dc16ac3c 100644 Binary files a/core/assets-raw/sprites/blocks/production/item-source.png and b/core/assets-raw/sprites/blocks/production/item-source.png differ diff --git a/core/assets-raw/sprites/blocks/production/item-void.png b/core/assets-raw/sprites/blocks/production/item-void.png index 473040a95d..a9f2dd45df 100644 Binary files a/core/assets-raw/sprites/blocks/production/item-void.png and b/core/assets-raw/sprites/blocks/production/item-void.png differ diff --git a/core/assets-raw/sprites/blocks/production/kiln-top.png b/core/assets-raw/sprites/blocks/production/kiln-top.png index 336852ceee..54b786e63a 100644 Binary files a/core/assets-raw/sprites/blocks/production/kiln-top.png and b/core/assets-raw/sprites/blocks/production/kiln-top.png differ diff --git a/core/assets-raw/sprites/blocks/production/kiln.png b/core/assets-raw/sprites/blocks/production/kiln.png index 67e03032c2..a115501b61 100644 Binary files a/core/assets-raw/sprites/blocks/production/kiln.png and b/core/assets-raw/sprites/blocks/production/kiln.png differ diff --git a/core/assets-raw/sprites/blocks/production/liquid-source.png b/core/assets-raw/sprites/blocks/production/liquid-source.png index 2c493d30f5..0ae3a70f6f 100644 Binary files a/core/assets-raw/sprites/blocks/production/liquid-source.png and b/core/assets-raw/sprites/blocks/production/liquid-source.png differ diff --git a/core/assets-raw/sprites/blocks/production/liquid-void.png b/core/assets-raw/sprites/blocks/production/liquid-void.png index cd81df317d..67424c05ea 100644 Binary files a/core/assets-raw/sprites/blocks/production/liquid-void.png and b/core/assets-raw/sprites/blocks/production/liquid-void.png differ diff --git a/core/assets-raw/sprites/blocks/production/melter.png b/core/assets-raw/sprites/blocks/production/melter.png index 2f4c3a0500..f499dd9893 100644 Binary files a/core/assets-raw/sprites/blocks/production/melter.png and b/core/assets-raw/sprites/blocks/production/melter.png differ diff --git a/core/assets-raw/sprites/blocks/production/multi-press.png b/core/assets-raw/sprites/blocks/production/multi-press.png index 5fea3ff19f..e0a57702e0 100644 Binary files a/core/assets-raw/sprites/blocks/production/multi-press.png and b/core/assets-raw/sprites/blocks/production/multi-press.png differ diff --git a/core/assets-raw/sprites/blocks/production/phase-weaver-weave.png b/core/assets-raw/sprites/blocks/production/phase-weaver-weave.png index b016588b17..7dee200cf6 100644 Binary files a/core/assets-raw/sprites/blocks/production/phase-weaver-weave.png and b/core/assets-raw/sprites/blocks/production/phase-weaver-weave.png differ diff --git a/core/assets-raw/sprites/blocks/production/phase-weaver.png b/core/assets-raw/sprites/blocks/production/phase-weaver.png index 0192b0e5dd..4cbda78f1b 100644 Binary files a/core/assets-raw/sprites/blocks/production/phase-weaver.png and b/core/assets-raw/sprites/blocks/production/phase-weaver.png differ diff --git a/core/assets-raw/sprites/blocks/production/plastanium-compressor-top.png b/core/assets-raw/sprites/blocks/production/plastanium-compressor-top.png index 2e8dc35787..ceb6a9b646 100644 Binary files a/core/assets-raw/sprites/blocks/production/plastanium-compressor-top.png and b/core/assets-raw/sprites/blocks/production/plastanium-compressor-top.png differ diff --git a/core/assets-raw/sprites/blocks/production/plastanium-compressor.png b/core/assets-raw/sprites/blocks/production/plastanium-compressor.png index 522b6f8b88..fa43d0b2c3 100644 Binary files a/core/assets-raw/sprites/blocks/production/plastanium-compressor.png and b/core/assets-raw/sprites/blocks/production/plastanium-compressor.png differ diff --git a/core/assets-raw/sprites/blocks/production/pulverizer-rotator.png b/core/assets-raw/sprites/blocks/production/pulverizer-rotator.png index c39062caa2..72cd249d26 100644 Binary files a/core/assets-raw/sprites/blocks/production/pulverizer-rotator.png and b/core/assets-raw/sprites/blocks/production/pulverizer-rotator.png differ diff --git a/core/assets-raw/sprites/blocks/production/pulverizer.png b/core/assets-raw/sprites/blocks/production/pulverizer.png index cc51a06fa5..ff0d2ad330 100644 Binary files a/core/assets-raw/sprites/blocks/production/pulverizer.png and b/core/assets-raw/sprites/blocks/production/pulverizer.png differ diff --git a/core/assets-raw/sprites/blocks/production/pump-liquid.png b/core/assets-raw/sprites/blocks/production/pump-liquid.png index e3d4c58e55..141b9591fe 100644 Binary files a/core/assets-raw/sprites/blocks/production/pump-liquid.png and b/core/assets-raw/sprites/blocks/production/pump-liquid.png differ diff --git a/core/assets-raw/sprites/blocks/production/pyratite-mixer.png b/core/assets-raw/sprites/blocks/production/pyratite-mixer.png index d7d33d09aa..fa1d0beb29 100644 Binary files a/core/assets-raw/sprites/blocks/production/pyratite-mixer.png and b/core/assets-raw/sprites/blocks/production/pyratite-mixer.png differ diff --git a/core/assets-raw/sprites/blocks/production/separator-spinner.png b/core/assets-raw/sprites/blocks/production/separator-spinner.png index d5e9c620c8..e09e119c3d 100644 Binary files a/core/assets-raw/sprites/blocks/production/separator-spinner.png and b/core/assets-raw/sprites/blocks/production/separator-spinner.png differ diff --git a/core/assets-raw/sprites/blocks/production/silicon-smelter-top.png b/core/assets-raw/sprites/blocks/production/silicon-smelter-top.png index 6120871f13..54b786e63a 100644 Binary files a/core/assets-raw/sprites/blocks/production/silicon-smelter-top.png and b/core/assets-raw/sprites/blocks/production/silicon-smelter-top.png differ diff --git a/core/assets-raw/sprites/blocks/production/silicon-smelter.png b/core/assets-raw/sprites/blocks/production/silicon-smelter.png index 72a92aea73..cbf1a9de5f 100644 Binary files a/core/assets-raw/sprites/blocks/production/silicon-smelter.png and b/core/assets-raw/sprites/blocks/production/silicon-smelter.png differ diff --git a/core/assets-raw/sprites/blocks/production/spore-press-liquid.png b/core/assets-raw/sprites/blocks/production/spore-press-liquid.png index 63944ceee2..c1e631410c 100644 Binary files a/core/assets-raw/sprites/blocks/production/spore-press-liquid.png and b/core/assets-raw/sprites/blocks/production/spore-press-liquid.png differ diff --git a/core/assets-raw/sprites/blocks/production/spore-press-top.png b/core/assets-raw/sprites/blocks/production/spore-press-top.png index 1856922336..86cc8ce5e6 100644 Binary files a/core/assets-raw/sprites/blocks/production/spore-press-top.png and b/core/assets-raw/sprites/blocks/production/spore-press-top.png differ diff --git a/core/assets-raw/sprites/blocks/production/spore-press.png b/core/assets-raw/sprites/blocks/production/spore-press.png index 414cebdb9c..cae8fbc65a 100644 Binary files a/core/assets-raw/sprites/blocks/production/spore-press.png and b/core/assets-raw/sprites/blocks/production/spore-press.png differ diff --git a/core/assets-raw/sprites/blocks/storage/container.png b/core/assets-raw/sprites/blocks/storage/container.png index ca98f41fd3..368cec3a21 100644 Binary files a/core/assets-raw/sprites/blocks/storage/container.png and b/core/assets-raw/sprites/blocks/storage/container.png differ diff --git a/core/assets-raw/sprites/blocks/storage/core-foundation.png b/core/assets-raw/sprites/blocks/storage/core-foundation.png index 1304e5500d..36569d588d 100644 Binary files a/core/assets-raw/sprites/blocks/storage/core-foundation.png and b/core/assets-raw/sprites/blocks/storage/core-foundation.png differ diff --git a/core/assets-raw/sprites/blocks/storage/core-nucleus.png b/core/assets-raw/sprites/blocks/storage/core-nucleus.png index d92d7033ea..8b35a0834f 100644 Binary files a/core/assets-raw/sprites/blocks/storage/core-nucleus.png and b/core/assets-raw/sprites/blocks/storage/core-nucleus.png differ diff --git a/core/assets-raw/sprites/blocks/storage/core-shard.png b/core/assets-raw/sprites/blocks/storage/core-shard.png index 44c445aaa8..eeff019491 100644 Binary files a/core/assets-raw/sprites/blocks/storage/core-shard.png and b/core/assets-raw/sprites/blocks/storage/core-shard.png differ diff --git a/core/assets-raw/sprites/blocks/storage/unloader-center.png b/core/assets-raw/sprites/blocks/storage/unloader-center.png index e5a2fffd15..de4959a223 100644 Binary files a/core/assets-raw/sprites/blocks/storage/unloader-center.png and b/core/assets-raw/sprites/blocks/storage/unloader-center.png differ diff --git a/core/assets-raw/sprites/blocks/storage/unloader.png b/core/assets-raw/sprites/blocks/storage/unloader.png index 39ec7a30a5..7edb57cd61 100644 Binary files a/core/assets-raw/sprites/blocks/storage/unloader.png and b/core/assets-raw/sprites/blocks/storage/unloader.png differ diff --git a/core/assets-raw/sprites/blocks/storage/vault.png b/core/assets-raw/sprites/blocks/storage/vault.png index e82235cc75..a9021d770a 100644 Binary files a/core/assets-raw/sprites/blocks/storage/vault.png and b/core/assets-raw/sprites/blocks/storage/vault.png differ diff --git a/core/assets-raw/sprites/blocks/turrets/arc.png b/core/assets-raw/sprites/blocks/turrets/arc.png index b90265b520..f214c4aa0f 100644 Binary files a/core/assets-raw/sprites/blocks/turrets/arc.png and b/core/assets-raw/sprites/blocks/turrets/arc.png differ diff --git a/core/assets-raw/sprites/blocks/turrets/bases/block-1.png b/core/assets-raw/sprites/blocks/turrets/bases/block-1.png index 36ec5be9a8..4a5ae359e8 100644 Binary files a/core/assets-raw/sprites/blocks/turrets/bases/block-1.png and b/core/assets-raw/sprites/blocks/turrets/bases/block-1.png differ diff --git a/core/assets-raw/sprites/blocks/turrets/bases/block-2.png b/core/assets-raw/sprites/blocks/turrets/bases/block-2.png index ec0fba351a..16d6d1d98a 100644 Binary files a/core/assets-raw/sprites/blocks/turrets/bases/block-2.png and b/core/assets-raw/sprites/blocks/turrets/bases/block-2.png differ diff --git a/core/assets-raw/sprites/blocks/turrets/bases/block-3.png b/core/assets-raw/sprites/blocks/turrets/bases/block-3.png index 1b01ddd33f..cade0ba490 100644 Binary files a/core/assets-raw/sprites/blocks/turrets/bases/block-3.png and b/core/assets-raw/sprites/blocks/turrets/bases/block-3.png differ diff --git a/core/assets-raw/sprites/blocks/turrets/bases/block-4.png b/core/assets-raw/sprites/blocks/turrets/bases/block-4.png index 0cf01f72a9..1ff1bb603b 100644 Binary files a/core/assets-raw/sprites/blocks/turrets/bases/block-4.png and b/core/assets-raw/sprites/blocks/turrets/bases/block-4.png differ diff --git a/core/assets-raw/sprites/blocks/turrets/cyclone.png b/core/assets-raw/sprites/blocks/turrets/cyclone.png index e2f0dbbfcb..7e1ae002b1 100644 Binary files a/core/assets-raw/sprites/blocks/turrets/cyclone.png and b/core/assets-raw/sprites/blocks/turrets/cyclone.png differ diff --git a/core/assets-raw/sprites/blocks/turrets/duo.png b/core/assets-raw/sprites/blocks/turrets/duo.png index c9717775d6..c234ccb38c 100644 Binary files a/core/assets-raw/sprites/blocks/turrets/duo.png and b/core/assets-raw/sprites/blocks/turrets/duo.png differ diff --git a/core/assets-raw/sprites/blocks/turrets/fuse.png b/core/assets-raw/sprites/blocks/turrets/fuse.png index 39fedd6b51..7322029f77 100644 Binary files a/core/assets-raw/sprites/blocks/turrets/fuse.png and b/core/assets-raw/sprites/blocks/turrets/fuse.png differ diff --git a/core/assets-raw/sprites/blocks/turrets/hail.png b/core/assets-raw/sprites/blocks/turrets/hail.png index ffa58615d2..4333d6ef7e 100644 Binary files a/core/assets-raw/sprites/blocks/turrets/hail.png and b/core/assets-raw/sprites/blocks/turrets/hail.png differ diff --git a/core/assets-raw/sprites/blocks/turrets/lancer.png b/core/assets-raw/sprites/blocks/turrets/lancer.png index 60f667d960..d3bbc2d909 100644 Binary files a/core/assets-raw/sprites/blocks/turrets/lancer.png and b/core/assets-raw/sprites/blocks/turrets/lancer.png differ diff --git a/core/assets-raw/sprites/blocks/turrets/meltdown.png b/core/assets-raw/sprites/blocks/turrets/meltdown.png index 824443f1d5..68c1b15347 100644 Binary files a/core/assets-raw/sprites/blocks/turrets/meltdown.png and b/core/assets-raw/sprites/blocks/turrets/meltdown.png differ diff --git a/core/assets-raw/sprites/blocks/turrets/ripple.png b/core/assets-raw/sprites/blocks/turrets/ripple.png index 9013b07a94..92bd3db328 100644 Binary files a/core/assets-raw/sprites/blocks/turrets/ripple.png and b/core/assets-raw/sprites/blocks/turrets/ripple.png differ diff --git a/core/assets-raw/sprites/blocks/turrets/salvo.png b/core/assets-raw/sprites/blocks/turrets/salvo.png index c15a9d47cd..63db15cded 100644 Binary files a/core/assets-raw/sprites/blocks/turrets/salvo.png and b/core/assets-raw/sprites/blocks/turrets/salvo.png differ diff --git a/core/assets-raw/sprites/blocks/turrets/scatter.png b/core/assets-raw/sprites/blocks/turrets/scatter.png index 3a9caea04a..82d01d22c2 100644 Binary files a/core/assets-raw/sprites/blocks/turrets/scatter.png and b/core/assets-raw/sprites/blocks/turrets/scatter.png differ diff --git a/core/assets-raw/sprites/blocks/turrets/scorch.png b/core/assets-raw/sprites/blocks/turrets/scorch.png index 1ab0fbda81..54616726e5 100644 Binary files a/core/assets-raw/sprites/blocks/turrets/scorch.png and b/core/assets-raw/sprites/blocks/turrets/scorch.png differ diff --git a/core/assets-raw/sprites/blocks/turrets/spectre.png b/core/assets-raw/sprites/blocks/turrets/spectre.png index 71ab4e5d0e..f85734b19d 100644 Binary files a/core/assets-raw/sprites/blocks/turrets/spectre.png and b/core/assets-raw/sprites/blocks/turrets/spectre.png differ diff --git a/core/assets-raw/sprites/blocks/turrets/swarmer.png b/core/assets-raw/sprites/blocks/turrets/swarmer.png index 60aeb73158..8caefc415a 100644 Binary files a/core/assets-raw/sprites/blocks/turrets/swarmer.png and b/core/assets-raw/sprites/blocks/turrets/swarmer.png differ diff --git a/core/assets-raw/sprites/blocks/turrets/wave-liquid.png b/core/assets-raw/sprites/blocks/turrets/wave-liquid.png index 289f824356..77930b7d14 100644 Binary files a/core/assets-raw/sprites/blocks/turrets/wave-liquid.png and b/core/assets-raw/sprites/blocks/turrets/wave-liquid.png differ diff --git a/core/assets-raw/sprites/blocks/turrets/wave.png b/core/assets-raw/sprites/blocks/turrets/wave.png index 458b42bfb8..f7823cc437 100644 Binary files a/core/assets-raw/sprites/blocks/turrets/wave.png and b/core/assets-raw/sprites/blocks/turrets/wave.png differ diff --git a/core/assets-raw/sprites/blocks/units/command-center.png b/core/assets-raw/sprites/blocks/units/command-center.png index 767c8b8da2..1a829c1cfd 100644 Binary files a/core/assets-raw/sprites/blocks/units/command-center.png and b/core/assets-raw/sprites/blocks/units/command-center.png differ diff --git a/core/assets-raw/sprites/blocks/units/crawler-factory-top.png b/core/assets-raw/sprites/blocks/units/crawler-factory-top.png index 32c053ef19..e517f1b7ea 100644 Binary files a/core/assets-raw/sprites/blocks/units/crawler-factory-top.png and b/core/assets-raw/sprites/blocks/units/crawler-factory-top.png differ diff --git a/core/assets-raw/sprites/blocks/units/crawler-factory.png b/core/assets-raw/sprites/blocks/units/crawler-factory.png index 72105e12eb..c421ec3d41 100644 Binary files a/core/assets-raw/sprites/blocks/units/crawler-factory.png and b/core/assets-raw/sprites/blocks/units/crawler-factory.png differ diff --git a/core/assets-raw/sprites/blocks/units/dagger-factory-top.png b/core/assets-raw/sprites/blocks/units/dagger-factory-top.png index 3297ef4435..98623023ae 100644 Binary files a/core/assets-raw/sprites/blocks/units/dagger-factory-top.png and b/core/assets-raw/sprites/blocks/units/dagger-factory-top.png differ diff --git a/core/assets-raw/sprites/blocks/units/dagger-factory.png b/core/assets-raw/sprites/blocks/units/dagger-factory.png index 72105e12eb..c421ec3d41 100644 Binary files a/core/assets-raw/sprites/blocks/units/dagger-factory.png and b/core/assets-raw/sprites/blocks/units/dagger-factory.png differ diff --git a/core/assets-raw/sprites/blocks/units/draug-factory-top.png b/core/assets-raw/sprites/blocks/units/draug-factory-top.png index c20fe8d186..20dccd2958 100644 Binary files a/core/assets-raw/sprites/blocks/units/draug-factory-top.png and b/core/assets-raw/sprites/blocks/units/draug-factory-top.png differ diff --git a/core/assets-raw/sprites/blocks/units/draug-factory.png b/core/assets-raw/sprites/blocks/units/draug-factory.png index 72105e12eb..c421ec3d41 100644 Binary files a/core/assets-raw/sprites/blocks/units/draug-factory.png and b/core/assets-raw/sprites/blocks/units/draug-factory.png differ diff --git a/core/assets-raw/sprites/blocks/units/fortress-factory-top.png b/core/assets-raw/sprites/blocks/units/fortress-factory-top.png index 0686a2c329..bfa0af2088 100644 Binary files a/core/assets-raw/sprites/blocks/units/fortress-factory-top.png and b/core/assets-raw/sprites/blocks/units/fortress-factory-top.png differ diff --git a/core/assets-raw/sprites/blocks/units/fortress-factory.png b/core/assets-raw/sprites/blocks/units/fortress-factory.png index 136bf7754d..75d2917c92 100644 Binary files a/core/assets-raw/sprites/blocks/units/fortress-factory.png and b/core/assets-raw/sprites/blocks/units/fortress-factory.png differ diff --git a/core/assets-raw/sprites/blocks/units/ghoul-factory-top.png b/core/assets-raw/sprites/blocks/units/ghoul-factory-top.png index 0686a2c329..bfa0af2088 100644 Binary files a/core/assets-raw/sprites/blocks/units/ghoul-factory-top.png and b/core/assets-raw/sprites/blocks/units/ghoul-factory-top.png differ diff --git a/core/assets-raw/sprites/blocks/units/ghoul-factory.png b/core/assets-raw/sprites/blocks/units/ghoul-factory.png index 38566929b8..608a1e396c 100644 Binary files a/core/assets-raw/sprites/blocks/units/ghoul-factory.png and b/core/assets-raw/sprites/blocks/units/ghoul-factory.png differ diff --git a/core/assets-raw/sprites/blocks/units/phantom-factory-top.png b/core/assets-raw/sprites/blocks/units/phantom-factory-top.png index 1107f27d6c..8a6a52c48c 100644 Binary files a/core/assets-raw/sprites/blocks/units/phantom-factory-top.png and b/core/assets-raw/sprites/blocks/units/phantom-factory-top.png differ diff --git a/core/assets-raw/sprites/blocks/units/phantom-factory.png b/core/assets-raw/sprites/blocks/units/phantom-factory.png index 72105e12eb..c421ec3d41 100644 Binary files a/core/assets-raw/sprites/blocks/units/phantom-factory.png and b/core/assets-raw/sprites/blocks/units/phantom-factory.png differ diff --git a/core/assets-raw/sprites/blocks/units/rally-point.png b/core/assets-raw/sprites/blocks/units/rally-point.png index 1d0921ec06..493d90df1d 100644 Binary files a/core/assets-raw/sprites/blocks/units/rally-point.png and b/core/assets-raw/sprites/blocks/units/rally-point.png differ diff --git a/core/assets-raw/sprites/blocks/units/repair-point-base.png b/core/assets-raw/sprites/blocks/units/repair-point-base.png index d5ead6f001..5cc56cb24b 100644 Binary files a/core/assets-raw/sprites/blocks/units/repair-point-base.png and b/core/assets-raw/sprites/blocks/units/repair-point-base.png differ diff --git a/core/assets-raw/sprites/blocks/units/repair-point.png b/core/assets-raw/sprites/blocks/units/repair-point.png index 5fe3b143fd..2cadeae5cb 100644 Binary files a/core/assets-raw/sprites/blocks/units/repair-point.png and b/core/assets-raw/sprites/blocks/units/repair-point.png differ diff --git a/core/assets-raw/sprites/blocks/units/revenant-factory-top.png b/core/assets-raw/sprites/blocks/units/revenant-factory-top.png index 79ca249876..ff912d5fb5 100644 Binary files a/core/assets-raw/sprites/blocks/units/revenant-factory-top.png and b/core/assets-raw/sprites/blocks/units/revenant-factory-top.png differ diff --git a/core/assets-raw/sprites/blocks/units/revenant-factory.png b/core/assets-raw/sprites/blocks/units/revenant-factory.png index acc7389987..44582b5716 100644 Binary files a/core/assets-raw/sprites/blocks/units/revenant-factory.png and b/core/assets-raw/sprites/blocks/units/revenant-factory.png differ diff --git a/core/assets-raw/sprites/blocks/units/spirit-factory-top.png b/core/assets-raw/sprites/blocks/units/spirit-factory-top.png index a825a19d9b..fe0bf57a17 100644 Binary files a/core/assets-raw/sprites/blocks/units/spirit-factory-top.png and b/core/assets-raw/sprites/blocks/units/spirit-factory-top.png differ diff --git a/core/assets-raw/sprites/blocks/units/spirit-factory.png b/core/assets-raw/sprites/blocks/units/spirit-factory.png index 72105e12eb..c421ec3d41 100644 Binary files a/core/assets-raw/sprites/blocks/units/spirit-factory.png and b/core/assets-raw/sprites/blocks/units/spirit-factory.png differ diff --git a/core/assets-raw/sprites/blocks/units/titan-factory-top.png b/core/assets-raw/sprites/blocks/units/titan-factory-top.png index 0686a2c329..bfa0af2088 100644 Binary files a/core/assets-raw/sprites/blocks/units/titan-factory-top.png and b/core/assets-raw/sprites/blocks/units/titan-factory-top.png differ diff --git a/core/assets-raw/sprites/blocks/units/titan-factory.png b/core/assets-raw/sprites/blocks/units/titan-factory.png index 83eecc696c..a112348ba1 100644 Binary files a/core/assets-raw/sprites/blocks/units/titan-factory.png and b/core/assets-raw/sprites/blocks/units/titan-factory.png differ diff --git a/core/assets-raw/sprites/blocks/units/wraith-factory-top.png b/core/assets-raw/sprites/blocks/units/wraith-factory-top.png index f1075f1097..adf5e63285 100644 Binary files a/core/assets-raw/sprites/blocks/units/wraith-factory-top.png and b/core/assets-raw/sprites/blocks/units/wraith-factory-top.png differ diff --git a/core/assets-raw/sprites/blocks/units/wraith-factory.png b/core/assets-raw/sprites/blocks/units/wraith-factory.png index 72105e12eb..c421ec3d41 100644 Binary files a/core/assets-raw/sprites/blocks/units/wraith-factory.png and b/core/assets-raw/sprites/blocks/units/wraith-factory.png differ diff --git a/core/assets-raw/sprites/blocks/walls/copper-wall-large.png b/core/assets-raw/sprites/blocks/walls/copper-wall-large.png index e3b5102636..dbc59dd808 100644 Binary files a/core/assets-raw/sprites/blocks/walls/copper-wall-large.png and b/core/assets-raw/sprites/blocks/walls/copper-wall-large.png differ diff --git a/core/assets-raw/sprites/blocks/walls/copper-wall.png b/core/assets-raw/sprites/blocks/walls/copper-wall.png index 6105f1ecf3..3f4ae89802 100644 Binary files a/core/assets-raw/sprites/blocks/walls/copper-wall.png and b/core/assets-raw/sprites/blocks/walls/copper-wall.png differ diff --git a/core/assets-raw/sprites/blocks/walls/door-large-open.png b/core/assets-raw/sprites/blocks/walls/door-large-open.png index b66dfdace9..b099e0df6d 100644 Binary files a/core/assets-raw/sprites/blocks/walls/door-large-open.png and b/core/assets-raw/sprites/blocks/walls/door-large-open.png differ diff --git a/core/assets-raw/sprites/blocks/walls/door-large.png b/core/assets-raw/sprites/blocks/walls/door-large.png index 0736d8ca38..84d035c251 100644 Binary files a/core/assets-raw/sprites/blocks/walls/door-large.png and b/core/assets-raw/sprites/blocks/walls/door-large.png differ diff --git a/core/assets-raw/sprites/blocks/walls/door-open.png b/core/assets-raw/sprites/blocks/walls/door-open.png index 0fbe23ebac..c4f7b79495 100644 Binary files a/core/assets-raw/sprites/blocks/walls/door-open.png and b/core/assets-raw/sprites/blocks/walls/door-open.png differ diff --git a/core/assets-raw/sprites/blocks/walls/door.png b/core/assets-raw/sprites/blocks/walls/door.png index 2218e23067..17b214671a 100644 Binary files a/core/assets-raw/sprites/blocks/walls/door.png and b/core/assets-raw/sprites/blocks/walls/door.png differ diff --git a/core/assets-raw/sprites/blocks/walls/insulator-wall-large.png b/core/assets-raw/sprites/blocks/walls/insulator-wall-large.png index b1084b553b..71946a7282 100644 Binary files a/core/assets-raw/sprites/blocks/walls/insulator-wall-large.png and b/core/assets-raw/sprites/blocks/walls/insulator-wall-large.png differ diff --git a/core/assets-raw/sprites/blocks/walls/insulator-wall.png b/core/assets-raw/sprites/blocks/walls/insulator-wall.png index 64913542e3..965155a934 100644 Binary files a/core/assets-raw/sprites/blocks/walls/insulator-wall.png and b/core/assets-raw/sprites/blocks/walls/insulator-wall.png differ diff --git a/core/assets-raw/sprites/blocks/walls/phase-wall-large.png b/core/assets-raw/sprites/blocks/walls/phase-wall-large.png index 3ebc1d33e0..daac191bd4 100644 Binary files a/core/assets-raw/sprites/blocks/walls/phase-wall-large.png and b/core/assets-raw/sprites/blocks/walls/phase-wall-large.png differ diff --git a/core/assets-raw/sprites/blocks/walls/phase-wall.png b/core/assets-raw/sprites/blocks/walls/phase-wall.png index 7566b2b17a..9cd08b78b2 100644 Binary files a/core/assets-raw/sprites/blocks/walls/phase-wall.png and b/core/assets-raw/sprites/blocks/walls/phase-wall.png differ diff --git a/core/assets-raw/sprites/blocks/walls/plastanium-wall-large.png b/core/assets-raw/sprites/blocks/walls/plastanium-wall-large.png index 6ec6b6f615..c819b340c4 100644 Binary files a/core/assets-raw/sprites/blocks/walls/plastanium-wall-large.png and b/core/assets-raw/sprites/blocks/walls/plastanium-wall-large.png differ diff --git a/core/assets-raw/sprites/blocks/walls/plastanium-wall.png b/core/assets-raw/sprites/blocks/walls/plastanium-wall.png index 1dade2db43..717e32723f 100644 Binary files a/core/assets-raw/sprites/blocks/walls/plastanium-wall.png and b/core/assets-raw/sprites/blocks/walls/plastanium-wall.png differ diff --git a/core/assets-raw/sprites/blocks/walls/surge-wall-large.png b/core/assets-raw/sprites/blocks/walls/surge-wall-large.png index 2c17759178..285cfb52e8 100644 Binary files a/core/assets-raw/sprites/blocks/walls/surge-wall-large.png and b/core/assets-raw/sprites/blocks/walls/surge-wall-large.png differ diff --git a/core/assets-raw/sprites/blocks/walls/surge-wall.png b/core/assets-raw/sprites/blocks/walls/surge-wall.png index 154fb95ce8..786ea64867 100644 Binary files a/core/assets-raw/sprites/blocks/walls/surge-wall.png and b/core/assets-raw/sprites/blocks/walls/surge-wall.png differ diff --git a/core/assets-raw/sprites/blocks/walls/thorium-wall-large.png b/core/assets-raw/sprites/blocks/walls/thorium-wall-large.png index 0a6f50e3ba..80564101f8 100644 Binary files a/core/assets-raw/sprites/blocks/walls/thorium-wall-large.png and b/core/assets-raw/sprites/blocks/walls/thorium-wall-large.png differ diff --git a/core/assets-raw/sprites/blocks/walls/thorium-wall.png b/core/assets-raw/sprites/blocks/walls/thorium-wall.png index e4ccef59f4..4fb0aaf1da 100644 Binary files a/core/assets-raw/sprites/blocks/walls/thorium-wall.png and b/core/assets-raw/sprites/blocks/walls/thorium-wall.png differ diff --git a/core/assets-raw/sprites/blocks/walls/titanium-wall-large.png b/core/assets-raw/sprites/blocks/walls/titanium-wall-large.png index 69194bf884..2bf8ad2aec 100644 Binary files a/core/assets-raw/sprites/blocks/walls/titanium-wall-large.png and b/core/assets-raw/sprites/blocks/walls/titanium-wall-large.png differ diff --git a/core/assets-raw/sprites/blocks/walls/titanium-wall.png b/core/assets-raw/sprites/blocks/walls/titanium-wall.png index 8eca3fe8a4..6f3cb08df8 100644 Binary files a/core/assets-raw/sprites/blocks/walls/titanium-wall.png and b/core/assets-raw/sprites/blocks/walls/titanium-wall.png differ diff --git a/core/assets-raw/sprites/editor/block-border-editor.png b/core/assets-raw/sprites/editor/block-border-editor.png index 415c5a6849..daf204a949 100644 Binary files a/core/assets-raw/sprites/editor/block-border-editor.png and b/core/assets-raw/sprites/editor/block-border-editor.png differ diff --git a/core/assets-raw/sprites/editor/clear-editor.png b/core/assets-raw/sprites/editor/clear-editor.png index a804d435b6..1a3a506d64 100644 Binary files a/core/assets-raw/sprites/editor/clear-editor.png and b/core/assets-raw/sprites/editor/clear-editor.png differ diff --git a/core/assets-raw/sprites/effects/circle-end.png b/core/assets-raw/sprites/effects/circle-end.png index e63f104191..a80d7e2dd1 100644 Binary files a/core/assets-raw/sprites/effects/circle-end.png and b/core/assets-raw/sprites/effects/circle-end.png differ diff --git a/core/assets-raw/sprites/effects/circle-mid.png b/core/assets-raw/sprites/effects/circle-mid.png index c6805a606c..12111a64a0 100644 Binary files a/core/assets-raw/sprites/effects/circle-mid.png and b/core/assets-raw/sprites/effects/circle-mid.png differ diff --git a/core/assets-raw/sprites/effects/circle-shadow.png b/core/assets-raw/sprites/effects/circle-shadow.png index 129b74296d..15a822572f 100644 Binary files a/core/assets-raw/sprites/effects/circle-shadow.png and b/core/assets-raw/sprites/effects/circle-shadow.png differ diff --git a/core/assets-raw/sprites/effects/error.png b/core/assets-raw/sprites/effects/error.png index f784bec923..005c4056d3 100644 Binary files a/core/assets-raw/sprites/effects/error.png and b/core/assets-raw/sprites/effects/error.png differ diff --git a/core/assets-raw/sprites/effects/laser-end.png b/core/assets-raw/sprites/effects/laser-end.png index dc90d3620b..f1167ff662 100644 Binary files a/core/assets-raw/sprites/effects/laser-end.png and b/core/assets-raw/sprites/effects/laser-end.png differ diff --git a/core/assets-raw/sprites/effects/minelaser-end.png b/core/assets-raw/sprites/effects/minelaser-end.png index 46ab615894..820ab782f6 100644 Binary files a/core/assets-raw/sprites/effects/minelaser-end.png and b/core/assets-raw/sprites/effects/minelaser-end.png differ diff --git a/core/assets-raw/sprites/effects/minelaser.png b/core/assets-raw/sprites/effects/minelaser.png index 21acfa15d4..5db610651a 100644 Binary files a/core/assets-raw/sprites/effects/minelaser.png and b/core/assets-raw/sprites/effects/minelaser.png differ diff --git a/core/assets-raw/sprites/items/item-blast-compound.png b/core/assets-raw/sprites/items/item-blast-compound.png index c14eb34b11..cc45da15db 100644 Binary files a/core/assets-raw/sprites/items/item-blast-compound.png and b/core/assets-raw/sprites/items/item-blast-compound.png differ diff --git a/core/assets-raw/sprites/items/item-coal.png b/core/assets-raw/sprites/items/item-coal.png index 13727cd802..13df71b603 100644 Binary files a/core/assets-raw/sprites/items/item-coal.png and b/core/assets-raw/sprites/items/item-coal.png differ diff --git a/core/assets-raw/sprites/items/item-copper.png b/core/assets-raw/sprites/items/item-copper.png index 664c9cc6f3..74f6bd94ed 100644 Binary files a/core/assets-raw/sprites/items/item-copper.png and b/core/assets-raw/sprites/items/item-copper.png differ diff --git a/core/assets-raw/sprites/items/item-graphite.png b/core/assets-raw/sprites/items/item-graphite.png index 68b074bdc7..47bbcb1506 100644 Binary files a/core/assets-raw/sprites/items/item-graphite.png and b/core/assets-raw/sprites/items/item-graphite.png differ diff --git a/core/assets-raw/sprites/items/item-lead.png b/core/assets-raw/sprites/items/item-lead.png index ce09ac6185..35595097ca 100644 Binary files a/core/assets-raw/sprites/items/item-lead.png and b/core/assets-raw/sprites/items/item-lead.png differ diff --git a/core/assets-raw/sprites/items/item-metaglass.png b/core/assets-raw/sprites/items/item-metaglass.png index 3c45a8873f..6b6d36240f 100644 Binary files a/core/assets-raw/sprites/items/item-metaglass.png and b/core/assets-raw/sprites/items/item-metaglass.png differ diff --git a/core/assets-raw/sprites/items/item-phase-fabric.png b/core/assets-raw/sprites/items/item-phase-fabric.png index 6f226c7a97..174215dd86 100644 Binary files a/core/assets-raw/sprites/items/item-phase-fabric.png and b/core/assets-raw/sprites/items/item-phase-fabric.png differ diff --git a/core/assets-raw/sprites/items/item-plastanium.png b/core/assets-raw/sprites/items/item-plastanium.png index 6ce75034f3..3d51e7562e 100644 Binary files a/core/assets-raw/sprites/items/item-plastanium.png and b/core/assets-raw/sprites/items/item-plastanium.png differ diff --git a/core/assets-raw/sprites/items/item-pyratite.png b/core/assets-raw/sprites/items/item-pyratite.png index eec30df17d..77012a522d 100644 Binary files a/core/assets-raw/sprites/items/item-pyratite.png and b/core/assets-raw/sprites/items/item-pyratite.png differ diff --git a/core/assets-raw/sprites/items/item-sand.png b/core/assets-raw/sprites/items/item-sand.png index ac94898030..ed025f9931 100644 Binary files a/core/assets-raw/sprites/items/item-sand.png and b/core/assets-raw/sprites/items/item-sand.png differ diff --git a/core/assets-raw/sprites/items/item-scrap.png b/core/assets-raw/sprites/items/item-scrap.png index 0de9f03656..45df8819fc 100644 Binary files a/core/assets-raw/sprites/items/item-scrap.png and b/core/assets-raw/sprites/items/item-scrap.png differ diff --git a/core/assets-raw/sprites/items/item-silicon.png b/core/assets-raw/sprites/items/item-silicon.png index 5d4cfab004..9014611f2c 100644 Binary files a/core/assets-raw/sprites/items/item-silicon.png and b/core/assets-raw/sprites/items/item-silicon.png differ diff --git a/core/assets-raw/sprites/items/item-spore-pod.png b/core/assets-raw/sprites/items/item-spore-pod.png index aa69408ee7..08fab9d2e8 100644 Binary files a/core/assets-raw/sprites/items/item-spore-pod.png and b/core/assets-raw/sprites/items/item-spore-pod.png differ diff --git a/core/assets-raw/sprites/items/item-surge-alloy.png b/core/assets-raw/sprites/items/item-surge-alloy.png index 9fc6aa4561..789012ef13 100644 Binary files a/core/assets-raw/sprites/items/item-surge-alloy.png and b/core/assets-raw/sprites/items/item-surge-alloy.png differ diff --git a/core/assets-raw/sprites/items/item-thorium.png b/core/assets-raw/sprites/items/item-thorium.png index 2cd39c8f49..b548c5acf7 100644 Binary files a/core/assets-raw/sprites/items/item-thorium.png and b/core/assets-raw/sprites/items/item-thorium.png differ diff --git a/core/assets-raw/sprites/items/item-titanium.png b/core/assets-raw/sprites/items/item-titanium.png index 3e15e1e7c7..b1dd24233a 100644 Binary files a/core/assets-raw/sprites/items/item-titanium.png and b/core/assets-raw/sprites/items/item-titanium.png differ diff --git a/core/assets-raw/sprites/items/liquid-cryofluid.png b/core/assets-raw/sprites/items/liquid-cryofluid.png index 198c21ad17..ada0f5b06d 100644 Binary files a/core/assets-raw/sprites/items/liquid-cryofluid.png and b/core/assets-raw/sprites/items/liquid-cryofluid.png differ diff --git a/core/assets-raw/sprites/items/liquid-oil.png b/core/assets-raw/sprites/items/liquid-oil.png index e0fbc07cf2..16ea1670b4 100644 Binary files a/core/assets-raw/sprites/items/liquid-oil.png and b/core/assets-raw/sprites/items/liquid-oil.png differ diff --git a/core/assets-raw/sprites/items/liquid-slag.png b/core/assets-raw/sprites/items/liquid-slag.png index 87c2a41d07..c482af93dd 100644 Binary files a/core/assets-raw/sprites/items/liquid-slag.png and b/core/assets-raw/sprites/items/liquid-slag.png differ diff --git a/core/assets-raw/sprites/items/liquid-water.png b/core/assets-raw/sprites/items/liquid-water.png index 025c812967..a822b86412 100644 Binary files a/core/assets-raw/sprites/items/liquid-water.png and b/core/assets-raw/sprites/items/liquid-water.png differ diff --git a/core/assets-raw/sprites/rubble/rubble-5-0.png b/core/assets-raw/sprites/rubble/rubble-5-0.png index 8b22b6fc14..822e4b777b 100644 Binary files a/core/assets-raw/sprites/rubble/rubble-5-0.png and b/core/assets-raw/sprites/rubble/rubble-5-0.png differ diff --git a/core/assets-raw/sprites/rubble/rubble-6-0.png b/core/assets-raw/sprites/rubble/rubble-6-0.png index 3f3fb19086..3260f4b32d 100644 Binary files a/core/assets-raw/sprites/rubble/rubble-6-0.png and b/core/assets-raw/sprites/rubble/rubble-6-0.png differ diff --git a/core/assets-raw/sprites/rubble/rubble-7-0.png b/core/assets-raw/sprites/rubble/rubble-7-0.png index ba3fb3f3af..525ca3da1f 100644 Binary files a/core/assets-raw/sprites/rubble/rubble-7-0.png and b/core/assets-raw/sprites/rubble/rubble-7-0.png differ diff --git a/core/assets-raw/sprites/rubble/rubble-8-0.png b/core/assets-raw/sprites/rubble/rubble-8-0.png index 5db796476d..680e65aa48 100644 Binary files a/core/assets-raw/sprites/rubble/rubble-8-0.png and b/core/assets-raw/sprites/rubble/rubble-8-0.png differ diff --git a/core/assets-raw/sprites/shapes/circle.png b/core/assets-raw/sprites/shapes/circle.png index e2e6c0b2ec..75b0b0acda 100644 Binary files a/core/assets-raw/sprites/shapes/circle.png and b/core/assets-raw/sprites/shapes/circle.png differ diff --git a/core/assets-raw/sprites/shapes/shape-3.png b/core/assets-raw/sprites/shapes/shape-3.png index 5e98717513..d8dfb1f9cf 100644 Binary files a/core/assets-raw/sprites/shapes/shape-3.png and b/core/assets-raw/sprites/shapes/shape-3.png differ diff --git a/core/assets-raw/sprites/ui/alpha-bg.png b/core/assets-raw/sprites/ui/alpha-bg.png index 9cbc32b1fe..22a7e1eb92 100644 Binary files a/core/assets-raw/sprites/ui/alpha-bg.png and b/core/assets-raw/sprites/ui/alpha-bg.png differ diff --git a/core/assets-raw/sprites/ui/button-disabled.9.png b/core/assets-raw/sprites/ui/button-disabled.9.png index a4602889e8..a1532fa6e9 100644 Binary files a/core/assets-raw/sprites/ui/button-disabled.9.png and b/core/assets-raw/sprites/ui/button-disabled.9.png differ diff --git a/core/assets-raw/sprites/ui/button-down.9.png b/core/assets-raw/sprites/ui/button-down.9.png index 1cc0db6249..2e4808729f 100644 Binary files a/core/assets-raw/sprites/ui/button-down.9.png and b/core/assets-raw/sprites/ui/button-down.9.png differ diff --git a/core/assets-raw/sprites/ui/button-edge-1.9.png b/core/assets-raw/sprites/ui/button-edge-1.9.png index 98f588a553..af8447dda1 100644 Binary files a/core/assets-raw/sprites/ui/button-edge-1.9.png and b/core/assets-raw/sprites/ui/button-edge-1.9.png differ diff --git a/core/assets-raw/sprites/ui/button-edge-2.9.png b/core/assets-raw/sprites/ui/button-edge-2.9.png index 745c279f10..1b8702a15a 100644 Binary files a/core/assets-raw/sprites/ui/button-edge-2.9.png and b/core/assets-raw/sprites/ui/button-edge-2.9.png differ diff --git a/core/assets-raw/sprites/ui/button-edge-3.9.png b/core/assets-raw/sprites/ui/button-edge-3.9.png index 344cfc07a9..b54c791163 100644 Binary files a/core/assets-raw/sprites/ui/button-edge-3.9.png and b/core/assets-raw/sprites/ui/button-edge-3.9.png differ diff --git a/core/assets-raw/sprites/ui/button-edge-4.9.png b/core/assets-raw/sprites/ui/button-edge-4.9.png index 831e94fd5e..c80ec376f6 100644 Binary files a/core/assets-raw/sprites/ui/button-edge-4.9.png and b/core/assets-raw/sprites/ui/button-edge-4.9.png differ diff --git a/core/assets-raw/sprites/ui/button-edge-over-4.9.png b/core/assets-raw/sprites/ui/button-edge-over-4.9.png index 92c520676a..ab288bee13 100644 Binary files a/core/assets-raw/sprites/ui/button-edge-over-4.9.png and b/core/assets-raw/sprites/ui/button-edge-over-4.9.png differ diff --git a/core/assets-raw/sprites/ui/button-over.9.png b/core/assets-raw/sprites/ui/button-over.9.png index 7effe30ffa..7e2213087d 100644 Binary files a/core/assets-raw/sprites/ui/button-over.9.png and b/core/assets-raw/sprites/ui/button-over.9.png differ diff --git a/core/assets-raw/sprites/ui/button-red.9.png b/core/assets-raw/sprites/ui/button-red.9.png index 621dda2ca6..89098436ff 100644 Binary files a/core/assets-raw/sprites/ui/button-red.9.png and b/core/assets-raw/sprites/ui/button-red.9.png differ diff --git a/core/assets-raw/sprites/ui/button-right-down.9.png b/core/assets-raw/sprites/ui/button-right-down.9.png index c410ca7f44..00b41dabe4 100644 Binary files a/core/assets-raw/sprites/ui/button-right-down.9.png and b/core/assets-raw/sprites/ui/button-right-down.9.png differ diff --git a/core/assets-raw/sprites/ui/button-right-over.9.png b/core/assets-raw/sprites/ui/button-right-over.9.png index 2f4a6a05bb..a8f83eee16 100644 Binary files a/core/assets-raw/sprites/ui/button-right-over.9.png and b/core/assets-raw/sprites/ui/button-right-over.9.png differ diff --git a/core/assets-raw/sprites/ui/button-right.9.png b/core/assets-raw/sprites/ui/button-right.9.png index dc88b76b54..e43fe0c11c 100644 Binary files a/core/assets-raw/sprites/ui/button-right.9.png and b/core/assets-raw/sprites/ui/button-right.9.png differ diff --git a/core/assets-raw/sprites/ui/button-select.9.png b/core/assets-raw/sprites/ui/button-select.9.png index a437c5b58d..8011cad610 100644 Binary files a/core/assets-raw/sprites/ui/button-select.9.png and b/core/assets-raw/sprites/ui/button-select.9.png differ diff --git a/core/assets-raw/sprites/ui/button-square-down.9.png b/core/assets-raw/sprites/ui/button-square-down.9.png index 44f9870ac6..4c81be0884 100644 Binary files a/core/assets-raw/sprites/ui/button-square-down.9.png and b/core/assets-raw/sprites/ui/button-square-down.9.png differ diff --git a/core/assets-raw/sprites/ui/button-square-over.9.png b/core/assets-raw/sprites/ui/button-square-over.9.png index 4bdc6aa350..9d197296b3 100644 Binary files a/core/assets-raw/sprites/ui/button-square-over.9.png and b/core/assets-raw/sprites/ui/button-square-over.9.png differ diff --git a/core/assets-raw/sprites/ui/button-square.9.png b/core/assets-raw/sprites/ui/button-square.9.png index a137425df9..8c79235588 100644 Binary files a/core/assets-raw/sprites/ui/button-square.9.png and b/core/assets-raw/sprites/ui/button-square.9.png differ diff --git a/core/assets-raw/sprites/ui/button-trans.9.png b/core/assets-raw/sprites/ui/button-trans.9.png index 39d840e1a2..fc179a9e9f 100644 Binary files a/core/assets-raw/sprites/ui/button-trans.9.png and b/core/assets-raw/sprites/ui/button-trans.9.png differ diff --git a/core/assets-raw/sprites/ui/button.9.png b/core/assets-raw/sprites/ui/button.9.png index 19e13554cf..c8fa691c60 100644 Binary files a/core/assets-raw/sprites/ui/button.9.png and b/core/assets-raw/sprites/ui/button.9.png differ diff --git a/core/assets-raw/sprites/ui/check-disabled.png b/core/assets-raw/sprites/ui/check-disabled.png index 53d7724049..a2f6137cbf 100644 Binary files a/core/assets-raw/sprites/ui/check-disabled.png and b/core/assets-raw/sprites/ui/check-disabled.png differ diff --git a/core/assets-raw/sprites/ui/check-off.png b/core/assets-raw/sprites/ui/check-off.png index 31f800e66f..94deb45bb7 100644 Binary files a/core/assets-raw/sprites/ui/check-off.png and b/core/assets-raw/sprites/ui/check-off.png differ diff --git a/core/assets-raw/sprites/ui/check-on-disabled.png b/core/assets-raw/sprites/ui/check-on-disabled.png index 8eadb568e9..f42ee9409c 100644 Binary files a/core/assets-raw/sprites/ui/check-on-disabled.png and b/core/assets-raw/sprites/ui/check-on-disabled.png differ diff --git a/core/assets-raw/sprites/ui/check-on-over.png b/core/assets-raw/sprites/ui/check-on-over.png index 5911e9ea4e..6b5d91a61e 100644 Binary files a/core/assets-raw/sprites/ui/check-on-over.png and b/core/assets-raw/sprites/ui/check-on-over.png differ diff --git a/core/assets-raw/sprites/ui/check-on.png b/core/assets-raw/sprites/ui/check-on.png index 424e7c324f..807abeaf6b 100644 Binary files a/core/assets-raw/sprites/ui/check-on.png and b/core/assets-raw/sprites/ui/check-on.png differ diff --git a/core/assets-raw/sprites/ui/check-over.png b/core/assets-raw/sprites/ui/check-over.png index 39611ce341..64cef03a18 100644 Binary files a/core/assets-raw/sprites/ui/check-over.png and b/core/assets-raw/sprites/ui/check-over.png differ diff --git a/core/assets-raw/sprites/ui/discord-banner.png b/core/assets-raw/sprites/ui/discord-banner.png index 7d1a2d4385..165705e368 100644 Binary files a/core/assets-raw/sprites/ui/discord-banner.png and b/core/assets-raw/sprites/ui/discord-banner.png differ diff --git a/core/assets-raw/sprites/ui/flat-down-base.9.png b/core/assets-raw/sprites/ui/flat-down-base.9.png index 10de55d3af..9a96a4a2cd 100644 Binary files a/core/assets-raw/sprites/ui/flat-down-base.9.png and b/core/assets-raw/sprites/ui/flat-down-base.9.png differ diff --git a/core/assets-raw/sprites/ui/info-banner.png b/core/assets-raw/sprites/ui/info-banner.png index 0ee4c4ad83..51942acebf 100644 Binary files a/core/assets-raw/sprites/ui/info-banner.png and b/core/assets-raw/sprites/ui/info-banner.png differ diff --git a/core/assets-raw/sprites/ui/inventory.9.png b/core/assets-raw/sprites/ui/inventory.9.png index 0bbff5a0fe..97990b9253 100644 Binary files a/core/assets-raw/sprites/ui/inventory.9.png and b/core/assets-raw/sprites/ui/inventory.9.png differ diff --git a/core/assets-raw/sprites/ui/logo.png b/core/assets-raw/sprites/ui/logo.png index eee1e0e658..0a1778c104 100644 Binary files a/core/assets-raw/sprites/ui/logo.png and b/core/assets-raw/sprites/ui/logo.png differ diff --git a/core/assets-raw/sprites/ui/nomap.png b/core/assets-raw/sprites/ui/nomap.png index fab7a7ad77..9233e4b89b 100644 Binary files a/core/assets-raw/sprites/ui/nomap.png and b/core/assets-raw/sprites/ui/nomap.png differ diff --git a/core/assets-raw/sprites/ui/pane-2.9.png b/core/assets-raw/sprites/ui/pane-2.9.png index 417dcd02fd..35a4822e67 100644 Binary files a/core/assets-raw/sprites/ui/pane-2.9.png and b/core/assets-raw/sprites/ui/pane-2.9.png differ diff --git a/core/assets-raw/sprites/ui/pane.9.png b/core/assets-raw/sprites/ui/pane.9.png index 885a5c45f3..a4a5f0992f 100644 Binary files a/core/assets-raw/sprites/ui/pane.9.png and b/core/assets-raw/sprites/ui/pane.9.png differ diff --git a/core/assets-raw/sprites/ui/scroll-knob-horizontal-black.png b/core/assets-raw/sprites/ui/scroll-knob-horizontal-black.png index b5056d235a..91b2db7313 100644 Binary files a/core/assets-raw/sprites/ui/scroll-knob-horizontal-black.png and b/core/assets-raw/sprites/ui/scroll-knob-horizontal-black.png differ diff --git a/core/assets-raw/sprites/ui/scroll-knob-vertical-black.png b/core/assets-raw/sprites/ui/scroll-knob-vertical-black.png index 1d1f180358..dd00e9cf99 100644 Binary files a/core/assets-raw/sprites/ui/scroll-knob-vertical-black.png and b/core/assets-raw/sprites/ui/scroll-knob-vertical-black.png differ diff --git a/core/assets-raw/sprites/ui/scroll-knob-vertical-thin.png b/core/assets-raw/sprites/ui/scroll-knob-vertical-thin.png index 540a1bcfca..1657573fcf 100644 Binary files a/core/assets-raw/sprites/ui/scroll-knob-vertical-thin.png and b/core/assets-raw/sprites/ui/scroll-knob-vertical-thin.png differ diff --git a/core/assets-raw/sprites/ui/slider-knob-down.png b/core/assets-raw/sprites/ui/slider-knob-down.png index 32fd414a91..7eac1c0f51 100644 Binary files a/core/assets-raw/sprites/ui/slider-knob-down.png and b/core/assets-raw/sprites/ui/slider-knob-down.png differ diff --git a/core/assets-raw/sprites/ui/slider-knob-over.png b/core/assets-raw/sprites/ui/slider-knob-over.png index d0dde09ecc..a4bb61170b 100644 Binary files a/core/assets-raw/sprites/ui/slider-knob-over.png and b/core/assets-raw/sprites/ui/slider-knob-over.png differ diff --git a/core/assets-raw/sprites/ui/slider-knob.png b/core/assets-raw/sprites/ui/slider-knob.png index 1c40347ea0..6e643e0dc6 100644 Binary files a/core/assets-raw/sprites/ui/slider-knob.png and b/core/assets-raw/sprites/ui/slider-knob.png differ diff --git a/core/assets-raw/sprites/ui/slider.png b/core/assets-raw/sprites/ui/slider.png index 71b354ccc9..cb2e464ff9 100644 Binary files a/core/assets-raw/sprites/ui/slider.png and b/core/assets-raw/sprites/ui/slider.png differ diff --git a/core/assets-raw/sprites/ui/underline-2.9.png b/core/assets-raw/sprites/ui/underline-2.9.png index 24da68912a..f703111db2 100644 Binary files a/core/assets-raw/sprites/ui/underline-2.9.png and b/core/assets-raw/sprites/ui/underline-2.9.png differ diff --git a/core/assets-raw/sprites/ui/underline-disabled.9.png b/core/assets-raw/sprites/ui/underline-disabled.9.png index 778b428500..d0b7121556 100644 Binary files a/core/assets-raw/sprites/ui/underline-disabled.9.png and b/core/assets-raw/sprites/ui/underline-disabled.9.png differ diff --git a/core/assets-raw/sprites/ui/underline-red.9.png b/core/assets-raw/sprites/ui/underline-red.9.png index 1237745208..af1810f47a 100644 Binary files a/core/assets-raw/sprites/ui/underline-red.9.png and b/core/assets-raw/sprites/ui/underline-red.9.png differ diff --git a/core/assets-raw/sprites/ui/underline.9.png b/core/assets-raw/sprites/ui/underline.9.png index 516f6f82cc..c1ed2c32ac 100644 Binary files a/core/assets-raw/sprites/ui/underline.9.png and b/core/assets-raw/sprites/ui/underline.9.png differ diff --git a/core/assets-raw/sprites/ui/window-empty.9.png b/core/assets-raw/sprites/ui/window-empty.9.png index 5c943d42b7..007da0d888 100644 Binary files a/core/assets-raw/sprites/ui/window-empty.9.png and b/core/assets-raw/sprites/ui/window-empty.9.png differ diff --git a/core/assets-raw/sprites/units/crawler-leg.png b/core/assets-raw/sprites/units/crawler-leg.png index af1a7636e9..a3c3fffbc6 100644 Binary files a/core/assets-raw/sprites/units/crawler-leg.png and b/core/assets-raw/sprites/units/crawler-leg.png differ diff --git a/core/assets-raw/sprites/units/delta.png b/core/assets-raw/sprites/units/delta.png index 826e9e1bec..adf85f8795 100644 Binary files a/core/assets-raw/sprites/units/delta.png and b/core/assets-raw/sprites/units/delta.png differ diff --git a/core/assets-raw/sprites/units/fortress-leg.png b/core/assets-raw/sprites/units/fortress-leg.png index 5fe3fe7b28..daaae97bc9 100644 Binary files a/core/assets-raw/sprites/units/fortress-leg.png and b/core/assets-raw/sprites/units/fortress-leg.png differ diff --git a/core/assets-raw/sprites/units/glaive.png b/core/assets-raw/sprites/units/glaive.png index 6374f07725..b5434e8c2a 100644 Binary files a/core/assets-raw/sprites/units/glaive.png and b/core/assets-raw/sprites/units/glaive.png differ diff --git a/core/assets-raw/sprites/units/javelin.png b/core/assets-raw/sprites/units/javelin.png index a9dff9a99b..ed8ac66ec3 100644 Binary files a/core/assets-raw/sprites/units/javelin.png and b/core/assets-raw/sprites/units/javelin.png differ diff --git a/core/assets-raw/sprites/units/lich.png b/core/assets-raw/sprites/units/lich.png index 046d51b3d9..d6048cfa25 100644 Binary files a/core/assets-raw/sprites/units/lich.png and b/core/assets-raw/sprites/units/lich.png differ diff --git a/core/assets-raw/sprites/units/omega.png b/core/assets-raw/sprites/units/omega.png index 2129eb3c08..c87d423365 100644 Binary files a/core/assets-raw/sprites/units/omega.png and b/core/assets-raw/sprites/units/omega.png differ diff --git a/core/assets-raw/sprites/units/power-cell.png b/core/assets-raw/sprites/units/power-cell.png index 04a09f93f3..933442c7a0 100644 Binary files a/core/assets-raw/sprites/units/power-cell.png and b/core/assets-raw/sprites/units/power-cell.png differ diff --git a/core/assets-raw/sprites/units/reaper.png b/core/assets-raw/sprites/units/reaper.png index ace8e0a9c2..168919a427 100644 Binary files a/core/assets-raw/sprites/units/reaper.png and b/core/assets-raw/sprites/units/reaper.png differ diff --git a/core/assets-raw/sprites/units/tau.png b/core/assets-raw/sprites/units/tau.png index 6f23a1364c..0dfdea349c 100644 Binary files a/core/assets-raw/sprites/units/tau.png and b/core/assets-raw/sprites/units/tau.png differ diff --git a/core/assets-raw/sprites/units/trident.png b/core/assets-raw/sprites/units/trident.png index e7fc0b88b1..dcbdd69f1b 100644 Binary files a/core/assets-raw/sprites/units/trident.png and b/core/assets-raw/sprites/units/trident.png differ diff --git a/core/assets-raw/sprites/units/wraith.png b/core/assets-raw/sprites/units/wraith.png index 3b7c673d86..28ab23c33a 100644 Binary files a/core/assets-raw/sprites/units/wraith.png and b/core/assets-raw/sprites/units/wraith.png differ diff --git a/core/assets-raw/sprites/weapons/blaster-equip.png b/core/assets-raw/sprites/weapons/blaster-equip.png index b5679122a5..277fe2463e 100644 Binary files a/core/assets-raw/sprites/weapons/blaster-equip.png and b/core/assets-raw/sprites/weapons/blaster-equip.png differ diff --git a/core/assets-raw/sprites/weapons/chain-blaster-equip.png b/core/assets-raw/sprites/weapons/chain-blaster-equip.png index 3cde6228a0..b93338cfca 100644 Binary files a/core/assets-raw/sprites/weapons/chain-blaster-equip.png and b/core/assets-raw/sprites/weapons/chain-blaster-equip.png differ diff --git a/core/assets-raw/sprites/weapons/flakgun-equip.png b/core/assets-raw/sprites/weapons/flakgun-equip.png index 931b33dd1d..e73c50aed2 100644 Binary files a/core/assets-raw/sprites/weapons/flakgun-equip.png and b/core/assets-raw/sprites/weapons/flakgun-equip.png differ diff --git a/core/assets-raw/sprites/weapons/heal-blaster-equip.png b/core/assets-raw/sprites/weapons/heal-blaster-equip.png index 52f579ce68..94b67429ce 100644 Binary files a/core/assets-raw/sprites/weapons/heal-blaster-equip.png and b/core/assets-raw/sprites/weapons/heal-blaster-equip.png differ diff --git a/core/assets-raw/sprites/weapons/swarmer-equip.png b/core/assets-raw/sprites/weapons/swarmer-equip.png index 6d818dcaac..89e8713f23 100644 Binary files a/core/assets-raw/sprites/weapons/swarmer-equip.png and b/core/assets-raw/sprites/weapons/swarmer-equip.png differ diff --git a/core/assets-raw/sprites/zones/zone-craters.png b/core/assets-raw/sprites/zones/zone-craters.png index 9675beb0b3..45ae9d3b79 100644 Binary files a/core/assets-raw/sprites/zones/zone-craters.png and b/core/assets-raw/sprites/zones/zone-craters.png differ diff --git a/core/assets-raw/sprites/zones/zone-desertWastes.png b/core/assets-raw/sprites/zones/zone-desertWastes.png index dc6b8946e8..bd3097a85a 100644 Binary files a/core/assets-raw/sprites/zones/zone-desertWastes.png and b/core/assets-raw/sprites/zones/zone-desertWastes.png differ diff --git a/core/assets-raw/sprites/zones/zone-desolateRift.png b/core/assets-raw/sprites/zones/zone-desolateRift.png index 8b24d6be6b..b19cda73a6 100644 Binary files a/core/assets-raw/sprites/zones/zone-desolateRift.png and b/core/assets-raw/sprites/zones/zone-desolateRift.png differ diff --git a/core/assets-raw/sprites/zones/zone-frozenForest.png b/core/assets-raw/sprites/zones/zone-frozenForest.png index 8faccbdcaf..5c5d702d33 100644 Binary files a/core/assets-raw/sprites/zones/zone-frozenForest.png and b/core/assets-raw/sprites/zones/zone-frozenForest.png differ diff --git a/core/assets-raw/sprites/zones/zone-fungalPass.png b/core/assets-raw/sprites/zones/zone-fungalPass.png index c59fbc57e3..a764365dd1 100644 Binary files a/core/assets-raw/sprites/zones/zone-fungalPass.png and b/core/assets-raw/sprites/zones/zone-fungalPass.png differ diff --git a/core/assets-raw/sprites/zones/zone-groundZero.png b/core/assets-raw/sprites/zones/zone-groundZero.png index 51fa326984..5dcaf536f8 100644 Binary files a/core/assets-raw/sprites/zones/zone-groundZero.png and b/core/assets-raw/sprites/zones/zone-groundZero.png differ diff --git a/core/assets-raw/sprites/zones/zone-nuclearComplex.png b/core/assets-raw/sprites/zones/zone-nuclearComplex.png index 84268346f9..bf7161db35 100644 Binary files a/core/assets-raw/sprites/zones/zone-nuclearComplex.png and b/core/assets-raw/sprites/zones/zone-nuclearComplex.png differ diff --git a/core/assets-raw/sprites/zones/zone-overgrowth.png b/core/assets-raw/sprites/zones/zone-overgrowth.png index 99ace71e99..0f13ba66cb 100644 Binary files a/core/assets-raw/sprites/zones/zone-overgrowth.png and b/core/assets-raw/sprites/zones/zone-overgrowth.png differ diff --git a/core/assets-raw/sprites/zones/zone-ruinousShores.png b/core/assets-raw/sprites/zones/zone-ruinousShores.png index 28f01f2a45..dd139eb973 100644 Binary files a/core/assets-raw/sprites/zones/zone-ruinousShores.png and b/core/assets-raw/sprites/zones/zone-ruinousShores.png differ diff --git a/core/assets-raw/sprites/zones/zone-saltFlats.png b/core/assets-raw/sprites/zones/zone-saltFlats.png index 3a31279c30..083f6ce154 100644 Binary files a/core/assets-raw/sprites/zones/zone-saltFlats.png and b/core/assets-raw/sprites/zones/zone-saltFlats.png differ diff --git a/core/assets-raw/sprites/zones/zone-stainedMountains.png b/core/assets-raw/sprites/zones/zone-stainedMountains.png index 0fb9bb2b10..e963423bfa 100644 Binary files a/core/assets-raw/sprites/zones/zone-stainedMountains.png and b/core/assets-raw/sprites/zones/zone-stainedMountains.png differ diff --git a/core/assets-raw/sprites/zones/zone-tarFields.png b/core/assets-raw/sprites/zones/zone-tarFields.png index 976af5c1d3..7649530196 100644 Binary files a/core/assets-raw/sprites/zones/zone-tarFields.png and b/core/assets-raw/sprites/zones/zone-tarFields.png differ diff --git a/core/assets/bundles/bundle_cs.properties b/core/assets/bundles/bundle_cs.properties index a490645d52..1446544f13 100644 --- a/core/assets/bundles/bundle_cs.properties +++ b/core/assets/bundles/bundle_cs.properties @@ -53,13 +53,14 @@ schematic.delete.confirm = Šablona bude kompletně vyhlazena. schematic.rename = Přejmenovat šablonu schematic.info = {0}x{1}, {2} bloků -stat.wave = Vln poraženo:[accent] {0} -stat.enemiesDestroyed = Nepřátel zničeno:[accent] {0} -stat.built = Budov postaveno:[accent] {0} -stat.destroyed = Budov zničeno:[accent] {0} -stat.deconstructed = Budov rozebráno:[accent] {0} +stat.wave = Vln poraženo: [accent]{0} +stat.enemiesDestroyed = Nepřátel zničeno: [accent]{0}[] +stat.built = Budov postaveno: [accent]{0}[] +stat.destroyed = Budov zničeno: [accent]{0}[] +stat.deconstructed = Budov rozebráno: [accent]{0}[] stat.delivered = Materiálu vysláno: -stat.rank = Celková známka: [accent]{0} +stat.playtime = Odehraný čas: [accent]{0}[] +stat.rank = Celková známka: [accent]{0}[] launcheditems = [accent]Získané předměty[] launchinfo = [unlaunched]Je třeba vyslat zpět Tvé jádro, abys získal věci vyznačené modře.[] @@ -104,6 +105,7 @@ mods.none = [lightgray]Modifikace nebyly nalezeny.[] mods.guide = Průvodce modifikacemi mods.report = Nahlásit závadu mods.openfolder = Otevřít složku s modifikacemi +mod.display = [gray]Modifikace:[][orange] {0}[] mod.enabled = [lightgray]Povoleno[] mod.disabled = [scarlet]Zakázáno[] mod.disable = Zakázat @@ -170,6 +172,11 @@ hosts.discovering.any = Hledám hry server.refreshing = Aktualizuji stav serverů hosts.none = [lightgray]Žádné místní hry nebyly nalezeny![] host.invalid = [scarlet]Nejde se připojit k hostiteli.[] + +servers.local = Místní servery +servers.remote = Vzdálené servery +servers.global = Globální servery + trace = Vystopovat hráče trace.playername = Jméno hráče: [accent]{0}[] trace.ip = Adresa IP: [accent]{0}[] diff --git a/core/assets/bundles/bundle_it.properties b/core/assets/bundles/bundle_it.properties index c142113cc3..2d3e2b967f 100644 --- a/core/assets/bundles/bundle_it.properties +++ b/core/assets/bundles/bundle_it.properties @@ -172,8 +172,13 @@ hosts.discovering.any = Ricerca partite server.refreshing = Aggiornamento del server hosts.none = [lightgray]Nessuna partita locale trovata! host.invalid = [scarlet]Impossibile connettersi all'host. -trace = Traccia giocatore -trace.playername = Nome del giocatore: [accent]{0} + +servers.local = Server Locali +servers.remote = Server Remoti +servers.global = Server Globali + +trace = Traccia Giocatore +trace.playername = Nome del Giocatore: [accent]{0} trace.ip = IP: [accent]{0} trace.id = ID univoco: [accent]{0} trace.mobile = Client Mobile: [accent]{0} @@ -183,11 +188,11 @@ server.bans = Lista Bans server.bans.none = Nessun giocatore bandito trovato! server.admins = Amministratori server.admins.none = Nessun amministratore trovato! -server.add = Aggiungi server +server.add = Aggiungi Server server.delete = Sei sicuro di voler eliminare questo server? -server.edit = Modifica server -server.outdated = [crimson]Server obsoleto![] -server.outdated.client = [crimson]Client obsoleto![] +server.edit = Modifica Server +server.outdated = [crimson]Server Obsoleto![] +server.outdated.client = [crimson]Client Obsoleto![] server.version = [gray]v{0} {1} server.custombuild = [yellow]Build Personalizzata confirmban = Sei sicuro di voler bandire questo giocatore? diff --git a/core/assets/bundles/bundle_ko.properties b/core/assets/bundles/bundle_ko.properties index 28efe4d483..91642721d7 100644 --- a/core/assets/bundles/bundle_ko.properties +++ b/core/assets/bundles/bundle_ko.properties @@ -59,6 +59,7 @@ stat.built = 건설한 건물 수 : [accent]{0} stat.destroyed = 파괴된 건물 수 : [accent]{0} stat.deconstructed = 파괴한 건물 수 : [accent]{0} stat.delivered = 획득한 자원 : +stat.playtime = 지역 클리어시간 : [accent] {0} stat.rank = 최종 점수 : [accent]{0} launcheditems = [accent]창고 @@ -104,17 +105,18 @@ mods.none = [LIGHT_GRAY]추가한 모드가 없습니다! mods.guide = 모드 가이드 mods.report = 문제 신고 mods.openfolder = 모드 폴더 열기 +mod.display = [gray]모드 :[orange] {0} mod.enabled=[blue]활성화 mod.disabled=[scarlet]적용 안됨 mod.disable=[lightgray]비활성화 mod.delete.error = 모드를 삭제할 수 없습니다. 아마도 해당 모드가 사용중인 것 같습니다. mod.requiresversion = [scarlet]게임의 버전이 낮아 모드를 활성화할 수 없습니다!\n[scarlet]요구되는 게임 버전 : [accent]{0} -mod.missingdependencies = [scarlet]의존되는 모드: {0} +mod.missingdependencies = [scarlet]필요한 모드 : {0} mod.erroredcontent = [scarlet]컨텐츠 오류 mod.errors = 컨텐츠를 불러오는 중 오류가 발생하였습니다. mod.noerrorplay = [scarlet]모드에 오류가 존재합니다.[] 해당 오류가 발생하는 모드를 비활성화하거나 모드의 오류를 고친 후 플레이가 가능합니다. mod.nowdisabled = [scarlet]모드 '{0}'는 다음의 모드에 의존합니다 : [accent] {1}\n[lightgray]이 모드를 먼저 다운로드해야합니다.\n이 모드는 자동으로 비활성화됩니다. -mod.enable=활성화 +mod.enable = 활성화 mod.requiresrestart = 모드 변경사항을 적용하기 위해 게임을 종료합니다. mod.reloadrequired = [scarlet]새로고침 예정됨 mod.import = 모드 추가 @@ -123,8 +125,8 @@ mod.item.remove = 이것은 모드[accent] '{0}'[]의 자원입니다. 이 자 mod.remove.confirm = 이 모드를 삭제하시겠습니까? mod.author = [LIGHT_GRAY]제작자 : [] {0} mod.missing = 이 세이브파일에는 설치하지 않은 모드 혹은 현재 버전에 속해있지 않은 데이터가 포함되어 있습니다. 이 파일을 불러올 경우 세이브파일의 데이터가 손상될 수 있습니다. 정말로 이 파일을 불러오시겠습니까?\n[lightgray]모드 :\n{0} -mod.preview.missing=Workshop에 당신의 모드를 업로드하기 전에 미리보기 이미지를 먼저 추가해야합니다.\n[accent] preview.png[]라는 이름으로 미리보기 이미지를 당신의 모드 폴더안에 준비한 후 다시 시도해주세요. -mod.folder.missing=Workshop에는 폴더 형태의 모드만 게시할 수 있습니다.\n모드를 폴더 형태로 바꾸려면 파일을 폴더에 압축 해제하고 이전 압축파일을 제거한 후, 게임을 재시작하거나 모드를 다시 로드하십시오. +mod.preview.missing = Workshop에 당신의 모드를 업로드하기 전에 미리보기 이미지를 먼저 추가해야합니다.\n[accent] preview.png[]라는 이름으로 미리보기 이미지를 당신의 모드 폴더안에 준비한 후 다시 시도해주세요. +mod.folder.missing = Workshop에는 폴더 형태의 모드만 게시할 수 있습니다.\n모드를 폴더 형태로 바꾸려면 파일을 폴더에 압축 해제하고 이전 압축파일을 제거한 후, 게임을 재시작하거나 모드를 다시 로드하십시오. mod.scripts.unsupported = 당신의 기기는 모드스크립트를 지원하지 않습니다. 모드의 일부 기능이 작동하지 않을 수 있습니다. about.button = 정보 @@ -251,6 +253,7 @@ copylink = 링크 복사 back = 뒤로가기 data.export = 데이터 내보내기 data.import = 데이터 불러오기 +data.openfolder = 게임 데이터 폴더 data.exported = 데이터를 내보냈습니다. data.invalid = 유효한 게임 데이터가 아닙니다. data.import.confirm = 외부 게임 데이터를 불러옵니다...\n[accent]작업이 완료되면 현재 게임 데이터는 삭제되고, 외부의 게임 데이터를 불러오니 주의하세요. 실행 취소가 불가능하며, 작업 후 게임이 바로 꺼집니다. @@ -531,6 +534,8 @@ error.crashtitle = 오류가 발생했습니다. blocks.input = 소모 자원 blocks.output = 출력 자원 blocks.booster = 가속 +blocks.tiles = 요구되는 타일 +blocks.affinities = 가속되는 block.unknown = [LIGHT_GRAY]OHNO blocks.powercapacity = 전력 용량 blocks.powershot = 1발당 전력 소모량 @@ -664,9 +669,11 @@ setting.sfxvol.name = 효과음 크기 setting.mutesound.name = 소리 끄기 setting.crashreport.name = 익명으로 오류 보고서 자동 전송 setting.savecreate.name = 자동 저장 활성화 -setting.publichost.name = 스팀 공개 서버 보이기 +setting.publichost.name = 스팀에 내 서버 공개하기 +setting.playerlimit.name = 플레이어 수 제한 setting.chatopacity.name = 채팅 투명도 setting.lasersopacity.name = 전력 레이저 밝기 +setting.bridgeopacity.name = 터널 그래픽 밝기 setting.playerchat.name = 채팅 말풍선 표시 public.confirm = 게임을 공개하시겠습니까?\n[lightgray]설정 - 게임 - 게임 서버 공개에서 다시 설정하실 수 있습니다. public.beta = [accent]!정보![] 베타 버전은 공개 게임 서버를 열지 못합니다. @@ -942,6 +949,7 @@ block.message.name = 메모 블럭 block.illuminator.name = 조명 block.illuminator.description = 작고, 간단한 조명입니다. 색을 변경할 수 있으며 가동하기 위해서 전력이 필요합니다. block.overflow-gate.name = 포화 필터 +block.underflow-gate.name = 언더플로 게이트 block.silicon-smelter.name = 실리콘 제련소 block.phase-weaver.name = 메타 합성기 block.pulverizer.name = 분쇄기 @@ -975,11 +983,12 @@ block.omega-mech-pad.name = 오메가 기체 패드 block.tau-mech-pad.name = 타우 기체 패드 block.conduit.name = 파이프 block.mechanical-pump.name = 기계식 펌프 -block.item-source.name = 아이템 소스 -block.item-void.name = 아이템 삭제 장치 -block.liquid-source.name = 무한 액체공급 장치 +block.item-source.name = 자원 공급기 +block.item-void.name = 자원 소멸기 +block.liquid-source.name = 액체 공급기 +block.liquid-void.name = 액체 소멸기 block.power-void.name = 방전장치 -block.power-source.name = 무한 전력공급 장치 +block.power-source.name = 전력 공급기 block.unloader.name = 언로더 block.vault.name = 창고 block.wave.name = 파도 @@ -1139,8 +1148,9 @@ block.incinerator.description = 불필요한 자원을 전기를 사용해 소 block.power-void.description = 이어져있는 건물의 전기를 모두 없앱니다.\n샌드박스에서만 건설가능. block.power-source.description = 무한한 전력을 공급해주는 블록입니다.\n샌드박스에서만 건설가능. block.item-source.description = 자원을 선택하면 그 자원이 무한하게 생성되는 블록입니다.\n샌드박스에서만 건설가능. -block.item-void.description = 자원을 사라지게 만듭니다.\n샌드박스에서만 건설가능. -block.liquid-source.description = 무한한 액체를 출력합니다.\n샌드박스에서만 건설가능. +block.item-void.description = 자원을 사라지게 합니다.\n샌드박스에서만 건설가능. +block.liquid-source.description = 액체를 선택하면 그 액체가 무한하게 생성되는 블록입니다.\n샌드박스에서만 건설가능. +block.liquid-void.description = 액체를 사라지게 합니다.\n샌드박스에서만 건설가능. block.copper-wall.description = 게임 시작 초기에 방어용으로 적합합니다. block.copper-wall-large.description = 구리 벽 4개를 뭉친 블럭입니다. block.titanium-wall.description = 흑연이 생산될 즈음에 사용하기 적합합니다. @@ -1170,6 +1180,7 @@ block.inverted-sorter.description = 필터와 비슷하지만, 대신에 반전 block.router.description = 한 방향에서 자원을 넣을 시 최대 3개의 다른 방향으로 균등하게 내보냅니다. 자원을 한 곳에서 여러 방향으로 분배하는 데 유용합니다. block.distributor.description = 자원을 최대 7개의 다른 방향으로 균등하게 분베하는 고급 분배기. block.overflow-gate.description = 평소에는 자원의 들어온 방향으로 자원을 통과시키지만, 정면이 자원으로 꽉 차거나 다른 사유로 막힐 시 옆으로 자원을 내보냅니다. +block.underflow-gate.description = 포화 필터의 정반대 방식의 필터입니다. 받은 자원을 먼저 필터의 양 옆으로 보내고 양 옆이 무슨 사유로든 자원을 보낼 수 없다면 정면으로 보냅니다. block.mass-driver.description = 자원 수송 포탑\n모인 자원을 전기를 사용하여 또 다른 매스 드라이버로 발사합니다.\n[ROYAL]받을 때도 전기를 사용합니다. block.mechanical-pump.description = 느린 속도로 액체를 퍼올리나, 전기를 사용하지 않는 펌프입니다. block.rotary-pump.description = 전기를 사용해 빠른 속도로 액체를 끌어올릴 수 있는 펌프입니다.\n\n[ROYAL]타일당 액체를 퍼올리는 속도가 가장 빠릅니다. diff --git a/core/assets/bundles/bundle_nl.properties b/core/assets/bundles/bundle_nl.properties index 8a45402b26..2087f6c811 100644 --- a/core/assets/bundles/bundle_nl.properties +++ b/core/assets/bundles/bundle_nl.properties @@ -494,16 +494,16 @@ zone.crags.name = Crags zone.fungalPass.name = Schimmelpad zone.groundZero.description = De optimale plek om weer tot kracht te komen. Weinig gevaar. Weinig grondstoffen.\nDelf zoveel mogelijk lood en koper als je kan.\nVertrek. -zone.frozenForest.description = Ook hier, dicht bij de bergen, hebben de schimmels zich verspreid. De koude tempratuur houd ze niet voor eeuwig tegen.\n\nBegin de industriële revolutie. Bouw fossiele generators. Leer hoe te repareren. +zone.frozenForest.description = Ook hier, dicht bij de bergen, hebben de schimmels zich verspreid. De koude tempratuur houdt ze niet voor eeuwig tegen.\n\nBegin de industriële revolutie. Bouw fossiele generatoren. Leer hoe te repareren. zone.desertWastes.description = Deze woestijn is groot, onvoorspelbaar, en vol met oude technologie.\nSteenkool is hier te vinden. Verbrand het om stroom op te wekken, of verwerk het tot grafiet.\n\n[lightgray]Of het hier veilig is is een tweede. zone.saltFlats.description = Aan de randen van de woestijn liggen de zoutvlaktes. Weinig grondstoffen zijn hier te vinden.\n\nDe vijand heeft hier rantsoenen opgeslagen. Vernietig hun core. Laat niks staan. zone.craters.description = Water heeft zich hier opgehoopt, herrinering aan de vroegere oorlog. Herover dit gebied. Delf zand. Maak glas. Pomp water in je wapens en boren om ze te koelen. zone.ruinousShores.description = Voorbij de ruines is de kust. Lang geleden werd de kust hier verdedigd maar er is weinig van terug te vinden. Enkel de meest simpele verdedigingswerken staan nog overeind, \nGa door met uitbereiden, herontdek de verloren techniek. zone.stainedMountains.description = Verder vanaf de kust liggen de bergen, nog niet aangetast door de schimmels.\nDelf de grote hoeveelheiden titanium titanium in het gebied en leer het te gebruiken.\n\nDe vijand is krachtig hier. Geef ze geen tijd om je te overrompelen. zone.overgrowth.description = Dit gebied is overgroeid, dichter bij de bron van de schimmels.\nDe vijand heeft hier een uitkijkpost. Bouw dolk units. Vernietig de vijand. Herneem wat ooit verloren was. -zone.tarFields.description = De randen van een olieveld, tussen de bergen en de woestijn. Een van de weinige plekken met bruikbare olie.\nOndanks dat het verboden is, zijn er wel krachtige vijanden in de buurt. Onderschat ze niet.\n\n[lightgray]Onderzoek wat je verder allemaal met olie kan doen. -zone.desolateRift.description = Een supergevaarlijk gebied. Veel grondstoffen, maar weinig ruimte. Grote kans op verwoesting. Lanceer zo snel mogelijk. Word niet overmoedig door de lange tijd tussen de rondes. -zone.nuclearComplex.description = Een voormalige installatie voor de productie en verwerking van thorium ligt er nu verlaten bij.\n[lightgray]Onderzoek thorium en de vele toepassingen ervoor.\n\nDe vijand is hier aanwezig in grote getalen, constant waakzaam voor aanvallers. +zone.tarFields.description = De randen van een olieveld, tussen de bergen en de woestijn. Een van de weinige plekken met bruikbare olie.\nOndanks dat het verlaten is, zijn er wel krachtige vijanden in de buurt. Onderschat ze niet.\n\n[lightgray]Onderzoek wat je verder allemaal met olie kan doen. +zone.desolateRift.description = Een zeer gevaarlijk gebied. Veel grondstoffen, maar weinig ruimte. Grote kans op verwoesting. Lanceer zo snel mogelijk. Word niet overmoedig door de lange tijd tussen de rondes. +zone.nuclearComplex.description = Een voormalige installatie voor de productie en verwerking van thorium ligt er nu verlaten bij.\n[lightgray]Onderzoek thorium en de vele toepassingen ervan.\n\nDe vijand is hier aanwezig in grote getalen, constant waakzaam voor aanvallers. zone.fungalPass.description = Een transitiegebied tussen de hogergelegen bergen en de lagergelegen, beschimmelde gebieden. Een kleine verkenningsbasis is hier gepositioneerd.\nVernietig het.\nGebruik Dolk en Kruiper units. Maak de twee cores onbruikbaar. zone.impact0078.description = zone.crags.description = @@ -803,27 +803,27 @@ liquid.water.name = Water liquid.slag.name = Slag liquid.oil.name = Olie liquid.cryofluid.name = Koelvloeistof -mech.alpha-mech.name = Alpha -mech.alpha-mech.weapon = Heavy Repeater +mech.alpha-mech.name = Alfa +mech.alpha-mech.weapon = Zwaar Machinegeweer mech.alpha-mech.ability = Drone Swarm mech.delta-mech.name = Delta mech.delta-mech.weapon = Arc Generator -mech.delta-mech.ability = Discharge +mech.delta-mech.ability = Ontlading mech.tau-mech.name = Tau mech.tau-mech.weapon = Restruct Laser mech.tau-mech.ability = Repair Burst mech.omega-mech.name = Omega mech.omega-mech.weapon = Swarm Missiles -mech.omega-mech.ability = Armored Configuration +mech.omega-mech.ability = Bepantserde Configuratie mech.dart-ship.name = Dart -mech.dart-ship.weapon = Repeater -mech.javelin-ship.name = Javelin +mech.dart-ship.weapon = Machinegeweer +mech.javelin-ship.name = Speer mech.javelin-ship.weapon = Burst Missiles mech.javelin-ship.ability = Discharge Booster -mech.trident-ship.name = Trident -mech.trident-ship.weapon = Bomb Bay +mech.trident-ship.name = Drietand +mech.trident-ship.weapon = Bommenruim mech.glaive-ship.name = Glaive -mech.glaive-ship.weapon = Flame Repeater +mech.glaive-ship.weapon = Vlammend Machinegeweer item.corestorable = [lightgray]Kan in de Core: {0} item.explosiveness = [LIGHT_GRAY]Explosivieit: {0}% item.flammability = [LIGHT_GRAY]Vlambaarheid: {0}% @@ -849,17 +849,17 @@ block.pebbles.name = Steentjes block.tendrils.name = Tendrils block.sandrocks.name = Zandsteen block.spore-pine.name = Sporenden -block.sporerocks.name = Spore Steens +block.sporerocks.name = Schimmelsteen block.rock.name = Steen block.snowrock.name = Sneeuwsteen block.snow-pine.name = Sneeuwden -block.shale.name = Shale -block.shale-boulder.name = Shale Boulder +block.shale.name = Schalie +block.shale-boulder.name = Schalie Kei block.moss.name = Mos -block.shrubs.name = Plantje +block.shrubs.name = Bosje block.spore-moss.name = Spore Moss block.shalerocks.name = Shale Steens -block.scrap-wall.name = Scrap Muur +block.scrap-wall.name = Oud ijzeren m block.scrap-wall-large.name = Large Scrap Muur block.scrap-wall-huge.name = Huge Scrap Muur block.scrap-wall-gigantic.name = Gigantic Scrap Muur @@ -911,7 +911,7 @@ block.dark-metal.name = Donker Metaal block.ignarock.name = Igna Steen block.hotrock.name = Lava Steen block.magmarock.name = Magma Steen -block.cliffs.name = Cliffs +block.cliffs.name = Rotswand block.copper-wall.name = Koperen Muur block.copper-wall-large.name = Grote Koperen Muur block.titanium-wall.name = Titanium Muur @@ -925,10 +925,10 @@ block.thorium-wall-large.name = Grote Thorium Muur block.door.name = Deur block.door-large.name = Grote Deur block.duo.name = Duo -block.scorch.name = Scorch -block.scatter.name = Scatter -block.hail.name = Hail -block.lancer.name = Lancer +block.scorch.name = Vlammenwerper +block.scatter.name = Strooier +block.hail.name = Hagel +block.lancer.name = Lansier block.conveyor.name = Lopende Band block.titanium-conveyor.name = Titanium Lopende Band block.armored-conveyor.name = Gepantserde Lopende Band @@ -942,15 +942,15 @@ block.message.name = Bericht block.illuminator.name = Lamp block.illuminator.description = Een kleine aanpasbare lamp, heef stroom nodig. block.overflow-gate.name = Overflow Gate -block.silicon-smelter.name = Silicon Smelter +block.silicon-smelter.name = Siliciumsmelter block.phase-weaver.name = Phase Weaver -block.pulverizer.name = Pulverizer +block.pulverizer.name = Vermorzelaar block.cryofluidmixer.name = Cryofluid Mixer -block.melter.name = Melter -block.incinerator.name = Verbrander -block.spore-press.name = Spore Press -block.separator.name = Separator -block.coal-centrifuge.name = Coal Centrifuge +block.melter.name = Smelter +block.incinerator.name = Verbrandingsoven +block.spore-press.name = Schimmelpers +block.separator.name = Afscheider +block.coal-centrifuge.name = Koolcentrifuge block.power-node.name = Stroompaal block.power-node-large.name = Grote Stroompaal block.surge-tower.name = Hoogspanningsmast @@ -959,12 +959,12 @@ block.battery.name = Batterij block.battery-large.name = Grote Batterij block.combustion-generator.name = Fossiele Generator block.turbine-generator.name = Turbine Generator -block.differential-generator.name = Differential Generator +block.differential-generator.name = Verschiltemperatuurgenerator block.impact-reactor.name = Impact Reactor -block.mechanical-drill.name = Mechanische Drill -block.pneumatic-drill.name = Pneumatische Drill -block.laser-drill.name = Laser Drill -block.water-extractor.name = Water Put +block.mechanical-drill.name = Mechanische Boor +block.pneumatic-drill.name = Pneumatische Boor +block.laser-drill.name = Lazerboor +block.water-extractor.name = Waterput block.cultivator.name = Cultivator block.dart-mech-pad.name = Dart Mech Pad block.delta-mech-pad.name = Delta Mech Pad @@ -983,7 +983,7 @@ block.power-void.name = Power Void block.power-source.name = Power Infinite block.unloader.name = Unloader block.vault.name = Kluis -block.wave.name = Wave +block.wave.name = Golf block.swarmer.name = Swarmer block.salvo.name = Salvo block.ripple.name = Ripple @@ -992,10 +992,10 @@ block.bridge-conveyor.name = Bridge Conveyor block.plastanium-compressor.name = Plastanium Compressor block.pyratite-mixer.name = Pyratite Mixer block.blast-mixer.name = Blast Mixer -block.solar-panel.name = Zonnepaneeltje -block.solar-panel-large.name = Zonnepaneel -block.oil-extractor.name = Olie put -block.command-center.name = Command Center +block.solar-panel.name = Zonnepaneel +block.solar-panel-large.name = Groot zonnepaneel +block.oil-extractor.name = Olieput +block.command-center.name = Commando centrum block.draug-factory.name = Draug Miner Drone Factory block.spirit-factory.name = Spirit Drone Factory block.phantom-factory.name = Phantom Drone Factory @@ -1011,23 +1011,23 @@ block.pulse-conduit.name = Pulse Conduit block.plated-conduit.name = Gepantserde Pijp block.phase-conduit.name = Phase Conduit block.liquid-router.name = Liquid Router -block.liquid-tank.name = Vloeistof Tank -block.liquid-junction.name = Vloeistof Kruising +block.liquid-tank.name = Vloeistoftank +block.liquid-junction.name = Vloeistofkruising block.bridge-conduit.name = Bridge Conduit block.rotary-pump.name = Rotary Pump -block.thorium-reactor.name = Thorium Reactor +block.thorium-reactor.name = Thoriumreactor block.mass-driver.name = Mass Driver block.blast-drill.name = Airblast Drill -block.thermal-pump.name = Thermal Pump -block.thermal-generator.name = Thermal Generator -block.alloy-smelter.name = Alloy Smelter +block.thermal-pump.name = Thermische Pomp +block.thermal-generator.name = Thermische Generator +block.alloy-smelter.name = Legering Smelterij block.mender.name = Mender block.mend-projector.name = Mend Projector block.surge-wall.name = Surge Muur block.surge-wall-large.name = Grote Surge Muur -block.cyclone.name = Cyclone -block.fuse.name = Fuse -block.shock-mine.name = Electrische Landmijn +block.cyclone.name = Cycloon +block.fuse.name = Zekering +block.shock-mine.name = Elektrische Landmijn block.overdrive-projector.name = Overdrive Projector block.force-projector.name = Krachtveld block.arc.name = Arc @@ -1035,8 +1035,8 @@ block.rtg-generator.name = RTG Generator block.spectre.name = Spectre block.meltdown.name = Meltdown block.container.name = Doos -block.launch-pad.name = Launch Pad -block.launch-pad-large.name = Large Launch Pad +block.launch-pad.name = Lanceerplatform +block.launch-pad-large.name = Groot Lanceerplatform team.blue.name = blauw team.crux.name = rood team.sharded.name = oranje diff --git a/core/assets/bundles/bundle_pt_BR.properties b/core/assets/bundles/bundle_pt_BR.properties index 38f865a38c..e1d1a5da56 100644 --- a/core/assets/bundles/bundle_pt_BR.properties +++ b/core/assets/bundles/bundle_pt_BR.properties @@ -941,7 +941,8 @@ block.inverted-sorter.name = Ordenador Invertido block.message.name = Mensagem block.illuminator.name = Iluminador block.illuminator.description = Uma pequena, compacta e configurável fonte de luz. Precisa de energia para funcionar. -block.overflow-gate.name = Portão Sobrecarregado +block.overflow-gate.name = Portão sobrecarregado +block.underflow-gate.name = Portão sobrecarregado invertido block.silicon-smelter.name = Fundidora de silicio block.phase-weaver.name = Palheta de fase block.pulverizer.name = Pulverizador @@ -978,7 +979,7 @@ block.mechanical-pump.name = Bomba Mecânica block.item-source.name = Criador de itens block.item-void.name = Destruidor de itens block.liquid-source.name = Criador de líquidos -block.liquid-void.name = Liquid Void +block.liquid-void.name = Destruidor de líquidos block.power-void.name = Anulador de energia block.power-source.name = Criador de energia block.unloader.name = Descarregador @@ -1049,7 +1050,7 @@ unit.draug.name = Drone minerador Draug unit.phantom.name = Drone Phantom unit.dagger.name = Dagger unit.crawler.name = Crawler -unit.titan.name = Titan +unit.titan.name = Titã unit.ghoul.name = Bombardeiro Ghoul unit.wraith.name = Lutador Wraith unit.fortress.name = Fortaleza @@ -1172,6 +1173,7 @@ block.inverted-sorter.description = Processes items like a standard sorter, but block.router.description = Aceita itens de uma direção e os divide em 3 direções igualmente. Util para espalhar materiais da fonte para multiplos alvos. block.distributor.description = Um roteador avancada que espalhas os itens em 7 outras direções igualmente. block.overflow-gate.description = Uma combinação de roteador e divisor Que apenas manda para a esquerda e Direita se a frente estiver bloqueada. +block.underflow-gate.description = O oposto de um portão de sobrecarga. Manda pra frente se a esquerda e a direita estiverem bloqueadas. block.mass-driver.description = Bloco de transporte de itens supremo. Coleta itens severos e atira eles em outro mass driver de uma longa distancia. block.mechanical-pump.description = Uma bomba barata com baixa saída de líquidos, mas sem consumo de energia. block.rotary-pump.description = Uma bomba avançada. Bombeia mais líquido, mas requer energia. @@ -1206,8 +1208,8 @@ block.blast-drill.description = A melhor mineradora. Requer muita energia. block.water-extractor.description = Extrai água subterrânea. Usado em locais sem água superficial disponível. block.cultivator.description = Cultiva pequenas concentrações de esporos na atmosfera em cápsulas prontas. block.oil-extractor.description = Usa altas quantidades de energia para extrair petróleo da areia. Use quando não tiver fontes de petróleo por perto. -block.core-shard.description = The first iteration of the core capsule. Once destroyed, all contact to the region is lost. Do not let this happen. -block.core-foundation.description = The second version of the core. Better armored. Stores more resources. +block.core-shard.description = A primeira iteração do núcleo. Uma vez destruído, todo o contato com a região é perdido. Não deixe isso acontecer. +block.core-foundation.description = A segunda versão do núcleo. Mais bem armadurado. Armazena mais recursos. block.core-nucleus.description = A terceira e ultima iteração do núcleo. Extremamente bem armadurada. Guarda quantidades massivas de recursos. block.vault.description = Carrega uma alta quantidade de itens. Usado para criar fontes Quando não tem uma necessidade constante de materiais. Um[LIGHT_GRAY] Descarregador[] pode ser usado para recuperar esses itens do container. block.container.description = Carrega uma baixa quantidade de itens. Usado para criar fontes Quando não tem uma necessidade constante de materiais. Um[LIGHT_GRAY] Descarregador[] pode ser usado para recuperar esses itens do container. diff --git a/core/assets/bundles/bundle_ru.properties b/core/assets/bundles/bundle_ru.properties index 1e7f44254e..01b7f33ff1 100644 --- a/core/assets/bundles/bundle_ru.properties +++ b/core/assets/bundles/bundle_ru.properties @@ -59,6 +59,7 @@ stat.built = Строений построено:[accent] {0} stat.destroyed = Строений уничтожено:[accent] {0} stat.deconstructed = Строений деконструировано:[accent] {0} stat.delivered = Ресурсов запущено: +stat.playtime = Время игры:[accent] {0} stat.rank = Финальный ранг: [accent]{0} launcheditems = [accent]Запущенные предметы @@ -104,6 +105,7 @@ mods.none = [LIGHT_GRAY]Модификации не найдены! mods.guide = Руководство по модам mods.report = Доложить об ошибке mods.openfolder = Открыть папку с модификациями +mod.display = [gray]Модификация:[orange] {0} mod.enabled = [lightgray]Включён mod.disabled = [scarlet]Выключен mod.disable = Выкл. @@ -133,7 +135,7 @@ noname = Для начала, придумайте[accent] себе имя[]. filename = Имя файла: unlocked = Новый контент разблокирован! completed = [accent]Завершено -techtree = Дерево технологий +techtree = Дерево\n технологий research.list = [lightgray]Исследуйте: research = Исследовать researched = [lightgray]{0} исследовано. @@ -170,6 +172,11 @@ hosts.discovering.any = Поиск игр server.refreshing = Обновление сервера hosts.none = [lightgray]Локальных игр не обнаружено! host.invalid = [scarlet]Не удаётся подключиться к хосту. + +servers.local = Локальные серверы +servers.remote = Удалённые серверы +servers.global = Глобальные серверы + trace = Отслеживать игрока trace.playername = Имя игрока: [accent]{0} trace.ip = IP: [accent]{0} @@ -344,7 +351,7 @@ editor.errorname = Карта не имеет имени. Может быть, editor.update = Обновить editor.randomize = Случайно editor.apply = Применить -editor.generate = Сгенерировать +editor.generate = Сгенери-\nровать editor.resize = Изменить\nразмер editor.loadmap = Загрузить\nкарту editor.savemap = Сохранить\nкарту @@ -669,7 +676,7 @@ setting.crashreport.name = Отправлять анонимные отчёты setting.savecreate.name = Автоматическое создание сохранений setting.publichost.name = Общедоступность игры setting.chatopacity.name = Непрозрачность чата -setting.playerlimit.name = Лимит игроков +setting.playerlimit.name = Ограничение игроков setting.lasersopacity.name = Непрозрачность лазеров энергоснабжения setting.bridgeopacity.name = Непрозрачность мостов setting.playerchat.name = Отображать облака чата над игроками diff --git a/core/assets/bundles/bundle_uk_UA.properties b/core/assets/bundles/bundle_uk_UA.properties index a5ffab3aed..5db7865d74 100644 --- a/core/assets/bundles/bundle_uk_UA.properties +++ b/core/assets/bundles/bundle_uk_UA.properties @@ -59,6 +59,7 @@ stat.built = Будівель збудувано:[accent] {0} stat.destroyed = Будівель знищено:[accent] {0} stat.deconstructed = Будівель деконструйовано:[accent] {0} stat.delivered = Ресурсів запущено: +stat.playtime = Час у грі:[accent] {0} stat.rank = Фінальний рахунок: [accent]{0} launcheditems = [accent]Запущені предмети @@ -171,6 +172,9 @@ hosts.discovering.any = Пошук ігор server.refreshing = Оновлення сервера hosts.none = [lightgray]Локальних ігр не знайдено host.invalid = [scarlet]Не вдалося під’єднатися до сервера. +servers.local = Локальні сервери +servers.remote = Віддалені сервери +servers.global = Глобальні сервери trace = Стежити за гравцем trace.playername = Ім’я гравця: [accent]{0} trace.ip = IP: [accent]{0} @@ -512,7 +516,7 @@ zone.crags.description = <вставити опис тут> settings.language = Мова settings.data = Ігрові дані -settings.reset =За замовчуванням +settings.reset = За замовчуванням settings.rebind = Змінити settings.resetKey = Скинути settings.controls = Керування @@ -628,7 +632,7 @@ setting.buildautopause.name = Автоматичне призупинення б setting.animatedwater.name = Анімована вода setting.animatedshields.name = Анімовані щити setting.antialias.name = Згладжування[lightgray] (потребує перезапуску)[] -setting.indicators.name = Показувати у сторону ворогів та союзників +setting.indicators.name = Показувати в бік ворогів та союзників setting.autotarget.name = Авто-стрільба setting.keyboard.name = Миш+Керування з клавіатури setting.touchscreen.name = Керування сенсорним екраном @@ -672,9 +676,9 @@ setting.publichost.name = Загальнодоступність гри setting.playerlimit.name = Обмеження гравців setting.chatopacity.name = Непрозорість чату setting.lasersopacity.name = Непрозорість лазерів енергопостачання -setting.bridgeopacity.name = Місткість мостів +setting.bridgeopacity.name = Непрозорість мостів setting.playerchat.name = Відображати хмару чата над гравцями -public.confirm = Ви хочете зробити цю гру загальнодоступною?\n[lightgray]Це можна змінити у Налаштування→Гра→Загальнодоступність гри +public.confirm = Ви хочете зробити цю гру загальнодоступною?\n[lightgray]Це можна змінити у Налаштування->Гра->Загальнодоступність гри public.beta = Зауважте, що в бета-версії гри ви не можете робити публічні ігри. uiscale.reset = Масштаб користувацького інтерфейсу було змінено.\nНатисніть «ОК» для підтвердження цього масштабу.\n[scarlet]Повернення налаштувань і вихід через[accent] {0}[] секунд… uiscale.cancel = Скасувати & Вийти @@ -771,7 +775,7 @@ rules.wavespacing = Інтервал хвиль:[lightgray] (секунди) rules.buildcostmultiplier = Множник затрат на будування rules.buildspeedmultiplier = Множник швидкості будування rules.waitForWaveToEnd = Хвилі чекають на смерть усіх ворогів -rules.dropzoneradius = Радіус зони висадки:[lightgray] (плитки) +rules.dropzoneradius = Радіус зони висадки:[lightgray] (у плитках) rules.respawns = Максимальна кількість відроджень за хвилю rules.limitedRespawns = Обмеження відроджень rules.title.waves = Хвилі @@ -780,7 +784,7 @@ rules.title.resourcesbuilding = Ресурси & будування rules.title.player = Гравці rules.title.enemy = Вороги rules.title.unit = Бойові одиниці -rules.title.experimental = Есперементальне! +rules.title.experimental = Експериментальне rules.lighting = Світлотінь rules.ambientlight = Навколишнє світло @@ -831,18 +835,18 @@ mech.trident-ship.weapon = Бомби mech.glaive-ship.name = Спис mech.glaive-ship.weapon = Вогняний кулемет item.corestorable = [lightgray]Зберігання в ядрі: {0} -item.explosiveness = [lightgray]Вибухонебезпечність: {0}% -item.flammability = [lightgray]Вогненебезпечність: {0}% -item.radioactivity = [lightgray]Радіоактивність: {0}% +item.explosiveness = [lightgray]Вибухонебезпечність: {0} % +item.flammability = [lightgray]Вогненебезпечність: {0} % +item.radioactivity = [lightgray]Радіоактивність: {0} % unit.health = [lightgray]Здоров’я: {0} unit.speed = [lightgray]Швидкість: {0} mech.weapon = [lightgray]Зброя: {0} mech.health = [lightgray]Здоров’я: {0} mech.itemcapacity = [lightgray]Місткість елементів: {0} -mech.minespeed = [lightgray]Швидкість видобутку: {0}% +mech.minespeed = [lightgray]Швидкість видобутку: {0} % mech.minepower = [lightgray]Потужність видобутку: {0} mech.ability = [lightgray]Здібність: {0} -mech.buildspeed = [lightgray]Швидкість будування: {0}% +mech.buildspeed = [lightgray]Швидкість будування: {0} % liquid.heatcapacity = [lightgray]Теплоємність: {0} liquid.viscosity = [lightgray]В’язкість: {0} liquid.temperature = [lightgray]Температура: {0} @@ -875,7 +879,7 @@ block.graphite-press.name = Графітний прес block.multi-press.name = Мульти-прес block.constructing = {0}\n[lightgray](В процесі) block.spawn.name = Місце появи ворога -block.core-shard.name = Ядро «Осколок» +block.core-shard.name = Ядро «Уламок» block.core-foundation.name = Ядро «Штаб» block.core-nucleus.name = Ядро «Атом» block.deepwater.name = Глибоководдя @@ -947,8 +951,8 @@ block.inverted-sorter.name = Зворотній сортувальник block.message.name = Повідомлення block.illuminator.name = Освітлювач block.illuminator.description = Невелике, компактне, джерело світла, яку можна налаштувати. Для роботи потребує енергії. -block.overflow-gate.name = Надмірний затвір -block.underflow-gate.name = Інвертований затвір +block.overflow-gate.name = Надмірний затвор +block.underflow-gate.name = Недостатній затвор block.silicon-smelter.name = Кремнієвий плавильний завод block.phase-weaver.name = Фазовий ткач block.pulverizer.name = Подрібнювач @@ -964,9 +968,9 @@ block.surge-tower.name = Кінетична вежа block.diode.name = Діод block.battery.name = Акумулятор block.battery-large.name = Великий акумулятор -block.combustion-generator.name = Генератор горіння +block.combustion-generator.name = Генератор згорання block.turbine-generator.name = Паровий генератор -block.differential-generator.name = Диференціальний генератор +block.differential-generator.name = Диференційний генератор block.impact-reactor.name = Імпульсний реактор block.mechanical-drill.name = Механічний дриль block.pneumatic-drill.name = Пневматичний дриль @@ -997,7 +1001,7 @@ block.ripple.name = Ряб block.phase-conveyor.name = Фазовий конвеєр block.bridge-conveyor.name = Мостовий конвеєр block.plastanium-compressor.name = Пластинієвий компресор -block.pyratite-mixer.name = Змішувач піротита +block.pyratite-mixer.name = Змішувач піротиту block.blast-mixer.name = Мішалка вибухонебезпечного з’єднання block.solar-panel.name = Сонячна панель block.solar-panel-large.name = Велика сонячна панель @@ -1029,19 +1033,19 @@ block.thermal-pump.name = Тепловий насос block.thermal-generator.name = Тепловий генератор block.alloy-smelter.name = Сплавовий завод block.mender.name = Регенератор -block.mend-projector.name = Відновлювальна установка +block.mend-projector.name = Великий регенератор block.surge-wall.name = Кінетична стіна block.surge-wall-large.name = Велика кінетична стіна block.cyclone.name = Циклон block.fuse.name = Підривник -block.shock-mine.name = Шокуюча міна -block.overdrive-projector.name = Швидкісна пускова установка -block.force-projector.name = Силова пускова установка +block.shock-mine.name = Міна +block.overdrive-projector.name = Пришвидшувач +block.force-projector.name = Силове поле block.arc.name = Дуга block.rtg-generator.name = Радіоізотопний термоелектричний генератор block.spectre.name = Спектр block.meltdown.name = Розплавлювач -block.container.name = Склад +block.container.name = Сховище block.launch-pad.name = Стартовий майданчик block.launch-pad-large.name = Великий стартовий майданчик team.blue.name = Синя @@ -1060,8 +1064,8 @@ unit.titan.name = Титан unit.ghoul.name = Ґуль unit.wraith.name = Примара unit.fortress.name = Фортеця -unit.revenant.name = Потойбічний вбивця -unit.eruptor.name = Вивиргатель +unit.revenant.name = Потойбічний убивця +unit.eruptor.name = Вивергатель unit.chaos-array.name = Масив хаосу unit.eradicator.name = Викорінювач unit.lich.name = Лич @@ -1089,15 +1093,15 @@ tutorial.waves.mobile = [lightgray] Ворог[] з’явився.\n\nЗахи tutorial.launch = Як тільки ви досягнете певної хвилі, ви зможете[accent] запустити ядро[], залишивши свою базу позаду, та [accent]отримати всі ресурси у вашому ядрі.[]\nЦі отримані ресурси можуть бути використані для дослідження нових технологій.\n\n[accent]Натисніть кнопку запуску. item.copper.description = Початковий будівельний матеріал. Широко використовується у всіх типах блоків. -item.lead.description = Основний стартовий матеріал. Широко застосовується в електроніці та у транспортуванні рідин. +item.lead.description = Основний початковий матеріал. Широко застосовується в електроніці та у транспортуванні рідин. item.metaglass.description = Дуже жорсткий склад скла. Широко застосовується для розподілу та зберігання рідини. item.graphite.description = Мінералізований вуглець, що використовується для боєприпасів та як електричний компонент. item.sand.description = Поширений матеріал, який широко використовується при виплавці, як при сплавленні, так і в якості відходів. -item.coal.description = Окам’янілі рослинні речовини, що утворюються задовго до посіву. Широко використовується для виробництва пального та ресурсів. +item.coal.description = Окам’янілі рослинні речовини, що утворилися задовго до посіву. Широко використовується для виробництва пального та ресурсів. item.titanium.description = Рідкісний надлегкий метал, який широко використовується для транспортування рідини, бурів і літаків. item.thorium.description = Щільний радіоактивний метал, що використовується в якості конструкційної опори та ядерного палива. item.scrap.description = Залишки старих споруд та підрозділів. Містить мікроелементи багатьох різних металів. -item.silicon.description = Надзвичайно корисний напівпровідник. Має застосування в сонячних батареях, складній електроніці та баштових боєприпасах. +item.silicon.description = Надзвичайно корисний напівпровідник. Має застосування в сонячних батареях, складній електроніці та боєприпасах для башт. item.plastanium.description = Легкий пластичний матеріал, що використовується в сучасних літальних апаратах та у фрагментованих боєприпасах. item.phase-fabric.description = Майже невагома речовина, що застосовується в передовій електроніці та у технології самовідновлення. item.surge-alloy.description = Удосконалений сплав з унікальними електричними властивостями. @@ -1106,137 +1110,137 @@ item.blast-compound.description = Нестабільна сполука, яка item.pyratite.description = Надзвичайно легкозаймиста речовина, що використовується в запальній зброї. liquid.water.description = Найкорисніша рідина. Зазвичай використовується для охолодження машин та переробки відходів. liquid.slag.description = Різні види розплавленого металу змішуються між собою. Може бути відокремлений від складових корисних копалин або розпорошений на ворожі частини як зброя. -liquid.oil.description = Рідина, яка використовується у виробництві сучасних матеріалів. Може бути перетворена в вугілля в якості палива або використана як куля. -liquid.cryofluid.description = Інертна, не роз’їдаюча рідина, створена з води та титану. Володіє надзвичайно високою пропускною спроможністю. Широко використовується в якості охолоджуючої рідини. -mech.alpha-mech.description = Стандартний керований мех. Заснований на бойовій одиниці «Кинджал», з оновленими бронею та можливостями будування. Наносить більше шкоди, ніж «Дротик». +liquid.oil.description = Рідина, яка використовується у виробництві сучасних матеріалів. Може бути перетворена у вугілля в якості палива або використана як куля. +liquid.cryofluid.description = Інертна рідина, що створена з води та титану. Володіє надзвичайно високою пропускною спроможністю. Широко використовується в якості рідини, що охолоджує. +mech.alpha-mech.description = Стандартний керований мех. Заснований на бойовій одиниці «Кинджал», з оновленими бронею та можливостями будування. Наносить більше шкоди, ніж корабель «Дротик». mech.delta-mech.description = Швидкий, легкоброньований мех, зроблений для тактики «атакуй і втікай». Наносить мало шкоди будівлям, але може дуже швидко вбити великі групи підрозділів противника своєю дуговою блискавкою. mech.tau-mech.description = Мех підтримки. Ремонтує союзні блоки, стріляючи по них. Може зцілювати союзників у радіусі його ремонтної здатності. -mech.omega-mech.description = Об’ємний і добре броньований мех, зроблений для фронтових штурмів. Його броня може перекрити до 90% пошкоджень, що надходять. -mech.dart-ship.description = Стандартний корабель управління. Швидко видобуває ресурси. Достатньо швидкий і легкий, але має мало наступальних можливостей. +mech.omega-mech.description = Об’ємний і добре броньований мех, зроблений для фронтових штурмів. Його броня може заблокувати до 90% пошкоджень, що надходять. +mech.dart-ship.description = Стандартний керований корабель. Швидко видобуває ресурси. Достатньо швидкий і легкий, але має мало наступальних можливостей. mech.javelin-ship.description = Корабель, який використовується для стратегії «атакуй та втікай». Хоча спочатку він повільний, потім вже може розганятися до великих швидкостей і літати над ворожими форпостами, завдаючи великої кількості шкоди своїми блискавками та ракетами. mech.trident-ship.description = Важкий бомбардувальник, побудований для будування та знищення ворожих укріплень. Дуже добре броньований. -mech.glaive-ship.description = Великий, добре броньований бойовий корабель. Оснащений запальним ретранслятором. Високо маневрений. -unit.draug.description = Примітивний дрон, який добуває ресурси. Дешевий для виробництва. Автоматично видобуває мідь і свинець поблизу. Доставляє видобуті ресурси до найближчого ядра. -unit.spirit.description = Модифікований «Драугр», призначений для ремонту замість видобутку. Автоматично відновлює будь-які пошкоджені блоки. -unit.phantom.description = Вдосконалений безпілотник. Йде за користувачами. Допомагає в будуванні блоків. -unit.dagger.description = Базовий мех(бойова одиниця). Дешевий у виробництві. Нездоланні при використанні в натовпі. -unit.crawler.description = Наземна одиниця, що складається зі стертої рами з високими вибуховими речовинами, прив’язаними зверху. Не особливо міцний. Вибухає при контакті з ворогами. -unit.titan.description = Вдосконалений броньований наземний блок. Нападає як на наземні, так і повітряні цілі. Оснащений двома мініатюрними вогнеметами класу Випалювач. +mech.glaive-ship.description = Великий і добре броньований бойовий корабель. Оснащений запальним ретранслятором. Високо маневрений. +unit.draug.description = Примітивний дрон, який добуває ресурси. Дешевий у виробництві. Автоматично видобуває мідь і свинець поблизу. Доставляє видобуті ресурси до найближчого ядра. +unit.spirit.description = Модифікований «Драугр», призначений для ремонту замість добування ресурсів. Автоматично відновлює будь-які пошкоджені блоки. +unit.phantom.description = Удосконалений безпілотник. Йде за користувачами і допомагає в будуванні блоків. +unit.dagger.description = Початкова бойова одиниця. Дешевий у виробництві. Нездоланні при використанні в натовпі. +unit.crawler.description = Наземна одиниця, що складається зі стертої рами з високими вибуховими речовинами, які прив’язані зверху. Не особливо міцний. Вибухає при контакті з ворогами. +unit.titan.description = Удосконалений броньована наземна одиниця. Нападає як на наземні, так і повітряні цілі. Оснащений двома мініатюрними вогнеметами класу «Випалювач». unit.fortress.description = Артилерійний мех. Оснащений двома модифікованими гарматами типу «Град» для дальнього нападу на ворожі структури та підрозділи. -unit.eruptor.description = Важкий мех, призначеней для знесення конструкцій. Вистрілює потік шлаків у ворожі укріплення, розплавляючи їх і підпалюючи летючі речовини. -unit.wraith.description = Швидкий перехоплювач, який використовується для тактики «атакуй і втікай». Пріоритет — генератори енергії. -unit.ghoul.description = Важкий килимовий бомбардувальник. Пробиває ворожі структури, орієнтуючись на віжливу інфраструктуру. +unit.eruptor.description = Важкий мех, що призначений для знесення конструкцій. Вистрілює потік шлаку у ворожі укріплення, розплавляє їх і підпалює леткі речовини. +unit.wraith.description = Швидкий перехоплювач, який використовує тактику «атакуй і втікай». Пріоритет — генератори енергії. +unit.ghoul.description = Важкий килимовий бомбардувальник. Пробиває ворожі структури, орієнтуючись на важливу інфраструктуру. unit.revenant.description = Важкий ракетний масив. -block.message.description = Зберігає повідомлення. Використовується для комунікаціх між союзниками. +block.message.description = Зберігає повідомлення. Використовується для комунікації між союзниками. block.graphite-press.description = Стискає шматки вугілля в чисті аркуші графіту. block.multi-press.description = Модернізована версія графітового преса. Використовує воду та енергію для швидкої та ефективної переробки вугілля. block.silicon-smelter.description = Змішує пісок з чистим вугіллям. Виробляє кремній. block.kiln.description = Виплавляє пісок та свинець у сполуку, відому як метаскло. Для запуску потрібна невелика кількість енергії. block.plastanium-compressor.description = Виробляє пластаній з нафти і титану. -block.phase-weaver.description = Синтезує фазову тканину з радіоактивного торію та піску. Для функціонування потрібна велика кількість енергії. +block.phase-weaver.description = Синтезує фазову тканину з радіоактивного торію та піску. Для роботи потрібна велика кількість енергії. block.alloy-smelter.description = Поєднує титан, свинець, кремній і мідь для отримання кінетичного сплаву. block.cryofluidmixer.description = Змішує воду і дрібний порошок титану титану в кріогенну рідину. Основне використання у торієвому реактору. -block.blast-mixer.description = Подрібнює і змішує скупчення спор з піратитом для отримання вибухової суміші. -block.pyratite-mixer.description = Змішує вугілля, свинець та пісок у легкозаймистий піратит. +block.blast-mixer.description = Подрібнює і змішує скупчення спор з піротитом для отримання вибухової суміші. +block.pyratite-mixer.description = Змішує вугілля, свинець та пісок у легкозаймистий піротит. block.melter.description = Розплавляє брухт у шлак для подальшої переробки або використання у баштах «Хвиля». block.separator.description = Відокремлює шлак на його мінеральні компоненти. Виводить охолоджений результат. block.spore-press.description = Стискає спорові стручки під сильним тиском для синтезу нафти. -block.pulverizer.description = Подрібнює брухт дрібного піску. +block.pulverizer.description = Подрібнює брухт у дрібний пісок. block.coal-centrifuge.description = Нафта перетворюється у шматки вугілля. block.incinerator.description = Випаровує будь-який зайвий предмет або рідину, які він отримує. block.power-void.description = Знищує будь-яку енергію, до якої він під’єднаний. Тільки пісочниця -block.power-source.description = Нескінченно виводить енергію. -block.item-source.description = Нескінченно виводить предмети. -block.item-void.description = Знищує будь-які предмети. -block.liquid-source.description = Нескінченно виводить рідини. -block.liquid-void.description = Removes any liquids. Sandbox only. -block.copper-wall.description = Дешевий захисний блок.\nКорисна для захисту ядра та башти у перші кілька хвиль. -block.copper-wall-large.description = Дешевий захисний блок.\nКорисна для захисту ядра та башт у перші кілька хвиль.\nОхоплює кілька плиток. +block.power-source.description = Нескінченно виводить енергію. Тільки пісочниця. +block.item-source.description = Нескінченно виводить предмети. Тільки пісочниця. +block.item-void.description = Знищує будь-які предмети. Тільки пісочниця. +block.liquid-source.description = Нескінченно виводить рідини. Тільки пісочниця. +block.liquid-void.description = Видаляє будь-які рідини. Тільки пісочниця. +block.copper-wall.description = Дешевий захисний блок.\nКорисний для захисту ядра та башти у перші кілька хвиль. +block.copper-wall-large.description = Дешевий захисний блок.\nКорисний для захисту ядра та башт у перші кілька хвиль.\nЗаймає декілька плиток. block.titanium-wall.description = Відносно сильний захисний блок.\nЗабезпечує помірний захист від ворогів. -block.titanium-wall-large.description = Відносно сильний захисний блок.\nЗабезпечує помірний захист від ворогів.\nОхоплює кілька плиток. +block.titanium-wall-large.description = Відносно сильний захисний блок.\nЗабезпечує помірний захист від ворогів.\nЗаймає декілька плиток. block.plastanium-wall.description = Особливий тип стіни, який поглинає електричні дуги і блокує автоматичні з'єднання енергетичних вузлів. -block.plastanium-wall-large.description = Особливий тип стіни, який поглинає електричні дуги і блокує автоматичні з'єднання вузлів живлення.\nОхоплює кілька плиток. +block.plastanium-wall-large.description = Особливий тип стіни, який поглинає електричні дуги і блокує автоматичні з'єднання енергетичних вузлів .\nЗаймає декілька плиток. block.thorium-wall.description = Сильний захисний блок.\nГідний захист від ворогів. -block.thorium-wall-large.description = Сильний захисний блок.\nГідний захист від ворогів.\nОхоплює кілька плиток. -block.phase-wall.description = Стіна, покрита спеціальним світловідбиваючим складом, який базується на фазовій тканині. Відхиляє більшість куль при ударі. -block.phase-wall-large.description = Стіна, покрита спеціальним світловідбиваючим складом, який базується на фазовій тканині. Відхиляє більшість куль при ударі.\nОхоплює кілька плиток. +block.thorium-wall-large.description = Сильний захисний блок.\nГідний захист від ворогів.\nЗаймає декілька плиток. +block.phase-wall.description = Стіна має покриття спеціальним складом, що відбиває світло і який базується на фазовій тканині. Відхиляє більшість куль при ударі. +block.phase-wall-large.description = Стіна має покриття спеціальним складом, що відбиває світло і який базується на фазовій тканині. Відхиляє більшість куль при ударі.\nЗаймає декілька плиток. block.surge-wall.description = Надзвичайно міцний захисний блок.\nЗбільшує заряд при контакті з кулями, вивільняючи його випадковим чином. -block.surge-wall-large.description = Надзвичайно міцний захисний блок.\nЗбільшує заряд при контакті з кулями, вивільняючи його випадковим чином.\nОхоплює кілька плиток. +block.surge-wall-large.description = Надзвичайно міцний захисний блок.\nЗбільшує заряд при контакті з кулями, вивільняючи його випадковим чином.\nЗаймає декілька плиток. block.door.description = Невеликі двері. Можна відкрити або закрити, натиснувши. -block.door-large.description = Великі двері. Можна відкрити або закрити, натиснувши.\nОхоплює кілька плиток. +block.door-large.description = Великі двері. Можна відкрити чи закрити, натиснувши.\nЗаймає декілька плиток. block.mender.description = Періодично ремонтує блоки у його радіусі дії. Захищає башти та стіни.\nЗа бажанням, можна використати кремній для підвищення дальності та ефективності. -block.mend-projector.description = Покращена версія «Регенератора». Періодично ремонтує блоки у його радіусі дії.\nЗа бажанням, можна використати фазова тканина для підвищення дальності та ефективності. -block.overdrive-projector.description = Збільшує швидкість прилеглих будівель.\nЗа бажанням, можна використати фазова тканина для підвищення дальності та ефективності. +block.mend-projector.description = Покращена версія «Регенератора». Періодично ремонтує блоки у його радіусі дії.\nЗа бажанням, можна використати фазову тканину для підвищення дальності та ефективності. +block.overdrive-projector.description = Збільшує швидкість найближчих будівель.\nЗа бажанням, можна використати фазову тканину для підвищення радіусу дії та ефективності. block.force-projector.description = Створює навколо себе шестикутне силове поле, захищаючи будівлі та блоки всередині від пошкоджень.\nПерегрівається, якщо завдано занадто великої шкоди. За бажанням, можна використати теплоносій для запобігання перегріву. Для збільшення розміру щита можна використовувати фазову тканину. -block.shock-mine.description = Пошкоджує ворогів, наступаючи на міну. Майже невидимий для ворога. +block.shock-mine.description = Пошкоджує ворогів, коли вони наступають на міну. Майже невидима для ворога. block.conveyor.description = Базовий транспортний блок. Переміщує елементи вперед і автоматично перетворює їх у блоки. Можна обертати. block.titanium-conveyor.description = Покращений блок транспорту елементів. Переміщує предмети швидше, ніж звичайні конвеєри. block.junction.description = Діє як міст для двох перехресних конвеєрних стрічок. Корисно в ситуаціях, коли два різних конвеєри перевозять різні матеріали в різні місця. block.bridge-conveyor.description = Покращений блок транспорту елементів. Дозволяє транспортувати предмети до 3-ох плиток з будь-якої місцевості чи будівлі. block.phase-conveyor.description = Покращений блок транспорту елементів. Використовує енергію для телепортування елементів на під’єднаний фазовий конвеєр через кілька плиток. -block.sorter.description = Сортує предмети. Якщо елемент відповідає вибраному, його можна передати. В іншому випадку елемент виводиться зліва та справа. +block.sorter.description = Сортує предмети. Якщо елемент відповідає вибраному, його можна передати. В іншому випадку елемент виводиться зліва та/чи справа. block.inverted-sorter.description = Обробляє елементи, як звичайний сортувальник, але виводить обрані елементи на сторони. block.router.description = Приймає елементи з одного напрямку та виводить їх до трьох інших напрямків порівну. Корисно для поділу матеріалів від одного джерела до кількох цілей.\n\n[scarlet]Ніколи не використовуйте поруч із входами до механізмів, оскільки вони будуть забиті вихідними предметами.[] -block.distributor.description = Розширений маршрутизатор. Розділяє предмети до 7 інших напрямків порівну. -block.overflow-gate.description = Виходи лише вліво і вправо, якщо передній шлях заблокований. -block.underflow-gate.description = Повна протилежність надмірному затвору. Виводить предмет прямо, якщо лівий і/чи правий шлях заблоковано. -block.mass-driver.description = Кінцевий елемент транспортного блоку. Збирає кілька предметів, а потім вистрілює їх до іншої електромагнитної катапульти на великій відстані. Для роботи потрібна енергія. -block.mechanical-pump.description = Недорогий насос з повільним виходом, але без енергоспоживання. +block.distributor.description = Поліпшений маршрутизатор. Розділяє предмети до 7 інших напрямків порівну. +block.overflow-gate.description = Вивантажує лише вліво та/або вправо, якщо передній шлях заблокований. +block.underflow-gate.description = Повна протилежність надмірному затвору. Виводить предмет прямо, якщо лівий та/або правий шлях заблоковано. +block.mass-driver.description = Найкращий блок для транспортування предметів. Збирає кілька предметів, а потім вистрілює їх до іншої електромагнітної катапульти на велику відстань. Для роботи потребує енергія. +block.mechanical-pump.description = Дешевий насос з повільним виходом, але не потребує енергоспоживання. block.rotary-pump.description = Удосконалений насос. Насоси більше викачують, але потребують енергію. block.thermal-pump.description = Найкращий насос. block.conduit.description = Основний блок транспортування рідини. Пересуває рідини вперед. Застосовується спільно з насосами та іншими трубопроводами. -block.pulse-conduit.description = Вдосконалений блок транспортування рідини. Транспортує рідини швидше і зберігає більше, ніж стандартні трубопроводи. -block.plated-conduit.description = Переміщує рідини з тією ж швидкістю, як і імпульсні трубопроводи, але має більше міцності. Не приймає рідин з боків окрім інших трубопроводів.\nПротікає менше. +block.pulse-conduit.description = Удосконалений блок транспортування рідини. Швидше транспортує і більше зберігає рідини , ніж стандартні трубопроводи. +block.plated-conduit.description = Переміщує рідини з тією ж швидкістю, що і імпульсні трубопроводи, але має більше міцності. Не приймає рідин з боків окрім інших трубопроводів.\nПротікає менше. block.liquid-router.description = Приймає рідини з одного напрямку та виводить їх до трьох інших напрямків порівну. Також можна зберігати певну кількість рідини. Корисно для розщеплення рідин від одного джерела до кількох мішеней. block.liquid-tank.description = Зберігає велику кількість рідини. Використовуйте для створення буферів у ситуаціях з непостійним попитом на матеріали або як гарантію охолодження життєво важливих блоків. -block.liquid-junction.description = Діє як міст для двох каналів перетину. Корисно в ситуаціях, коли два різні трубопроводи перевозять різні рідини в різні місця. -block.bridge-conduit.description = Розширений блок транспортування рідини. Дозволяє транспортувати рідину до 3 плиток будь-якої місцевості чи будівлі. -block.phase-conduit.description = Розширений блок транспортування рідини. Використовує енергію для транспортування рідин до приєднаного фазового каналу через декілька плиток. +block.liquid-junction.description = Діє як міст для двох каналів, що перетинаються. Корисно в ситуаціях, коли два різні трубопроводи транспортують різні рідини в різні місця. +block.bridge-conduit.description = Удосконалений блок транспортування рідини. Дозволяє транспортувати рідину до 3 плиток будь-якої місцевості чи будівлі. +block.phase-conduit.description = Удосконалений блок транспортування рідини. Використовує енергію для транспортування рідин до приєднаного фазового каналу через декілька плиток. block.power-node.description = Передає живлення на приєднані вузли. Вузол буде отримувати живлення від будь-яких сусідніх блоків або подавати живлення до них. -block.power-node-large.description = Удосконалений вузол живлення з більшим діапазоном. -block.surge-tower.description = Надзвичайно дальний вузол живлення з меншою кількістю доступних з’єднань. +block.power-node-large.description = Поліпшений вузол живлення з більшим радіусом дії. +block.surge-tower.description = Вузол живлення з меншою кількістю доступних з’єднань і з найбільшим радіусом дії. block.diode.description = Живлення акумулятора може протікати через цей блок лише в одному напрямку, але лише в тому випадку, якщо інша сторона має менше енергії. block.battery.description = Зберігає енергію як буфер в часи надлишкової енергії. Виводить енергію у періоди дефіциту. block.battery-large.description = Зберігає набагато більше енергії, ніж звичайний акумулятор. block.combustion-generator.description = Виробляє енергію, спалюючи легкозаймисті матеріали, такі як вугілля. block.thermal-generator.description = Генерує енергію при розміщенні в спекотних місцях. block.turbine-generator.description = Удосконалений генератор згоряння. Більш ефективний, але потребує додаткової води для отримання пари. -block.differential-generator.description = Удосконалений генератор згоряння. Більш ефективна, але вимагає додаткової води для генерування пари. Виробляє велику кількість енергії. Використовує різницю температур між кріогеннВиробляє значну кількість енергії з торію. Вимагає постійного охолодження. Вибухне сильно, якщо подаватиметься недостатньо кількості теплоносія. Вихідна потужність залежить від повноти, базова енергія генерується на повній потужності.ою рідиною і піратитом, що горить. -block.rtg-generator.description = Простий, надійний генератор. Використовує тепло радіоактивних сполук, які розкладаються, для отримання енергії з повільною швидкістю. +block.differential-generator.description = Удосконалений генератор згоряння. Використовує різницю температур між кріогенною рідиною і піротитом, що горить. +block.rtg-generator.description = Простий і надійний генератор. Використовує тепло радіоактивних сполук, які розкладаються, для отримання енергії з повільною швидкістю. block.solar-panel.description = Забезпечує невелику кількість енергії від сонця. block.solar-panel-large.description = Значно ефективніша версія стандартної сонячної панелі. -block.thorium-reactor.description = Виробляє значну кількість енергії з торію. Вимагає постійного охолодження. Вибухне сильно, якщо подаватиметься недостатньо кількості теплоносія. Вихідна потужність залежить від повноти, базова потужність генерується на повній потужності. +block.thorium-reactor.description = Виробляє значну кількість енергії з торію. Вимагає постійного охолодження. Сильно вибухне, якщо подаватиметься недостатня кількість теплоносія. Вихідна потужність залежить від заповненості, базова потужність генерується на повній потужності. block.impact-reactor.description = Удосконалений генератор, здатний створювати величезну кількість енергії при максимальній ефективності. Для запуску процесу потрібно значні обсяги енергії. -block.mechanical-drill.description = Недорогий бур. Розміщуючи їх на відповідних плитках, виводить предмети повільним темпом нескінченно. Здатний видобувати лише мідь, свинець і вугілля. -block.pneumatic-drill.description = Вдосконалений бур, здатний добувати титан. Шахти швидше, ніж механічна дриль. -block.laser-drill.description = Дозволяє виконувати свердління ще швидше за допомогою лазерної технології, але вимагає енергії. Здатний до видобутку торію. -block.blast-drill.description = Кінцева дриль. Потрібна велика кількість енергії. +block.mechanical-drill.description = Недорогий бур. Якщо розмістити на доречних плитках, то буде виводити предмети повільним темпом нескінченно. Здатний видобувати мідь, свинець і вугілля. +block.pneumatic-drill.description = Поліпшений бур, здатний добувати титан. Видобуває швидше, ніж механічний бур. +block.laser-drill.description = Дозволяє виконувати буріння ще швидше за допомогою лазерної технології, але вимагає енергії. Здатний до видобутку торію. +block.blast-drill.description = Найкращий бур. Потрібна велика кількість енергії. block.water-extractor.description = Видобуває підземні води. Використовується в місцях, де немає поверхневої води. block.cultivator.description = Культивує невеликі концентрації спор в атмосфері на готові до промисловості стручки. block.oil-extractor.description = Для видобутку нафти використовується велика кількість енергії, піску та води. -block.core-shard.description = Перша ітерація капсули ядра. Після знищення всі контакти з регіоном втрачаються. Не допускайте цього. -block.core-foundation.description = Друга версія ядра. Краще броньований. Зберігає більше ресурсів. -block.core-nucleus.description = Третя і остання ітерація капсули ядра. Надзвичайно добре броньований. Зберігає величезні обсяги ресурсів. +block.core-shard.description = Найперша версія капсули ядра. Після його знищення всі контакти з регіоном втрачаються. Не допустіть цього. +block.core-foundation.description = Друга версія ядра. Краще броньована. Зберігає більше ресурсів. +block.core-nucleus.description = Третя і остання версія капсули ядра. Надзвичайно добре броньована. Зберігає величезні обсяги ресурсів. block.vault.description = Зберігає велику кількість предметів кожного типу. Блок розвантажувача може використовуватися для отримання предметів із сховища. -block.container.description = Зберігає велику кількість предметів кожного типу. Блок розвантажувача може використовуватися для отримання предметів із сховища. +block.container.description = Зберігає малу кількість предметів кожного типу. Блок розвантажувача може використовуватися для отримання предметів із сховища. block.unloader.description = Вивантажує предмети з блока, який не переміщує предмети, на конвеєр або безпосередньо в сусідній блок. Тип предмета для завантаження можна змінити, натиснувши на блок. -block.launch-pad.description = Запускає партії предметів без необхідності запуску ядра. -block.launch-pad-large.description = Покращена версія стартового майданчика. Зберігає більше предметів. Запускається частіше. -block.duo.description = Невелика дешева башта. Корисна проти наземних одиниць. +block.launch-pad.description = Запускає партії предметів без необхідності запуску ядра. Стартовий майданчик дозволяє вам запускати ресурси кожні n секунд без необхідності завершувати гру. Просто подайте у нього ресурси і забезпечте енергією. +block.launch-pad-large.description = Поліпшена версія стартового майданчика. Зберігає більше предметів. Запускається частіше. +block.duo.description = Мала і дешева башта. Корисна проти наземних одиниць. block.scatter.description = Основна протиповітряна башта. Розпилює грудочки свинцю або металобрухту у ворогів. -block.scorch.description = Спалює будь-яких наземних ворогів поблизу. Висока ефективність на близькій відстані. -block.hail.description = Невелика артилерійська башта далекої дальності. -block.wave.description = Вежа середньої величини. Стріляє потоками рідини в ворогів. Автоматично гасить пожежі при постачанні води. -block.lancer.description = Лазерна башта середнього розміру проти наземних ворогів. Заряджає і вистрілює потужні пучки енергії. -block.arc.description = Невелика електрична башта ближнього замикання. Стріляє дугами електрики у ворогів. -block.swarmer.description = Ракетна башта середнього розміру. Атакує як повітряних, так і наземних ворогів. Запускад самонаведені ракети. +block.scorch.description = Підпалює будь-яких наземних ворогів поблизу. Високоефективна на близькій відстані. +block.hail.description = Невелика артилерійська башта з далеким радіусом дії. +block.wave.description = Башта середнього розміру. Стріляє потоками рідини в ворогів. Автоматично гасить пожежі при постачанні води. +block.lancer.description = Лазерна башта середнього розміру, яка атакує наземних ворогів. Заряджає і вистрілює потужні пучки енергії. +block.arc.description = Невелика електрична башта з малим радіусом дії. Стріляє дугами електрики у ворогів. +block.swarmer.description = Ракетна башта середнього розміру. Атакує як повітряних, так і наземних ворогів. Запускає ракети, які летять у ворогів самостійно. block.salvo.description = Більш велика, вдосконалена версія башти «Подвійна». Вистрілює швидкий залп куль у ворога. -block.fuse.description = Велика енергетична башта з малим радіусом дії. Стріляє трьома пронизливими променями на ворогів, що знаходяться поблизу. +block.fuse.description = Велика енергетична башта з малим радіусом дії. Стріляє трьома пронизливими променями на найближчих ворогів. block.ripple.description = Надзвичайно потужна артилерійська башта. На великі відстані стріляє скупченнями снарядів у ворогів. block.cyclone.description = Велика протиповітряна та протиземна башта. Підпалює вибухонебезпечними грудками скупчення ворогів. block.spectre.description = Масивна двоствольна гармата. Стріляє великими бронебійними кулями в повітряні та наземні цілі. -block.meltdown.description = Масивна лазерна гармата. Заряджає і стріляє стійким лазерним променем у сусідніх ворогів. Для роботи потрібен теплоносій. -block.command-center.description = Наказує бойовим одиницям пересуватися по всій мапі.\nНаявні команди: патрулювання, атакувати вороже ядро, відступити до ядра/заводу. Якщо ворожого ядра немає, то бойові одиниці будуть патрулювати за замовчуванням, коли була застосована команда атакувати. +block.meltdown.description = Масивна лазерна гармата. Заряджає і стріляє лазерним променем у найближчих ворогів. Для роботи потрібен теплоносій. +block.command-center.description = Наказує бойовим одиницям пересуватися по всій мапі.\nНаявні команди: патрулювання, атакувати вороже ядро, відступити до ядра/заводу. Якщо ворожого ядра немає, то бойові одиниці будуть патрулювати за замовчуванням при застосуванні команди «атакувати». block.draug-factory.description = Виробляє дронів, які видобувають ресурси. block.spirit-factory.description = Виробляє дронів, які ремонтують блоки. block.phantom-factory.description = Виробляє дронів, які допомогають у будівництві. @@ -1244,14 +1248,14 @@ block.wraith-factory.description = Виробляє швидких перехо block.ghoul-factory.description = Виробляє важкокилимових бомбардувальників. block.revenant-factory.description = Виробляє важких ракетних одиниць. block.dagger-factory.description = Виробляє початкових наземних одиниць. -block.crawler-factory.description = Виробляє швидких і самовибухових одиниць. +block.crawler-factory.description = Виробляє швидких одиниць, які вибухають при контакті з ворогом. block.titan-factory.description = Виробляє поліпшених наземних одиниць. block.fortress-factory.description = Виробляє важкоартилерійних наземних одиниць. -block.repair-point.description = Безперервно лікує найближчу пошкоджену бойову одиницю, що знаходиться поруч. -block.dart-mech-pad.description = Забезпечує перетворення в основий атакуючий мех.\nВикористовуйте, натиснувши, коли стоїте на ньому. -block.delta-mech-pad.description = Забезпечує перетворення в легкоброньований атакуючий мех.\nВикористовуйте, натиснувши, коли стоїте на ньому. -block.tau-mech-pad.description = Забезпечує перетворення в поліпшений мех підтримки.\nВикористовуйте, натиснувши, коли стоїте на ньому. -block.omega-mech-pad.description = Забезпечує перетворення в тяжкоброньований ракетний мех.\nВикористовуйте, натиснувши, коли стоїте на ньому. -block.javelin-ship-pad.description = Забезпечує перетворення в швидкий, легкоброньований перехоплювач.\nВикористовуйте, натиснувши, коли стоїте на ньому. -block.trident-ship-pad.description = Забезпечує перетворення в тяжкий бомбардувальник.\nВикористовуйте, натискаючи, стоячи на ньому. -block.glaive-ship-pad.description = Забезпечує перетворення в великий добреброньований корабель зі зроєю.\nВикористовуйте, натиснувши, коли стоїте на ньому. +block.repair-point.description = Безперервно лікує найближчу пошкоджену бойову одиницю. +block.dart-mech-pad.description = Забезпечує перетворення в основий атакуючий мех.\nДля використання натисніть на нього, коли стоїте на ньому. +block.delta-mech-pad.description = Забезпечує перетворення в легкоброньований атакуючий мех.\nДля використання натисніть на нього, коли стоїте на ньому. +block.tau-mech-pad.description = Забезпечує перетворення в поліпшений мех підтримки.\nДля використання натисніть на нього, коли стоїте на ньому. +block.omega-mech-pad.description = Забезпечує перетворення в тяжкоброньований ракетний мех.\\nДля використання натисніть на нього, коли стоїте на ньому. +block.javelin-ship-pad.description = Забезпечує перетворення в швидкий, легкоброньований перехоплювач.\nДля використання натисніть на нього, коли стоїте на ньому. +block.trident-ship-pad.description = Забезпечує перетворення в тяжкий бомбардувальник.\nДля використання натисніть на нього, коли стоїте на ньому. +block.glaive-ship-pad.description = Забезпечує перетворення в великий добреброньований озброєний корабель.\nДля використання натисніть на нього, коли стоїте на ньому. diff --git a/core/assets/bundles/bundle_zh_TW.properties b/core/assets/bundles/bundle_zh_TW.properties index 5a9da9dddf..539be7b004 100644 --- a/core/assets/bundles/bundle_zh_TW.properties +++ b/core/assets/bundles/bundle_zh_TW.properties @@ -59,6 +59,7 @@ stat.built = 建設的建築：[accent]{0} stat.destroyed = 摧毀的建築：[accent]{0} stat.deconstructed = 拆除的建築：[accent]{0} stat.delivered = 發射的核心資源： +stat.playtime = 遊玩時間：[accent] {0} stat.rank = 最終排名：[accent]{0} launcheditems = [accent]已發射的物品 @@ -171,6 +172,11 @@ hosts.discovering.any = 搜尋遊戲 server.refreshing = 伺服器刷新中 hosts.none = [lightgray]找不到區域網路伺服器！ host.invalid = [scarlet]無法連線至伺服器。 + +servers.local = 區域伺服器 +servers.remote = 遠端伺服器 +servers.global = 全域伺服器 + trace = 追蹤玩家 trace.playername = 玩家名稱：[accent]{0} trace.ip = IP：[accent]{0} @@ -1176,7 +1182,7 @@ block.bridge-conveyor.description = 高級的物品運輸方塊。允許跨過 block.phase-conveyor.description = 高級物品傳輸方塊。使用能量將物品傳送到幾個方塊外連接的相織輸送帶。 block.sorter.description = 對物品進行分類。如果物品與所選種類匹配，則允許其通過。否則，物品將從左邊和右邊輸出。 block.inverted-sorter.description = 處理物品的方式類似於分類器，但將所選擇的物品輸出到側面。 -block.router.description = 接受來自一個方向的物品並將它們平均輸出到最多3個其他方向。用於將物品從一個來源分割為多個目標。\n\n[[scarlet]]不建議緊貼在生產型方塊旁使用，可能導致其被產出堵塞。[] +block.router.description = 接受來自一個方向的物品並將它們平均輸出到最多3個其他方向。用於將物品從一個來源分割為多個目標。\n\n[[scarlet]不建議緊貼在生產型方塊旁使用，可能導致其被產出堵塞。[] block.distributor.description = 高級的分配器，可將物品均分到最多7個其他方向。 block.overflow-gate.description = 如果前面被阻擋，則向左邊和右邊輸出物品。 block.underflow-gate.description = 反向的溢流器。如果側面被阻擋，則向前方輸出物品。 diff --git a/core/assets/scripts/base.js b/core/assets/scripts/base.js index 9c06bed19c..3721b5b165 100755 --- a/core/assets/scripts/base.js +++ b/core/assets/scripts/base.js @@ -2,6 +2,11 @@ const log = function(context, obj){ Vars.mods.getScripts().log(context, obj ? String(obj) : "null") } +var scriptName = "base.js" +var modName = "none" + +const print = text => log(scriptName, text); + const extendContent = function(classType, name, params){ return new JavaAdapter(classType, params, name) } diff --git a/core/assets/scripts/global.js b/core/assets/scripts/global.js index 22d746b420..fee9596705 100755 --- a/core/assets/scripts/global.js +++ b/core/assets/scripts/global.js @@ -4,6 +4,11 @@ const log = function(context, obj){ Vars.mods.getScripts().log(context, obj ? String(obj) : "null") } +var scriptName = "base.js" +var modName = "none" + +const print = text => log(scriptName, text); + const extendContent = function(classType, name, params){ return new JavaAdapter(classType, params, name) } @@ -20,61 +25,62 @@ const prov = method => new Prov(){get: method} const newEffect = (lifetime, renderer) => new Effects.Effect(lifetime, new Effects.EffectRenderer({render: renderer})) Call = Packages.mindustry.gen.Call const Calls = Call //backwards compat -importPackage(Packages.arc) -importPackage(Packages.arc.func) -importPackage(Packages.arc.graphics) -importPackage(Packages.arc.graphics.g2d) -importPackage(Packages.arc.math) + importPackage(Packages.arc.math.geom) -importPackage(Packages.arc.scene) -importPackage(Packages.arc.scene.actions) -importPackage(Packages.arc.scene.event) -importPackage(Packages.arc.scene.style) -importPackage(Packages.arc.scene.ui) -importPackage(Packages.arc.scene.ui.layout) -importPackage(Packages.arc.scene.utils) -importPackage(Packages.arc.struct) -importPackage(Packages.arc.util) -importPackage(Packages.mindustry) -importPackage(Packages.mindustry.ai) -importPackage(Packages.mindustry.content) -importPackage(Packages.mindustry.core) -importPackage(Packages.mindustry.ctype) -importPackage(Packages.mindustry.editor) -importPackage(Packages.mindustry.entities) -importPackage(Packages.mindustry.entities.bullet) -importPackage(Packages.mindustry.entities.effect) -importPackage(Packages.mindustry.entities.traits) -importPackage(Packages.mindustry.entities.type) -importPackage(Packages.mindustry.entities.type.base) -importPackage(Packages.mindustry.entities.units) -importPackage(Packages.mindustry.game) -importPackage(Packages.mindustry.gen) importPackage(Packages.mindustry.graphics) -importPackage(Packages.mindustry.input) -importPackage(Packages.mindustry.maps) -importPackage(Packages.mindustry.maps.filters) -importPackage(Packages.mindustry.maps.generators) -importPackage(Packages.mindustry.maps.zonegen) -importPackage(Packages.mindustry.type) -importPackage(Packages.mindustry.ui) importPackage(Packages.mindustry.ui.dialogs) -importPackage(Packages.mindustry.ui.fragments) -importPackage(Packages.mindustry.ui.layout) -importPackage(Packages.mindustry.world) -importPackage(Packages.mindustry.world.blocks) -importPackage(Packages.mindustry.world.blocks.defense) -importPackage(Packages.mindustry.world.blocks.defense.turrets) -importPackage(Packages.mindustry.world.blocks.distribution) importPackage(Packages.mindustry.world.blocks.liquid) -importPackage(Packages.mindustry.world.blocks.logic) +importPackage(Packages.mindustry.world.blocks) +importPackage(Packages.arc.scene.event) +importPackage(Packages.arc.scene.actions) +importPackage(Packages.mindustry.gen) +importPackage(Packages.arc.struct) +importPackage(Packages.mindustry.world.blocks.defense.turrets) +importPackage(Packages.mindustry.game) +importPackage(Packages.arc.graphics) +importPackage(Packages.mindustry.ui.fragments) +importPackage(Packages.mindustry.ui) importPackage(Packages.mindustry.world.blocks.power) -importPackage(Packages.mindustry.world.blocks.production) -importPackage(Packages.mindustry.world.blocks.sandbox) -importPackage(Packages.mindustry.world.blocks.storage) -importPackage(Packages.mindustry.world.blocks.units) -importPackage(Packages.mindustry.world.consumers) +importPackage(Packages.mindustry.entities.traits) +importPackage(Packages.mindustry.entities.effect) +importPackage(Packages.arc.math) +importPackage(Packages.arc.scene.ui) +importPackage(Packages.mindustry.world.blocks.defense) +importPackage(Packages.mindustry.ctype) +importPackage(Packages.mindustry.entities.type) importPackage(Packages.mindustry.world.meta) +importPackage(Packages.arc.func) +importPackage(Packages.mindustry.editor) +importPackage(Packages.mindustry.entities.units) +importPackage(Packages.mindustry.maps.filters) +importPackage(Packages.mindustry.world) +importPackage(Packages.arc.scene.utils) +importPackage(Packages.mindustry.maps.generators) +importPackage(Packages.mindustry.world.blocks.distribution) +importPackage(Packages.mindustry.entities.bullet) +importPackage(Packages.mindustry.content) importPackage(Packages.mindustry.world.meta.values) +importPackage(Packages.mindustry.world.blocks.production) +importPackage(Packages.arc) +importPackage(Packages.mindustry.world.blocks.units) +importPackage(Packages.mindustry.core) +importPackage(Packages.mindustry.world.consumers) +importPackage(Packages.mindustry.entities.type.base) +importPackage(Packages.arc.scene.ui.layout) +importPackage(Packages.mindustry.type) +importPackage(Packages.mindustry.input) +importPackage(Packages.mindustry.entities) +importPackage(Packages.arc.scene.style) +importPackage(Packages.mindustry.world.blocks.sandbox) +importPackage(Packages.mindustry.ui.layout) +importPackage(Packages.mindustry.maps.zonegen) +importPackage(Packages.arc.graphics.g2d) +importPackage(Packages.mindustry.ai) importPackage(Packages.mindustry.world.modules) +importPackage(Packages.mindustry.world.blocks.storage) +importPackage(Packages.arc.scene) +importPackage(Packages.mindustry.maps) +importPackage(Packages.mindustry.world.blocks.logic) +importPackage(Packages.arc.util) importPackage(Packages.mindustry.world.producers) +importPackage(Packages.mindustry) diff --git a/core/assets/scripts/wrapper.js b/core/assets/scripts/wrapper.js deleted file mode 100755 index 0c7a8aba4d..0000000000 --- a/core/assets/scripts/wrapper.js +++ /dev/null @@ -1,10 +0,0 @@ -modName = "$MOD_NAME$" - -!function(){ - -const scriptName = "$SCRIPT_NAME$" -const print = text => log(scriptName, text); -$CODE$ - -}(); - diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index 2425482efa..3dfcb0a7a4 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -1132,13 +1132,13 @@ public class Blocks implements ContentList{ differentialGenerator = new SingleTypeGenerator("differential-generator"){{ requirements(Category.power, ItemStack.with(Items.copper, 70, Items.titanium, 50, Items.lead, 100, Items.silicon, 65, Items.metaglass, 50)); powerProduction = 16f; - itemDuration = 120f; + itemDuration = 140f; hasLiquids = true; hasItems = true; size = 3; consumes.item(Items.pyratite).optional(true, false); - consumes.liquid(Liquids.cryofluid, 0.18f); + consumes.liquid(Liquids.cryofluid, 0.15f); }}; rtgGenerator = new DecayGenerator("rtg-generator"){{ diff --git a/core/src/mindustry/core/NetClient.java b/core/src/mindustry/core/NetClient.java index 8fb7e27a19..4fce7abd73 100644 --- a/core/src/mindustry/core/NetClient.java +++ b/core/src/mindustry/core/NetClient.java @@ -255,34 +255,62 @@ public class NetClient implements ApplicationListener{ ui.loadfrag.hide(); } + @Remote(variants = Variant.both, unreliable = true) + public static void setHudText(String message){ + if(message == null) return; + + ui.hudfrag.setHudText(message); + } + + @Remote(variants = Variant.both) + public static void hideHudText(){ + ui.hudfrag.toggleHudText(false); + } + + /** TCP version */ + @Remote(variants = Variant.both) + public static void setHudTextReliable(String message){ + setHudText(message); + } + @Remote(variants = Variant.both) public static void onInfoMessage(String message){ + if(message == null) return; + ui.showText("", message); } @Remote(variants = Variant.both) public static void onInfoPopup(String message, float duration, int align, int top, int left, int bottom, int right){ + if(message == null) return; + ui.showInfoPopup(message, duration, align, top, left, bottom, right); } @Remote(variants = Variant.both) - public static void onLabel(String info, float duration, float worldx, float worldy){ - ui.showLabel(info, duration, worldx, worldy); + public static void onLabel(String message, float duration, float worldx, float worldy){ + if(message == null) return; + + ui.showLabel(message, duration, worldx, worldy); } /* @Remote(variants = Variant.both, unreliable = true) public static void onEffect(Effect effect, float x, float y, float rotation, Color color){ + if(effect == null) return; + effect.at(x, y, rotation, color); } @Remote(variants = Variant.both) public static void onEffectReliable(Effect effect, float x, float y, float rotation, Color color){ - effect.at(x, y, rotation, color); + onEffect(effect, x, y, rotation, color); }*/ @Remote(variants = Variant.both) public static void onInfoToast(String message, float duration){ + if(message == null) return; + ui.showInfoToast(message, duration); } @@ -529,6 +557,11 @@ public class NetClient implements ApplicationListener{ } String getUsid(String ip){ + //consistently use the latter part of an IP, if possible + if(ip.contains("/")){ + ip = ip.substring(ip.indexOf("/") + 1); + } + if(Core.settings.getString("usid-" + ip, null) != null){ return Core.settings.getString("usid-" + ip, null); }else{ diff --git a/core/src/mindustry/core/NetServer.java b/core/src/mindustry/core/NetServer.java index 129db7855d..6d575e1307 100644 --- a/core/src/mindustry/core/NetServer.java +++ b/core/src/mindustry/core/NetServer.java @@ -8,6 +8,7 @@ import arc.struct.*; import arc.util.*; import arc.util.CommandHandler.*; import arc.util.io.*; +import arc.util.serialization.*; import mindustry.annotations.Annotations.*; import mindustry.core.GameState.*; import mindustry.entities.units.*; @@ -88,6 +89,16 @@ public class NetServer implements ApplicationListener{ } String uuid = packet.uuid; + byte[] buuid = Base64Coder.decode(uuid); + CRC32 crc = new CRC32(); + crc.update(buuid, 0, 8); + ByteBuffer buff = ByteBuffer.allocate(8); + buff.put(buuid, 8, 8); + buff.position(0); + if(crc.getValue() != buff.getLong()){ + con.kick(KickReason.clientOutdated); + return; + } if(admins.isIPBanned(con.address) || admins.isSubnetBanned(con.address)) return; @@ -116,7 +127,7 @@ public class NetServer implements ApplicationListener{ return; } - if(admins.getPlayerLimit() > 0 && Groups.player.size() >= admins.getPlayerLimit()){ + if(admins.getPlayerLimit() > 0 && Groups.player.size() >= admins.getPlayerLimit() && !netServer.admins.isAdmin(uuid, packet.usid)){ con.kick(KickReason.playerLimit); return; } @@ -197,6 +208,11 @@ public class NetServer implements ApplicationListener{ player.name(packet.name); player.color().set(packet.color).a(1f); + //save admin ID but don't overwrite it + if(!player.admin() && !info.admin){ + info.adminUsid = packet.usid; + } + try{ writeBuffer.position(0); player.write(outputBuffer); diff --git a/core/src/mindustry/mod/Mods.java b/core/src/mindustry/mod/Mods.java index fb97e5b273..7adb1493af 100644 --- a/core/src/mindustry/mod/Mods.java +++ b/core/src/mindustry/mod/Mods.java @@ -317,7 +317,7 @@ public class Mods implements Loadable{ return result; } - private LoadedMod locateMod(String name){ + public LoadedMod locateMod(String name){ return mods.find(mod -> mod.enabled() && mod.name.equals(name)); } @@ -460,22 +460,25 @@ public class Mods implements Loadable{ eachEnabled(mod -> { if(mod.root.child("scripts").exists()){ content.setCurrentMod(mod); - mod.scripts = mod.root.child("scripts").findAll(f -> f.extension().equals("js")); - Log.debug("[{0}] Found {1} scripts.", mod.meta.name, mod.scripts.size); - - for(Fi file : mod.scripts){ + //if there's only one script file, use it (for backwards compatibility); if there isn't, use "main.js" + Array allScripts = mod.root.child("scripts").findAll(f -> f.extEquals("js")); + Fi main = allScripts.size == 1 ? allScripts.first() : mod.root.child("scripts").child("main.js"); + if(main.exists() && !main.isDirectory()){ try{ if(scripts == null){ scripts = platform.createScripts(); } - scripts.run(mod, file); + scripts.run(mod, main); }catch(Throwable e){ Core.app.post(() -> { - Log.err("Error loading script {0} for mod {1}.", file.name(), mod.meta.name); + Log.err("Error loading main script {0} for mod {1}.", main.name(), mod.meta.name); e.printStackTrace(); }); - break; } + }else{ + Core.app.post(() -> { + Log.err("No main.js found for mod {0}.", mod.meta.name); + }); } } }); diff --git a/core/src/mindustry/mod/Scripts.java b/core/src/mindustry/mod/Scripts.java index 94acd92eb4..69f272595c 100644 --- a/core/src/mindustry/mod/Scripts.java +++ b/core/src/mindustry/mod/Scripts.java @@ -8,6 +8,12 @@ import arc.util.Log.*; import mindustry.*; import mindustry.mod.Mods.*; import org.mozilla.javascript.*; +import org.mozilla.javascript.commonjs.module.*; +import org.mozilla.javascript.commonjs.module.provider.*; + +import java.io.*; +import java.net.*; +import java.util.regex.*; public class Scripts implements Disposable{ private final Array blacklist = Array.with("net", "files", "reflect", "javax", "rhino", "file", "channels", "jdk", @@ -15,9 +21,9 @@ public class Scripts implements Disposable{ ".awt", "socket", "classloader", "oracle", "invoke"); private final Array whitelist = Array.with("mindustry.net"); private final Context context; - private final String wrapper; private Scriptable scope; private boolean errored; + private LoadedMod currentMod = null; public Scripts(){ Time.mark(); @@ -25,9 +31,12 @@ public class Scripts implements Disposable{ context = Vars.platform.getScriptContext(); context.setClassShutter(type -> !blacklist.contains(type.toLowerCase()::contains) || whitelist.contains(type.toLowerCase()::contains)); context.getWrapFactory().setJavaPrimitiveWrap(false); - + scope = new ImporterTopLevel(context); - wrapper = Core.files.internal("scripts/wrapper.js").readString(); + + new RequireBuilder() + .setModuleScriptProvider(new SoftCachingModuleScriptProvider(new ScriptModuleProvider())) + .setSandboxed(true).createRequire(context, scope).install(scope); if(!run(Core.files.internal("scripts/global.js").readString(), "global.js")){ errored = true; @@ -68,11 +77,17 @@ public class Scripts implements Disposable{ } public void run(LoadedMod mod, Fi file){ - run(wrapper.replace("$SCRIPT_NAME$", mod.name + "/" + file.nameWithoutExtension()).replace("$CODE$", file.readString()).replace("$MOD_NAME$", mod.name), file.name()); + currentMod = mod; + run(file.readString(), file.name()); + currentMod = null; } private boolean run(String script, String file){ try{ + if(currentMod != null){ + //inject script info into file (TODO maybe rhino handles this?) + context.evaluateString(scope, "modName = \"" + currentMod.name + "\"\nscriptName = \"" + file + "\"", "initscript.js", 1, null); + } context.evaluateString(scope, script, file, 1, null); return true; }catch(Throwable t){ @@ -85,4 +100,38 @@ public class Scripts implements Disposable{ public void dispose(){ Context.exit(); } + + private class ScriptModuleProvider extends UrlModuleSourceProvider{ + private Pattern directory = Pattern.compile("^(.+?)/(.+)"); + + public ScriptModuleProvider(){ + super(null, null); + } + + @Override + public ModuleSource loadSource(String moduleId, Scriptable paths, Object validator) throws IOException, URISyntaxException{ + if(currentMod == null) return null; + return loadSource(moduleId, currentMod.root.child("scripts"), validator); + } + + private ModuleSource loadSource(String moduleId, Fi root, Object validator) throws URISyntaxException{ + Matcher matched = directory.matcher(moduleId); + if(matched.find()){ + LoadedMod required = Vars.mods.locateMod(matched.group(1)); + String script = matched.group(2); + if(required == null || root.equals(required.root.child("scripts"))){ // Mod not found, or already using a mod + Fi dir = root.child(matched.group(1)); + if(!dir.exists()) return null; // Mod and folder not found + return loadSource(script, dir, validator); + } + return loadSource(script, required.root.child("scripts"), validator); + } + + Fi module = root.child(moduleId + ".js"); + if(!module.exists() || module.isDirectory()) return null; + return new ModuleSource( + new InputStreamReader(new ByteArrayInputStream((module.readString()).getBytes())), + null, new URI(moduleId), root.file().toURI(), validator); + } + } } diff --git a/core/src/mindustry/net/Packets.java b/core/src/mindustry/net/Packets.java index 98a3bad857..e24d18db6f 100644 --- a/core/src/mindustry/net/Packets.java +++ b/core/src/mindustry/net/Packets.java @@ -181,7 +181,7 @@ public class Packets{ usid = TypeIO.readString(buffer); mobile = buffer.get() == 1; color = buffer.getInt(); - byte[] idbytes = new byte[8]; + byte[] idbytes = new byte[16]; buffer.get(idbytes); uuid = new String(Base64Coder.encode(idbytes)); int totalMods = buffer.get(); diff --git a/core/src/mindustry/ui/fragments/HudFragment.java b/core/src/mindustry/ui/fragments/HudFragment.java index 52b6cfc80b..bb4ea59253 100644 --- a/core/src/mindustry/ui/fragments/HudFragment.java +++ b/core/src/mindustry/ui/fragments/HudFragment.java @@ -35,6 +35,9 @@ public class HudFragment extends Fragment{ private boolean shown = true; private float dsize = 47.2f; + private String hudText = ""; + private boolean showHudText; + private long lastToast; public void build(Group parent){ @@ -280,6 +283,19 @@ public class HudFragment extends Fragment{ t.add("$saveload").style(Styles.outlineLabel); }); + parent.fill(p -> { + p.top().table(Styles.black3, t -> t.margin(4).label(() -> hudText) + .style(Styles.outlineLabel)).padTop(10).visible(p.color.a >= 0.001f); + p.update(() -> { + p.color.a = Mathf.lerpDelta(p.color.a, Mathf.num(showHudText), 0.2f); + if(state.is(State.menu)){ + p.color.a = 0f; + showHudText = false; + } + }); + p.touchable(Touchable.disabled); + }); + blockfrag.build(parent); } @@ -290,6 +306,15 @@ public class HudFragment extends Fragment{ } } + public void setHudText(String text){ + showHudText = true; + hudText = text; + } + + public void toggleHudText(boolean shown){ + showHudText = shown; + } + private void scheduleToast(Runnable run){ long duration = (int)(3.5 * 1000); long since = Time.timeSinceMillis(lastToast); diff --git a/core/src/mindustry/world/blocks/Autotiler.java b/core/src/mindustry/world/blocks/Autotiler.java index dfcecf4a7d..7485a19d96 100644 --- a/core/src/mindustry/world/blocks/Autotiler.java +++ b/core/src/mindustry/world/blocks/Autotiler.java @@ -84,7 +84,7 @@ public interface Autotiler{ default boolean blends(Tile tile, int rotation, int direction){ Tile other = tile.getNearby(Mathf.mod(rotation - direction, 4)); if(other != null) other = other.link(); - return other != null && blends(tile, rotation, other.x, other.y, other.rotation(), other.block()); + return other != null && other.team() == tile.team() && blends(tile, rotation, other.x, other.y, other.rotation(), other.block()); } default boolean blendsArmored(Tile tile, int rotation, int otherx, int othery, int otherrot, Block otherblock){ diff --git a/core/src/mindustry/world/blocks/ItemSelection.java b/core/src/mindustry/world/blocks/ItemSelection.java index 8fe4994d5b..2f654d081b 100644 --- a/core/src/mindustry/world/blocks/ItemSelection.java +++ b/core/src/mindustry/world/blocks/ItemSelection.java @@ -1,31 +1,29 @@ package mindustry.world.blocks; -import arc.struct.*; import arc.func.*; import arc.scene.style.*; import arc.scene.ui.*; import arc.scene.ui.layout.*; +import arc.struct.*; +import mindustry.ctype.*; import mindustry.gen.*; -import mindustry.type.*; import mindustry.ui.*; -import mindustry.ui.Cicon; import static mindustry.Vars.*; public class ItemSelection{ + private static float scrollPos = 0f; - public static void buildItemTable(Table table, Prov holder, Cons consumer){ - - Array items = content.items(); + public static void buildTable(Table table, Array items, Prov holder, Cons consumer){ ButtonGroup group = new ButtonGroup<>(); group.setMinCheckCount(0); Table cont = new Table(); - cont.defaults().size(38); + cont.defaults().size(40); int i = 0; - for(Item item : items){ + for(T item : items){ if(!data.isUnlocked(item) && world.isZone()) continue; ImageButton button = cont.addImageButton(Tex.whiteui, Styles.clearToggleTransi, 24, () -> control.input.frag.config.hideConfig()).group(group).get(); @@ -38,6 +36,21 @@ public class ItemSelection{ } } - table.add(cont); + //add extra blank spaces so it looks nice + if(i % 4 != 0){ + int remaining = 4 - (i % 4); + for(int j = 0; j < remaining; j++){ + cont.addImage(Styles.black6); + } + } + + ScrollPane pane = new ScrollPane(cont, Styles.smallPane); + pane.setScrollingDisabled(true, false); + pane.setScrollYForce(scrollPos); + pane.update(() -> { + scrollPos = pane.getScrollY(); + }); + + table.add(pane).maxHeight(40 * 5); } } diff --git a/core/src/mindustry/world/blocks/distribution/Sorter.java b/core/src/mindustry/world/blocks/distribution/Sorter.java index a011929cec..7f8744bd51 100644 --- a/core/src/mindustry/world/blocks/distribution/Sorter.java +++ b/core/src/mindustry/world/blocks/distribution/Sorter.java @@ -133,7 +133,7 @@ public class Sorter extends Block{ @Override public void buildConfiguration(Tile tile, Table table){ SorterEntity entity = tile.ent(); - ItemSelection.buildItemTable(table, () -> entity.sortItem, item -> { + ItemSelection.buildTable(table, content.items(), () -> entity.sortItem, item -> { lastItem = item; tile.configure(item == null ? -1 : item.id); }); diff --git a/core/src/mindustry/world/blocks/power/Battery.java b/core/src/mindustry/world/blocks/power/Battery.java index 2783984747..053fb39ea9 100644 --- a/core/src/mindustry/world/blocks/power/Battery.java +++ b/core/src/mindustry/world/blocks/power/Battery.java @@ -1,10 +1,29 @@ package mindustry.world.blocks.power; +import arc.graphics.*; +import arc.graphics.g2d.*; +import mindustry.world.*; + +import static mindustry.Vars.tilesize; + public class Battery extends PowerDistributor{ + public int topRegion = reg("-top"); + + public Color emptyLightColor = Color.valueOf("f8c266"); + public Color fullLightColor = Color.valueOf("fb9567"); public Battery(String name){ super(name); outputsPower = true; consumesPower = true; } + + @Override + public void draw(Tile tile){ + Draw.color(emptyLightColor, fullLightColor, tile.entity.power().status); + Fill.square(tile.drawx(), tile.drawy(), tilesize * size / 2f - 1); + Draw.color(); + + Draw.rect(reg(topRegion), tile.drawx(), tile.drawy()); + } } diff --git a/core/src/mindustry/world/blocks/sandbox/ItemSource.java b/core/src/mindustry/world/blocks/sandbox/ItemSource.java index 4e6755b283..37b79aabf8 100644 --- a/core/src/mindustry/world/blocks/sandbox/ItemSource.java +++ b/core/src/mindustry/world/blocks/sandbox/ItemSource.java @@ -81,7 +81,7 @@ public class ItemSource extends Block{ @Override public void buildConfiguration(Tile tile, Table table){ ItemSourceEntity entity = tile.ent(); - ItemSelection.buildItemTable(table, () -> entity.outputItem, item -> { + ItemSelection.buildTable(table, content.items(), () -> entity.outputItem, item -> { lastItem = item; tile.configure(item == null ? -1 : item.id); }); diff --git a/core/src/mindustry/world/blocks/sandbox/LiquidSource.java b/core/src/mindustry/world/blocks/sandbox/LiquidSource.java index 73f89e0668..fd90df201f 100644 --- a/core/src/mindustry/world/blocks/sandbox/LiquidSource.java +++ b/core/src/mindustry/world/blocks/sandbox/LiquidSource.java @@ -1,24 +1,19 @@ package mindustry.world.blocks.sandbox; import arc.*; -import arc.struct.*; import arc.graphics.g2d.*; -import arc.scene.style.*; -import arc.scene.ui.*; import arc.scene.ui.layout.*; -import arc.util.*; import arc.util.ArcAnnotate.*; -import mindustry.gen.*; -import mindustry.gen.*; +import arc.util.*; import mindustry.entities.units.*; +import mindustry.gen.*; import mindustry.type.*; -import mindustry.ui.*; -import mindustry.ui.Cicon; import mindustry.world.*; +import mindustry.world.blocks.*; import java.io.*; -import static mindustry.Vars.*; +import static mindustry.Vars.content; public class LiquidSource extends Block{ public static Liquid lastLiquid; @@ -82,29 +77,10 @@ public class LiquidSource extends Block{ public void buildConfiguration(Tile tile, Table table){ LiquidSourceEntity entity = tile.ent(); - Array items = content.liquids(); - - ButtonGroup group = new ButtonGroup<>(); - group.setMinCheckCount(0); - Table cont = new Table(); - - for(int i = 0; i < items.size; i++){ - final int f = i; - ImageButton button = cont.addImageButton(Tex.clear, Styles.clearToggleTransi, 24, () -> control.input.frag.config.hideConfig()).size(38).group(group).get(); - button.changed(() -> { - tile.configure(button.isChecked() ? items.get(f).id : -1); - control.input.frag.config.hideConfig(); - lastLiquid = items.get(f); - }); - button.getStyle().imageUp = new TextureRegionDrawable(items.get(i).icon(Cicon.medium)); - button.setChecked(entity.source == items.get(i)); - - if(i % 4 == 3){ - cont.row(); - } - } - - table.add(cont); + ItemSelection.buildTable(table, content.liquids(), () -> entity.source, liquid -> { + lastLiquid = liquid; + tile.configure(liquid == null ? -1 : liquid.id); + }); } @Override diff --git a/core/src/mindustry/world/blocks/storage/Unloader.java b/core/src/mindustry/world/blocks/storage/Unloader.java index b1f5644515..7a4d834b2f 100644 --- a/core/src/mindustry/world/blocks/storage/Unloader.java +++ b/core/src/mindustry/world/blocks/storage/Unloader.java @@ -123,7 +123,7 @@ public class Unloader extends Block{ @Override public void buildConfiguration(Tile tile, Table table){ UnloaderEntity entity = tile.ent(); - ItemSelection.buildItemTable(table, () -> entity.sortItem, item -> { + ItemSelection.buildTable(table, content.items(), () -> entity.sortItem, item -> { lastItem = item; tile.configure(item == null ? -1 : item.id); }); diff --git a/desktop/src/mindustry/desktop/DesktopLauncher.java b/desktop/src/mindustry/desktop/DesktopLauncher.java index 71689d40be..376c84db82 100644 --- a/desktop/src/mindustry/desktop/DesktopLauncher.java +++ b/desktop/src/mindustry/desktop/DesktopLauncher.java @@ -319,7 +319,7 @@ public class DesktopLauncher extends ClientLauncher{ try{ Enumeration e = NetworkInterface.getNetworkInterfaces(); NetworkInterface out; - for(out = e.nextElement(); (out.getHardwareAddress() == null || !validAddress(out.getHardwareAddress())) && e.hasMoreElements(); out = e.nextElement()); + for(out = e.nextElement(); (out.getHardwareAddress() == null || out.isVirtual() || !validAddress(out.getHardwareAddress())) && e.hasMoreElements(); out = e.nextElement()); byte[] bytes = out.getHardwareAddress(); byte[] result = new byte[8]; diff --git a/fastlane/metadata/android/cs-CZ/changelogs/103.1.txt b/fastlane/metadata/android/cs-CZ/changelogs/103.1.txt new file mode 100644 index 0000000000..ea267c1c96 --- /dev/null +++ b/fastlane/metadata/android/cs-CZ/changelogs/103.1.txt @@ -0,0 +1,9 @@ +- Přidány nové ikony s hladkým škálováním +- Přidána černá díra na kapaliny (přispěno uživatelem @GioIacca9) +- Přidáno nastavení průsvitnosti přemostění přepravníku (přispěno uživatelem @Quezler) +- Přidána brána s podtokem (protikus k bráně s přetečením) +- Přidány emotikony do kanálu zpráv, pro většinu bloků a předmětů +- Přidán nový strom technologií, s lepší podporou pro modifikace +- Přidán soubor s logem hry, uložený v adresáři s daty +- Přidán nový oddělovač pro sprity a animace (ocení modéři) +- Přidán seznam synergetických dlaždic do statistik některých bloků (viz například vrt na vodu) diff --git a/fastlane/metadata/android/cs-CZ/changelogs/103.2.txt b/fastlane/metadata/android/cs-CZ/changelogs/103.2.txt new file mode 100644 index 0000000000..ea267c1c96 --- /dev/null +++ b/fastlane/metadata/android/cs-CZ/changelogs/103.2.txt @@ -0,0 +1,9 @@ +- Přidány nové ikony s hladkým škálováním +- Přidána černá díra na kapaliny (přispěno uživatelem @GioIacca9) +- Přidáno nastavení průsvitnosti přemostění přepravníku (přispěno uživatelem @Quezler) +- Přidána brána s podtokem (protikus k bráně s přetečením) +- Přidány emotikony do kanálu zpráv, pro většinu bloků a předmětů +- Přidán nový strom technologií, s lepší podporou pro modifikace +- Přidán soubor s logem hry, uložený v adresáři s daty +- Přidán nový oddělovač pro sprity a animace (ocení modéři) +- Přidán seznam synergetických dlaždic do statistik některých bloků (viz například vrt na vodu) diff --git a/fastlane/metadata/android/cs-CZ/changelogs/103.3.txt b/fastlane/metadata/android/cs-CZ/changelogs/103.3.txt new file mode 100644 index 0000000000..ea267c1c96 --- /dev/null +++ b/fastlane/metadata/android/cs-CZ/changelogs/103.3.txt @@ -0,0 +1,9 @@ +- Přidány nové ikony s hladkým škálováním +- Přidána černá díra na kapaliny (přispěno uživatelem @GioIacca9) +- Přidáno nastavení průsvitnosti přemostění přepravníku (přispěno uživatelem @Quezler) +- Přidána brána s podtokem (protikus k bráně s přetečením) +- Přidány emotikony do kanálu zpráv, pro většinu bloků a předmětů +- Přidán nový strom technologií, s lepší podporou pro modifikace +- Přidán soubor s logem hry, uložený v adresáři s daty +- Přidán nový oddělovač pro sprity a animace (ocení modéři) +- Přidán seznam synergetických dlaždic do statistik některých bloků (viz například vrt na vodu) diff --git a/fastlane/metadata/android/cs-CZ/changelogs/103.txt b/fastlane/metadata/android/cs-CZ/changelogs/103.txt new file mode 100644 index 0000000000..ea267c1c96 --- /dev/null +++ b/fastlane/metadata/android/cs-CZ/changelogs/103.txt @@ -0,0 +1,9 @@ +- Přidány nové ikony s hladkým škálováním +- Přidána černá díra na kapaliny (přispěno uživatelem @GioIacca9) +- Přidáno nastavení průsvitnosti přemostění přepravníku (přispěno uživatelem @Quezler) +- Přidána brána s podtokem (protikus k bráně s přetečením) +- Přidány emotikony do kanálu zpráv, pro většinu bloků a předmětů +- Přidán nový strom technologií, s lepší podporou pro modifikace +- Přidán soubor s logem hry, uložený v adresáři s daty +- Přidán nový oddělovač pro sprity a animace (ocení modéři) +- Přidán seznam synergetických dlaždic do statistik některých bloků (viz například vrt na vodu) diff --git a/fastlane/metadata/android/cs-CZ/changelogs/29591.txt b/fastlane/metadata/android/cs-CZ/changelogs/29591.txt new file mode 100644 index 0000000000..ea267c1c96 --- /dev/null +++ b/fastlane/metadata/android/cs-CZ/changelogs/29591.txt @@ -0,0 +1,9 @@ +- Přidány nové ikony s hladkým škálováním +- Přidána černá díra na kapaliny (přispěno uživatelem @GioIacca9) +- Přidáno nastavení průsvitnosti přemostění přepravníku (přispěno uživatelem @Quezler) +- Přidána brána s podtokem (protikus k bráně s přetečením) +- Přidány emotikony do kanálu zpráv, pro většinu bloků a předmětů +- Přidán nový strom technologií, s lepší podporou pro modifikace +- Přidán soubor s logem hry, uložený v adresáři s daty +- Přidán nový oddělovač pro sprity a animace (ocení modéři) +- Přidán seznam synergetických dlaždic do statistik některých bloků (viz například vrt na vodu) diff --git a/fastlane/metadata/android/cs-CZ/changelogs/29594.txt b/fastlane/metadata/android/cs-CZ/changelogs/29594.txt new file mode 100644 index 0000000000..ea267c1c96 --- /dev/null +++ b/fastlane/metadata/android/cs-CZ/changelogs/29594.txt @@ -0,0 +1,9 @@ +- Přidány nové ikony s hladkým škálováním +- Přidána černá díra na kapaliny (přispěno uživatelem @GioIacca9) +- Přidáno nastavení průsvitnosti přemostění přepravníku (přispěno uživatelem @Quezler) +- Přidána brána s podtokem (protikus k bráně s přetečením) +- Přidány emotikony do kanálu zpráv, pro většinu bloků a předmětů +- Přidán nový strom technologií, s lepší podporou pro modifikace +- Přidán soubor s logem hry, uložený v adresáři s daty +- Přidán nový oddělovač pro sprity a animace (ocení modéři) +- Přidán seznam synergetických dlaždic do statistik některých bloků (viz například vrt na vodu) diff --git a/fastlane/metadata/android/cs-CZ/changelogs/29597.txt b/fastlane/metadata/android/cs-CZ/changelogs/29597.txt new file mode 100644 index 0000000000..ea267c1c96 --- /dev/null +++ b/fastlane/metadata/android/cs-CZ/changelogs/29597.txt @@ -0,0 +1,9 @@ +- Přidány nové ikony s hladkým škálováním +- Přidána černá díra na kapaliny (přispěno uživatelem @GioIacca9) +- Přidáno nastavení průsvitnosti přemostění přepravníku (přispěno uživatelem @Quezler) +- Přidána brána s podtokem (protikus k bráně s přetečením) +- Přidány emotikony do kanálu zpráv, pro většinu bloků a předmětů +- Přidán nový strom technologií, s lepší podporou pro modifikace +- Přidán soubor s logem hry, uložený v adresáři s daty +- Přidán nový oddělovač pro sprity a animace (ocení modéři) +- Přidán seznam synergetických dlaždic do statistik některých bloků (viz například vrt na vodu) diff --git a/fastlane/metadata/android/en-US/changelogs/104.txt b/fastlane/metadata/android/en-US/changelogs/104.txt new file mode 100644 index 0000000000..6f3e27fb4d --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/104.txt @@ -0,0 +1,6 @@ +- Optimized and cleaned up conveyors +- Made unloaders take items from blocks in equal amounts +- Added server categories (Partially contributed by @Quezler) +- Added require() function for scripts (Contributed by @DeltaNedas) +- Added color gradient for battery status (Contributed by @Arkanic (eventually)) +- Changed script loading: For mods with more than one script file, the main file must be named "main.js" and must require() other files to run them diff --git a/fastlane/metadata/android/en-US/changelogs/29603.txt b/fastlane/metadata/android/en-US/changelogs/29603.txt new file mode 100644 index 0000000000..a268ddebde --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/29603.txt @@ -0,0 +1,9 @@ +- Fixed incorrect line numbers in script errors +- Fixed black screen caused by bloom on some devices +- Fixed some music issues with sound playing at 0% [Android] +- Fixed client IDs resetting +- Fixed data resetting between specific versions [Android] +- Added server categories (Partially contributed by @Quezler) +- Added require() function for scripts (Contributed by @DeltaNedas) +- Optimized and cleaned up conveyors +- Tweaked power block palette diff --git a/fastlane/metadata/android/en-US/changelogs/29607.txt b/fastlane/metadata/android/en-US/changelogs/29607.txt new file mode 100644 index 0000000000..6f3e27fb4d --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/29607.txt @@ -0,0 +1,6 @@ +- Optimized and cleaned up conveyors +- Made unloaders take items from blocks in equal amounts +- Added server categories (Partially contributed by @Quezler) +- Added require() function for scripts (Contributed by @DeltaNedas) +- Added color gradient for battery status (Contributed by @Arkanic (eventually)) +- Changed script loading: For mods with more than one script file, the main file must be named "main.js" and must require() other files to run them diff --git a/fastlane/metadata/android/fr-FR/video.txt b/fastlane/metadata/android/fr-FR/video.txt deleted file mode 100644 index 8b13789179..0000000000 --- a/fastlane/metadata/android/fr-FR/video.txt +++ /dev/null @@ -1 +0,0 @@ - diff --git a/fastlane/metadata/android/it-IT/video.txt b/fastlane/metadata/android/it-IT/video.txt deleted file mode 100644 index 8b13789179..0000000000 --- a/fastlane/metadata/android/it-IT/video.txt +++ /dev/null @@ -1 +0,0 @@ - diff --git a/gradle.properties b/gradle.properties index c56c42567f..fc81933aea 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,3 @@ org.gradle.daemon=true org.gradle.jvmargs=-Xms256m -Xmx1024m -archash=292d60e7d6c2013334b0f4f30659e1d885f73cfe +archash=a3edc4804b57ac9f8c59216cc470f05133f8c804 diff --git a/server/src/mindustry/server/ServerControl.java b/server/src/mindustry/server/ServerControl.java index 6552828b06..30196e9257 100644 --- a/server/src/mindustry/server/ServerControl.java +++ b/server/src/mindustry/server/ServerControl.java @@ -647,37 +647,38 @@ public class ServerControl implements ApplicationListener{ } }); - handler.register("admin", "", "Make an online user admin", arg -> { + handler.register("admin", " ", "Make an online user admin", arg -> { if(!state.is(State.playing)){ err("Open the server first."); return; } - Playerc target = Groups.player.find(p -> p.name().equals(arg[0])); - - if(target != null){ - netServer.admins.adminPlayer(target.uuid(), target.usid()); - target.admin(true); - info("Admin-ed player: {0}", arg[0]); - }else{ - info("Nobody with that name could be found."); - } - }); - - handler.register("unadmin", "", "Removes admin status from an online player", arg -> { - if(!state.is(State.playing)){ - err("Open the server first."); + if(!(arg[0].equals("add") || arg[0].equals("remove"))){ + err("Second parameter must be either 'add' or 'remove'."); return; } - Playerc target = Groups.player.find(p -> p.name().equals(arg[0])); + boolean add = arg[0].equals("add"); + + PlayerInfo target; + Playerc playert = Groups.player.find(p -> p.name().equalsIgnoreCase(arg[1])); + if(playert != null){ + target = playert.getInfo(); + }else{ + target = netServer.admins.getInfoOptional(arg[1]); + playert = Groups.player.find(p -> p.getInfo() == target); + } if(target != null){ - netServer.admins.unAdminPlayer(target.uuid()); - target.admin(false); - info("Un-admin-ed player: {0}", arg[0]); + if(add){ + netServer.admins.adminPlayer(target.id, target.adminUsid); + }else{ + netServer.admins.unAdminPlayer(target.id); + } + if(playert != null) playert.admin(add); + info("Changed admin status of player: &ly{0}", target.lastName); }else{ - info("Nobody with that name could be found."); + err("Nobody with that name or ID could be found. If adding an admin by name, make sure they're online; otherwise, use their UUID."); } }); @@ -694,6 +695,18 @@ public class ServerControl implements ApplicationListener{ } }); + handler.register("players", "List all players currently in game.", arg -> { + if(Groups.player.size() == 0){ + info("No players are currently in the server."); + }else{ + info("&lyPlayers: {0}", Groups.player.size()); + for(Playerc user : Groups.player){ + PlayerInfo userInfo = user.getInfo(); + info(" &lm {0} / ID: '{1}' / IP: '{2}' / Admin: '{3}'", userInfo.lastName, userInfo.id, userInfo.lastIP, userInfo.admin); + } + } + }); + handler.register("runwave", "Trigger the next wave.", arg -> { if(!state.is(State.playing)){ err("Not hosting. Host a game first."); diff --git a/servers.json b/servers.json index 8f6e4d3491..892bda7168 100644 --- a/servers.json +++ b/servers.json @@ -11,6 +11,9 @@ { "address": "mindustry.ru" }, + { + "address": "mindustry.ru:7000" + }, { "address": "mindustry.io" }, diff --git a/tools/build.gradle b/tools/build.gradle index 959121fcda..e527ef1e10 100644 --- a/tools/build.gradle +++ b/tools/build.gradle @@ -34,7 +34,7 @@ def transformColors = { List> list -> } -transformColors([["6e7080", "989aa4", "b0bac0"], ["bc5452", "ea8878", "feb380"], ["dea158", "f8c266", "ffe18f"], ["feb380", "ea8878", "bc5452"]]) +transformColors([["6e7080", "989aa4", "b0bac0"], ["bc5452", "ea8878", "feb380"], ["de9458", "f8c266", "ffe18f"], ["feb380", "ea8878", "bc5452"]]) def antialias = { File file -> if(!doAntialias || file.lastModified() <= 1000) return diff --git a/tools/src/mindustry/tools/ScriptStubGenerator.java b/tools/src/mindustry/tools/ScriptStubGenerator.java index 58dfd27b28..ddbd357e60 100644 --- a/tools/src/mindustry/tools/ScriptStubGenerator.java +++ b/tools/src/mindustry/tools/ScriptStubGenerator.java @@ -30,13 +30,6 @@ public class ScriptStubGenerator{ DataInputStream.class, DataOutputStream.class, Integer.class, Float.class, Double.class, Long.class, Boolean.class, Short.class, Byte.class, Character.class); Array nopackage = Array.with("java.lang", "java"); - String fileTemplate = "package mindustry.mod;\n" + - "\nimport arc.struct.*;\n" + - "//obviously autogenerated, do not touch\n" + - "public class ClassAccess{\n" + - "\tpublic static final ObjectSet allowedClassNames = ObjectSet.with($ALLOWED_CLASS_NAMES$);\n" + - "}"; - List classLoadersList = new LinkedList<>(); classLoadersList.add(ClasspathHelper.contextClassLoader()); classLoadersList.add(ClasspathHelper.staticClassLoader()); @@ -73,8 +66,5 @@ public class ScriptStubGenerator{ //Log.info(result); new Fi("core/assets/scripts/global.js").writeString(result.toString()); - new Fi("core/src/mindustry/mod/ClassAccess.java").writeString(fileTemplate - .replace("$ALLOWED_CLASSES$", classes.toString(", ", type -> type.getName() + ".class")) - .replace("$ALLOWED_CLASS_NAMES$", classes.toString(", ", type -> "\"" + type.getName() + "\""))); } }