diff --git a/android/build.gradle b/android/build.gradle index 148adf6a3e..5c288d5e3a 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -8,7 +8,7 @@ buildscript{ } dependencies{ - classpath 'com.android.tools.build:gradle:3.4.0' + classpath 'com.android.tools.build:gradle:3.4.1' } } @@ -166,27 +166,4 @@ task run(type: Exec){ def adb = path + "/platform-tools/adb" commandLine "$adb", 'shell', 'am', 'start', '-n', 'io.anuke.mindustry/io.anuke.mindustry.AndroidLauncher' -} - -// sets up the Android Idea project, using the old Ant based build. -idea{ - module{ - sourceDirs += file("src") - scopes = [COMPILE: [plus: [project.configurations.compile]]] - - iml{ - withXml{ - def node = it.asNode() - def builder = NodeBuilder.newInstance() - builder.current = node - builder.component(name: "FacetManager"){ - facet(type: "android", name: "Android"){ - configuration{ - option(name: "UPDATE_PROPERTY_FILES", value: "true") - } - } - } - } - } - } -} +} \ No newline at end of file diff --git a/android/src/io/anuke/mindustry/AndroidLauncher.java b/android/src/io/anuke/mindustry/AndroidLauncher.java index 7571b3f746..3f75f746fe 100644 --- a/android/src/io/anuke/mindustry/AndroidLauncher.java +++ b/android/src/io/anuke/mindustry/AndroidLauncher.java @@ -15,16 +15,15 @@ import io.anuke.arc.backends.android.surfaceview.AndroidApplication; import io.anuke.arc.backends.android.surfaceview.AndroidApplicationConfiguration; import io.anuke.arc.files.FileHandle; import io.anuke.arc.function.Consumer; +import io.anuke.arc.function.Predicate; import io.anuke.arc.scene.ui.layout.Unit; import io.anuke.arc.util.Strings; import io.anuke.arc.util.serialization.Base64Coder; import io.anuke.mindustry.core.Platform; import io.anuke.mindustry.game.Saves.SaveSlot; import io.anuke.mindustry.io.SaveIO; -import io.anuke.mindustry.net.Net; +import io.anuke.mindustry.net.*; import io.anuke.mindustry.ui.dialogs.FileChooser; -import io.anuke.mindustry.net.ArcNetClient; -import io.anuke.mindustry.net.ArcNetServer; import java.io.*; import java.util.ArrayList; @@ -72,10 +71,10 @@ public class AndroidLauncher extends AndroidApplication{ } @Override - public void showFileChooser(String text, String content, Consumer cons, boolean open, String filetype){ - chooser = new FileChooser(text, file -> file.extension().equalsIgnoreCase(filetype), open, cons); + public void showFileChooser(String text, String content, Consumer cons, boolean open, Predicate filetype){ + chooser = new FileChooser(text, file -> filetype.test(file.extension().toLowerCase()), open, cons); if(Build.VERSION.SDK_INT < Build.VERSION_CODES.M || (checkSelfPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED && - checkSelfPermission(Manifest.permission.READ_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED)){ + checkSelfPermission(Manifest.permission.READ_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED)){ chooser.show(); chooser = null; }else{ @@ -157,7 +156,7 @@ public class AndroidLauncher extends AndroidApplication{ SaveSlot slot = control.saves.importSave(file); ui.load.runLoadSave(slot); }catch(IOException e){ - ui.showError(Core.bundle.format("save.import.fail", Strings.parseException(e, false))); + ui.showError(Core.bundle.format("save.import.fail", Strings.parseException(e, true))); } }else{ ui.showError("$save.import.invalid"); diff --git a/build.gradle b/build.gradle index bcf90a444b..15c9312444 100644 --- a/build.gradle +++ b/build.gradle @@ -15,8 +15,6 @@ buildscript{ } allprojects{ - apply plugin: "idea" - version = 'release' ext{ 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 3890d89025..78a2d51a4e 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 1075da7378..282bb537a9 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 c6ed6d08b0..217574631e 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 ba25cba5da..eb06e9501e 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 424c81c793..395ee6c254 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 34c765afcd..8c539251fb 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 9da22c1a84..9ade5fe188 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 3a808300f5..6ff5f9bed7 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 1bbf64d1da..41f624b06a 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-conveyor-arrow.png b/core/assets-raw/sprites/blocks/distribution/bridge-conveyor-arrow.png index 4a2f7fb61f..2c88950956 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-bridge.png b/core/assets-raw/sprites/blocks/distribution/bridge-conveyor-bridge.png index 96cad7a850..1ae054b4a0 100644 Binary files a/core/assets-raw/sprites/blocks/distribution/bridge-conveyor-bridge.png and b/core/assets-raw/sprites/blocks/distribution/bridge-conveyor-bridge.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 1dae00d2b5..b553fc29a7 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 de5367fcf9..76b29569ea 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 new file mode 100644 index 0000000000..ef9b77ae97 Binary files /dev/null and b/core/assets-raw/sprites/blocks/distribution/center.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 dfb7bc53f3..2e0a43ea3b 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 c04f44c6e6..24048d1a43 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 6ecb113579..73b23fc35b 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 06a488e33e..6306aa871a 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 0555853b1d..5227b0a105 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 736be72188..d7807ed213 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 0e5a5dd0c6..809e73f91e 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 d63fb25e24..cbbcc06765 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 97892fd317..7d83503a4c 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 89a2dedf7e..7c096f931d 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 d93e101711..8f3bc82e43 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 eb37fac0fd..2ae54594cb 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 217d48fdda..4ab7a2b834 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 8f95dcae1c..078385b52e 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 5747d4e6ba..353aed8146 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 7bb3eb722b..b0ca93a9ef 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 3a5fbbe8d9..7cf6b7a50c 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 b0d59d5557..20edd79d73 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 f7b33d4a55..d2857c3270 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 153a2358ba..2533da2648 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 7176e22108..8b950f97f8 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 89c6aa713e..3254dc8756 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 d30a757cab..7f69cf0669 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 08c757f577..8675cc94d0 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 9bbf561807..1329d5537d 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 b092fbc637..ee5360c7fe 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 d9da20f897..92c8101998 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 85a87d6206..427ffeacd3 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 f976699f58..9a3d6926f6 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 685bbbce16..9961efb201 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 d53ff34aad..14ba76c0fa 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 99ce4b28ef..c9f72835e5 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 40b638c1c7..2707bc9288 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 9bc204ec9b..352665be11 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 ca68bd0bed..4ce88b7534 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 57a954fd35..a555b6b661 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 a328033f71..da3dafa312 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 acbd45a2e2..9e040e9590 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 12159e3197..a2b0ee6665 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 04eed21d57..6a96832452 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 ca890d2387..6322cb7379 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/junction.png b/core/assets-raw/sprites/blocks/distribution/junction.png index 2863c32e31..e84244e630 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/mass-driver-base.png b/core/assets-raw/sprites/blocks/distribution/mass-driver-base.png index 93be68da7a..da1f082874 100644 Binary files a/core/assets-raw/sprites/blocks/distribution/mass-driver-base.png and b/core/assets-raw/sprites/blocks/distribution/mass-driver-base.png differ diff --git a/core/assets-raw/sprites/blocks/distribution/mass-driver.png b/core/assets-raw/sprites/blocks/distribution/mass-driver.png index 4e2d5dca5f..8f835d1a40 100644 Binary files a/core/assets-raw/sprites/blocks/distribution/mass-driver.png and b/core/assets-raw/sprites/blocks/distribution/mass-driver.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 9def20894c..3b47f57453 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 f1002eb4f9..5873e584e8 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-bridge.png b/core/assets-raw/sprites/blocks/distribution/phase-conveyor-bridge.png index a0511f58ac..176c3fc9ce 100644 Binary files a/core/assets-raw/sprites/blocks/distribution/phase-conveyor-bridge.png and b/core/assets-raw/sprites/blocks/distribution/phase-conveyor-bridge.png differ diff --git a/core/assets-raw/sprites/blocks/distribution/phase-conveyor-end.png b/core/assets-raw/sprites/blocks/distribution/phase-conveyor-end.png index 36c6950bf9..090155a3f4 100644 Binary files a/core/assets-raw/sprites/blocks/distribution/phase-conveyor-end.png and b/core/assets-raw/sprites/blocks/distribution/phase-conveyor-end.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 bca6892ef9..20c9739180 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 712556a016..59a5fa0564 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 2de5726c2a..03876f3138 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/drills/blast-drill-rim.png b/core/assets-raw/sprites/blocks/drills/blast-drill-rim.png index 05b5f843a1..dc6cb23e0f 100644 Binary files a/core/assets-raw/sprites/blocks/drills/blast-drill-rim.png and b/core/assets-raw/sprites/blocks/drills/blast-drill-rim.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 f216e3f0b3..ab75a38dd0 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/blast-drill-top.png b/core/assets-raw/sprites/blocks/drills/blast-drill-top.png index 45c3aff97f..3448ea9e70 100644 Binary files a/core/assets-raw/sprites/blocks/drills/blast-drill-top.png and b/core/assets-raw/sprites/blocks/drills/blast-drill-top.png differ diff --git a/core/assets-raw/sprites/blocks/drills/blast-drill.png b/core/assets-raw/sprites/blocks/drills/blast-drill.png index a9c0f5adad..fcb9c57a1e 100644 Binary files a/core/assets-raw/sprites/blocks/drills/blast-drill.png and b/core/assets-raw/sprites/blocks/drills/blast-drill.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 611d85060b..45d006600c 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 fe87720d61..d4cf0ec730 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 106df26337..1b45be8083 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 1cf4fb002b..b183f080d3 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 ea92f17aa3..23fe1726e8 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 da0eebdebd..6cbbd821fd 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 c70a4e2b7c..8b888ae205 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-liquid.png b/core/assets-raw/sprites/blocks/drills/oil-extractor-liquid.png index f6b000dea0..9a058e3fc9 100644 Binary files a/core/assets-raw/sprites/blocks/drills/oil-extractor-liquid.png and b/core/assets-raw/sprites/blocks/drills/oil-extractor-liquid.png differ diff --git a/core/assets-raw/sprites/blocks/drills/oil-extractor-rotator.png b/core/assets-raw/sprites/blocks/drills/oil-extractor-rotator.png index ec3082b7a3..ced2a08d0e 100644 Binary files a/core/assets-raw/sprites/blocks/drills/oil-extractor-rotator.png and b/core/assets-raw/sprites/blocks/drills/oil-extractor-rotator.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 ab6dbb8f03..f9c9008ed0 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 b67aa00eb5..08af487136 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-rotator.png b/core/assets-raw/sprites/blocks/drills/pneumatic-drill-rotator.png index dc86b53b12..98ab08b0ea 100644 Binary files a/core/assets-raw/sprites/blocks/drills/pneumatic-drill-rotator.png and b/core/assets-raw/sprites/blocks/drills/pneumatic-drill-rotator.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 b718b71283..7d9e100498 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 1277139c04..a265034fef 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 047d3a7b2a..0c48f91821 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-rotator.png b/core/assets-raw/sprites/blocks/drills/water-extractor-rotator.png index f4d0d76401..c20a0aea4c 100644 Binary files a/core/assets-raw/sprites/blocks/drills/water-extractor-rotator.png and b/core/assets-raw/sprites/blocks/drills/water-extractor-rotator.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 def4187b1c..96e7c4482b 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 1a34e8c652..1a0a42382c 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/char1.png b/core/assets-raw/sprites/blocks/environment/char1.png index 47203a89c7..d8a1dae14f 100644 Binary files a/core/assets-raw/sprites/blocks/environment/char1.png and b/core/assets-raw/sprites/blocks/environment/char1.png differ diff --git a/core/assets-raw/sprites/blocks/environment/char2.png b/core/assets-raw/sprites/blocks/environment/char2.png index 7ded27b4fd..c37787ba4f 100644 Binary files a/core/assets-raw/sprites/blocks/environment/char2.png and b/core/assets-raw/sprites/blocks/environment/char2.png differ diff --git a/core/assets-raw/sprites/blocks/environment/char3.png b/core/assets-raw/sprites/blocks/environment/char3.png index 482ecb48ab..c45e69823a 100644 Binary files a/core/assets-raw/sprites/blocks/environment/char3.png and b/core/assets-raw/sprites/blocks/environment/char3.png differ diff --git a/core/assets-raw/sprites/blocks/environment/cliffs1.png b/core/assets-raw/sprites/blocks/environment/cliffs1.png index f07190276d..52b99e2de6 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 45622ba8a2..a65216e00d 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 bc54f9fbd2..9cf4691919 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 7003405d7f..5f2cf4730f 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 22ebe9e501..c7b4dcc9ed 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 1dec4de47f..d62a9f201a 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 57e10aab06..47128d4f81 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 e819484335..4b2172bc61 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 f33ee31d60..1170ab3c4f 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 36a73ab5a5..9a23d383f7 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 57c362e366..3d77e3080f 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/craters5.png b/core/assets-raw/sprites/blocks/environment/craters5.png index 684ebd3e2b..d163324486 100644 Binary files a/core/assets-raw/sprites/blocks/environment/craters5.png and b/core/assets-raw/sprites/blocks/environment/craters5.png differ diff --git a/core/assets-raw/sprites/blocks/environment/craters6.png b/core/assets-raw/sprites/blocks/environment/craters6.png index 2ee1c2dfd1..a504bcf640 100644 Binary files a/core/assets-raw/sprites/blocks/environment/craters6.png and b/core/assets-raw/sprites/blocks/environment/craters6.png differ diff --git a/core/assets-raw/sprites/blocks/environment/creeptree.png b/core/assets-raw/sprites/blocks/environment/creeptree.png deleted file mode 100644 index 7f50d064fc..0000000000 Binary files a/core/assets-raw/sprites/blocks/environment/creeptree.png and /dev/null 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 1d3f1286e3..2b30255f53 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 628ab6f6a3..907b253157 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 048f1f88ff..3eb3558f6c 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 5127bcd8ae..3035832574 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 58bfca2b27..cead3de9bc 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 098dfbf429..bf321e76a6 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 4d15be6b8d..0a76f30595 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 7b52b05aa7..3f3c511fe4 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 1fdc58d411..6ff46b0373 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_replacement/blocks/environment/darksand-tainted-water.png b/core/assets-raw/sprites/blocks/environment/darksand-tainted-water.png similarity index 100% rename from core/assets-raw/sprites_replacement/blocks/environment/darksand-tainted-water.png rename to core/assets-raw/sprites/blocks/environment/darksand-tainted-water.png diff --git a/core/assets-raw/sprites_replacement/blocks/environment/darksand-water.png b/core/assets-raw/sprites/blocks/environment/darksand-water.png similarity index 100% rename from core/assets-raw/sprites_replacement/blocks/environment/darksand-water.png rename to core/assets-raw/sprites/blocks/environment/darksand-water.png diff --git a/core/assets-raw/sprites/blocks/environment/darksand1.png b/core/assets-raw/sprites/blocks/environment/darksand1.png index aa70565c08..0478f5a78d 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 82c0b9e074..2ee445aba9 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 942a1b2574..f6e829199b 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 869752084b..2389c5985d 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/dunerocks-large.png b/core/assets-raw/sprites/blocks/environment/dunerocks-large.png index 7139941920..23082592c7 100644 Binary files a/core/assets-raw/sprites/blocks/environment/dunerocks-large.png and b/core/assets-raw/sprites/blocks/environment/dunerocks-large.png differ diff --git a/core/assets-raw/sprites/blocks/environment/dunerocks1.png b/core/assets-raw/sprites/blocks/environment/dunerocks1.png index c13f3b73f2..923945dd74 100644 Binary files a/core/assets-raw/sprites/blocks/environment/dunerocks1.png and b/core/assets-raw/sprites/blocks/environment/dunerocks1.png differ diff --git a/core/assets-raw/sprites/blocks/environment/dunerocks2.png b/core/assets-raw/sprites/blocks/environment/dunerocks2.png index 11d9c15cba..85783da449 100644 Binary files a/core/assets-raw/sprites/blocks/environment/dunerocks2.png and b/core/assets-raw/sprites/blocks/environment/dunerocks2.png differ diff --git a/core/assets-raw/sprites/blocks/environment/edge-stencil.png b/core/assets-raw/sprites/blocks/environment/edge-stencil.png new file mode 100644 index 0000000000..4d45e75fde Binary files /dev/null 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 new file mode 100644 index 0000000000..566dd28288 Binary files /dev/null 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 new file mode 100644 index 0000000000..98d675f453 Binary files /dev/null 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 abc7231016..adf810314d 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 33d2cef85f..2f37e91369 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 a0e5014795..704219e7f9 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 7e9ea228b2..cc68b49c90 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 1c0c94d197..1c74d19a1b 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 928118bee8..008f5a85f1 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 5cb74267f6..d331a9b07c 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 b26e6dddd7..5bfe3110eb 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 b2bb2e1a47..1d37b221a3 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 23764ff1cc..d671587375 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 538943b64c..115a8a08a2 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 2e56e2e7e7..944fb54588 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 f27c916fa2..7e3bfcedfa 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 463317a9d2..9a2643a694 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 21e0023570..08821cc029 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 79671701fa..4a9ffd8e52 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 ca5db6fedf..8e11fd1ddf 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 b2dd1a0cee..9b2cd18d2f 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 cde4186e52..fff2086d21 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 536e8d995b..da2c7412b7 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 6ba51e5957..e303b57082 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 7cf39fcfeb..ea20a9261d 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 bb32711c3a..7741575e00 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 0c54609e7b..c7e5ab676a 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 68ef3a28e7..a25af14de1 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 dfab8e2f30..7360fb1690 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 66f3080629..7516823fc6 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 d4930278d5..563338725b 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-3.png b/core/assets-raw/sprites/blocks/environment/metal-floor-3.png index f16fde60bb..7fbb9243b4 100644 Binary files a/core/assets-raw/sprites/blocks/environment/metal-floor-3.png and b/core/assets-raw/sprites/blocks/environment/metal-floor-3.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 b2fe8c279d..ed2bc67e17 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_replacement/blocks/environment/metal-floor-damaged1.png b/core/assets-raw/sprites/blocks/environment/metal-floor-damaged1.png similarity index 100% rename from core/assets-raw/sprites_replacement/blocks/environment/metal-floor-damaged1.png rename to core/assets-raw/sprites/blocks/environment/metal-floor-damaged1.png diff --git a/core/assets-raw/sprites_replacement/blocks/environment/metal-floor-damaged2.png b/core/assets-raw/sprites/blocks/environment/metal-floor-damaged2.png similarity index 100% rename from core/assets-raw/sprites_replacement/blocks/environment/metal-floor-damaged2.png rename to core/assets-raw/sprites/blocks/environment/metal-floor-damaged2.png diff --git a/core/assets-raw/sprites_replacement/blocks/environment/metal-floor-damaged3.png b/core/assets-raw/sprites/blocks/environment/metal-floor-damaged3.png similarity index 100% rename from core/assets-raw/sprites_replacement/blocks/environment/metal-floor-damaged3.png rename to core/assets-raw/sprites/blocks/environment/metal-floor-damaged3.png diff --git a/core/assets-raw/sprites/blocks/environment/metal-floor.png b/core/assets-raw/sprites/blocks/environment/metal-floor.png index c030a04fa1..d0085b65d9 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 924b902506..800bb05170 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 3719205bea..2d338650e1 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 65ca4ca767..e840a1936a 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 28d2e8fe26..81baa64bd5 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 e1f1679a9b..7b11d5fc17 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 74c2388174..39b1ebd9c5 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 643932c15b..1642bbbfd0 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 034b6b2fb6..f5fbeae6eb 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 9f29ee1517..df9303897d 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/rocks-large.png b/core/assets-raw/sprites/blocks/environment/rocks-large.png index 391ce2f941..b967a8a367 100644 Binary files a/core/assets-raw/sprites/blocks/environment/rocks-large.png and b/core/assets-raw/sprites/blocks/environment/rocks-large.png differ diff --git a/core/assets-raw/sprites/blocks/environment/rocks1.png b/core/assets-raw/sprites/blocks/environment/rocks1.png index 907519e3a9..7179dbe50d 100644 Binary files a/core/assets-raw/sprites/blocks/environment/rocks1.png and b/core/assets-raw/sprites/blocks/environment/rocks1.png differ diff --git a/core/assets-raw/sprites/blocks/environment/rocks2.png b/core/assets-raw/sprites/blocks/environment/rocks2.png index e9b0151176..9b83808267 100644 Binary files a/core/assets-raw/sprites/blocks/environment/rocks2.png and b/core/assets-raw/sprites/blocks/environment/rocks2.png differ diff --git a/core/assets-raw/sprites_replacement/blocks/environment/salt.png b/core/assets-raw/sprites/blocks/environment/salt.png similarity index 100% rename from core/assets-raw/sprites_replacement/blocks/environment/salt.png rename to core/assets-raw/sprites/blocks/environment/salt.png diff --git a/core/assets-raw/sprites/blocks/environment/saltrocks-large.png b/core/assets-raw/sprites/blocks/environment/saltrocks-large.png index 93c9d32da7..f0ec9c74f3 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 0c5f64d1b6..5ad770404e 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 fa9643f794..b44d62eba4 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_replacement/blocks/environment/sand-water.png b/core/assets-raw/sprites/blocks/environment/sand-water.png similarity index 100% rename from core/assets-raw/sprites_replacement/blocks/environment/sand-water.png rename to core/assets-raw/sprites/blocks/environment/sand-water.png diff --git a/core/assets-raw/sprites/blocks/environment/sand1.png b/core/assets-raw/sprites/blocks/environment/sand1.png index 348aa527c2..ae4fe3c363 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 47a14cdb84..2d6b23f129 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 f66cb0f33d..b03562c494 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 968b6ce405..ff3efd9395 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 a9a76d7a83..2217bbd5e0 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 a795170808..b2dacd5abf 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 2a72eb2a06..9fb8fb03f2 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 dd2503dfce..f133d159f5 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 39c65cc1b0..f602404e34 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 66f88b2a06..ed47edab22 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 4b45697887..1d54fe6d4a 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 81110df96b..6f242df279 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 2ae6234529..2edf629f90 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 dde6687dea..95382a191c 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/shalerocks-large.png b/core/assets-raw/sprites/blocks/environment/shalerocks-large.png index ec311cc1fc..325945d278 100644 Binary files a/core/assets-raw/sprites/blocks/environment/shalerocks-large.png and b/core/assets-raw/sprites/blocks/environment/shalerocks-large.png differ diff --git a/core/assets-raw/sprites/blocks/environment/shalerocks1.png b/core/assets-raw/sprites/blocks/environment/shalerocks1.png index d8af4693e9..f489ee1d03 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 7a8d8b178b..356255acb4 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 b155b297cd..dd0b6612d9 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 38e9848fc8..caff49a543 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 6989198ea6..a4f583d86f 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/snow1.png b/core/assets-raw/sprites/blocks/environment/snow1.png index 25042c14c5..39f893df24 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 2ef4c13aca..3d1a76608d 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 79c9b36ab7..c52f98cdae 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 4b588fd1ca..5c3a702ccd 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 ee3ec6ad9c..c25c544910 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 2e5047e702..01cfa406f8 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 0f91b13def..32bb74348d 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 24a26a54fe..8ddeafa1ff 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/spawn.png b/core/assets-raw/sprites/blocks/environment/spawn.png new file mode 100644 index 0000000000..dc1a4c30a7 Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/spawn.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 89a95e4f5f..9e3738039b 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 c8975c0472..4aaa8d86e3 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 c1a4749033..57462c7762 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 140e0023c6..b1e7fbbf34 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 03b6b94fef..cf05c4279e 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 d1349bebe6..8b519681f9 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_replacement/blocks/environment/spore-pine.png b/core/assets-raw/sprites/blocks/environment/spore-pine.png similarity index 100% rename from core/assets-raw/sprites_replacement/blocks/environment/spore-pine.png rename to core/assets-raw/sprites/blocks/environment/spore-pine.png diff --git a/core/assets-raw/sprites/blocks/environment/sporerocks-large.png b/core/assets-raw/sprites/blocks/environment/sporerocks-large.png index 43f842fbca..4153ac2798 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 8567468ec4..9672003dfb 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 a3ce58c7ae..668e3d2cc6 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 684ebd3e2b..e9f42a172d 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 2ee1c2dfd1..09bc9f3e5a 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 baf4ec6835..ca2487d441 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_replacement/blocks/environment/tainted-water.png b/core/assets-raw/sprites/blocks/environment/tainted-water.png similarity index 100% rename from core/assets-raw/sprites_replacement/blocks/environment/tainted-water.png rename to core/assets-raw/sprites/blocks/environment/tainted-water.png diff --git a/core/assets-raw/sprites/blocks/environment/tar.png b/core/assets-raw/sprites/blocks/environment/tar.png index f84183e17b..8ad3f8ec68 100644 Binary files a/core/assets-raw/sprites/blocks/environment/tar.png and b/core/assets-raw/sprites/blocks/environment/tar.png differ diff --git a/core/assets-raw/sprites_replacement/blocks/environment/tendrils1.png b/core/assets-raw/sprites/blocks/environment/tendrils1.png similarity index 100% rename from core/assets-raw/sprites_replacement/blocks/environment/tendrils1.png rename to core/assets-raw/sprites/blocks/environment/tendrils1.png diff --git a/core/assets-raw/sprites_replacement/blocks/environment/tendrils2.png b/core/assets-raw/sprites/blocks/environment/tendrils2.png similarity index 100% rename from core/assets-raw/sprites_replacement/blocks/environment/tendrils2.png rename to core/assets-raw/sprites/blocks/environment/tendrils2.png diff --git a/core/assets-raw/sprites_replacement/blocks/environment/tendrils3.png b/core/assets-raw/sprites/blocks/environment/tendrils3.png similarity index 100% rename from core/assets-raw/sprites_replacement/blocks/environment/tendrils3.png rename to core/assets-raw/sprites/blocks/environment/tendrils3.png diff --git a/core/assets-raw/sprites/blocks/environment/thorium1.png b/core/assets-raw/sprites/blocks/environment/thorium1.png index db7eddcd84..ce0de1271c 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 90a182d71a..9372bf6f81 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 0872ffb168..de787e98a6 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 95bc34dd60..9ba087608a 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 68d021abe7..c6add6ad54 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 e4bb5b45dd..946f55ab46 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_replacement/blocks/environment/water.png b/core/assets-raw/sprites/blocks/environment/water.png similarity index 100% rename from core/assets-raw/sprites_replacement/blocks/environment/water.png rename to core/assets-raw/sprites/blocks/environment/water.png 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 adc18507bb..4831e1879e 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 a6e26a8ede..af2b61c5ca 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 f28df6c095..415c5a6849 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-middle.png b/core/assets-raw/sprites/blocks/extra/block-middle.png index 1b6c55fb87..2a856aef48 100644 Binary files a/core/assets-raw/sprites/blocks/extra/block-middle.png and b/core/assets-raw/sprites/blocks/extra/block-middle.png differ diff --git a/core/assets-raw/sprites_replacement/blocks/extra/block-select.png b/core/assets-raw/sprites/blocks/extra/block-select.png similarity index 100% rename from core/assets-raw/sprites_replacement/blocks/extra/block-select.png rename to core/assets-raw/sprites/blocks/extra/block-select.png diff --git a/core/assets-raw/sprites/blocks/extra/conduit-liquid.png b/core/assets-raw/sprites/blocks/extra/conduit-liquid.png index 231db3568c..24d37b73c8 100644 Binary files a/core/assets-raw/sprites/blocks/extra/conduit-liquid.png and b/core/assets-raw/sprites/blocks/extra/conduit-liquid.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 e9a33f74c1..5ae905b23f 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/extra/rubble-1-0.png b/core/assets-raw/sprites/blocks/extra/rubble-1-0.png index 9fb247b258..6da7d9e583 100644 Binary files a/core/assets-raw/sprites/blocks/extra/rubble-1-0.png and b/core/assets-raw/sprites/blocks/extra/rubble-1-0.png differ diff --git a/core/assets-raw/sprites/blocks/extra/rubble-1-1.png b/core/assets-raw/sprites/blocks/extra/rubble-1-1.png index 0ab8fc42cc..354f448d7e 100644 Binary files a/core/assets-raw/sprites/blocks/extra/rubble-1-1.png and b/core/assets-raw/sprites/blocks/extra/rubble-1-1.png differ diff --git a/core/assets-raw/sprites/blocks/extra/rubble-2-0.png b/core/assets-raw/sprites/blocks/extra/rubble-2-0.png index ff0eceb5ec..406e27a2f9 100644 Binary files a/core/assets-raw/sprites/blocks/extra/rubble-2-0.png and b/core/assets-raw/sprites/blocks/extra/rubble-2-0.png differ diff --git a/core/assets-raw/sprites/blocks/extra/rubble-2-1.png b/core/assets-raw/sprites/blocks/extra/rubble-2-1.png index 0fdfd0d596..57e13f6c02 100644 Binary files a/core/assets-raw/sprites/blocks/extra/rubble-2-1.png and b/core/assets-raw/sprites/blocks/extra/rubble-2-1.png differ diff --git a/core/assets-raw/sprites/blocks/extra/rubble-3-0.png b/core/assets-raw/sprites/blocks/extra/rubble-3-0.png index 6612263705..83853df7a2 100644 Binary files a/core/assets-raw/sprites/blocks/extra/rubble-3-0.png and b/core/assets-raw/sprites/blocks/extra/rubble-3-0.png differ diff --git a/core/assets-raw/sprites/blocks/extra/rubble-3-1.png b/core/assets-raw/sprites/blocks/extra/rubble-3-1.png index 6612263705..83853df7a2 100644 Binary files a/core/assets-raw/sprites/blocks/extra/rubble-3-1.png and b/core/assets-raw/sprites/blocks/extra/rubble-3-1.png differ diff --git a/core/assets-raw/sprites/blocks/extra/rubble-4-0.png b/core/assets-raw/sprites/blocks/extra/rubble-4-0.png index 91c1fc9749..f937d25c8e 100644 Binary files a/core/assets-raw/sprites/blocks/extra/rubble-4-0.png and b/core/assets-raw/sprites/blocks/extra/rubble-4-0.png differ diff --git a/core/assets-raw/sprites/blocks/extra/rubble-4-1.png b/core/assets-raw/sprites/blocks/extra/rubble-4-1.png index 91c1fc9749..f937d25c8e 100644 Binary files a/core/assets-raw/sprites/blocks/extra/rubble-4-1.png and b/core/assets-raw/sprites/blocks/extra/rubble-4-1.png differ diff --git a/core/assets-raw/sprites/blocks/extra/spawn.png b/core/assets-raw/sprites/blocks/extra/spawn.png deleted file mode 100644 index fccd4354e9..0000000000 Binary files a/core/assets-raw/sprites/blocks/extra/spawn.png and /dev/null 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 4a2f7fb61f..2c88950956 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-bridge.png b/core/assets-raw/sprites/blocks/liquid/bridge-conduit-bridge.png index 2dfdcba3a0..bfb44d16b6 100644 Binary files a/core/assets-raw/sprites/blocks/liquid/bridge-conduit-bridge.png and b/core/assets-raw/sprites/blocks/liquid/bridge-conduit-bridge.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 0919ee1fb9..4fe3d03201 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 6d410e4829..6b10c50140 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-0.png b/core/assets-raw/sprites/blocks/liquid/conduit-bottom-0.png index 070468711d..b5f2d11a9a 100644 Binary files a/core/assets-raw/sprites/blocks/liquid/conduit-bottom-0.png and b/core/assets-raw/sprites/blocks/liquid/conduit-bottom-0.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 2500feaa67..7153704def 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 42bd75f1bb..7d5b6fb9f9 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 9ecfcdf88c..977188d577 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 32755ce6fe..0328b79b3e 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 49137fe492..e7ef35006f 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 622c40021b..9b4b292794 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 feab88d240..4908fa83c9 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 99a4199802..9dc9384971 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 004959c5df..e219a5751d 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 ad65e04ad2..30d039d2d8 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 637a38ab9c..c7feafdfa8 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 98cb3e39f6..58ab8e6927 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 35e2236735..72461ba0b6 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 035dde1e32..d30fc7a8b6 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 a0b9dc4d11..0b0ad5344d 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-router-bottom.png b/core/assets-raw/sprites/blocks/liquid/liquid-router-bottom.png index 248aa61266..75b058a987 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 710b2b325d..a32ca6161a 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 484b27d7f9..53e880b826 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 b3d4a432a9..b4743171f0 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 4588b7f33e..6ce6c746da 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 2f7ce0005b..9455df4454 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 f7d2ebe4cb..dcc74a737a 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 60914f7fb1..858a02861c 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-bridge.png b/core/assets-raw/sprites/blocks/liquid/phase-conduit-bridge.png index dd722d24ac..e681a09e98 100644 Binary files a/core/assets-raw/sprites/blocks/liquid/phase-conduit-bridge.png and b/core/assets-raw/sprites/blocks/liquid/phase-conduit-bridge.png differ diff --git a/core/assets-raw/sprites/blocks/liquid/phase-conduit-end.png b/core/assets-raw/sprites/blocks/liquid/phase-conduit-end.png index 3c05672345..cdcc52224b 100644 Binary files a/core/assets-raw/sprites/blocks/liquid/phase-conduit-end.png and b/core/assets-raw/sprites/blocks/liquid/phase-conduit-end.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 245ad00611..9443960074 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/pulse-conduit-top-0.png b/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-0.png index 9198c3703a..c6a453fed9 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 7755bf244c..62f03471c4 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 00a4a503c3..3cea1a8e8d 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 d1a2a244c8..657e292eeb 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 8a8549093d..0dda362ff1 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 43f474b93b..7ada32da91 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 72cd323b46..f43d03fa16 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 52e1dc15cc..68aa196101 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 a62d3d2418..807fa4bc15 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-mech-pad.png b/core/assets-raw/sprites/blocks/mechs/dart-mech-pad.png index bce86581c8..70f16847d2 100644 Binary files a/core/assets-raw/sprites/blocks/mechs/dart-mech-pad.png and b/core/assets-raw/sprites/blocks/mechs/dart-mech-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 0163191de7..03f04549c6 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 574e63be17..d2f9db2a65 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 e9917c7571..0c98d4566a 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 d31cc5a7fd..0f3d98c97e 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 11bbef8ba8..f929bedde8 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 6d5fc11095..dd9d17e0dd 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.png b/core/assets-raw/sprites/blocks/power/battery-large.png index fb5c37bf18..5f7d9afc2c 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.png b/core/assets-raw/sprites/blocks/power/battery.png index 527ab35d5a..65593f2167 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 54726d68f6..8df8df9a57 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 bc22c6fc55..8fb412f555 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-top.png b/core/assets-raw/sprites/blocks/power/differential-generator-top.png index ae0c4cc026..0e1b4fda69 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 95ff31b79b..96ff71e8ac 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/impact-reactor-bottom.png b/core/assets-raw/sprites/blocks/power/impact-reactor-bottom.png index e43c25e404..8275642a0f 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-light.png b/core/assets-raw/sprites/blocks/power/impact-reactor-light.png index 51077471b4..0563c2a151 100644 Binary files a/core/assets-raw/sprites/blocks/power/impact-reactor-light.png and b/core/assets-raw/sprites/blocks/power/impact-reactor-light.png differ diff --git a/core/assets-raw/sprites/blocks/power/impact-reactor-plasma-0.png b/core/assets-raw/sprites/blocks/power/impact-reactor-plasma-0.png index e158a66961..bbbfe6a38c 100644 Binary files a/core/assets-raw/sprites/blocks/power/impact-reactor-plasma-0.png and b/core/assets-raw/sprites/blocks/power/impact-reactor-plasma-0.png differ diff --git a/core/assets-raw/sprites/blocks/power/impact-reactor-plasma-1.png b/core/assets-raw/sprites/blocks/power/impact-reactor-plasma-1.png index 111451409f..25cdb575f7 100644 Binary files a/core/assets-raw/sprites/blocks/power/impact-reactor-plasma-1.png and b/core/assets-raw/sprites/blocks/power/impact-reactor-plasma-1.png differ diff --git a/core/assets-raw/sprites/blocks/power/impact-reactor-plasma-2.png b/core/assets-raw/sprites/blocks/power/impact-reactor-plasma-2.png index bc3f9109a1..b50d0313d8 100644 Binary files a/core/assets-raw/sprites/blocks/power/impact-reactor-plasma-2.png and b/core/assets-raw/sprites/blocks/power/impact-reactor-plasma-2.png differ diff --git a/core/assets-raw/sprites/blocks/power/impact-reactor-plasma-3.png b/core/assets-raw/sprites/blocks/power/impact-reactor-plasma-3.png index 62466b9cad..21ee665e25 100644 Binary files a/core/assets-raw/sprites/blocks/power/impact-reactor-plasma-3.png and b/core/assets-raw/sprites/blocks/power/impact-reactor-plasma-3.png differ diff --git a/core/assets-raw/sprites/blocks/power/impact-reactor-top.png b/core/assets-raw/sprites/blocks/power/impact-reactor-top.png index 05e799b15f..ee89e87b5e 100644 Binary files a/core/assets-raw/sprites/blocks/power/impact-reactor-top.png and b/core/assets-raw/sprites/blocks/power/impact-reactor-top.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 ee7e403971..89bb2b8ca5 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 95d43bb0b2..0a76d7e1a7 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 2081207f2a..0e7296b98f 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 079397e307..f4c6473df4 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 4506ce2f99..fee2a2b3e8 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 5db51a87cc..f4b6d38c54 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 e68303af1d..bb33034b49 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 d226e9f8b8..782d792039 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 48f3deda02..0703c1be90 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 dfb3ad5eaf..ec9ab71c70 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/thermal-generator.png b/core/assets-raw/sprites/blocks/power/thermal-generator.png index a6d0e1135d..b0ad9dc496 100644 Binary files a/core/assets-raw/sprites/blocks/power/thermal-generator.png and b/core/assets-raw/sprites/blocks/power/thermal-generator.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 914758e9f4..10afc2e244 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 63ee995c34..2bc7d1baab 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 f1d7b96063..3d8ed983b0 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-top.png b/core/assets-raw/sprites/blocks/power/turbine-generator-top.png index 6a4d4b2f5b..c95d49851a 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 246f90efe9..aa302411ee 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 bef438ec0e..aa106fffa3 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 3226e4efb9..048022a525 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 3ba57b3638..7bb42d17ac 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 31258cfb90..d32ffe368b 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 44c8fc2629..4a97b6c5ff 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 48b80363ae..a7a0aa14af 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 e32657f59e..26fe248540 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 777e48848c..29f0d1fcf4 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 dc29af6e09..fd33bf6210 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 6869527fcf..6d1eecd2b0 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 57d5c43969..b4d7a2e255 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 62aa3ad591..9c20fa5308 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 b2cb50b64f..b384226e5f 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 ebd286c3ac..473040a95d 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 d6dcef23ef..336852ceee 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 58248d838f..67e03032c2 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 b345a398e2..2c493d30f5 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/melter.png b/core/assets-raw/sprites/blocks/production/melter.png index aa57e3c0f4..7502a32e17 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 effe30d689..5fea3ff19f 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-bottom.png b/core/assets-raw/sprites/blocks/production/phase-weaver-bottom.png index 7765bb72e4..17518b9014 100644 Binary files a/core/assets-raw/sprites/blocks/production/phase-weaver-bottom.png and b/core/assets-raw/sprites/blocks/production/phase-weaver-bottom.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 e3ca869e32..b016588b17 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 cf6b24a25e..0192b0e5dd 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 d12e1c1e67..2e8dc35787 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 afdcb7006c..522b6f8b88 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 56d7b4a878..c39062caa2 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 0a215af405..cc51a06fa5 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 7bb98b9f61..f53fd4f8f4 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 ca6b893e8b..d7d33d09aa 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-liquid.png b/core/assets-raw/sprites/blocks/production/separator-liquid.png index e5ff06ade7..af231fedb5 100644 Binary files a/core/assets-raw/sprites/blocks/production/separator-liquid.png and b/core/assets-raw/sprites/blocks/production/separator-liquid.png differ diff --git a/core/assets-raw/sprites/blocks/production/separator.png b/core/assets-raw/sprites/blocks/production/separator.png index 6f628f9255..a3810f08d8 100644 Binary files a/core/assets-raw/sprites/blocks/production/separator.png and b/core/assets-raw/sprites/blocks/production/separator.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 d6dcef23ef..6120871f13 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 a1e7a82e89..72a92aea73 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/smelter.png b/core/assets-raw/sprites/blocks/production/smelter.png deleted file mode 100644 index 9028c08251..0000000000 Binary files a/core/assets-raw/sprites/blocks/production/smelter.png and /dev/null differ diff --git a/core/assets-raw/sprites/blocks/production/spore-press-frame0.png b/core/assets-raw/sprites/blocks/production/spore-press-frame0.png index 4b646157a2..73ed9f86a9 100644 Binary files a/core/assets-raw/sprites/blocks/production/spore-press-frame0.png and b/core/assets-raw/sprites/blocks/production/spore-press-frame0.png differ diff --git a/core/assets-raw/sprites/blocks/production/spore-press-frame1.png b/core/assets-raw/sprites/blocks/production/spore-press-frame1.png index 1b8efd7534..ef61bd309c 100644 Binary files a/core/assets-raw/sprites/blocks/production/spore-press-frame1.png and b/core/assets-raw/sprites/blocks/production/spore-press-frame1.png differ diff --git a/core/assets-raw/sprites/blocks/production/spore-press-frame2.png b/core/assets-raw/sprites/blocks/production/spore-press-frame2.png index 404487235d..f527f3146c 100644 Binary files a/core/assets-raw/sprites/blocks/production/spore-press-frame2.png and b/core/assets-raw/sprites/blocks/production/spore-press-frame2.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 1ea7069753..b6ee31e12a 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 29ef5f54c7..1856922336 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 4b06633f50..414cebdb9c 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 66c2f17fb2..ca98f41fd3 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 83e3b25c9f..1304e5500d 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 9619e83c9d..90c5a6c1f4 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-top.png b/core/assets-raw/sprites/blocks/storage/core-shard-top.png deleted file mode 100644 index ceb1bce59e..0000000000 Binary files a/core/assets-raw/sprites/blocks/storage/core-shard-top.png and /dev/null differ diff --git a/core/assets-raw/sprites/blocks/storage/core-shard.png b/core/assets-raw/sprites/blocks/storage/core-shard.png index 959c12a291..44c445aaa8 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/launch-pad-large.png b/core/assets-raw/sprites/blocks/storage/launch-pad-large.png index 10148c4853..ac04aef1c4 100644 Binary files a/core/assets-raw/sprites/blocks/storage/launch-pad-large.png and b/core/assets-raw/sprites/blocks/storage/launch-pad-large.png differ diff --git a/core/assets-raw/sprites/blocks/storage/launch-pad.png b/core/assets-raw/sprites/blocks/storage/launch-pad.png index cc192f5edb..020670ad28 100644 Binary files a/core/assets-raw/sprites/blocks/storage/launch-pad.png and b/core/assets-raw/sprites/blocks/storage/launch-pad.png differ diff --git a/core/assets-raw/sprites/blocks/storage/sortedunloader.png b/core/assets-raw/sprites/blocks/storage/sortedunloader.png deleted file mode 100644 index 8d27db0b21..0000000000 Binary files a/core/assets-raw/sprites/blocks/storage/sortedunloader.png and /dev/null differ diff --git a/core/assets-raw/sprites/blocks/storage/unloader.png b/core/assets-raw/sprites/blocks/storage/unloader.png index 776c9250f3..39ec7a30a5 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 5e20102b8a..e82235cc75 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-heat.png b/core/assets-raw/sprites/blocks/turrets/arc-heat.png index 8cb4340f9e..de36f57ce4 100644 Binary files a/core/assets-raw/sprites/blocks/turrets/arc-heat.png and b/core/assets-raw/sprites/blocks/turrets/arc-heat.png differ diff --git a/core/assets-raw/sprites/blocks/turrets/arc.png b/core/assets-raw/sprites/blocks/turrets/arc.png index 18fcfdc59f..5231db0265 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 1d6006fd8b..43a8576c0f 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 2a1522f8fb..b425980c32 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 019c25f183..4997c7fc3e 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 29c4990489..7206b69d95 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 19bcb421f8..84d62394dc 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 68873f34e0..efcdb60832 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 a8875a7664..d142523a22 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-heat.png b/core/assets-raw/sprites/blocks/turrets/hail-heat.png index ca1d3121d5..daad1ac936 100644 Binary files a/core/assets-raw/sprites/blocks/turrets/hail-heat.png and b/core/assets-raw/sprites/blocks/turrets/hail-heat.png differ diff --git a/core/assets-raw/sprites/blocks/turrets/hail.png b/core/assets-raw/sprites/blocks/turrets/hail.png index 7f74cc57d8..77aa236fa3 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-heat.png b/core/assets-raw/sprites/blocks/turrets/lancer-heat.png index 72def3cdf6..1327410b66 100644 Binary files a/core/assets-raw/sprites/blocks/turrets/lancer-heat.png and b/core/assets-raw/sprites/blocks/turrets/lancer-heat.png differ diff --git a/core/assets-raw/sprites/blocks/turrets/lancer.png b/core/assets-raw/sprites/blocks/turrets/lancer.png index cb4a837ebb..2a998ac328 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-heat.png b/core/assets-raw/sprites/blocks/turrets/meltdown-heat.png index a66d7c4ee5..e9b1fc0ed3 100644 Binary files a/core/assets-raw/sprites/blocks/turrets/meltdown-heat.png and b/core/assets-raw/sprites/blocks/turrets/meltdown-heat.png differ diff --git a/core/assets-raw/sprites/blocks/turrets/meltdown.png b/core/assets-raw/sprites/blocks/turrets/meltdown.png index 6444f9a941..1d0b7aba73 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-heat.png b/core/assets-raw/sprites/blocks/turrets/ripple-heat.png index fff3a05312..6b88b97cb3 100644 Binary files a/core/assets-raw/sprites/blocks/turrets/ripple-heat.png and b/core/assets-raw/sprites/blocks/turrets/ripple-heat.png differ diff --git a/core/assets-raw/sprites/blocks/turrets/ripple.png b/core/assets-raw/sprites/blocks/turrets/ripple.png index 27fc308592..0dddade4fc 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-heat.png b/core/assets-raw/sprites/blocks/turrets/salvo-heat.png index a13b2f90cc..5022fafc1d 100644 Binary files a/core/assets-raw/sprites/blocks/turrets/salvo-heat.png and b/core/assets-raw/sprites/blocks/turrets/salvo-heat.png differ diff --git a/core/assets-raw/sprites/blocks/turrets/salvo-panel-left.png b/core/assets-raw/sprites/blocks/turrets/salvo-panel-left.png index 7af10f8a23..de0af2f724 100644 Binary files a/core/assets-raw/sprites/blocks/turrets/salvo-panel-left.png and b/core/assets-raw/sprites/blocks/turrets/salvo-panel-left.png differ diff --git a/core/assets-raw/sprites/blocks/turrets/salvo-panel-right.png b/core/assets-raw/sprites/blocks/turrets/salvo-panel-right.png index 180344eea8..462f082f2a 100644 Binary files a/core/assets-raw/sprites/blocks/turrets/salvo-panel-right.png and b/core/assets-raw/sprites/blocks/turrets/salvo-panel-right.png differ diff --git a/core/assets-raw/sprites/blocks/turrets/salvo.png b/core/assets-raw/sprites/blocks/turrets/salvo.png index 9527912c07..2f222833c1 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 d1b98c75bc..5c792708e8 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-heat.png b/core/assets-raw/sprites/blocks/turrets/scorch-heat.png index ba5b47935e..84863ae266 100644 Binary files a/core/assets-raw/sprites/blocks/turrets/scorch-heat.png and b/core/assets-raw/sprites/blocks/turrets/scorch-heat.png differ diff --git a/core/assets-raw/sprites/blocks/turrets/scorch.png b/core/assets-raw/sprites/blocks/turrets/scorch.png index a1fb61f657..3a20d8fd95 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 18c1b7e7da..f0e0ed7f64 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 08ccc5ac62..1672cd8e8e 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 88568eb468..289f824356 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 05a115eb68..458b42bfb8 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/crawler-factory-top-open.png b/core/assets-raw/sprites/blocks/units/crawler-factory-top-open.png deleted file mode 100644 index 8a41754b19..0000000000 Binary files a/core/assets-raw/sprites/blocks/units/crawler-factory-top-open.png and /dev/null 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 79816238f7..32c053ef19 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 144156ae68..72105e12eb 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-open.png b/core/assets-raw/sprites/blocks/units/dagger-factory-top-open.png deleted file mode 100644 index c4625ff0e5..0000000000 Binary files a/core/assets-raw/sprites/blocks/units/dagger-factory-top-open.png and /dev/null 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 df47c999a8..3297ef4435 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 144156ae68..72105e12eb 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/fortress-factory-top-open.png b/core/assets-raw/sprites/blocks/units/fortress-factory-top-open.png deleted file mode 100644 index f47586f6b6..0000000000 Binary files a/core/assets-raw/sprites/blocks/units/fortress-factory-top-open.png and /dev/null 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 edbff201e8..0686a2c329 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 716fd0a9cf..136bf7754d 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-open.png b/core/assets-raw/sprites/blocks/units/ghoul-factory-top-open.png deleted file mode 100644 index f47586f6b6..0000000000 Binary files a/core/assets-raw/sprites/blocks/units/ghoul-factory-top-open.png and /dev/null 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 edbff201e8..0686a2c329 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 9fe71323cf..38566929b8 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-open.png b/core/assets-raw/sprites/blocks/units/phantom-factory-top-open.png deleted file mode 100644 index b523405918..0000000000 Binary files a/core/assets-raw/sprites/blocks/units/phantom-factory-top-open.png and /dev/null 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 e23e8ffa2b..1107f27d6c 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 144156ae68..72105e12eb 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/repair-point-base.png b/core/assets-raw/sprites/blocks/units/repair-point-base.png index cbddf2f48a..d5ead6f001 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 b01b4bde05..a0f6c69e45 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-open.png b/core/assets-raw/sprites/blocks/units/revenant-factory-top-open.png deleted file mode 100644 index 570f92dc80..0000000000 Binary files a/core/assets-raw/sprites/blocks/units/revenant-factory-top-open.png and /dev/null 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 e0940d5486..79ca249876 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 3388b2cc76..acc7389987 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-open.png b/core/assets-raw/sprites/blocks/units/spirit-factory-top-open.png deleted file mode 100644 index 027540a97b..0000000000 Binary files a/core/assets-raw/sprites/blocks/units/spirit-factory-top-open.png and /dev/null 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 9e9b8033f8..c20fe8d186 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 144156ae68..72105e12eb 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-open.png b/core/assets-raw/sprites/blocks/units/titan-factory-top-open.png deleted file mode 100644 index f47586f6b6..0000000000 Binary files a/core/assets-raw/sprites/blocks/units/titan-factory-top-open.png and /dev/null 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 edbff201e8..0686a2c329 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 f798cd6418..83eecc696c 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-open.png b/core/assets-raw/sprites/blocks/units/wraith-factory-top-open.png deleted file mode 100644 index 26fdcb2528..0000000000 Binary files a/core/assets-raw/sprites/blocks/units/wraith-factory-top-open.png and /dev/null 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 fb03b837da..f1075f1097 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 144156ae68..72105e12eb 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 8f8ea8cfa3..e3b5102636 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 ebb4ef432d..6105f1ecf3 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 f696ab8d72..b66dfdace9 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 4f965b30f9..0736d8ca38 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 43ef798df0..0fbe23ebac 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 59e6f05401..2218e23067 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/phase-wall-large.png b/core/assets-raw/sprites/blocks/walls/phase-wall-large.png index 68a05def6f..3ebc1d33e0 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 6490d32088..7566b2b17a 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/scrap-wall-gigantic.png b/core/assets-raw/sprites/blocks/walls/scrap-wall-gigantic.png index 3146c493f8..a5ed4a3117 100644 Binary files a/core/assets-raw/sprites/blocks/walls/scrap-wall-gigantic.png and b/core/assets-raw/sprites/blocks/walls/scrap-wall-gigantic.png differ diff --git a/core/assets-raw/sprites/blocks/walls/scrap-wall-huge1.png b/core/assets-raw/sprites/blocks/walls/scrap-wall-huge1.png index b2b3c57b51..4a23912802 100644 Binary files a/core/assets-raw/sprites/blocks/walls/scrap-wall-huge1.png and b/core/assets-raw/sprites/blocks/walls/scrap-wall-huge1.png differ diff --git a/core/assets-raw/sprites/blocks/walls/scrap-wall-huge2.png b/core/assets-raw/sprites/blocks/walls/scrap-wall-huge2.png index 982649f167..aa87272b1c 100644 Binary files a/core/assets-raw/sprites/blocks/walls/scrap-wall-huge2.png and b/core/assets-raw/sprites/blocks/walls/scrap-wall-huge2.png differ diff --git a/core/assets-raw/sprites/blocks/walls/scrap-wall-huge3.png b/core/assets-raw/sprites/blocks/walls/scrap-wall-huge3.png index 02e2cd0a7a..04f1382d4d 100644 Binary files a/core/assets-raw/sprites/blocks/walls/scrap-wall-huge3.png and b/core/assets-raw/sprites/blocks/walls/scrap-wall-huge3.png differ diff --git a/core/assets-raw/sprites/blocks/walls/scrap-wall-large1.png b/core/assets-raw/sprites/blocks/walls/scrap-wall-large1.png index 7b420a30d3..6f5b66a672 100644 Binary files a/core/assets-raw/sprites/blocks/walls/scrap-wall-large1.png and b/core/assets-raw/sprites/blocks/walls/scrap-wall-large1.png differ diff --git a/core/assets-raw/sprites/blocks/walls/scrap-wall-large2.png b/core/assets-raw/sprites/blocks/walls/scrap-wall-large2.png index 0b0c955246..d271f8e16a 100644 Binary files a/core/assets-raw/sprites/blocks/walls/scrap-wall-large2.png and b/core/assets-raw/sprites/blocks/walls/scrap-wall-large2.png differ diff --git a/core/assets-raw/sprites/blocks/walls/scrap-wall-large3.png b/core/assets-raw/sprites/blocks/walls/scrap-wall-large3.png index e3ae01cb89..89bdcffae7 100644 Binary files a/core/assets-raw/sprites/blocks/walls/scrap-wall-large3.png and b/core/assets-raw/sprites/blocks/walls/scrap-wall-large3.png differ diff --git a/core/assets-raw/sprites/blocks/walls/scrap-wall-large4.png b/core/assets-raw/sprites/blocks/walls/scrap-wall-large4.png index 59002328c8..ef76eb0c51 100644 Binary files a/core/assets-raw/sprites/blocks/walls/scrap-wall-large4.png and b/core/assets-raw/sprites/blocks/walls/scrap-wall-large4.png differ diff --git a/core/assets-raw/sprites/blocks/walls/scrap-wall1.png b/core/assets-raw/sprites/blocks/walls/scrap-wall1.png index 736757a9d1..b0be0f2747 100644 Binary files a/core/assets-raw/sprites/blocks/walls/scrap-wall1.png and b/core/assets-raw/sprites/blocks/walls/scrap-wall1.png differ diff --git a/core/assets-raw/sprites/blocks/walls/scrap-wall2.png b/core/assets-raw/sprites/blocks/walls/scrap-wall2.png index ed6229481c..078bd13aa2 100644 Binary files a/core/assets-raw/sprites/blocks/walls/scrap-wall2.png and b/core/assets-raw/sprites/blocks/walls/scrap-wall2.png differ diff --git a/core/assets-raw/sprites/blocks/walls/scrap-wall3.png b/core/assets-raw/sprites/blocks/walls/scrap-wall3.png index 59dab303a3..de2e17d6f2 100644 Binary files a/core/assets-raw/sprites/blocks/walls/scrap-wall3.png and b/core/assets-raw/sprites/blocks/walls/scrap-wall3.png differ diff --git a/core/assets-raw/sprites/blocks/walls/scrap-wall4.png b/core/assets-raw/sprites/blocks/walls/scrap-wall4.png index 0c709a1049..0cd3df9ca4 100644 Binary files a/core/assets-raw/sprites/blocks/walls/scrap-wall4.png and b/core/assets-raw/sprites/blocks/walls/scrap-wall4.png differ diff --git a/core/assets-raw/sprites/blocks/walls/scrap-wall5.png b/core/assets-raw/sprites/blocks/walls/scrap-wall5.png index 0c709a1049..0cd3df9ca4 100644 Binary files a/core/assets-raw/sprites/blocks/walls/scrap-wall5.png and b/core/assets-raw/sprites/blocks/walls/scrap-wall5.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 e14c54697e..2c17759178 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 57ccaf61b0..154fb95ce8 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 6a62fe6a1e..0a6f50e3ba 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 c059ad0ed8..e4ccef59f4 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/thruster.png b/core/assets-raw/sprites/blocks/walls/thruster.png index 8531ab06b7..0725cc31b2 100644 Binary files a/core/assets-raw/sprites/blocks/walls/thruster.png and b/core/assets-raw/sprites/blocks/walls/thruster.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 d6f6fc4644..69194bf884 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 effbf52069..8eca3fe8a4 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_replacement/editor/block-border-editor.png b/core/assets-raw/sprites/editor/block-border-editor.png similarity index 100% rename from core/assets-raw/sprites_replacement/editor/block-border-editor.png rename to core/assets-raw/sprites/editor/block-border-editor.png diff --git a/core/assets-raw/sprites_replacement/editor/clear-editor.png b/core/assets-raw/sprites/editor/clear-editor.png similarity index 100% rename from core/assets-raw/sprites_replacement/editor/clear-editor.png rename to core/assets-raw/sprites/editor/clear-editor.png diff --git a/core/assets-raw/sprites_replacement/editor/pack.json b/core/assets-raw/sprites/editor/pack.json similarity index 100% rename from core/assets-raw/sprites_replacement/editor/pack.json rename to core/assets-raw/sprites/editor/pack.json diff --git a/core/assets-raw/sprites/effects/bullet-back.png b/core/assets-raw/sprites/effects/bullet-back.png index 48429567b6..d5dccee0d7 100644 Binary files a/core/assets-raw/sprites/effects/bullet-back.png and b/core/assets-raw/sprites/effects/bullet-back.png differ diff --git a/core/assets-raw/sprites/effects/bullet.png b/core/assets-raw/sprites/effects/bullet.png index ca12da1af9..0b5dd8e8ac 100644 Binary files a/core/assets-raw/sprites/effects/bullet.png and b/core/assets-raw/sprites/effects/bullet.png differ diff --git a/core/assets-raw/sprites/effects/casing.png b/core/assets-raw/sprites/effects/casing.png index 2dd49226a9..37b0613251 100644 Binary files a/core/assets-raw/sprites/effects/casing.png and b/core/assets-raw/sprites/effects/casing.png differ diff --git a/core/assets-raw/sprites_replacement/effects/circle-shadow.png b/core/assets-raw/sprites/effects/circle-shadow.png similarity index 100% rename from core/assets-raw/sprites_replacement/effects/circle-shadow.png rename to core/assets-raw/sprites/effects/circle-shadow.png diff --git a/core/assets-raw/sprites_replacement/effects/error.png b/core/assets-raw/sprites/effects/error.png similarity index 100% rename from core/assets-raw/sprites_replacement/effects/error.png rename to core/assets-raw/sprites/effects/error.png diff --git a/core/assets-raw/sprites_replacement/effects/laser-end.png b/core/assets-raw/sprites/effects/laser-end.png similarity index 100% rename from core/assets-raw/sprites_replacement/effects/laser-end.png rename to core/assets-raw/sprites/effects/laser-end.png diff --git a/core/assets-raw/sprites_replacement/effects/laser.png b/core/assets-raw/sprites/effects/laser.png similarity index 100% rename from core/assets-raw/sprites_replacement/effects/laser.png rename to core/assets-raw/sprites/effects/laser.png diff --git a/core/assets-raw/sprites_replacement/effects/minelaser-end.png b/core/assets-raw/sprites/effects/minelaser-end.png similarity index 100% rename from core/assets-raw/sprites_replacement/effects/minelaser-end.png rename to core/assets-raw/sprites/effects/minelaser-end.png diff --git a/core/assets-raw/sprites_replacement/effects/minelaser.png b/core/assets-raw/sprites/effects/minelaser.png similarity index 100% rename from core/assets-raw/sprites_replacement/effects/minelaser.png rename to core/assets-raw/sprites/effects/minelaser.png diff --git a/core/assets-raw/sprites/effects/missile-back.png b/core/assets-raw/sprites/effects/missile-back.png index d0c3073a06..0aa9893a33 100644 Binary files a/core/assets-raw/sprites/effects/missile-back.png and b/core/assets-raw/sprites/effects/missile-back.png differ diff --git a/core/assets-raw/sprites/effects/missile.png b/core/assets-raw/sprites/effects/missile.png index 32e5dc39bb..9f9f3831c3 100644 Binary files a/core/assets-raw/sprites/effects/missile.png and b/core/assets-raw/sprites/effects/missile.png differ diff --git a/core/assets-raw/sprites/effects/scale_marker.png b/core/assets-raw/sprites/effects/scale_marker.png index dc8beb206c..109b5dafa3 100644 Binary files a/core/assets-raw/sprites/effects/scale_marker.png and b/core/assets-raw/sprites/effects/scale_marker.png differ diff --git a/core/assets-raw/sprites/effects/scorch1.png b/core/assets-raw/sprites/effects/scorch1.png index 375a7c6dbe..9044dc696c 100644 Binary files a/core/assets-raw/sprites/effects/scorch1.png and b/core/assets-raw/sprites/effects/scorch1.png differ diff --git a/core/assets-raw/sprites/effects/scorch2.png b/core/assets-raw/sprites/effects/scorch2.png index 5c78d8dfbc..e5f2f11105 100644 Binary files a/core/assets-raw/sprites/effects/scorch2.png and b/core/assets-raw/sprites/effects/scorch2.png differ diff --git a/core/assets-raw/sprites/effects/scorch3.png b/core/assets-raw/sprites/effects/scorch3.png index a1a70104ac..555ca5f288 100644 Binary files a/core/assets-raw/sprites/effects/scorch3.png and b/core/assets-raw/sprites/effects/scorch3.png differ diff --git a/core/assets-raw/sprites/effects/scorch4.png b/core/assets-raw/sprites/effects/scorch4.png index e2593370cf..981a1c8ac4 100644 Binary files a/core/assets-raw/sprites/effects/scorch4.png and b/core/assets-raw/sprites/effects/scorch4.png differ diff --git a/core/assets-raw/sprites/effects/scorch5.png b/core/assets-raw/sprites/effects/scorch5.png index 139e235165..0a8d1e2ef2 100644 Binary files a/core/assets-raw/sprites/effects/scorch5.png and b/core/assets-raw/sprites/effects/scorch5.png differ diff --git a/core/assets-raw/sprites/effects/shell-back.png b/core/assets-raw/sprites/effects/shell-back.png index b9118fa180..2702b8f463 100644 Binary files a/core/assets-raw/sprites/effects/shell-back.png and b/core/assets-raw/sprites/effects/shell-back.png differ diff --git a/core/assets-raw/sprites/effects/shell.png b/core/assets-raw/sprites/effects/shell.png index ec93fe363d..72969437f9 100644 Binary files a/core/assets-raw/sprites/effects/shell.png and b/core/assets-raw/sprites/effects/shell.png differ diff --git a/core/assets-raw/sprites/effects/shot.png b/core/assets-raw/sprites/effects/shot.png index 2cd4b51d23..98a45162f4 100644 Binary files a/core/assets-raw/sprites/effects/shot.png and b/core/assets-raw/sprites/effects/shot.png differ diff --git a/core/assets-raw/sprites/effects/transfer-arrow.png b/core/assets-raw/sprites/effects/transfer-arrow.png index 1dae96753b..16d71b0c5e 100644 Binary files a/core/assets-raw/sprites/effects/transfer-arrow.png and b/core/assets-raw/sprites/effects/transfer-arrow.png differ diff --git a/core/assets-raw/sprites/effects/transfer-end.png b/core/assets-raw/sprites/effects/transfer-end.png index 5995c020f3..8579ff179e 100644 Binary files a/core/assets-raw/sprites/effects/transfer-end.png and b/core/assets-raw/sprites/effects/transfer-end.png differ diff --git a/core/assets-raw/sprites/effects/transfer.png b/core/assets-raw/sprites/effects/transfer.png index cde985abfd..653219d8dd 100644 Binary files a/core/assets-raw/sprites/effects/transfer.png and b/core/assets-raw/sprites/effects/transfer.png differ diff --git a/core/assets-raw/sprites/items/item-biomatter.png b/core/assets-raw/sprites/items/item-biomatter.png index ac2580d8e2..6dae991e87 100644 Binary files a/core/assets-raw/sprites/items/item-biomatter.png and b/core/assets-raw/sprites/items/item-biomatter.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 ec2b818853..c14eb34b11 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 399e28f7d5..13727cd802 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 1d62eeba29..664c9cc6f3 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 bacdf52b8a..68b074bdc7 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 45ad28106b..ce09ac6185 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 3ccccbf1ca..3c45a8873f 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 223b47e28b..6f226c7a97 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 58dc9afc65..6ce75034f3 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 ac6370a732..eec30df17d 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 0995dacdf3..ac94898030 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 d39570505b..0de9f03656 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 7cb816d09e..5d4cfab004 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_replacement/items/item-spore-pod.png b/core/assets-raw/sprites/items/item-spore-pod.png similarity index 100% rename from core/assets-raw/sprites_replacement/items/item-spore-pod.png rename to core/assets-raw/sprites/items/item-spore-pod.png diff --git a/core/assets-raw/sprites/items/item-surge-alloy.png b/core/assets-raw/sprites/items/item-surge-alloy.png index 67b185b7f9..9fc6aa4561 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 02b6b71305..2cd39c8f49 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 e4250fea1b..3e15e1e7c7 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 8fb5c04279..198c21ad17 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 897050ec04..e0fbc07cf2 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 e3387f557a..87c2a41d07 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 c51264d09b..025c812967 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/mechs/mechs/alpha-mech-base.png b/core/assets-raw/sprites/mechs/mechs/alpha-mech-base.png index ded0237097..703f86e430 100644 Binary files a/core/assets-raw/sprites/mechs/mechs/alpha-mech-base.png and b/core/assets-raw/sprites/mechs/mechs/alpha-mech-base.png differ diff --git a/core/assets-raw/sprites/mechs/mechs/alpha-mech-leg.png b/core/assets-raw/sprites/mechs/mechs/alpha-mech-leg.png index 6efa298e66..d60217a0bc 100644 Binary files a/core/assets-raw/sprites/mechs/mechs/alpha-mech-leg.png and b/core/assets-raw/sprites/mechs/mechs/alpha-mech-leg.png differ diff --git a/core/assets-raw/sprites/mechs/mechs/alpha-mech.png b/core/assets-raw/sprites/mechs/mechs/alpha-mech.png index 41cad964be..83d62471d5 100644 Binary files a/core/assets-raw/sprites/mechs/mechs/alpha-mech.png and b/core/assets-raw/sprites/mechs/mechs/alpha-mech.png differ diff --git a/core/assets-raw/sprites/mechs/mechs/delta-mech-base.png b/core/assets-raw/sprites/mechs/mechs/delta-mech-base.png index 277d848d8f..1e954dfd87 100644 Binary files a/core/assets-raw/sprites/mechs/mechs/delta-mech-base.png and b/core/assets-raw/sprites/mechs/mechs/delta-mech-base.png differ diff --git a/core/assets-raw/sprites/mechs/mechs/delta-mech-leg.png b/core/assets-raw/sprites/mechs/mechs/delta-mech-leg.png index 2cdfd02fc6..39a650e4b0 100644 Binary files a/core/assets-raw/sprites/mechs/mechs/delta-mech-leg.png and b/core/assets-raw/sprites/mechs/mechs/delta-mech-leg.png differ diff --git a/core/assets-raw/sprites/mechs/mechs/delta-mech.png b/core/assets-raw/sprites/mechs/mechs/delta-mech.png index d143dd51bb..e3d6e6424b 100644 Binary files a/core/assets-raw/sprites/mechs/mechs/delta-mech.png and b/core/assets-raw/sprites/mechs/mechs/delta-mech.png differ diff --git a/core/assets-raw/sprites/mechs/mechs/omega-mech-armor.png b/core/assets-raw/sprites/mechs/mechs/omega-mech-armor.png index c2688c825e..47d531379a 100644 Binary files a/core/assets-raw/sprites/mechs/mechs/omega-mech-armor.png and b/core/assets-raw/sprites/mechs/mechs/omega-mech-armor.png differ diff --git a/core/assets-raw/sprites/mechs/mechs/omega-mech-base.png b/core/assets-raw/sprites/mechs/mechs/omega-mech-base.png index d03a84a34e..659de584d9 100644 Binary files a/core/assets-raw/sprites/mechs/mechs/omega-mech-base.png and b/core/assets-raw/sprites/mechs/mechs/omega-mech-base.png differ diff --git a/core/assets-raw/sprites/mechs/mechs/omega-mech-leg.png b/core/assets-raw/sprites/mechs/mechs/omega-mech-leg.png index 4e2dc959a1..870875a6d4 100644 Binary files a/core/assets-raw/sprites/mechs/mechs/omega-mech-leg.png and b/core/assets-raw/sprites/mechs/mechs/omega-mech-leg.png differ diff --git a/core/assets-raw/sprites/mechs/mechs/omega-mech.png b/core/assets-raw/sprites/mechs/mechs/omega-mech.png index 775e582330..1f7c0ad626 100644 Binary files a/core/assets-raw/sprites/mechs/mechs/omega-mech.png and b/core/assets-raw/sprites/mechs/mechs/omega-mech.png differ diff --git a/core/assets-raw/sprites/mechs/mechs/tau-mech-base.png b/core/assets-raw/sprites/mechs/mechs/tau-mech-base.png index c3cac140d2..6c83eaa41a 100644 Binary files a/core/assets-raw/sprites/mechs/mechs/tau-mech-base.png and b/core/assets-raw/sprites/mechs/mechs/tau-mech-base.png differ diff --git a/core/assets-raw/sprites/mechs/mechs/tau-mech-leg.png b/core/assets-raw/sprites/mechs/mechs/tau-mech-leg.png index 9fe5fcf294..cf45f61eb9 100644 Binary files a/core/assets-raw/sprites/mechs/mechs/tau-mech-leg.png and b/core/assets-raw/sprites/mechs/mechs/tau-mech-leg.png differ diff --git a/core/assets-raw/sprites/mechs/mechs/tau-mech.png b/core/assets-raw/sprites/mechs/mechs/tau-mech.png index ded905611c..9b6b934213 100644 Binary files a/core/assets-raw/sprites/mechs/mechs/tau-mech.png and b/core/assets-raw/sprites/mechs/mechs/tau-mech.png differ diff --git a/core/assets-raw/sprites/mechs/ships/dart-ship.png b/core/assets-raw/sprites/mechs/ships/dart-ship.png index 2f67113ab2..6ca70bcc85 100644 Binary files a/core/assets-raw/sprites/mechs/ships/dart-ship.png and b/core/assets-raw/sprites/mechs/ships/dart-ship.png differ diff --git a/core/assets-raw/sprites/mechs/ships/glaive-ship.png b/core/assets-raw/sprites/mechs/ships/glaive-ship.png index 5588b9a996..34aac96310 100644 Binary files a/core/assets-raw/sprites/mechs/ships/glaive-ship.png and b/core/assets-raw/sprites/mechs/ships/glaive-ship.png differ diff --git a/core/assets-raw/sprites/mechs/ships/javelin-ship-shield.png b/core/assets-raw/sprites/mechs/ships/javelin-ship-shield.png index 61eb887941..b7bc640522 100644 Binary files a/core/assets-raw/sprites/mechs/ships/javelin-ship-shield.png and b/core/assets-raw/sprites/mechs/ships/javelin-ship-shield.png differ diff --git a/core/assets-raw/sprites/mechs/ships/javelin-ship.png b/core/assets-raw/sprites/mechs/ships/javelin-ship.png index ba1a5ed0e4..174d6e59cd 100644 Binary files a/core/assets-raw/sprites/mechs/ships/javelin-ship.png and b/core/assets-raw/sprites/mechs/ships/javelin-ship.png differ diff --git a/core/assets-raw/sprites/mechs/ships/trident-ship.png b/core/assets-raw/sprites/mechs/ships/trident-ship.png index 56f60bf424..0a4c15e5a3 100644 Binary files a/core/assets-raw/sprites/mechs/ships/trident-ship.png and b/core/assets-raw/sprites/mechs/ships/trident-ship.png differ diff --git a/core/assets-raw/sprites_replacement/shapes/blank.png b/core/assets-raw/sprites/shapes/blank.png similarity index 100% rename from core/assets-raw/sprites_replacement/shapes/blank.png rename to core/assets-raw/sprites/shapes/blank.png diff --git a/core/assets-raw/sprites_replacement/shapes/circle.png b/core/assets-raw/sprites/shapes/circle.png similarity index 100% rename from core/assets-raw/sprites_replacement/shapes/circle.png rename to core/assets-raw/sprites/shapes/circle.png diff --git a/core/assets-raw/sprites_replacement/shapes/clear.png b/core/assets-raw/sprites/shapes/clear.png similarity index 100% rename from core/assets-raw/sprites_replacement/shapes/clear.png rename to core/assets-raw/sprites/shapes/clear.png diff --git a/core/assets-raw/sprites_replacement/shapes/shape-3.png b/core/assets-raw/sprites/shapes/shape-3.png similarity index 100% rename from core/assets-raw/sprites_replacement/shapes/shape-3.png rename to core/assets-raw/sprites/shapes/shape-3.png diff --git a/core/assets-raw/sprites/units/chaos-array-base.png b/core/assets-raw/sprites/units/chaos-array-base.png index e80d4a1b53..eaff7f46ad 100644 Binary files a/core/assets-raw/sprites/units/chaos-array-base.png and b/core/assets-raw/sprites/units/chaos-array-base.png differ diff --git a/core/assets-raw/sprites/units/chaos-array-leg.png b/core/assets-raw/sprites/units/chaos-array-leg.png index 8d0aba139b..62ba2d8b78 100644 Binary files a/core/assets-raw/sprites/units/chaos-array-leg.png and b/core/assets-raw/sprites/units/chaos-array-leg.png differ diff --git a/core/assets-raw/sprites/units/chaos-array.png b/core/assets-raw/sprites/units/chaos-array.png index 9c0ff7d661..5500e743df 100644 Binary files a/core/assets-raw/sprites/units/chaos-array.png and b/core/assets-raw/sprites/units/chaos-array.png differ diff --git a/core/assets-raw/sprites/units/crawler-base.png b/core/assets-raw/sprites/units/crawler-base.png index dd62bbf01e..509f802a94 100644 Binary files a/core/assets-raw/sprites/units/crawler-base.png and b/core/assets-raw/sprites/units/crawler-base.png differ diff --git a/core/assets-raw/sprites/units/crawler-leg.png b/core/assets-raw/sprites/units/crawler-leg.png index 40d363b816..68e76d7f8d 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/crawler.png b/core/assets-raw/sprites/units/crawler.png index 42456d8681..88f81e6476 100644 Binary files a/core/assets-raw/sprites/units/crawler.png and b/core/assets-raw/sprites/units/crawler.png differ diff --git a/core/assets-raw/sprites/units/dagger-base.png b/core/assets-raw/sprites/units/dagger-base.png index ef06fe6820..06a1bd3c59 100644 Binary files a/core/assets-raw/sprites/units/dagger-base.png and b/core/assets-raw/sprites/units/dagger-base.png differ diff --git a/core/assets-raw/sprites/units/dagger-leg.png b/core/assets-raw/sprites/units/dagger-leg.png index 2804fc72d3..444d18cf09 100644 Binary files a/core/assets-raw/sprites/units/dagger-leg.png and b/core/assets-raw/sprites/units/dagger-leg.png differ diff --git a/core/assets-raw/sprites/units/dagger.png b/core/assets-raw/sprites/units/dagger.png index 96a9855621..25fb15a197 100644 Binary files a/core/assets-raw/sprites/units/dagger.png and b/core/assets-raw/sprites/units/dagger.png differ diff --git a/core/assets-raw/sprites/units/eradicator-base.png b/core/assets-raw/sprites/units/eradicator-base.png index 750e78bf41..2c143879ef 100644 Binary files a/core/assets-raw/sprites/units/eradicator-base.png and b/core/assets-raw/sprites/units/eradicator-base.png differ diff --git a/core/assets-raw/sprites/units/eradicator-leg.png b/core/assets-raw/sprites/units/eradicator-leg.png index 82ade466da..3b822e3b46 100644 Binary files a/core/assets-raw/sprites/units/eradicator-leg.png and b/core/assets-raw/sprites/units/eradicator-leg.png differ diff --git a/core/assets-raw/sprites/units/eradicator.png b/core/assets-raw/sprites/units/eradicator.png index e4d3b0fe67..0554a3e349 100644 Binary files a/core/assets-raw/sprites/units/eradicator.png and b/core/assets-raw/sprites/units/eradicator.png differ diff --git a/core/assets-raw/sprites/units/eruptor-base.png b/core/assets-raw/sprites/units/eruptor-base.png index 6efea6d508..6eefd52275 100644 Binary files a/core/assets-raw/sprites/units/eruptor-base.png and b/core/assets-raw/sprites/units/eruptor-base.png differ diff --git a/core/assets-raw/sprites/units/eruptor-leg.png b/core/assets-raw/sprites/units/eruptor-leg.png index 9725454262..5172f16d0e 100644 Binary files a/core/assets-raw/sprites/units/eruptor-leg.png and b/core/assets-raw/sprites/units/eruptor-leg.png differ diff --git a/core/assets-raw/sprites/units/eruptor.png b/core/assets-raw/sprites/units/eruptor.png index ea76a8b29b..5832adb8f2 100644 Binary files a/core/assets-raw/sprites/units/eruptor.png and b/core/assets-raw/sprites/units/eruptor.png differ diff --git a/core/assets-raw/sprites/units/fortress-base.png b/core/assets-raw/sprites/units/fortress-base.png index 27d0869faa..27138867ff 100644 Binary files a/core/assets-raw/sprites/units/fortress-base.png and b/core/assets-raw/sprites/units/fortress-base.png differ diff --git a/core/assets-raw/sprites/units/fortress-leg.png b/core/assets-raw/sprites/units/fortress-leg.png index f6154b625a..258cdbf0c1 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/fortress.png b/core/assets-raw/sprites/units/fortress.png index 8842a4aefc..dad65f876b 100644 Binary files a/core/assets-raw/sprites/units/fortress.png and b/core/assets-raw/sprites/units/fortress.png differ diff --git a/core/assets-raw/sprites/units/ghoul.png b/core/assets-raw/sprites/units/ghoul.png index cf78f27837..17bbd381da 100644 Binary files a/core/assets-raw/sprites/units/ghoul.png and b/core/assets-raw/sprites/units/ghoul.png differ diff --git a/core/assets-raw/sprites/units/lich.png b/core/assets-raw/sprites/units/lich.png index ab440f96d8..d80c0b0294 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/phantom.png b/core/assets-raw/sprites/units/phantom.png index f056942a6a..173b2c991b 100644 Binary files a/core/assets-raw/sprites/units/phantom.png and b/core/assets-raw/sprites/units/phantom.png differ diff --git a/core/assets-raw/sprites/units/power-cell.png b/core/assets-raw/sprites/units/power-cell.png index fac5e3f3ca..dfbc73a20b 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 5094cbae27..c6baf138b1 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/revenant.png b/core/assets-raw/sprites/units/revenant.png index 645ec6a995..0355715192 100644 Binary files a/core/assets-raw/sprites/units/revenant.png and b/core/assets-raw/sprites/units/revenant.png differ diff --git a/core/assets-raw/sprites/units/spirit.png b/core/assets-raw/sprites/units/spirit.png index d2283645ea..1f9a4e89ec 100644 Binary files a/core/assets-raw/sprites/units/spirit.png and b/core/assets-raw/sprites/units/spirit.png differ diff --git a/core/assets-raw/sprites/units/titan-base.png b/core/assets-raw/sprites/units/titan-base.png index 27d0869faa..27138867ff 100644 Binary files a/core/assets-raw/sprites/units/titan-base.png and b/core/assets-raw/sprites/units/titan-base.png differ diff --git a/core/assets-raw/sprites/units/titan-leg.png b/core/assets-raw/sprites/units/titan-leg.png index a7f07eccef..be3a3ee575 100644 Binary files a/core/assets-raw/sprites/units/titan-leg.png and b/core/assets-raw/sprites/units/titan-leg.png differ diff --git a/core/assets-raw/sprites/units/titan.png b/core/assets-raw/sprites/units/titan.png index 6959fffef2..b3505074ce 100644 Binary files a/core/assets-raw/sprites/units/titan.png and b/core/assets-raw/sprites/units/titan.png differ diff --git a/core/assets-raw/sprites/units/wraith.png b/core/assets-raw/sprites/units/wraith.png index 3ee75dc1a8..b95d632036 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/artillery-equip.png b/core/assets-raw/sprites/weapons/artillery-equip.png index 7572b98c95..38f11655f8 100644 Binary files a/core/assets-raw/sprites/weapons/artillery-equip.png and b/core/assets-raw/sprites/weapons/artillery-equip.png differ diff --git a/core/assets-raw/sprites/weapons/blaster-equip.png b/core/assets-raw/sprites/weapons/blaster-equip.png index 104add7016..e8d35d7c9e 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/bomber-equip.png b/core/assets-raw/sprites/weapons/bomber-equip.png index 1f3be67082..b5a0872660 100644 Binary files a/core/assets-raw/sprites/weapons/bomber-equip.png and b/core/assets-raw/sprites/weapons/bomber-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 b3c37d50a2..3cde6228a0 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/chaos-equip.png b/core/assets-raw/sprites/weapons/chaos-equip.png index 3254c70c88..9c7f91085c 100644 Binary files a/core/assets-raw/sprites/weapons/chaos-equip.png and b/core/assets-raw/sprites/weapons/chaos-equip.png differ diff --git a/core/assets-raw/sprites/weapons/eradication-equip.png b/core/assets-raw/sprites/weapons/eradication-equip.png index c3fbf46416..15a7748677 100644 Binary files a/core/assets-raw/sprites/weapons/eradication-equip.png and b/core/assets-raw/sprites/weapons/eradication-equip.png differ diff --git a/core/assets-raw/sprites/weapons/eruption-equip.png b/core/assets-raw/sprites/weapons/eruption-equip.png index 11dc406fb0..fb63f47a8f 100644 Binary files a/core/assets-raw/sprites/weapons/eruption-equip.png and b/core/assets-raw/sprites/weapons/eruption-equip.png differ diff --git a/core/assets-raw/sprites/weapons/flakgun-equip.png b/core/assets-raw/sprites/weapons/flakgun-equip.png index 9b18d74953..c264823bb3 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/flamethrower-equip.png b/core/assets-raw/sprites/weapons/flamethrower-equip.png index 6c11713a5e..b7ce3aaeee 100644 Binary files a/core/assets-raw/sprites/weapons/flamethrower-equip.png and b/core/assets-raw/sprites/weapons/flamethrower-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 ff592f64e7..4499364ab9 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/lich-missiles-equip.png b/core/assets-raw/sprites/weapons/lich-missiles-equip.png index b5118bbf4e..d8fbd8549b 100644 Binary files a/core/assets-raw/sprites/weapons/lich-missiles-equip.png and b/core/assets-raw/sprites/weapons/lich-missiles-equip.png differ diff --git a/core/assets-raw/sprites/weapons/missiles-equip.png b/core/assets-raw/sprites/weapons/missiles-equip.png index 1f3be67082..b5a0872660 100644 Binary files a/core/assets-raw/sprites/weapons/missiles-equip.png and b/core/assets-raw/sprites/weapons/missiles-equip.png differ diff --git a/core/assets-raw/sprites/weapons/reaper-gun-equip.png b/core/assets-raw/sprites/weapons/reaper-gun-equip.png index f4addc0634..016e6dacf4 100644 Binary files a/core/assets-raw/sprites/weapons/reaper-gun-equip.png and b/core/assets-raw/sprites/weapons/reaper-gun-equip.png differ diff --git a/core/assets-raw/sprites/weapons/revenant-missiles-equip.png b/core/assets-raw/sprites/weapons/revenant-missiles-equip.png index 7e23b71b4e..6aaac4c6d7 100644 Binary files a/core/assets-raw/sprites/weapons/revenant-missiles-equip.png and b/core/assets-raw/sprites/weapons/revenant-missiles-equip.png differ diff --git a/core/assets-raw/sprites/weapons/shockgun-equip.png b/core/assets-raw/sprites/weapons/shockgun-equip.png index ed182a6b92..5710b7c655 100644 Binary files a/core/assets-raw/sprites/weapons/shockgun-equip.png and b/core/assets-raw/sprites/weapons/shockgun-equip.png differ diff --git a/core/assets-raw/sprites/weapons/swarmer-equip.png b/core/assets-raw/sprites/weapons/swarmer-equip.png index a761a92a9d..68de627f44 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_replacement/blocks/distribution/bridge-conveyor-end.png b/core/assets-raw/sprites_replacement/blocks/distribution/bridge-conveyor-end.png deleted file mode 100644 index b553fc29a7..0000000000 Binary files a/core/assets-raw/sprites_replacement/blocks/distribution/bridge-conveyor-end.png and /dev/null differ diff --git a/core/assets-raw/sprites_replacement/blocks/distribution/bridge-conveyor.png b/core/assets-raw/sprites_replacement/blocks/distribution/bridge-conveyor.png deleted file mode 100644 index 76b29569ea..0000000000 Binary files a/core/assets-raw/sprites_replacement/blocks/distribution/bridge-conveyor.png and /dev/null differ diff --git a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-0-0.png b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-0-0.png deleted file mode 100644 index 2e0a43ea3b..0000000000 Binary files a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-0-0.png and /dev/null differ diff --git a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-0-1.png b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-0-1.png deleted file mode 100644 index 24048d1a43..0000000000 Binary files a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-0-1.png and /dev/null differ diff --git a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-0-2.png b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-0-2.png deleted file mode 100644 index 73b23fc35b..0000000000 Binary files a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-0-2.png and /dev/null differ diff --git a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-0-3.png b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-0-3.png deleted file mode 100644 index 6306aa871a..0000000000 Binary files a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-0-3.png and /dev/null differ diff --git a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-1-0.png b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-1-0.png deleted file mode 100644 index 5227b0a105..0000000000 Binary files a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-1-0.png and /dev/null differ diff --git a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-1-1.png b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-1-1.png deleted file mode 100644 index d7807ed213..0000000000 Binary files a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-1-1.png and /dev/null differ diff --git a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-1-2.png b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-1-2.png deleted file mode 100644 index 809e73f91e..0000000000 Binary files a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-1-2.png and /dev/null differ diff --git a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-1-3.png b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-1-3.png deleted file mode 100644 index cbbcc06765..0000000000 Binary files a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-1-3.png and /dev/null differ diff --git a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-2-0.png b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-2-0.png deleted file mode 100644 index 7d83503a4c..0000000000 Binary files a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-2-0.png and /dev/null differ diff --git a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-2-1.png b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-2-1.png deleted file mode 100644 index 7c096f931d..0000000000 Binary files a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-2-1.png and /dev/null differ diff --git a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-2-2.png b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-2-2.png deleted file mode 100644 index 8f3bc82e43..0000000000 Binary files a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-2-2.png and /dev/null differ diff --git a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-2-3.png b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-2-3.png deleted file mode 100644 index 2ae54594cb..0000000000 Binary files a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-2-3.png and /dev/null differ diff --git a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-3-0.png b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-3-0.png deleted file mode 100644 index 4ab7a2b834..0000000000 Binary files a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-3-0.png and /dev/null differ diff --git a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-3-1.png b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-3-1.png deleted file mode 100644 index 078385b52e..0000000000 Binary files a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-3-1.png and /dev/null differ diff --git a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-3-2.png b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-3-2.png deleted file mode 100644 index 353aed8146..0000000000 Binary files a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-3-2.png and /dev/null differ diff --git a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-3-3.png b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-3-3.png deleted file mode 100644 index b0ca93a9ef..0000000000 Binary files a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-3-3.png and /dev/null differ diff --git a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-4-0.png b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-4-0.png deleted file mode 100644 index 7cf6b7a50c..0000000000 Binary files a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-4-0.png and /dev/null differ diff --git a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-4-1.png b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-4-1.png deleted file mode 100644 index 20edd79d73..0000000000 Binary files a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-4-1.png and /dev/null differ diff --git a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-4-2.png b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-4-2.png deleted file mode 100644 index d2857c3270..0000000000 Binary files a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-4-2.png and /dev/null differ diff --git a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-4-3.png b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-4-3.png deleted file mode 100644 index 2533da2648..0000000000 Binary files a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-4-3.png and /dev/null differ diff --git a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-0-0.png b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-0-0.png deleted file mode 100644 index 8b950f97f8..0000000000 Binary files a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-0-0.png and /dev/null differ diff --git a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-0-1.png b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-0-1.png deleted file mode 100644 index 3254dc8756..0000000000 Binary files a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-0-1.png and /dev/null differ diff --git a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-0-2.png b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-0-2.png deleted file mode 100644 index 7f69cf0669..0000000000 Binary files a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-0-2.png and /dev/null differ diff --git a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-0-3.png b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-0-3.png deleted file mode 100644 index 8675cc94d0..0000000000 Binary files a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-0-3.png and /dev/null differ diff --git a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-1-0.png b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-1-0.png deleted file mode 100644 index 1329d5537d..0000000000 Binary files a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-1-0.png and /dev/null differ diff --git a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-1-1.png b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-1-1.png deleted file mode 100644 index ee5360c7fe..0000000000 Binary files a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-1-1.png and /dev/null differ diff --git a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-1-2.png b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-1-2.png deleted file mode 100644 index 92c8101998..0000000000 Binary files a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-1-2.png and /dev/null differ diff --git a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-1-3.png b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-1-3.png deleted file mode 100644 index 427ffeacd3..0000000000 Binary files a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-1-3.png and /dev/null differ diff --git a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-2-0.png b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-2-0.png deleted file mode 100644 index 9a3d6926f6..0000000000 Binary files a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-2-0.png and /dev/null differ diff --git a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-2-1.png b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-2-1.png deleted file mode 100644 index 9961efb201..0000000000 Binary files a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-2-1.png and /dev/null differ diff --git a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-2-2.png b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-2-2.png deleted file mode 100644 index 14ba76c0fa..0000000000 Binary files a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-2-2.png and /dev/null differ diff --git a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-2-3.png b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-2-3.png deleted file mode 100644 index c9f72835e5..0000000000 Binary files a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-2-3.png and /dev/null differ diff --git a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-3-0.png b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-3-0.png deleted file mode 100644 index 2707bc9288..0000000000 Binary files a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-3-0.png and /dev/null differ diff --git a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-3-1.png b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-3-1.png deleted file mode 100644 index 352665be11..0000000000 Binary files a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-3-1.png and /dev/null differ diff --git a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-3-2.png b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-3-2.png deleted file mode 100644 index 4ce88b7534..0000000000 Binary files a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-3-2.png and /dev/null differ diff --git a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-3-3.png b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-3-3.png deleted file mode 100644 index a555b6b661..0000000000 Binary files a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-3-3.png and /dev/null differ diff --git a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-4-0.png b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-4-0.png deleted file mode 100644 index da3dafa312..0000000000 Binary files a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-4-0.png and /dev/null differ diff --git a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-4-1.png b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-4-1.png deleted file mode 100644 index 9e040e9590..0000000000 Binary files a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-4-1.png and /dev/null differ diff --git a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-4-2.png b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-4-2.png deleted file mode 100644 index a2b0ee6665..0000000000 Binary files a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-4-2.png and /dev/null differ diff --git a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-4-3.png b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-4-3.png deleted file mode 100644 index 6a96832452..0000000000 Binary files a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-4-3.png and /dev/null differ diff --git a/core/assets-raw/sprites_replacement/blocks/distribution/junction.png b/core/assets-raw/sprites_replacement/blocks/distribution/junction.png deleted file mode 100644 index e84244e630..0000000000 Binary files a/core/assets-raw/sprites_replacement/blocks/distribution/junction.png and /dev/null differ diff --git a/core/assets-raw/sprites_replacement/blocks/environment/coal1.png b/core/assets-raw/sprites_replacement/blocks/environment/coal1.png deleted file mode 100644 index a65216e00d..0000000000 Binary files a/core/assets-raw/sprites_replacement/blocks/environment/coal1.png and /dev/null differ diff --git a/core/assets-raw/sprites_replacement/blocks/environment/coal2.png b/core/assets-raw/sprites_replacement/blocks/environment/coal2.png deleted file mode 100644 index 9cf4691919..0000000000 Binary files a/core/assets-raw/sprites_replacement/blocks/environment/coal2.png and /dev/null differ diff --git a/core/assets-raw/sprites_replacement/blocks/environment/coal3.png b/core/assets-raw/sprites_replacement/blocks/environment/coal3.png deleted file mode 100644 index 5f2cf4730f..0000000000 Binary files a/core/assets-raw/sprites_replacement/blocks/environment/coal3.png and /dev/null differ diff --git a/core/assets-raw/sprites_replacement/blocks/environment/copper1.png b/core/assets-raw/sprites_replacement/blocks/environment/copper1.png deleted file mode 100644 index c7b4dcc9ed..0000000000 Binary files a/core/assets-raw/sprites_replacement/blocks/environment/copper1.png and /dev/null differ diff --git a/core/assets-raw/sprites_replacement/blocks/environment/copper2.png b/core/assets-raw/sprites_replacement/blocks/environment/copper2.png deleted file mode 100644 index d62a9f201a..0000000000 Binary files a/core/assets-raw/sprites_replacement/blocks/environment/copper2.png and /dev/null differ diff --git a/core/assets-raw/sprites_replacement/blocks/environment/copper3.png b/core/assets-raw/sprites_replacement/blocks/environment/copper3.png deleted file mode 100644 index 47128d4f81..0000000000 Binary files a/core/assets-raw/sprites_replacement/blocks/environment/copper3.png and /dev/null differ diff --git a/core/assets-raw/sprites_replacement/blocks/environment/craters1.png b/core/assets-raw/sprites_replacement/blocks/environment/craters1.png deleted file mode 100644 index 4b2172bc61..0000000000 Binary files a/core/assets-raw/sprites_replacement/blocks/environment/craters1.png and /dev/null differ diff --git a/core/assets-raw/sprites_replacement/blocks/environment/craters2.png b/core/assets-raw/sprites_replacement/blocks/environment/craters2.png deleted file mode 100644 index 1170ab3c4f..0000000000 Binary files a/core/assets-raw/sprites_replacement/blocks/environment/craters2.png and /dev/null differ diff --git a/core/assets-raw/sprites_replacement/blocks/environment/craters3.png b/core/assets-raw/sprites_replacement/blocks/environment/craters3.png deleted file mode 100644 index 9a23d383f7..0000000000 Binary files a/core/assets-raw/sprites_replacement/blocks/environment/craters3.png and /dev/null differ diff --git a/core/assets-raw/sprites_replacement/blocks/environment/craters4.png b/core/assets-raw/sprites_replacement/blocks/environment/craters4.png deleted file mode 100644 index 3d77e3080f..0000000000 Binary files a/core/assets-raw/sprites_replacement/blocks/environment/craters4.png and /dev/null differ diff --git a/core/assets-raw/sprites_replacement/blocks/environment/dark-metal-large.png b/core/assets-raw/sprites_replacement/blocks/environment/dark-metal-large.png deleted file mode 100644 index 2b30255f53..0000000000 Binary files a/core/assets-raw/sprites_replacement/blocks/environment/dark-metal-large.png and /dev/null differ diff --git a/core/assets-raw/sprites_replacement/blocks/environment/dark-metal1.png b/core/assets-raw/sprites_replacement/blocks/environment/dark-metal1.png deleted file mode 100644 index 907b253157..0000000000 Binary files a/core/assets-raw/sprites_replacement/blocks/environment/dark-metal1.png and /dev/null differ diff --git a/core/assets-raw/sprites_replacement/blocks/environment/dark-metal2.png b/core/assets-raw/sprites_replacement/blocks/environment/dark-metal2.png deleted file mode 100644 index 3eb3558f6c..0000000000 Binary files a/core/assets-raw/sprites_replacement/blocks/environment/dark-metal2.png and /dev/null differ diff --git a/core/assets-raw/sprites_replacement/blocks/environment/dark-panel-1.png b/core/assets-raw/sprites_replacement/blocks/environment/dark-panel-1.png deleted file mode 100644 index 3035832574..0000000000 Binary files a/core/assets-raw/sprites_replacement/blocks/environment/dark-panel-1.png and /dev/null differ diff --git a/core/assets-raw/sprites_replacement/blocks/environment/dark-panel-2.png b/core/assets-raw/sprites_replacement/blocks/environment/dark-panel-2.png deleted file mode 100644 index cead3de9bc..0000000000 Binary files a/core/assets-raw/sprites_replacement/blocks/environment/dark-panel-2.png and /dev/null differ diff --git a/core/assets-raw/sprites_replacement/blocks/environment/dark-panel-3.png b/core/assets-raw/sprites_replacement/blocks/environment/dark-panel-3.png deleted file mode 100644 index bf321e76a6..0000000000 Binary files a/core/assets-raw/sprites_replacement/blocks/environment/dark-panel-3.png and /dev/null differ diff --git a/core/assets-raw/sprites_replacement/blocks/environment/dark-panel-4.png b/core/assets-raw/sprites_replacement/blocks/environment/dark-panel-4.png deleted file mode 100644 index 0a76f30595..0000000000 Binary files a/core/assets-raw/sprites_replacement/blocks/environment/dark-panel-4.png and /dev/null differ diff --git a/core/assets-raw/sprites_replacement/blocks/environment/dark-panel-5.png b/core/assets-raw/sprites_replacement/blocks/environment/dark-panel-5.png deleted file mode 100644 index 3f3c511fe4..0000000000 Binary files a/core/assets-raw/sprites_replacement/blocks/environment/dark-panel-5.png and /dev/null differ diff --git a/core/assets-raw/sprites_replacement/blocks/environment/dark-panel-6.png b/core/assets-raw/sprites_replacement/blocks/environment/dark-panel-6.png deleted file mode 100644 index 6ff46b0373..0000000000 Binary files a/core/assets-raw/sprites_replacement/blocks/environment/dark-panel-6.png and /dev/null differ diff --git a/core/assets-raw/sprites_replacement/blocks/environment/darksand1.png b/core/assets-raw/sprites_replacement/blocks/environment/darksand1.png deleted file mode 100644 index 0478f5a78d..0000000000 Binary files a/core/assets-raw/sprites_replacement/blocks/environment/darksand1.png and /dev/null differ diff --git a/core/assets-raw/sprites_replacement/blocks/environment/darksand2.png b/core/assets-raw/sprites_replacement/blocks/environment/darksand2.png deleted file mode 100644 index 2ee445aba9..0000000000 Binary files a/core/assets-raw/sprites_replacement/blocks/environment/darksand2.png and /dev/null differ diff --git a/core/assets-raw/sprites_replacement/blocks/environment/darksand3.png b/core/assets-raw/sprites_replacement/blocks/environment/darksand3.png deleted file mode 100644 index f6e829199b..0000000000 Binary files a/core/assets-raw/sprites_replacement/blocks/environment/darksand3.png and /dev/null differ diff --git a/core/assets-raw/sprites_replacement/blocks/environment/deepwater.png b/core/assets-raw/sprites_replacement/blocks/environment/deepwater.png deleted file mode 100644 index 2389c5985d..0000000000 Binary files a/core/assets-raw/sprites_replacement/blocks/environment/deepwater.png and /dev/null differ diff --git a/core/assets-raw/sprites_replacement/blocks/environment/edge-stencil.png b/core/assets-raw/sprites_replacement/blocks/environment/edge-stencil.png deleted file mode 100644 index 7d7e1b2365..0000000000 Binary files a/core/assets-raw/sprites_replacement/blocks/environment/edge-stencil.png and /dev/null differ diff --git a/core/assets-raw/sprites_replacement/blocks/environment/grass1.png b/core/assets-raw/sprites_replacement/blocks/environment/grass1.png deleted file mode 100644 index adf810314d..0000000000 Binary files a/core/assets-raw/sprites_replacement/blocks/environment/grass1.png and /dev/null differ diff --git a/core/assets-raw/sprites_replacement/blocks/environment/grass2.png b/core/assets-raw/sprites_replacement/blocks/environment/grass2.png deleted file mode 100644 index 2f37e91369..0000000000 Binary files a/core/assets-raw/sprites_replacement/blocks/environment/grass2.png and /dev/null differ diff --git a/core/assets-raw/sprites_replacement/blocks/environment/grass3.png b/core/assets-raw/sprites_replacement/blocks/environment/grass3.png deleted file mode 100644 index 704219e7f9..0000000000 Binary files a/core/assets-raw/sprites_replacement/blocks/environment/grass3.png and /dev/null differ diff --git a/core/assets-raw/sprites_replacement/blocks/environment/holostone1.png b/core/assets-raw/sprites_replacement/blocks/environment/holostone1.png deleted file mode 100644 index cc68b49c90..0000000000 Binary files a/core/assets-raw/sprites_replacement/blocks/environment/holostone1.png and /dev/null differ diff --git a/core/assets-raw/sprites_replacement/blocks/environment/holostone2.png b/core/assets-raw/sprites_replacement/blocks/environment/holostone2.png deleted file mode 100644 index 1c74d19a1b..0000000000 Binary files a/core/assets-raw/sprites_replacement/blocks/environment/holostone2.png and /dev/null differ diff --git a/core/assets-raw/sprites_replacement/blocks/environment/holostone3.png b/core/assets-raw/sprites_replacement/blocks/environment/holostone3.png deleted file mode 100644 index 008f5a85f1..0000000000 Binary files a/core/assets-raw/sprites_replacement/blocks/environment/holostone3.png and /dev/null differ diff --git a/core/assets-raw/sprites_replacement/blocks/environment/hotrock1.png b/core/assets-raw/sprites_replacement/blocks/environment/hotrock1.png deleted file mode 100644 index d331a9b07c..0000000000 Binary files a/core/assets-raw/sprites_replacement/blocks/environment/hotrock1.png and /dev/null differ diff --git a/core/assets-raw/sprites_replacement/blocks/environment/hotrock2.png b/core/assets-raw/sprites_replacement/blocks/environment/hotrock2.png deleted file mode 100644 index 5bfe3110eb..0000000000 Binary files a/core/assets-raw/sprites_replacement/blocks/environment/hotrock2.png and /dev/null differ diff --git a/core/assets-raw/sprites_replacement/blocks/environment/hotrock3.png b/core/assets-raw/sprites_replacement/blocks/environment/hotrock3.png deleted file mode 100644 index 1d37b221a3..0000000000 Binary files a/core/assets-raw/sprites_replacement/blocks/environment/hotrock3.png and /dev/null differ diff --git a/core/assets-raw/sprites_replacement/blocks/environment/ice1.png b/core/assets-raw/sprites_replacement/blocks/environment/ice1.png deleted file mode 100644 index 7e3bfcedfa..0000000000 Binary files a/core/assets-raw/sprites_replacement/blocks/environment/ice1.png and /dev/null differ diff --git a/core/assets-raw/sprites_replacement/blocks/environment/ice2.png b/core/assets-raw/sprites_replacement/blocks/environment/ice2.png deleted file mode 100644 index 9a2643a694..0000000000 Binary files a/core/assets-raw/sprites_replacement/blocks/environment/ice2.png and /dev/null differ diff --git a/core/assets-raw/sprites_replacement/blocks/environment/ice3.png b/core/assets-raw/sprites_replacement/blocks/environment/ice3.png deleted file mode 100644 index 08821cc029..0000000000 Binary files a/core/assets-raw/sprites_replacement/blocks/environment/ice3.png and /dev/null differ diff --git a/core/assets-raw/sprites_replacement/blocks/environment/ignarock1.png b/core/assets-raw/sprites_replacement/blocks/environment/ignarock1.png deleted file mode 100644 index fff2086d21..0000000000 Binary files a/core/assets-raw/sprites_replacement/blocks/environment/ignarock1.png and /dev/null differ diff --git a/core/assets-raw/sprites_replacement/blocks/environment/ignarock2.png b/core/assets-raw/sprites_replacement/blocks/environment/ignarock2.png deleted file mode 100644 index da2c7412b7..0000000000 Binary files a/core/assets-raw/sprites_replacement/blocks/environment/ignarock2.png and /dev/null differ diff --git a/core/assets-raw/sprites_replacement/blocks/environment/ignarock3.png b/core/assets-raw/sprites_replacement/blocks/environment/ignarock3.png deleted file mode 100644 index e303b57082..0000000000 Binary files a/core/assets-raw/sprites_replacement/blocks/environment/ignarock3.png and /dev/null differ diff --git a/core/assets-raw/sprites_replacement/blocks/environment/lead1.png b/core/assets-raw/sprites_replacement/blocks/environment/lead1.png deleted file mode 100644 index ea20a9261d..0000000000 Binary files a/core/assets-raw/sprites_replacement/blocks/environment/lead1.png and /dev/null differ diff --git a/core/assets-raw/sprites_replacement/blocks/environment/lead2.png b/core/assets-raw/sprites_replacement/blocks/environment/lead2.png deleted file mode 100644 index 7741575e00..0000000000 Binary files a/core/assets-raw/sprites_replacement/blocks/environment/lead2.png and /dev/null differ diff --git a/core/assets-raw/sprites_replacement/blocks/environment/lead3.png b/core/assets-raw/sprites_replacement/blocks/environment/lead3.png deleted file mode 100644 index c7e5ab676a..0000000000 Binary files a/core/assets-raw/sprites_replacement/blocks/environment/lead3.png and /dev/null differ diff --git a/core/assets-raw/sprites_replacement/blocks/environment/magmarock1.png b/core/assets-raw/sprites_replacement/blocks/environment/magmarock1.png deleted file mode 100644 index a25af14de1..0000000000 Binary files a/core/assets-raw/sprites_replacement/blocks/environment/magmarock1.png and /dev/null differ diff --git a/core/assets-raw/sprites_replacement/blocks/environment/magmarock2.png b/core/assets-raw/sprites_replacement/blocks/environment/magmarock2.png deleted file mode 100644 index 7360fb1690..0000000000 Binary files a/core/assets-raw/sprites_replacement/blocks/environment/magmarock2.png and /dev/null differ diff --git a/core/assets-raw/sprites_replacement/blocks/environment/magmarock3.png b/core/assets-raw/sprites_replacement/blocks/environment/magmarock3.png deleted file mode 100644 index 7516823fc6..0000000000 Binary files a/core/assets-raw/sprites_replacement/blocks/environment/magmarock3.png and /dev/null differ diff --git a/core/assets-raw/sprites_replacement/blocks/environment/metal-floor-2.png b/core/assets-raw/sprites_replacement/blocks/environment/metal-floor-2.png deleted file mode 100644 index 563338725b..0000000000 Binary files a/core/assets-raw/sprites_replacement/blocks/environment/metal-floor-2.png and /dev/null differ diff --git a/core/assets-raw/sprites_replacement/blocks/environment/metal-floor-5.png b/core/assets-raw/sprites_replacement/blocks/environment/metal-floor-5.png deleted file mode 100644 index ed2bc67e17..0000000000 Binary files a/core/assets-raw/sprites_replacement/blocks/environment/metal-floor-5.png and /dev/null differ diff --git a/core/assets-raw/sprites_replacement/blocks/environment/metal-floor.png b/core/assets-raw/sprites_replacement/blocks/environment/metal-floor.png deleted file mode 100644 index d0085b65d9..0000000000 Binary files a/core/assets-raw/sprites_replacement/blocks/environment/metal-floor.png and /dev/null differ diff --git a/core/assets-raw/sprites_replacement/blocks/environment/moss1.png b/core/assets-raw/sprites_replacement/blocks/environment/moss1.png deleted file mode 100644 index 800bb05170..0000000000 Binary files a/core/assets-raw/sprites_replacement/blocks/environment/moss1.png and /dev/null differ diff --git a/core/assets-raw/sprites_replacement/blocks/environment/moss2.png b/core/assets-raw/sprites_replacement/blocks/environment/moss2.png deleted file mode 100644 index 2d338650e1..0000000000 Binary files a/core/assets-raw/sprites_replacement/blocks/environment/moss2.png and /dev/null differ diff --git a/core/assets-raw/sprites_replacement/blocks/environment/moss3.png b/core/assets-raw/sprites_replacement/blocks/environment/moss3.png deleted file mode 100644 index e840a1936a..0000000000 Binary files a/core/assets-raw/sprites_replacement/blocks/environment/moss3.png and /dev/null differ diff --git a/core/assets-raw/sprites_replacement/blocks/environment/pine.png b/core/assets-raw/sprites_replacement/blocks/environment/pine.png deleted file mode 100644 index 1642bbbfd0..0000000000 Binary files a/core/assets-raw/sprites_replacement/blocks/environment/pine.png and /dev/null differ diff --git a/core/assets-raw/sprites_replacement/blocks/environment/sand1.png b/core/assets-raw/sprites_replacement/blocks/environment/sand1.png deleted file mode 100644 index ae4fe3c363..0000000000 Binary files a/core/assets-raw/sprites_replacement/blocks/environment/sand1.png and /dev/null differ diff --git a/core/assets-raw/sprites_replacement/blocks/environment/sand2.png b/core/assets-raw/sprites_replacement/blocks/environment/sand2.png deleted file mode 100644 index 2d6b23f129..0000000000 Binary files a/core/assets-raw/sprites_replacement/blocks/environment/sand2.png and /dev/null differ diff --git a/core/assets-raw/sprites_replacement/blocks/environment/sand3.png b/core/assets-raw/sprites_replacement/blocks/environment/sand3.png deleted file mode 100644 index b03562c494..0000000000 Binary files a/core/assets-raw/sprites_replacement/blocks/environment/sand3.png and /dev/null differ diff --git a/core/assets-raw/sprites_replacement/blocks/environment/scrap1.png b/core/assets-raw/sprites_replacement/blocks/environment/scrap1.png deleted file mode 100644 index 9fb8fb03f2..0000000000 Binary files a/core/assets-raw/sprites_replacement/blocks/environment/scrap1.png and /dev/null differ diff --git a/core/assets-raw/sprites_replacement/blocks/environment/scrap2.png b/core/assets-raw/sprites_replacement/blocks/environment/scrap2.png deleted file mode 100644 index f133d159f5..0000000000 Binary files a/core/assets-raw/sprites_replacement/blocks/environment/scrap2.png and /dev/null differ diff --git a/core/assets-raw/sprites_replacement/blocks/environment/scrap3.png b/core/assets-raw/sprites_replacement/blocks/environment/scrap3.png deleted file mode 100644 index f602404e34..0000000000 Binary files a/core/assets-raw/sprites_replacement/blocks/environment/scrap3.png and /dev/null differ diff --git a/core/assets-raw/sprites_replacement/blocks/environment/shale1.png b/core/assets-raw/sprites_replacement/blocks/environment/shale1.png deleted file mode 100644 index 6f242df279..0000000000 Binary files a/core/assets-raw/sprites_replacement/blocks/environment/shale1.png and /dev/null differ diff --git a/core/assets-raw/sprites_replacement/blocks/environment/shale2.png b/core/assets-raw/sprites_replacement/blocks/environment/shale2.png deleted file mode 100644 index 2edf629f90..0000000000 Binary files a/core/assets-raw/sprites_replacement/blocks/environment/shale2.png and /dev/null differ diff --git a/core/assets-raw/sprites_replacement/blocks/environment/shale3.png b/core/assets-raw/sprites_replacement/blocks/environment/shale3.png deleted file mode 100644 index 95382a191c..0000000000 Binary files a/core/assets-raw/sprites_replacement/blocks/environment/shale3.png and /dev/null differ diff --git a/core/assets-raw/sprites_replacement/blocks/environment/shrubs-large.png b/core/assets-raw/sprites_replacement/blocks/environment/shrubs-large.png deleted file mode 100644 index dd0b6612d9..0000000000 Binary files a/core/assets-raw/sprites_replacement/blocks/environment/shrubs-large.png and /dev/null differ diff --git a/core/assets-raw/sprites_replacement/blocks/environment/shrubs1.png b/core/assets-raw/sprites_replacement/blocks/environment/shrubs1.png deleted file mode 100644 index caff49a543..0000000000 Binary files a/core/assets-raw/sprites_replacement/blocks/environment/shrubs1.png and /dev/null differ diff --git a/core/assets-raw/sprites_replacement/blocks/environment/shrubs2.png b/core/assets-raw/sprites_replacement/blocks/environment/shrubs2.png deleted file mode 100644 index a4f583d86f..0000000000 Binary files a/core/assets-raw/sprites_replacement/blocks/environment/shrubs2.png and /dev/null differ diff --git a/core/assets-raw/sprites_replacement/blocks/environment/snow1.png b/core/assets-raw/sprites_replacement/blocks/environment/snow1.png deleted file mode 100644 index 39f893df24..0000000000 Binary files a/core/assets-raw/sprites_replacement/blocks/environment/snow1.png and /dev/null differ diff --git a/core/assets-raw/sprites_replacement/blocks/environment/snow2.png b/core/assets-raw/sprites_replacement/blocks/environment/snow2.png deleted file mode 100644 index 3d1a76608d..0000000000 Binary files a/core/assets-raw/sprites_replacement/blocks/environment/snow2.png and /dev/null differ diff --git a/core/assets-raw/sprites_replacement/blocks/environment/snow3.png b/core/assets-raw/sprites_replacement/blocks/environment/snow3.png deleted file mode 100644 index c52f98cdae..0000000000 Binary files a/core/assets-raw/sprites_replacement/blocks/environment/snow3.png and /dev/null differ diff --git a/core/assets-raw/sprites_replacement/blocks/environment/spore-moss1.png b/core/assets-raw/sprites_replacement/blocks/environment/spore-moss1.png deleted file mode 100644 index b1e7fbbf34..0000000000 Binary files a/core/assets-raw/sprites_replacement/blocks/environment/spore-moss1.png and /dev/null differ diff --git a/core/assets-raw/sprites_replacement/blocks/environment/spore-moss2.png b/core/assets-raw/sprites_replacement/blocks/environment/spore-moss2.png deleted file mode 100644 index cf05c4279e..0000000000 Binary files a/core/assets-raw/sprites_replacement/blocks/environment/spore-moss2.png and /dev/null differ diff --git a/core/assets-raw/sprites_replacement/blocks/environment/spore-moss3.png b/core/assets-raw/sprites_replacement/blocks/environment/spore-moss3.png deleted file mode 100644 index 8b519681f9..0000000000 Binary files a/core/assets-raw/sprites_replacement/blocks/environment/spore-moss3.png and /dev/null differ diff --git a/core/assets-raw/sprites_replacement/blocks/environment/stone1.png b/core/assets-raw/sprites_replacement/blocks/environment/stone1.png deleted file mode 100644 index e9f42a172d..0000000000 Binary files a/core/assets-raw/sprites_replacement/blocks/environment/stone1.png and /dev/null differ diff --git a/core/assets-raw/sprites_replacement/blocks/environment/stone2.png b/core/assets-raw/sprites_replacement/blocks/environment/stone2.png deleted file mode 100644 index 09bc9f3e5a..0000000000 Binary files a/core/assets-raw/sprites_replacement/blocks/environment/stone2.png and /dev/null differ diff --git a/core/assets-raw/sprites_replacement/blocks/environment/stone3.png b/core/assets-raw/sprites_replacement/blocks/environment/stone3.png deleted file mode 100644 index ca2487d441..0000000000 Binary files a/core/assets-raw/sprites_replacement/blocks/environment/stone3.png and /dev/null differ diff --git a/core/assets-raw/sprites_replacement/blocks/environment/thorium1.png b/core/assets-raw/sprites_replacement/blocks/environment/thorium1.png deleted file mode 100644 index ce0de1271c..0000000000 Binary files a/core/assets-raw/sprites_replacement/blocks/environment/thorium1.png and /dev/null differ diff --git a/core/assets-raw/sprites_replacement/blocks/environment/thorium2.png b/core/assets-raw/sprites_replacement/blocks/environment/thorium2.png deleted file mode 100644 index 9372bf6f81..0000000000 Binary files a/core/assets-raw/sprites_replacement/blocks/environment/thorium2.png and /dev/null differ diff --git a/core/assets-raw/sprites_replacement/blocks/environment/thorium3.png b/core/assets-raw/sprites_replacement/blocks/environment/thorium3.png deleted file mode 100644 index de787e98a6..0000000000 Binary files a/core/assets-raw/sprites_replacement/blocks/environment/thorium3.png and /dev/null differ diff --git a/core/assets-raw/sprites_replacement/blocks/environment/titanium1.png b/core/assets-raw/sprites_replacement/blocks/environment/titanium1.png deleted file mode 100644 index 9ba087608a..0000000000 Binary files a/core/assets-raw/sprites_replacement/blocks/environment/titanium1.png and /dev/null differ diff --git a/core/assets-raw/sprites_replacement/blocks/environment/titanium2.png b/core/assets-raw/sprites_replacement/blocks/environment/titanium2.png deleted file mode 100644 index c6add6ad54..0000000000 Binary files a/core/assets-raw/sprites_replacement/blocks/environment/titanium2.png and /dev/null differ diff --git a/core/assets-raw/sprites_replacement/blocks/environment/titanium3.png b/core/assets-raw/sprites_replacement/blocks/environment/titanium3.png deleted file mode 100644 index 946f55ab46..0000000000 Binary files a/core/assets-raw/sprites_replacement/blocks/environment/titanium3.png and /dev/null differ diff --git a/core/assets-raw/sprites_replacement/blocks/environment/white-tree-dead.png b/core/assets-raw/sprites_replacement/blocks/environment/white-tree-dead.png deleted file mode 100644 index 4831e1879e..0000000000 Binary files a/core/assets-raw/sprites_replacement/blocks/environment/white-tree-dead.png and /dev/null differ diff --git a/core/assets-raw/sprites_replacement/blocks/environment/white-tree.png b/core/assets-raw/sprites_replacement/blocks/environment/white-tree.png deleted file mode 100644 index af2b61c5ca..0000000000 Binary files a/core/assets-raw/sprites_replacement/blocks/environment/white-tree.png and /dev/null differ diff --git a/core/assets-raw/sprites_replacement/blocks/extra/block-border.png b/core/assets-raw/sprites_replacement/blocks/extra/block-border.png deleted file mode 100644 index 415c5a6849..0000000000 Binary files a/core/assets-raw/sprites_replacement/blocks/extra/block-border.png and /dev/null differ diff --git a/core/assets-raw/sprites_replacement/blocks/extra/place-arrow.png b/core/assets-raw/sprites_replacement/blocks/extra/place-arrow.png deleted file mode 100644 index 5ae905b23f..0000000000 Binary files a/core/assets-raw/sprites_replacement/blocks/extra/place-arrow.png and /dev/null differ diff --git a/core/assets-raw/sprites_replacement/blocks/liquid/conduit-top-0.png b/core/assets-raw/sprites_replacement/blocks/liquid/conduit-top-0.png deleted file mode 100644 index 9dc9384971..0000000000 Binary files a/core/assets-raw/sprites_replacement/blocks/liquid/conduit-top-0.png and /dev/null differ diff --git a/core/assets-raw/sprites_replacement/blocks/liquid/conduit-top-1.png b/core/assets-raw/sprites_replacement/blocks/liquid/conduit-top-1.png deleted file mode 100644 index e219a5751d..0000000000 Binary files a/core/assets-raw/sprites_replacement/blocks/liquid/conduit-top-1.png and /dev/null differ diff --git a/core/assets-raw/sprites_replacement/blocks/liquid/conduit-top-5.png b/core/assets-raw/sprites_replacement/blocks/liquid/conduit-top-5.png deleted file mode 100644 index 72461ba0b6..0000000000 Binary files a/core/assets-raw/sprites_replacement/blocks/liquid/conduit-top-5.png and /dev/null differ diff --git a/core/assets-raw/sprites_replacement/blocks/liquid/pulse-conduit-top-0.png b/core/assets-raw/sprites_replacement/blocks/liquid/pulse-conduit-top-0.png deleted file mode 100644 index c6a453fed9..0000000000 Binary files a/core/assets-raw/sprites_replacement/blocks/liquid/pulse-conduit-top-0.png and /dev/null differ diff --git a/core/assets-raw/sprites_replacement/blocks/liquid/pulse-conduit-top-1.png b/core/assets-raw/sprites_replacement/blocks/liquid/pulse-conduit-top-1.png deleted file mode 100644 index 62f03471c4..0000000000 Binary files a/core/assets-raw/sprites_replacement/blocks/liquid/pulse-conduit-top-1.png and /dev/null differ diff --git a/core/assets-raw/sprites_replacement/blocks/power/power-node-large.png b/core/assets-raw/sprites_replacement/blocks/power/power-node-large.png deleted file mode 100644 index 0a76d7e1a7..0000000000 Binary files a/core/assets-raw/sprites_replacement/blocks/power/power-node-large.png and /dev/null differ diff --git a/core/assets-raw/sprites_replacement/blocks/power/power-node.png b/core/assets-raw/sprites_replacement/blocks/power/power-node.png deleted file mode 100644 index 0e7296b98f..0000000000 Binary files a/core/assets-raw/sprites_replacement/blocks/power/power-node.png and /dev/null differ diff --git a/core/assets-raw/sprites_replacement/blocks/power/power-source.png b/core/assets-raw/sprites_replacement/blocks/power/power-source.png deleted file mode 100644 index f4c6473df4..0000000000 Binary files a/core/assets-raw/sprites_replacement/blocks/power/power-source.png and /dev/null differ diff --git a/core/assets-raw/sprites_replacement/blocks/power/power-void.png b/core/assets-raw/sprites_replacement/blocks/power/power-void.png deleted file mode 100644 index fee2a2b3e8..0000000000 Binary files a/core/assets-raw/sprites_replacement/blocks/power/power-void.png and /dev/null differ diff --git a/core/assets-raw/sprites_replacement/blocks/production/incinerator.png b/core/assets-raw/sprites_replacement/blocks/production/incinerator.png deleted file mode 100644 index 9c20fa5308..0000000000 Binary files a/core/assets-raw/sprites_replacement/blocks/production/incinerator.png and /dev/null differ diff --git a/core/assets-raw/sprites_replacement/blocks/production/pulverizer-rotator.png b/core/assets-raw/sprites_replacement/blocks/production/pulverizer-rotator.png deleted file mode 100644 index c39062caa2..0000000000 Binary files a/core/assets-raw/sprites_replacement/blocks/production/pulverizer-rotator.png and /dev/null differ diff --git a/core/assets-raw/sprites_replacement/blocks/production/pulverizer.png b/core/assets-raw/sprites_replacement/blocks/production/pulverizer.png deleted file mode 100644 index cc51a06fa5..0000000000 Binary files a/core/assets-raw/sprites_replacement/blocks/production/pulverizer.png and /dev/null differ diff --git a/core/assets-raw/sprites_replacement/blocks/turrets/duo.png b/core/assets-raw/sprites_replacement/blocks/turrets/duo.png deleted file mode 100644 index efcdb60832..0000000000 Binary files a/core/assets-raw/sprites_replacement/blocks/turrets/duo.png and /dev/null differ diff --git a/core/assets-raw/sprites_replacement/items/item-blast-compound.png b/core/assets-raw/sprites_replacement/items/item-blast-compound.png deleted file mode 100644 index c14eb34b11..0000000000 Binary files a/core/assets-raw/sprites_replacement/items/item-blast-compound.png and /dev/null differ diff --git a/core/assets-raw/sprites_replacement/items/item-coal.png b/core/assets-raw/sprites_replacement/items/item-coal.png deleted file mode 100644 index 13727cd802..0000000000 Binary files a/core/assets-raw/sprites_replacement/items/item-coal.png and /dev/null differ diff --git a/core/assets-raw/sprites_replacement/items/item-copper.png b/core/assets-raw/sprites_replacement/items/item-copper.png deleted file mode 100644 index 664c9cc6f3..0000000000 Binary files a/core/assets-raw/sprites_replacement/items/item-copper.png and /dev/null differ diff --git a/core/assets-raw/sprites_replacement/items/item-graphite.png b/core/assets-raw/sprites_replacement/items/item-graphite.png deleted file mode 100644 index 68b074bdc7..0000000000 Binary files a/core/assets-raw/sprites_replacement/items/item-graphite.png and /dev/null differ diff --git a/core/assets-raw/sprites_replacement/items/item-lead.png b/core/assets-raw/sprites_replacement/items/item-lead.png deleted file mode 100644 index ce09ac6185..0000000000 Binary files a/core/assets-raw/sprites_replacement/items/item-lead.png and /dev/null differ diff --git a/core/assets-raw/sprites_replacement/items/item-metaglass.png b/core/assets-raw/sprites_replacement/items/item-metaglass.png deleted file mode 100644 index 3c45a8873f..0000000000 Binary files a/core/assets-raw/sprites_replacement/items/item-metaglass.png and /dev/null differ diff --git a/core/assets-raw/sprites_replacement/items/item-phase-fabric.png b/core/assets-raw/sprites_replacement/items/item-phase-fabric.png deleted file mode 100644 index 6f226c7a97..0000000000 Binary files a/core/assets-raw/sprites_replacement/items/item-phase-fabric.png and /dev/null differ diff --git a/core/assets-raw/sprites_replacement/items/item-plastanium.png b/core/assets-raw/sprites_replacement/items/item-plastanium.png deleted file mode 100644 index 6ce75034f3..0000000000 Binary files a/core/assets-raw/sprites_replacement/items/item-plastanium.png and /dev/null differ diff --git a/core/assets-raw/sprites_replacement/items/item-pyratite.png b/core/assets-raw/sprites_replacement/items/item-pyratite.png deleted file mode 100644 index eec30df17d..0000000000 Binary files a/core/assets-raw/sprites_replacement/items/item-pyratite.png and /dev/null differ diff --git a/core/assets-raw/sprites_replacement/items/item-sand.png b/core/assets-raw/sprites_replacement/items/item-sand.png deleted file mode 100644 index ac94898030..0000000000 Binary files a/core/assets-raw/sprites_replacement/items/item-sand.png and /dev/null differ diff --git a/core/assets-raw/sprites_replacement/items/item-scrap.png b/core/assets-raw/sprites_replacement/items/item-scrap.png deleted file mode 100644 index 0de9f03656..0000000000 Binary files a/core/assets-raw/sprites_replacement/items/item-scrap.png and /dev/null differ diff --git a/core/assets-raw/sprites_replacement/items/item-silicon.png b/core/assets-raw/sprites_replacement/items/item-silicon.png deleted file mode 100644 index 5d4cfab004..0000000000 Binary files a/core/assets-raw/sprites_replacement/items/item-silicon.png and /dev/null differ diff --git a/core/assets-raw/sprites_replacement/items/item-surge-alloy.png b/core/assets-raw/sprites_replacement/items/item-surge-alloy.png deleted file mode 100644 index 9fc6aa4561..0000000000 Binary files a/core/assets-raw/sprites_replacement/items/item-surge-alloy.png and /dev/null differ diff --git a/core/assets-raw/sprites_replacement/items/item-thorium.png b/core/assets-raw/sprites_replacement/items/item-thorium.png deleted file mode 100644 index 2cd39c8f49..0000000000 Binary files a/core/assets-raw/sprites_replacement/items/item-thorium.png and /dev/null differ diff --git a/core/assets-raw/sprites_replacement/items/item-titanium.png b/core/assets-raw/sprites_replacement/items/item-titanium.png deleted file mode 100644 index 3e15e1e7c7..0000000000 Binary files a/core/assets-raw/sprites_replacement/items/item-titanium.png and /dev/null differ diff --git a/core/assets-raw/sprites_replacement/items/liquid-cryofluid.png b/core/assets-raw/sprites_replacement/items/liquid-cryofluid.png deleted file mode 100644 index 198c21ad17..0000000000 Binary files a/core/assets-raw/sprites_replacement/items/liquid-cryofluid.png and /dev/null differ diff --git a/core/assets-raw/sprites_replacement/items/liquid-oil.png b/core/assets-raw/sprites_replacement/items/liquid-oil.png deleted file mode 100644 index e0fbc07cf2..0000000000 Binary files a/core/assets-raw/sprites_replacement/items/liquid-oil.png and /dev/null differ diff --git a/core/assets-raw/sprites_replacement/items/liquid-slag.png b/core/assets-raw/sprites_replacement/items/liquid-slag.png deleted file mode 100644 index 87c2a41d07..0000000000 Binary files a/core/assets-raw/sprites_replacement/items/liquid-slag.png and /dev/null differ diff --git a/core/assets-raw/sprites_replacement/items/liquid-water.png b/core/assets-raw/sprites_replacement/items/liquid-water.png deleted file mode 100644 index 025c812967..0000000000 Binary files a/core/assets-raw/sprites_replacement/items/liquid-water.png and /dev/null differ diff --git a/core/assets-raw/sprites_replacement/weapons/blaster-equip.png b/core/assets-raw/sprites_replacement/weapons/blaster-equip.png deleted file mode 100644 index e8d35d7c9e..0000000000 Binary files a/core/assets-raw/sprites_replacement/weapons/blaster-equip.png and /dev/null differ diff --git a/core/assets-raw/sprites_replacement/weapons/chain-blaster-equip.png b/core/assets-raw/sprites_replacement/weapons/chain-blaster-equip.png deleted file mode 100644 index 3cde6228a0..0000000000 Binary files a/core/assets-raw/sprites_replacement/weapons/chain-blaster-equip.png and /dev/null differ diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index 305733dca0..74c88600fc 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -219,6 +219,9 @@ editor.teams = Teams editor.elevation = Elevation editor.errorload = Error loading file:\n[accent]{0} editor.errorsave = Error saving file:\n[accent]{0} +editor.errorimage = That's an image, not a map. Don't go around changing extensions expecting it to work.\n\nIf you want to import a legacy map, use the 'import legacy map' button in the editor. +editor.errorlegacy = This map is too old, and uses a legacy map format that is no longer supported. +editor.errorheader = This map file is either not valid or corrupt. editor.errorname = Map has no name defined. editor.update = Update editor.randomize = Randomize @@ -271,6 +274,8 @@ filter.option.wall = Wall filter.option.ore = Ore filter.option.floor2 = Secondary Floor filter.option.threshold2 = Secondary Threshold +filter.option.radius = Radius +filter.option.percentile = Percentile width = Width: height = Height: menu = Menu @@ -426,6 +431,7 @@ category.shooting = Shooting category.optional = Optional Enhancements setting.landscape.name = Lock Landscape setting.shadows.name = Shadows +setting.linear.name = Linear Filtering setting.animatedwater.name = Animated Water setting.animatedshields.name = Animated Shields setting.antialias.name = Antialias[LIGHT_GRAY] (requires restart)[] @@ -502,9 +508,9 @@ mode.survival.description = The normal mode. Limited resources and automatic inc mode.sandbox.name = Sandbox mode.sandbox.description = Infinite resources and no timer for waves. mode.pvp.name = PvP -mode.pvp.description = Fight against other players locally. +mode.pvp.description = Fight against other players locally. Requires at least 2 differently-colored cores in the map to play. mode.attack.name = Attack -mode.attack.description = Destroy the enemy's base. No waves. +mode.attack.description = Destroy the enemy's base. No waves. Requires a red core in the map to play. mode.custom = Custom Rules rules.infiniteresources = Infinite Resources @@ -801,7 +807,7 @@ block.spectre.name = Spectre block.meltdown.name = Meltdown block.container.name = Container block.launch-pad.name = Launch Pad -block.launch-pad.description = Launches batches of items without any need for a core launch. Unfinished. +block.launch-pad.description = Launches batches of items without any need for a core launch. block.launch-pad-large.name = Large Launch Pad team.blue.name = blue team.red.name = red diff --git a/core/assets/bundles/bundle_fr.properties b/core/assets/bundles/bundle_fr.properties index fab11cfc22..61e1e981e3 100644 --- a/core/assets/bundles/bundle_fr.properties +++ b/core/assets/bundles/bundle_fr.properties @@ -326,7 +326,7 @@ zone.overgrowth.name = Overgrowth zone.tarFields.name = Tar Fields settings.language = Langage settings.reset = Valeur par défaut. -settings.rebind = Réatttribuer +settings.rebind = Réattribuer settings.controls = Contrôles settings.game = Jeu settings.sound = Son @@ -360,14 +360,14 @@ blocks.poweruse = Énergie utilisée blocks.powerdamage = Énergie/Dégâts blocks.itemcapacity = Stockage blocks.basepowergeneration = Génération d'énergie minimale -blocks.productiontime = Production Time +blocks.productiontime = Temps de production blocks.repairtime = Temps pour la Réparation Totale du Bloc blocks.speedincrease = Speed Increase blocks.range = Portée blocks.drilltier = Forable blocks.drillspeed = Vitesse de forage de base blocks.boosteffect = Boost Effect -blocks.maxunits = Nombre d'unité actives maximal +blocks.maxunits = Nombre d'unités actives maximal blocks.health = Santé blocks.inaccuracy = Précision blocks.shots = Tir @@ -422,10 +422,10 @@ setting.antialias.name = Antialias[LIGHT_GRAY] (demande le redémarrage de l'app setting.indicators.name = Indicateurs pour les alliés setting.autotarget.name = Visée automatique setting.fpscap.name = Max FPS -setting.fpscap.none = None +setting.fpscap.none = Aucun setting.fpscap.text = {0} FPS setting.swapdiagonal.name = Autoriser le placement des blocs en diagonal -setting.difficulty.training = entraînement +setting.difficulty.training = Entraînement setting.difficulty.easy = Facile setting.difficulty.normal = Normal setting.difficulty.hard = Difficile @@ -441,14 +441,14 @@ setting.borderless.name = Fenêtre sans contour setting.fps.name = Afficher FPS setting.vsync.name = VSync setting.lasers.name = Afficher les rayons des lasers -setting.pixelate.name = Pixelate[LIGHT_GRAY] (disables animations) +setting.pixelate.name = Pixeliser[LIGHT_GRAY] (disables animations) setting.minimap.name = Montrer la minimap setting.musicvol.name = Volume de la musique setting.mutemusic.name = Couper la musique setting.sfxvol.name = Volume des SFX setting.mutesound.name = Couper les SFX setting.crashreport.name = Envoyer un rapport de crash anonyme -setting.chatopacity.name = Chat Opacity +setting.chatopacity.name = Opacité du chat setting.playerchat.name = Display In-Game Chat keybind.title = Paramétrer les touches category.general.name = Général @@ -465,7 +465,7 @@ keybind.screenshot.name = Capture d'écran keybind.move_x.name = mouvement x keybind.move_y.name = mouvement y keybind.select.name = sélectionner -keybind.diagonal_placement.name = Placement en diagonal +keybind.diagonal_placement.name = Placement en diagonale keybind.pick.name = Choisir un bloc keybind.break_block.name = Suppprimer un bloc keybind.deselect.name = Désélectionner @@ -488,17 +488,17 @@ keybind.drop_unit.name = drop unit keybind.zoom_minimap.name = Zoom minimap mode.help.title = Description des modes de jeu mode.survival.name = Survival -mode.survival.description = The normal mode. Limited resources and automatic incoming waves. +mode.survival.description = Le mode normal. Ressources limitées et vagues automatiques. mode.sandbox.name = bac à sable -mode.sandbox.description = Ressources infinies et pas de timer pour les vagues. +mode.sandbox.description = Ressources infinies et pas de minuterie pour les vagues. mode.pvp.name = JcJ mode.pvp.description = Battez-vous contre d'autres joueurs en local. -mode.attack.name = Attack -mode.attack.description = No waves, with the goal to destroy the enemy base. -mode.custom = Custom Rules -rules.infiniteresources = Infinite Resources -rules.wavetimer = Wave Timer -rules.waves = Waves +mode.attack.name = Attaque +mode.attack.description = Pas de vagues, avec le but de détruire la base ennemie. +mode.custom = Règles personnalisées +rules.infiniteresources = Ressources infinies +rules.wavetimer = Minuterie pour les vagues +rules.waves = Vagues rules.enemyCheat = Infinite AI Resources rules.unitdrops = Unit Drops rules.unitbuildspeedmultiplier = Unit Creation Speed Multiplier @@ -514,13 +514,13 @@ rules.buildspeedmultiplier = Build Speed Multiplier rules.waitForWaveToEnd = Waves wait for enemies rules.dropzoneradius = Drop Zone Radius:[LIGHT_GRAY] (tiles) rules.respawns = Max respawns per wave -rules.limitedRespawns = Limit Respawns -rules.title.waves = Waves -rules.title.respawns = Respawns +rules.limitedRespawns = Limite de réapparition +rules.title.waves = Vagues +rules.title.respawns = Réapparitions rules.title.resourcesbuilding = Resources & Building -rules.title.player = Players -rules.title.enemy = Enemies -rules.title.unit = Units +rules.title.player = Joueurs +rules.title.enemy = Ennemis +rules.title.unit = Unités content.item.name = Objets content.liquid.name = Liquides content.unit.name = Unités @@ -553,8 +553,8 @@ item.blast-compound.name = Mélange explosif item.blast-compound.description = Un composé volatile utilisé dans les bombes et les explosifs. Bien qu'il puisse être utilisé comme carburant, ce n'est pas conseillé. item.pyratite.name = Pyratite item.pyratite.description = Une substance extrêmement inflammable utilisée dans les armes incendiaires. -item.metaglass.name = Metaglass -item.metaglass.description = A super-tough glass compound. Extensively used for liquid distribution and storage. +item.metaglass.name = Métavitre +item.metaglass.description = Un composé de vitre super-résistant. Utilisé largement pour le transport et le stockage de liquides. item.scrap.name = Scrap item.scrap.description = Leftover remnants of old structures and units. Contains trace amounts of many different metals. liquid.water.name = Eau @@ -601,23 +601,23 @@ mech.itemcapacity = [LIGHT_GRAY]Capacité de stockage: {0} mech.minespeed = [LIGHT_GRAY]Vitesse de minage: {0} mech.minepower = [LIGHT_GRAY]Puissance du minage: {0} mech.ability = [LIGHT_GRAY]Compétence: {0} -mech.buildspeed = [LIGHT_GRAY]Building Speed: {0}% +mech.buildspeed = [LIGHT_GRAY]Vitesse de construction: {0}% liquid.heatcapacity = [LIGHT_GRAY]Capacité Thermique: {0} liquid.viscosity = [LIGHT_GRAY]Viscosité: {0} liquid.temperature = [LIGHT_GRAY]Température: {0} -block.grass.name = Grass -block.salt.name = Salt -block.saltrocks.name = Salt Rocks -block.pebbles.name = Pebbles +block.grass.name = Herbe +block.salt.name = Sel +block.saltrocks.name = Roches de sel +block.pebbles.name = Cailloux block.tendrils.name = Tendrils -block.sandrocks.name = Sand Rocks +block.sandrocks.name = Roches de sable block.spore-pine.name = Spore Pine block.sporerocks.name = Spore Rocks -block.rock.name = Rock -block.snowrock.name = Snow Rock +block.rock.name = Roche +block.snowrock.name = Roches de neige block.shale.name = Shale block.shale-boulder.name = Shale Boulder -block.moss.name = Moss +block.moss.name = Mousse block.shrubs.name = Shrubs block.spore-moss.name = Spore Moss block.shalerocks.name = Shale Rocks @@ -642,44 +642,44 @@ block.darksand-tainted-water.name = Dark Sand Tainted Water block.tar.name = Pétrole block.stone.name = Roche block.sand.name = Sable -block.darksand.name = Dark Sand -block.ice.name = glace +block.darksand.name = Sable sombre +block.ice.name = Glace block.snow.name = Neige -block.craters.name = Craters +block.craters.name = Cratères block.sand-water.name = Sand water block.darksand-water.name = Dark Sand Water block.char.name = Char block.holostone.name = Holo stone block.ice-snow.name = Ice Snow -block.rocks.name = Rocks -block.icerocks.name = Ice rocks -block.snowrocks.name = Snow Rocks -block.dunerocks.name = Dune Rocks -block.pine.name = Pine -block.white-tree-dead.name = White Tree Dead -block.white-tree.name = White Tree +block.rocks.name = Roches +block.icerocks.name = Roches de glace +block.snowrocks.name = Roches de neige +block.dunerocks.name = Roches de dunes +block.pine.name = Pin +block.white-tree-dead.name = Arbre blanc mort +block.white-tree.name = Arbre blanc block.spore-cluster.name = Spore Cluster -block.metal-floor.name = Metal Floor -block.metal-floor-2.name = Metal Floor 2 -block.metal-floor-3.name = Metal Floor 3 -block.metal-floor-5.name = Metal Floor 5 -block.metal-floor-damaged.name = Metal Floor Damaged +block.metal-floor.name = Plancher de métal +block.metal-floor-2.name = Plancher de métal 2 +block.metal-floor-3.name = Plancher de métal 3 +block.metal-floor-5.name = Plancher de métal 5 +block.metal-floor-damaged.name = Plancher de métal endommagé block.creeptree.name = Creeptree -block.dark-panel-1.name = Dark Panel 1 -block.dark-panel-2.name = Dark Panel 2 -block.dark-panel-3.name = Dark Panel 3 -block.dark-panel-4.name = Dark Panel 4 -block.dark-panel-5.name = Dark Panel 5 -block.dark-panel-6.name = Dark Panel 6 -block.dark-metal.name = Dark Metal -block.ignarock.name = Igna Rock +block.dark-panel-1.name = Panneau sombre 1 +block.dark-panel-2.name = Panneau sombre 2 +block.dark-panel-3.name = Panneau sombre 3 +block.dark-panel-4.name = Panneau sombre 4 +block.dark-panel-5.name = Panneau sombre 5 +block.dark-panel-6.name = Panneau sombre 6 +block.dark-metal.name = Métal Sombre +block.ignarock.name = Roches ignées block.hotrock.name = Hot Rock block.magmarock.name = Magma Rock -block.cliffs.name = Cliffs +block.cliffs.name = Falaises block.copper-wall.name = Mur de cuivre block.copper-wall-large.name = Grand mur de cuivre -block.titanium-wall.name = Titanium Wall -block.titanium-wall-large.name = Large Titanium Wall +block.titanium-wall.name = Mur de titane +block.titanium-wall-large.name = Grand mur de titane block.phase-wall.name = Mur phasé block.phase-wall-large.name = Grand mur phasé block.thorium-wall.name = Mur en Thorium @@ -696,7 +696,7 @@ block.titanium-conveyor.name = Convoyeur en titane block.junction.name = Jonction block.router.name = [accent]routeur[] block.distributor.name = Distributeur -block.sorter.name = Sorteur +block.sorter.name = Trieur block.sorter.description = Trie les articles. Si un article rcorrespond à la sélection, il peut passer. Autrement, l'article est distribué vers la gauche ou la droite. block.overflow-gate.name = Barrière de Débordement block.overflow-gate.description = C'est la combinaison entre un Routeur et un Diviseur qui peut seulement distribuer à gauche et à droite si le chemin de devant est bloqué. @@ -708,16 +708,16 @@ block.melter.name = Four à Fusion block.incinerator.name = Incinérateur block.spore-press.name = Spore Press block.separator.name = Séparateur -block.coal-centrifuge.name = Coal Centrifuge +block.coal-centrifuge.name = Centrifuge à charbon block.power-node.name = Transmetteur énergétique block.power-node-large.name = Gros transmetteur énergétique block.surge-tower.name = Surge Tower block.battery.name = Batterie -block.battery-large.name = Batterie large +block.battery-large.name = Grande batterie block.combustion-generator.name = Générateur à combustion block.turbine-generator.name = Générateur à Turbine block.differential-generator.name = Differential Generator -block.impact-reactor.name = Impact Reactor +block.impact-reactor.name = Réacteur à impact block.mechanical-drill.name = Foreuse mécanique block.pneumatic-drill.name = Foreuse à vérin block.laser-drill.name = Foreuse Laser @@ -776,7 +776,7 @@ block.thermal-generator.name = Générateur thermique block.alloy-smelter.name = Fonderie d'alliage superchargé block.mender.name = Mender block.mend-projector.name = Projecteur soignant -block.surge-wall.name = mur superchargé +block.surge-wall.name = Mur superchargé block.surge-wall-large.name = Grand mur superchargé block.cyclone.name = Cyclone block.fuse.name = Fuse @@ -788,16 +788,16 @@ block.rtg-generator.name = G.T.R. block.spectre.name = Spectre block.meltdown.name = Meltdown block.container.name = Conteneur -block.launch-pad.name = Launch Pad +block.launch-pad.name = Plateforme de lancement block.launch-pad.description = Launches batches of items without any need for a core launch. Unfinished. -block.launch-pad-large.name = Large Launch Pad +block.launch-pad-large.name = Grande plateforme de lancement team.blue.name = Bleu team.red.name = Rouge team.orange.name = Orange team.none.name = Gris team.green.name = Vert team.purple.name = Violet -unit.spirit.name = Drone sppirituel +unit.spirit.name = Drone spirituel unit.spirit.description = L'unité de soutien de départ. Apparaît dans la base par défaut. Mine automatiquement les minerais, récupère les objets au sol et répare les blocs. unit.phantom.name = Drone Fantôme unit.phantom.description = Une unité de soutien avancée. Mine automatiquement les minerais, récupère les objets au sol et répare les blocs. Bien plus efficace qu'un drone spirituel. diff --git a/core/assets/bundles/bundle_ja.properties b/core/assets/bundles/bundle_ja.properties index b274a0a47c..c5c3cf425a 100644 --- a/core/assets/bundles/bundle_ja.properties +++ b/core/assets/bundles/bundle_ja.properties @@ -3,28 +3,31 @@ credits = クレジット contributors = 翻訳や協力してくださった方々 discord = DiscordのMindustryに参加! link.discord.description = Mindustryの公式Discordグループ -link.github.description = ゲームのソースコード -link.dev-builds.description = 不安定な開発ビルド -link.trello.description = 公式 Trelloボード の実装予定の機能をチェック -link.itch.io.description = itch.ioでPC版のダウンロードやweb版をプレイ +link.github.description = このゲームのソースコード +link.dev-builds.description = 不安定な開発版 +link.trello.description = 公式 Trelloボード で実装予定の機能をチェック +link.itch.io.description = itch.io でPC版のダウンロードやweb版で遊ぼう link.google-play.description = Google Playのストア link.wiki.description = 公式 Mindustry Wiki linkfail = リンクを開けませんでした!\nURLをクリップボードにコピーしました。 screenshot = スクリーンショットを {0} に保存しました。 -screenshot.invalid = Map too large, potentially not enough memory for screenshot. +screenshot.invalid = マップが広すぎます。スクリーンショットに必要なメモリが足りない可能性があります。 gameover = ゲームオーバー gameover.pvp = [accent] {0}[] チームの勝利! highscore = [accent]ハイスコアを記録! + stat.wave = 防衛したウェーブ:[accent] {0} stat.enemiesDestroyed = 敵による破壊数:[accent] {0} stat.built = 建設した建造物数:[accent] {0} stat.destroyed = 破壊した建造物数:[accent] {0} stat.deconstructed = 解体した建造物数:[accent] {0} stat.delivered = 獲得した資源: -stat.rank = ランク: [accent]{0} -placeline = You have selected a block.\nYou can[accent] place in a line[] by[accent] holding down your finger for a few seconds[] and dragging in a direction.\nTry it. -removearea = You have selected removal mode.\nYou can[accent] remove blocks in a rectangle[] by[accent] holding down your finger for a few seconds[] and dragging.\nTry it. -launcheditems = [accent]Launched Items +stat.rank = 最終ランク: [accent]{0} + +placeline = ブロックを選択しました。\n[accent]少し長押し[]して、好きな方向にドラッグすると[accent]一直線上にブロックを設置[]することができます。\nやってみよう。 +removearea = 撤去モードが選択されました。\n[accent]少し長押し[]して、ドラッグすると[accent]範囲内のブロックを撤去[]することができます。\nやってみよう。 + +launcheditems = [accent]回収したアイテム map.delete = マップ "[accent]{0}[]" を削除してもよろしいですか? level.highscore = ハイスコア: [accent]{0} level.select = レベル選択 @@ -32,26 +35,26 @@ level.mode = ゲームモード: showagain = 次回以降表示しない coreattack = < コアが攻撃を受けています! > nearpoint = [[ [scarlet]直ちに出現ポイントより離脱せよ[] ]\n殲滅されます -outofbounds = [[ 領域外 ]\n[]自爆まであと {0} 秒 +outofbounds = [[ 区域外 ]\n[]自爆まであと {0} 秒 database = コアデーターベース -savegame = ゲームを保存 -loadgame = ゲームを読み込む -joingame = ゲームに参加 +savegame = 保存 +loadgame = 読み込む +joingame = 参加 addplayers = プレイヤーを追加/削除 -customgame = カスタムゲーム -newgame = 新しいゲーム +customgame = カスタムプレイ +newgame = 新しく始める none = <なし> -minimap = Minimap +minimap = ミニマップ close = 閉じる quit = 終了 maps = マップ continue = 続ける -maps.none = [LIGHT_GRAY]マップが存在しません! +maps.none = [LIGHT_GRAY]マップが見つかりませんでした! about.button = 情報 -name = 名前: -noname = 先に[accent]プレイヤー名[]を決めてください。 +name = プレイヤー名: +noname = [accent]プレイヤー名[]を入力してください。 filename = ファイル名: -unlocked = 新しいブロックをアンロック! +unlocked = 新しい要素をアンロック! completed = [accent]完了 techtree = テックツリー research.list = [LIGHT_GRAY]調査: @@ -61,26 +64,26 @@ players = {0} 人がオンライン players.single = {0} 人がオンライン server.closing = [accent]サーバーを閉じています... server.kicked.kick = サーバからキックされました! -server.kicked.serverClose = サーバーが閉じました。 +server.kicked.serverClose = サーバーが閉じられました。 server.kicked.clientOutdated = 古いクライアントです! ゲームをアップデートしてください! server.kicked.serverOutdated = 古いサーバーです! ホストに更新してもらってください! server.kicked.banned = サーバーからブロックされています。 server.kicked.recentKick = 直前にキックされています。\nもう一度接続できるまでお待ちください。 -server.kicked.nameInUse = このサーバーでは、\nその名前はすでに使用されています。 +server.kicked.nameInUse = このサーバーでは、\nすでに同じ名前が使用されています。 server.kicked.nameEmpty = 無効な名前です。 -server.kicked.idInUse = すでにサーバーに参加しています! 二つのアカウントでの接続は許可されていません。 +server.kicked.idInUse = すでにサーバーに参加しています! 二つのアカウントでの同時接続は許可されていません。 server.kicked.customClient = このサーバーはカスタムビルドをサポートしていません。公式版をダウンロードしてください。 server.kicked.gameover = ゲームオーバー! -host.info = [accent]ホスト[]ボタンを押すと、ポート[scarlet]6567[]でサーバーが開かれます。同じ[LIGHT_GRAY]Wifi や ローカルネットワーク[]からはサーバーリストで見ることができます。\n\nIPアドレスからどこからでもアクセスできるようにするには、[accent]ポート開放[]する必要があります。\n\n[LIGHT_GRAY]注意:: LAN上のゲームで接続できない場合、Mindustryがファイアウォールの設定でローカルネットワークに接続が許可されているか確認してください。 -join.info = ここでは、[accent]サーバーのIPアドレス[]から接続したり、[accent]ローカルネットワーク[]のサーバーを探すことができます。\nLANとWANの両方のマルチプレイに対応しています。\n\n[LIGHT_GRAY]注意:グローバルサーバーリストはありません。誰かのサーバーにIPで接続したい場合、ホストにIPをお尋ねください。 -hostserver = ゲームをホスト +host.info = [accent]ホスト[]をすると、ポート[scarlet]6567[]でサーバーが開かれまます。\n同じ[LIGHT_GRAY]WiFiやローカル上のネットワークなど[]ではサーバーリストに表示されるようになります。\n\nIPアドレスで他のところからも接続できるようにするには、[accent]ポート開放[]が必要です。\n\n注意: もしLAN上のゲームに参加できない場合、Mindustryがファイアーウォールの設定でローカルネットワークへの接続が許可されているかを確認してください。 +join.info = ここでは、[accent]サーバーのIPアドレス[]から接続したり、[accent]ローカル上[]のサーバーを探したりすることができます。\nLANやWAN上の両方のマルチプレイに対応しています。\n\n[LIGHT_GRAY]注意: 世界中のサーバーの一覧ではありません。他人のサーバーにIPアドレスで接続したい場合は、あらかじめホスト側にIPアドレスをお尋ねください。 +hostserver = ホスト hostserver.mobile = ホスト host = ホスト hosting = [accent]サーバーを開いています... -hosts.refresh = リフレッシュ -hosts.discovering = LAN上のサーバーを探しています -server.refreshing = サーバーをリフレッシュ -hosts.none = [lightgray]ローカルゲームが見つかりません! +hosts.refresh = 更新 +hosts.discovering = LAN上のサーバーを探索中 +server.refreshing = サーバーを更新中 +hosts.none = [lightgray]ローカル上のサーバーが見つかりませんでした! host.invalid = [scarlet]ホストに接続できません。 trace = プレイヤーの記録 trace.playername = プレイヤー名: [accent]{0} @@ -95,48 +98,48 @@ trace.totalblocksplaced = 総ブロック設置数: [accent]{0} trace.lastblockplaced = 最後に設置したブロック: [accent]{0} invalidid = 無効なクライアントIDです! バグ報告してください。 server.bans = ブロック -server.bans.none = ブロックされたプレイヤーはいません! +server.bans.none = ブロックされたプレイヤーは見つかりませんでした! server.admins = 管理者 server.admins.none = 管理者はいません! server.add = サーバーを追加 -server.delete = サーバーを削除しますか? +server.delete = サーバーを削除してもよろしいですか? server.hostname = ホスト: {0} server.edit = サーバーを編集 server.outdated = [crimson]古いサーバーです![] server.outdated.client = [crimson]古いクライアントです![] server.version = [lightgray]バージョン: {0} {1} server.custombuild = [yellow]カスタムビルド -confirmban = このプレイヤーをブロックしますか? -confirmkick = このプレイヤーをキックしますか? -confirmunban = このプレイヤーのブロックを解除しますか? -confirmadmin = このプレイヤーを管理者にしますか? -confirmunadmin = このプレイヤーを管理者から削除しますか? +confirmban = このプレイヤーをブロックしてもよろしいですか? +confirmkick = このプレイヤーをキックしてもよろしいですか? +confirmunban = このプレイヤーのブロックを解除してもよろしいですか? +confirmadmin = このプレイヤーを管理者にしてもよろしいですか? +confirmunadmin = このプレイヤーを管理者から削除してもよろしいですか? joingame.title = サーバーに参加 joingame.ip = アドレス: disconnect = 接続が切断されました。 disconnect.data = ワールドデータの読み込みに失敗しました! connecting = [accent]接続中... -connecting.data = [accent]ワールドデータを読み込んでいます... +connecting.data = [accent]ワールドデータを読み込み中... server.port = ポート: server.addressinuse = アドレスがすでに使用されています! server.invalidport = 無効なポート番号です! -server.error = [crimson]サーバーエラー: [accent]{0} -save.old = これは古いバージョンのセーブデータで、使用することができません。\n\n[LIGHT_GRAY]下位互換性の実装は正式版の4.0行われます。 -save.new = 新しく保存 -save.overwrite = このスロットに上書きしてよろしいですか? +server.error = [crimson]サーバーのホストエラー: [accent]{0} +save.old = この古いバージョンのセーブデータは使用することができません。\n\n[LIGHT_GRAY]セーブデータの下位互換性の実装は正式版4.0で行われます。 +save.new = 新規保存 +save.overwrite = このスロットに上書きしてもよろしいですか? overwrite = 上書き -save.none = セーブデータがありません! +save.none = セーブデータがに見つかりませんでした! saveload = [accent]セーブ中... savefail = ゲームの保存に失敗しました! save.delete.confirm = このセーブデータを削除してよろしいですか? save.delete = 削除 save.export = エクスポート save.import.invalid = [accent]無効なセーブデータです! -save.import.fail = [crimson]セーブのインポートに失敗: [accent]{0} -save.export.fail = [crimson]セーブのエクスポートに失敗: [accent]{0} +save.import.fail = [crimson]セーブデータのインポートに失敗しました: [accent]{0} +save.export.fail = [crimson]セーブデータのエクスポートに失敗しました: [accent]{0} save.import = セーブデータを読み込む -save.newslot = セーブデータ名: -save.rename = リネーム +save.newslot = セーブ名: +save.rename = 名前を変更 save.rename.text = 新しい名前: selectslot = セーブデータを選択 slot = [accent]スロット {0} @@ -148,14 +151,14 @@ save.autosave = 自動保存: {0} save.map = マップ: {0} save.wave = ウェーブ {0} save.difficulty = 難易度: {0} -save.date = 最終保存: {0} +save.date = 最終保存日時: {0} save.playtime = プレイ時間: {0} warning = 警告 confirm = 確認 delete = 削除 ok = OK open = 開く -customize = Customize +customize = カスタマイズ cancel = キャンセル openlink = リンクを開く copylink = リンクをコピー @@ -163,30 +166,30 @@ back = 戻る quit.confirm = 終了してもよろしいですか? changelog.title = 変更履歴 changelog.loading = 変更履歴を取得中... -changelog.error.android = [accent]Android4.4または、それ以下では変更履歴が動作しない場合があります!\nこれはAndroidの内部バグによるものです。 -changelog.error.ios = [accent]iOSは変更履歴に対応していません。 +changelog.error.android = [accent]変更履歴はAndroid4.4または、それ以下では動作しない場合があります!\nこれはAndroidの内部バグによるものです。 +changelog.error.ios = [accent]変更履歴はiOSに対応していません。 changelog.error = [scarlet]変更履歴を取得できませんでした!\nインターネット接続を確認してください。 changelog.current = [yellow][[現在のバージョン] -changelog.latest = [accent][[最新バージョン] +changelog.latest = [accent][[最新版] loading = [accent]読み込み中... saving = [accent]保存中... wave = [accent]ウェーブ {0} wave.waiting = [LIGHT_GRAY]次のウェーブまで {0} 秒 -wave.waveInProgress = [LIGHT_GRAY]Wave in progress +wave.waveInProgress = [LIGHT_GRAY]ウェーブ進行中 waiting = [LIGHT_GRAY]待機中... waiting.players = プレイヤーを待っています... -wave.enemies = [LIGHT_GRAY]残り {0} 体 -wave.enemy = [LIGHT_GRAY]残り {0} 体 -loadimage = イメージを読み込む -saveimage = イメージを保存 +wave.enemies = [LIGHT_GRAY]敵は残り {0} 体 +wave.enemy = [LIGHT_GRAY]敵は残り {0} 体 +loadimage = 画像を読み込む +saveimage = 画像を保存 unknown = 不明 custom = カスタム builtin = 組み込み -map.delete.confirm = マップを削除してもよろしいですか? これは戻すことができません! +map.delete.confirm = マップを削除してもよろしいですか? これは元に戻すことができません! map.random = [accent]ランダムマップ -map.nospawn = このマップにはスポーンするためのプレイヤーのコアがありません! [ROYAL]青い[]コアをエディターでマップに追加してください。 -map.nospawn.pvp = このマップには敵がスポーンするためのプレイヤーのコアがありません! [SCARLET]赤い[]コアをエディターでマップに追加してください。 -map.nospawn.attack = This map does not have any enemy cores for player to attack! Add[SCARLET] red[] cores to this map in the editor. +map.nospawn = このマップにはプレイヤーの出現するコアがありません! エディターで[ROYAL]青い[]コアをマップに追加してください。 +map.nospawn.pvp = このマップにはプレイヤーの敵が出現するコアがありません! エディターで[SCARLET]青以外[]のコアをマップに追加してください。 +map.nospawn.attack = このマップにはプレイヤーを攻撃する敵のコアがありません! エディターから[SCARLET]赤い[]コアを追加してください。 map.invalid = マップの読み込みエラー: ファイルが無効、または破損しています。 editor.brush = ブラシ editor.openin = エディターで開く @@ -199,9 +202,9 @@ editor.waves = ウェーブ: waves.title = ウェーブ waves.remove = 削除 waves.never = <永久> -waves.every = every -waves.waves = ウェーブごとに出現 -waves.perspawn = スポーン +waves.every = ウェーブ +waves.waves = ごとに出現 +waves.perspawn = 体出現 waves.to = から waves.boss = ボス waves.preview = プレビュー @@ -226,30 +229,30 @@ editor.resize = リサイズ editor.loadmap = マップを読み込む editor.savemap = マップを保存 editor.saved = 保存しました! -editor.save.noname = マップに名前がありません! メニューの 'マップ情報' から設定してください。 -editor.save.overwrite = マップが組み込みマップを上書きしようとしています! メニューの 'マップ情報' から異なる名前に設定してください。 -editor.import.exists = [scarlet]インポートできません:[] '{0}' はすでに組み込みマップの名前として存在します! +editor.save.noname = マップに名前が設定されていません! メニューの 'マップ情報' から設定してください。 +editor.save.overwrite = 組み込みマップを上書きしようとしています! メニューの 'マップ情報' から異なる名前に設定してください。 +editor.import.exists = [scarlet]インポートできませんでした:[] '{0}' はすでに組み込みマップの名前として存在します! editor.import = インポート... editor.importmap = マップをインポート -editor.importmap.description = すでに存在しているマップをインポート +editor.importmap.description = すでに存在しているマップを読み込む editor.importfile = ファイルをインポート -editor.importfile.description = 外部マップファイルをインポート +editor.importfile.description = 外部マップファイルを読み込む editor.importimage = 古いイメージをインポート -editor.importimage.description = 外部イメージファイルをインポート +editor.importimage.description = 外部イメージファイルを読み込む editor.export = エクスポート... editor.exportfile = ファイルをエクスポート -editor.exportfile.description = マップファイルをエクスポート +editor.exportfile.description = マップファイルをエクスポートする editor.exportimage = 地形イメージをエクスポート -editor.exportimage.description = イメージファイルをエクスポート +editor.exportimage.description = イメージファイルをエクスポートする editor.loadimage = 地形をインポート editor.saveimage = 地形をエクスポート editor.unsaved = [scarlet]保存されていない変更があります![]\n終了してもよろしいですか? editor.resizemap = マップをリサイズ editor.mapname = マップ名: -editor.overwrite = [accent]警告!\n存在するマップを上書きします。 -editor.overwrite.confirm = [scarlet]警告![] この名前のマップがすでに存在します。上書きしてもよろしいですか? +editor.overwrite = [accent]警告!\nすでに存在するマップを上書きします。 +editor.overwrite.confirm = [scarlet]警告![] すでに同じ名前のマップが存在します。上書きしてもよろしいですか? editor.selectmap = 読み込むマップを選択: -filters.empty = [LIGHT_GRAY]No filters! Add one with the button below. +filters.empty = [LIGHT_GRAY]フィルターが設定されていません! 下のボタンからフィルターを追加してください。 filter.distort = ゆがみ filter.noise = ノイズ filter.ore = 鉱石 @@ -278,52 +281,56 @@ save = 保存 fps = FPS: {0} tps = TPS: {0} ping = Ping: {0}ms -language.restart = 言語設定を有効にするにはゲームを再起動してください。 +language.restart = ゲームを再起動後、言語設定が有効になります。 settings = 設定 tutorial = チュートリアル editor = エディター mapeditor = マップエディター donate = 寄附 + abandon = 撤退 abandon.text = このゾーンとすべての資源が敵に奪われます。 locked = ロック -complete = [LIGHT_GRAY]完了: -zone.requirement = Wave {0} in zone {1} +complete = [LIGHT_GRAY]達成済み: +zone.requirement = ゾーン {1} でウェーブ {0} を達成 resume = 再開ゾーン:\n[LIGHT_GRAY]{0} bestwave = [LIGHT_GRAY]最高ウェーブ: {0} -launch = 出撃 -launch.title = 出撃成功 -launch.next = [LIGHT_GRAY]次の出撃は ウェーブ {0} -launch.unable = [scarlet]出撃できません[] 敵によって妨害されています。 +launch = 発射 +launch.title = 発射成功 +launch.next = [LIGHT_GRAY]次の発射は ウェーブ {0} +launch.unable = [scarlet]発射できません[] 敵によって妨害されています。 launch.confirm = すべての資源がコアに搬入されます。\nもうこの基地には戻ってくることはできません。 -uncover = 開拓 +uncover = 開放 configure = 積荷の設定 configure.locked = [LIGHT_GRAY]ウェーブ {0} を達成すると積荷を設定できるようになります。 zone.unlocked = [LIGHT_GRAY]{0} がアンロックされました. -zone.requirement.complete = Wave {0} reached:\n{1} zone requirements met. +zone.requirement.complete = ウェーブ {0} を達成:\n{1} の開放条件を達成しました。 zone.config.complete = ウェーブ {0} を達成:\n積荷の設定が解除されました。 zone.resources = 発見した資源: add = 追加... boss.health = ボスのHP + connectfail = [crimson]サーバーへの接続できませんでした:\n\n[accent]{0} error.unreachable = サーバーに到達できません。\nアドレスは正しいですか? error.invalidaddress = 無効なアドレスです。 -error.timedout = タイムアウトしました!\nホストがポート開放されているか確認してください。アドレスは正しいです! -error.mismatch = パケットエラー:\nクライアント/サーバーのバージョンが一致しません。\nゲームとホストが最新のMindustryか確認してください! +error.timedout = タイムアウトしました!\nホストがポート開放されているかを確認してください。また、このアドレスは無効なアドレスではありません! +error.mismatch = パケットエラー:\n恐らくクライアント/サーバーのバージョンが一致していません。\nゲームとホストが最新版のMindustryかどうかを確認してください! error.alreadyconnected = すでに接続されています。 error.mapnotfound = マップファイルが見つかりません! error.io = ネットワークエラーです。 error.any = 不明なネットワークエラーです。 + zone.groundZero.name = グラウンド · ゼロ -zone.desertWastes.name = Desert Wastes +zone.desertWastes.name = デザート · ウェーツ zone.craters.name = ザ · クレーター zone.frozenForest.name = フローズン · フォレスト zone.ruinousShores.name = ルーイナス · ショアーズ zone.stainedMountains.name = ステインド · マウンテン zone.desolateRift.name = ディサレット · リフト zone.nuclearComplex.name = ニュークリア · プロダクション · コンプレックス -zone.overgrowth.name = Overgrowth -zone.tarFields.name = Tar Fields +zone.overgrowth.name = オーバーグロウス +zone.tarFields.name = ター · フィールズ + settings.language = 言語 settings.reset = デフォルトにリセット settings.rebind = 再設定 @@ -332,7 +339,7 @@ settings.game = ゲーム settings.sound = サウンド settings.graphics = グラフィック settings.cleardata = データを削除... -settings.clear.confirm = データを削除してもよろしいですか?\n元に戻すことはできません! +settings.clear.confirm = データを削除してもよろしいですか?\nこれを元に戻すことはできません! settings.clearall.confirm = [scarlet]警告![]\nこれはすべてのデータが削除されます。これにはセーブデータ、マップ、アンロック、キーバインドが含まれます。\n「ok」 を押すと、すべてのデータが削除され、自動的に終了します。 settings.clearunlocks = アンロックを削除 settings.clearall = すべてを削除 @@ -342,16 +349,16 @@ no = いいえ info.title = 情報 error.title = [crimson]エラーが発生しました error.crashtitle = エラーが発生しました -blocks.input = Input -blocks.output = Output -blocks.booster = Booster +blocks.input = 搬入 +blocks.output = 搬出 +blocks.booster = ブースト block.unknown = [LIGHT_GRAY]??? blocks.powercapacity = 電力容量 blocks.powershot = 電力/ショット blocks.targetsair = 対空攻撃 blocks.targetsground = 対地攻撃 blocks.itemsmoved = 輸送速度 -blocks.launchtime = Time Between Launches +blocks.launchtime = 発射の待機時間 blocks.shootrange = 範囲 blocks.size = 大きさ blocks.liquidcapacity = 液体容量 @@ -360,23 +367,25 @@ blocks.poweruse = 電力使用量 blocks.powerdamage = 電力/ダメージ blocks.itemcapacity = アイテム容量 blocks.basepowergeneration = 基本発電量 -blocks.productiontime = Production Time -blocks.repairtime = Block Full Repair Time -blocks.speedincrease = Speed Increase -blocks.range = Range +blocks.productiontime = 製造速度 +blocks.repairtime = ブロックの完全修復速度 +blocks.speedincrease = 速度向上 +blocks.range = 範囲 blocks.drilltier = ドリル blocks.drillspeed = 基本採掘速度 -blocks.boosteffect = Boost Effect +blocks.boosteffect = ブースト効果 blocks.maxunits = 最大ユニット数 blocks.health = 耐久値 +blocks.buildtime = 建設時間 blocks.inaccuracy = 精度のずれ blocks.shots = ショット blocks.reload = ショット/秒 blocks.ammo = 弾薬 + bar.drillspeed = 採掘速度: {0}/秒 bar.efficiency = 効率: {0}% -bar.powerbalance = 電力: {0} -bar.poweramount = Power: {0} +bar.powerbalance = 電力: {0}/秒 +bar.poweramount = 電力: {0} bar.poweroutput = 電力発電量: {0} bar.items = アイテム: {0} bar.liquid = 液体 @@ -384,17 +393,19 @@ bar.heat = 熱 bar.power = 電力 bar.progress = 建設状況 bar.spawned = ユニット数: {0}/{1} -bullet.damage = [stat]{0}[lightgray] dmg -bullet.splashdamage = [stat]{0}[lightgray] area dmg ~[stat] {1}[lightgray] tiles -bullet.incendiary = [stat]incendiary -bullet.homing = [stat]homing -bullet.shock = [stat]shock -bullet.frag = [stat]frag -bullet.knockback = [stat]{0}[lightgray] knockback -bullet.freezing = [stat]freezing -bullet.tarred = [stat]tarred -bullet.multiplier = [stat]{0}[lightgray]x ammo multiplier -bullet.reload = [stat]{0}[lightgray]x reload + +bullet.damage = [stat]{0}[lightgray] ダメージ +bullet.splashdamage = [stat]{0}[lightgray] 範囲ダメージ 約[stat] {1}[lightgray] タイル +bullet.incendiary = [stat]焼夷弾 +bullet.homing = [stat]ホーミング +bullet.shock = [stat]電撃 +bullet.frag = [stat]爆発弾 +bullet.knockback = [stat]{0}[lightgray] ノックバック +bullet.freezing = [stat]フリーズ +bullet.tarred = [stat]タール弾 +bullet.multiplier = [stat]弾薬 {0}[lightgray]倍 +bullet.reload = [stat]リロード速度 {0}[lightgray]倍 + unit.blocks = ブロック unit.powersecond = 電力/秒 unit.liquidsecond = 液体/秒 @@ -403,24 +414,24 @@ unit.liquidunits = 液体 unit.powerunits = 電力 unit.degrees = 度 unit.seconds = 秒 -unit.persecond = /sec -unit.timesspeed = x speed +unit.persecond = /秒 +unit.timesspeed = 倍の速度 unit.percent = % unit.items = アイテム category.general = 一般 category.power = 電力 category.liquids = 液体 category.items = アイテム -category.crafting = 製作速度 -category.shooting = 攻撃速度 -category.optional = 機能強化オプション -setting.landscape.name = Lock Landscape -setting.shadows.name = Shadows +category.crafting = 搬入/搬出 +category.shooting = ショット +category.optional = 強化オプション +setting.landscape.name = 横画面で固定 +setting.shadows.name = 影 setting.animatedwater.name = 水のアニメーション -setting.animatedshields.name = Animated Shields -setting.antialias.name = Antialias[LIGHT_GRAY] (requires restart)[] -setting.indicators.name = 味方の方角表示 -setting.autotarget.name = 自動ターゲット +setting.animatedshields.name = シールドのアニメーション +setting.antialias.name = アンチエイリアス[LIGHT_GRAY] (再起動が必要)[] +setting.indicators.name = 敵/味方の方角表示 +setting.autotarget.name = オートターゲット setting.fpscap.name = 最大FPS setting.fpscap.none = なし setting.fpscap.text = {0} FPS @@ -437,25 +448,25 @@ setting.sensitivity.name = 操作感度 setting.saveinterval.name = 自動保存間隔 setting.seconds = {0} 秒 setting.fullscreen.name = フルスクリーン -setting.borderless.name = Borderless Window +setting.borderless.name = ボーダーレスウィンドウ (再起動が必要な可能性があります) setting.fps.name = FPSを表示 setting.vsync.name = VSync -setting.lasers.name = 電力レーザーを表示 -setting.pixelate.name = Pixelate [LIGHT_GRAY](may decrease performance) +setting.lasers.name = 電力線を表示 +setting.pixelate.name = ピクセル化 [LIGHT_GRAY](パフォーマンスが低下する可能性があります) setting.minimap.name = ミニマップを表示 setting.musicvol.name = 音楽 音量 setting.mutemusic.name = 音楽をミュート setting.sfxvol.name = 効果音 音量 setting.mutesound.name = 効果音をミュート setting.crashreport.name = 匿名でクラッシュレポートを送信する -setting.chatopacity.name = Chat Opacity -setting.playerchat.name = Display In-Game Chat -keybind.title = キーバインド +setting.chatopacity.name = チャットの透明度 +setting.playerchat.name = ゲーム内にチャットを表示 +keybind.title = キーバインドを再設定 category.general.name = 一般 category.view.name = 表示 category.multiplayer.name = マルチプレイ command.attack = 攻撃 -command.retreat = 退却 +command.retreat = 後退 command.patrol = 巡回 keybind.gridMode.name = ブロック選択 keybind.gridModeShift.name = カテゴリー選択 @@ -470,11 +481,11 @@ keybind.pick.name = ブロックの選択 keybind.break_block.name = ブロックの破壊 keybind.deselect.name = 選択解除 keybind.shoot.name = ショット -keybind.zoom_hold.name = ズーム長押し +keybind.zoom_hold.name = 長押しズーム keybind.zoom.name = ズーム keybind.menu.name = メニュー keybind.pause.name = ポーズ -keybind.minimap.name = Minimap +keybind.minimap.name = ミニマップ keybind.dash.name = ダッシュ keybind.chat.name = チャット keybind.player_list.name = プレイヤーリスト @@ -488,39 +499,41 @@ keybind.drop_unit.name = ドロップユニット keybind.zoom_minimap.name = ミニマップのズーム mode.help.title = モード説明 mode.survival.name = サバイバル -mode.survival.description = 通常のモードです。 限られた資源で自動的にウェーブが進行します。 +mode.survival.description = 通常のモードです。 資源も限られる中、自動的にウェーブが進行していきます。 mode.sandbox.name = サンドボックス -mode.sandbox.description = 無限の資源でウェーブを自由に進行できます。 +mode.sandbox.description = 無限の資源があり、ウェーブを自由に進行できます。 mode.pvp.name = PvP -mode.pvp.description = ローカル内で他のプレイヤーと戦います。 +mode.pvp.description = エリア内で他のプレイヤーと戦います。 mode.attack.name = アタック mode.attack.description = ウェーブがなく、敵の基地を破壊することを目指します。 -mode.custom = Custom Rules -rules.infiniteresources = Infinite Resources -rules.wavetimer = Wave Timer -rules.waves = Waves -rules.enemyCheat = Infinite AI Resources -rules.unitdrops = Unit Drops -rules.unitbuildspeedmultiplier = Unit Creation Speed Multiplier -rules.unithealthmultiplier = Unit Health Multiplier -rules.playerhealthmultiplier = Player Health Multiplier -rules.playerdamagemultiplier = Player Damage Multiplier -rules.unitdamagemultiplier = Unit Damage Multiplier -rules.enemycorebuildradius = Enemy Core No-Build Radius:[LIGHT_GRAY] (tiles) -rules.respawntime = Respawn Time:[LIGHT_GRAY] (sec) -rules.wavespacing = Wave Spacing:[LIGHT_GRAY] (sec) -rules.buildcostmultiplier = Build Cost Multiplier -rules.buildspeedmultiplier = Build Speed Multiplier -rules.waitForWaveToEnd = Waves wait for enemies -rules.dropzoneradius = Drop Zone Radius:[LIGHT_GRAY] (tiles) -rules.respawns = Max respawns per wave -rules.limitedRespawns = Limit Respawns -rules.title.waves = Waves -rules.title.respawns = Respawns -rules.title.resourcesbuilding = Resources & Building -rules.title.player = Players -rules.title.enemy = Enemies -rules.title.unit = Units +mode.custom = カスタムルール + +rules.infiniteresources = 資源の無限化 +rules.wavetimer = ウェーブの自動進行 +rules.waves = ウェーブ +rules.enemyCheat = 敵の資源の無限化 +rules.unitdrops = ユニットの戦利品 +rules.unitbuildspeedmultiplier = ユニットの製造速度倍率 +rules.unithealthmultiplier = ユニットの体力倍率 +rules.playerhealthmultiplier = プレイヤーの体力倍率 +rules.playerdamagemultiplier = プレイヤーのダメージ倍率 +rules.unitdamagemultiplier = ユニットのダメージ倍率 +rules.enemycorebuildradius = 敵コア周辺の建設禁止区域の半径: [LIGHT_GRAY] (タイル) +rules.respawntime = 復活までの待機時間:[LIGHT_GRAY] (秒) +rules.wavespacing = ウェーブ間の待機時間:[LIGHT_GRAY] (秒) +rules.buildcostmultiplier = 建設コストの倍率 +rules.buildspeedmultiplier = 建設速度の倍率 +rules.waitForWaveToEnd = 敵が倒されるまでウェーブの進行を中断 +rules.dropzoneradius = 出現範囲の半径:[LIGHT_GRAY] (タイル) +rules.respawns = ウェーブごとの最大復活回数 +rules.limitedRespawns = 復活回数の制限 +rules.title.waves = ウェーブ +rules.title.respawns = 復活 +rules.title.resourcesbuilding = 資源 & 建設 +rules.title.player = プレイヤー +rules.title.enemy = 敵 +rules.title.unit = ユニット + content.item.name = アイテム content.liquid.name = 液体 content.unit.name = ユニット @@ -536,23 +549,23 @@ item.graphite.name = 黒鉛 item.titanium.name = チタン item.titanium.description = 希少で非常に軽量な金属です。液体輸送やドリル、航空機などで使われます。 item.thorium.name = トリウム -item.thorium.description = 放射性を持つ高密度な金属です。建物の補強や核燃料として使われます。 +item.thorium.description = 放射性を持つ高密度な金属です。建造物の支えや核燃料として使われます。 item.silicon.name = シリコン item.silicon.description = 非常に有用な半導体でソーラーパネルや多くの複雑な機械に応用できます。 item.plastanium.name = プラスタニウム -item.plastanium.description = 軽量で伸縮性のある材料です。機体や弾薬に使用されます。 +item.plastanium.description = 軽量で伸縮性のある材料です。高度な航空機や分散型の弾薬として使用されます。 item.phase-fabric.name = フェーズファイバー item.phase-fabric.description = 極めて軽量な素材です。高度な機械や自己修復技術に使用されます。 item.surge-alloy.name = サージ合金 item.surge-alloy.description = 電気的特性を持った特殊な合金です。 item.spore-pod.name = 胞子ポッド -item.spore-pod.description = 石油や爆薬、燃料への転換に使用されます。 +item.spore-pod.description = 石油や爆薬、燃料への転換として使用されます。 item.sand.name = 砂 item.sand.description = 合金や融剤など広く使用されている一般的な材料です。 item.blast-compound.name = 爆発性化合物 item.blast-compound.description = 爆弾や爆発物に使われる揮発性の化合物です。燃料として燃やすこともできますが、お勧めしません。 item.pyratite.name = ピラタイト -item.pyratite.description = 兵器などに使われる非常に燃えやすい物質です。 +item.pyratite.description = 焼夷兵器などに使われる非常に燃えやすい物質です。 item.metaglass.name = メタガラス item.metaglass.description = とても頑丈な強化ガラスです。液体の輸送やタンクとして幅広く使われています。 item.scrap.name = スクラップ @@ -562,26 +575,26 @@ liquid.slag.name = スラグ liquid.oil.name = 石油 liquid.cryofluid.name = 冷却水 mech.alpha-mech.name = アルファ -mech.alpha-mech.weapon = 重武装機関砲 -mech.alpha-mech.ability = ドローン部隊 -mech.alpha-mech.description = 一般的な機体です。標準的な速度と攻撃力を持っています。攻撃力を高めるために最大3体のドローン機を持っています。 +mech.alpha-mech.weapon = 重機関砲 +mech.alpha-mech.ability = 再生 +mech.alpha-mech.description = 一般的な機体です。十分な速度と攻撃性能です。 mech.delta-mech.name = デルタ mech.delta-mech.weapon = 電撃砲 mech.delta-mech.ability = 放電 -mech.delta-mech.description = 高速移動する敵のために素早く軽量化された機体です。建物にはほとんどダメージを与えられませんが、電撃でたくさんの敵を攻撃することができます。 +mech.delta-mech.description = 突撃攻撃が可能な素早く軽量化された機体です。建造物にはダメージをほとんど与えられませんが、電撃によって多くの敵に攻撃することができます。 mech.tau-mech.name = タウ -mech.tau-mech.weapon = 修復レーザー +mech.tau-mech.weapon = 再構築レーザー mech.tau-mech.ability = リペアバースト -mech.tau-mech.description = 支援型機体です。ダメージを受けたブロックを修復や火災の消火、半径内の味方の治療を行います。 +mech.tau-mech.description = 支援型機体です。攻撃を受けた味方のブロックを修復します。修復能力によって周辺の味方を修復します。 mech.omega-mech.name = オメガ mech.omega-mech.weapon = ロケット弾 -mech.omega-mech.ability = プロテクター -mech.omega-mech.description = 最前線での攻撃向けに作られた大型機体です。プロテクターによってダメージの90%を防ぐことができます。 +mech.omega-mech.ability = 特殊装甲 +mech.omega-mech.description = 最前線での攻撃向けに作られた大型機体です。特殊装甲によってダメージの90%を防ぐことができます。 mech.dart-ship.name = ダーツ mech.dart-ship.weapon = 機関砲 mech.dart-ship.description = 一般的な機体です。軽く高速で使いやすいですが、攻撃能力はほとんどなく採掘速度も遅いのが難点です。 mech.javelin-ship.name = ジャベリン -mech.javelin-ship.description = 高速移動ができる機体です。最初は遅いですが、敵の基地で飛行能力が飛躍的に高まり、電撃やミサイルで多量のダメージを与えることができます。 +mech.javelin-ship.description = 突撃攻撃型の機体です。最初の速度は遅いですが、敵基地が近づくと飛行能力が飛躍的に高まり、電撃やミサイルで大きなダメージを与えることができます。 mech.javelin-ship.weapon = バーストミサイル mech.javelin-ship.ability = 放電ブースター mech.trident-ship.name = トライデント @@ -601,24 +614,25 @@ mech.itemcapacity = [LIGHT_GRAY]アイテム容量: {0} mech.minespeed = [LIGHT_GRAY]採掘速度: {0} mech.minepower = [LIGHT_GRAY]採掘性能: {0} mech.ability = [LIGHT_GRAY]能力: {0} -mech.buildspeed = [LIGHT_GRAY]Building Speed: {0}% +mech.buildspeed = [LIGHT_GRAY]建設速度: {0}% liquid.heatcapacity = [LIGHT_GRAY]熱容量: {0} liquid.viscosity = [LIGHT_GRAY]粘度: {0} liquid.temperature = [LIGHT_GRAY]温度: {0} + block.grass.name = 草 block.salt.name = 岩塩氷河 -block.saltrocks.name = Salt Rocks -block.pebbles.name = Pebbles -block.tendrils.name = Tendrils +block.saltrocks.name = 岩塩 +block.pebbles.name = 小石 +block.tendrils.name = つる block.sandrocks.name = 砂岩 block.spore-pine.name = 胞子の松の木 block.sporerocks.name = 胞子の岩 block.rock.name = 岩 -block.snowrock.name = Snow Rock +block.snowrock.name = 雪の積もった岩 block.shale.name = 泥板岩 block.shale-boulder.name = 泥板岩の丸石 block.moss.name = コケ -block.shrubs.name = Shrubs +block.shrubs.name = 低木 block.spore-moss.name = 胞子のコケ block.shalerocks.name = 泥板岩の岩 block.scrap-wall.name = スクラップの壁 @@ -626,28 +640,28 @@ block.scrap-wall-large.name = 大きなスクラップの壁 block.scrap-wall-huge.name = とても大きなスクラップの壁 block.scrap-wall-gigantic.name = 巨大なスクラップの壁 block.thruster.name = スラスター -block.kiln.name = かまど +block.kiln.name = 溶解炉 block.kiln.description = 砂と鉛を溶かしてメタガラスを生成します。少量の電力が必要です。 block.graphite-press.name = 黒鉛圧縮機 block.multi-press.name = マルチ圧縮機 block.constructing = {0}\n[LIGHT_GRAY](建設中) -block.spawn.name = 敵のスポーン +block.spawn.name = 敵の出現場所 block.core-shard.name = コア: シャード block.core-foundation.name = コア: ファンデーション block.core-nucleus.name = コア: ニュークリアス block.deepwater.name = 深層水 block.water.name = 水 -block.tainted-water.name = Tainted Water -block.darksand-tainted-water.name = Dark Sand Tainted Water +block.tainted-water.name = 汚れた水 +block.darksand-tainted-water.name = 黒い砂で汚れた水 block.tar.name = タール block.stone.name = 石 block.sand.name = 砂 -block.darksand.name = Dark Sand +block.darksand.name = 黒い砂 block.ice.name = 氷 block.snow.name = 雪 block.craters.name = クレーター block.sand-water.name = 濁った水 -block.darksand-water.name = Dark Sand Water +block.darksand-water.name = 黒い砂で濁った水 block.char.name = 焦げ跡 block.holostone.name = ホロストーン block.ice-snow.name = 雪氷 @@ -664,30 +678,29 @@ block.metal-floor-2.name = 金属製の地面 2 block.metal-floor-3.name = 金属製の地面 3 block.metal-floor-5.name = 金属製の地面 5 block.metal-floor-damaged.name = 破壊された金属製の地面 -block.creeptree.name = Creeptree -block.dark-panel-1.name = Dark Panel 1 -block.dark-panel-2.name = Dark Panel 2 -block.dark-panel-3.name = Dark Panel 3 -block.dark-panel-4.name = Dark Panel 4 -block.dark-panel-5.name = Dark Panel 5 -block.dark-panel-6.name = Dark Panel 6 -block.dark-metal.name = Dark Metal +block.dark-panel-1.name = ダークパネル 1 +block.dark-panel-2.name = ダークパネル 2 +block.dark-panel-3.name = ダークパネル 3 +block.dark-panel-4.name = ダークパネル 4 +block.dark-panel-5.name = ダークパネル 5 +block.dark-panel-6.name = ダークパネル 6 +block.dark-metal.name = ダークメタル block.ignarock.name = イグナロック block.hotrock.name = ホットロック block.magmarock.name = マグマロック block.cliffs.name = 崖 block.copper-wall.name = 銅の壁 -block.copper-wall-large.name = 大きな銅の壁 +block.copper-wall-large.name = 巨大な銅の壁 block.titanium-wall.name = チタンの壁 -block.titanium-wall-large.name = 大きなチタンの壁 +block.titanium-wall-large.name = 巨大なチタンの壁 block.phase-wall.name = フェーズファイバーの壁 -block.phase-wall-large.name = 大きなフェーズファイバーの壁 +block.phase-wall-large.name = 巨大なフェーズファイバーの壁 block.thorium-wall.name = トリウムの壁 -block.thorium-wall-large.name = 大きなトリウムの壁 +block.thorium-wall-large.name = 巨大なトリウムの壁 block.door.name = ドア -block.door-large.name = 大きなドア +block.door-large.name = 大型のドア block.duo.name = デュオ -block.scorch.name = Scorch +block.scorch.name = スコーチ block.scatter.name = スキャッター block.hail.name = ヘイル block.lancer.name = ランサー @@ -697,9 +710,9 @@ block.junction.name = ジャンクション block.router.name = ルーター block.distributor.name = ディストリビューター block.sorter.name = ソーター -block.sorter.description = アイテムを分別して搬出します。設定されたアイテムは通過させ、異なるアイテムの場合、左右に搬出します。 +block.sorter.description = アイテムを分別して搬出します。設定したアイテムは通過させます。他のアイテムが搬入されると側面にアイテムを搬出します。 block.overflow-gate.name = オーバーフローゲート -block.overflow-gate.description = 搬出先がいっぱいの場合に左右にアイテムを搬出します。 +block.overflow-gate.description = 搬出先にアイテムを搬入する空きがない場合に左右にアイテムを搬出します。 block.silicon-smelter.name = シリコン溶鉱炉 block.phase-weaver.name = フェーズ織機 block.pulverizer.name = 粉砕機 @@ -708,7 +721,7 @@ block.melter.name = 融合機 block.incinerator.name = 焼却炉 block.spore-press.name = 胞子圧縮機 block.separator.name = 分離機 -block.coal-centrifuge.name = Coal Centrifuge +block.coal-centrifuge.name = 石炭遠心分離機 block.power-node.name = 電源ノード block.power-node-large.name = 大型電源ノード block.surge-tower.name = サージタワー @@ -723,13 +736,13 @@ block.pneumatic-drill.name = 空気圧ドリル block.laser-drill.name = レーザードリル block.water-extractor.name = ウォーターポンプ block.cultivator.name = 培養機 -block.dart-mech-pad.name = Dart Mech Pad -block.delta-mech-pad.name = デルタパッド -block.javelin-ship-pad.name = ジャベリンパッド -block.trident-ship-pad.name = トライデントパッド -block.glaive-ship-pad.name = グライブパッド -block.omega-mech-pad.name = オメガパッド -block.tau-mech-pad.name = タウパッド +block.dart-mech-pad.name = アルファ整備台 +block.delta-mech-pad.name = デルタ整備台 +block.javelin-ship-pad.name = ジャベリン整備台 +block.trident-ship-pad.name = トライデント整備台 +block.glaive-ship-pad.name = グライブ整備台 +block.omega-mech-pad.name = オメガ整備台 +block.tau-mech-pad.name = タウ整備台 block.conduit.name = パイプ block.mechanical-pump.name = 機械ポンプ block.item-source.name = アイテムソース @@ -774,7 +787,7 @@ block.blast-drill.name = エアブラストドリル block.thermal-pump.name = サーマルポンプ block.thermal-generator.name = サーマル発電機 block.alloy-smelter.name = 合金溶鉱炉 -block.mender.name = Mender +block.mender.name = 修復機 block.mend-projector.name = 修復プロジェクター block.surge-wall.name = サージの壁 block.surge-wall-large.name = 大きなサージの壁 @@ -788,8 +801,8 @@ block.rtg-generator.name = RTG発電機 block.spectre.name = スペクター block.meltdown.name = メルトダウン block.container.name = コンテナー -block.launch-pad.name = 出撃パッド -block.launch-pad.description = コアの出撃不要で多くのアイテムを脱出します。これは未完成です。 +block.launch-pad.name = 発射台 +block.launch-pad.description = コアを発射することなく、沢山のアイテムを発射します。まだ未完成だよ。 block.launch-pad-large.name = 大型発射台 team.blue.name = ブルー team.red.name = レッド @@ -798,14 +811,14 @@ team.none.name = グレー team.green.name = グリーン team.purple.name = パープル unit.spirit.name = スピリットドローン -unit.spirit.description = 初期のドローンユニットです。デフォルトでコアからスポーンします。自動で鉱石の採掘やブロックの修理をします。 +unit.spirit.description = 手軽なドローンユニットです。最初からコアに出現します。鉱石の採掘やブロックの修理を自動で行います。 unit.phantom.name = ファントムドローン -unit.phantom.description = 改良された小型ドローンユニットです。自動で鉱石の採掘やブロックの修理をします。スピリットドローンを遥かに凌ぐ性能です。 +unit.phantom.description = 高度な小型ドローンユニットです。自動で鉱石の採掘やブロックの修理をします。スピリットドローンを遥かに凌ぐ性能を誇ります。 unit.dagger.name = ダガー -unit.dagger.description = 一般的な地上ユニットです。集団になるほど有用です。 +unit.dagger.description = 基本的な地上ユニットです。集団になると便利に使えます。 unit.crawler.name = クローラー unit.titan.name = タイタン -unit.titan.description = 改良された武装地上ユニットです。地上と航空機の両方に攻撃します。 +unit.titan.description = 高度な武装地上ユニットです。空と地上の両方の敵に攻撃を行います。 unit.ghoul.name = グール爆撃機 unit.ghoul.description = 重爆撃機です。 unit.wraith.name = レースファイター @@ -848,11 +861,11 @@ block.phase-wall-large.description = トリウムの壁ほど強固ではない block.surge-wall.description = 最も硬い防壁ブロックです。\nたまに攻撃されると敵に電撃を与えます。 block.surge-wall-large.description = 最も硬い大型防壁ブロックです。\nたまに攻撃されると敵に電撃を与えます。 block.door.description = 小さなドアブロックです。タップすることで開閉することができます。\nただし、ドアが開いている場合、弾や敵も通過できます。 -block.door-large.description = 大きなドアブロックです。タップすることで開閉することができます。\nただし、ドアが開いている場合、弾や敵も通過できます。 +block.door-large.description = 大型のドアブロックです。タップすることで開閉することができます。\nただし、ドアが開いている場合、弾や敵も通過できます。 block.mend-projector.description = 定期的に周辺のブロックを修復します。 block.overdrive-projector.description = ドリルやコンベアなど、近くの施設の効率を向上させます。 block.force-projector.description = 周囲に六角形の力場を作り出し、内部の建造物やユニットなどを守ります。 -block.shock-mine.description = 敵が踏むと、ダメージを与えます。敵には見えません。 +block.shock-mine.description = 踏んだ敵にダメージを与えます。敵に見えることはありません。 block.duo.description = 小さく安価なターレットです。 block.scatter.description = 中規模の対空型ターレットです。敵に鉛またはスクラップの塊を分散するように発射させます。 block.arc.description = 小型の電撃型ターレットです。敵に向かってランダムな半円状に電撃を放ちます。 @@ -886,48 +899,48 @@ block.separator.description = 石を水圧で砕き、石に含まれる様々 block.power-node.description = 電力ノード間で電力の送電を行います。最大で4つの電力源やノードなどに接続できます。隣接するブロックから電力の送電や供給を行います。 block.power-node-large.description = 巨大な電力ノードです。最大で6つの電力源やノードに接続できます。 block.battery.description = 余分な電力の充電して、貯めておくことができます。必要があれば、溜まった電力を供給します。 -block.battery-large.description = 通常のバッテリーよりもたくさんの電力を溜めておくことができます +block.battery-large.description = 通常のバッテリーよりもたくさんの電力を溜めておくことができます。 block.combustion-generator.description = 石油や可燃性の物質を燃やして発電します。 block.turbine-generator.description = 水を使って火力発電機より効率的に発電します。 block.thermal-generator.description = 溶岩から大量の電力を発電します。 block.solar-panel.description = 太陽光から少量の電力を発電します。 -block.solar-panel-large.description = 建設費が高価ですが、通常のソーラーパネルより大量の電力を発電することができます。 +block.solar-panel-large.description = 高価な建設費と引き換えに、通常のソーラーパネルより大量の電力を発電することができます。 block.thorium-reactor.description = 高い放射性を持ったトリウムから大量の電力を発電します。これには一定の冷却が必要です。冷却が不十分な場合、大きな爆発が発生します。 block.rtg-generator.description = トリウムリアクターよりも発電量は少ないですが、冷却を必要としない放射性同位体熱発電機(RTG)です。 block.unloader.description = コンテナやボールト、コアからアイテムをコンベアーか隣接するブロックに搬出します。搬出機をタップして搬出するアイテムを変更することができます。 block.container.description = 各種類のアイテムを少量ずつ保管します。隣接するコンテナーやボール卜、コアは一つのストレージユニットとして扱われます。 [LIGHT_GRAY]搬出機[]を使って、コンテナーからアイテムを搬出できます。 block.vault.description = 各種類のアイテムを大量に保管します。隣接するコンテナーやボール卜、コアは一つのストレージユニットとして扱われます。[LIGHT_GRAY]搬出機[]を使って、ボールトからアイテムを搬出できます。 block.mechanical-drill.description = 安価なドリルです。採掘可能な鉱脈に設置すると、アイテムを採掘して搬出します。 -block.pneumatic-drill.description = 速く採掘できるように改善されたドリルです。また、より硬い鉱石も採掘することができます。 -block.laser-drill.description = 電力を使用して、レーザー技術でより速く採掘することができます。また、放射性のトリウムを回収することができます。 -block.blast-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.trident-ship-pad.description = 機体を重装備の爆撃機に乗り換えます。\nパッドに乗ってダブルタップすることで使用することができます。 -block.javelin-ship-pad.description = 機体を高速で強力な電撃砲を搭載した迎撃機に乗り換えます。\nパッドに乗ってダブルタップすることで使用することができます。 -block.glaive-ship-pad.description = 機体を重装備の大型攻撃機に乗り換えます。\nパッドに乗ってダブルタップすることで使用することができます。 -block.tau-mech-pad.description = 機体を味方の建造物やユニットの修復が可能な支援型機体に乗り換えます。\nパッドに乗ってダブルタップすることで使用することができます。 -block.delta-mech-pad.description = 機体を高速で突撃攻撃に向いた軽装備の機体に乗り換えます。\nパッドに乗ってダブルタップすることで使用することができます。 -block.omega-mech-pad.description = 機体を最前線での戦闘に向いた重装備の機体に乗り換えます。\nパッドに乗ってダブルタップすることで使用することができます。 +block.trident-ship-pad.description = 機体を重装備の爆撃機に乗り換えます。\n整備台に乗ってダブルタップすることで使用することができます。 +block.javelin-ship-pad.description = 機体を高速で強力な電撃砲を搭載した迎撃機に乗り換えます。\n整備台に乗ってダブルタップすることで使用することができます。 +block.glaive-ship-pad.description = 機体を重装備の大型攻撃機に乗り換えます。\n整備台に乗ってダブルタップすることで使用することができます。 +block.tau-mech-pad.description = 機体を味方の建造物やユニットの修復が可能な支援型機体に乗り換えます。\n整備台に乗ってダブルタップすることで使用することができます。 +block.delta-mech-pad.description = 機体を高速で突撃攻撃に向いた軽装備の機体に乗り換えます。\n整備台に乗ってダブルタップすることで使用することができます。 +block.omega-mech-pad.description = 機体を最前線での戦闘に向いた重装備の機体に乗り換えます。\n整備台に乗ってダブルタップすることで使用することができます。 block.spirit-factory.description = 鉱石の採掘やブロックの修復を行う小型のドローンユニットのスピリットを製造します。 block.phantom-factory.description = スピリットドローンの性能を遥かに凌ぐ上位のドローンユニットのファントムドローンを製造します。 block.wraith-factory.description = 高速で突撃攻撃が可能な迎撃ユニットのレースファイターを製造します。 -block.ghoul-factory.description = 大型の爆撃機のグールを製造します。 +block.ghoul-factory.description = 大型爆撃機のグールを製造します。 block.dagger-factory.description = 基本的な地上ユニットのダガーを製造します。 -block.titan-factory.description = 改良された武装地上ユニットのタイタンを製造します。 +block.titan-factory.description = 高度な武装地上ユニットのタイタンを製造します。 block.fortress-factory.description = 大型の砲撃地上ユニットのフォートレスを製造します。 block.revenant-factory.description = 大型のレーザー航空ユニットのレベナントを製造します。 block.repair-point.description = 近くの負傷したユニットを修復します。 block.conduit.description = 一般的な液体輸送ブロックです。液体版のコンベアーです。ポンプや他のパイプに使うことができます。 -block.pulse-conduit.description = 改良された液体輸送ブロックです。通常のパイプより速く、たくさんのアイテムを輸送することができます。 -block.phase-conduit.description = 改良された液体輸送ブロックです。電力を使用して、液体を他の離れたフェーズパイプに転送することができます。 +block.pulse-conduit.description = 高度な液体輸送ブロックです。通常のパイプより速く、たくさんのアイテムを輸送することができます。 +block.phase-conduit.description = 高度な液体輸送ブロックです。電力を使用して、液体を他の離れたフェーズパイプに転送することができます。 block.liquid-router.description = 搬入したアイテムをほかの3方向に均等に搬出します。液体の漏れを防ぐことができます。一つの資源から複数に分ける際などに使われます。 block.liquid-tank.description = 大量の液体を保管しておくことができます。需要が不安定な製造設備や重要な施設の冷却水の予備などとして使用されます。 block.liquid-junction.description = パイプを他のパイプと交差できるようにします。それぞれ搬入した液体を前方に搬出します。パイプで複雑な構造を組み立てるときなどに使われます。 block.bridge-conduit.description = 高度な液体輸送ブロックです。地形や建物を超えて、3ブロック離れた場所に液体を輸送することができます。 block.mechanical-pump.description = 安価なポンプです。搬出速度は遅いですが、電力を使わず使用できます。 -block.rotary-pump.description = 改良されたポンプです。電力を使用して2倍速く搬出することができます。 +block.rotary-pump.description = 高度なポンプです。電力を使用して2倍速く搬出することができます。 block.thermal-pump.description = 最高性能のポンプです。 block.router.description = 搬入したアイテムをほかの3方向に均等に搬出します。一つの資源から複数に分ける際などに使われます。 block.distributor.description = 高度なルーターです。搬入したアイテムをほかの7方向に均等に分けて搬出します。 diff --git a/core/assets/bundles/bundle_ko.properties b/core/assets/bundles/bundle_ko.properties index 92a596cc9d..d13faf92fa 100644 --- a/core/assets/bundles/bundle_ko.properties +++ b/core/assets/bundles/bundle_ko.properties @@ -1,8 +1,8 @@ credits.text = Created by [ROYAL]Anuken[] - [SKY]anukendev@gmail.com[] credits = 제작자 contributors = 번역 및 기여자들 -discord = mindustry discord 에 참여 해 보세요! -link.discord.description = 공식 mindustry discord 채팅방 +discord = Mindustry Discord 에 참여 해 보세요! +link.discord.description = 공식 Mindustry Discord 채팅방 link.github.description = 게임 소스코드 link.dev-builds.description = 불안정한 개발 빌드들 link.trello.description = 다음 출시될 기능들을 게시판 공식 Trello 보드 @@ -86,13 +86,8 @@ trace = 플레이어 정보 보기 trace.playername = 이름: [accent]{0} trace.ip = IP: [accent]{0}{0} trace.id = 고유 ID: [accent]{0} -trace.android = Android 클라이언트: [accent]{0} +trace.mobile = 모바일 클라이언트: [accent]{0} trace.modclient = 수정된 클라이언트: [accent]{0} -trace.totalblocksbroken = 총 블록 파괴 개수: [accent]{0} -trace.structureblocksbroken = 구조 블록 파괴 수: [accent]{0} -trace.lastblockbroken = 마지막으로 파괴한 블록: [accent]{0} -trace.totalblocksplaced = 총 설치한 블록 개수: [accent]{0} -trace.lastblockplaced = 마지막으로 설치한 블록: [accent]{0} invalidid = 잘못된 클라이언트 ID 입니다! 버그 보고서를 제출 해 주세요. server.bans = 차단된 유저 server.bans.none = 차단된 플레이어가 없습니다. @@ -196,6 +191,8 @@ editor.mapinfo = 맵 정보 editor.author = 만든이: editor.description = 설명: editor.waves = 웨이브: +editor.rules = 규칙: +editor.ingame = 인게임 편집 waves.title = 웨이브 waves.remove = 삭제 waves.never = <절대> @@ -213,10 +210,15 @@ waves.copied = 웨이브 복사됨 editor.default = [LIGHT_GRAY]<기본값> edit = 편집... editor.name = 이름: +editor.spawn = 유닛 생성 +editor.removeunit = 유닛 삭제 editor.teams = 팀 editor.elevation = 지형 높이 editor.errorload = [accent]{0} 파일을 불러오는데 실패했습니다. editor.errorsave = [accent]{0} 파일을 저장하는데 실패했습니다. +editor.errorimage = 이것은 맵이 아니라 사진입니다. 확장자를 바꿔서 시도할 생각하지 마세요.\n\n예전 맵을 가져올려면 편집기의 '예전 맵 가져오기' 버튼을 사용하세요. +editor.errorlegacy = 이 맵은 너무 오래되어, 더이상 지원하지 않는 맵 형식을 사용합니다. +editor.errorheader = 이 맵 파일은 유효하지 않거나 손상되었습니다. editor.errorname = 맵에 이름이 지정되어 있지 않습니다. editor.update = 업데이트 editor.randomize = 랜덤 @@ -250,7 +252,7 @@ editor.overwrite = [accept]경고!이 명령은 기존 맵을 덮어씌우게 editor.overwrite.confirm = [scarlet]경고![] 이 이름을 가진 맵이 이미 있습니다. 덮어 쓰시겠습니까? editor.selectmap = 불러올 맵 선택: filters.empty = [LIGHT_GRAY]필터가 없습니다!! 아래 버튼을 눌러 추가하세요. -filter.distort = 비틀기 +filter.distort = 왜곡 filter.noise = 노이즈 filter.ore = 자원 filter.rivernoise = 협곡 노이즈 @@ -269,6 +271,8 @@ filter.option.wall = 벽 filter.option.ore = 자원 filter.option.floor2 = 2번째 바닥 filter.option.threshold2 = 2번째 한계점 +filter.option.radius = 반경 +filter.option.percentile = 백분위수 width = 넓이: height = 높이: menu = 메뉴 @@ -315,7 +319,7 @@ error.mapnotfound = 맵 파일을 찾을 수 없습니다! error.io = 네트워크 I/O 오류. error.any = 알 수 없는 네트워크 오류. zone.groundZero.name = 그라운드 제로 -zone.desertWastes.name = 사막 쓰레기 +zone.desertWastes.name = 쓰레기 사막 zone.craters.name = 분화구 zone.frozenForest.name = 얼어붙은 숲 zone.ruinousShores.name = 파멸의 기슭 @@ -416,6 +420,7 @@ category.shooting = 사격 category.optional = 보조 아이템 setting.landscape.name = 가로화면으로 고정 setting.shadows.name = 그림자 +setting.linear.name = 선형 필터링 setting.animatedwater.name = 움직이는 물 setting.animatedshields.name = 움직이는 보호막 setting.antialias.name = 안티 에일리어싱[LIGHT_GRAY] (재시작 필요)[] @@ -429,7 +434,7 @@ setting.difficulty.training = 훈련 setting.difficulty.easy = 쉬움 setting.difficulty.normal = 보통 setting.difficulty.hard = 어려움 -setting.difficulty.insane = 매우 어려움 +setting.difficulty.insane = 미침 setting.difficulty.name = 난이도: setting.screenshake.name = 화면 흔들기 setting.effects.name = 화면 효과 @@ -437,7 +442,7 @@ setting.sensitivity.name = 컨트롤러 감도 setting.saveinterval.name = 저장 간격 setting.seconds = 초 setting.fullscreen.name = 전체 화면 -setting.borderless.name = 테두리 없는 창모드 +setting.borderlesswindow.name = 테두리 없는 창모드[LIGHT_GRAY] (재시작이 필요할 수 있습니다) setting.fps.name = FPS 표시 setting.vsync.name = VSync 활성화 setting.lasers.name = 전력 노드 레이저 표시 @@ -607,9 +612,9 @@ liquid.viscosity = [LIGHT_GRAY]점도: {0} liquid.temperature = [LIGHT_GRAY]온도: {0} block.grass.name = 잔디 block.salt.name = 소금 -block.saltrocks.name = Salt Rocks +block.saltrocks.name = 소금 바위 block.pebbles.name = 조약돌 -block.tendrils.name = 텐드릴 +block.tendrils.name = 덩굴 block.sandrocks.name = 모래 바위 block.spore-pine.name = 포자 소나무 block.sporerocks.name = 포자 바위 @@ -637,8 +642,8 @@ block.core-foundation.name = 코어-기초 block.core-nucleus.name = 코어-핵 block.deepwater.name = 깊은물 block.water.name = 물 -block.tainted-water.name = 도색된 물 -block.darksand-tainted-water.name = 검은 모래로 도색된 물 +block.tainted-water.name = 오염된 물 +block.darksand-tainted-water.name = 검은 모래로 오염된 물 block.tar.name = 타르 block.stone.name = 돌 block.sand.name = 모래 @@ -659,11 +664,11 @@ block.pine.name = 소나무 block.white-tree-dead.name = 죽은 하얀나무 block.white-tree.name = 하얀 나무 block.spore-cluster.name = 포자낭 -block.metal-floor.name = 메탈 바닥 -block.metal-floor-2.name = 메탈 바닥 2 -block.metal-floor-3.name = 메탈 바닥 3 -block.metal-floor-5.name = 메탈 바닥 5 -block.metal-floor-damaged.name = 손상된 메탈 바닥 +block.metal-floor.name = 금속제 바닥 +block.metal-floor-2.name = 금속제 바닥 2 +block.metal-floor-3.name = 금속제 바닥 3 +block.metal-floor-5.name = 금속제 바닥 5 +block.metal-floor-damaged.name = 손상된 금속제 바닥 block.creeptree.name = 섬뜩한 나무 block.dark-panel-1.name = 어두운 패널 1 block.dark-panel-2.name = 어두운 패널 2 @@ -671,7 +676,7 @@ block.dark-panel-3.name = 어두운 패널 3 block.dark-panel-4.name = 어두운 패널 4 block.dark-panel-5.name = 어두운 패널 5 block.dark-panel-6.name = 어두운 패널 6 -block.dark-metal.name = 어두운 메탈 +block.dark-metal.name = 어두운 금속제 block.ignarock.name = 얼은 바위 block.hotrock.name = 뜨거운 바위 block.magmarock.name = 마그마 바위 @@ -718,12 +723,12 @@ block.combustion-generator.name = 화력 발전기 block.turbine-generator.name = 터빈 발전기 block.differential-generator.name = 차동 발전기 block.impact-reactor.name = 핵융합로 -block.mechanical-drill.name = 기계 드릴 -block.pneumatic-drill.name = 강철 드릴 +block.mechanical-drill.name = 기계식 드릴 +block.pneumatic-drill.name = 공기 드릴 block.laser-drill.name = 레이저 드릴 block.water-extractor.name = 물 추출기 block.cultivator.name = 온실 -block.dart-mech-pad.name = 다트 기체 패드 +block.dart-mech-pad.name = 알파 기체 패드 block.delta-mech-pad.name = 델타 기체 패드 block.javelin-ship-pad.name = 재블린 비행선 패드 block.trident-ship-pad.name = 삼지창 비행선 패드 @@ -759,7 +764,7 @@ block.dagger-factory.name = 디거 기체 공장 block.crawler-factory.name = 크롤러 기체 공장 block.titan-factory.name = 타이탄 기체 공장 block.fortress-factory.name = 포트리스 기체 공장 -block.revenant-factory.name = 레비던트 전투기 공장 +block.revenant-factory.name = 레비넌트 전투기 공장 block.repair-point.name = 수리 지점 block.pulse-conduit.name = 퓨즈 파이프 block.phase-conduit.name = 상직물 파이프 @@ -789,7 +794,7 @@ block.spectre.name = 스펙터 block.meltdown.name = 멜트다운 block.container.name = 컨테이너 block.launch-pad.name = 발사대 -block.launch-pad.description = 출격할 필요 없이 아이템을 수송시킵시다. 미완성. +block.launch-pad.description = 출격할 필요 없이 아이템을 수송시킵시다. block.launch-pad-large.name = 큰 출격 패드 team.blue.name = 블루팀 team.red.name = 레드팀 @@ -812,10 +817,10 @@ unit.wraith.name = 유령 전투기 unit.wraith.description = 적 핵심 건물 및 유닛을 집중적으로 공격하는 방식을 사용하는 전투기 입니다. unit.fortress.name = 포트리스 unit.fortress.description = 중포 지상 유닛.\n높은 공격력을 가진 총과 높은 체력을 가지고 있습니다. -unit.revenant.name = 레비던트 -unit.eruptor.name = 이어럽터 +unit.revenant.name = 레비넌트 +unit.eruptor.name = 이럽터 unit.chaos-array.name = 카오스 배열 -unit.eradicator.name = 박멸 +unit.eradicator.name = 짭멸 unit.lich.name = 리치 unit.reaper.name = 사신 tutorial.begin = 플레이어의 주요 목표는 [LIGHT_GRAY]적군[]을 제거하는 것입니다.\n\n이 게임은 [accent]구리를 채광[]하는 것으로 시작합니다.\n이것을 하기 위해 플레이어의 중심부 근처에 있는 구리 광맥을 누르세요. @@ -854,12 +859,12 @@ block.overdrive-projector.description = 드릴과 컨베이어와 같은 인근 block.force-projector.description = 총알에게서 내부의 건물과 유닛을 보호하면서 그 주위에 육각형 보호막을 만듭니다. block.shock-mine.description = 지뢰를 밟는 적에게 피해를 줍니다. 적에게는 거의 보이지 않습니다. block.duo.description = 작고 싼 터렛. -block.scatter.description = A medium-sized anti-air turret. Sprays clumps of lead or scrap flak at enemy units. +block.scatter.description = 중형 대공 터렛. 납이나 고철 덩어리를 적에게 쏩니다. block.arc.description = 적을 향해 무작위 각도로 전기를 쏘는 작은 터렛. block.hail.description = 작은 포병 터렛. block.lancer.description = 충전된 전기빔을 쏘는 중형 터렛. block.wave.description = 액체를 뿜는 중간 크기의 속화 터렛. -block.salvo.description = 살보에서 사격을 하는 중형 터렛. +block.salvo.description = 일제히 사격을 하는 중형 터렛. block.swarmer.description = 유도 미사일을 발사하는 중형 터렛. block.ripple.description = 여러 발의 사격을 동시에 하는 대형 포대. block.cyclone.description = 대형 초고속 사격 터렛. @@ -888,7 +893,7 @@ block.power-node-large.description = 생성된 전력를 다른 건물로 전달 block.battery.description = 전력 생산량에 여유가 있을경우, 생산된 잉여 전력을 여기에 저장합니다. block.battery-large.description = 일반 배터리보다 훨씬 많은 량의 전력을 저장합니다. block.combustion-generator.description = 기름이나 인화성 물질을 태워 전력을 발생시킵니다. -block.turbine-generator.description = 연소 발생기보다 효율적이지만, 추가 액체가 필요합니다. +block.turbine-generator.description = 화력 발전기보다 효율적이지만, 추가 액체가 필요합니다. block.thermal-generator.description = 뜨거운 위치에 건설하면 전력을 생산합니다. block.solar-panel.description = 태양으로부터 소량의 전력을 공급합니다. block.solar-panel-large.description = 일반 태양 전지판보다 훨씬 나은 전력을 공급하지만, 건축비도 훨씬 비쌉니다. diff --git a/core/assets/bundles/bundle_pt_BR.properties b/core/assets/bundles/bundle_pt_BR.properties index 5b9f799bee..b4df804e8a 100644 --- a/core/assets/bundles/bundle_pt_BR.properties +++ b/core/assets/bundles/bundle_pt_BR.properties @@ -149,7 +149,7 @@ save.map = Mapa: {0} save.wave = Horda {0} save.difficulty = Dificuldade: {0} save.date = Último salvamento: {0} -save.playtime = Playtime: {0} +save.playtime = Tempo De Jogo: {0} warning = Aviso. confirm = Confirmar delete = Excluir @@ -172,11 +172,11 @@ loading = [accent]Carregando... saving = [accent]Salvando... wave = [accent]Horda {0} wave.waiting = Horda em {0} -wave.waveInProgress = [LIGHT_GRAY]Wave in progress +wave.waveInProgress = [LIGHT_GRAY]Horda Em Progresso waiting = Aguardando... waiting.players = Esperando por jogadores... -wave.enemies = [LIGHT_GRAY]{0} Enimigos Restantes -wave.enemy = [LIGHT_GRAY]{0} Enimigo Restante +wave.enemies = [LIGHT_GRAY]{0} Inimigos Restantes +wave.enemy = [LIGHT_GRAY]{0} Inimigo Restante loadimage = Carregar\nImagem saveimage = Salvar\nImagem unknown = Desconhecido @@ -203,7 +203,7 @@ waves.every = a casa waves.waves = ondas(s) waves.perspawn = por spawn waves.to = para -waves.boss = Boss +waves.boss = Chefe waves.preview = Prever waves.edit = Editar... waves.copy = Copiar para área de transferência @@ -517,10 +517,10 @@ rules.respawns = Max respawns per wave rules.limitedRespawns = Limit Respawns rules.title.waves = Waves rules.title.respawns = Respawns -rules.title.resourcesbuilding = Resources & Building +rules.title.resourcesbuilding = Recursos e Construções rules.title.player = Players -rules.title.enemy = Enemies -rules.title.unit = Units +rules.title.enemy = Inimigos +rules.title.unit = Unidades content.item.name = Itens content.liquid.name = Liquidos content.unit.name = Unidades @@ -529,7 +529,7 @@ content.mech.name = Mecas item.copper.name = Cobre item.copper.description = Um material de estrutura util. Usado extensivamente em Maioria dos blocos. item.lead.name = Chumbo -item.lead.description = Material de comeco basico. usado intensivamente em Blocos de transporte de liquidos e eletronicos. +item.lead.description = Material de começo basico. usado intensivamente em Blocos de transporte de liquidos e eletronicos. item.coal.name = Carvão item.coal.description = Combustivel pronto. item.graphite.name = Graphite @@ -607,13 +607,13 @@ liquid.viscosity = [LIGHT_GRAY]Viscosidade: {0} liquid.temperature = [LIGHT_GRAY]Temperatura: {0} block.grass.name = Grama block.salt.name = Sal -block.saltrocks.name = Salt Rocks +block.saltrocks.name = Pedras De Sal block.pebbles.name = Pebbles block.tendrils.name = Tendrils block.sandrocks.name = Pedras de areia block.spore-pine.name = Pinheiro de esporo block.sporerocks.name = Pedras de esporo -block.rock.name = Rock +block.rock.name = Pedra block.snowrock.name = Pedra de gelo block.shale.name = Xisto block.shale-boulder.name = Pedra de xisto @@ -637,7 +637,7 @@ block.core-foundation.name = Core: Fundação block.core-nucleus.name = Core: Nucleus block.deepwater.name = água funda block.water.name = Água -block.tainted-water.name = Agua contaminada +block.tainted-water.name = Água contaminada block.darksand-tainted-water.name = Água contaminada de areia escura block.tar.name = Tar block.stone.name = Pedra @@ -646,8 +646,8 @@ block.darksand.name = Areia escura block.ice.name = Gelo block.snow.name = Neve block.craters.name = Crateras -block.sand-water.name = Agua de areia -block.darksand-water.name = Agua de areia escura +block.sand-water.name = Água de areia +block.darksand-water.name = Água de areia escura block.char.name = Char block.holostone.name = Pedra holo block.ice-snow.name = Gelo de neve diff --git a/core/assets/bundles/bundle_ru.properties b/core/assets/bundles/bundle_ru.properties index a4f838d55b..d56d06a8f0 100644 --- a/core/assets/bundles/bundle_ru.properties +++ b/core/assets/bundles/bundle_ru.properties @@ -2,11 +2,11 @@ credits.text = Создатель [ROYAL] Anuken. - [SKY]anukendev@gmail.com[][] credits = Авторы contributors = Переводчики и Помощники discord = Присоединяйтесь к нашему Discord! -link.discord.description = Официальный discord-сервер Mindustry +link.discord.description = Официальный Discord-сервер Mindustry link.github.description = Исходный код игры link.dev-builds.description = Нестабильные версии -link.trello.description = Официальная доска trello для запланированных функций -link.itch.io.description = itch.io страница с загрузкой ПК версии и веб-версией игры +link.trello.description = Официальная доска Trello для запланированных функций +link.itch.io.description = Itch.io страница с загрузкой ПК версии и веб-версией игры link.google-play.description = Скачать для Android c Google play link.wiki.description = Официальная вики Mindustry(англ.) linkfail = Не удалось открыть ссылку!\nURL-адрес был скопирован в буфер обмена. @@ -86,13 +86,8 @@ trace = Слежка за игроком trace.playername = Имя игрока: [accent]{0} trace.ip = IP: [accent]{0} trace.id = ID: [accent]{0} -trace.android = Клиент Android: [accent]{0} +trace.mobile = Мобильный клиент: [accent]{0} trace.modclient = Пользовательский клиент: [accent]{0} -trace.totalblocksbroken = Всего разрушено блоков: [accent]{0} -trace.structureblocksbroken = Структурных блоков сломано: [accent]{0} -trace.lastblockbroken = Последний сломанный блок:[accent]{0} -trace.totalblocksplaced = Всего размещено блоков: [accent]{0} -trace.lastblockplaced = Последний размещенный блок: [accent]{0} invalidid = Недопустимый ID клиента! Отправьте отчёт об ошибке. server.bans = Блокировки server.bans.none = Заблокированных игроков нет! @@ -196,6 +191,8 @@ editor.mapinfo = Информация о карте editor.author = Автор: editor.description = Описание: editor.waves = Волны: +editor.rules = Правила: +editor.ingame = Редактировать в игре waves.title = Волны waves.remove = Удалить waves.never = <никогда> @@ -213,6 +210,8 @@ waves.copied = Волны скопированы. editor.default = [LIGHT_GRAY]<По умолчанию> edit = Редактировать... editor.name = Название: +editor.spawn = Создать боевую единицу +editor.removeunit = Удалить боевую единицу editor.teams = Команды editor.elevation = Возвышенность editor.errorload = Ошибка загрузки изображения: [accent] {0} @@ -298,7 +297,7 @@ launch.unable = [scarlet]ЗАПУСК невозможен.[] {0} Враг. launch.confirm = Это удалит все ресурсы в Вашем ядре.\nВы не сможете вернуться на эту базу. uncover = Раскрыть configure = Выгрузить конфигурацию -configure.locked = [LIGHT_GRAY]Разблокировать настройки выгрузки:\nВолна {0}. +configure.locked = [LIGHT_GRAY]Разблокировать настройки выгрузки: Волна {0}. zone.unlocked = [LIGHT_GRAY]{0} разблокировано. zone.requirement.complete = {0}-я волна достигнута:\nУсловия для зоны "{1}" исполнены. zone.config.complete = {0} волн достигнуто:\nВыгружаемая конфигурация разблокирована @@ -322,8 +321,8 @@ zone.ruinousShores.name = Разрушенные Берега zone.stainedMountains.name = Окрашенные горы zone.desolateRift.name = Пустынный Разлом zone.nuclearComplex.name = Ядерный Производственный Комплекс -zone.overgrowth.name = Overgrowth -zone.tarFields.name = Tar Fields +zone.overgrowth.name = Заросли +zone.tarFields.name = Дёгтяные поля settings.language = Язык settings.reset = Сбросить по умолчанию settings.rebind = Смена @@ -369,6 +368,7 @@ blocks.drillspeed = Базовая скорость бурения blocks.boosteffect = Ускоряющий эффект blocks.maxunits = Максимальное количество активных единиц blocks.health = Здоровье +blocks.buildtime = Время строительства blocks.inaccuracy = Разброс blocks.shots = Выстрелы blocks.reload = Выстрелы/секунду @@ -414,8 +414,9 @@ category.items = Предметы category.crafting = Ввод/вывод category.shooting = Cтрельба category.optional = Дополнительные улучшения -setting.landscape.name = Сохранить ландшафт +setting.landscape.name = Ландшафтный режим setting.shadows.name = Тени +setting.linear.name = Линейная фильтрация setting.animatedwater.name = Анимированная вода setting.animatedshields.name = Анимированные щиты setting.antialias.name = Сглаживание[LIGHT_GRAY] (требует перезапуска)[] @@ -425,11 +426,11 @@ setting.fpscap.name = Макс. FPS setting.fpscap.none = Неограниченный setting.fpscap.text = {0} FPS setting.swapdiagonal.name = Всегда Диагональное Размещение -setting.difficulty.training = обучение -setting.difficulty.easy = легко -setting.difficulty.normal = нормально -setting.difficulty.hard = тяжело -setting.difficulty.insane = безумно +setting.difficulty.training = Обучение +setting.difficulty.easy = Легко +setting.difficulty.normal = Нормально +setting.difficulty.hard = Тяжело +setting.difficulty.insane = Безумно setting.difficulty.name = Сложность: setting.screenshake.name = Тряска экрана setting.effects.name = Эффекты @@ -437,7 +438,7 @@ setting.sensitivity.name = Чувствительность контроллер setting.saveinterval.name = Интервал сохранения setting.seconds = {0} Секунд setting.fullscreen.name = Полноэкранный режим -setting.borderless.name = Окно без границ +setting.borderlesswindow.name = Окно без границ [LIGHT_GRAY] (может потребоваться перезапуск) setting.fps.name = Показывать FPS setting.vsync.name = Верт. синхронизация setting.lasers.name = Показывать энергию лазеров @@ -553,8 +554,8 @@ item.blast-compound.name = Взрывная смесь item.blast-compound.description = Летучее соединение, используемое в бомбах и взрывчатых веществах. Также может гореть в качестве топлива, но не рекомендуется этого делать. item.pyratite.name = Пиротит item.pyratite.description = Очень огнеопасное вещество, используемое в зажигательном оружии. -item.metaglass.name = Биостекло -item.metaglass.description = Сверхпрочная смесь стекла. Широко используется для распределения и хранения жидкости. +item.metaglass.name = Метастекло +item.metaglass.description = Сверхпрочная смесь стекла и металла. Широко используется для распределения и хранения жидкости. item.scrap.name = Металлолом item.scrap.description = Остатки старых сооружений и подразделений. Содержит незначительные количества многих различных металлов. liquid.water.name = Вода @@ -627,7 +628,7 @@ block.scrap-wall-huge.name = Огромная стена из металлоло block.scrap-wall-gigantic.name = Гигантская стена из металлолома block.thruster.name = Толкатель block.kiln.name = Печь -block.kiln.description = Выплавляет песок и свинец в биостекло. Требует малого количества энергии. +block.kiln.description = Выплавляет песок и свинец в метастекло. Требует малого количества энергии. block.graphite-press.name = Графитный пресс block.multi-press.name = Мульти-пресс block.constructing = {0}\n[LIGHT_GRAY](Строится) @@ -664,7 +665,6 @@ block.metal-floor-2.name = Металлический Пол 2 block.metal-floor-3.name = Металлический Пол 3 block.metal-floor-5.name = Металлический Пол 5 block.metal-floor-damaged.name = Повреждённый Металлический Пол -block.creeptree.name = Жуткодерево block.dark-panel-1.name = Тёмная Панель 1 block.dark-panel-2.name = Тёмная Панель 2 block.dark-panel-3.name = Тёмная Панель 3 @@ -723,7 +723,7 @@ block.pneumatic-drill.name = Пневматический бур block.laser-drill.name = Лазерный бур block.water-extractor.name = Гидроконденсатор block.cultivator.name = Культиватор -block.dart-mech-pad.name = Dart Mech Pad +block.dart-mech-pad.name = Реконструктор "Альфа" block.delta-mech-pad.name = Реконструктор "Дельта" block.javelin-ship-pad.name = Реконструктор "Джавелин" block.trident-ship-pad.name = Реконструктор "Трезубeц" diff --git a/core/assets/bundles/bundle_uk_UA.properties b/core/assets/bundles/bundle_uk_UA.properties index a783a6db40..8add86a221 100644 --- a/core/assets/bundles/bundle_uk_UA.properties +++ b/core/assets/bundles/bundle_uk_UA.properties @@ -2,10 +2,10 @@ credits.text = Створив [ROYAL]Anuken[] - [SKY]anukendev@gmail.com[]\n\nЄ credits = Автори contributors = Перекладачі та Помічники discord = Приєднуйтесь до нашого Discord! -link.discord.description = Офіційний discord-сервер Mindustry +link.discord.description = Офіційний Discord-сервер Mindustry link.github.description = Код гри link.dev-builds.description = Нестабільні версії -link.trello.description = Офіційна дошка trello(на англ.) для запланованих функцій +link.trello.description = Офіційна дошка Trello(англ.) для запланованих функцій link.itch.io.description = Itch.io сторінка з веб-версією та завантаженням для ПК link.google-play.description = Скачати з Google Play для Android link.wiki.description = Офіційна Mindustry вікі (англ.) @@ -31,8 +31,8 @@ level.select = Вибір мапи level.mode = Режим гри: showagain = Не показувати знову до наступного сеансу coreattack = < Ядро під атакою! > -nearpoint = [[ [scarlet]ЗАЛИШТЕ ТОЧ НЕГАЙНО[] ]\nаннігіляція неминуча. -outofbounds = [[ ПОЗА МЕЖАМИ ]\n[]саморуйнування через{0} +nearpoint = [ [scarlet]ЗАЛИШТЕ ТОЧКУ НЕГАЙНО[] ]\nаннігіляція неминуча. +outofbounds = [ ПОЗА МЕЖАМИ ]\nсаморуйнування через{0} database = База Даних Ядра savegame = Зберегти гру loadgame = Завантажити гру @@ -86,13 +86,8 @@ trace = Стежити за гравцем trace.playername = Ім'я гравця: [accent]{0} trace.ip = IP: [accent]{0} trace.id = Унікальний ідентифікатор: [accent]{0} -trace.android = Клієнт Android: [accent]{0} +trace.mobile = Мобільний клієнт: [accent]{0} trace.modclient = Користувацький клієнт: [accent]{0} -trace.totalblocksbroken = Всього зруйновано блоків: [accent]{0} -trace.structureblocksbroken = Структурних блоків зруйновано: [accent]{0} -trace.lastblockbroken = Останній зруйнований блок: [accent]{0} -trace.totalblocksplaced = Всього встановлено блоків: [accent]{0} -trace.lastblockplaced = Останній встановлений блок: [accent]{0} invalidid = Невірний ідентифікатор клієнта! Надішліть звіт про помилку. server.bans = Блокування server.bans.none = Заблокованих гравців нема! @@ -196,6 +191,8 @@ editor.mapinfo = Інформація про мапу editor.author = Автор: editor.description = Опис: editor.waves = Хвилі: +editor.rules = Правила: +editor.ingame = Редагувати в грі waves.title = Хвилі waves.remove = Видалити waves.never = <ніколи> @@ -213,6 +210,8 @@ waves.copied = Хвилі скопіювані. editor.default = [LIGHT_GRAY]<За замовчуванням> edit = Редагувати... editor.name = Назва: +editor.spawn = Створити бойову одиницю +editor.removeunit = Видалити бойову одиницю editor.teams = Команди editor.elevation = Висота editor.errorload = Помилка завантаження зображення:[accent] {0} @@ -298,7 +297,7 @@ launch.unable = [scarlet]ЗАПУСК неможливий.[] {0} Ворог. launch.confirm = Це видалить всі ресурси у Вашому ядрі.\nВи не зможете повернутися до цієї бази. uncover = Розкрити configure = Вивантаження -configure.locked = [LIGHT_GRAY]Розблокувати можливість вивантаження ресурсів:Хвиля {0}. +configure.locked = [LIGHT_GRAY]Розблокувати можливість вивантаження ресурсів: Хвиля {0}. zone.unlocked = [LIGHT_GRAY]{0} розблоковано zone.requirement.complete = {0}-та хвиля досягено:\nвимоги до зони "{1}" виконані. zone.config.complete = {0} хвиль досягнено. :\nРозблоковано можливість вивантаження. @@ -322,8 +321,8 @@ zone.ruinousShores.name = Зруйновані Берега zone.stainedMountains.name = Пофарбовані гори zone.desolateRift.name = Пустельний Розлом zone.nuclearComplex.name = Ядерний Виробничий Комплекс -zone.overgrowth.name = Overgrowth -zone.tarFields.name = Tar Fields +zone.overgrowth.name = Зарості +zone.tarFields.name = Дьогтьові поля settings.language = Мова settings.reset = Скинути за замовчуванням settings.rebind = Зміна @@ -369,6 +368,7 @@ blocks.drillspeed = Базова швидкість буріння blocks.boosteffect = Прискорювальний ефект blocks.maxunits = Максимальна кількість активних одиниць blocks.health = Здоров'я +blocks.buildtime = Час будівництва blocks.inaccuracy = Розкид blocks.shots = Постріли blocks.reload = Постріли/секунду @@ -414,8 +414,9 @@ category.items = Предмети category.crafting = Введення/виведення category.shooting = Стрільба category.optional = Додаткові поліпшення -setting.landscape.name = Зберегти пейхаж +setting.landscape.name = Ландшафтний setting.shadows.name = Тіні +setting.linear.name = Лінійна фільтрація setting.animatedwater.name = Анімована вода setting.animatedshields.name = Анімовані щити setting.antialias.name = Згладжування[LIGHT_GRAY] (потребує перезапуску)[] @@ -425,11 +426,11 @@ setting.fpscap.name = Макс. FPS setting.fpscap.none = Необмежений setting.fpscap.text = {0} FPS setting.swapdiagonal.name = Завжди Діагональне Розміщення -setting.difficulty.training = навчання -setting.difficulty.easy = легка -setting.difficulty.normal = нормальна -setting.difficulty.hard = важка -setting.difficulty.insane = божевільна +setting.difficulty.training = Навчання +setting.difficulty.easy = Легка +setting.difficulty.normal = Нормальна +setting.difficulty.hard = Важка +setting.difficulty.insane = Божевільна setting.difficulty.name = Складність: setting.screenshake.name = Тряска екрану setting.effects.name = Ефекти @@ -437,7 +438,7 @@ setting.sensitivity.name = Чутливість контролера setting.saveinterval.name = Інтервал збереження setting.seconds = {0} сек. setting.fullscreen.name = Повноекранний режим -setting.borderless.name = Вікно без полів +setting.borderlesswindow.name = Вікно без полів[LIGHT_GRAY] (може потребувати перезапуску) setting.fps.name = Показувати FPS setting.vsync.name = Вертикальна синхронізація setting.lasers.name = Показувати енергію лазерів @@ -553,8 +554,8 @@ item.blast-compound.name = Вибухова суміш item.blast-compound.description = Нестійке з'єднання, що використовується в бомбах та вибухових речовинах. Хоча воно може спалюватися як паливо, та це не рекомендується. item.pyratite.name = Піротит item.pyratite.description = Вкрай легкозаймиста речовина, що використовується у запальній зброї. -item.metaglass.name = Біоскло -item.metaglass.description = Надміцна суміш скла. Широко використовується для розподілу і зберігання рідини. +item.metaglass.name = Метаскло +item.metaglass.description = Надміцна суміш скла й метала. Широко використовується для розподілу і зберігання рідини. item.scrap.name = Металобрухт item.scrap.description = Залишки старих споруд і бойових одиниць. Містить незначні кількості багатьох різних металів. liquid.water.name = Вода @@ -627,7 +628,7 @@ block.scrap-wall-huge.name = Величезна стіна з металобру block.scrap-wall-gigantic.name = Гігантська стіна з металобрухту block.thruster.name = Штовхач block.kiln.name = Піч -block.kiln.description = Виплавляє пісок і свинець в біоскло. Потребує малої кількості енергії. +block.kiln.description = Виплавляє пісок і свинець в метаскло. Потребує малої кількості енергії. block.graphite-press.name = Графітний прес block.multi-press.name = Мульти-прес block.constructing = {0}\n[LIGHT_GRAY](В процесі) @@ -664,7 +665,6 @@ block.metal-floor-2.name = Металевий Пол 2 block.metal-floor-3.name = Металевий Пол 3 block.metal-floor-5.name = Металевий Пол 4 block.metal-floor-damaged.name = Пошкоджений Металевий Пол -block.creeptree.name = Жахливе дерево block.dark-panel-1.name = Темна Панель 1 block.dark-panel-2.name = Темна Панель 2 block.dark-panel-3.name = Темна Панель 3 @@ -723,7 +723,7 @@ block.pneumatic-drill.name = Пневматичний дриль block.laser-drill.name = Лазерний дриль block.water-extractor.name = Гідроконденсатор block.cultivator.name = Культиватор -block.dart-mech-pad.name = Dart Mech Pad +block.dart-mech-pad.name = Реконструктор "Альфа" block.delta-mech-pad.name = Реконструктор "Дельта" block.javelin-ship-pad.name = Реконструктор "Джавелін" block.trident-ship-pad.name = Реконструктор "Тризуб" diff --git a/core/assets/bundles/bundle_zh_CN.properties b/core/assets/bundles/bundle_zh_CN.properties index fbceb693ff..90c6f8025f 100644 --- a/core/assets/bundles/bundle_zh_CN.properties +++ b/core/assets/bundles/bundle_zh_CN.properties @@ -11,7 +11,7 @@ link.google-play.description = 从谷歌商店获取安卓版 link.wiki.description = 官方 Mindustry 维基 linkfail = 打开链接失败!\nURL 已经复制到剪贴板。 screenshot = 荧幕截图已放在 {0} -screenshot.invalid = 地图尺寸太大,可能没有足够的内存用于截屏。 +screenshot.invalid = 地图太大,可能没有足够的内存用于截图。 gameover = 你的核心被摧毁了! gameover.pvp = [accent] {0}[] 队获胜! highscore = [accent]新纪录! @@ -27,11 +27,11 @@ removearea = 你选择了拆除模式。\n你能通过[accent]长按几秒钟[] launcheditems = [accent]发射的资源 map.delete = 确定要删除 "[accent]{0}[]" 地图吗? level.highscore = 最高分:[accent]{0} -level.select = 选择关卡(?Level Select) +level.select = 选择关卡 level.mode = 游戏模式: showagain = 下次不再显示 -coreattack = < 核心正在受到攻击! > -nearpoint = [[ [scarlet]立即离开敌人出生点[] ]\n将被清理 +coreattack = < 核心正在受到攻击!> +nearpoint = [[ [scarlet]立即离开敌人出生点[] ]\n将被全部清除 outofbounds = [[ 超出边界 ]\n[]{0}秒后自毁 database = 核心数据库 savegame = 保存游戏 @@ -50,7 +50,7 @@ maps.none = [LIGHT_GRAY]没有找到地图! about.button = 关于 name = 名字: noname = 先取一个[accent]玩家名[]。 -filename = 文件名: +filename = 文件名: unlocked = 新方块已解锁! completed = [accent]己研究 techtree = 科技树 @@ -62,12 +62,12 @@ players.single = {0}玩家在线 server.closing = [accent]正在关闭服务器…… server.kicked.kick = 你被踢出服务器了! server.kicked.serverClose = 服务器已关闭。 -server.kicked.clientOutdated = 过旧的客户端!更新你的游戏! -server.kicked.serverOutdated = 过旧的服务器!联系房主升级! -server.kicked.banned = 你在这个服务器上被禁了。 +server.kicked.clientOutdated = 客户端过旧,请更新你的游戏。 +server.kicked.serverOutdated = 服务器过旧,请联系房主升级服务器。 +server.kicked.banned = 你在这个服务器上被拉入黑名单了。 server.kicked.recentKick = 你刚刚被踢出服务器。\n请稍后重新连接! -server.kicked.nameInUse = 服务器中已经\n有人有相同的名字了。 -server.kicked.nameEmpty = 你选择的名字是无效的。 +server.kicked.nameInUse = 你的名字与服务器中的一个人重复了。 +server.kicked.nameEmpty = 无效的名字! server.kicked.idInUse = 你已在这个服务器上!不允许用两个账号连接。 server.kicked.customClient = 这个服务器不支持定制版本。下载官方版本。 server.kicked.gameover = 游戏结束! @@ -115,8 +115,8 @@ joingame.title = 加入游戏 joingame.ip = 地址: disconnect = 已断开 disconnect.data = 读取世界数据失败! -connecting = [accent]正在连接... -connecting.data = [accent]正在加载世界数据... +connecting = [accent]连接中…… +connecting.data = [accent]加载中…… server.port = 端口: server.addressinuse = 地址已经在使用中! server.invalidport = 无效的端口号! @@ -150,7 +150,7 @@ save.wave = 波次 {0} save.difficulty = 难度:{0} save.date = 最后保存过:{0} save.playtime = 游戏时间:{0} -warning = 警告。 +warning = 警告! confirm = 确认 delete = 删除 ok = 好的 @@ -162,18 +162,18 @@ copylink = 复制链接 back = 返回 quit.confirm = 你确定你想要退出? changelog.title = 更新日志 -changelog.loading = 正在获取更新日志... +changelog.loading = 正在获取更新日志…… changelog.error.android = [accent]注意更新日志有时在安卓 4.4 以下不工作。\n这是安卓系统内部的一个bug。 changelog.error.ios = [accent]更新日志当前在iOS中不被支持。 changelog.error = [scarlet]获取更新日志失败!\n请检查你的网络。 changelog.current = [yellow][[当前版本] changelog.latest = [accent][[最新版本] -loading = [accent]正在加载... -saving = [accent]正在保存... +loading = [accent]加载中…… +saving = [accent]保存中…… wave = [accent]波次 {0} wave.waiting = [LIGHT_GRAY]下一波将在{0}秒后到来 wave.waveInProgress = [LIGHT_GRAY]Wave in progress -waiting = [LIGHT_GRAY]正在等待... +waiting = [LIGHT_GRAY]等待中…… waiting.players = 等待玩家中…… wave.enemies = [LIGHT_GRAY]剩余 {0} 个敌人 wave.enemy = [LIGHT_GRAY]剩余 {0} 个敌人 @@ -197,28 +197,28 @@ editor.author = 作者: editor.description = 描述: editor.waves = 波数: waves.title = 波数 -waves.remove = 去除 -waves.never = +waves.remove = 移除 +waves.never = <永不> waves.every = 每 waves.waves = 波 waves.perspawn = 每次生成 waves.to = 至 waves.boss = BOSS waves.preview = 预览 -waves.edit = 编辑... +waves.edit = 编辑…… waves.copy = 复制到剪贴板 waves.load = 从剪贴板读取 waves.invalid = 剪贴板中无效的波次信息。 waves.copied = 波次信息已复制。 editor.default = [LIGHT_GRAY]<默认> -edit = 编辑... +edit = 编辑…… editor.name = 名称: editor.teams = 队伍 editor.elevation = 高度 editor.errorload = 读取文件时出现错误:\n[accent]{0} editor.errorsave = 保存文件时出现错误:\n[accent]{0} editor.errorname = 地图没有被定义的名称。 -editor.update = 更新(Update) +editor.update = 更新 editor.randomize = 随机化 editor.apply = 应用 editor.generate = 生成 @@ -250,13 +250,13 @@ editor.overwrite = [accent]警告!\n这将会覆盖一个已经存在的地图 editor.overwrite.confirm = [scarlet]警告![]存在同名地图。你确定你想要覆盖? editor.selectmap = 选择一个地图加载: filters.empty = [LIGHT_GRAY]没有过滤器(filters)!用下方的按钮添加一个。 -filter.distort = 扭曲?(Distort) +filter.distort = 扭曲程度 filter.noise = 噪音(Noise) -filter.ore = 矿石(Ore) +filter.ore = 矿石数量 filter.rivernoise = 河流噪音(River Noise) -filter.scatter = 散播(Scatter) -filter.terrain = 地形(Terrain) -filter.option.scale = 规模?(Scale) +filter.scatter = 分散程度 +filter.terrain = 地形 +filter.option.scale = 规模大小 filter.option.chance = 机会(Chance) filter.option.mag = 大小?(Magnitude) filter.option.threshold = 门槛?(Threshold) @@ -285,45 +285,45 @@ editor = 编辑器 mapeditor = 地图编辑器 donate = 捐赠 abandon = 放弃 -abandon.text = 这个区域和它的所有资源会被敌人重置 +abandon.text = 这个区域和它的所有资源会被敌人重置。 locked = 已被锁定 -complete = [LIGHT_GRAY]完成: +complete = [LIGHT_GRAY]完成: zone.requirement = 在{1}中达到{0}波 resume = 恢复区:\n[LIGHT_GRAY]{0} bestwave = [LIGHT_GRAY]最好: {0} launch = < 发射 > launch.title = 发射成功 launch.next = [LIGHT_GRAY]下一个发射机会在第 {0} 波 -launch.unable = [scarlet]发射失败。[] 敌人. -launch.confirm = 这样做会把您基地里的所有资源发射出去\n您不能再回来这个基地。 -uncover = Uncover -configure = 设定发射资源 +launch.unable = [scarlet]发射失败。[]敌人未被全部消灭。 +launch.confirm = 您将发射核心中所有资源。\n此地图将被重置。 +uncover = 解锁 +configure = 设定发射资源数量 configure.locked = [LIGHT_GRAY]到达第 {0} 波\n才设定发射资源。 zone.unlocked = [LIGHT_GRAY]{0} 已解锁。 -zone.requirement.complete = Wave {0} reached:\n{1} zone requirements met. -zone.config.complete = Wave {0} reached:\nLoadout config unlocked. -zone.resources = 已被发现的资源: +zone.requirement.complete = 已达到第{0}波。\n达到解锁{1}的需求。 +zone.config.complete = 已达到第{0}波。\n允许携带发射的资源进入此地区。 +zone.resources = 地图中的资源: add = 添加 boss.health = BOSS 生命值 -connectfail = [crimson]服务器连接失败: [accent]{0} +connectfail = [crimson]服务器连接失败:[accent]{0} error.unreachable = 服务器无法访问。 error.invalidaddress = 地址无效。 error.timedout = 连接超时!\n确保服务器设置了端口转发,并且地址正确! -error.mismatch = 包错误:\n可能是客户端/服务器版本不匹配.\n请确保客户端和服务器都是最新的版本! +error.mismatch = 不匹配。\n可能是客户端/服务器版本不匹配。\n请确保客户端和服务器都是最新的版本! error.alreadyconnected = 已连接。 error.mapnotfound = 找不到地图文件! error.io = 网络 I/O 错误。 error.any = 未知网络错误。 zone.groundZero.name = 零号地区 -zone.desertWastes.name = Desert Wastes -zone.craters.name = 陨石地带 +zone.desertWastes.name = 沙漠废物 +zone.craters.name = 陨石带 zone.frozenForest.name = 冰冻森林 zone.ruinousShores.name = 毁灭海岸 zone.stainedMountains.name = 绵延群山 zone.desolateRift.name = 荒芜裂谷 -zone.nuclearComplex.name = 核能生产 -zone.overgrowth.name = Overgrowth -zone.tarFields.name = Tar Fields +zone.nuclearComplex.name = 核裂变 +zone.overgrowth.name = 增生区 +zone.tarFields.name = 石油田 settings.language = 语言 settings.reset = 恢复默认 settings.rebind = 重新绑定 @@ -417,11 +417,11 @@ category.optional = 可选的增强物品 setting.landscape.name = 锁定横屏 setting.shadows.name = 影子 setting.animatedwater.name = 流动的水 -setting.animatedshields.name = Animated Shields -setting.antialias.name = 抗锯齿[LIGHT_GRAY] (需要重新启动)[] +setting.animatedshields.name = 动态画面 +setting.antialias.name = 抗锯齿[LIGHT_GRAY] (需要重新启动)[] setting.indicators.name = 队友指示器 setting.autotarget.name = 自动发射 -setting.fpscap.name = 最高 FPS +setting.fpscap.name = FPS限制 setting.fpscap.none = 无 setting.fpscap.text = {0} FPS setting.swapdiagonal.name = 总是自动铺设 @@ -448,8 +448,8 @@ setting.mutemusic.name = 静音 setting.sfxvol.name = 音效音量 setting.mutesound.name = 静音 setting.crashreport.name = 发送匿名崩溃报告 -setting.chatopacity.name = Chat Opacity -setting.playerchat.name = Display In-Game Chat +setting.chatopacity.name = 聊天界面透明度 +setting.playerchat.name = 显示游戏内聊天界面 keybind.title = 重新绑定按键 category.general.name = 普通 category.view.name = 查看 @@ -474,7 +474,7 @@ keybind.zoom_hold.name = 保持缩放 keybind.zoom.name = 缩放 keybind.menu.name = 菜单 keybind.pause.name = 暂停 -keybind.minimap.name = Minimap +keybind.minimap.name = 小地图 keybind.dash.name = 冲刺 keybind.chat.name = 聊天 keybind.player_list.name = 玩家列表 @@ -492,35 +492,35 @@ mode.survival.description = 正常的游戏模式,有限的资源和自动波次 mode.sandbox.name = 沙盒 mode.sandbox.description = 无限的资源,不会自动生成敌人。 mode.pvp.name = PvP -mode.pvp.description = 和本地玩家对战. +mode.pvp.description = 和本地玩家对战。 mode.attack.name = 攻击 -mode.attack.description = 没有波数,但是有摧毁敌人基地的任务. +mode.attack.description = 没有波数,但是有摧毁敌人基地的任务。 mode.custom = 自定义模式 rules.infiniteresources = 无限资源 rules.wavetimer = 波次计时器 rules.waves = 波次 -rules.enemyCheat = AI无限资源 +rules.enemyCheat = 敌人无限资源 rules.unitdrops = 敌人出生点 -rules.unitbuildspeedmultiplier = Unit Production Speed Multiplier -rules.unithealthmultiplier = Unit Health Multiplier -rules.playerhealthmultiplier = Player Health Multiplier -rules.playerdamagemultiplier = Player Damage Multiplier -rules.unitdamagemultiplier = Unit Damage Multiplier -rules.enemycorebuildradius = 敌对核心非建设区半径:[LIGHT_GRAY](格) -rules.respawntime = 重生时间:[LIGHT_GRAY](秒) -rules.wavespacing = 波次间隔时间:[LIGHT_GRAY](秒) +rules.unitbuildspeedmultiplier = 单位生产速度倍数 +rules.unithealthmultiplier = 单位生命倍数 +rules.playerhealthmultiplier = 玩家生命倍数 +rules.playerdamagemultiplier = 玩家伤害倍数 +rules.unitdamagemultiplier = 单位伤害倍数 +rules.enemycorebuildradius = 敌对核心非建设区半径:[LIGHT_GRAY](格) +rules.respawntime = 重生时间:[LIGHT_GRAY](秒) +rules.wavespacing = 波次间隔时间:[LIGHT_GRAY](秒) rules.buildcostmultiplier = 建设花费倍数 rules.buildspeedmultiplier = 建设时间倍数 -rules.waitForWaveToEnd = Waves wait for enemies -rules.dropzoneradius = Drop Zone Radius:[LIGHT_GRAY] (tiles) -rules.respawns = Max respawns per wave -rules.limitedRespawns = Limit Respawns -rules.title.waves = Waves -rules.title.respawns = Respawns -rules.title.resourcesbuilding = Resources & Building -rules.title.player = Players -rules.title.enemy = Enemies -rules.title.unit = Units +rules.waitForWaveToEnd = 等待敌人时间 +rules.dropzoneradius = 敌人出生点毁灭大小:[LIGHT_GRAY] (格) +rules.respawns = 每波最大重生次数 +rules.limitedRespawns = 重生限制次数 +rules.title.waves = 波次 +rules.title.respawns = 重生 +rules.title.resourcesbuilding = 资源和建造 +rules.title.player = 玩家 +rules.title.enemy = 敌人 +rules.title.unit = 单位 content.item.name = 物品 content.liquid.name = 液体 content.unit.name = 部队 @@ -564,7 +564,7 @@ liquid.cryofluid.name = 冷冻液 mech.alpha-mech.name = 阿尔法 mech.alpha-mech.weapon = 重型机枪 mech.alpha-mech.ability = 无人机群 -mech.alpha-mech.description = 标准的机甲。具有不错的速度和伤害输出;,可以制造多达 3 架无人机以提高进攻能力。 +mech.alpha-mech.description = 标准的机甲。具有不错的速度和伤害输出,可以制造多达 3 架无人机以提高进攻能力。 mech.delta-mech.name = 德尔塔 mech.delta-mech.weapon = 电弧发电机 mech.delta-mech.ability = 放电 @@ -576,7 +576,7 @@ mech.tau-mech.description = 后勤机甲。治疗友军。可以熄灭火焰并 mech.omega-mech.name = 欧米茄 mech.omega-mech.weapon = 导弹群 mech.omega-mech.ability = 配置装甲 -mech.omega-mech.description = 一种装甲厚重的机甲,用于在前线攻击。它的护甲可以阻挡高达 90% 的伤害。 +mech.omega-mech.description = 一种装甲厚重的机甲,用于在前线攻击。它的护甲可以阻挡高达90%的伤害。 mech.dart-ship.name = 飞镖 mech.dart-ship.weapon = 机枪 mech.dart-ship.description = 标准飞船。快速轻便,但攻击能力低,采矿速度快。 @@ -596,7 +596,7 @@ item.radioactivity = [LIGHT_GRAY]放射性:{0} unit.health = [LIGHT_GRAY]生命值:{0} unit.speed = [LIGHT_GRAY]速度:{0} mech.weapon = [LIGHT_GRAY]武器:{0} -mech.health = [LIGHT_GRAY]生命值: {0} +mech.health = [LIGHT_GRAY]生命值: {0} mech.itemcapacity = [LIGHT_GRAY]物品容量:{0} mech.minespeed = [LIGHT_GRAY]采矿速度:{0} mech.minepower = [LIGHT_GRAY]采矿力量:{0} @@ -618,7 +618,7 @@ block.snowrock.name = 雪岩石 block.shale.name = 页岩地 block.shale-boulder.name = 页岩巨石 block.moss.name = 苔藓地 -block.shrubs.name = Shrubs +block.shrubs.name = 灌木丛 block.spore-moss.name = 孢子苔藓地 block.shalerocks.name = 页岩岩石 block.scrap-wall.name = 废墙 @@ -637,45 +637,45 @@ block.core-foundation.name = 中型核心 block.core-nucleus.name = 大型核心 block.deepwater.name = 深水 block.water.name = 水 -block.tainted-water.name = Tainted Water -block.darksand-tainted-water.name = Dark Sand Tainted Water -block.tar.name = Tar +block.tainted-water.name = 污水 +block.darksand-tainted-water.name = 暗沙 污水 +block.tar.name = 石油 block.stone.name = 石头 block.sand.name = 沙子 block.darksand.name = 黑沙 block.ice.name = 冰 block.snow.name = 雪 block.craters.name = 陨石坑 -block.sand-water.name = Sand water -block.darksand-water.name = Dark Sand Water -block.char.name = Char -block.holostone.name = Holo stone -block.ice-snow.name = Ice Snow +block.sand-water.name = 沙 水 +block.darksand-water.name = 暗沙 水 +block.char.name = 焦土 +block.holostone.name = 霍洛石头 +block.ice-snow.name = 冰雪地 block.rocks.name = 岩石 -block.icerocks.name = Ice rocks -block.snowrocks.name = Snow Rocks -block.dunerocks.name = Dune Rocks +block.icerocks.name = 冰岩石 +block.snowrocks.name = 雪岩石 +block.dunerocks.name = 沙丘岩石 block.pine.name = 松树 -block.white-tree-dead.name = White Tree Dead +block.white-tree-dead.name = 枯萎的白树 block.white-tree.name = 白树 -block.spore-cluster.name = Spore Cluster -block.metal-floor.name = Metal Floor -block.metal-floor-2.name = Metal Floor 2 -block.metal-floor-3.name = Metal Floor 3 -block.metal-floor-5.name = Metal Floor 5 -block.metal-floor-damaged.name = Metal Floor Damaged -block.creeptree.name = Creeptree -block.dark-panel-1.name = Dark Panel 1 -block.dark-panel-2.name = Dark Panel 2 -block.dark-panel-3.name = Dark Panel 3 -block.dark-panel-4.name = Dark Panel 4 -block.dark-panel-5.name = Dark Panel 5 -block.dark-panel-6.name = Dark Panel 6 -block.dark-metal.name = Dark Metal -block.ignarock.name = Igna Rock -block.hotrock.name = Hot Rock -block.magmarock.name = Magma Rock -block.cliffs.name = Cliffs +block.spore-cluster.name = 孢子簇 +block.metal-floor.name = 金属地板 +block.metal-floor-2.name = 金属地板2 +block.metal-floor-3.name = 金属地板3 +block.metal-floor-5.name = 金属地板5 +block.metal-floor-damaged.name = 损坏的金属地板 +block.creeptree.name = 爬行树 +block.dark-panel-1.name = 暗面板1 +block.dark-panel-2.name = 暗面板2 +block.dark-panel-3.name = 暗面板3 +block.dark-panel-4.name = 暗面板4 +block.dark-panel-5.name = 暗面板5 +block.dark-panel-6.name = 暗面板6 +block.dark-metal.name = 暗金属 +block.ignarock.name = 伊格纳石头 +block.hotrock.name = 热石头 +block.magmarock.name = 岩浆石头 +block.cliffs.name = 悬崖 block.copper-wall.name = 铜墙 block.copper-wall-large.name = 大型铜墙 block.titanium-wall.name = 钛墙 @@ -708,7 +708,7 @@ block.melter.name = 熔炉 block.incinerator.name = 焚化炉 block.spore-press.name = 孢子压缩机 block.separator.name = 分离机 -block.coal-centrifuge.name = Coal Centrifuge +block.coal-centrifuge.name = 煤炭离心机 block.power-node.name = 能量节点 block.power-node-large.name = 大型能量节点 block.surge-tower.name = 远程输电塔 @@ -723,7 +723,7 @@ block.pneumatic-drill.name = 气动钻头 block.laser-drill.name = 激光钻头 block.water-extractor.name = 抽水机 block.cultivator.name = 耕种机 -block.dart-mech-pad.name = Dart Mech Pad +block.dart-mech-pad.name = 飞镖 机甲平台 block.delta-mech-pad.name = 德尔塔 机甲平台 block.javelin-ship-pad.name = 标枪 机甲平台 block.trident-ship-pad.name = 三叉戟 机甲平台 diff --git a/core/assets/maps/fortress.msav b/core/assets/maps/fortress.msav index 24caf622f6..fdfa666271 100644 Binary files a/core/assets/maps/fortress.msav and b/core/assets/maps/fortress.msav differ diff --git a/core/assets/maps/impact0078.msav b/core/assets/maps/impact0078.msav new file mode 100644 index 0000000000..92afbebb7b Binary files /dev/null and b/core/assets/maps/impact0078.msav differ diff --git a/core/assets/maps/islands.msav b/core/assets/maps/islands.msav new file mode 100644 index 0000000000..ce9a3baedc Binary files /dev/null and b/core/assets/maps/islands.msav differ diff --git a/core/assets/maps/labyrinth.msav b/core/assets/maps/labyrinth.msav new file mode 100644 index 0000000000..e1d51492aa Binary files /dev/null and b/core/assets/maps/labyrinth.msav differ diff --git a/core/assets/maps/map_9.msav b/core/assets/maps/map_9.msav deleted file mode 100644 index d45c5d618b..0000000000 Binary files a/core/assets/maps/map_9.msav and /dev/null differ diff --git a/core/assets/maps/maze.msav b/core/assets/maps/maze.msav new file mode 100644 index 0000000000..775b9c83cf Binary files /dev/null and b/core/assets/maps/maze.msav differ diff --git a/core/assets/maps/nuclearProductionComplex.msav b/core/assets/maps/nuclearProductionComplex.msav index e20fc7c73b..02a86783c1 100644 Binary files a/core/assets/maps/nuclearProductionComplex.msav and b/core/assets/maps/nuclearProductionComplex.msav differ diff --git a/core/assets/maps/overgrowth.msav b/core/assets/maps/overgrowth.msav index 4d58d57fda..58135743ed 100644 Binary files a/core/assets/maps/overgrowth.msav and b/core/assets/maps/overgrowth.msav differ diff --git a/core/assets/maps/ruinousShores.msav b/core/assets/maps/ruinousShores.msav index 32f0e7cd6c..1f3a1628bd 100644 Binary files a/core/assets/maps/ruinousShores.msav and b/core/assets/maps/ruinousShores.msav differ diff --git a/core/assets/maps/saltcrags.msav b/core/assets/maps/saltcrags.msav new file mode 100644 index 0000000000..406168ec90 Binary files /dev/null and b/core/assets/maps/saltcrags.msav differ diff --git a/core/assets/maps/shoreline.msav b/core/assets/maps/shoreline.msav new file mode 100644 index 0000000000..b0320b4350 Binary files /dev/null and b/core/assets/maps/shoreline.msav differ diff --git a/core/assets/maps/tarFields.msav b/core/assets/maps/tarFields.msav index 8c19d68047..b3910d34ce 100644 Binary files a/core/assets/maps/tarFields.msav and b/core/assets/maps/tarFields.msav differ diff --git a/core/assets/shaders/unitbuild.fragment.glsl b/core/assets/shaders/unitbuild.fragment.glsl index 35a956c35a..fe1b07ea42 100644 --- a/core/assets/shaders/unitbuild.fragment.glsl +++ b/core/assets/shaders/unitbuild.fragment.glsl @@ -41,15 +41,14 @@ void main() { vec2 v = vec2(1.0/u_texsize.x, 1.0/u_texsize.y); vec4 c = texture2D(u_texture, v_texCoord.xy); - bool outl = cont(t, v); - if(1.0-abs(coords.x - 0.5)*2.0 < 1.0-u_progress && !outl){ + if(1.0-abs(coords.x - 0.5)*2.0 < 1.0-u_progress){ c = vec4(0.0); } if(c.a > 0.01){ float f = abs(sin(coords.x*2.0 + u_time)); - if(f > 0.9 || outl) + if(f > 0.9) f = 1.0; else f = 0.0; diff --git a/core/assets/sprites/block_colors.png b/core/assets/sprites/block_colors.png index ff20fd35b2..abf8ce2704 100644 Binary files a/core/assets/sprites/block_colors.png and b/core/assets/sprites/block_colors.png differ diff --git a/core/assets/sprites/sprites.atlas b/core/assets/sprites/sprites.atlas index 4e03cb8190..9b6089baec 100644 --- a/core/assets/sprites/sprites.atlas +++ b/core/assets/sprites/sprites.atlas @@ -6,434 +6,441 @@ filter: Nearest,Nearest repeat: none force-projector rotate: false - xy: 415, 1302 + xy: 709, 1431 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 force-projector-top rotate: false - xy: 513, 1333 + xy: 302, 1302 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 mend-projector rotate: false - xy: 873, 1071 + xy: 1897, 1069 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 mend-projector-top rotate: false - xy: 939, 1071 + xy: 1963, 1057 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 mender rotate: false - xy: 1331, 141 + xy: 1229, 400 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 mender-top rotate: false - xy: 1331, 107 + xy: 1229, 366 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 overdrive-projector rotate: false - xy: 1071, 1071 + xy: 924, 1073 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 overdrive-projector-top rotate: false - xy: 1137, 1071 + xy: 990, 1073 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 shock-mine rotate: false - xy: 1719, 939 + xy: 567, 31 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conveyor rotate: false - xy: 1871, 1245 + xy: 1191, 253 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conveyor-bridge rotate: false - xy: 1905, 1245 + xy: 1267, 874 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conveyor-end rotate: false - xy: 1459, 1211 + xy: 1267, 840 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +center + rotate: false + xy: 1267, 806 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-0-0 rotate: false - xy: 1387, 872 + xy: 1601, 927 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-0-1 rotate: false - xy: 1387, 838 + xy: 1431, 912 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-0-2 rotate: false - xy: 1387, 804 + xy: 1465, 912 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-0-3 rotate: false - xy: 1387, 770 + xy: 1499, 893 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-1-0 rotate: false - xy: 1387, 736 + xy: 1533, 893 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-1-1 rotate: false - xy: 1379, 702 + xy: 1567, 893 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-1-2 rotate: false - xy: 1379, 668 + xy: 1601, 893 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-1-3 rotate: false - xy: 1263, 465 + xy: 1635, 903 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-2-0 rotate: false - xy: 1263, 431 + xy: 1669, 903 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-2-1 rotate: false - xy: 1263, 397 + xy: 1703, 903 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-2-2 rotate: false - xy: 1263, 363 + xy: 1737, 903 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-2-3 rotate: false - xy: 1263, 329 + xy: 1771, 903 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-3-0 rotate: false - xy: 1263, 295 + xy: 1805, 903 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-3-1 rotate: false - xy: 1263, 261 + xy: 1839, 903 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-3-2 rotate: false - xy: 1263, 227 + xy: 1873, 903 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-3-3 rotate: false - xy: 1263, 193 + xy: 1907, 891 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-4-0 rotate: false - xy: 1263, 159 + xy: 1941, 891 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-4-1 rotate: false - xy: 1263, 125 + xy: 1975, 891 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-4-2 rotate: false - xy: 1263, 91 + xy: 2009, 891 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-4-3 rotate: false - xy: 1263, 57 + xy: 1301, 860 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-0-0 rotate: false - xy: 1923, 1007 + xy: 737, 227 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-0-1 rotate: false - xy: 1923, 973 + xy: 669, 125 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-0-2 rotate: false - xy: 1923, 939 + xy: 703, 159 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-0-3 rotate: false - xy: 1923, 905 + xy: 737, 193 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-1-0 rotate: false - xy: 1421, 871 + xy: 669, 91 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-1-1 rotate: false - xy: 1421, 837 + xy: 703, 125 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-1-2 rotate: false - xy: 1455, 871 + xy: 737, 159 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-1-3 rotate: false - xy: 1421, 803 + xy: 669, 57 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-2-0 rotate: false - xy: 1489, 871 + xy: 703, 91 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-2-1 rotate: false - xy: 1455, 837 + xy: 737, 125 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-2-2 rotate: false - xy: 1421, 769 + xy: 669, 23 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-2-3 rotate: false - xy: 1523, 871 + xy: 703, 57 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-3-0 rotate: false - xy: 1489, 837 + xy: 737, 91 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-3-1 rotate: false - xy: 1455, 803 + xy: 703, 23 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-3-2 rotate: false - xy: 1557, 871 + xy: 737, 57 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-3-3 rotate: false - xy: 1523, 837 + xy: 737, 23 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-4-0 rotate: false - xy: 1489, 803 + xy: 771, 251 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-4-1 rotate: false - xy: 1455, 769 + xy: 805, 251 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-4-2 rotate: false - xy: 1591, 871 + xy: 771, 217 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-4-3 rotate: false - xy: 1557, 837 + xy: 771, 183 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 distributor rotate: false - xy: 939, 1203 + xy: 924, 1139 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 junction rotate: false - xy: 1263, 23 + xy: 1437, 640 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 mass-driver-base rotate: false - xy: 391, 1008 + xy: 1101, 1337 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 overflow-gate rotate: false - xy: 1659, 1075 + xy: 1297, 350 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conveyor rotate: false - xy: 1863, 1075 + xy: 1365, 350 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conveyor-arrow rotate: false - xy: 1897, 1075 + xy: 1365, 316 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conveyor-bridge rotate: false - xy: 1421, 1046 + xy: 1403, 391 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conveyor-end rotate: false - xy: 1455, 1041 + xy: 1399, 357 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 router rotate: false - xy: 1617, 1007 + xy: 567, 337 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sorter rotate: false - xy: 1855, 973 + xy: 635, 219 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -468,574 +475,567 @@ blast-drill-top index: -1 laser-drill rotate: false - xy: 293, 912 + xy: 694, 1235 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 laser-drill-rim rotate: false - xy: 293, 716 + xy: 596, 1137 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 laser-drill-rotator rotate: false - xy: 293, 618 + xy: 694, 1137 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 laser-drill-top rotate: false - xy: 293, 520 + xy: 807, 1435 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 mechanical-drill rotate: false - xy: 1137, 1137 + xy: 1386, 1103 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 mechanical-drill-rotator rotate: false - xy: 783, 1033 + xy: 1765, 1069 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 mechanical-drill-top rotate: false - xy: 783, 967 + xy: 1831, 1069 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 oil-extractor rotate: false - xy: 391, 714 + xy: 1297, 1447 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 oil-extractor-liquid rotate: false - xy: 391, 518 + xy: 1395, 1463 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 oil-extractor-rotator rotate: false - xy: 391, 420 + xy: 1395, 1365 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 oil-extractor-top rotate: false - xy: 391, 322 + xy: 1493, 1463 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 pneumatic-drill rotate: false - xy: 783, 901 + xy: 1584, 1061 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 pneumatic-drill-rotator rotate: false - xy: 759, 769 + xy: 1584, 995 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 pneumatic-drill-top rotate: false - xy: 849, 873 + xy: 1650, 1003 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 water-extractor rotate: false - xy: 1923, 1429 + xy: 425, 1072 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 water-extractor-liquid rotate: false - xy: 695, 529 + xy: 425, 940 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 water-extractor-rotator rotate: false - xy: 563, 515 + xy: 425, 874 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 water-extractor-top rotate: false - xy: 555, 449 + xy: 425, 808 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-border rotate: false - xy: 1633, 1245 + xy: 1233, 672 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-middle rotate: false - xy: 1667, 1245 + xy: 1233, 638 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pump-liquid rotate: false - xy: 1667, 1245 + xy: 1233, 638 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-select rotate: false - xy: 1701, 1245 + xy: 1233, 604 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-liquid rotate: false - xy: 1345, 950 + xy: 1431, 946 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 place-arrow rotate: false - xy: 391, 126 + xy: 1591, 1463 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 rubble-1-0 rotate: false - xy: 825, 807 + xy: 1716, 937 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 rubble-1-1 rotate: false - xy: 891, 807 + xy: 1782, 937 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 rubble-2-0 rotate: false - xy: 957, 807 + xy: 1848, 937 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 rubble-2-1 rotate: false - xy: 1023, 807 + xy: 1914, 991 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 rubble-3-0 rotate: false - xy: 709, 1137 + xy: 1787, 1463 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 rubble-3-1 rotate: false - xy: 709, 1137 + xy: 1787, 1463 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 rubble-4-0 rotate: false - xy: 1785, 1659 + xy: 1655, 1659 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 rubble-4-1 rotate: false - xy: 1785, 1659 + xy: 1655, 1659 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 -spawn - rotate: false - xy: 1821, 939 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 bridge-conduit rotate: false - xy: 1735, 1245 + xy: 1233, 570 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conduit-arrow rotate: false - xy: 1769, 1245 + xy: 1233, 536 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conveyor-arrow rotate: false - xy: 1769, 1245 + xy: 1233, 536 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conduit-bridge rotate: false - xy: 1803, 1245 + xy: 1233, 502 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conduit-end rotate: false - xy: 1837, 1245 + xy: 1233, 468 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom rotate: false - xy: 1799, 1211 + xy: 1267, 466 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-0 rotate: false - xy: 1833, 1211 + xy: 1363, 1003 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-1 rotate: false - xy: 1867, 1211 + xy: 1397, 1003 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-2 rotate: false - xy: 1901, 1211 + xy: 1363, 969 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-3 rotate: false - xy: 1387, 1144 + xy: 1363, 935 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-4 rotate: false - xy: 1348, 1086 + xy: 1397, 969 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-5 rotate: false - xy: 1345, 1052 + xy: 1397, 935 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-6 rotate: false - xy: 1345, 1018 + xy: 1431, 980 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-0 rotate: false - xy: 1345, 916 + xy: 1465, 946 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-1 rotate: false - xy: 1383, 1110 + xy: 1499, 961 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-2 rotate: false - xy: 1382, 1076 + xy: 1533, 961 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-3 rotate: false - xy: 1379, 1042 + xy: 1567, 961 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-4 rotate: false - xy: 1379, 1008 + xy: 1601, 961 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-5 rotate: false - xy: 1379, 974 + xy: 1499, 927 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-6 rotate: false - xy: 1379, 940 + xy: 1533, 927 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-junction rotate: false - xy: 1429, 634 + xy: 1403, 425 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-router-bottom rotate: false - xy: 1429, 566 + xy: 1635, 869 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-router-liquid rotate: false - xy: 1429, 532 + xy: 1703, 869 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-router-top rotate: false - xy: 1391, 498 + xy: 1737, 869 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-tank-bottom rotate: false - xy: 293, 324 + xy: 905, 1435 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 liquid-tank-liquid rotate: false - xy: 293, 128 + xy: 1003, 1435 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 liquid-tank-top rotate: false - xy: 293, 30 + xy: 1003, 1337 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 mechanical-pump rotate: false - xy: 1331, 277 + xy: 1975, 857 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conduit rotate: false - xy: 1727, 1075 + xy: 1297, 316 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conduit-arrow rotate: false - xy: 1761, 1075 + xy: 1331, 350 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conduit-bridge rotate: false - xy: 1795, 1075 + xy: 1365, 384 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conduit-end rotate: false - xy: 1829, 1075 + xy: 1331, 316 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-0 rotate: false - xy: 1863, 1041 + xy: 1437, 368 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-1 rotate: false - xy: 1897, 1041 + xy: 1433, 334 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-2 rotate: false - xy: 1413, 1012 + xy: 1433, 300 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-3 rotate: false - xy: 1413, 978 + xy: 1433, 266 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-4 rotate: false - xy: 1413, 944 + xy: 1433, 232 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-5 rotate: false - xy: 1413, 910 + xy: 1399, 221 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-6 rotate: false - xy: 1447, 1007 + xy: 1433, 198 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 rotary-pump rotate: false - xy: 1047, 873 + xy: 1848, 1003 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 thermal-pump rotate: false - xy: 587, 941 + xy: 1493, 1267 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 dart-mech-pad rotate: false - xy: 1005, 1335 + xy: 924, 1205 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 delta-mech-pad rotate: false - xy: 1071, 1401 + xy: 990, 1271 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 glaive-ship-pad rotate: false - xy: 293, 1010 + xy: 596, 1235 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 javelin-ship-pad rotate: false - xy: 1956, 1853 + xy: 1188, 1205 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 omega-mech-pad rotate: false - xy: 391, 224 + xy: 1493, 1365 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 tau-mech-pad rotate: false - xy: 1593, 1495 + xy: 359, 412 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 trident-ship-pad rotate: false - xy: 1527, 1429 + xy: 359, 214 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 battery rotate: false - xy: 1463, 1245 + xy: 1233, 842 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1049,28 +1049,28 @@ battery-large index: -1 combustion-generator rotate: false - xy: 1731, 1211 + xy: 1267, 534 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 combustion-generator-top rotate: false - xy: 1765, 1211 + xy: 1267, 500 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 differential-generator rotate: false - xy: 709, 1431 + xy: 513, 1431 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 differential-generator-top rotate: false - xy: 219, 1345 + xy: 611, 1431 size: 96, 96 orig: 96, 96 offset: 0, 0 @@ -1133,105 +1133,105 @@ impact-reactor-top index: -1 power-node rotate: false - xy: 1693, 1041 + xy: 1263, 262 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 power-node-large rotate: false - xy: 915, 873 + xy: 1716, 1003 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 power-source rotate: false - xy: 1761, 1041 + xy: 1331, 248 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 power-void rotate: false - xy: 1795, 1041 + xy: 1365, 248 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 rtg-generator rotate: false - xy: 1113, 873 + xy: 1650, 937 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 rtg-generator-top rotate: false - xy: 1549, 939 + xy: 567, 303 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 solar-panel rotate: false - xy: 1821, 973 + xy: 635, 287 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 solar-panel-large rotate: false - xy: 489, 843 + xy: 1395, 1267 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 surge-tower rotate: false - xy: 695, 595 + xy: 359, 544 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 thermal-generator rotate: false - xy: 1659, 1495 + xy: 293, 280 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 thorium-reactor rotate: false - xy: 685, 1039 + xy: 1591, 1267 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 thorium-reactor-center rotate: false - xy: 489, 745 + xy: 1689, 1267 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 thorium-reactor-lights rotate: false - xy: 587, 843 + xy: 1787, 1267 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 turbine-generator rotate: false - xy: 1593, 1429 + xy: 293, 82 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 turbine-generator-top rotate: false - xy: 1659, 1429 + xy: 359, 148 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -1245,266 +1245,259 @@ alloy-smelter index: -1 alloy-smelter-top rotate: false - xy: 1509, 1561 + xy: 1379, 1561 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 blast-mixer rotate: false - xy: 807, 1561 + xy: 1983, 1519 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 coal-centrifuge rotate: false - xy: 807, 1495 + xy: 1983, 1387 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cryofluidmixer-bottom rotate: false - xy: 873, 1401 + xy: 1831, 1135 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cryofluidmixer-liquid rotate: false - xy: 873, 1335 + xy: 1963, 1123 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cryofluidmixer-top rotate: false - xy: 939, 1401 + xy: 792, 1267 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cultivator rotate: false - xy: 1071, 1467 + xy: 792, 1201 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cultivator-middle rotate: false - xy: 939, 1335 + xy: 858, 1271 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cultivator-top rotate: false - xy: 1005, 1401 + xy: 858, 1205 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 graphite-press rotate: false - xy: 1137, 1203 + xy: 1122, 1139 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 incinerator rotate: false - xy: 1727, 1109 + xy: 1369, 452 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-source rotate: false - xy: 1297, 243 + xy: 1437, 878 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-void rotate: false - xy: 1297, 73 + xy: 1437, 708 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 kiln rotate: false - xy: 685, 727 + xy: 1188, 1139 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 kiln-top rotate: false - xy: 873, 1137 + xy: 1254, 1185 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 silicon-smelter-top rotate: false - xy: 873, 1137 + xy: 1254, 1185 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 liquid-source rotate: false - xy: 1331, 447 + xy: 1805, 869 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 melter rotate: false - xy: 1331, 209 + xy: 1233, 434 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 multi-press rotate: false - xy: 391, 812 + xy: 1199, 1337 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 phase-weaver rotate: false - xy: 1113, 1005 + xy: 1254, 1053 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 phase-weaver-bottom rotate: false - xy: 849, 939 + xy: 1320, 1053 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 phase-weaver-weave rotate: false - xy: 981, 939 + xy: 1452, 1080 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 plastanium-compressor rotate: false - xy: 1047, 939 + xy: 1452, 1014 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 plastanium-compressor-top rotate: false - xy: 1113, 939 + xy: 1518, 1061 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 pulverizer rotate: false - xy: 1481, 1007 + xy: 533, 371 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulverizer-rotator rotate: false - xy: 1515, 1007 + xy: 533, 303 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pyratite-mixer rotate: false - xy: 981, 873 + xy: 1782, 1003 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 separator rotate: false - xy: 1015, 675 + xy: 359, 940 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 separator-liquid rotate: false - xy: 1081, 675 + xy: 293, 808 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 silicon-smelter rotate: false - xy: 563, 581 + xy: 359, 874 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 -smelter - rotate: false - xy: 1753, 939 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 spore-press rotate: false - xy: 1155, 807 + xy: 293, 676 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 spore-press-frame0 rotate: false - xy: 1155, 741 + xy: 359, 742 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 spore-press-frame1 rotate: false - xy: 1147, 675 + xy: 293, 610 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 spore-press-frame2 rotate: false - xy: 1221, 807 + xy: 359, 676 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 spore-press-liquid rotate: false - xy: 1213, 675 + xy: 359, 610 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 spore-press-top rotate: false - xy: 629, 595 + xy: 293, 478 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 container rotate: false - xy: 489, 441 + xy: 1983, 1321 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -1525,21 +1518,14 @@ core-nucleus index: -1 core-shard rotate: false - xy: 1705, 1561 - size: 96, 96 - orig: 96, 96 - offset: 0, 0 - index: -1 -core-shard-top - rotate: false - xy: 1803, 1561 + xy: 1575, 1561 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 launch-pad rotate: false - xy: 293, 422 + xy: 807, 1337 size: 96, 96 orig: 96, 96 offset: 0, 0 @@ -1551,51 +1537,44 @@ launch-pad-large orig: 128, 128 offset: 0, 0 index: -1 -sortedunloader - rotate: false - xy: 1889, 1007 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 unloader rotate: false - xy: 1523, 769 + xy: 771, 81 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 vault rotate: false - xy: 587, 745 + xy: 1395, 1169 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 arc-heat rotate: false - xy: 1425, 1216 + xy: 1325, 894 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-1 rotate: false - xy: 1599, 1245 + xy: 1233, 706 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-2 rotate: false - xy: 489, 507 + xy: 1983, 1453 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-3 rotate: false - xy: 1607, 1561 + xy: 1477, 1561 size: 96, 96 orig: 96, 96 offset: 0, 0 @@ -1609,14 +1588,14 @@ block-4 index: -1 hail-heat rotate: false - xy: 1171, 33 + xy: 425, 1 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 lancer-heat rotate: false - xy: 1005, 1137 + xy: 1254, 1119 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -1630,182 +1609,140 @@ meltdown-heat index: -1 ripple-heat rotate: false - xy: 513, 1137 + xy: 1689, 1463 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 salvo-heat rotate: false - xy: 825, 741 + xy: 1980, 991 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 salvo-panel-left rotate: false - xy: 957, 741 + xy: 302, 1138 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 salvo-panel-right rotate: false - xy: 1023, 741 + xy: 368, 1138 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 scorch-heat rotate: false - xy: 1685, 1007 + xy: 601, 269 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 wave-liquid rotate: false - xy: 555, 251 + xy: 425, 610 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 crawler-factory rotate: false - xy: 489, 111 + xy: 1633, 1127 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 dagger-factory rotate: false - xy: 489, 111 + xy: 1633, 1127 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 phantom-factory rotate: false - xy: 489, 111 + xy: 1633, 1127 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 spirit-factory rotate: false - xy: 489, 111 + xy: 1633, 1127 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 wraith-factory rotate: false - xy: 489, 111 + xy: 1633, 1127 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 crawler-factory-top rotate: false - xy: 873, 1467 - size: 64, 64 - orig: 64, 64 - offset: 0, 0 - index: -1 -crawler-factory-top-open - rotate: false - xy: 939, 1467 + xy: 1765, 1135 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 dagger-factory-top rotate: false - xy: 873, 1203 - size: 64, 64 - orig: 64, 64 - offset: 0, 0 - index: -1 -dagger-factory-top-open - rotate: false - xy: 939, 1269 + xy: 858, 1139 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 fortress-factory rotate: false - xy: 611, 1333 + xy: 302, 1204 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 fortress-factory-top rotate: false - xy: 415, 1204 + xy: 400, 1204 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 ghoul-factory-top rotate: false - xy: 415, 1204 + xy: 400, 1204 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 titan-factory-top rotate: false - xy: 415, 1204 - size: 96, 96 - orig: 96, 96 - offset: 0, 0 - index: -1 -fortress-factory-top-open - rotate: false - xy: 513, 1235 - size: 96, 96 - orig: 96, 96 - offset: 0, 0 - index: -1 -ghoul-factory-top-open - rotate: false - xy: 513, 1235 - size: 96, 96 - orig: 96, 96 - offset: 0, 0 - index: -1 -titan-factory-top-open - rotate: false - xy: 513, 1235 + xy: 400, 1204 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 ghoul-factory rotate: false - xy: 204, 1247 + xy: 709, 1333 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 phantom-factory-top rotate: false - xy: 915, 1005 - size: 64, 64 - orig: 64, 64 - offset: 0, 0 - index: -1 -phantom-factory-top-open - rotate: false - xy: 981, 1005 + xy: 1122, 1073 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 repair-point-base rotate: false - xy: 1549, 1007 + xy: 533, 201 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1824,240 +1761,219 @@ revenant-factory-top orig: 128, 128 offset: 0, 0 index: -1 -revenant-factory-top-open - rotate: false - xy: 1655, 1659 - size: 128, 128 - orig: 128, 128 - offset: 0, 0 - index: -1 spirit-factory-top rotate: false - xy: 1179, 939 - size: 64, 64 - orig: 64, 64 - offset: 0, 0 - index: -1 -spirit-factory-top-open - rotate: false - xy: 1179, 873 + xy: 359, 808 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 titan-factory rotate: false - xy: 685, 941 + xy: 1885, 1267 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 wraith-factory-top rotate: false - xy: 555, 119 - size: 64, 64 - orig: 64, 64 - offset: 0, 0 - index: -1 -wraith-factory-top-open - rotate: false - xy: 555, 53 + xy: 425, 478 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 copper-wall rotate: false - xy: 1425, 1182 + xy: 1301, 826 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 copper-wall-large rotate: false - xy: 807, 1429 + xy: 1983, 1255 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 door rotate: false - xy: 1659, 1143 + xy: 1335, 486 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 door-large rotate: false - xy: 1005, 1269 + xy: 990, 1205 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 door-large-open rotate: false - xy: 1071, 1335 + xy: 1056, 1271 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 door-open rotate: false - xy: 1727, 1143 + xy: 1335, 452 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-wall rotate: false - xy: 1489, 1041 + xy: 1399, 323 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-wall-large rotate: false - xy: 1047, 1005 + xy: 1188, 1073 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 scrap-wall-gigantic rotate: false - xy: 1915, 1659 + xy: 1785, 1659 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 scrap-wall-huge1 rotate: false - xy: 489, 1039 + xy: 1787, 1365 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 scrap-wall-huge2 rotate: false - xy: 489, 941 + xy: 1885, 1463 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 scrap-wall-huge3 rotate: false - xy: 587, 1039 + xy: 1885, 1365 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 scrap-wall-large1 rotate: false - xy: 661, 661 + xy: 359, 1072 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 scrap-wall-large2 rotate: false - xy: 817, 675 + xy: 293, 940 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 scrap-wall-large3 rotate: false - xy: 883, 675 + xy: 359, 1006 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 scrap-wall-large4 rotate: false - xy: 949, 675 + xy: 293, 874 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 scrap-wall1 rotate: false - xy: 1617, 939 + xy: 601, 235 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap-wall2 rotate: false - xy: 1719, 1007 + xy: 567, 167 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap-wall3 rotate: false - xy: 1685, 973 + xy: 601, 201 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap-wall4 rotate: false - xy: 1651, 939 + xy: 567, 133 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap-wall5 rotate: false - xy: 1651, 939 + xy: 567, 133 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 surge-wall rotate: false - xy: 1549, 905 + xy: 669, 295 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 surge-wall-large rotate: false - xy: 1395, 1479 + xy: 293, 412 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 thorium-wall rotate: false - xy: 1787, 905 + xy: 703, 227 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 thorium-wall-large rotate: false - xy: 1725, 1495 + xy: 359, 346 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 thruster rotate: false - xy: 1135, 1533 + xy: 1005, 1533 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 titanium-wall rotate: false - xy: 1523, 803 + xy: 805, 217 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-wall-large rotate: false - xy: 1923, 1495 + xy: 293, 148 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -2071,14 +1987,14 @@ bullet index: -1 bullet-back rotate: false - xy: 1261, 1301 + xy: 1956, 1791 size: 52, 52 orig: 52, 52 offset: 0, 0 index: -1 casing rotate: false - xy: 2039, 1541 + xy: 1897, 851 size: 8, 16 orig: 8, 16 offset: 0, 0 @@ -2092,147 +2008,147 @@ circle-shadow index: -1 error rotate: false - xy: 621, 14 + xy: 641, 821 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 laser rotate: false - xy: 507, 1154 + xy: 492, 1154 size: 4, 48 orig: 4, 48 offset: 0, 0 index: -1 laser-end rotate: false - xy: 489, 573 + xy: 1956, 1845 size: 72, 72 orig: 72, 72 offset: 0, 0 index: -1 minelaser rotate: false - xy: 1252, 475 + xy: 2043, 875 size: 4, 48 orig: 4, 48 offset: 0, 0 index: -1 minelaser-end rotate: false - xy: 587, 671 + xy: 1493, 1146 size: 72, 72 orig: 72, 72 offset: 0, 0 index: -1 missile rotate: false - xy: 1311, 1188 + xy: 1249, 986 size: 36, 36 orig: 36, 36 offset: 0, 0 index: -1 missile-back rotate: false - xy: 1311, 1150 + xy: 1249, 948 size: 36, 36 orig: 36, 36 offset: 0, 0 index: -1 scale_marker rotate: false - xy: 204, 1194 + xy: 757, 1029 size: 4, 4 orig: 4, 4 offset: 0, 0 index: -1 scorch1 rotate: false - xy: 2019, 1257 + xy: 839, 57 size: 28, 100 orig: 28, 100 offset: 0, 0 index: -1 scorch2 rotate: false - xy: 1931, 1075 + xy: 870, 137 size: 28, 100 orig: 28, 100 offset: 0, 0 index: -1 scorch3 rotate: false - xy: 1939, 1177 + xy: 900, 137 size: 28, 100 orig: 28, 100 offset: 0, 0 index: -1 scorch4 rotate: false - xy: 1969, 1157 + xy: 869, 35 size: 28, 100 orig: 28, 100 offset: 0, 0 index: -1 scorch5 rotate: false - xy: 1999, 1155 + xy: 899, 35 size: 28, 100 orig: 28, 100 offset: 0, 0 index: -1 shell rotate: false - xy: 1349, 1212 + xy: 1325, 986 size: 36, 36 orig: 36, 36 offset: 0, 0 index: -1 shell-back rotate: false - xy: 1387, 1241 + xy: 1249, 910 size: 36, 36 orig: 36, 36 offset: 0, 0 index: -1 shot rotate: false - xy: 1821, 1007 + xy: 601, 65 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 transfer rotate: false - xy: 555, 523 + xy: 2043, 825 size: 4, 48 orig: 4, 48 offset: 0, 0 index: -1 transfer-arrow rotate: false - xy: 1625, 871 + xy: 805, 183 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 transfer-end rotate: false - xy: 685, 793 + xy: 1579, 1193 size: 72, 72 orig: 72, 72 offset: 0, 0 index: -1 alloy-smelter-icon-large rotate: false - xy: 1999, 1609 + xy: 491, 913 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 alloy-smelter-icon-medium rotate: false - xy: 727, 669 + xy: 823, 1101 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2246,21 +2162,21 @@ alloy-smelter-icon-small index: -1 arc rotate: false - xy: 1387, 1178 + xy: 2010, 1811 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 arc-icon-full rotate: false - xy: 1349, 1120 + xy: 1233, 876 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 arc-icon-large rotate: false - xy: 1261, 1201 + xy: 491, 863 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -2274,7 +2190,7 @@ arc-icon-small index: -1 battery-icon-large rotate: false - xy: 87, 10 + xy: 657, 1029 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -2288,21 +2204,21 @@ battery-icon-small index: -1 battery-large-icon-large rotate: false - xy: 621, 414 + xy: 491, 755 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 battery-large-icon-medium rotate: false - xy: 1497, 1245 + xy: 1233, 808 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 battery-large-icon-small rotate: false - xy: 1421, 743 + xy: 844, 1535 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -2316,455 +2232,455 @@ blast-drill-icon-full index: -1 blast-drill-icon-large rotate: false - xy: 621, 364 + xy: 491, 705 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 blast-drill-icon-medium rotate: false - xy: 1531, 1245 + xy: 1233, 774 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 blast-drill-icon-small rotate: false - xy: 1447, 743 + xy: 533, 5 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 blast-mixer-icon-large rotate: false - xy: 621, 314 + xy: 491, 655 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 blast-mixer-icon-medium rotate: false - xy: 1565, 1245 + xy: 1233, 740 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 blast-mixer-icon-small rotate: false - xy: 1591, 777 + xy: 907, 247 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 bridge-conduit-icon-large rotate: false - xy: 621, 164 + xy: 491, 505 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 bridge-conduit-icon-small rotate: false - xy: 1931, 1049 + xy: 1471, 886 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 bridge-conveyor-icon-large rotate: false - xy: 621, 114 + xy: 87, 10 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 bridge-conveyor-icon-small rotate: false - xy: 1693, 845 + xy: 1467, 279 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 char-icon-large rotate: false - xy: 1989, 1509 + xy: 491, 455 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 char-icon-small rotate: false - xy: 1473, 743 + xy: 933, 247 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 cliffs-icon-large rotate: false - xy: 1989, 1459 + xy: 490, 405 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 cliffs-icon-small rotate: false - xy: 1811, 879 + xy: 1471, 860 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 coal-centrifuge-icon-large rotate: false - xy: 1261, 1093 + xy: 483, 355 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 coal-centrifuge-icon-medium rotate: false - xy: 1697, 1211 + xy: 1267, 568 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 coal-centrifuge-icon-small rotate: false - xy: 1499, 743 + xy: 1467, 253 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 combustion-generator-icon-large rotate: false - xy: 1377, 1429 + xy: 483, 305 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 combustion-generator-icon-small rotate: false - xy: 1837, 879 + xy: 585, 5 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 conduit-icon-full rotate: false - xy: 1345, 984 + xy: 1465, 980 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-icon-large rotate: false - xy: 1427, 1429 + xy: 483, 255 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 conduit-icon-small rotate: false - xy: 1525, 743 + xy: 959, 247 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 container-icon-large rotate: false - xy: 1477, 1429 + xy: 483, 205 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 container-icon-medium rotate: false - xy: 1379, 906 + xy: 1567, 927 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 container-icon-small rotate: false - xy: 1863, 879 + xy: 1471, 834 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 conveyor-icon-large rotate: false - xy: 1989, 1409 + xy: 483, 155 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 conveyor-icon-small rotate: false - xy: 1551, 743 + xy: 1467, 227 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 copper-wall-icon-large rotate: false - xy: 671, 414 + xy: 483, 105 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 copper-wall-icon-small rotate: false - xy: 1889, 879 + xy: 985, 247 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 copper-wall-large-icon-large rotate: false - xy: 671, 364 + xy: 483, 55 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 copper-wall-large-icon-medium rotate: false - xy: 1421, 1148 + xy: 1301, 792 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 copper-wall-large-icon-small rotate: false - xy: 1915, 879 + xy: 1471, 808 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 core-foundation-icon-large rotate: false - xy: 671, 314 + xy: 707, 1029 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 core-foundation-icon-medium rotate: false - xy: 1459, 1177 + xy: 1301, 758 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 core-foundation-icon-small rotate: false - xy: 2014, 1793 + xy: 1467, 201 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 core-nucleus-icon-large rotate: false - xy: 671, 264 + xy: 757, 1035 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 core-nucleus-icon-medium rotate: false - xy: 1493, 1177 + xy: 1301, 724 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 core-nucleus-icon-small rotate: false - xy: 1961, 1068 + xy: 1011, 247 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 core-shard-icon-large rotate: false - xy: 671, 214 + xy: 807, 1035 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 core-shard-icon-medium rotate: false - xy: 1527, 1177 + xy: 1301, 690 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 core-shard-icon-small rotate: false - xy: 1447, 717 + xy: 1471, 782 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 cracks-1-0 rotate: false - xy: 1561, 1177 + xy: 1301, 656 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cracks-1-1 rotate: false - xy: 1595, 1177 + xy: 1301, 622 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cracks-1-2 rotate: false - xy: 1629, 1177 + xy: 1301, 588 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cracks-1-3 rotate: false - xy: 1663, 1177 + xy: 1301, 554 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cracks-1-4 rotate: false - xy: 1697, 1177 + xy: 1301, 520 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cracks-1-5 rotate: false - xy: 1731, 1177 + xy: 1301, 486 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cracks-1-6 rotate: false - xy: 1765, 1177 + xy: 1335, 860 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cracks-1-7 rotate: false - xy: 1799, 1177 + xy: 1335, 826 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cracks-2-0 rotate: false - xy: 489, 375 + xy: 807, 1561 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cracks-2-1 rotate: false - xy: 807, 1363 + xy: 1653, 1201 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cracks-2-2 rotate: false - xy: 489, 309 + xy: 1719, 1201 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cracks-2-3 rotate: false - xy: 807, 1297 + xy: 1785, 1201 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cracks-2-4 rotate: false - xy: 489, 243 + xy: 1851, 1201 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cracks-2-5 rotate: false - xy: 807, 1231 + xy: 1917, 1201 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cracks-2-6 rotate: false - xy: 489, 177 + xy: 1983, 1189 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cracks-2-7 rotate: false - xy: 807, 1165 + xy: 1567, 1127 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cracks-3-0 rotate: false - xy: 1901, 1561 + xy: 1673, 1561 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 cracks-3-1 rotate: false - xy: 317, 1498 + xy: 1771, 1561 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 cracks-3-2 rotate: false - xy: 415, 1498 + xy: 1869, 1561 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 cracks-3-3 rotate: false - xy: 513, 1529 + xy: 317, 1498 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 cracks-3-4 rotate: false - xy: 611, 1529 + xy: 415, 1498 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 cracks-3-5 rotate: false - xy: 709, 1529 + xy: 513, 1529 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 cracks-3-6 rotate: false - xy: 317, 1400 + xy: 611, 1529 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 cracks-3-7 rotate: false - xy: 415, 1400 + xy: 709, 1529 size: 96, 96 orig: 96, 96 offset: 0, 0 @@ -2883,756 +2799,756 @@ cracks-5-7 index: -1 craters-icon-large rotate: false - xy: 671, 164 + xy: 857, 1023 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 craters-icon-small rotate: false - xy: 1447, 691 + xy: 1037, 247 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 crawler-factory-icon-full rotate: false - xy: 489, 45 + xy: 1699, 1135 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 crawler-factory-icon-large rotate: false - xy: 721, 421 + xy: 1007, 1023 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 crawler-factory-icon-medium rotate: false - xy: 1833, 1177 + xy: 1335, 792 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 crawler-factory-icon-small rotate: false - xy: 1473, 717 + xy: 1471, 756 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 cryofluidmixer-icon-full rotate: false - xy: 1005, 1467 + xy: 1897, 1135 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cryofluidmixer-icon-large rotate: false - xy: 721, 321 + xy: 1107, 1023 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 cryofluidmixer-icon-medium rotate: false - xy: 1867, 1177 + xy: 1335, 758 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cryofluidmixer-icon-small rotate: false - xy: 1473, 691 + xy: 1063, 247 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 cultivator-icon-full rotate: false - xy: 873, 1269 + xy: 792, 1135 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cultivator-icon-large rotate: false - xy: 721, 271 + xy: 1157, 1023 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 cultivator-icon-medium rotate: false - xy: 1901, 1177 + xy: 1335, 724 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cultivator-icon-small rotate: false - xy: 1499, 717 + xy: 1471, 730 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 cyclone rotate: false - xy: 513, 1431 + xy: 317, 1400 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 cyclone-icon-full rotate: false - xy: 611, 1431 + xy: 415, 1400 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 cyclone-icon-large rotate: false - xy: 721, 221 + xy: 483, 5 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 cyclone-icon-medium rotate: false - xy: 1455, 1143 + xy: 1335, 690 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cyclone-icon-small rotate: false - xy: 1499, 691 + xy: 1089, 247 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 dagger-factory-icon-full rotate: false - xy: 1137, 1467 + xy: 924, 1271 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 dagger-factory-icon-large rotate: false - xy: 721, 71 + xy: 541, 813 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 dagger-factory-icon-medium rotate: false - xy: 1489, 1143 + xy: 1335, 656 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 dagger-factory-icon-small rotate: false - xy: 1525, 717 + xy: 1471, 704 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 dark-metal-icon-large rotate: false - xy: 1427, 1379 + xy: 541, 713 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 dark-metal-icon-small rotate: false - xy: 1525, 691 + xy: 1115, 247 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 dark-panel-1-icon-large rotate: false - xy: 1477, 1379 + xy: 541, 663 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 dark-panel-1-icon-small rotate: false - xy: 1551, 717 + xy: 1471, 678 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 dark-panel-2-icon-large rotate: false - xy: 1527, 1379 + xy: 541, 613 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 dark-panel-2-icon-small rotate: false - xy: 1551, 691 + xy: 1141, 247 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 dark-panel-3-icon-large rotate: false - xy: 1577, 1379 + xy: 541, 563 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 dark-panel-3-icon-small rotate: false - xy: 1990, 1129 + xy: 1471, 652 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 dark-panel-4-icon-large rotate: false - xy: 1627, 1379 + xy: 541, 513 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 dark-panel-4-icon-small rotate: false - xy: 1990, 1103 + xy: 1471, 626 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 dark-panel-5-icon-large rotate: false - xy: 1677, 1379 + xy: 541, 463 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 dark-panel-5-icon-small rotate: false - xy: 1941, 879 + xy: 1471, 600 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 dark-panel-6-icon-large rotate: false - xy: 1727, 1379 + xy: 599, 971 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 dark-panel-6-icon-small rotate: false - xy: 1957, 1042 + xy: 1471, 574 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 darksand-icon-large rotate: false - xy: 1777, 1379 + xy: 591, 921 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 darksand-icon-small rotate: false - xy: 1957, 1016 + xy: 1471, 548 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 darksand-tainted-water-icon-large rotate: false - xy: 1827, 1379 + xy: 591, 871 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 darksand-tainted-water-icon-small rotate: false - xy: 1957, 990 + xy: 1471, 522 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 darksand-water-icon-large rotate: false - xy: 1877, 1379 + xy: 591, 821 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 darksand-water-icon-small rotate: false - xy: 1957, 964 + xy: 1471, 496 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 dart-mech-pad-icon-large rotate: false - xy: 1927, 1379 + xy: 591, 771 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 dart-mech-pad-icon-medium rotate: false - xy: 1523, 1143 + xy: 1335, 622 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 dart-mech-pad-icon-small rotate: false - xy: 1957, 938 + xy: 1471, 470 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 deepwater-icon-large rotate: false - xy: 1245, 1043 + xy: 591, 671 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 deepwater-icon-small rotate: false - xy: 1957, 912 + xy: 1471, 444 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 delta-mech-pad-icon-large rotate: false - xy: 1295, 1043 + xy: 591, 471 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 delta-mech-pad-icon-medium rotate: false - xy: 1557, 1143 + xy: 1335, 588 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 delta-mech-pad-icon-small rotate: false - xy: 1719, 841 + xy: 1471, 418 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 differential-generator-icon-large rotate: false - xy: 1295, 993 + xy: 649, 979 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 differential-generator-icon-medium rotate: false - xy: 1591, 1143 + xy: 1335, 554 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 differential-generator-icon-small rotate: false - xy: 1745, 841 + xy: 1471, 392 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 distributor-icon-large rotate: false - xy: 1295, 943 + xy: 699, 979 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 distributor-icon-medium rotate: false - xy: 1625, 1143 + xy: 1335, 520 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 distributor-icon-small rotate: false - xy: 1577, 743 + xy: 1497, 867 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 door-icon-large rotate: false - xy: 1295, 893 + xy: 541, 413 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 door-icon-small rotate: false - xy: 1577, 717 + xy: 1523, 867 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 door-large-icon-large rotate: false - xy: 1287, 843 + xy: 591, 421 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 door-large-icon-medium rotate: false - xy: 1693, 1143 + xy: 1301, 452 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 door-large-icon-small rotate: false - xy: 1577, 691 + xy: 1497, 841 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 dunerocks-icon-large rotate: false - xy: 1287, 793 + xy: 641, 921 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 dunerocks-icon-small rotate: false - xy: 1771, 841 + xy: 1549, 867 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 duo rotate: false - xy: 1761, 1143 + xy: 1359, 894 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 duo-icon-full rotate: false - xy: 1795, 1143 + xy: 1393, 901 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 duo-icon-large rotate: false - xy: 1287, 743 + xy: 641, 871 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 duo-icon-small rotate: false - xy: 1797, 853 + xy: 1497, 815 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 force-projector-icon-large rotate: false - xy: 771, 421 + xy: 641, 605 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 force-projector-icon-medium rotate: false - xy: 1863, 1143 + xy: 1369, 826 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 force-projector-icon-small rotate: false - xy: 1823, 853 + xy: 1523, 841 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 fortress-factory-icon-full rotate: false - xy: 709, 1333 + xy: 400, 1302 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 fortress-factory-icon-large rotate: false - xy: 771, 371 + xy: 641, 555 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 fortress-factory-icon-medium rotate: false - xy: 1897, 1143 + xy: 1369, 792 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 fortress-factory-icon-small rotate: false - xy: 1849, 853 + xy: 1575, 867 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 fuse rotate: false - xy: 611, 1235 + xy: 513, 1333 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 fuse-icon-full rotate: false - xy: 709, 1235 + xy: 611, 1333 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 fuse-icon-large rotate: false - xy: 771, 321 + xy: 641, 505 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 fuse-icon-medium rotate: false - xy: 1421, 1114 + xy: 1369, 758 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 fuse-icon-small rotate: false - xy: 1875, 853 + xy: 1497, 789 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ghoul-factory-icon-full rotate: false - xy: 293, 1108 + xy: 498, 1235 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 ghoul-factory-icon-large rotate: false - xy: 771, 271 + xy: 641, 455 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 ghoul-factory-icon-medium rotate: false - xy: 1455, 1109 + xy: 1369, 724 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ghoul-factory-icon-small rotate: false - xy: 1901, 853 + xy: 1523, 815 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 glaive-ship-pad-icon-large rotate: false - xy: 771, 221 + xy: 691, 929 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 glaive-ship-pad-icon-medium rotate: false - xy: 1489, 1109 + xy: 1369, 690 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 glaive-ship-pad-icon-small rotate: false - xy: 1927, 853 + xy: 1549, 841 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 graphite-press-icon-large rotate: false - xy: 771, 171 + xy: 691, 879 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 graphite-press-icon-medium rotate: false - xy: 1523, 1109 + xy: 1369, 656 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 graphite-press-icon-small rotate: false - xy: 1953, 853 + xy: 1601, 867 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 grass-icon-large rotate: false - xy: 771, 121 + xy: 691, 829 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 grass-icon-small rotate: false - xy: 2016, 1129 + xy: 1497, 763 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 hail rotate: false - xy: 1557, 1109 + xy: 1369, 622 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 hail-icon-full rotate: false - xy: 1591, 1109 + xy: 1369, 588 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 hail-icon-large rotate: false - xy: 771, 71 + xy: 691, 779 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 hail-icon-small rotate: false - xy: 2016, 1103 + xy: 1523, 789 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 holostone-icon-large rotate: false - xy: 1279, 691 + xy: 691, 679 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 holostone-icon-small rotate: false - xy: 290, 1221 + xy: 1549, 815 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 hotrock-icon-large rotate: false - xy: 1279, 641 + xy: 691, 629 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 hotrock-icon-small rotate: false - xy: 2022, 1907 + xy: 1575, 841 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ice-icon-large rotate: false - xy: 1369, 1329 + xy: 691, 579 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 ice-icon-small rotate: false - xy: 2022, 1881 + xy: 1497, 737 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ice-snow-icon-large rotate: false - xy: 1419, 1329 + xy: 691, 529 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 ice-snow-icon-small rotate: false - xy: 2022, 1855 + xy: 1523, 763 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 icerocks-icon-large rotate: false - xy: 1469, 1329 + xy: 691, 479 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 icerocks-icon-small rotate: false - xy: 1617, 771 + xy: 1549, 789 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ignarock-icon-large rotate: false - xy: 1569, 1329 + xy: 691, 429 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 ignarock-icon-small rotate: false - xy: 1823, 827 + xy: 1523, 737 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3646,784 +3562,784 @@ impact-reactor-icon-full index: -1 impact-reactor-icon-large rotate: false - xy: 1619, 1329 + xy: 591, 371 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 impact-reactor-icon-medium rotate: false - xy: 1693, 1109 + xy: 1369, 486 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 impact-reactor-icon-small rotate: false - xy: 1849, 827 + xy: 1549, 763 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 incinerator-icon-large rotate: false - xy: 1669, 1329 + xy: 641, 355 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 incinerator-icon-small rotate: false - xy: 1875, 827 + xy: 1575, 789 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-blast-compound-medium rotate: false - xy: 1901, 827 + xy: 1497, 685 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-blast-compound-small rotate: false - xy: 2029, 1167 + xy: 163, 6 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-blast-compound-xlarge rotate: false - xy: 1221, 433 + xy: 1254, 1295 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-coal-medium rotate: false - xy: 1603, 703 + xy: 1523, 711 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-coal-small rotate: false - xy: 1519, 673 + xy: 181, 6 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-coal-xlarge rotate: false - xy: 1221, 391 + xy: 1650, 1085 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-copper-medium rotate: false - xy: 1629, 745 + xy: 1549, 737 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-copper-small rotate: false - xy: 1469, 208 + xy: 199, 6 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-copper-xlarge rotate: false - xy: 1221, 349 + xy: 1191, 881 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-graphite-medium rotate: false - xy: 1927, 827 + xy: 1575, 763 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-graphite-small rotate: false - xy: 1537, 673 + xy: 217, 6 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-graphite-xlarge rotate: false - xy: 1221, 307 + xy: 1207, 1031 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-lead-medium rotate: false - xy: 1629, 719 + xy: 1601, 773 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-lead-small rotate: false - xy: 1469, 190 + xy: 235, 6 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-lead-xlarge rotate: false - xy: 1221, 265 + xy: 263, 1401 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-metaglass-medium rotate: false - xy: 1655, 745 + xy: 1497, 659 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-metaglass-small rotate: false - xy: 1555, 673 + xy: 253, 6 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-metaglass-xlarge rotate: false - xy: 1221, 223 + xy: 1254, 1253 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-phase-fabric-medium rotate: false - xy: 1953, 827 + xy: 1523, 685 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-phase-fabric-small rotate: false - xy: 1469, 172 + xy: 271, 6 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-phase-fabric-xlarge rotate: false - xy: 1221, 181 + xy: 1191, 839 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-plastanium-medium rotate: false - xy: 1655, 719 + xy: 1549, 711 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-plastanium-small rotate: false - xy: 1573, 673 + xy: 2028, 1793 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-plastanium-xlarge rotate: false - xy: 1221, 139 + xy: 1191, 797 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-pyratite-medium rotate: false - xy: 1629, 693 + xy: 1575, 737 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-pyratite-small rotate: false - xy: 1469, 154 + xy: 1705, 685 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-pyratite-xlarge rotate: false - xy: 1221, 97 + xy: 1191, 755 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-sand-medium rotate: false - xy: 1655, 693 + xy: 1601, 747 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-sand-small rotate: false - xy: 1469, 136 + xy: 1845, 825 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-sand-xlarge rotate: false - xy: 1221, 55 + xy: 1191, 713 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-scrap-medium rotate: false - xy: 1603, 677 + xy: 1497, 633 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-scrap-small rotate: false - xy: 1469, 118 + xy: 1653, 640 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-scrap-xlarge rotate: false - xy: 1311, 599 + xy: 1191, 671 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-silicon-medium rotate: false - xy: 1629, 667 + xy: 1523, 659 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-silicon-small rotate: false - xy: 1469, 100 + xy: 1679, 669 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-silicon-xlarge rotate: false - xy: 1311, 557 + xy: 1191, 629 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-source-icon-large rotate: false - xy: 1719, 1329 + xy: 691, 379 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-source-icon-small rotate: false - xy: 1655, 667 + xy: 1549, 685 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-spore-pod-medium rotate: false - xy: 1681, 745 + xy: 1575, 711 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-spore-pod-small rotate: false - xy: 1469, 82 + xy: 567, 395 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-spore-pod-xlarge rotate: false - xy: 1353, 601 + xy: 1191, 587 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-surge-alloy-medium rotate: false - xy: 1681, 719 + xy: 1601, 721 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-surge-alloy-small rotate: false - xy: 1469, 64 + xy: 567, 377 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-surge-alloy-xlarge rotate: false - xy: 1353, 559 + xy: 1191, 545 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-thorium-medium rotate: false - xy: 1681, 693 + xy: 1497, 607 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-thorium-small rotate: false - xy: 1469, 46 + xy: 839, 39 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-thorium-xlarge rotate: false - xy: 1261, 499 + xy: 1191, 503 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-titanium-medium rotate: false - xy: 1681, 667 + xy: 1523, 633 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-titanium-small rotate: false - xy: 1469, 28 + xy: 1601, 391 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-titanium-xlarge rotate: false - xy: 1311, 515 + xy: 1191, 461 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-void-icon-large rotate: false - xy: 1769, 1329 + xy: 691, 329 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-void-icon-small rotate: false - xy: 1693, 819 + xy: 1549, 659 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 javelin-ship-pad-icon-large rotate: false - xy: 1869, 1329 + xy: 741, 929 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 javelin-ship-pad-icon-medium rotate: false - xy: 1297, 39 + xy: 1437, 674 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 javelin-ship-pad-icon-small rotate: false - xy: 1719, 815 + xy: 1575, 685 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 junction-icon-large rotate: false - xy: 1319, 1313 + xy: 741, 829 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 junction-icon-small rotate: false - xy: 1745, 815 + xy: 1601, 695 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 kiln-icon-large rotate: false - xy: 1969, 1309 + xy: 741, 779 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 kiln-icon-medium rotate: false - xy: 1297, 5 + xy: 1437, 606 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 kiln-icon-small rotate: false - xy: 1771, 815 + xy: 1497, 581 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 lancer rotate: false - xy: 939, 1137 + xy: 1320, 1185 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 lancer-icon-full rotate: false - xy: 1071, 1137 + xy: 1320, 1119 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 lancer-icon-large rotate: false - xy: 1369, 1279 + xy: 741, 729 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 lancer-icon-medium rotate: false - xy: 1413, 702 + xy: 1437, 572 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 lancer-icon-small rotate: false - xy: 1797, 801 + xy: 1523, 607 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 laser-drill-icon-full rotate: false - xy: 293, 814 + xy: 498, 1137 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 laser-drill-icon-large rotate: false - xy: 1419, 1279 + xy: 741, 679 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 laser-drill-icon-medium rotate: false - xy: 1413, 668 + xy: 1437, 538 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 laser-drill-icon-small rotate: false - xy: 1823, 801 + xy: 1549, 633 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 launch-pad-icon-large rotate: false - xy: 1469, 1279 + xy: 741, 629 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 launch-pad-icon-medium rotate: false - xy: 1395, 634 + xy: 1437, 504 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 launch-pad-icon-small rotate: false - xy: 1849, 801 + xy: 1575, 659 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 launch-pad-large-icon-large rotate: false - xy: 1519, 1279 + xy: 741, 579 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 launch-pad-large-icon-medium rotate: false - xy: 1395, 600 + xy: 1437, 470 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 launch-pad-large-icon-small rotate: false - xy: 1875, 801 + xy: 1601, 669 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 liquid-junction-icon-large rotate: false - xy: 1619, 1279 + xy: 741, 479 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 liquid-junction-icon-small rotate: false - xy: 1901, 801 + xy: 1497, 555 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 liquid-router-icon-full rotate: false - xy: 1395, 532 + xy: 1669, 869 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-router-icon-large rotate: false - xy: 1669, 1279 + xy: 741, 429 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 liquid-router-icon-small rotate: false - xy: 1927, 801 + xy: 1523, 581 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 liquid-source-icon-large rotate: false - xy: 1719, 1279 + xy: 741, 379 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 liquid-source-icon-small rotate: false - xy: 1953, 801 + xy: 1549, 607 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 liquid-tank-icon-full rotate: false - xy: 293, 226 + xy: 905, 1337 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 liquid-tank-icon-large rotate: false - xy: 1769, 1279 + xy: 741, 329 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 liquid-tank-icon-medium rotate: false - xy: 1331, 413 + xy: 1839, 869 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-tank-icon-small rotate: false - xy: 1365, 475 + xy: 1575, 633 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 magmarock-icon-large rotate: false - xy: 1819, 1279 + xy: 799, 985 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 magmarock-icon-small rotate: false - xy: 1365, 449 + xy: 1601, 643 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 mass-driver rotate: false - xy: 391, 1106 + xy: 1101, 1435 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 mass-driver-icon-full rotate: false - xy: 391, 910 + xy: 1199, 1435 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 mass-driver-icon-large rotate: false - xy: 1869, 1279 + xy: 849, 973 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 mass-driver-icon-medium rotate: false - xy: 1331, 345 + xy: 1907, 857 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 mass-driver-icon-small rotate: false - xy: 1391, 472 + xy: 1497, 529 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 mech-icon-alpha-mech rotate: false - xy: 1919, 1279 + xy: 899, 973 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 mech-icon-dart-ship rotate: false - xy: 1969, 1259 + xy: 949, 973 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 mech-icon-delta-mech rotate: false - xy: 1337, 843 + xy: 999, 973 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 mech-icon-glaive-ship rotate: false - xy: 694, 471 + xy: 425, 217 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 mech-icon-javelin-ship rotate: false - xy: 1337, 793 + xy: 1049, 973 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 mech-icon-omega-mech rotate: false - xy: 1203, 1337 + xy: 425, 159 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 mech-icon-tau-mech rotate: false - xy: 1203, 1279 + xy: 425, 101 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 mech-icon-trident-ship rotate: false - xy: 1203, 1221 + xy: 425, 43 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 mechanical-drill-icon-full rotate: false - xy: 807, 1099 + xy: 1699, 1069 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 mechanical-drill-icon-large rotate: false - xy: 1337, 743 + xy: 1099, 973 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 mechanical-drill-icon-medium rotate: false - xy: 1331, 311 + xy: 1941, 857 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 mechanical-drill-icon-small rotate: false - xy: 1365, 423 + xy: 1523, 555 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 mechanical-pump-icon-large rotate: false - xy: 1329, 693 + xy: 1149, 973 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 mechanical-pump-icon-small rotate: false - xy: 1391, 446 + xy: 1549, 581 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4444,777 +4360,777 @@ meltdown-icon-full index: -1 meltdown-icon-large rotate: false - xy: 1329, 643 + xy: 799, 935 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 meltdown-icon-medium rotate: false - xy: 1331, 243 + xy: 2009, 857 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 meltdown-icon-small rotate: false - xy: 1417, 472 + xy: 1575, 607 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 melter-icon-large rotate: false - xy: 555, 3 + xy: 791, 885 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 melter-icon-small rotate: false - xy: 1365, 397 + xy: 1601, 617 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 mend-projector-icon-large rotate: false - xy: 761, 653 + xy: 791, 835 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 mend-projector-icon-medium rotate: false - xy: 1331, 175 + xy: 1267, 432 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 mend-projector-icon-small rotate: false - xy: 1391, 420 + xy: 1497, 503 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 mender-icon-large rotate: false - xy: 761, 603 + xy: 791, 785 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 mender-icon-small rotate: false - xy: 1417, 446 + xy: 1523, 529 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 metal-floor-2-icon-large rotate: false - xy: 761, 553 + xy: 791, 735 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 metal-floor-2-icon-small rotate: false - xy: 1365, 371 + xy: 1549, 555 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 metal-floor-3-icon-large rotate: false - xy: 811, 625 + xy: 791, 685 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 metal-floor-3-icon-small rotate: false - xy: 1391, 394 + xy: 1575, 581 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 metal-floor-5-icon-large rotate: false - xy: 861, 625 + xy: 791, 635 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 metal-floor-5-icon-small rotate: false - xy: 1417, 420 + xy: 1601, 591 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 metal-floor-damaged-icon-large rotate: false - xy: 811, 575 + xy: 791, 585 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 metal-floor-damaged-icon-small rotate: false - xy: 1365, 345 + xy: 1497, 477 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 metal-floor-icon-large rotate: false - xy: 911, 625 + xy: 791, 535 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 metal-floor-icon-small rotate: false - xy: 1391, 368 + xy: 1523, 503 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 moss-icon-large rotate: false - xy: 861, 575 + xy: 791, 485 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 moss-icon-small rotate: false - xy: 1417, 394 + xy: 1549, 529 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 multi-press-icon-large rotate: false - xy: 961, 625 + xy: 791, 435 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 multi-press-icon-medium rotate: false - xy: 1331, 73 + xy: 1229, 332 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 multi-press-icon-small rotate: false - xy: 1365, 319 + xy: 1575, 555 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 oil-extractor-icon-full rotate: false - xy: 391, 616 + xy: 1297, 1349 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 oil-extractor-icon-large rotate: false - xy: 911, 575 + xy: 791, 385 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 oil-extractor-icon-medium rotate: false - xy: 1331, 39 + xy: 1229, 298 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 oil-extractor-icon-small rotate: false - xy: 1391, 342 + xy: 1601, 565 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 omega-mech-pad-icon-large rotate: false - xy: 1011, 625 + xy: 791, 335 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 omega-mech-pad-icon-medium rotate: false - xy: 1331, 5 + xy: 1263, 398 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 omega-mech-pad-icon-small rotate: false - xy: 1417, 368 + xy: 1497, 451 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-coal-icon-full rotate: false - xy: 1421, 1080 + xy: 1263, 364 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-icon-medium rotate: false - xy: 1421, 1080 + xy: 1263, 364 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-icon-large rotate: false - xy: 961, 575 + xy: 849, 923 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 ore-coal-icon-small rotate: false - xy: 1365, 293 + xy: 1523, 477 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-copper-icon-full rotate: false - xy: 1455, 1075 + xy: 1263, 330 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-icon-medium rotate: false - xy: 1455, 1075 + xy: 1263, 330 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-icon-large rotate: false - xy: 1061, 625 + xy: 899, 923 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 ore-copper-icon-small rotate: false - xy: 1391, 316 + xy: 1549, 503 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-lead-icon-full rotate: false - xy: 1489, 1075 + xy: 1263, 296 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-icon-medium rotate: false - xy: 1489, 1075 + xy: 1263, 296 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-icon-large rotate: false - xy: 1011, 575 + xy: 949, 923 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 ore-lead-icon-small rotate: false - xy: 1417, 342 + xy: 1575, 529 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-scrap-icon-full rotate: false - xy: 1523, 1075 + xy: 1301, 418 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-icon-medium rotate: false - xy: 1523, 1075 + xy: 1301, 418 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-icon-large rotate: false - xy: 1111, 625 + xy: 999, 923 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 ore-scrap-icon-small rotate: false - xy: 1365, 267 + xy: 1601, 539 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-thorium-icon-full rotate: false - xy: 1557, 1075 + xy: 1335, 418 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-icon-medium rotate: false - xy: 1557, 1075 + xy: 1335, 418 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-icon-large rotate: false - xy: 1061, 575 + xy: 1049, 923 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 ore-thorium-icon-small rotate: false - xy: 1391, 290 + xy: 1497, 425 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-titanium-icon-full rotate: false - xy: 1591, 1075 + xy: 1369, 418 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-icon-medium rotate: false - xy: 1591, 1075 + xy: 1369, 418 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-icon-large rotate: false - xy: 1161, 625 + xy: 1099, 923 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 ore-titanium-icon-small rotate: false - xy: 1417, 316 + xy: 1523, 451 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 overdrive-projector-icon-large rotate: false - xy: 1111, 575 + xy: 1149, 923 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 overdrive-projector-icon-medium rotate: false - xy: 1625, 1075 + xy: 1297, 384 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 overdrive-projector-icon-small rotate: false - xy: 1365, 241 + xy: 1549, 477 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 overflow-gate-icon-large rotate: false - xy: 1211, 625 + xy: 841, 873 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 overflow-gate-icon-small rotate: false - xy: 1391, 264 + xy: 1575, 503 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 pebbles-icon-large rotate: false - xy: 1161, 575 + xy: 841, 823 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 pebbles-icon-small rotate: false - xy: 1417, 290 + xy: 1601, 513 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 phantom-factory-icon-full rotate: false - xy: 849, 1005 + xy: 1056, 1073 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 phantom-factory-icon-large rotate: false - xy: 1211, 575 + xy: 891, 873 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 phantom-factory-icon-medium rotate: false - xy: 1693, 1075 + xy: 1331, 384 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phantom-factory-icon-small rotate: false - xy: 1365, 215 + xy: 1497, 399 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 phase-conduit-icon-large rotate: false - xy: 1261, 591 + xy: 841, 773 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 phase-conduit-icon-small rotate: false - xy: 1391, 238 + xy: 1523, 425 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 phase-conveyor-icon-large rotate: false - xy: 811, 525 + xy: 891, 823 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 phase-conveyor-icon-small rotate: false - xy: 1417, 264 + xy: 1549, 451 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 phase-wall-icon-large rotate: false - xy: 861, 525 + xy: 941, 873 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 phase-wall-icon-small rotate: false - xy: 1365, 189 + xy: 1575, 477 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 phase-wall-large-icon-large rotate: false - xy: 911, 525 + xy: 841, 723 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 phase-wall-large-icon-medium rotate: false - xy: 1523, 1041 + xy: 1297, 282 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-wall-large-icon-small rotate: false - xy: 1391, 212 + xy: 1601, 487 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 phase-weaver-icon-full rotate: false - xy: 915, 939 + xy: 1386, 1037 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 phase-weaver-icon-large rotate: false - xy: 961, 525 + xy: 891, 773 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 phase-weaver-icon-medium rotate: false - xy: 1557, 1041 + xy: 1331, 282 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-weaver-icon-small rotate: false - xy: 1417, 238 + xy: 1523, 399 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 pine-icon-medium rotate: false - xy: 1591, 1041 + xy: 1365, 282 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pine-icon-small rotate: false - xy: 1365, 163 + xy: 1549, 425 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 plastanium-compressor-icon-large rotate: false - xy: 1011, 525 + xy: 941, 823 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 plastanium-compressor-icon-medium rotate: false - xy: 1625, 1041 + xy: 1399, 289 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plastanium-compressor-icon-small rotate: false - xy: 1391, 186 + xy: 1575, 451 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 pneumatic-drill-icon-full rotate: false - xy: 759, 835 + xy: 1518, 995 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 pneumatic-drill-icon-large rotate: false - xy: 1061, 525 + xy: 991, 873 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 pneumatic-drill-icon-medium rotate: false - xy: 1659, 1041 + xy: 1229, 264 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pneumatic-drill-icon-small rotate: false - xy: 1417, 212 + xy: 1601, 461 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 power-node-icon-large rotate: false - xy: 1111, 525 + xy: 841, 673 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 power-node-icon-small rotate: false - xy: 1365, 137 + xy: 1549, 399 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 power-node-large-icon-large rotate: false - xy: 1161, 525 + xy: 891, 723 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 power-node-large-icon-medium rotate: false - xy: 1727, 1041 + xy: 1297, 248 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 power-node-large-icon-small rotate: false - xy: 1391, 160 + xy: 1575, 425 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 power-source-icon-large rotate: false - xy: 1211, 525 + xy: 941, 773 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 power-source-icon-small rotate: false - xy: 1417, 186 + xy: 1601, 435 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 power-void-icon-large rotate: false - xy: 1261, 541 + xy: 991, 823 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 power-void-icon-small rotate: false - xy: 1365, 111 + xy: 1575, 399 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 pulse-conduit-icon-full rotate: false - xy: 1829, 1041 + xy: 1399, 255 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-icon-large rotate: false - xy: 802, 475 + xy: 1041, 873 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 pulse-conduit-icon-small rotate: false - xy: 1391, 134 + xy: 1601, 409 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 pulverizer-icon-full rotate: false - xy: 1447, 973 + xy: 533, 337 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulverizer-icon-large rotate: false - xy: 852, 475 + xy: 841, 623 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 pulverizer-icon-small rotate: false - xy: 1417, 160 + xy: 930, 221 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 pyratite-mixer-icon-large rotate: false - xy: 902, 475 + xy: 891, 673 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 pyratite-mixer-icon-medium rotate: false - xy: 1481, 973 + xy: 533, 269 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pyratite-mixer-icon-small rotate: false - xy: 1365, 85 + xy: 930, 195 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 repair-point rotate: false - xy: 1447, 939 + xy: 533, 235 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 repair-point-icon-full rotate: false - xy: 1515, 973 + xy: 533, 167 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 repair-point-icon-large rotate: false - xy: 1002, 475 + xy: 991, 773 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 repair-point-icon-small rotate: false - xy: 1391, 108 + xy: 956, 221 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -5228,1183 +5144,1183 @@ revenant-factory-icon-full index: -1 revenant-factory-icon-large rotate: false - xy: 1052, 475 + xy: 1041, 823 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 revenant-factory-icon-medium rotate: false - xy: 1481, 939 + xy: 533, 133 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 revenant-factory-icon-small rotate: false - xy: 1417, 134 + xy: 956, 195 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ripple rotate: false - xy: 391, 28 + xy: 1591, 1365 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 ripple-icon-full rotate: false - xy: 611, 1137 + xy: 1689, 1365 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 ripple-icon-large rotate: false - xy: 1152, 475 + xy: 841, 573 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 ripple-icon-medium rotate: false - xy: 1583, 1007 + xy: 533, 99 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ripple-icon-small rotate: false - xy: 1365, 59 + xy: 930, 169 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 rock-icon-medium rotate: false - xy: 1549, 973 + xy: 533, 65 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 rock-icon-small rotate: false - xy: 1391, 82 + xy: 982, 221 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 rocks-icon-large rotate: false - xy: 1202, 475 + xy: 891, 623 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 rocks-icon-small rotate: false - xy: 1417, 108 + xy: 982, 195 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 rotary-pump-icon-large rotate: false - xy: 821, 425 + xy: 941, 673 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 rotary-pump-icon-medium rotate: false - xy: 1515, 939 + xy: 533, 31 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 rotary-pump-icon-small rotate: false - xy: 1365, 33 + xy: 930, 143 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 router-icon-large rotate: false - xy: 821, 375 + xy: 991, 723 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 router-icon-small rotate: false - xy: 1391, 56 + xy: 956, 169 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 rtg-generator-icon-large rotate: false - xy: 871, 425 + xy: 1041, 773 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 rtg-generator-icon-medium rotate: false - xy: 1583, 973 + xy: 601, 337 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 rtg-generator-icon-small rotate: false - xy: 1417, 82 + xy: 1008, 221 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 salt-icon-large rotate: false - xy: 821, 325 + xy: 1091, 823 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 salt-icon-small rotate: false - xy: 1365, 7 + xy: 1008, 195 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 saltrocks-icon-large rotate: false - xy: 871, 375 + xy: 1141, 873 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 saltrocks-icon-small rotate: false - xy: 1391, 30 + xy: 956, 143 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 salvo rotate: false - xy: 1089, 807 + xy: 1914, 925 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 salvo-icon-full rotate: false - xy: 891, 741 + xy: 1980, 925 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 salvo-icon-large rotate: false - xy: 921, 425 + xy: 841, 523 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 salvo-icon-medium rotate: false - xy: 1651, 1007 + xy: 567, 269 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 salvo-icon-small rotate: false - xy: 1417, 56 + xy: 982, 169 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 sand-icon-large rotate: false - xy: 821, 275 + xy: 891, 573 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 sand-icon-small rotate: false - xy: 1417, 30 + xy: 1034, 221 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 sand-water-icon-large rotate: false - xy: 871, 325 + xy: 941, 623 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 sand-water-icon-small rotate: false - xy: 1391, 4 + xy: 1034, 195 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 sandrocks-icon-large rotate: false - xy: 921, 375 + xy: 991, 673 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 sandrocks-icon-small rotate: false - xy: 1417, 4 + xy: 982, 143 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 scatter rotate: false - xy: 1089, 741 + xy: 293, 1072 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 scatter-icon-full rotate: false - xy: 751, 703 + xy: 293, 1006 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 scatter-icon-large rotate: false - xy: 971, 425 + xy: 1041, 723 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 scatter-icon-medium rotate: false - xy: 1617, 973 + xy: 601, 303 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scatter-icon-small rotate: false - xy: 1443, 472 + xy: 1008, 169 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 scorch rotate: false - xy: 1583, 939 + xy: 567, 235 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scorch-icon-full rotate: false - xy: 1651, 973 + xy: 567, 201 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scorch-icon-large rotate: false - xy: 821, 225 + xy: 1091, 773 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 scorch-icon-small rotate: false - xy: 1443, 446 + xy: 1060, 221 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 scrap-wall-gigantic-icon-large rotate: false - xy: 871, 275 + xy: 1141, 823 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 scrap-wall-gigantic-icon-medium rotate: false - xy: 1753, 1007 + xy: 601, 167 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap-wall-gigantic-icon-small rotate: false - xy: 1443, 420 + xy: 1060, 195 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 scrap-wall-huge-icon-large rotate: false - xy: 921, 325 + xy: 841, 473 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 scrap-wall-huge-icon-medium rotate: false - xy: 1719, 973 + xy: 567, 99 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap-wall-huge-icon-small rotate: false - xy: 1443, 394 + xy: 1008, 143 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 scrap-wall-icon-large rotate: false - xy: 971, 375 + xy: 891, 523 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 scrap-wall-icon-small rotate: false - xy: 1443, 368 + xy: 1034, 169 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 scrap-wall-large-icon-large rotate: false - xy: 1021, 425 + xy: 941, 573 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 scrap-wall-large-icon-medium rotate: false - xy: 1685, 939 + xy: 601, 133 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap-wall-large-icon-small rotate: false - xy: 1443, 342 + xy: 1086, 221 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 separator-icon-large rotate: false - xy: 821, 175 + xy: 991, 623 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 separator-icon-medium rotate: false - xy: 1753, 973 + xy: 601, 99 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 separator-icon-small rotate: false - xy: 1443, 237 + xy: 1086, 195 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 shale-boulder-icon-large rotate: false - xy: 871, 225 + xy: 1041, 673 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 shale-boulder-icon-small rotate: false - xy: 1443, 211 + xy: 1034, 143 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 shale-icon-large rotate: false - xy: 921, 275 + xy: 1091, 723 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 shale-icon-small rotate: false - xy: 1443, 185 + xy: 1060, 169 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 shalerocks-icon-large rotate: false - xy: 971, 325 + xy: 1141, 773 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 shalerocks-icon-small rotate: false - xy: 1443, 159 + xy: 1112, 221 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 shock-mine-icon-large rotate: false - xy: 1021, 375 + xy: 841, 423 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 shock-mine-icon-small rotate: false - xy: 1443, 133 + xy: 1627, 801 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 shrubs-icon-large rotate: false - xy: 821, 125 + xy: 941, 523 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 shrubs-icon-small rotate: false - xy: 1443, 107 + xy: 1679, 843 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 silicon-smelter-icon-large rotate: false - xy: 871, 175 + xy: 991, 573 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 silicon-smelter-icon-medium rotate: false - xy: 1787, 973 + xy: 601, 31 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 silicon-smelter-icon-small rotate: false - xy: 1443, 81 + xy: 1653, 806 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 snow-icon-large rotate: false - xy: 921, 225 + xy: 1041, 623 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 snow-icon-small rotate: false - xy: 1443, 55 + xy: 1112, 195 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 snowrock-icon-medium rotate: false - xy: 1855, 1007 + xy: 635, 321 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 snowrock-icon-small rotate: false - xy: 1443, 29 + xy: 1060, 143 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 snowrocks-icon-large rotate: false - xy: 971, 275 + xy: 1091, 673 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 snowrocks-icon-small rotate: false - xy: 1443, 3 + xy: 1086, 169 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 solar-panel-icon-large rotate: false - xy: 1021, 325 + xy: 1141, 723 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 solar-panel-icon-small rotate: false - xy: 1990, 1077 + xy: 1138, 221 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 solar-panel-large-icon-large rotate: false - xy: 1071, 375 + xy: 841, 373 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 solar-panel-large-icon-medium rotate: false - xy: 1787, 939 + xy: 635, 253 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 solar-panel-large-icon-small rotate: false - xy: 2016, 1077 + xy: 1627, 775 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 sorter-icon-large rotate: false - xy: 1121, 425 + xy: 891, 423 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 sorter-icon-small rotate: false - xy: 1967, 886 + xy: 1705, 843 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 spawn-icon-large rotate: false - xy: 821, 75 + xy: 941, 473 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 spawn-icon-small rotate: false - xy: 1171, 7 + xy: 1679, 817 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 spectre rotate: false - xy: 875, 1533 + xy: 1915, 1659 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 spectre-icon-full rotate: false - xy: 1005, 1533 + xy: 875, 1533 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 spectre-icon-large rotate: false - xy: 871, 125 + xy: 991, 523 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 spectre-icon-medium rotate: false - xy: 1889, 973 + xy: 635, 185 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 spectre-icon-small rotate: false - xy: 1979, 860 + xy: 1653, 780 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 spirit-factory-icon-full rotate: false - xy: 1179, 1005 + xy: 293, 742 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 spirit-factory-icon-large rotate: false - xy: 971, 225 + xy: 1091, 623 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 spirit-factory-icon-medium rotate: false - xy: 1855, 939 + xy: 635, 151 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 spirit-factory-icon-small rotate: false - xy: 1979, 834 + xy: 1138, 195 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 spore-cluster-icon-large rotate: false - xy: 1021, 275 + xy: 1141, 673 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 spore-cluster-icon-medium rotate: false - xy: 1889, 939 + xy: 635, 117 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 spore-cluster-icon-small rotate: false - xy: 1979, 808 + xy: 1086, 143 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 spore-moss-icon-large rotate: false - xy: 1071, 325 + xy: 891, 373 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 spore-moss-icon-small rotate: false - xy: 1979, 782 + xy: 1112, 169 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 spore-pine-icon-medium rotate: false - xy: 1447, 905 + xy: 635, 83 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 spore-pine-icon-small rotate: false - xy: 1987, 1051 + xy: 1627, 749 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 spore-press-icon-full rotate: false - xy: 1221, 741 + xy: 293, 544 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 spore-press-icon-large rotate: false - xy: 1121, 375 + xy: 941, 423 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 spore-press-icon-medium rotate: false - xy: 1481, 905 + xy: 635, 49 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 spore-press-icon-small rotate: false - xy: 2013, 1051 + xy: 1731, 843 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 sporerocks-icon-large rotate: false - xy: 1171, 425 + xy: 991, 473 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 sporerocks-icon-small rotate: false - xy: 1983, 1025 + xy: 1679, 791 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 stone-icon-large rotate: false - xy: 821, 25 + xy: 1041, 523 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 stone-icon-small rotate: false - xy: 1983, 999 + xy: 1705, 817 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 surge-tower-icon-large rotate: false - xy: 871, 75 + xy: 1091, 573 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 surge-tower-icon-medium rotate: false - xy: 1515, 905 + xy: 635, 15 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 surge-tower-icon-small rotate: false - xy: 2009, 1025 + xy: 1653, 754 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 surge-wall-icon-large rotate: false - xy: 921, 125 + xy: 1141, 623 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 surge-wall-icon-small rotate: false - xy: 1983, 973 + xy: 1112, 143 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 surge-wall-large-icon-large rotate: false - xy: 971, 175 + xy: 941, 373 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 surge-wall-large-icon-medium rotate: false - xy: 1583, 905 + xy: 669, 261 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 surge-wall-large-icon-small rotate: false - xy: 2009, 999 + xy: 1138, 169 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 swarmer rotate: false - xy: 1461, 1479 + xy: 359, 478 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 swarmer-icon-full rotate: false - xy: 1527, 1495 + xy: 293, 346 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 swarmer-icon-large rotate: false - xy: 1071, 275 + xy: 1041, 473 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 swarmer-icon-medium rotate: false - xy: 1617, 905 + xy: 703, 295 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 swarmer-icon-small rotate: false - xy: 1983, 947 + xy: 1627, 723 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 tainted-water-icon-large rotate: false - xy: 1121, 325 + xy: 1091, 523 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 tainted-water-icon-small rotate: false - xy: 2009, 973 + xy: 1757, 843 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 tar-icon-large rotate: false - xy: 1171, 375 + xy: 1141, 573 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 tar-icon-small rotate: false - xy: 1983, 921 + xy: 1679, 765 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 tau-mech-pad-icon-large rotate: false - xy: 971, 125 + xy: 1091, 473 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 tau-mech-pad-icon-medium rotate: false - xy: 1651, 905 + xy: 669, 227 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 tau-mech-pad-icon-small rotate: false - xy: 2009, 947 + xy: 1705, 791 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 tendrils-icon-large rotate: false - xy: 1021, 175 + xy: 1141, 523 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 tendrils-icon-small rotate: false - xy: 2009, 921 + xy: 1731, 817 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 thermal-generator-icon-large rotate: false - xy: 1071, 225 + xy: 1041, 373 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 thermal-generator-icon-medium rotate: false - xy: 1685, 905 + xy: 703, 261 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 thermal-generator-icon-small rotate: false - xy: 1993, 895 + xy: 1653, 728 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 thermal-pump-icon-large rotate: false - xy: 1121, 275 + xy: 1091, 423 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 thermal-pump-icon-medium rotate: false - xy: 1719, 905 + xy: 737, 295 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 thermal-pump-icon-small rotate: false - xy: 2019, 895 + xy: 1138, 143 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 thorium-reactor-icon-large rotate: false - xy: 1171, 325 + xy: 1141, 473 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 thorium-reactor-icon-medium rotate: false - xy: 1753, 905 + xy: 669, 193 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 thorium-reactor-icon-small rotate: false - xy: 2005, 869 + xy: 1627, 697 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 thorium-wall-icon-large rotate: false - xy: 921, 25 + xy: 1091, 373 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 thorium-wall-icon-small rotate: false - xy: 2005, 843 + xy: 1783, 843 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 thorium-wall-large-icon-large rotate: false - xy: 971, 75 + xy: 1141, 423 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 thorium-wall-large-icon-medium rotate: false - xy: 1821, 905 + xy: 737, 261 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 thorium-wall-large-icon-small rotate: false - xy: 2005, 817 + xy: 1679, 739 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 thruster-icon-large rotate: false - xy: 1021, 125 + xy: 1141, 373 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 thruster-icon-medium rotate: false - xy: 1855, 905 + xy: 669, 159 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 thruster-icon-small rotate: false - xy: 2005, 791 + xy: 1705, 765 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 titan-factory-icon-full rotate: false - xy: 489, 647 + xy: 1297, 1251 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 titan-factory-icon-large rotate: false - xy: 1071, 175 + xy: 841, 323 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 titan-factory-icon-medium rotate: false - xy: 1889, 905 + xy: 703, 193 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titan-factory-icon-small rotate: false - xy: 2005, 765 + xy: 1731, 791 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 titanium-conveyor-icon-large rotate: false - xy: 1121, 225 + xy: 891, 323 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 titanium-conveyor-icon-small rotate: false - xy: 369, 2 + xy: 1757, 817 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 titanium-wall-icon-large rotate: false - xy: 1171, 275 + xy: 941, 323 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 titanium-wall-icon-small rotate: false - xy: 395, 2 + xy: 1653, 702 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 titanium-wall-large-icon-large rotate: false - xy: 971, 25 + xy: 991, 323 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 titanium-wall-large-icon-medium rotate: false - xy: 1489, 769 + xy: 771, 149 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-wall-large-icon-small rotate: false - xy: 421, 2 + xy: 1627, 671 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 trident-ship-pad-icon-large rotate: false - xy: 1021, 75 + xy: 1041, 323 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 trident-ship-pad-icon-medium rotate: false - xy: 1591, 837 + xy: 771, 115 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 trident-ship-pad-icon-small rotate: false - xy: 447, 2 + xy: 1809, 843 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 turbine-generator-icon-large rotate: false - xy: 1071, 125 + xy: 1091, 323 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 turbine-generator-icon-medium rotate: false - xy: 1557, 803 + xy: 805, 149 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 turbine-generator-icon-small rotate: false - xy: 1459, 506 + xy: 1679, 713 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 unit-icon-chaos-array rotate: false - xy: 1265, 1529 + xy: 1135, 1533 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 unit-icon-crawler rotate: false - xy: 1121, 175 + xy: 1141, 323 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 unit-icon-dagger rotate: false - xy: 1171, 225 + xy: 791, 285 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -6418,483 +6334,483 @@ unit-icon-eradicator index: -1 unit-icon-eruptor rotate: false - xy: 1725, 1429 + xy: 359, 82 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 unit-icon-fortress rotate: false - xy: 1791, 1429 + xy: 293, 16 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 unit-icon-titan rotate: false - xy: 1857, 1429 + xy: 359, 16 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 unloader-icon-large rotate: false - xy: 1021, 25 + xy: 841, 273 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 unloader-icon-small rotate: false - xy: 1469, 480 + xy: 1705, 739 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 vault-icon-large rotate: false - xy: 1071, 75 + xy: 891, 273 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 vault-icon-medium rotate: false - xy: 1659, 871 + xy: 805, 115 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 vault-icon-small rotate: false - xy: 1469, 454 + xy: 1731, 765 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 water-extractor-icon-full rotate: false - xy: 629, 529 + xy: 425, 1006 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 water-extractor-icon-large rotate: false - xy: 1121, 125 + xy: 941, 273 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 water-extractor-icon-medium rotate: false - xy: 1625, 837 + xy: 771, 47 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 water-extractor-icon-small rotate: false - xy: 1469, 428 + xy: 1757, 791 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 water-icon-large rotate: false - xy: 1171, 175 + xy: 991, 273 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 water-icon-small rotate: false - xy: 1469, 402 + xy: 1783, 817 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 wave rotate: false - xy: 555, 383 + xy: 425, 742 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 wave-icon-full rotate: false - xy: 555, 317 + xy: 425, 676 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 wave-icon-large rotate: false - xy: 1071, 25 + xy: 1041, 273 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 wave-icon-medium rotate: false - xy: 1591, 803 + xy: 805, 81 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 wave-icon-small rotate: false - xy: 1469, 376 + xy: 1653, 676 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 white-tree-dead-icon-large rotate: false - xy: 1121, 75 + xy: 1091, 273 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 white-tree-dead-icon-medium rotate: false - xy: 1557, 769 + xy: 805, 47 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 white-tree-dead-icon-small rotate: false - xy: 1469, 350 + xy: 1627, 645 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 white-tree-icon-large rotate: false - xy: 1171, 125 + xy: 1141, 273 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 white-tree-icon-medium rotate: false - xy: 1693, 871 + xy: 839, 239 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 white-tree-icon-small rotate: false - xy: 1469, 324 + xy: 1835, 843 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 wraith-factory-icon-full rotate: false - xy: 555, 185 + xy: 425, 544 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 wraith-factory-icon-large rotate: false - xy: 1171, 75 + xy: 1199, 923 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 wraith-factory-icon-medium rotate: false - xy: 1659, 837 + xy: 873, 239 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 wraith-factory-icon-small rotate: false - xy: 1469, 298 + xy: 1679, 687 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-biomatter rotate: false - xy: 1761, 1109 + xy: 1403, 867 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-blast-compound rotate: false - xy: 1795, 1109 + xy: 1403, 833 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-coal rotate: false - xy: 1829, 1109 + xy: 1403, 799 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-copper rotate: false - xy: 1863, 1109 + xy: 1403, 765 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-graphite rotate: false - xy: 1897, 1109 + xy: 1403, 731 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-lead rotate: false - xy: 2014, 1819 + xy: 1403, 697 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-metaglass rotate: false - xy: 1303, 481 + xy: 1403, 663 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-phase-fabric rotate: false - xy: 1297, 447 + xy: 1403, 629 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-plastanium rotate: false - xy: 1297, 413 + xy: 1403, 595 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-pyratite rotate: false - xy: 1297, 379 + xy: 1403, 561 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-sand rotate: false - xy: 1297, 345 + xy: 1403, 527 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-scrap rotate: false - xy: 1297, 311 + xy: 1403, 493 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-silicon rotate: false - xy: 1297, 277 + xy: 1403, 459 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-spore-pod rotate: false - xy: 1297, 209 + xy: 1437, 844 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-surge-alloy rotate: false - xy: 1297, 175 + xy: 1437, 810 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-thorium rotate: false - xy: 1297, 141 + xy: 1437, 776 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-titanium rotate: false - xy: 1297, 107 + xy: 1437, 742 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-cryofluid rotate: false - xy: 1395, 566 + xy: 1437, 436 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-oil rotate: false - xy: 1429, 600 + xy: 1437, 402 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-slag rotate: false - xy: 1425, 498 + xy: 1771, 869 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-water rotate: false - xy: 1331, 379 + xy: 1873, 869 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 alpha-mech rotate: false - xy: 1999, 1559 + xy: 549, 971 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 alpha-mech-base rotate: false - xy: 1319, 1363 + xy: 607, 1029 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 alpha-mech-leg rotate: false - xy: 1261, 1251 + xy: 723, 1087 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 delta-mech rotate: false - xy: 1245, 993 + xy: 591, 621 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 delta-mech-base rotate: false - xy: 1245, 943 + xy: 591, 571 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 delta-mech-leg rotate: false - xy: 1245, 893 + xy: 591, 521 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 omega-mech rotate: false - xy: 1203, 1163 + xy: 491, 1079 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 omega-mech-armor rotate: false - xy: 1005, 1071 + xy: 858, 1073 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 omega-mech-base rotate: false - xy: 1203, 1105 + xy: 549, 1079 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 omega-mech-leg rotate: false - xy: 1261, 1471 + xy: 491, 1021 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 tau-mech rotate: false - xy: 1261, 1355 + xy: 549, 1021 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 tau-mech-base rotate: false - xy: 871, 25 + xy: 991, 373 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 tau-mech-leg rotate: false - xy: 921, 75 + xy: 1041, 423 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 dart-ship rotate: false - xy: 1977, 1359 + xy: 591, 721 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 glaive-ship rotate: false - xy: 1956, 1795 + xy: 434, 1146 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 javelin-ship rotate: false - xy: 1819, 1329 + xy: 749, 979 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 javelin-ship-shield rotate: false - xy: 1919, 1329 + xy: 741, 879 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 trident-ship rotate: false - xy: 1319, 1413 + xy: 665, 1079 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 blank rotate: false - xy: 1379, 1083 + xy: 1449, 1034 size: 1, 1 orig: 1, 1 offset: 0, 0 @@ -6908,21 +6824,21 @@ circle index: -1 clear rotate: false - xy: 1987, 1091 + xy: 1164, 244 size: 1, 1 orig: 1, 1 offset: 0, 0 index: -1 shape-3 rotate: false - xy: 629, 464 + xy: 425, 413 size: 63, 63 orig: 63, 63 offset: 0, 0 index: -1 bar rotate: false - xy: 1756, 867 + xy: 800, 9 size: 27, 36 split: 9, 9, 9, 9 orig: 27, 36 @@ -6930,7 +6846,7 @@ bar index: -1 bar-top rotate: false - xy: 1727, 867 + xy: 771, 9 size: 27, 36 split: 9, 10, 9, 10 orig: 27, 36 @@ -6938,7 +6854,7 @@ bar-top index: -1 button rotate: false - xy: 1353, 501 + xy: 1191, 316 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -6946,7 +6862,7 @@ button index: -1 button-disabled rotate: false - xy: 293, 1 + xy: 786, 1764 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -6954,7 +6870,7 @@ button-disabled index: -1 button-down rotate: false - xy: 331, 1 + xy: 2010, 2020 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -6962,7 +6878,7 @@ button-down index: -1 button-edge-1 rotate: false - xy: 786, 1764 + xy: 1191, 432 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -6970,7 +6886,7 @@ button-edge-1 index: -1 button-edge-2 rotate: false - xy: 2010, 2020 + xy: 824, 1764 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -6978,7 +6894,7 @@ button-edge-2 index: -1 button-edge-3 rotate: false - xy: 1203, 1076 + xy: 2010, 1991 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -6986,7 +6902,7 @@ button-edge-3 index: -1 button-edge-4 rotate: false - xy: 1353, 530 + xy: 1191, 403 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -6994,7 +6910,7 @@ button-edge-4 index: -1 button-over rotate: false - xy: 824, 1764 + xy: 2010, 1962 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -7002,7 +6918,7 @@ button-over index: -1 button-right rotate: false - xy: 2010, 1933 + xy: 1191, 345 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -7010,7 +6926,7 @@ button-right index: -1 button-right-down rotate: false - xy: 2010, 1991 + xy: 1191, 374 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -7018,7 +6934,7 @@ button-right-down index: -1 button-right-over rotate: false - xy: 2010, 1962 + xy: 2010, 1933 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -7026,7 +6942,7 @@ button-right-over index: -1 button-select rotate: false - xy: 1785, 879 + xy: 559, 5 size: 24, 24 split: 4, 4, 4, 4 orig: 24, 24 @@ -7034,56 +6950,56 @@ button-select index: -1 check-disabled rotate: false - xy: 1493, 1211 + xy: 1267, 772 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 check-off rotate: false - xy: 1527, 1211 + xy: 1267, 738 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 check-on rotate: false - xy: 1561, 1211 + xy: 1267, 704 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 check-on-disabled rotate: false - xy: 1595, 1211 + xy: 1267, 670 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 check-on-over rotate: false - xy: 1629, 1211 + xy: 1267, 636 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 check-over rotate: false - xy: 1663, 1211 + xy: 1267, 602 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 clear rotate: false - xy: 1785, 867 + xy: 1265, 1533 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 content-background rotate: false - xy: 1311, 1226 + xy: 1325, 1024 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -7091,7 +7007,7 @@ content-background index: -1 content-background-locked rotate: false - xy: 1213, 26 + xy: 1191, 287 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -7099,7 +7015,7 @@ content-background-locked index: -1 content-background-noitems rotate: false - xy: 1315, 1284 + xy: 1249, 1024 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -7107,7 +7023,7 @@ content-background-noitems index: -1 content-background-over rotate: false - xy: 1311, 1255 + xy: 1287, 1024 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -7129,448 +7045,448 @@ discord-banner index: -1 empty-sector rotate: false - xy: 1829, 1143 + xy: 1369, 860 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 icon-crafting rotate: false - xy: 2031, 823 + xy: 771, 311 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-defense rotate: false - xy: 2031, 805 + xy: 611, 13 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-distribution rotate: false - xy: 2031, 769 + xy: 1471, 374 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-effect rotate: false - xy: 2031, 751 + xy: 1705, 721 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-liquid rotate: false - xy: 533, 27 + xy: 1470, 1151 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-power rotate: false - xy: 783, 1101 + xy: 562, 1889 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-production rotate: false - xy: 759, 905 + xy: 1627, 591 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-turret rotate: false - xy: 2029, 1203 + xy: 1627, 501 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-units rotate: false - xy: 1469, 244 + xy: 1627, 465 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-upgrade rotate: false - xy: 1501, 673 + xy: 1627, 429 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 controller-cursor rotate: false - xy: 661, 727 + xy: 1452, 1151 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-about rotate: false - xy: 1509, 1545 + xy: 1379, 1545 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-add rotate: false - xy: 605, 37 + xy: 1967, 1569 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-admin rotate: false - xy: 1353, 1297 + xy: 467, 27 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-admin-small rotate: false - xy: 751, 785 + xy: 1653, 1193 size: 6, 6 orig: 6, 6 offset: 0, 0 index: -1 icon-areaDelete rotate: false - xy: 1, 1 + xy: 1567, 1208 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-arrow rotate: false - xy: 1377, 1511 + xy: 1518, 1128 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-arrow-16 rotate: false - xy: 1377, 1511 + xy: 1518, 1128 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-arrow-down rotate: false - xy: 1977, 1417 + xy: 1963, 1189 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-arrow-left rotate: false - xy: 1251, 43 + xy: 1914, 1057 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-arrow-right rotate: false - xy: 2010, 1921 + xy: 1, 1 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-arrow-up rotate: false - xy: 2029, 1155 + xy: 305, 1431 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-back rotate: false - xy: 1261, 657 + xy: 526, 1889 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-ban rotate: false - xy: 1379, 652 + xy: 1650, 1069 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-break rotate: false - xy: 1377, 1493 + xy: 2010, 1793 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-cancel rotate: false - xy: 2031, 877 + xy: 1431, 1019 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-cancel-2 rotate: false - xy: 1643, 771 + xy: 1575, 815 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 icon-chat rotate: false - xy: 1591, 679 + xy: 857, 45 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-check rotate: false - xy: 2031, 859 + xy: 1499, 996 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-check-2 rotate: false - xy: 1669, 771 + xy: 1601, 841 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 icon-copy rotate: false - xy: 2031, 841 + xy: 669, 337 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-cursor rotate: false - xy: 1353, 489 + xy: 1277, 1533 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-database rotate: false - xy: 473, 12 + xy: 823, 1085 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-database-small rotate: false - xy: 13, 1 + xy: 1567, 1196 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-dev-builds rotate: false - xy: 1261, 641 + xy: 1363, 1037 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-diagonal rotate: false - xy: 2031, 787 + xy: 1167, 255 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-discord rotate: false - xy: 605, 21 + xy: 467, 11 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-donate rotate: false - xy: 1337, 499 + xy: 1666, 1069 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-dots rotate: false - xy: 1353, 1281 + xy: 839, 1085 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-editor rotate: false - xy: 1363, 900 + xy: 1682, 1069 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-egg rotate: false - xy: 1197, 17 + xy: 669, 7 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-elevation rotate: false - xy: 489, 1186 + xy: 1731, 747 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-eraser rotate: false - xy: 783, 1119 + xy: 1757, 773 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-exit rotate: false - xy: 1197, 1 + xy: 685, 7 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-file rotate: false - xy: 849, 1081 + xy: 1783, 799 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-file-image rotate: false - xy: 759, 923 + xy: 1809, 825 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-file-text rotate: false - xy: 605, 5 + xy: 701, 7 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-fill rotate: false - xy: 825, 883 + xy: 1653, 658 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-floppy rotate: false - xy: 163, 8 + xy: 717, 7 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-floppy-16 rotate: false - xy: 587, 653 + xy: 1627, 627 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-folder rotate: false - xy: 1469, 12 + xy: 733, 7 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-folder-parent rotate: false - xy: 1337, 483 + xy: 749, 7 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-generated rotate: false - xy: 1519, 1329 + xy: 641, 405 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 icon-github rotate: false - xy: 1213, 10 + xy: 1167, 239 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-google-play rotate: false - xy: 179, 8 + xy: 1164, 223 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-grid rotate: false - xy: 1245, 875 + xy: 1861, 851 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-hold rotate: false - xy: 1251, 31 + xy: 1926, 1057 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-holdDelete rotate: false - xy: 25, 1 + xy: 13, 1 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-home rotate: false - xy: 1229, 10 + xy: 1164, 207 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-host rotate: false - xy: 195, 8 + xy: 1164, 191 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-info rotate: false - xy: 211, 8 + xy: 1164, 175 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-itch.io rotate: false - xy: 227, 8 + xy: 1164, 159 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-item rotate: false - xy: 37, 1 + xy: 305, 1419 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -7584,441 +7500,441 @@ icon-items-none index: -1 icon-line rotate: false - xy: 761, 535 + xy: 2029, 1151 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-link rotate: false - xy: 243, 8 + xy: 1164, 143 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-liquid-small rotate: false - xy: 49, 1 + xy: 1938, 1057 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-load rotate: false - xy: 259, 8 + xy: 1723, 723 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-load-image rotate: false - xy: 727, 709 + xy: 1536, 1128 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-load-map rotate: false - xy: 1345, 898 + xy: 544, 1889 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-loading rotate: false - xy: 2029, 1239 + xy: 771, 293 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-locked rotate: false - xy: 1447, 673 + xy: 1705, 703 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-logic rotate: false - xy: 61, 1 + xy: 25, 1 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-map rotate: false - xy: 275, 8 + xy: 1723, 707 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-menu rotate: false - xy: 73, 1 + xy: 305, 1407 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-menu-large rotate: false - xy: 1469, 280 + xy: 1827, 825 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-missing rotate: false - xy: 1241, 1093 + xy: 1950, 1057 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-mission-background rotate: false - xy: 526, 1887 + xy: 2029, 1169 size: 18, 18 orig: 18, 18 offset: 0, 0 index: -1 icon-mission-battle rotate: false - xy: 1251, 19 + xy: 37, 1 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-mission-defense rotate: false - xy: 204, 1385 + xy: 49, 1 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-mission-done rotate: false - xy: 862, 1781 + xy: 61, 1 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-none rotate: false - xy: 302, 1333 + xy: 73, 1 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-paste rotate: false - xy: 546, 1889 + xy: 1627, 609 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-pause rotate: false - xy: 290, 1209 + xy: 611, 1 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-pencil rotate: false - xy: 564, 1889 + xy: 1879, 851 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-pencil-small rotate: false - xy: 721, 5 + xy: 1723, 691 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-pick rotate: false - xy: 489, 1168 + xy: 2029, 1133 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-play rotate: false - xy: 1377, 1481 + xy: 623, 1 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-play-2 rotate: false - xy: 737, 5 + xy: 1749, 749 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-play-custom rotate: false - xy: 753, 5 + xy: 1775, 775 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-players rotate: false - xy: 797, 541 + xy: 857, 33 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-power-requirement rotate: false - xy: 1625, 1109 + xy: 1369, 554 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 icon-power-small rotate: false - xy: 489, 1138 + xy: 498, 1388 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-quit rotate: false - xy: 769, 5 + xy: 1801, 801 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-redo rotate: false - xy: 605, 653 + xy: 2029, 1115 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-refresh rotate: false - xy: 785, 5 + xy: 1863, 835 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rename rotate: false - xy: 801, 5 + xy: 1879, 835 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-resize rotate: false - xy: 1263, 875 + xy: 1627, 573 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-rotate rotate: false - xy: 2027, 1393 + xy: 1863, 819 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rotate-arrow rotate: false - xy: 2027, 1377 + xy: 1879, 819 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rotate-left rotate: false - xy: 2027, 1361 + xy: 1645, 624 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rotate-right rotate: false - xy: 1463, 657 + xy: 1645, 608 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-save rotate: false - xy: 1463, 641 + xy: 1645, 592 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-save-image rotate: false - xy: 779, 535 + xy: 2029, 1097 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-save-map rotate: false - xy: 533, 9 + xy: 1627, 555 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-settings rotate: false - xy: 501, 1138 + xy: 862, 1781 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-spray rotate: false - xy: 2029, 1221 + xy: 2029, 1079 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-terrain rotate: false - xy: 1465, 673 + xy: 1627, 537 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-tools rotate: false - xy: 1479, 657 + xy: 1645, 576 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-touch rotate: false - xy: 1479, 629 + xy: 2010, 1921 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-touchDelete rotate: false - xy: 1511, 645 + xy: 1233, 911 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-trash rotate: false - xy: 1495, 657 + xy: 1645, 560 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-trash-16 rotate: false - xy: 1469, 262 + xy: 2029, 1061 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-tree rotate: false - xy: 489, 1150 + xy: 1627, 519 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-tree-locked rotate: false - xy: 1659, 1109 + xy: 1369, 520 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 icon-trello rotate: false - xy: 1463, 625 + xy: 1645, 544 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-tutorial rotate: false - xy: 1479, 641 + xy: 1645, 528 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-undo rotate: false - xy: 1483, 673 + xy: 1627, 483 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-unlocked rotate: false - xy: 2029, 1185 + xy: 1627, 447 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-unlocks rotate: false - xy: 1495, 641 + xy: 1645, 512 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-wiki rotate: false - xy: 1511, 657 + xy: 1645, 496 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-zone rotate: false - xy: 1797, 827 + xy: 1497, 711 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 icon-zone-locked rotate: false - xy: 489, 1 + xy: 219, 1399 size: 42, 42 orig: 42, 42 offset: 0, 0 index: -1 icon-zoom rotate: false - xy: 1469, 226 + xy: 1627, 411 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-zoom-small rotate: false - xy: 1463, 609 + xy: 1645, 480 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 info-banner rotate: false - xy: 204, 1200 + xy: 1493, 1220 size: 84, 45 orig: 84, 45 offset: 0, 0 index: -1 inventory rotate: false - xy: 1603, 729 + xy: 1601, 799 size: 24, 40 split: 10, 10, 10, 14 orig: 24, 40 @@ -8033,7 +7949,7 @@ logotext index: -1 pane rotate: false - xy: 1349, 1250 + xy: 1287, 966 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -8041,7 +7957,7 @@ pane index: -1 pane-2 rotate: false - xy: 1311, 1121 + xy: 1287, 995 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -8049,7 +7965,7 @@ pane-2 index: -1 scroll rotate: false - xy: 1443, 263 + xy: 1653, 832 size: 24, 35 split: 10, 10, 6, 5 orig: 24, 35 @@ -8057,7 +7973,7 @@ scroll index: -1 scroll-horizontal rotate: false - xy: 1311, 1095 + xy: 807, 1535 size: 35, 24 split: 6, 5, 10, 10 orig: 35, 24 @@ -8073,7 +7989,7 @@ scroll-knob-horizontal-black index: -1 scroll-knob-vertical-black rotate: false - xy: 1443, 300 + xy: 1627, 827 size: 24, 40 split: 10, 10, 6, 10 orig: 24, 40 @@ -8081,56 +7997,56 @@ scroll-knob-vertical-black index: -1 sector-select rotate: false - xy: 1787, 1007 + xy: 567, 65 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 selection rotate: false - xy: 216, 1394 + xy: 510, 1397 size: 1, 1 orig: 1, 1 offset: 0, 0 index: -1 slider rotate: false - xy: 314, 1335 + xy: 1449, 1024 size: 1, 8 orig: 1, 8 offset: 0, 0 index: -1 slider-knob rotate: false - xy: 1625, 797 + xy: 839, 199 size: 29, 38 orig: 29, 38 offset: 0, 0 index: -1 slider-knob-down rotate: false - xy: 1656, 797 + xy: 839, 159 size: 29, 38 orig: 29, 38 offset: 0, 0 index: -1 slider-knob-over rotate: false - xy: 1656, 797 + xy: 839, 159 size: 29, 38 orig: 29, 38 offset: 0, 0 index: -1 slider-vertical rotate: false - xy: 290, 1206 + xy: 1567, 1193 size: 8, 1 orig: 8, 1 offset: 0, 0 index: -1 underline rotate: false - xy: 1349, 1154 + xy: 1325, 928 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -8138,7 +8054,7 @@ underline index: -1 underline-2 rotate: false - xy: 1349, 1183 + xy: 1287, 937 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -8146,7 +8062,7 @@ underline-2 index: -1 underline-disabled rotate: false - xy: 1387, 1212 + xy: 1325, 957 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -8154,7 +8070,7 @@ underline-disabled index: -1 underline-red rotate: false - xy: 1425, 1250 + xy: 1287, 908 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -8162,14 +8078,14 @@ underline-red index: -1 white rotate: false - xy: 1203, 1071 + xy: 1249, 1068 size: 3, 3 orig: 3, 3 offset: 0, 0 index: -1 window-empty rotate: false - xy: 1961, 1094 + xy: 1467, 305 size: 27, 61 split: 8, 8, 44, 11 orig: 27, 61 @@ -8198,42 +8114,42 @@ chaos-array-leg index: -1 crawler rotate: false - xy: 671, 114 + xy: 907, 1023 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 crawler-base rotate: false - xy: 671, 64 + xy: 957, 1023 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 crawler-leg rotate: false - xy: 721, 371 + xy: 1057, 1023 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 dagger rotate: false - xy: 721, 171 + xy: 541, 913 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 dagger-base rotate: false - xy: 721, 121 + xy: 541, 863 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 dagger-leg rotate: false - xy: 1377, 1379 + xy: 541, 763 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -8261,56 +8177,56 @@ eradicator-leg index: -1 eruptor rotate: false - xy: 1137, 1401 + xy: 990, 1139 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 eruptor-base rotate: false - xy: 1005, 1203 + xy: 1056, 1205 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 eruptor-leg rotate: false - xy: 1071, 1269 + xy: 1122, 1271 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 fortress rotate: false - xy: 1137, 1335 + xy: 1056, 1139 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 fortress-base rotate: false - xy: 1071, 1203 + xy: 1122, 1205 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 titan-base rotate: false - xy: 1071, 1203 + xy: 1122, 1205 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 fortress-leg rotate: false - xy: 1137, 1269 + xy: 1188, 1271 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 ghoul rotate: false - xy: 685, 867 + xy: 1967, 1585 size: 72, 72 orig: 72, 72 offset: 0, 0 @@ -8324,14 +8240,14 @@ lich index: -1 phantom rotate: false - xy: 1319, 1471 + xy: 607, 1079 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 power-cell rotate: false - xy: 1261, 1413 + xy: 491, 963 size: 56, 56 orig: 56, 56 offset: 0, 0 @@ -8345,147 +8261,147 @@ reaper index: -1 revenant rotate: false - xy: 1395, 1545 + xy: 1265, 1545 size: 112, 112 orig: 112, 112 offset: 0, 0 index: -1 spirit rotate: false - xy: 921, 175 + xy: 1041, 573 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 titan rotate: false - xy: 1791, 1495 + xy: 293, 214 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 titan-leg rotate: false - xy: 1857, 1495 + xy: 359, 280 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 wraith rotate: false - xy: 1121, 25 + xy: 1199, 973 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 artillery-equip rotate: false - xy: 1261, 1143 + xy: 491, 805 size: 48, 56 orig: 48, 56 offset: 0, 0 index: -1 blaster-equip rotate: false - xy: 621, 264 + xy: 491, 605 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 bomber-equip rotate: false - xy: 621, 214 + xy: 491, 555 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 missiles-equip rotate: false - xy: 621, 214 + xy: 491, 555 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 chain-blaster-equip rotate: false - xy: 621, 64 + xy: 773, 1085 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 chaos-equip rotate: false - xy: 1203, 1395 + xy: 425, 275 size: 56, 136 orig: 56, 136 offset: 0, 0 index: -1 eradication-equip rotate: false - xy: 317, 1206 + xy: 204, 1203 size: 96, 192 orig: 96, 192 offset: 0, 0 index: -1 eruption-equip rotate: false - xy: 671, 6 + xy: 641, 763 size: 48, 56 orig: 48, 56 offset: 0, 0 index: -1 flakgun-equip rotate: false - xy: 721, 21 + xy: 641, 713 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 flamethrower-equip rotate: false - xy: 752, 471 + xy: 641, 655 size: 48, 56 orig: 48, 56 offset: 0, 0 index: -1 heal-blaster-equip rotate: false - xy: 771, 21 + xy: 691, 729 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 lich-missiles-equip rotate: false - xy: 1569, 1279 + xy: 741, 529 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 reaper-gun-equip rotate: false - xy: 952, 475 + xy: 941, 723 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 revenant-missiles-equip rotate: false - xy: 1102, 475 + xy: 1091, 873 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 shockgun-equip rotate: false - xy: 1071, 425 + xy: 891, 473 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 swarmer-equip rotate: false - xy: 1021, 225 + xy: 991, 423 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -9525,121 +9441,128 @@ editor-snow3 orig: 32, 32 offset: 0, 0 index: -1 +editor-spawn + rotate: false + xy: 635, 25 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 editor-spore-moss1 - rotate: false - xy: 635, 25 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -spore-moss-icon-editor - rotate: false - xy: 635, 25 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -editor-spore-moss2 rotate: false xy: 669, 59 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -editor-spore-moss3 +spore-moss-icon-editor + rotate: false + xy: 669, 59 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +editor-spore-moss2 rotate: false xy: 669, 25 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 +editor-spore-moss3 + rotate: false + xy: 703, 59 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 editor-stone1 - rotate: false - xy: 703, 59 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -stone-icon-editor - rotate: false - xy: 703, 59 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -editor-stone2 rotate: false xy: 703, 25 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -editor-stone3 +stone-icon-editor + rotate: false + xy: 703, 25 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +editor-stone2 rotate: false xy: 737, 59 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -editor-tainted-water +editor-stone3 rotate: false xy: 737, 25 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 +editor-tainted-water + rotate: false + xy: 771, 59 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 tainted-water-icon-editor rotate: false - xy: 737, 25 + xy: 771, 59 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-tar rotate: false - xy: 771, 59 + xy: 771, 25 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 tar-icon-editor rotate: false - xy: 771, 59 + xy: 771, 25 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-tendrils1 rotate: false - xy: 771, 25 + xy: 733, 827 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-tendrils2 rotate: false - xy: 733, 827 + xy: 767, 827 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-tendrils3 rotate: false - xy: 767, 827 + xy: 801, 827 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-water rotate: false - xy: 801, 827 + xy: 835, 827 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 water-icon-editor rotate: false - xy: 801, 827 + xy: 835, 827 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -9688,14 +9611,14 @@ graphite-press-icon-editor index: -1 hail-icon-editor rotate: false - xy: 835, 827 + xy: 869, 827 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 icerocks-icon-editor rotate: false - xy: 869, 827 + xy: 903, 827 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -9709,21 +9632,21 @@ impact-reactor-icon-editor index: -1 incinerator-icon-editor rotate: false - xy: 903, 827 + xy: 937, 827 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-source-icon-editor rotate: false - xy: 937, 827 + xy: 971, 827 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-void-icon-editor rotate: false - xy: 971, 827 + xy: 1005, 827 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -9737,7 +9660,7 @@ javelin-ship-pad-icon-editor index: -1 junction-icon-editor rotate: false - xy: 1005, 827 + xy: 1039, 827 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -9779,21 +9702,21 @@ launch-pad-large-icon-editor index: -1 liquid-junction-icon-editor rotate: false - xy: 1039, 827 + xy: 1073, 827 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-router-icon-editor rotate: false - xy: 1073, 827 + xy: 1107, 827 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-source-icon-editor rotate: false - xy: 1107, 827 + xy: 1141, 827 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -9821,7 +9744,7 @@ mechanical-drill-icon-editor index: -1 mechanical-pump-icon-editor rotate: false - xy: 1141, 827 + xy: 1175, 827 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -9835,7 +9758,7 @@ meltdown-icon-editor index: -1 melter-icon-editor rotate: false - xy: 1175, 827 + xy: 1209, 827 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -9849,7 +9772,7 @@ mend-projector-icon-editor index: -1 mender-icon-editor rotate: false - xy: 1209, 827 + xy: 1243, 827 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -9884,14 +9807,14 @@ overdrive-projector-icon-editor index: -1 overflow-gate-icon-editor rotate: false - xy: 1243, 827 + xy: 1277, 827 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pebbles-icon-editor rotate: false - xy: 1277, 827 + xy: 1311, 827 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -9905,21 +9828,21 @@ phantom-factory-icon-editor index: -1 phase-conduit-icon-editor rotate: false - xy: 1311, 827 + xy: 1345, 827 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conveyor-icon-editor rotate: false - xy: 1345, 827 + xy: 1379, 827 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-wall-icon-editor rotate: false - xy: 1379, 827 + xy: 1413, 827 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -9961,7 +9884,7 @@ pneumatic-drill-icon-editor index: -1 power-node-icon-editor rotate: false - xy: 1413, 827 + xy: 1447, 827 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -9975,28 +9898,28 @@ power-node-large-icon-editor index: -1 power-source-icon-editor rotate: false - xy: 1447, 827 + xy: 1481, 827 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 power-void-icon-editor rotate: false - xy: 1481, 827 + xy: 1515, 827 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-icon-editor rotate: false - xy: 1515, 827 + xy: 1549, 827 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulverizer-icon-editor rotate: false - xy: 1549, 827 + xy: 1583, 827 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -10010,7 +9933,7 @@ pyratite-mixer-icon-editor index: -1 repair-point-icon-editor rotate: false - xy: 1583, 827 + xy: 1617, 827 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -10038,7 +9961,7 @@ rock-icon-editor index: -1 rocks-icon-editor rotate: false - xy: 1617, 827 + xy: 1651, 827 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -10052,7 +9975,7 @@ rotary-pump-icon-editor index: -1 router-icon-editor rotate: false - xy: 1651, 827 + xy: 1685, 827 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -10066,7 +9989,7 @@ rtg-generator-icon-editor index: -1 saltrocks-icon-editor rotate: false - xy: 1685, 827 + xy: 1719, 827 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -10080,7 +10003,7 @@ salvo-icon-editor index: -1 sandrocks-icon-editor rotate: false - xy: 1719, 827 + xy: 1753, 827 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -10094,7 +10017,7 @@ scatter-icon-editor index: -1 scorch-icon-editor rotate: false - xy: 1753, 827 + xy: 1787, 827 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -10115,7 +10038,7 @@ scrap-wall-huge-icon-editor index: -1 scrap-wall-icon-editor rotate: false - xy: 1787, 827 + xy: 1821, 827 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -10136,28 +10059,28 @@ separator-icon-editor index: -1 shale-boulder-icon-editor rotate: false - xy: 1821, 827 + xy: 1855, 827 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 shalerocks-icon-editor rotate: false - xy: 1855, 827 + xy: 1889, 827 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 shock-mine-icon-editor rotate: false - xy: 1889, 827 + xy: 1923, 827 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 shrubs-icon-editor rotate: false - xy: 1923, 827 + xy: 1957, 827 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -10178,14 +10101,14 @@ snowrock-icon-editor index: -1 snowrocks-icon-editor rotate: false - xy: 1957, 827 + xy: 717, 793 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 solar-panel-icon-editor rotate: false - xy: 717, 793 + xy: 717, 759 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -10199,14 +10122,14 @@ solar-panel-large-icon-editor index: -1 sorter-icon-editor rotate: false - xy: 717, 759 + xy: 751, 793 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 spawn-icon-editor rotate: false - xy: 751, 793 + xy: 717, 725 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -10248,7 +10171,7 @@ spore-press-icon-editor index: -1 sporerocks-icon-editor rotate: false - xy: 717, 725 + xy: 785, 793 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -10262,7 +10185,7 @@ surge-tower-icon-editor index: -1 surge-wall-icon-editor rotate: false - xy: 785, 793 + xy: 751, 759 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -10290,7 +10213,7 @@ tau-mech-pad-icon-editor index: -1 tendrils-icon-editor rotate: false - xy: 751, 759 + xy: 717, 691 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -10318,7 +10241,7 @@ thorium-reactor-icon-editor index: -1 thorium-wall-icon-editor rotate: false - xy: 717, 691 + xy: 819, 793 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -10346,14 +10269,14 @@ titan-factory-icon-editor index: -1 titanium-conveyor-icon-editor rotate: false - xy: 819, 793 + xy: 785, 759 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-wall-icon-editor rotate: false - xy: 785, 759 + xy: 751, 725 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -10381,7 +10304,7 @@ turbine-generator-icon-editor index: -1 unloader-icon-editor rotate: false - xy: 751, 725 + xy: 717, 657 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -10430,1364 +10353,1357 @@ wraith-factory-icon-editor index: -1 sprites3.png -size: 2048,1024 +size: 2048,512 format: RGBA8888 filter: Nearest,Nearest repeat: none char1 rotate: false - xy: 2015, 989 + xy: 1775, 479 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 char2 rotate: false - xy: 2015, 955 + xy: 315, 59 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 char3 rotate: false - xy: 1201, 401 + xy: 349, 59 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cliffs1 rotate: false - xy: 1773, 597 + xy: 1809, 479 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 coal1 rotate: false - xy: 1839, 837 + xy: 383, 59 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 coal2 rotate: false - xy: 1925, 923 + xy: 1843, 479 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 coal3 rotate: false - xy: 1235, 401 + xy: 417, 59 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 copper1 rotate: false - xy: 1773, 563 + xy: 1877, 479 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 copper2 rotate: false - xy: 1839, 803 + xy: 451, 59 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 copper3 rotate: false - xy: 1959, 923 + xy: 1911, 479 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 craters1 rotate: false - xy: 1269, 401 + xy: 485, 59 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 craters2 rotate: false - xy: 1773, 529 + xy: 1945, 479 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 craters3 rotate: false - xy: 1303, 401 + xy: 519, 59 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 craters4 rotate: false - xy: 1773, 495 + xy: 1979, 479 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 craters5 rotate: false - xy: 1337, 401 + xy: 553, 59 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 craters6 rotate: false - xy: 1773, 461 + xy: 2013, 479 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -creeptree - rotate: false - xy: 1773, 913 - size: 108, 108 - orig: 108, 108 - offset: 0, 0 - index: -1 dark-metal-large rotate: false - xy: 1, 19 + xy: 1, 27 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 dark-metal1 rotate: false - xy: 1371, 401 + xy: 1429, 217 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 dark-metal2 rotate: false - xy: 1405, 401 + xy: 1495, 283 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 dark-panel-1 rotate: false - xy: 1439, 401 + xy: 1627, 347 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 dark-panel-1-edge rotate: false - xy: 323, 925 - size: 288, 96 - orig: 288, 96 + xy: 1, 93 + size: 96, 96 + orig: 96, 96 offset: 0, 0 index: -1 dark-panel-2 rotate: false - xy: 1473, 401 + xy: 1463, 217 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 dark-panel-2-edge rotate: false - xy: 1, 281 - size: 288, 96 - orig: 288, 96 + xy: 645, 415 + size: 96, 96 + orig: 96, 96 offset: 0, 0 index: -1 dark-panel-3 rotate: false - xy: 1507, 401 + xy: 645, 185 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 dark-panel-3-edge rotate: false - xy: 323, 827 - size: 288, 96 - orig: 288, 96 + xy: 99, 93 + size: 96, 96 + orig: 96, 96 offset: 0, 0 index: -1 dark-panel-4 rotate: false - xy: 1541, 401 + xy: 679, 185 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 dark-panel-4-edge rotate: false - xy: 613, 925 - size: 288, 96 - orig: 288, 96 + xy: 645, 317 + size: 96, 96 + orig: 96, 96 offset: 0, 0 index: -1 dark-panel-5 rotate: false - xy: 1575, 401 + xy: 713, 185 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 dark-panel-5-edge rotate: false - xy: 1, 183 - size: 288, 96 - orig: 288, 96 + xy: 743, 415 + size: 96, 96 + orig: 96, 96 offset: 0, 0 index: -1 dark-panel-6 rotate: false - xy: 1609, 401 + xy: 747, 185 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 dark-panel-6-edge rotate: false - xy: 323, 729 - size: 288, 96 - orig: 288, 96 + xy: 197, 93 + size: 96, 96 + orig: 96, 96 offset: 0, 0 index: -1 darksand-edge rotate: false - xy: 613, 827 - size: 288, 96 - orig: 288, 96 + xy: 645, 219 + size: 96, 96 + orig: 96, 96 offset: 0, 0 index: -1 darksand-tainted-water rotate: false - xy: 903, 335 + xy: 883, 185 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 darksand-tainted-water-edge rotate: false - xy: 903, 925 - size: 288, 96 - orig: 288, 96 + xy: 743, 317 + size: 96, 96 + orig: 96, 96 offset: 0, 0 index: -1 darksand-water rotate: false - xy: 937, 335 + xy: 917, 185 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 darksand-water-edge rotate: false - xy: 1, 85 - size: 288, 96 - orig: 288, 96 + xy: 841, 415 + size: 96, 96 + orig: 96, 96 offset: 0, 0 index: -1 darksand1 rotate: false - xy: 1643, 401 + xy: 781, 185 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 darksand2 rotate: false - xy: 1677, 401 + xy: 815, 185 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 darksand3 rotate: false - xy: 1711, 401 + xy: 849, 185 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 deepwater rotate: false - xy: 971, 335 + xy: 951, 185 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 deepwater-edge rotate: false - xy: 323, 631 - size: 288, 96 - orig: 288, 96 + xy: 295, 93 + size: 96, 96 + orig: 96, 96 offset: 0, 0 index: -1 dunerocks-large rotate: false - xy: 903, 369 + xy: 1527, 447 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 dunerocks1 rotate: false - xy: 1005, 335 + xy: 985, 185 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 dunerocks2 rotate: false - xy: 1039, 335 + xy: 1019, 185 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +edge + rotate: false + xy: 1053, 185 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 edge-stencil rotate: false - xy: 613, 729 - size: 288, 96 - orig: 288, 96 + xy: 743, 219 + size: 96, 96 + orig: 96, 96 + offset: 0, 0 + index: -1 +edgier + rotate: false + xy: 1087, 185 + size: 32, 32 + orig: 32, 32 offset: 0, 0 index: -1 grass-edge rotate: false - xy: 903, 827 - size: 288, 96 - orig: 288, 96 + xy: 841, 317 + size: 96, 96 + orig: 96, 96 offset: 0, 0 index: -1 grass1 rotate: false - xy: 1745, 401 + xy: 1121, 185 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 grass2 rotate: false - xy: 1073, 335 + xy: 1155, 185 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 grass3 rotate: false - xy: 1839, 769 + xy: 1189, 185 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 holostone-edge rotate: false - xy: 1193, 925 - size: 288, 96 - orig: 288, 96 + xy: 939, 415 + size: 96, 96 + orig: 96, 96 offset: 0, 0 index: -1 holostone1 rotate: false - xy: 1107, 351 + xy: 1223, 185 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 holostone2 rotate: false - xy: 1141, 351 + xy: 1257, 185 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 holostone3 rotate: false - xy: 1175, 351 + xy: 1291, 185 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 hotrock1 rotate: false - xy: 1823, 735 + xy: 1325, 185 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 hotrock2 rotate: false - xy: 1823, 701 + xy: 1359, 185 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 hotrock3 rotate: false - xy: 1823, 667 + xy: 1393, 185 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ice-edge rotate: false - xy: 323, 533 - size: 288, 96 - orig: 288, 96 + xy: 393, 93 + size: 96, 96 + orig: 96, 96 offset: 0, 0 index: -1 ice-snow-edge rotate: false - xy: 613, 631 - size: 288, 96 - orig: 288, 96 + xy: 841, 219 + size: 96, 96 + orig: 96, 96 offset: 0, 0 index: -1 ice-snow1 rotate: false - xy: 1277, 367 + xy: 673, 151 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ice-snow2 rotate: false - xy: 1311, 367 + xy: 707, 151 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ice-snow3 rotate: false - xy: 1345, 367 + xy: 741, 151 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ice1 rotate: false - xy: 1823, 633 + xy: 1427, 183 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ice2 rotate: false - xy: 1209, 367 + xy: 1461, 183 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ice3 rotate: false - xy: 1243, 367 + xy: 639, 151 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 icerocks-large rotate: false - xy: 1773, 847 + xy: 1429, 251 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 icerocks1 rotate: false - xy: 1379, 367 + xy: 775, 151 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 icerocks2 rotate: false - xy: 1413, 367 + xy: 809, 151 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ignarock-edge rotate: false - xy: 903, 729 - size: 288, 96 - orig: 288, 96 + xy: 939, 317 + size: 96, 96 + orig: 96, 96 offset: 0, 0 index: -1 ignarock1 rotate: false - xy: 1447, 367 + xy: 843, 151 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ignarock2 rotate: false - xy: 1481, 367 + xy: 877, 151 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ignarock3 rotate: false - xy: 1515, 367 + xy: 911, 151 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 lead1 rotate: false - xy: 1549, 367 + xy: 945, 151 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 lead2 rotate: false - xy: 1583, 367 + xy: 979, 151 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 lead3 rotate: false - xy: 1617, 367 + xy: 1013, 151 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 magmarock1 rotate: false - xy: 1651, 367 + xy: 1047, 151 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 magmarock2 rotate: false - xy: 1685, 367 + xy: 1081, 151 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 magmarock3 rotate: false - xy: 1719, 367 + xy: 1115, 151 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 metal-floor rotate: false - xy: 1753, 367 + xy: 1149, 151 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 metal-floor-2 rotate: false - xy: 199, 1 + xy: 1183, 151 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 metal-floor-2-edge rotate: false - xy: 1193, 827 - size: 288, 96 - orig: 288, 96 + xy: 1037, 415 + size: 96, 96 + orig: 96, 96 offset: 0, 0 index: -1 metal-floor-3 rotate: false - xy: 1807, 597 + xy: 1217, 151 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 metal-floor-3-edge rotate: false - xy: 1483, 925 - size: 288, 96 - orig: 288, 96 + xy: 491, 93 + size: 96, 96 + orig: 96, 96 offset: 0, 0 index: -1 metal-floor-5 rotate: false - xy: 1807, 563 + xy: 1251, 151 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 metal-floor-5-edge rotate: false - xy: 323, 435 - size: 288, 96 - orig: 288, 96 + xy: 939, 219 + size: 96, 96 + orig: 96, 96 offset: 0, 0 index: -1 metal-floor-damaged-edge rotate: false - xy: 613, 533 - size: 288, 96 - orig: 288, 96 + xy: 1037, 317 + size: 96, 96 + orig: 96, 96 offset: 0, 0 index: -1 metal-floor-damaged1 rotate: false - xy: 1807, 529 + xy: 1285, 151 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 metal-floor-damaged2 rotate: false - xy: 1807, 495 + xy: 1319, 151 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 metal-floor-damaged3 rotate: false - xy: 1807, 461 + xy: 1353, 151 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 metal-floor-edge rotate: false - xy: 903, 631 - size: 288, 96 - orig: 288, 96 + xy: 1135, 415 + size: 96, 96 + orig: 96, 96 offset: 0, 0 index: -1 moss-edge rotate: false - xy: 1193, 729 - size: 288, 96 - orig: 288, 96 + xy: 1037, 219 + size: 96, 96 + orig: 96, 96 offset: 0, 0 index: -1 moss1 rotate: false - xy: 1107, 317 + xy: 1387, 151 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 moss2 rotate: false - xy: 1141, 317 + xy: 1421, 149 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 moss3 rotate: false - xy: 1175, 317 + xy: 1455, 149 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal1 rotate: false - xy: 1209, 333 + xy: 1529, 297 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal2 rotate: false - xy: 1243, 333 + xy: 1563, 297 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal3 rotate: false - xy: 1277, 333 + xy: 1597, 297 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper1 rotate: false - xy: 1311, 333 + xy: 349, 25 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper2 rotate: false - xy: 1345, 333 + xy: 383, 25 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper3 rotate: false - xy: 1379, 333 + xy: 417, 25 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead1 rotate: false - xy: 1413, 333 + xy: 451, 25 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead2 rotate: false - xy: 1447, 333 + xy: 485, 25 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead3 rotate: false - xy: 1481, 333 + xy: 519, 25 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap1 rotate: false - xy: 1515, 333 + xy: 553, 25 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap2 rotate: false - xy: 1549, 333 + xy: 1661, 363 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap3 rotate: false - xy: 1583, 333 + xy: 1709, 413 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium1 rotate: false - xy: 1617, 333 + xy: 1775, 445 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium2 rotate: false - xy: 1651, 333 + xy: 1809, 445 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium3 rotate: false - xy: 1685, 333 + xy: 1843, 445 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium1 rotate: false - xy: 1719, 333 + xy: 1877, 445 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium2 rotate: false - xy: 1753, 333 + xy: 1911, 445 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium3 rotate: false - xy: 1857, 735 + xy: 1945, 445 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -pebbles-edge - rotate: false - xy: 1483, 827 - size: 288, 96 - orig: 288, 96 - offset: 0, 0 - index: -1 pebbles1 rotate: false - xy: 1857, 701 + xy: 1979, 445 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pebbles2 rotate: false - xy: 1857, 667 + xy: 2013, 445 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pebbles3 rotate: false - xy: 1857, 633 + xy: 1661, 329 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pine rotate: false - xy: 1773, 731 + xy: 589, 141 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 rock1 rotate: false - xy: 199, 35 + xy: 1527, 331 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 rock2 rotate: false - xy: 1101, 385 + xy: 1659, 397 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 rocks-large rotate: false - xy: 1883, 957 + xy: 67, 27 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 rocks1 rotate: false - xy: 1841, 599 + xy: 1709, 379 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 rocks2 rotate: false - xy: 1841, 565 + xy: 1695, 345 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 salt rotate: false - xy: 1841, 531 + xy: 1695, 311 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 salt-edge rotate: false - xy: 613, 435 - size: 288, 96 - orig: 288, 96 + xy: 1135, 317 + size: 96, 96 + orig: 96, 96 offset: 0, 0 index: -1 saltrocks-large rotate: false - xy: 67, 19 + xy: 1527, 381 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 saltrocks1 rotate: false - xy: 1841, 497 + xy: 1529, 263 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 saltrocks2 rotate: false - xy: 1841, 463 + xy: 1563, 263 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sand-edge rotate: false - xy: 903, 533 - size: 288, 96 - orig: 288, 96 + xy: 1233, 415 + size: 96, 96 + orig: 96, 96 offset: 0, 0 index: -1 sand-water rotate: false - xy: 1277, 299 + xy: 639, 117 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sand-water-edge rotate: false - xy: 1193, 631 - size: 288, 96 - orig: 288, 96 + xy: 1135, 219 + size: 96, 96 + orig: 96, 96 offset: 0, 0 index: -1 sand1 rotate: false - xy: 233, 1 + xy: 1597, 263 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sand2 rotate: false - xy: 1209, 299 + xy: 1729, 345 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sand3 rotate: false - xy: 1243, 299 + xy: 1729, 311 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sandrocks-large rotate: false - xy: 969, 369 + xy: 1593, 447 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 sandrocks1 rotate: false - xy: 1311, 299 + xy: 673, 117 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sandrocks2 rotate: false - xy: 1345, 299 + xy: 707, 117 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap1 rotate: false - xy: 1379, 299 + xy: 741, 117 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap2 rotate: false - xy: 1413, 299 + xy: 775, 117 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap3 rotate: false - xy: 1447, 299 + xy: 809, 117 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 shale-boulder1 rotate: false - xy: 1583, 299 + xy: 945, 117 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 shale-boulder2 rotate: false - xy: 1617, 299 + xy: 979, 117 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 shale-edge rotate: false - xy: 1483, 729 - size: 288, 96 - orig: 288, 96 + xy: 1233, 317 + size: 96, 96 + orig: 96, 96 offset: 0, 0 index: -1 shale1 rotate: false - xy: 1481, 299 + xy: 843, 117 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 shale2 rotate: false - xy: 1515, 299 + xy: 877, 117 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 shale3 rotate: false - xy: 1549, 299 + xy: 911, 117 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 shalerocks-large rotate: false - xy: 1773, 781 + xy: 133, 27 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 shalerocks1 rotate: false - xy: 1651, 299 + xy: 1013, 117 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 shalerocks2 rotate: false - xy: 1685, 299 + xy: 1047, 117 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 shrubs-large rotate: false - xy: 1949, 957 + xy: 1593, 381 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 shrubs1 rotate: false - xy: 1719, 299 + xy: 1081, 117 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 shrubs2 rotate: false - xy: 1753, 299 + xy: 1115, 117 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 snow-edge rotate: false - xy: 903, 435 - size: 288, 96 - orig: 288, 96 + xy: 1331, 415 + size: 96, 96 + orig: 96, 96 offset: 0, 0 index: -1 snow1 rotate: false - xy: 1875, 599 + xy: 1149, 117 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 snow2 rotate: false - xy: 1875, 565 + xy: 1183, 117 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 snow3 rotate: false - xy: 1875, 531 + xy: 1217, 117 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 snowrock1 rotate: false - xy: 1773, 681 + xy: 1725, 463 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 snowrock2 rotate: false - xy: 1151, 385 + xy: 265, 43 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 snowrocks-large rotate: false - xy: 133, 19 + xy: 1659, 447 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 snowrocks1 rotate: false - xy: 1875, 497 + xy: 1251, 117 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 snowrocks2 rotate: false - xy: 1875, 463 + xy: 1285, 117 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -spawn-edge +spawn rotate: false - xy: 1193, 533 - size: 288, 96 - orig: 288, 96 + xy: 1319, 117 + size: 32, 32 + orig: 32, 32 offset: 0, 0 index: -1 spore-cluster1 rotate: false - xy: 1839, 871 + xy: 265, 1 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 spore-cluster2 rotate: false - xy: 1883, 915 + xy: 307, 1 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 spore-cluster3 rotate: false - xy: 249, 43 + xy: 589, 99 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 spore-moss-edge rotate: false - xy: 1483, 631 - size: 288, 96 - orig: 288, 96 + xy: 1233, 219 + size: 96, 96 + orig: 96, 96 offset: 0, 0 index: -1 spore-moss1 rotate: false - xy: 267, 9 + xy: 1353, 117 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 spore-moss2 rotate: false - xy: 1993, 921 + xy: 1387, 117 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 spore-moss3 rotate: false - xy: 1779, 427 + xy: 1421, 115 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 spore-pine rotate: false - xy: 1773, 631 + xy: 1577, 331 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 sporerocks-large rotate: false - xy: 1035, 369 + xy: 199, 27 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 sporerocks1 rotate: false - xy: 1813, 427 + xy: 1455, 115 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sporerocks2 rotate: false - xy: 1847, 429 + xy: 631, 83 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 stone-edge rotate: false - xy: 1193, 435 - size: 288, 96 - orig: 288, 96 + xy: 1331, 317 + size: 96, 96 + orig: 96, 96 offset: 0, 0 index: -1 stone1 rotate: false - xy: 1881, 429 + xy: 665, 83 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 stone2 rotate: false - xy: 1873, 837 + xy: 699, 83 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 stone3 rotate: false - xy: 1873, 803 + xy: 733, 83 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 tainted-water rotate: false - xy: 1873, 769 + xy: 767, 83 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 tainted-water-edge rotate: false - xy: 1483, 533 - size: 288, 96 - orig: 288, 96 + xy: 1429, 415 + size: 96, 96 + orig: 96, 96 offset: 0, 0 index: -1 tar rotate: false - xy: 1891, 735 + xy: 801, 83 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 tar-edge rotate: false - xy: 1483, 435 - size: 288, 96 - orig: 288, 96 - offset: 0, 0 - index: -1 -tendrils-edge - rotate: false - xy: 323, 337 - size: 288, 96 - orig: 288, 96 + xy: 1331, 219 + size: 96, 96 + orig: 96, 96 offset: 0, 0 index: -1 tendrils1 rotate: false - xy: 1891, 701 + xy: 835, 83 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 tendrils2 rotate: false - xy: 1891, 667 + xy: 869, 83 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 tendrils3 rotate: false - xy: 1891, 633 + xy: 903, 83 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 thorium1 rotate: false - xy: 1909, 599 + xy: 937, 83 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 thorium2 rotate: false - xy: 1909, 565 + xy: 971, 83 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 thorium3 rotate: false - xy: 1909, 531 + xy: 1005, 83 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium1 rotate: false - xy: 1909, 497 + xy: 1039, 83 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium2 rotate: false - xy: 1909, 463 + xy: 1073, 83 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium3 rotate: false - xy: 1915, 429 + xy: 1107, 83 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 water rotate: false - xy: 1787, 393 + xy: 1141, 83 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 water-edge rotate: false - xy: 613, 337 - size: 288, 96 - orig: 288, 96 + xy: 1429, 317 + size: 96, 96 + orig: 96, 96 offset: 0, 0 index: -1 white-tree rotate: false - xy: 1, 701 + xy: 1, 191 size: 320, 320 orig: 320, 320 offset: 0, 0 index: -1 white-tree-dead rotate: false - xy: 1, 379 + xy: 323, 191 size: 320, 320 orig: 320, 320 offset: 0, 0 diff --git a/core/assets/sprites/sprites.png b/core/assets/sprites/sprites.png index 71da20b99c..df518b8fdc 100644 Binary files a/core/assets/sprites/sprites.png and b/core/assets/sprites/sprites.png differ diff --git a/core/assets/sprites/sprites2.png b/core/assets/sprites/sprites2.png index a3ae8c4fee..79857b3b36 100644 Binary files a/core/assets/sprites/sprites2.png and b/core/assets/sprites/sprites2.png differ diff --git a/core/assets/sprites/sprites3.png b/core/assets/sprites/sprites3.png index 192d3985b9..f882d80099 100644 Binary files a/core/assets/sprites/sprites3.png and b/core/assets/sprites/sprites3.png differ diff --git a/core/assets/sprites/sprites_fallback.atlas b/core/assets/sprites/sprites_fallback.atlas index 8f3916def5..bec8bcb7c3 100644 --- a/core/assets/sprites/sprites_fallback.atlas +++ b/core/assets/sprites/sprites_fallback.atlas @@ -194,21 +194,21 @@ filter: Nearest,Nearest repeat: none force-projector rotate: false - xy: 749, 145 + xy: 619, 211 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 force-projector-icon-editor rotate: false - xy: 749, 145 + xy: 619, 211 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 force-projector-top rotate: false - xy: 521, 49 + xy: 703, 113 size: 96, 96 orig: 96, 96 offset: 0, 0 @@ -222,182 +222,175 @@ blast-drill-top index: -1 rubble-4-0 rotate: false - xy: 261, 115 + xy: 391, 505 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 rubble-4-1 rotate: false - xy: 261, 115 + xy: 391, 505 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 battery-large rotate: false - xy: 781, 537 + xy: 311, 17 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 battery-large-icon-editor rotate: false - xy: 781, 537 + xy: 311, 17 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 differential-generator rotate: false - xy: 749, 243 + xy: 619, 407 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 differential-generator-icon-editor rotate: false - xy: 749, 243 + xy: 619, 407 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 differential-generator-top rotate: false - xy: 847, 339 + xy: 619, 309 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 impact-reactor rotate: false - xy: 521, 895 + xy: 131, 635 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 impact-reactor-bottom rotate: false - xy: 1, 245 + xy: 131, 505 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 impact-reactor-light rotate: false - xy: 391, 635 + xy: 131, 115 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 impact-reactor-plasma-0 rotate: false - xy: 521, 765 + xy: 261, 765 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 impact-reactor-plasma-1 rotate: false - xy: 651, 895 + xy: 391, 765 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 impact-reactor-plasma-2 rotate: false - xy: 1, 115 + xy: 521, 765 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 impact-reactor-plasma-3 rotate: false - xy: 131, 245 + xy: 651, 765 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 impact-reactor-top rotate: false - xy: 261, 375 + xy: 781, 765 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 alloy-smelter rotate: false - xy: 911, 927 + xy: 115, 17 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 alloy-smelter-icon-editor rotate: false - xy: 911, 927 + xy: 115, 17 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 alloy-smelter-top rotate: false - xy: 651, 407 + xy: 213, 17 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 core-foundation rotate: false - xy: 261, 895 + xy: 1, 245 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 core-foundation-icon-editor rotate: false - xy: 261, 895 + xy: 1, 245 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 core-shard rotate: false - xy: 115, 17 + xy: 507, 17 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 core-shard-icon-editor rotate: false - xy: 115, 17 - size: 96, 96 - orig: 96, 96 - offset: 0, 0 - index: -1 -core-shard-top - rotate: false - xy: 911, 829 + xy: 507, 17 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 launch-pad-large rotate: false - xy: 391, 505 + xy: 261, 635 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 launch-pad-large-icon-editor rotate: false - xy: 391, 505 + xy: 261, 635 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 block-3 rotate: false - xy: 521, 147 + xy: 409, 17 size: 96, 96 orig: 96, 96 offset: 0, 0 @@ -411,119 +404,112 @@ block-4 index: -1 meltdown-heat rotate: false - xy: 651, 765 + xy: 261, 375 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 fortress-factory rotate: false - xy: 619, 113 + xy: 717, 213 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 fortress-factory-top rotate: false - xy: 815, 47 + xy: 801, 17 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 ghoul-factory-top rotate: false - xy: 815, 47 + xy: 801, 17 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 titan-factory-top rotate: false - xy: 815, 47 + xy: 801, 17 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 -fortress-factory-top-open +ghoul-factory rotate: false - xy: 913, 47 - size: 96, 96 - orig: 96, 96 - offset: 0, 0 - index: -1 -ghoul-factory-top-open - rotate: false - xy: 913, 47 - size: 96, 96 - orig: 96, 96 - offset: 0, 0 - index: -1 -titan-factory-top-open - rotate: false - xy: 913, 47 + xy: 899, 45 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 revenant-factory rotate: false - xy: 261, 245 + xy: 391, 635 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 revenant-factory-top rotate: false - xy: 651, 635 - size: 128, 128 - orig: 128, 128 - offset: 0, 0 - index: -1 -revenant-factory-top-open - rotate: false - xy: 781, 765 + xy: 781, 635 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 scrap-wall-gigantic rotate: false - xy: 391, 245 + xy: 391, 375 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 scrap-wall-gigantic-icon-editor rotate: false - xy: 391, 245 + xy: 391, 375 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 thruster rotate: false - xy: 391, 115 + xy: 651, 505 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 thruster-icon-editor rotate: false - xy: 391, 115 + xy: 651, 505 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 cyclone-icon-editor rotate: false - xy: 879, 437 + xy: 605, 113 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 fortress-factory-icon-editor rotate: false - xy: 619, 15 + xy: 703, 15 + size: 96, 96 + orig: 96, 96 + offset: 0, 0 + index: -1 +fuse-icon-editor + rotate: false + xy: 815, 241 + size: 96, 96 + orig: 96, 96 + offset: 0, 0 + index: -1 +ghoul-factory-icon-editor + rotate: false + xy: 913, 339 size: 96, 96 orig: 96, 96 offset: 0, 0 @@ -537,35 +523,35 @@ impact-reactor-icon-editor index: -1 meltdown-icon-editor rotate: false - xy: 781, 895 + xy: 261, 245 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 revenant-factory-icon-editor rotate: false - xy: 391, 375 + xy: 521, 635 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 spectre-icon-editor rotate: false - xy: 651, 505 + xy: 391, 115 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 cracks-3-0 rotate: false - xy: 651, 309 + xy: 911, 927 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 cracks-3-1 rotate: false - xy: 213, 17 + xy: 911, 829 size: 96, 96 orig: 96, 96 offset: 0, 0 @@ -579,56 +565,56 @@ cracks-3-2 index: -1 cracks-3-3 rotate: false - xy: 311, 17 + xy: 911, 633 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 cracks-3-4 rotate: false - xy: 409, 17 + xy: 911, 535 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 cracks-3-5 rotate: false - xy: 911, 633 + xy: 911, 437 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 cracks-3-6 rotate: false - xy: 651, 211 + xy: 521, 407 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 cracks-3-7 rotate: false - xy: 879, 535 + xy: 521, 309 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 cracks-4-0 rotate: false - xy: 1, 505 + xy: 1, 115 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 cracks-4-1 rotate: false - xy: 131, 635 + xy: 131, 895 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 cracks-4-2 rotate: false - xy: 261, 765 + xy: 261, 895 size: 128, 128 orig: 128, 128 offset: 0, 0 @@ -642,119 +628,140 @@ cracks-4-3 index: -1 cracks-4-4 rotate: false - xy: 1, 375 + xy: 521, 895 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 cracks-4-5 rotate: false - xy: 131, 505 + xy: 651, 895 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 cracks-4-6 rotate: false - xy: 261, 635 + xy: 781, 895 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 cracks-4-7 rotate: false - xy: 391, 765 + xy: 131, 765 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 cyclone rotate: false - xy: 781, 439 + xy: 521, 211 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 cyclone-icon-full rotate: false - xy: 749, 341 + xy: 605, 15 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 fortress-factory-icon-full rotate: false - xy: 717, 47 + xy: 801, 115 + size: 96, 96 + orig: 96, 96 + offset: 0, 0 + index: -1 +fuse + rotate: false + xy: 815, 339 + size: 96, 96 + orig: 96, 96 + offset: 0, 0 + index: -1 +fuse-icon-full + rotate: false + xy: 899, 143 + size: 96, 96 + orig: 96, 96 + offset: 0, 0 + index: -1 +ghoul-factory-icon-full + rotate: false + xy: 913, 241 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 impact-reactor-icon-full rotate: false - xy: 261, 505 + xy: 131, 245 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 meltdown rotate: false - xy: 521, 635 + xy: 261, 505 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 meltdown-icon-full rotate: false - xy: 131, 115 + xy: 261, 115 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 revenant-factory-icon-full rotate: false - xy: 521, 505 + xy: 651, 635 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 spectre rotate: false - xy: 521, 375 + xy: 391, 245 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 spectre-icon-full rotate: false - xy: 781, 635 + xy: 521, 505 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 unit-icon-chaos-array rotate: false - xy: 521, 245 + xy: 781, 505 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 chaos-array rotate: false - xy: 131, 895 + xy: 1, 635 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 chaos-array-base rotate: false - xy: 1, 635 + xy: 1, 505 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 chaos-array-leg rotate: false - xy: 131, 765 + xy: 1, 375 size: 128, 128 orig: 128, 128 offset: 0, 0 @@ -768,7 +775,7 @@ revenant index: -1 eradication-equip rotate: false - xy: 847, 145 + xy: 717, 311 size: 96, 192 orig: 96, 192 offset: 0, 0 @@ -781,1397 +788,1488 @@ filter: Nearest,Nearest repeat: none mend-projector rotate: false - xy: 361, 210 + xy: 463, 289 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 mend-projector-icon-editor rotate: false - xy: 361, 210 + xy: 463, 289 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 mend-projector-top rotate: false - xy: 559, 199 + xy: 529, 289 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 overdrive-projector rotate: false - xy: 493, 191 + xy: 661, 289 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 overdrive-projector-icon-editor rotate: false - xy: 493, 191 + xy: 661, 289 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 overdrive-projector-top rotate: false - xy: 295, 144 + xy: 1, 265 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 distributor rotate: false - xy: 823, 463 + xy: 265, 382 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 distributor-icon-editor rotate: false - xy: 823, 463 + xy: 265, 382 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 mass-driver-base rotate: false - xy: 99, 629 + xy: 393, 823 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 laser-drill rotate: false - xy: 1, 139 + xy: 99, 921 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 laser-drill-rim rotate: false - xy: 197, 923 + xy: 393, 921 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 laser-drill-rotator rotate: false - xy: 295, 923 + xy: 491, 921 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 laser-drill-top rotate: false - xy: 393, 923 + xy: 589, 921 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 mechanical-drill rotate: false - xy: 361, 276 + xy: 727, 297 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 mechanical-drill-rotator rotate: false - xy: 493, 257 + xy: 925, 297 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 mechanical-drill-top rotate: false - xy: 295, 210 + xy: 397, 289 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 oil-extractor rotate: false - xy: 99, 237 + xy: 785, 823 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 oil-extractor-liquid rotate: false - xy: 197, 825 + xy: 99, 725 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 oil-extractor-rotator rotate: false - xy: 295, 825 + xy: 197, 725 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 oil-extractor-top rotate: false - xy: 393, 825 + xy: 295, 725 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 pneumatic-drill rotate: false - xy: 625, 331 + xy: 529, 223 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 pneumatic-drill-rotator rotate: false - xy: 625, 133 + xy: 1, 199 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 pneumatic-drill-top rotate: false - xy: 625, 67 + xy: 67, 199 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 place-arrow rotate: false - xy: 589, 825 + xy: 491, 725 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 rubble-1-0 rotate: false - xy: 691, 265 + xy: 793, 165 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 rubble-1-1 rotate: false - xy: 691, 199 + xy: 859, 165 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 rubble-2-0 rotate: false - xy: 691, 133 + xy: 925, 165 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 rubble-2-1 rotate: false - xy: 691, 67 + xy: 397, 157 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 rubble-3-0 rotate: false - xy: 197, 629 + xy: 1, 627 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 rubble-3-1 rotate: false - xy: 197, 629 + xy: 1, 627 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 liquid-tank-bottom rotate: false - xy: 589, 923 + xy: 785, 921 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 liquid-tank-liquid rotate: false - xy: 883, 923 + xy: 99, 823 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 liquid-tank-top rotate: false - xy: 99, 825 + xy: 197, 823 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 rotary-pump rotate: false - xy: 823, 331 + xy: 331, 184 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +rotary-pump-icon-editor + rotate: false + xy: 331, 184 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 thermal-pump rotate: false - xy: 197, 139 + xy: 491, 627 + size: 96, 96 + orig: 96, 96 + offset: 0, 0 + index: -1 +thermal-pump-icon-editor + rotate: false + xy: 491, 627 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 dart-mech-pad rotate: false - xy: 691, 463 + xy: 133, 397 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 dart-mech-pad-icon-editor rotate: false - xy: 691, 463 + xy: 133, 397 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 delta-mech-pad rotate: false - xy: 757, 463 + xy: 199, 397 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 delta-mech-pad-icon-editor rotate: false - xy: 757, 463 + xy: 199, 397 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 glaive-ship-pad rotate: false - xy: 1, 335 - size: 96, 96 - orig: 96, 96 - offset: 0, 0 - index: -1 -javelin-ship-pad - rotate: false - xy: 757, 397 - size: 64, 64 - orig: 64, 64 - offset: 0, 0 - index: -1 -omega-mech-pad - rotate: false - xy: 491, 825 - size: 96, 96 - orig: 96, 96 - offset: 0, 0 - index: -1 -omega-mech-pad-icon-editor - rotate: false - xy: 491, 825 - size: 96, 96 - orig: 96, 96 - offset: 0, 0 - index: -1 -power-node-large - rotate: false - xy: 625, 1 - size: 64, 64 - orig: 64, 64 - offset: 0, 0 - index: -1 -rtg-generator - rotate: false - xy: 955, 331 - size: 64, 64 - orig: 64, 64 - offset: 0, 0 - index: -1 -rtg-generator-icon-editor - rotate: false - xy: 955, 331 - size: 64, 64 - orig: 64, 64 - offset: 0, 0 - index: -1 -solar-panel-large - rotate: false - xy: 197, 237 - size: 96, 96 - orig: 96, 96 - offset: 0, 0 - index: -1 -solar-panel-large-icon-editor - rotate: false - xy: 197, 237 - size: 96, 96 - orig: 96, 96 - offset: 0, 0 - index: -1 -thorium-reactor - rotate: false - xy: 295, 727 - size: 96, 96 - orig: 96, 96 - offset: 0, 0 - index: -1 -thorium-reactor-icon-editor - rotate: false - xy: 295, 727 - size: 96, 96 - orig: 96, 96 - offset: 0, 0 - index: -1 -thorium-reactor-center - rotate: false - xy: 393, 727 - size: 96, 96 - orig: 96, 96 - offset: 0, 0 - index: -1 -thorium-reactor-lights - rotate: false - xy: 491, 727 - size: 96, 96 - orig: 96, 96 - offset: 0, 0 - index: -1 -blast-mixer - rotate: false - xy: 615, 661 - size: 64, 64 - orig: 64, 64 - offset: 0, 0 - index: -1 -blast-mixer-icon-editor - rotate: false - xy: 615, 661 - size: 64, 64 - orig: 64, 64 - offset: 0, 0 - index: -1 -coal-centrifuge - rotate: false - xy: 747, 661 - size: 64, 64 - orig: 64, 64 - offset: 0, 0 - index: -1 -coal-centrifuge-icon-editor - rotate: false - xy: 747, 661 - size: 64, 64 - orig: 64, 64 - offset: 0, 0 - index: -1 -cryofluidmixer-bottom - rotate: false - xy: 493, 521 - size: 64, 64 - orig: 64, 64 - offset: 0, 0 - index: -1 -cryofluidmixer-liquid - rotate: false - xy: 641, 529 - size: 64, 64 - orig: 64, 64 - offset: 0, 0 - index: -1 -cryofluidmixer-top - rotate: false - xy: 707, 529 - size: 64, 64 - orig: 64, 64 - offset: 0, 0 - index: -1 -cultivator - rotate: false - xy: 773, 529 - size: 64, 64 - orig: 64, 64 - offset: 0, 0 - index: -1 -cultivator-middle - rotate: false - xy: 559, 463 - size: 64, 64 - orig: 64, 64 - offset: 0, 0 - index: -1 -cultivator-top - rotate: false - xy: 427, 455 - size: 64, 64 - orig: 64, 64 - offset: 0, 0 - index: -1 -graphite-press - rotate: false - xy: 691, 397 - size: 64, 64 - orig: 64, 64 - offset: 0, 0 - index: -1 -graphite-press-icon-editor - rotate: false - xy: 691, 397 - size: 64, 64 - orig: 64, 64 - offset: 0, 0 - index: -1 -kiln - rotate: false - xy: 889, 397 - size: 64, 64 - orig: 64, 64 - offset: 0, 0 - index: -1 -kiln-icon-editor - rotate: false - xy: 889, 397 - size: 64, 64 - orig: 64, 64 - offset: 0, 0 - index: -1 -kiln-top - rotate: false - xy: 955, 397 - size: 64, 64 - orig: 64, 64 - offset: 0, 0 - index: -1 -silicon-smelter-top - rotate: false - xy: 955, 397 - size: 64, 64 - orig: 64, 64 - offset: 0, 0 - index: -1 -multi-press - rotate: false - xy: 99, 335 - size: 96, 96 - orig: 96, 96 - offset: 0, 0 - index: -1 -multi-press-icon-editor - rotate: false - xy: 99, 335 - size: 96, 96 - orig: 96, 96 - offset: 0, 0 - index: -1 -phase-weaver - rotate: false - xy: 361, 78 - size: 64, 64 - orig: 64, 64 - offset: 0, 0 - index: -1 -phase-weaver-bottom - rotate: false - xy: 295, 12 - size: 64, 64 - orig: 64, 64 - offset: 0, 0 - index: -1 -phase-weaver-weave - rotate: false - xy: 427, 59 - size: 64, 64 - orig: 64, 64 - offset: 0, 0 - index: -1 -plastanium-compressor - rotate: false - xy: 493, 59 - size: 64, 64 - orig: 64, 64 - offset: 0, 0 - index: -1 -plastanium-compressor-icon-editor - rotate: false - xy: 493, 59 - size: 64, 64 - orig: 64, 64 - offset: 0, 0 - index: -1 -plastanium-compressor-top - rotate: false - xy: 559, 1 - size: 64, 64 - orig: 64, 64 - offset: 0, 0 - index: -1 -pyratite-mixer - rotate: false - xy: 757, 331 - size: 64, 64 - orig: 64, 64 - offset: 0, 0 - index: -1 -pyratite-mixer-icon-editor - rotate: false - xy: 757, 331 - size: 64, 64 - orig: 64, 64 - offset: 0, 0 - index: -1 -separator - rotate: false - xy: 823, 1 - size: 64, 64 - orig: 64, 64 - offset: 0, 0 - index: -1 -separator-icon-editor - rotate: false - xy: 823, 1 - size: 64, 64 - orig: 64, 64 - offset: 0, 0 - index: -1 -separator-liquid - rotate: false - xy: 889, 133 - size: 64, 64 - orig: 64, 64 - offset: 0, 0 - index: -1 -silicon-smelter - rotate: false - xy: 955, 133 - size: 64, 64 - orig: 64, 64 - offset: 0, 0 - index: -1 -silicon-smelter-icon-editor - rotate: false - xy: 955, 133 - size: 64, 64 - orig: 64, 64 - offset: 0, 0 - index: -1 -container - rotate: false - xy: 813, 661 - size: 64, 64 - orig: 64, 64 - offset: 0, 0 - index: -1 -container-icon-editor - rotate: false - xy: 813, 661 - size: 64, 64 - orig: 64, 64 - offset: 0, 0 - index: -1 -launch-pad - rotate: false - xy: 491, 923 - size: 96, 96 - orig: 96, 96 - offset: 0, 0 - index: -1 -launch-pad-icon-editor - rotate: false - xy: 491, 923 - size: 96, 96 - orig: 96, 96 - offset: 0, 0 - index: -1 -vault - rotate: false - xy: 883, 727 - size: 96, 96 - orig: 96, 96 - offset: 0, 0 - index: -1 -vault-icon-editor - rotate: false - xy: 883, 727 - size: 96, 96 - orig: 96, 96 - offset: 0, 0 - index: -1 -block-2 - rotate: false - xy: 681, 661 - size: 64, 64 - orig: 64, 64 - offset: 0, 0 - index: -1 -lancer-heat - rotate: false - xy: 427, 323 - size: 64, 64 - orig: 64, 64 - offset: 0, 0 - index: -1 -ripple-heat - rotate: false - xy: 785, 825 - size: 96, 96 - orig: 96, 96 - offset: 0, 0 - index: -1 -salvo-heat - rotate: false - xy: 757, 265 - size: 64, 64 - orig: 64, 64 - offset: 0, 0 - index: -1 -salvo-panel-left - rotate: false - xy: 955, 265 - size: 64, 64 - orig: 64, 64 - offset: 0, 0 - index: -1 -salvo-panel-right - rotate: false - xy: 757, 199 - size: 64, 64 - orig: 64, 64 - offset: 0, 0 - index: -1 -crawler-factory - rotate: false - xy: 813, 595 - size: 64, 64 - orig: 64, 64 - offset: 0, 0 - index: -1 -dagger-factory - rotate: false - xy: 813, 595 - size: 64, 64 - orig: 64, 64 - offset: 0, 0 - index: -1 -phantom-factory - rotate: false - xy: 813, 595 - size: 64, 64 - orig: 64, 64 - offset: 0, 0 - index: -1 -spirit-factory - rotate: false - xy: 813, 595 - size: 64, 64 - orig: 64, 64 - offset: 0, 0 - index: -1 -wraith-factory - rotate: false - xy: 813, 595 - size: 64, 64 - orig: 64, 64 - offset: 0, 0 - index: -1 -crawler-factory-top - rotate: false - xy: 575, 529 - size: 64, 64 - orig: 64, 64 - offset: 0, 0 - index: -1 -crawler-factory-top-open - rotate: false - xy: 427, 521 - size: 64, 64 - orig: 64, 64 - offset: 0, 0 - index: -1 -dagger-factory-top - rotate: false - xy: 361, 408 - size: 64, 64 - orig: 64, 64 - offset: 0, 0 - index: -1 -dagger-factory-top-open - rotate: false - xy: 625, 463 - size: 64, 64 - orig: 64, 64 - offset: 0, 0 - index: -1 -ghoul-factory - rotate: false - xy: 1, 629 - size: 96, 96 - orig: 96, 96 - offset: 0, 0 - index: -1 -phantom-factory-top - rotate: false - xy: 427, 125 - size: 64, 64 - orig: 64, 64 - offset: 0, 0 - index: -1 -phantom-factory-top-open - rotate: false - xy: 493, 125 - size: 64, 64 - orig: 64, 64 - offset: 0, 0 - index: -1 -spirit-factory-top - rotate: false - xy: 955, 67 - size: 64, 64 - orig: 64, 64 - offset: 0, 0 - index: -1 -spirit-factory-top-open - rotate: false - xy: 955, 1 - size: 64, 64 - orig: 64, 64 - offset: 0, 0 - index: -1 -titan-factory - rotate: false - xy: 589, 727 - size: 96, 96 - orig: 96, 96 - offset: 0, 0 - index: -1 -copper-wall-large - rotate: false - xy: 879, 661 - size: 64, 64 - orig: 64, 64 - offset: 0, 0 - index: -1 -copper-wall-large-icon-editor - rotate: false - xy: 879, 661 - size: 64, 64 - orig: 64, 64 - offset: 0, 0 - index: -1 -door-large - rotate: false - xy: 889, 463 - size: 64, 64 - orig: 64, 64 - offset: 0, 0 - index: -1 -door-large-icon-editor - rotate: false - xy: 889, 463 - size: 64, 64 - orig: 64, 64 - offset: 0, 0 - index: -1 -door-large-open - rotate: false - xy: 955, 463 - size: 64, 64 - orig: 64, 64 - offset: 0, 0 - index: -1 -phase-wall-large - rotate: false - xy: 295, 78 - size: 64, 64 - orig: 64, 64 - offset: 0, 0 - index: -1 -phase-wall-large-icon-editor - rotate: false - xy: 295, 78 - size: 64, 64 - orig: 64, 64 - offset: 0, 0 - index: -1 -scrap-wall-huge1 - rotate: false - xy: 197, 531 - size: 96, 96 - orig: 96, 96 - offset: 0, 0 - index: -1 -scrap-wall-huge-icon-editor - rotate: false - xy: 197, 531 - size: 96, 96 - orig: 96, 96 - offset: 0, 0 - index: -1 -scrap-wall-huge2 - rotate: false - xy: 197, 433 - size: 96, 96 - orig: 96, 96 - offset: 0, 0 - index: -1 -scrap-wall-huge3 - rotate: false - xy: 197, 335 - size: 96, 96 - orig: 96, 96 - offset: 0, 0 - index: -1 -scrap-wall-large1 - rotate: false - xy: 823, 199 - size: 64, 64 - orig: 64, 64 - offset: 0, 0 - index: -1 -scrap-wall-large2 - rotate: false - xy: 889, 199 - size: 64, 64 - orig: 64, 64 - offset: 0, 0 - index: -1 -scrap-wall-large3 - rotate: false - xy: 955, 199 - size: 64, 64 - orig: 64, 64 - offset: 0, 0 - index: -1 -scrap-wall-large4 - rotate: false - xy: 823, 133 - size: 64, 64 - orig: 64, 64 - offset: 0, 0 - index: -1 -crawler-factory-icon-editor - rotate: false - xy: 879, 595 - size: 64, 64 - orig: 64, 64 - offset: 0, 0 - index: -1 -cryofluidmixer-icon-editor - rotate: false - xy: 295, 474 - size: 64, 64 - orig: 64, 64 - offset: 0, 0 - index: -1 -cultivator-icon-editor - rotate: false - xy: 839, 529 - size: 64, 64 - orig: 64, 64 - offset: 0, 0 - index: -1 -dagger-factory-icon-editor - rotate: false - xy: 493, 455 - size: 64, 64 - orig: 64, 64 - offset: 0, 0 - index: -1 -fuse-icon-editor - rotate: false - xy: 1, 825 - size: 96, 96 - orig: 96, 96 - offset: 0, 0 - index: -1 -ghoul-factory-icon-editor - rotate: false - xy: 1, 531 + xy: 1, 921 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 glaive-ship-pad-icon-editor rotate: false - xy: 1, 237 + xy: 1, 921 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 +javelin-ship-pad + rotate: false + xy: 661, 355 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 javelin-ship-pad-icon-editor rotate: false - xy: 823, 397 + xy: 661, 355 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +omega-mech-pad + rotate: false + xy: 393, 725 + size: 96, 96 + orig: 96, 96 + offset: 0, 0 + index: -1 +omega-mech-pad-icon-editor + rotate: false + xy: 393, 725 + size: 96, 96 + orig: 96, 96 + offset: 0, 0 + index: -1 +tau-mech-pad + rotate: false + xy: 661, 25 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +tau-mech-pad-icon-editor + rotate: false + xy: 661, 25 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +power-node-large + rotate: false + xy: 133, 199 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +rtg-generator + rotate: false + xy: 727, 165 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +rtg-generator-icon-editor + rotate: false + xy: 727, 165 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +solar-panel-large + rotate: false + xy: 393, 627 + size: 96, 96 + orig: 96, 96 + offset: 0, 0 + index: -1 +solar-panel-large-icon-editor + rotate: false + xy: 393, 627 + size: 96, 96 + orig: 96, 96 + offset: 0, 0 + index: -1 +surge-tower + rotate: false + xy: 925, 33 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +surge-tower-icon-editor + rotate: false + xy: 925, 33 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +thermal-generator + rotate: false + xy: 1, 1 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +thermal-generator-icon-editor + rotate: false + xy: 1, 1 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +thorium-reactor + rotate: false + xy: 589, 627 + size: 96, 96 + orig: 96, 96 + offset: 0, 0 + index: -1 +thorium-reactor-icon-editor + rotate: false + xy: 589, 627 + size: 96, 96 + orig: 96, 96 + offset: 0, 0 + index: -1 +thorium-reactor-center + rotate: false + xy: 687, 627 + size: 96, 96 + orig: 96, 96 + offset: 0, 0 + index: -1 +thorium-reactor-lights + rotate: false + xy: 785, 627 + size: 96, 96 + orig: 96, 96 + offset: 0, 0 + index: -1 +blast-mixer + rotate: false + xy: 763, 561 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +blast-mixer-icon-editor + rotate: false + xy: 763, 561 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +coal-centrifuge + rotate: false + xy: 895, 561 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +coal-centrifuge-icon-editor + rotate: false + xy: 895, 561 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cryofluidmixer-bottom + rotate: false + xy: 265, 448 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cryofluidmixer-liquid + rotate: false + xy: 823, 429 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cryofluidmixer-top + rotate: false + xy: 889, 429 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cultivator + rotate: false + xy: 955, 429 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cultivator-middle + rotate: false + xy: 529, 421 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cultivator-top + rotate: false + xy: 595, 421 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +graphite-press + rotate: false + xy: 595, 355 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +graphite-press-icon-editor + rotate: false + xy: 595, 355 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +kiln + rotate: false + xy: 1, 331 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +kiln-icon-editor + rotate: false + xy: 1, 331 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +kiln-top + rotate: false + xy: 67, 331 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +silicon-smelter-top + rotate: false + xy: 67, 331 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +multi-press + rotate: false + xy: 687, 823 + size: 96, 96 + orig: 96, 96 + offset: 0, 0 + index: -1 +multi-press-icon-editor + rotate: false + xy: 687, 823 + size: 96, 96 + orig: 96, 96 + offset: 0, 0 + index: -1 +phase-weaver + rotate: false + xy: 331, 250 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +phase-weaver-bottom + rotate: false + xy: 727, 231 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +phase-weaver-weave + rotate: false + xy: 925, 231 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +plastanium-compressor + rotate: false + xy: 397, 223 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +plastanium-compressor-icon-editor + rotate: false + xy: 397, 223 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +plastanium-compressor-top + rotate: false + xy: 463, 223 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +pyratite-mixer + rotate: false + xy: 265, 184 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +pyratite-mixer-icon-editor + rotate: false + xy: 265, 184 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +separator + rotate: false + xy: 397, 91 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +separator-icon-editor + rotate: false + xy: 397, 91 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +separator-liquid + rotate: false + xy: 463, 91 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +silicon-smelter + rotate: false + xy: 529, 91 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +silicon-smelter-icon-editor + rotate: false + xy: 529, 91 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +spore-press + rotate: false + xy: 67, 67 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +spore-press-frame0 + rotate: false + xy: 133, 67 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +spore-press-frame1 + rotate: false + xy: 199, 67 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +spore-press-frame2 + rotate: false + xy: 265, 52 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +spore-press-liquid + rotate: false + xy: 793, 33 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +spore-press-top + rotate: false + xy: 859, 33 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +container + rotate: false + xy: 295, 514 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +container-icon-editor + rotate: false + xy: 295, 514 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +launch-pad + rotate: false + xy: 687, 921 + size: 96, 96 + orig: 96, 96 + offset: 0, 0 + index: -1 +launch-pad-icon-editor + rotate: false + xy: 687, 921 + size: 96, 96 + orig: 96, 96 + offset: 0, 0 + index: -1 +vault + rotate: false + xy: 197, 529 + size: 96, 96 + orig: 96, 96 + offset: 0, 0 + index: -1 +vault-icon-editor + rotate: false + xy: 197, 529 + size: 96, 96 + orig: 96, 96 + offset: 0, 0 + index: -1 +block-2 + rotate: false + xy: 829, 561 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +lancer-heat + rotate: false + xy: 199, 331 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +ripple-heat + rotate: false + xy: 687, 725 + size: 96, 96 + orig: 96, 96 + offset: 0, 0 + index: -1 +salvo-heat + rotate: false + xy: 529, 157 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +salvo-panel-left + rotate: false + xy: 1, 133 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +salvo-panel-right + rotate: false + xy: 67, 133 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +crawler-factory + rotate: false + xy: 1, 463 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +dagger-factory + rotate: false + xy: 1, 463 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +phantom-factory + rotate: false + xy: 1, 463 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +spirit-factory + rotate: false + xy: 1, 463 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +wraith-factory + rotate: false + xy: 1, 463 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +crawler-factory-top + rotate: false + xy: 199, 463 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +dagger-factory-top + rotate: false + xy: 67, 397 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +phantom-factory-top + rotate: false + xy: 199, 265 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +spirit-factory-top + rotate: false + xy: 1, 67 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +titan-factory + rotate: false + xy: 883, 627 + size: 96, 96 + orig: 96, 96 + offset: 0, 0 + index: -1 +copper-wall-large + rotate: false + xy: 361, 514 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +copper-wall-large-icon-editor + rotate: false + xy: 361, 514 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +door-large + rotate: false + xy: 331, 382 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +door-large-icon-editor + rotate: false + xy: 331, 382 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +door-large-open + rotate: false + xy: 727, 363 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +phase-wall-large + rotate: false + xy: 265, 250 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +phase-wall-large-icon-editor + rotate: false + xy: 265, 250 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +scrap-wall-huge1 + rotate: false + xy: 99, 627 + size: 96, 96 + orig: 96, 96 + offset: 0, 0 + index: -1 +scrap-wall-huge-icon-editor + rotate: false + xy: 99, 627 + size: 96, 96 + orig: 96, 96 + offset: 0, 0 + index: -1 +scrap-wall-huge2 + rotate: false + xy: 197, 627 + size: 96, 96 + orig: 96, 96 + offset: 0, 0 + index: -1 +scrap-wall-huge3 + rotate: false + xy: 295, 627 + size: 96, 96 + orig: 96, 96 + offset: 0, 0 + index: -1 +scrap-wall-large1 + rotate: false + xy: 331, 118 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +scrap-wall-large2 + rotate: false + xy: 727, 99 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +scrap-wall-large3 + rotate: false + xy: 793, 99 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +scrap-wall-large4 + rotate: false + xy: 859, 99 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +surge-wall-large + rotate: false + xy: 397, 25 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +surge-wall-large-icon-editor + rotate: false + xy: 397, 25 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +thorium-wall-large + rotate: false + xy: 67, 1 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +thorium-wall-large-icon-editor + rotate: false + xy: 67, 1 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +crawler-factory-icon-editor + rotate: false + xy: 67, 463 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cryofluidmixer-icon-editor + rotate: false + xy: 331, 448 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +cultivator-icon-editor + rotate: false + xy: 397, 421 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +dagger-factory-icon-editor + rotate: false + xy: 661, 421 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 lancer-icon-editor rotate: false - xy: 493, 323 + xy: 265, 316 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 laser-drill-icon-editor rotate: false - xy: 1, 41 + xy: 197, 921 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 liquid-tank-icon-editor rotate: false - xy: 687, 923 + xy: 883, 921 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 mass-driver-icon-editor rotate: false - xy: 99, 531 + xy: 491, 823 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 mechanical-drill-icon-editor rotate: false - xy: 559, 265 + xy: 793, 297 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 oil-extractor-icon-editor rotate: false - xy: 99, 139 + xy: 883, 823 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 phantom-factory-icon-editor rotate: false - xy: 361, 144 + xy: 67, 265 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 phase-weaver-icon-editor rotate: false - xy: 361, 12 + xy: 793, 231 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 pneumatic-drill-icon-editor rotate: false - xy: 625, 265 + xy: 595, 223 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 power-node-large-icon-editor rotate: false - xy: 691, 331 + xy: 199, 199 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 ripple-icon-editor rotate: false - xy: 883, 825 + xy: 785, 725 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 -rotary-pump-icon-editor - rotate: false - xy: 889, 331 - size: 64, 64 - orig: 64, 64 - offset: 0, 0 - index: -1 salvo-icon-editor rotate: false - xy: 823, 265 + xy: 595, 157 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 scatter-icon-editor rotate: false - xy: 757, 67 + xy: 199, 133 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 scrap-wall-large-icon-editor rotate: false - xy: 823, 67 + xy: 925, 99 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 spirit-factory-icon-editor rotate: false - xy: 889, 67 + xy: 595, 91 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 -thermal-pump-icon-editor +spore-press-icon-editor rotate: false - xy: 197, 41 - size: 96, 96 - orig: 96, 96 + xy: 331, 52 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +swarmer-icon-editor + rotate: false + xy: 529, 25 + size: 64, 64 + orig: 64, 64 offset: 0, 0 index: -1 titan-factory-icon-editor rotate: false - xy: 687, 727 + xy: 1, 529 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 laser-end rotate: false - xy: 295, 606 + xy: 541, 553 size: 72, 72 orig: 72, 72 offset: 0, 0 index: -1 minelaser-end rotate: false - xy: 369, 606 + xy: 615, 553 size: 72, 72 orig: 72, 72 offset: 0, 0 index: -1 transfer-end rotate: false - xy: 541, 653 + xy: 689, 553 size: 72, 72 orig: 72, 72 offset: 0, 0 index: -1 cracks-2-0 rotate: false - xy: 945, 661 + xy: 763, 495 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cracks-2-1 rotate: false - xy: 615, 595 + xy: 829, 495 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cracks-2-2 rotate: false - xy: 443, 587 + xy: 895, 495 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cracks-2-3 rotate: false - xy: 509, 587 + xy: 427, 487 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cracks-2-4 rotate: false - xy: 295, 540 + xy: 493, 487 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cracks-2-5 rotate: false - xy: 361, 540 + xy: 559, 487 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cracks-2-6 rotate: false - xy: 681, 595 + xy: 625, 487 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cracks-2-7 rotate: false - xy: 747, 595 + xy: 691, 487 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 crawler-factory-icon-full rotate: false - xy: 945, 595 + xy: 133, 463 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cryofluidmixer-icon-full rotate: false - xy: 361, 474 + xy: 757, 429 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cultivator-icon-full rotate: false - xy: 905, 529 + xy: 463, 421 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 dagger-factory-icon-full rotate: false - xy: 295, 408 + xy: 1, 397 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 -fuse - rotate: false - xy: 1, 923 - size: 96, 96 - orig: 96, 96 - offset: 0, 0 - index: -1 -fuse-icon-full - rotate: false - xy: 1, 727 - size: 96, 96 - orig: 96, 96 - offset: 0, 0 - index: -1 -ghoul-factory-icon-full - rotate: false - xy: 1, 433 - size: 96, 96 - orig: 96, 96 - offset: 0, 0 - index: -1 lancer rotate: false - xy: 559, 331 + xy: 133, 331 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 lancer-icon-full rotate: false - xy: 295, 276 + xy: 331, 316 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 laser-drill-icon-full rotate: false - xy: 99, 923 + xy: 295, 921 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 liquid-tank-icon-full rotate: false - xy: 785, 923 + xy: 1, 823 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 mass-driver rotate: false - xy: 99, 727 + xy: 295, 823 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 mass-driver-icon-full rotate: false - xy: 99, 433 + xy: 589, 823 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 mechanical-drill-icon-full rotate: false - xy: 427, 257 + xy: 859, 297 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 oil-extractor-icon-full rotate: false - xy: 99, 41 + xy: 1, 725 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 phantom-factory-icon-full rotate: false - xy: 559, 133 + xy: 133, 265 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 phase-weaver-icon-full rotate: false - xy: 559, 67 + xy: 859, 231 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 pneumatic-drill-icon-full rotate: false - xy: 625, 199 + xy: 661, 223 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 ripple rotate: false - xy: 687, 825 + xy: 589, 725 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 ripple-icon-full rotate: false - xy: 197, 727 + xy: 883, 725 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 salvo rotate: false - xy: 691, 1 + xy: 463, 157 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 salvo-icon-full rotate: false - xy: 889, 265 + xy: 661, 157 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 scatter rotate: false - xy: 757, 133 + xy: 133, 133 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 scatter-icon-full rotate: false - xy: 757, 1 + xy: 265, 118 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 spirit-factory-icon-full rotate: false - xy: 889, 1 + xy: 661, 91 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +spore-press-icon-full + rotate: false + xy: 727, 33 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +swarmer + rotate: false + xy: 463, 25 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +swarmer-icon-full + rotate: false + xy: 595, 25 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 titan-factory-icon-full rotate: false - xy: 785, 727 + xy: 99, 529 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 omega-mech-armor rotate: false - xy: 427, 191 + xy: 595, 289 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 discord-banner rotate: false - xy: 295, 680 + xy: 295, 580 size: 84, 45 orig: 84, 45 offset: 0, 0 index: -1 info-banner rotate: false - xy: 381, 680 + xy: 381, 580 size: 84, 45 orig: 84, 45 offset: 0, 0 index: -1 eruptor rotate: false - xy: 559, 397 + xy: 793, 363 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 eruptor-base rotate: false - xy: 427, 389 + xy: 859, 363 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 eruptor-leg rotate: false - xy: 493, 389 + xy: 925, 363 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 fortress rotate: false - xy: 295, 342 + xy: 397, 355 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 fortress-base rotate: false - xy: 361, 342 + xy: 463, 355 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 titan-base rotate: false - xy: 361, 342 + xy: 463, 355 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 fortress-leg rotate: false - xy: 625, 397 + xy: 529, 355 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 ghoul rotate: false - xy: 467, 653 + xy: 467, 553 size: 72, 72 orig: 72, 72 offset: 0, 0 index: -1 +titan + rotate: false + xy: 133, 1 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +titan-leg + rotate: false + xy: 199, 1 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 sprites_fallback4.png size: 1024,1024 @@ -2180,3087 +2278,3472 @@ filter: Nearest,Nearest repeat: none bridge-conveyor rotate: false - xy: 952, 391 + xy: 797, 106 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conveyor-icon-editor rotate: false - xy: 952, 391 + xy: 797, 106 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conveyor-bridge rotate: false - xy: 986, 391 + xy: 893, 634 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conveyor-end rotate: false - xy: 911, 373 + xy: 927, 618 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +center + rotate: false + xy: 961, 618 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-0-0 rotate: false - xy: 903, 305 + xy: 339, 82 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-icon-editor rotate: false - xy: 903, 305 + xy: 339, 82 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-0-1 rotate: false - xy: 860, 276 + xy: 373, 116 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-0-2 rotate: false - xy: 826, 266 + xy: 339, 48 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-0-3 rotate: false - xy: 777, 234 + xy: 373, 82 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-1-0 rotate: false - xy: 971, 323 + xy: 407, 116 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-1-1 rotate: false - xy: 709, 216 + xy: 373, 48 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-1-2 rotate: false - xy: 675, 189 + xy: 407, 82 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-1-3 rotate: false - xy: 641, 173 + xy: 441, 116 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-2-0 rotate: false - xy: 743, 216 + xy: 407, 48 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-2-1 rotate: false - xy: 937, 289 + xy: 441, 82 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-2-2 rotate: false - xy: 894, 271 + xy: 475, 116 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-2-3 rotate: false - xy: 860, 242 + xy: 441, 48 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-3-0 rotate: false - xy: 811, 232 + xy: 475, 82 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-3-1 rotate: false - xy: 777, 200 + xy: 509, 116 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-3-2 rotate: false - xy: 971, 289 + xy: 475, 48 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-3-3 rotate: false - xy: 709, 182 + xy: 509, 82 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-4-0 rotate: false - xy: 675, 155 + xy: 543, 116 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-4-1 rotate: false - xy: 641, 139 + xy: 509, 48 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-4-2 rotate: false - xy: 743, 182 + xy: 543, 82 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-4-3 rotate: false - xy: 928, 255 + xy: 543, 48 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 water-extractor rotate: false - xy: 793, 959 + xy: 67, 825 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 water-extractor-liquid rotate: false - xy: 67, 893 + xy: 1, 693 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 water-extractor-rotator rotate: false - xy: 67, 827 + xy: 67, 759 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 water-extractor-top rotate: false - xy: 67, 761 + xy: 133, 825 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-border rotate: false - xy: 923, 441 + xy: 797, 344 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-border-editor rotate: false - xy: 923, 441 + xy: 797, 344 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-middle rotate: false - xy: 884, 412 + xy: 797, 310 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pump-liquid rotate: false - xy: 884, 412 + xy: 797, 310 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-select rotate: false - xy: 843, 402 + xy: 797, 276 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-liquid rotate: false - xy: 869, 310 + xy: 237, 82 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conduit rotate: false - xy: 957, 425 + xy: 797, 242 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conduit-icon-editor rotate: false - xy: 957, 425 + xy: 797, 242 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conduit-arrow rotate: false - xy: 991, 425 + xy: 797, 208 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conveyor-arrow rotate: false - xy: 991, 425 + xy: 797, 208 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conduit-bridge rotate: false - xy: 918, 407 + xy: 797, 174 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conduit-end rotate: false - xy: 877, 378 + xy: 797, 140 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom rotate: false - xy: 690, 291 + xy: 135, 57 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-0 rotate: false - xy: 758, 318 + xy: 169, 91 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-1 rotate: false - xy: 792, 302 + xy: 135, 23 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-2 rotate: false - xy: 641, 275 + xy: 169, 57 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-3 rotate: false - xy: 724, 284 + xy: 169, 23 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-4 rotate: false - xy: 758, 284 + xy: 203, 125 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-5 rotate: false - xy: 675, 257 + xy: 203, 91 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-6 rotate: false - xy: 641, 241 + xy: 203, 57 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-0 rotate: false - xy: 826, 300 + xy: 271, 116 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-1 rotate: false - xy: 792, 268 + xy: 237, 48 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-2 rotate: false - xy: 979, 357 + xy: 271, 82 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-3 rotate: false - xy: 709, 250 + xy: 305, 116 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-4 rotate: false - xy: 675, 223 + xy: 271, 48 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-5 rotate: false - xy: 641, 207 + xy: 305, 82 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-6 rotate: false - xy: 743, 250 + xy: 339, 116 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -tau-mech-pad - rotate: false - xy: 1, 101 - size: 64, 64 - orig: 64, 64 - offset: 0, 0 - index: -1 -tau-mech-pad-icon-editor - rotate: false - xy: 1, 101 - size: 64, 64 - orig: 64, 64 - offset: 0, 0 - index: -1 trident-ship-pad rotate: false - xy: 331, 959 - size: 64, 64 - orig: 64, 64 - offset: 0, 0 - index: -1 -battery - rotate: false - xy: 991, 821 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -battery-icon-editor - rotate: false - xy: 991, 821 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -combustion-generator - rotate: false - xy: 690, 325 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -combustion-generator-icon-editor - rotate: false - xy: 690, 325 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -combustion-generator-top - rotate: false - xy: 724, 318 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -surge-tower - rotate: false - xy: 1, 431 - size: 64, 64 - orig: 64, 64 - offset: 0, 0 - index: -1 -surge-tower-icon-editor - rotate: false - xy: 1, 431 - size: 64, 64 - orig: 64, 64 - offset: 0, 0 - index: -1 -thermal-generator - rotate: false - xy: 1, 35 - size: 64, 64 - orig: 64, 64 - offset: 0, 0 - index: -1 -thermal-generator-icon-editor - rotate: false - xy: 1, 35 - size: 64, 64 - orig: 64, 64 - offset: 0, 0 - index: -1 -turbine-generator - rotate: false - xy: 463, 959 - size: 64, 64 - orig: 64, 64 - offset: 0, 0 - index: -1 -turbine-generator-icon-editor - rotate: false - xy: 463, 959 - size: 64, 64 - orig: 64, 64 - offset: 0, 0 - index: -1 -turbine-generator-top - rotate: false - xy: 529, 959 - size: 64, 64 - orig: 64, 64 - offset: 0, 0 - index: -1 -spore-press - rotate: false - xy: 1, 959 - size: 64, 64 - orig: 64, 64 - offset: 0, 0 - index: -1 -spore-press-frame0 - rotate: false - xy: 1, 893 - size: 64, 64 - orig: 64, 64 - offset: 0, 0 - index: -1 -spore-press-frame1 - rotate: false - xy: 1, 827 - size: 64, 64 - orig: 64, 64 - offset: 0, 0 - index: -1 -spore-press-frame2 - rotate: false - xy: 1, 761 - size: 64, 64 - orig: 64, 64 - offset: 0, 0 - index: -1 -spore-press-liquid - rotate: false - xy: 1, 563 - size: 64, 64 - orig: 64, 64 - offset: 0, 0 - index: -1 -spore-press-top - rotate: false - xy: 1, 497 - size: 64, 64 - orig: 64, 64 - offset: 0, 0 - index: -1 -arc-heat - rotate: false - xy: 991, 923 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -block-1 - rotate: false - xy: 809, 404 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -hail-heat - rotate: false - xy: 391, 1 - size: 40, 40 - orig: 40, 40 - offset: 0, 0 - index: -1 -wave-liquid - rotate: false - xy: 67, 497 - size: 64, 64 - orig: 64, 64 - offset: 0, 0 - index: -1 -wraith-factory-top - rotate: false - xy: 67, 299 - size: 64, 64 - orig: 64, 64 - offset: 0, 0 - index: -1 -wraith-factory-top-open - rotate: false - xy: 67, 233 - size: 64, 64 - orig: 64, 64 - offset: 0, 0 - index: -1 -copper-wall - rotate: false - xy: 894, 237 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -copper-wall-icon-editor - rotate: false - xy: 894, 237 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -door - rotate: false - xy: 743, 46 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -door-icon-editor - rotate: false - xy: 743, 46 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -door-open - rotate: false - xy: 777, 64 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -surge-wall-large - rotate: false - xy: 1, 365 - size: 64, 64 - orig: 64, 64 - offset: 0, 0 - index: -1 -surge-wall-large-icon-editor - rotate: false - xy: 1, 365 - size: 64, 64 - orig: 64, 64 - offset: 0, 0 - index: -1 -thorium-wall-large - rotate: false - xy: 67, 959 - size: 64, 64 - orig: 64, 64 - offset: 0, 0 - index: -1 -thorium-wall-large-icon-editor - rotate: false - xy: 67, 959 - size: 64, 64 - orig: 64, 64 - offset: 0, 0 - index: -1 -titanium-wall-large - rotate: false - xy: 265, 959 - size: 64, 64 - orig: 64, 64 - offset: 0, 0 - index: -1 -titanium-wall-large-icon-editor - rotate: false - xy: 265, 959 - size: 64, 64 - orig: 64, 64 - offset: 0, 0 - index: -1 -arc-icon-editor - rotate: false - xy: 991, 889 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -char-icon-editor - rotate: false - xy: 733, 386 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -editor-char1 - rotate: false - xy: 733, 386 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -cliffs-icon-editor - rotate: false - xy: 801, 336 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -conduit-icon-editor - rotate: false - xy: 945, 357 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -craters-icon-editor - rotate: false - xy: 777, 132 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -editor-craters1 - rotate: false - xy: 777, 132 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -dark-metal-icon-editor - rotate: false - xy: 641, 37 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -dark-panel-1-icon-editor - rotate: false - xy: 641, 3 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -editor-dark-panel-1 - rotate: false - xy: 641, 3 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -dark-panel-2-icon-editor - rotate: false - xy: 675, 53 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -editor-dark-panel-2 - rotate: false - xy: 675, 53 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -dark-panel-3-icon-editor - rotate: false - xy: 675, 19 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -editor-dark-panel-3 - rotate: false - xy: 675, 19 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -dark-panel-4-icon-editor - rotate: false - xy: 913, 187 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -editor-dark-panel-4 - rotate: false - xy: 913, 187 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -dark-panel-5-icon-editor - rotate: false - xy: 879, 169 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -editor-dark-panel-5 - rotate: false - xy: 879, 169 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -dark-panel-6-icon-editor - rotate: false - xy: 845, 140 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -editor-dark-panel-6 - rotate: false - xy: 845, 140 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -darksand-icon-editor - rotate: false - xy: 811, 130 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -editor-darksand1 - rotate: false - xy: 811, 130 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -darksand-tainted-water-icon-editor - rotate: false - xy: 777, 98 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -editor-darksand-tainted-water - rotate: false - xy: 777, 98 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -darksand-water-icon-editor - rotate: false - xy: 709, 80 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -editor-darksand-water - rotate: false - xy: 709, 80 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -deepwater-icon-editor - rotate: false - xy: 947, 187 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -editor-deepwater - rotate: false - xy: 947, 187 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -dunerocks-icon-editor - rotate: false - xy: 777, 30 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -duo-icon-editor - rotate: false - xy: 879, 135 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -editor-char2 - rotate: false - xy: 811, 96 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -editor-char3 - rotate: false - xy: 947, 153 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -editor-craters2 - rotate: false - xy: 981, 153 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -editor-craters3 - rotate: false - xy: 811, 62 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -editor-darksand2 - rotate: false - xy: 811, 28 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -editor-darksand3 - rotate: false - xy: 845, 72 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -editor-grass1 - rotate: false - xy: 845, 38 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -grass-icon-editor - rotate: false - xy: 845, 38 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -editor-grass2 - rotate: false - xy: 845, 4 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -editor-grass3 - rotate: false - xy: 913, 119 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -editor-holostone1 - rotate: false - xy: 879, 101 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -holostone-icon-editor - rotate: false - xy: 879, 101 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -editor-holostone2 - rotate: false - xy: 947, 119 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -editor-holostone3 - rotate: false - xy: 981, 119 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -editor-hotrock1 - rotate: false - xy: 879, 67 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -hotrock-icon-editor - rotate: false - xy: 879, 67 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -editor-hotrock2 - rotate: false - xy: 879, 33 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -editor-hotrock3 - rotate: false - xy: 913, 85 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -editor-ice-snow1 - rotate: false - xy: 913, 17 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -ice-snow-icon-editor - rotate: false - xy: 913, 17 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -editor-ice-snow2 - rotate: false - xy: 947, 51 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -editor-ice-snow3 - rotate: false - xy: 981, 51 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -editor-ice1 - rotate: false - xy: 947, 85 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -ice-icon-editor - rotate: false - xy: 947, 85 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -editor-ice2 - rotate: false - xy: 981, 85 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -editor-ice3 - rotate: false - xy: 913, 51 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -editor-ignarock1 - rotate: false - xy: 947, 17 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -ignarock-icon-editor - rotate: false - xy: 947, 17 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -editor-ignarock2 - rotate: false - xy: 981, 17 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -pine-icon-editor - rotate: false - xy: 491, 259 - size: 48, 48 - orig: 48, 48 - offset: 0, 0 - index: -1 -rock-icon-editor - rotate: false - xy: 491, 159 - size: 48, 48 - orig: 48, 48 - offset: 0, 0 - index: -1 -snowrock-icon-editor - rotate: false - xy: 687, 659 - size: 48, 48 - orig: 48, 48 - offset: 0, 0 - index: -1 -spore-cluster-icon-editor - rotate: false - xy: 859, 491 - size: 40, 40 - orig: 40, 40 - offset: 0, 0 - index: -1 -spore-pine-icon-editor - rotate: false - xy: 591, 209 - size: 48, 48 - orig: 48, 48 - offset: 0, 0 - index: -1 -spore-press-icon-editor - rotate: false - xy: 1, 695 - size: 64, 64 - orig: 64, 64 - offset: 0, 0 - index: -1 -swarmer-icon-editor - rotate: false - xy: 1, 233 + xy: 1, 891 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 trident-ship-pad-icon-editor rotate: false - xy: 397, 959 + xy: 1, 891 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 +battery + rotate: false + xy: 797, 514 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +battery-icon-editor + rotate: false + xy: 797, 514 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +combustion-generator + rotate: false + xy: 169, 125 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +combustion-generator-icon-editor + rotate: false + xy: 169, 125 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +combustion-generator-top + rotate: false + xy: 135, 91 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +turbine-generator + rotate: false + xy: 67, 957 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +turbine-generator-icon-editor + rotate: false + xy: 67, 957 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +turbine-generator-top + rotate: false + xy: 1, 825 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +arc-heat + rotate: false + xy: 989, 879 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +block-1 + rotate: false + xy: 797, 378 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +hail-heat + rotate: false + xy: 982, 981 + size: 40, 40 + orig: 40, 40 + offset: 0, 0 + index: -1 +wave-liquid + rotate: false + xy: 67, 693 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +wraith-factory-top + rotate: false + xy: 265, 891 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +copper-wall + rotate: false + xy: 237, 14 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +copper-wall-icon-editor + rotate: false + xy: 237, 14 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +door + rotate: false + xy: 831, 584 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +door-icon-editor + rotate: false + xy: 831, 584 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +door-open + rotate: false + xy: 831, 516 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +titanium-wall-large + rotate: false + xy: 1, 957 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +titanium-wall-large-icon-editor + rotate: false + xy: 1, 957 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +arc-icon-editor + rotate: false + xy: 797, 582 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +char-icon-editor + rotate: false + xy: 101, 193 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +editor-char1 + rotate: false + xy: 101, 193 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +cliffs-icon-editor + rotate: false + xy: 135, 125 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +conduit-icon-editor + rotate: false + xy: 203, 23 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +craters-icon-editor + rotate: false + xy: 611, 47 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +editor-craters1 + rotate: false + xy: 611, 47 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +dark-metal-icon-editor + rotate: false + xy: 713, 47 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +dark-panel-1-icon-editor + rotate: false + xy: 577, 13 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +editor-dark-panel-1 + rotate: false + xy: 577, 13 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +dark-panel-2-icon-editor + rotate: false + xy: 611, 13 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +editor-dark-panel-2 + rotate: false + xy: 611, 13 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +dark-panel-3-icon-editor + rotate: false + xy: 645, 13 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +editor-dark-panel-3 + rotate: false + xy: 645, 13 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +dark-panel-4-icon-editor + rotate: false + xy: 679, 13 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +editor-dark-panel-4 + rotate: false + xy: 679, 13 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +dark-panel-5-icon-editor + rotate: false + xy: 713, 13 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +editor-dark-panel-5 + rotate: false + xy: 713, 13 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +dark-panel-6-icon-editor + rotate: false + xy: 747, 81 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +editor-dark-panel-6 + rotate: false + xy: 747, 81 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +darksand-icon-editor + rotate: false + xy: 747, 47 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +editor-darksand1 + rotate: false + xy: 747, 47 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +darksand-tainted-water-icon-editor + rotate: false + xy: 747, 13 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +editor-darksand-tainted-water + rotate: false + xy: 747, 13 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +darksand-water-icon-editor + rotate: false + xy: 781, 72 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +editor-darksand-water + rotate: false + xy: 781, 72 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +deepwater-icon-editor + rotate: false + xy: 781, 4 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +editor-deepwater + rotate: false + xy: 781, 4 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +dunerocks-icon-editor + rotate: false + xy: 831, 482 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +duo-icon-editor + rotate: false + xy: 831, 414 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +editor-char2 + rotate: false + xy: 831, 346 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +editor-char3 + rotate: false + xy: 831, 312 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +editor-craters2 + rotate: false + xy: 831, 278 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +editor-craters3 + rotate: false + xy: 831, 244 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +editor-darksand2 + rotate: false + xy: 831, 210 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +editor-darksand3 + rotate: false + xy: 831, 176 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +editor-grass1 + rotate: false + xy: 831, 142 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +grass-icon-editor + rotate: false + xy: 831, 142 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +editor-grass2 + rotate: false + xy: 831, 108 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +editor-grass3 + rotate: false + xy: 865, 600 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +editor-holostone1 + rotate: false + xy: 865, 566 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +holostone-icon-editor + rotate: false + xy: 865, 566 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +editor-holostone2 + rotate: false + xy: 865, 532 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +editor-holostone3 + rotate: false + xy: 865, 498 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +editor-hotrock1 + rotate: false + xy: 865, 464 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +hotrock-icon-editor + rotate: false + xy: 865, 464 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +editor-hotrock2 + rotate: false + xy: 865, 430 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +editor-hotrock3 + rotate: false + xy: 865, 396 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +editor-ice-snow1 + rotate: false + xy: 865, 260 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +ice-snow-icon-editor + rotate: false + xy: 865, 260 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +editor-ice-snow2 + rotate: false + xy: 865, 226 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +editor-ice-snow3 + rotate: false + xy: 865, 192 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +editor-ice1 + rotate: false + xy: 865, 362 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +ice-icon-editor + rotate: false + xy: 865, 362 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +editor-ice2 + rotate: false + xy: 865, 328 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +editor-ice3 + rotate: false + xy: 865, 294 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +editor-ignarock1 + rotate: false + xy: 865, 158 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +ignarock-icon-editor + rotate: false + xy: 865, 158 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +editor-ignarock2 + rotate: false + xy: 865, 124 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +editor-ignarock3 + rotate: false + xy: 865, 90 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +editor-magmarock1 + rotate: false + xy: 849, 56 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +magmarock-icon-editor + rotate: false + xy: 849, 56 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +editor-magmarock2 + rotate: false + xy: 849, 22 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +editor-magmarock3 + rotate: false + xy: 883, 56 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +editor-metal-floor + rotate: false + xy: 883, 22 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +metal-floor-icon-editor + rotate: false + xy: 883, 22 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +editor-metal-floor-2 + rotate: false + xy: 899, 584 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +metal-floor-2-icon-editor + rotate: false + xy: 899, 584 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +editor-metal-floor-3 + rotate: false + xy: 899, 550 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +metal-floor-3-icon-editor + rotate: false + xy: 899, 550 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +editor-metal-floor-5 + rotate: false + xy: 933, 584 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +metal-floor-5-icon-editor + rotate: false + xy: 933, 584 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +editor-metal-floor-damaged1 + rotate: false + xy: 899, 516 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +metal-floor-damaged-icon-editor + rotate: false + xy: 899, 516 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +editor-metal-floor-damaged2 + rotate: false + xy: 933, 550 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +editor-metal-floor-damaged3 + rotate: false + xy: 899, 482 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +editor-moss1 + rotate: false + xy: 933, 516 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +moss-icon-editor + rotate: false + xy: 933, 516 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +editor-moss2 + rotate: false + xy: 899, 448 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +editor-moss3 + rotate: false + xy: 933, 482 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +editor-ore-coal1 + rotate: false + xy: 899, 414 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +editor-ore-coal2 + rotate: false + xy: 933, 448 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +editor-ore-coal3 + rotate: false + xy: 899, 380 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +editor-ore-copper1 + rotate: false + xy: 933, 414 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +editor-ore-copper2 + rotate: false + xy: 899, 346 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +editor-ore-copper3 + rotate: false + xy: 933, 380 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +editor-ore-lead1 + rotate: false + xy: 899, 312 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +editor-ore-lead2 + rotate: false + xy: 933, 346 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +editor-ore-lead3 + rotate: false + xy: 899, 278 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +editor-ore-scrap1 + rotate: false + xy: 933, 312 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +editor-ore-scrap2 + rotate: false + xy: 899, 244 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +editor-ore-scrap3 + rotate: false + xy: 933, 278 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +editor-ore-thorium1 + rotate: false + xy: 899, 210 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +editor-ore-thorium2 + rotate: false + xy: 933, 244 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +editor-ore-thorium3 + rotate: false + xy: 899, 176 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +editor-ore-titanium1 + rotate: false + xy: 933, 210 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +editor-ore-titanium2 + rotate: false + xy: 899, 142 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +editor-ore-titanium3 + rotate: false + xy: 933, 176 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +editor-pebbles1 + rotate: false + xy: 899, 108 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +editor-pebbles2 + rotate: false + xy: 933, 142 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +editor-pebbles3 + rotate: false + xy: 933, 108 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +editor-salt + rotate: false + xy: 967, 584 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +salt-icon-editor + rotate: false + xy: 967, 584 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +editor-sand-water + rotate: false + xy: 967, 448 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +sand-water-icon-editor + rotate: false + xy: 967, 448 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +editor-sand1 + rotate: false + xy: 967, 550 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +sand-icon-editor + rotate: false + xy: 967, 550 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +editor-sand2 + rotate: false + xy: 967, 516 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +editor-sand3 + rotate: false + xy: 967, 482 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +editor-shale1 + rotate: false + xy: 967, 414 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +shale-icon-editor + rotate: false + xy: 967, 414 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +editor-shale2 + rotate: false + xy: 967, 380 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +editor-shale3 + rotate: false + xy: 967, 346 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +editor-snow1 + rotate: false + xy: 967, 312 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +snow-icon-editor + rotate: false + xy: 967, 312 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +editor-snow2 + rotate: false + xy: 967, 278 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +editor-snow3 + rotate: false + xy: 967, 244 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +editor-spawn + rotate: false + xy: 967, 210 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +editor-spore-moss1 + rotate: false + xy: 967, 176 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +spore-moss-icon-editor + rotate: false + xy: 967, 176 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +editor-spore-moss2 + rotate: false + xy: 967, 142 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +editor-spore-moss3 + rotate: false + xy: 967, 108 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +editor-stone1 + rotate: false + xy: 917, 74 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +stone-icon-editor + rotate: false + xy: 917, 74 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +editor-stone2 + rotate: false + xy: 917, 40 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +editor-stone3 + rotate: false + xy: 951, 74 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +editor-tainted-water + rotate: false + xy: 951, 40 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +tainted-water-icon-editor + rotate: false + xy: 951, 40 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +editor-tar + rotate: false + xy: 917, 6 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +tar-icon-editor + rotate: false + xy: 917, 6 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +editor-tendrils1 + rotate: false + xy: 951, 6 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +editor-tendrils2 + rotate: false + xy: 985, 74 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +editor-tendrils3 + rotate: false + xy: 985, 40 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +editor-water + rotate: false + xy: 985, 6 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +water-icon-editor + rotate: false + xy: 985, 6 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +pine-icon-editor + rotate: false + xy: 409, 150 + size: 48, 48 + orig: 48, 48 + offset: 0, 0 + index: -1 +rock-icon-editor + rotate: false + xy: 559, 550 + size: 48, 48 + orig: 48, 48 + offset: 0, 0 + index: -1 +snowrock-icon-editor + rotate: false + xy: 607, 765 + size: 48, 48 + orig: 48, 48 + offset: 0, 0 + index: -1 +spore-cluster-icon-editor + rotate: false + xy: 893, 697 + size: 40, 40 + orig: 40, 40 + offset: 0, 0 + index: -1 +spore-pine-icon-editor + rotate: false + xy: 609, 215 + size: 48, 48 + orig: 48, 48 + offset: 0, 0 + index: -1 water-extractor-icon-editor rotate: false - xy: 859, 959 + xy: 133, 891 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 wave-icon-editor rotate: false - xy: 67, 629 + xy: 265, 957 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 wraith-factory-icon-editor rotate: false - xy: 67, 431 + xy: 133, 759 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 bullet rotate: false - xy: 133, 557 + xy: 1, 261 size: 52, 52 orig: 52, 52 offset: 0, 0 index: -1 bullet-back rotate: false - xy: 133, 503 + xy: 628, 969 size: 52, 52 orig: 52, 52 offset: 0, 0 index: -1 error rotate: false - xy: 291, 909 + xy: 475, 650 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 missile rotate: false - xy: 771, 487 + xy: 759, 346 size: 36, 36 orig: 36, 36 offset: 0, 0 index: -1 missile-back rotate: false - xy: 733, 458 + xy: 759, 308 size: 36, 36 orig: 36, 36 offset: 0, 0 index: -1 shell rotate: false - xy: 771, 449 + xy: 759, 212 size: 36, 36 orig: 36, 36 offset: 0, 0 index: -1 shell-back rotate: false - xy: 733, 420 + xy: 759, 174 size: 36, 36 orig: 36, 36 offset: 0, 0 index: -1 alloy-smelter-icon-large rotate: false - xy: 125, 2 + xy: 1, 211 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 alloy-smelter-icon-medium rotate: false - xy: 991, 991 + xy: 989, 947 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 arc rotate: false - xy: 991, 957 + xy: 989, 913 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 arc-icon-full rotate: false - xy: 991, 855 + xy: 797, 548 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 arc-icon-large rotate: false - xy: 133, 303 + xy: 1, 111 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 battery-icon-large rotate: false - xy: 183, 453 + xy: 782, 973 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 battery-large-icon-large rotate: false - xy: 187, 561 + xy: 1, 3 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 battery-large-icon-medium rotate: false - xy: 991, 787 + xy: 797, 480 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 blast-drill-icon-large rotate: false - xy: 187, 511 + xy: 832, 973 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 blast-drill-icon-medium rotate: false - xy: 991, 753 + xy: 797, 446 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 blast-mixer-icon-large rotate: false - xy: 183, 403 + xy: 882, 973 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 blast-mixer-icon-medium rotate: false - xy: 991, 719 + xy: 797, 412 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conduit-icon-large rotate: false - xy: 183, 253 + xy: 323, 800 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 bridge-conveyor-icon-large rotate: false - xy: 190, 203 + xy: 59, 577 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 char-icon-large rotate: false - xy: 233, 411 + xy: 59, 477 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 cliffs-icon-large rotate: false - xy: 233, 361 + xy: 59, 427 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 coal-centrifuge-icon-large rotate: false - xy: 233, 311 + xy: 59, 377 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 coal-centrifuge-icon-medium rotate: false - xy: 835, 334 + xy: 169, 159 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 combustion-generator-icon-large rotate: false - xy: 233, 261 + xy: 59, 327 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 conduit-icon-full rotate: false - xy: 903, 339 + xy: 237, 116 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-icon-large rotate: false - xy: 240, 211 + xy: 59, 277 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 container-icon-large rotate: false - xy: 241, 161 + xy: 55, 227 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 container-icon-medium rotate: false - xy: 937, 323 + xy: 305, 48 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-icon-large rotate: false - xy: 241, 111 + xy: 51, 177 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 copper-wall-icon-large rotate: false - xy: 241, 61 + xy: 51, 127 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 copper-wall-large-icon-large rotate: false - xy: 241, 11 + xy: 51, 77 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 copper-wall-large-icon-medium rotate: false - xy: 845, 208 + xy: 271, 14 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 core-foundation-icon-large rotate: false - xy: 191, 909 + xy: 51, 27 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 core-foundation-icon-medium rotate: false - xy: 811, 198 + xy: 305, 14 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 core-nucleus-icon-large rotate: false - xy: 191, 859 + xy: 125, 643 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 core-nucleus-icon-medium rotate: false - xy: 777, 166 + xy: 339, 14 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 core-shard-icon-large rotate: false - xy: 191, 809 + xy: 191, 709 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 core-shard-icon-medium rotate: false - xy: 962, 255 + xy: 373, 14 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cracks-1-0 rotate: false - xy: 709, 148 + xy: 407, 14 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cracks-1-1 rotate: false - xy: 675, 121 + xy: 441, 14 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cracks-1-2 rotate: false - xy: 641, 105 + xy: 475, 14 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cracks-1-3 rotate: false - xy: 743, 148 + xy: 509, 14 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cracks-1-4 rotate: false - xy: 928, 221 + xy: 543, 14 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cracks-1-5 rotate: false - xy: 879, 203 + xy: 577, 81 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cracks-1-6 rotate: false - xy: 845, 174 + xy: 577, 47 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cracks-1-7 rotate: false - xy: 811, 164 + xy: 611, 81 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 craters-icon-large rotate: false - xy: 191, 759 + xy: 381, 850 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 crawler-factory-icon-large rotate: false - xy: 237, 609 + xy: 307, 750 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 crawler-factory-icon-medium rotate: false - xy: 962, 221 + xy: 645, 81 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cryofluidmixer-icon-large rotate: false - xy: 283, 509 + xy: 257, 725 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 cryofluidmixer-icon-medium rotate: false - xy: 709, 114 + xy: 645, 47 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cultivator-icon-large rotate: false - xy: 283, 459 + xy: 307, 700 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 cultivator-icon-medium rotate: false - xy: 675, 87 + xy: 679, 81 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cyclone-icon-large rotate: false - xy: 283, 409 + xy: 357, 700 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 cyclone-icon-medium rotate: false - xy: 641, 71 + xy: 679, 47 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 dagger-factory-icon-large rotate: false - xy: 290, 259 + xy: 423, 800 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 dagger-factory-icon-medium rotate: false - xy: 743, 114 + xy: 713, 81 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 dark-metal-icon-large rotate: false - xy: 291, 159 + xy: 457, 700 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 dark-panel-1-icon-large rotate: false - xy: 291, 109 + xy: 109, 585 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 dark-panel-2-icon-large rotate: false - xy: 291, 59 + xy: 109, 535 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 dark-panel-3-icon-large rotate: false - xy: 291, 9 + xy: 109, 485 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 dark-panel-4-icon-large rotate: false - xy: 241, 909 + xy: 109, 435 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 dark-panel-5-icon-large rotate: false - xy: 241, 859 + xy: 109, 385 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 dark-panel-6-icon-large rotate: false - xy: 241, 809 + xy: 109, 335 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 darksand-icon-large rotate: false - xy: 241, 759 + xy: 109, 285 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 darksand-tainted-water-icon-large rotate: false - xy: 241, 709 + xy: 175, 651 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 darksand-water-icon-large rotate: false - xy: 241, 659 + xy: 159, 593 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 dart-mech-pad-icon-large rotate: false - xy: 287, 609 + xy: 159, 543 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 dart-mech-pad-icon-medium rotate: false - xy: 743, 80 + xy: 781, 38 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 deepwater-icon-large rotate: false - xy: 333, 509 + xy: 159, 443 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 delta-mech-pad-icon-large rotate: false - xy: 333, 309 + xy: 109, 235 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 delta-mech-pad-icon-medium rotate: false - xy: 981, 187 + xy: 815, 72 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 differential-generator-icon-large rotate: false - xy: 340, 259 + xy: 159, 243 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 differential-generator-icon-medium rotate: false - xy: 709, 46 + xy: 815, 38 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 distributor-icon-large rotate: false - xy: 341, 209 + xy: 225, 659 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 distributor-icon-medium rotate: false - xy: 709, 12 + xy: 815, 4 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 door-icon-large rotate: false - xy: 341, 159 + xy: 275, 650 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 door-large-icon-large rotate: false - xy: 341, 109 + xy: 325, 650 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 door-large-icon-medium rotate: false - xy: 743, 12 + xy: 831, 550 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 dunerocks-icon-large rotate: false - xy: 341, 59 + xy: 375, 650 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 duo rotate: false - xy: 913, 153 + xy: 831, 448 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 duo-icon-full rotate: false - xy: 845, 106 + xy: 831, 380 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 duo-icon-large rotate: false - xy: 341, 9 + xy: 425, 650 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 force-projector-icon-large rotate: false - xy: 291, 693 + xy: 489, 915 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 fortress-factory-icon-large rotate: false - xy: 337, 643 + xy: 539, 915 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 fuse-icon-large rotate: false - xy: 337, 593 + xy: 473, 800 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 ghoul-factory-icon-large rotate: false - xy: 341, 909 + xy: 589, 915 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 glaive-ship-pad-icon-large rotate: false - xy: 341, 859 + xy: 639, 919 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 graphite-press-icon-large rotate: false - xy: 341, 809 + xy: 689, 923 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 grass-icon-large rotate: false - xy: 341, 759 + xy: 739, 923 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 hail-icon-large rotate: false - xy: 341, 709 + xy: 789, 923 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 holostone-icon-large rotate: false - xy: 387, 659 + xy: 889, 923 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 hotrock-icon-large rotate: false - xy: 387, 609 + xy: 939, 923 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 ice-icon-large rotate: false - xy: 383, 493 + xy: 225, 609 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 ice-snow-icon-large rotate: false - xy: 383, 443 + xy: 275, 600 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 icerocks-icon-large rotate: false - xy: 383, 393 + xy: 325, 600 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 ignarock-icon-large rotate: false - xy: 390, 293 + xy: 425, 600 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 impact-reactor-icon-large rotate: false - xy: 391, 909 + xy: 475, 600 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 incinerator-icon-large rotate: false - xy: 391, 859 + xy: 209, 559 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-blast-compound-xlarge rotate: false - xy: 237, 517 + xy: 857, 781 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-coal-xlarge rotate: false - xy: 887, 617 + xy: 801, 731 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-copper-xlarge rotate: false - xy: 929, 617 + xy: 899, 781 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-graphite-xlarge rotate: false - xy: 971, 617 + xy: 941, 781 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-lead-xlarge rotate: false - xy: 887, 575 + xy: 983, 781 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-metaglass-xlarge rotate: false - xy: 929, 575 + xy: 725, 677 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-phase-fabric-xlarge rotate: false - xy: 971, 575 + xy: 725, 635 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-plastanium-xlarge rotate: false - xy: 733, 567 + xy: 767, 687 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-pyratite-xlarge rotate: false - xy: 775, 567 + xy: 767, 645 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-sand-xlarge rotate: false - xy: 817, 567 + xy: 809, 689 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-scrap-xlarge rotate: false - xy: 859, 533 + xy: 809, 647 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-silicon-xlarge rotate: false - xy: 901, 533 + xy: 843, 731 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-source-icon-large rotate: false - xy: 391, 809 + xy: 209, 509 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-spore-pod-xlarge rotate: false - xy: 943, 533 + xy: 885, 739 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-surge-alloy-xlarge rotate: false - xy: 733, 525 + xy: 927, 739 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-thorium-xlarge rotate: false - xy: 775, 525 + xy: 969, 739 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-titanium-xlarge rotate: false - xy: 817, 525 + xy: 851, 689 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-void-icon-large rotate: false - xy: 391, 759 + xy: 209, 459 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 javelin-ship-pad-icon-large rotate: false - xy: 433, 559 + xy: 209, 359 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 junction-icon-large rotate: false - xy: 437, 609 + xy: 209, 259 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 kiln-icon-large rotate: false - xy: 433, 509 + xy: 259, 550 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 lancer-icon-large rotate: false - xy: 433, 459 + xy: 259, 500 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 laser-drill-icon-large rotate: false - xy: 433, 409 + xy: 309, 550 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 launch-pad-icon-large rotate: false - xy: 433, 359 + xy: 259, 450 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 launch-pad-large-icon-large rotate: false - xy: 441, 909 + xy: 309, 500 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 liquid-junction-icon-large rotate: false - xy: 441, 809 + xy: 259, 400 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 liquid-router-icon-large rotate: false - xy: 441, 759 + xy: 309, 450 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 liquid-source-icon-large rotate: false - xy: 441, 709 + xy: 359, 500 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 liquid-tank-icon-large rotate: false - xy: 391, 243 + xy: 409, 550 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 magmarock-icon-large rotate: false - xy: 440, 309 + xy: 259, 350 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 mass-driver-icon-large rotate: false - xy: 391, 193 + xy: 309, 400 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 mech-icon-alpha-mech rotate: false - xy: 391, 143 + xy: 359, 450 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 mech-icon-dart-ship rotate: false - xy: 391, 93 + xy: 409, 500 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 mech-icon-delta-mech rotate: false - xy: 391, 43 + xy: 459, 550 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 mech-icon-glaive-ship rotate: false - xy: 132, 175 + xy: 133, 701 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 mech-icon-javelin-ship rotate: false - xy: 483, 559 + xy: 259, 300 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 mech-icon-omega-mech rotate: false - xy: 125, 52 + xy: 199, 767 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 mech-icon-tau-mech rotate: false - xy: 183, 117 + xy: 265, 833 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 mech-icon-trident-ship rotate: false - xy: 183, 59 + xy: 331, 900 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 mechanical-drill-icon-large rotate: false - xy: 487, 659 + xy: 309, 350 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 mechanical-pump-icon-large rotate: false - xy: 487, 609 + xy: 359, 400 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 meltdown-icon-large rotate: false - xy: 483, 509 + xy: 409, 450 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 melter-icon-large rotate: false - xy: 483, 459 + xy: 459, 500 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 mend-projector-icon-large rotate: false - xy: 483, 409 + xy: 309, 300 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 mender-icon-large rotate: false - xy: 483, 359 + xy: 359, 350 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 metal-floor-2-icon-large rotate: false - xy: 491, 909 + xy: 409, 400 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 metal-floor-3-icon-large rotate: false - xy: 491, 859 + xy: 459, 450 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 metal-floor-5-icon-large rotate: false - xy: 491, 809 + xy: 359, 300 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 metal-floor-damaged-icon-large rotate: false - xy: 491, 759 + xy: 409, 350 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 metal-floor-icon-large rotate: false - xy: 491, 709 + xy: 459, 400 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 moss-icon-large rotate: false - xy: 441, 259 + xy: 409, 300 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 multi-press-icon-large rotate: false - xy: 490, 309 + xy: 459, 350 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 oil-extractor-icon-large rotate: false - xy: 533, 559 + xy: 459, 300 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 omega-mech-pad-icon-large rotate: false - xy: 537, 659 + xy: 259, 250 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 ore-coal-icon-large rotate: false - xy: 537, 609 + xy: 309, 250 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 ore-copper-icon-large rotate: false - xy: 533, 509 + xy: 359, 250 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 ore-lead-icon-large rotate: false - xy: 533, 459 + xy: 409, 250 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 ore-scrap-icon-large rotate: false - xy: 533, 409 + xy: 459, 250 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 ore-thorium-icon-large rotate: false - xy: 533, 359 + xy: 209, 209 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 ore-titanium-icon-large rotate: false - xy: 541, 909 + xy: 159, 193 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 overdrive-projector-icon-large rotate: false - xy: 541, 859 + xy: 259, 200 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 overflow-gate-icon-large rotate: false - xy: 541, 809 + xy: 309, 200 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 pebbles-icon-large rotate: false - xy: 541, 759 + xy: 359, 200 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 phantom-factory-icon-large rotate: false - xy: 541, 709 + xy: 409, 200 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 phase-conduit-icon-large rotate: false - xy: 441, 209 + xy: 459, 200 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 phase-conveyor-icon-large rotate: false - xy: 441, 159 + xy: 209, 159 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 phase-wall-icon-large rotate: false - xy: 441, 109 + xy: 259, 150 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 phase-wall-large-icon-large rotate: false - xy: 441, 59 + xy: 309, 150 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 phase-weaver-icon-large rotate: false - xy: 441, 9 + xy: 359, 150 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 plastanium-compressor-icon-large rotate: false - xy: 540, 309 + xy: 459, 150 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 pneumatic-drill-icon-large rotate: false - xy: 583, 559 + xy: 507, 750 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 power-node-icon-large rotate: false - xy: 587, 659 + xy: 507, 700 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 power-node-large-icon-large rotate: false - xy: 587, 609 + xy: 525, 650 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 power-source-icon-large rotate: false - xy: 583, 509 + xy: 525, 600 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 power-void-icon-large rotate: false - xy: 583, 459 + xy: 509, 550 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 pulse-conduit-icon-large rotate: false - xy: 583, 409 + xy: 509, 500 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 pulverizer-icon-large rotate: false - xy: 583, 359 + xy: 509, 450 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 pyratite-mixer-icon-large rotate: false - xy: 591, 909 + xy: 509, 400 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 repair-point-icon-large rotate: false - xy: 591, 809 + xy: 509, 300 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 revenant-factory-icon-large rotate: false - xy: 591, 759 + xy: 509, 250 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 ripple-icon-large rotate: false - xy: 491, 209 + xy: 509, 150 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 rocks-icon-large rotate: false - xy: 491, 109 + xy: 559, 500 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 rotary-pump-icon-large rotate: false - xy: 491, 59 + xy: 559, 450 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 router-icon-large rotate: false - xy: 491, 9 + xy: 559, 400 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 rtg-generator-icon-large rotate: false - xy: 541, 259 + xy: 559, 350 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 salt-icon-large rotate: false - xy: 590, 309 + xy: 559, 300 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 saltrocks-icon-large rotate: false - xy: 633, 559 + xy: 559, 250 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 salvo-icon-large rotate: false - xy: 637, 659 + xy: 559, 200 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 sand-icon-large rotate: false - xy: 637, 609 + xy: 559, 150 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 sand-water-icon-large rotate: false - xy: 633, 509 + xy: 489, 865 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 sandrocks-icon-large rotate: false - xy: 633, 459 + xy: 539, 865 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 scatter-icon-large rotate: false - xy: 633, 409 + xy: 589, 865 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 scorch-icon-large rotate: false - xy: 633, 359 + xy: 639, 869 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 scrap-wall-gigantic-icon-large rotate: false - xy: 641, 909 + xy: 689, 873 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 scrap-wall-huge-icon-large rotate: false - xy: 641, 859 + xy: 739, 873 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 scrap-wall-icon-large rotate: false - xy: 641, 809 + xy: 789, 873 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 scrap-wall-large-icon-large rotate: false - xy: 641, 759 + xy: 839, 873 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 separator-icon-large rotate: false - xy: 641, 709 + xy: 889, 873 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 shale-boulder-icon-large rotate: false - xy: 541, 209 + xy: 939, 873 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 shale-icon-large rotate: false - xy: 541, 159 + xy: 523, 815 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 shalerocks-icon-large rotate: false - xy: 541, 109 + xy: 573, 815 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 shock-mine-icon-large rotate: false - xy: 541, 59 + xy: 557, 765 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 shrubs-icon-large rotate: false - xy: 591, 259 + xy: 575, 665 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 silicon-smelter-icon-large rotate: false - xy: 640, 309 + xy: 575, 615 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 snow-icon-large rotate: false - xy: 683, 559 + xy: 623, 815 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 snowrocks-icon-large rotate: false - xy: 687, 609 + xy: 607, 715 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 solar-panel-icon-large rotate: false - xy: 683, 509 + xy: 625, 665 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 solar-panel-large-icon-large rotate: false - xy: 683, 459 + xy: 625, 615 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 sorter-icon-large rotate: false - xy: 683, 409 + xy: 609, 565 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 spawn-icon-large rotate: false - xy: 683, 359 + xy: 609, 515 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 spectre-icon-large rotate: false - xy: 691, 909 + xy: 609, 465 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 spirit-factory-icon-large rotate: false - xy: 691, 809 + xy: 609, 365 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 spore-cluster-icon-large rotate: false - xy: 691, 759 + xy: 609, 315 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 spore-moss-icon-large rotate: false - xy: 691, 709 + xy: 609, 265 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -spore-press-icon-full - rotate: false - xy: 1, 629 - size: 64, 64 - orig: 64, 64 - offset: 0, 0 - index: -1 spore-press-icon-large rotate: false - xy: 591, 159 + xy: 609, 165 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 sporerocks-icon-large rotate: false - xy: 591, 109 + xy: 657, 765 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 stone-icon-large rotate: false - xy: 591, 59 + xy: 657, 715 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 surge-tower-icon-large rotate: false - xy: 591, 9 + xy: 675, 665 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 surge-wall-icon-large rotate: false - xy: 741, 909 + xy: 675, 615 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 surge-wall-large-icon-large rotate: false - xy: 791, 909 + xy: 659, 565 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -swarmer - rotate: false - xy: 1, 299 - size: 64, 64 - orig: 64, 64 - offset: 0, 0 - index: -1 -swarmer-icon-full - rotate: false - xy: 1, 167 - size: 64, 64 - orig: 64, 64 - offset: 0, 0 - index: -1 swarmer-icon-large rotate: false - xy: 891, 909 + xy: 659, 465 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 tainted-water-icon-large rotate: false - xy: 941, 909 + xy: 659, 415 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 tar-icon-large rotate: false - xy: 741, 859 + xy: 659, 365 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 tau-mech-pad-icon-large rotate: false - xy: 891, 859 + xy: 659, 215 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 tendrils-icon-large rotate: false - xy: 941, 859 + xy: 659, 165 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 thermal-generator-icon-large rotate: false - xy: 741, 809 + xy: 709, 565 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 thermal-pump-icon-large rotate: false - xy: 791, 809 + xy: 709, 515 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 thorium-reactor-icon-large rotate: false - xy: 841, 809 + xy: 709, 465 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 thorium-wall-icon-large rotate: false - xy: 891, 809 + xy: 709, 415 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 thorium-wall-large-icon-large rotate: false - xy: 941, 809 + xy: 709, 365 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 thruster-icon-large rotate: false - xy: 741, 759 + xy: 709, 315 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 titan-factory-icon-large rotate: false - xy: 791, 759 + xy: 709, 265 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 titanium-conveyor-icon-large rotate: false - xy: 841, 759 + xy: 709, 215 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 titanium-wall-icon-large rotate: false - xy: 891, 759 + xy: 709, 165 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 titanium-wall-large-icon-large rotate: false - xy: 941, 759 + xy: 609, 115 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 trident-ship-pad-icon-large rotate: false - xy: 741, 709 + xy: 659, 115 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 turbine-generator-icon-large rotate: false - xy: 791, 709 + xy: 709, 115 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 unit-icon-crawler rotate: false - xy: 841, 709 + xy: 673, 819 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 unit-icon-dagger rotate: false - xy: 891, 709 + xy: 723, 823 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 unit-icon-eruptor rotate: false - xy: 595, 959 + xy: 67, 891 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 unit-icon-fortress rotate: false - xy: 661, 959 + xy: 133, 957 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 unit-icon-titan rotate: false - xy: 727, 959 + xy: 1, 759 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 unloader-icon-large rotate: false - xy: 941, 709 + xy: 773, 823 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 vault-icon-large rotate: false - xy: 737, 659 + xy: 823, 823 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 water-extractor-icon-full rotate: false - xy: 925, 959 + xy: 199, 957 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 water-extractor-icon-large rotate: false - xy: 787, 659 + xy: 873, 823 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 water-icon-large rotate: false - xy: 837, 659 + xy: 923, 823 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 wave rotate: false - xy: 67, 695 + xy: 199, 891 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 wave-icon-full rotate: false - xy: 67, 563 + xy: 1, 627 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 wave-icon-large rotate: false - xy: 887, 659 + xy: 973, 823 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 white-tree-dead-icon-large rotate: false - xy: 937, 659 + xy: 707, 769 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 white-tree-icon-large rotate: false - xy: 737, 609 + xy: 707, 719 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 wraith-factory-icon-full rotate: false - xy: 67, 365 + xy: 199, 825 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 wraith-factory-icon-large rotate: false - xy: 837, 609 + xy: 807, 773 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 alpha-mech rotate: false - xy: 133, 453 + xy: 682, 973 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 alpha-mech-base rotate: false - xy: 133, 403 + xy: 1, 161 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 alpha-mech-leg rotate: false - xy: 133, 353 + xy: 732, 973 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 delta-mech rotate: false - xy: 333, 459 + xy: 159, 393 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 delta-mech-base rotate: false - xy: 333, 409 + xy: 159, 343 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 delta-mech-leg rotate: false - xy: 333, 359 + xy: 159, 293 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 omega-mech rotate: false - xy: 183, 1 + xy: 396, 965 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 omega-mech-base rotate: false - xy: 133, 901 + xy: 1, 431 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 omega-mech-leg rotate: false - xy: 133, 843 + xy: 454, 965 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 tau-mech rotate: false - xy: 133, 669 + xy: 1, 315 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 tau-mech-base rotate: false - xy: 791, 859 + xy: 659, 315 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 tau-mech-leg rotate: false - xy: 841, 859 + xy: 659, 265 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 dart-ship rotate: false - xy: 287, 559 + xy: 159, 493 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 glaive-ship rotate: false - xy: 125, 110 + xy: 67, 635 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 javelin-ship rotate: false - xy: 391, 709 + xy: 209, 409 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 javelin-ship-shield rotate: false - xy: 437, 659 + xy: 209, 309 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 trident-ship rotate: false - xy: 133, 611 + xy: 570, 965 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 shape-3 rotate: false - xy: 67, 168 + xy: 331, 958 size: 63, 63 orig: 63, 63 offset: 0, 0 index: -1 button rotate: false - xy: 977, 488 + xy: 759, 500 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -5268,7 +5751,7 @@ button index: -1 button-disabled rotate: false - xy: 987, 680 + xy: 893, 668 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -5276,7 +5759,7 @@ button-disabled index: -1 button-down rotate: false - xy: 1, 1 + xy: 935, 710 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -5284,7 +5767,7 @@ button-down index: -1 button-edge-1 rotate: false - xy: 39, 1 + xy: 973, 710 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -5292,7 +5775,7 @@ button-edge-1 index: -1 button-edge-2 rotate: false - xy: 77, 1 + xy: 851, 634 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -5300,7 +5783,7 @@ button-edge-2 index: -1 button-edge-3 rotate: false - xy: 985, 546 + xy: 935, 681 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -5308,7 +5791,7 @@ button-edge-3 index: -1 button-edge-4 rotate: false - xy: 985, 517 + xy: 973, 681 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -5316,7 +5799,7 @@ button-edge-4 index: -1 button-over rotate: false - xy: 291, 664 + xy: 767, 616 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -5324,7 +5807,7 @@ button-over index: -1 button-right rotate: false - xy: 939, 504 + xy: 759, 529 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -5332,7 +5815,7 @@ button-right index: -1 button-right-down rotate: false - xy: 337, 564 + xy: 759, 587 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -5340,7 +5823,7 @@ button-right-down index: -1 button-right-over rotate: false - xy: 901, 504 + xy: 759, 558 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -5348,49 +5831,49 @@ button-right-over index: -1 check-disabled rotate: false - xy: 767, 386 + xy: 101, 159 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 check-off rotate: false - xy: 801, 370 + xy: 101, 125 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 check-on rotate: false - xy: 835, 368 + xy: 101, 91 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 check-on-disabled rotate: false - xy: 869, 344 + xy: 101, 57 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 check-on-over rotate: false - xy: 733, 352 + xy: 101, 23 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 check-over rotate: false - xy: 767, 352 + xy: 135, 159 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 content-background rotate: false - xy: 733, 496 + xy: 759, 384 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -5398,7 +5881,7 @@ content-background index: -1 content-background-locked rotate: false - xy: 901, 475 + xy: 759, 471 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -5406,7 +5889,7 @@ content-background-locked index: -1 content-background-noitems rotate: false - xy: 939, 475 + xy: 759, 442 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -5414,7 +5897,7 @@ content-background-noitems index: -1 content-background-over rotate: false - xy: 977, 459 + xy: 759, 413 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -5422,21 +5905,21 @@ content-background-over index: -1 icon-generated rotate: false - xy: 383, 343 + xy: 375, 600 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 icon-zone-locked rotate: false - xy: 191, 615 + xy: 757, 729 size: 42, 42 orig: 42, 42 offset: 0, 0 index: -1 pane rotate: false - xy: 809, 467 + xy: 759, 250 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -5444,7 +5927,7 @@ pane index: -1 pane-2 rotate: false - xy: 809, 496 + xy: 759, 279 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -5452,7 +5935,7 @@ pane-2 index: -1 scroll-horizontal rotate: false - xy: 847, 436 + xy: 51, 1 size: 35, 24 split: 6, 5, 10, 10 orig: 35, 24 @@ -5460,7 +5943,7 @@ scroll-horizontal index: -1 scroll-knob-horizontal-black rotate: false - xy: 190, 177 + xy: 851, 663 size: 40, 24 split: 11, 10, 10, 10 orig: 40, 24 @@ -5468,7 +5951,7 @@ scroll-knob-horizontal-black index: -1 underline rotate: false - xy: 885, 446 + xy: 969, 652 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -5476,7 +5959,7 @@ underline index: -1 underline-2 rotate: false - xy: 847, 462 + xy: 759, 145 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -5484,7 +5967,7 @@ underline-2 index: -1 underline-disabled rotate: false - xy: 809, 438 + xy: 759, 116 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -5492,7 +5975,7 @@ underline-disabled index: -1 underline-red rotate: false - xy: 771, 420 + xy: 931, 652 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -5500,189 +5983,175 @@ underline-red index: -1 crawler rotate: false - xy: 191, 709 + xy: 373, 800 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 crawler-base rotate: false - xy: 191, 659 + xy: 257, 775 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 crawler-leg rotate: false - xy: 237, 559 + xy: 357, 750 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 dagger rotate: false - xy: 283, 359 + xy: 407, 750 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 dagger-base rotate: false - xy: 283, 309 + xy: 407, 700 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 dagger-leg rotate: false - xy: 291, 209 + xy: 457, 750 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 phantom rotate: false - xy: 133, 785 + xy: 1, 373 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 power-cell rotate: false - xy: 133, 727 + xy: 512, 965 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 spirit rotate: false - xy: 691, 859 + xy: 609, 415 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -titan - rotate: false - xy: 133, 959 - size: 64, 64 - orig: 64, 64 - offset: 0, 0 - index: -1 -titan-leg - rotate: false - xy: 199, 959 - size: 64, 64 - orig: 64, 64 - offset: 0, 0 - index: -1 wraith rotate: false - xy: 787, 609 + xy: 757, 773 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 artillery-equip rotate: false - xy: 133, 245 + xy: 1, 53 size: 48, 56 orig: 48, 56 offset: 0, 0 index: -1 blaster-equip rotate: false - xy: 183, 353 + xy: 932, 973 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 bomber-equip rotate: false - xy: 183, 303 + xy: 331, 850 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 missiles-equip rotate: false - xy: 183, 303 + xy: 331, 850 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 chain-blaster-equip rotate: false - xy: 233, 461 + xy: 59, 527 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 chaos-equip rotate: false - xy: 67, 30 + xy: 1, 489 size: 56, 136 orig: 56, 136 offset: 0, 0 index: -1 eruption-equip rotate: false - xy: 291, 851 + xy: 389, 900 size: 48, 56 orig: 48, 56 offset: 0, 0 index: -1 flakgun-equip rotate: false - xy: 291, 801 + xy: 431, 850 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 flamethrower-equip rotate: false - xy: 291, 743 + xy: 439, 907 size: 48, 56 orig: 48, 56 offset: 0, 0 index: -1 heal-blaster-equip rotate: false - xy: 383, 543 + xy: 839, 923 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 lich-missiles-equip rotate: false - xy: 441, 859 + xy: 359, 550 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 reaper-gun-equip rotate: false - xy: 591, 859 + xy: 509, 350 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 revenant-missiles-equip rotate: false - xy: 591, 709 + xy: 509, 200 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 shockgun-equip rotate: false - xy: 541, 9 + xy: 557, 715 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 swarmer-equip rotate: false - xy: 841, 909 + xy: 659, 515 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -5695,3759 +6164,3213 @@ filter: Nearest,Nearest repeat: none mender rotate: false - xy: 443, 445 + xy: 137, 275 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 mender-icon-editor rotate: false - xy: 443, 445 + xy: 137, 275 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 mender-top rotate: false - xy: 477, 479 + xy: 171, 309 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 shock-mine rotate: false - xy: 307, 105 + xy: 171, 105 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-0-0 rotate: false - xy: 477, 207 + xy: 239, 105 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-icon-editor rotate: false - xy: 477, 207 + xy: 239, 105 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-0-1 rotate: false - xy: 511, 241 + xy: 273, 139 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-0-2 rotate: false - xy: 545, 275 + xy: 307, 173 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-0-3 rotate: false - xy: 579, 309 + xy: 341, 207 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-1-0 rotate: false - xy: 613, 343 + xy: 375, 241 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-1-1 rotate: false - xy: 647, 377 + xy: 409, 275 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-1-2 rotate: false - xy: 681, 411 + xy: 443, 309 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-1-3 rotate: false - xy: 715, 445 + xy: 477, 343 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-2-0 rotate: false - xy: 749, 479 + xy: 511, 377 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-2-1 rotate: false - xy: 307, 3 + xy: 545, 411 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-2-2 rotate: false - xy: 341, 37 + xy: 579, 445 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-2-3 rotate: false - xy: 375, 71 + xy: 613, 479 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-3-0 rotate: false - xy: 409, 105 + xy: 171, 3 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-3-1 rotate: false - xy: 443, 139 + xy: 205, 37 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-3-2 rotate: false - xy: 477, 173 + xy: 239, 71 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-3-3 rotate: false - xy: 511, 207 + xy: 273, 105 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-4-0 rotate: false - xy: 545, 241 + xy: 307, 139 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-4-1 rotate: false - xy: 579, 275 + xy: 341, 173 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-4-2 rotate: false - xy: 613, 309 + xy: 375, 207 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-4-3 rotate: false - xy: 647, 343 + xy: 409, 241 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 junction rotate: false - xy: 69, 105 + xy: 239, 479 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 junction-icon-editor rotate: false - xy: 69, 105 + xy: 239, 479 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 overflow-gate rotate: false - xy: 375, 343 + xy: 171, 275 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 overflow-gate-icon-editor rotate: false - xy: 375, 343 + xy: 171, 275 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conveyor rotate: false - xy: 137, 71 + xy: 1, 71 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conveyor-icon-editor rotate: false - xy: 137, 71 + xy: 1, 71 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conveyor-arrow rotate: false - xy: 171, 105 + xy: 35, 105 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conveyor-bridge rotate: false - xy: 205, 139 + xy: 69, 139 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conveyor-end rotate: false - xy: 239, 173 + xy: 103, 173 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 router rotate: false - xy: 477, 343 + xy: 375, 377 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 router-icon-editor rotate: false - xy: 477, 343 + xy: 375, 377 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sorter rotate: false - xy: 681, 479 + xy: 477, 411 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sorter-icon-editor rotate: false - xy: 681, 479 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -spawn - rotate: false - xy: 239, 3 + xy: 477, 411 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-junction rotate: false - xy: 307, 343 + xy: 205, 411 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-junction-icon-editor rotate: false - xy: 307, 343 + xy: 205, 411 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-router-bottom rotate: false - xy: 375, 411 + xy: 273, 479 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-router-liquid rotate: false - xy: 1, 3 + xy: 69, 241 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-router-top rotate: false - xy: 35, 37 + xy: 103, 275 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 mechanical-pump - rotate: false - xy: 273, 275 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -phase-conduit - rotate: false - xy: 477, 445 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -phase-conduit-icon-editor - rotate: false - xy: 477, 445 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -phase-conduit-arrow - rotate: false - xy: 511, 479 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -phase-conduit-bridge - rotate: false - xy: 69, 3 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -phase-conduit-end - rotate: false - xy: 103, 37 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -pulse-conduit-top-0 - rotate: false - xy: 239, 139 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -pulse-conduit-top-1 - rotate: false - xy: 273, 173 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -pulse-conduit-top-2 - rotate: false - xy: 307, 207 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -pulse-conduit-top-3 - rotate: false - xy: 341, 241 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -pulse-conduit-top-4 - rotate: false - xy: 375, 275 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -pulse-conduit-top-5 - rotate: false - xy: 409, 309 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -pulse-conduit-top-6 - rotate: false - xy: 443, 343 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -power-node - rotate: false - xy: 477, 411 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -power-node-icon-editor - rotate: false - xy: 477, 411 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -power-source - rotate: false - xy: 545, 479 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -power-void - rotate: false - xy: 137, 37 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -power-void-icon-editor - rotate: false - xy: 137, 37 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -rtg-generator-top - rotate: false - xy: 545, 411 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -solar-panel - rotate: false - xy: 579, 377 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -solar-panel-icon-editor - rotate: false - xy: 579, 377 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -incinerator - rotate: false - xy: 205, 309 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -incinerator-icon-editor - rotate: false - xy: 205, 309 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -item-source - rotate: false - xy: 273, 343 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -item-source-icon-editor - rotate: false - xy: 273, 343 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -item-void - rotate: false - xy: 1, 37 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -item-void-icon-editor - rotate: false - xy: 1, 37 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -liquid-source - rotate: false - xy: 103, 105 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -liquid-source-icon-editor - rotate: false - xy: 103, 105 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -melter - rotate: false - xy: 375, 377 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -melter-icon-editor - rotate: false - xy: 375, 377 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -pulverizer - rotate: false - xy: 477, 377 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -pulverizer-rotator - rotate: false - xy: 579, 479 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -smelter - rotate: false - xy: 477, 275 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -sortedunloader - rotate: false - xy: 647, 445 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -unloader - rotate: false - xy: 375, 37 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -unloader-icon-editor - rotate: false - xy: 375, 37 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -scorch-heat - rotate: false - xy: 273, 105 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -repair-point-base - rotate: false - xy: 205, 71 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -phase-wall - rotate: false - xy: 273, 207 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -phase-wall-icon-editor - rotate: false - xy: 273, 207 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -scrap-wall1 - rotate: false - xy: 375, 207 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -scrap-wall2 - rotate: false - xy: 409, 241 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -scrap-wall3 - rotate: false - xy: 443, 275 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -scrap-wall4 - rotate: false - xy: 477, 309 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -scrap-wall5 - rotate: false - xy: 477, 309 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -surge-wall - rotate: false - xy: 545, 309 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -surge-wall-icon-editor - rotate: false - xy: 545, 309 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -thorium-wall - rotate: false - xy: 341, 71 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -thorium-wall-icon-editor - rotate: false - xy: 341, 71 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -titanium-wall - rotate: false - xy: 681, 377 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -titanium-wall-icon-editor - rotate: false - xy: 681, 377 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -editor-ignarock3 - rotate: false - xy: 1, 479 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -editor-magmarock1 - rotate: false - xy: 1, 445 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -magmarock-icon-editor - rotate: false - xy: 1, 445 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -editor-magmarock2 - rotate: false - xy: 35, 479 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -editor-magmarock3 - rotate: false - xy: 1, 411 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -editor-metal-floor - rotate: false - xy: 35, 445 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -metal-floor-icon-editor - rotate: false - xy: 35, 445 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -editor-metal-floor-2 - rotate: false - xy: 69, 479 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -metal-floor-2-icon-editor - rotate: false - xy: 69, 479 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -editor-metal-floor-3 - rotate: false - xy: 1, 377 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -metal-floor-3-icon-editor - rotate: false - xy: 1, 377 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -editor-metal-floor-5 - rotate: false - xy: 35, 411 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -metal-floor-5-icon-editor - rotate: false - xy: 35, 411 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -editor-metal-floor-damaged1 - rotate: false - xy: 69, 445 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -metal-floor-damaged-icon-editor - rotate: false - xy: 69, 445 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -editor-metal-floor-damaged2 - rotate: false - xy: 103, 479 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -editor-metal-floor-damaged3 - rotate: false - xy: 1, 343 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -editor-moss1 - rotate: false - xy: 35, 377 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -moss-icon-editor - rotate: false - xy: 35, 377 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -editor-moss2 - rotate: false - xy: 69, 411 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -editor-moss3 - rotate: false - xy: 103, 445 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -editor-ore-coal1 - rotate: false - xy: 137, 479 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -editor-ore-coal2 - rotate: false - xy: 1, 309 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -editor-ore-coal3 - rotate: false - xy: 35, 343 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -editor-ore-copper1 - rotate: false - xy: 69, 377 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -editor-ore-copper2 - rotate: false - xy: 103, 411 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -editor-ore-copper3 - rotate: false - xy: 137, 445 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -editor-ore-lead1 - rotate: false - xy: 171, 479 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -editor-ore-lead2 - rotate: false - xy: 1, 275 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -editor-ore-lead3 - rotate: false - xy: 35, 309 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -editor-ore-scrap1 - rotate: false - xy: 69, 343 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -editor-ore-scrap2 - rotate: false - xy: 103, 377 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -editor-ore-scrap3 - rotate: false - xy: 137, 411 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -editor-ore-thorium1 - rotate: false - xy: 171, 445 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -editor-ore-thorium2 - rotate: false - xy: 205, 479 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -editor-ore-thorium3 - rotate: false - xy: 1, 241 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -editor-ore-titanium1 - rotate: false - xy: 35, 275 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -editor-ore-titanium2 - rotate: false - xy: 69, 309 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -editor-ore-titanium3 - rotate: false - xy: 103, 343 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -editor-pebbles1 - rotate: false - xy: 137, 377 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -editor-pebbles2 - rotate: false - xy: 171, 411 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -editor-pebbles3 - rotate: false - xy: 205, 445 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -editor-salt - rotate: false - xy: 239, 479 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -salt-icon-editor - rotate: false - xy: 239, 479 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -editor-sand-water - rotate: false - xy: 103, 309 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -sand-water-icon-editor - rotate: false - xy: 103, 309 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -editor-sand1 - rotate: false - xy: 1, 207 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -sand-icon-editor - rotate: false - xy: 1, 207 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -editor-sand2 - rotate: false - xy: 35, 241 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -editor-sand3 - rotate: false - xy: 69, 275 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -editor-shale1 - rotate: false - xy: 137, 343 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -shale-icon-editor - rotate: false - xy: 137, 343 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -editor-shale2 - rotate: false - xy: 171, 377 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -editor-shale3 - rotate: false - xy: 205, 411 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -editor-snow1 - rotate: false - xy: 239, 445 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -snow-icon-editor - rotate: false - xy: 239, 445 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -editor-snow2 - rotate: false - xy: 273, 479 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -editor-snow3 - rotate: false - xy: 1, 173 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -editor-spore-moss1 - rotate: false - xy: 35, 207 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -spore-moss-icon-editor - rotate: false - xy: 35, 207 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -editor-spore-moss2 - rotate: false - xy: 69, 241 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -editor-spore-moss3 - rotate: false - xy: 103, 275 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -editor-stone1 - rotate: false - xy: 137, 309 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -stone-icon-editor - rotate: false - xy: 137, 309 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -editor-stone2 - rotate: false - xy: 171, 343 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -editor-stone3 - rotate: false - xy: 205, 377 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -editor-tainted-water - rotate: false - xy: 239, 411 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -tainted-water-icon-editor - rotate: false - xy: 239, 411 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -editor-tar - rotate: false - xy: 273, 445 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -tar-icon-editor - rotate: false - xy: 273, 445 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -editor-tendrils1 - rotate: false - xy: 307, 479 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -editor-tendrils2 rotate: false xy: 1, 139 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -editor-tendrils3 - rotate: false - xy: 35, 173 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -editor-water - rotate: false - xy: 69, 207 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -water-icon-editor - rotate: false - xy: 69, 207 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -hail-icon-editor - rotate: false - xy: 1, 105 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -icerocks-icon-editor - rotate: false - xy: 69, 173 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -liquid-router-icon-editor - rotate: false - xy: 409, 445 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 mechanical-pump-icon-editor rotate: false - xy: 307, 309 + xy: 1, 139 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -pebbles-icon-editor - rotate: false - xy: 409, 377 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -power-source-icon-editor - rotate: false - xy: 103, 3 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -pulse-conduit-icon-editor - rotate: false - xy: 171, 71 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -pulverizer-icon-editor - rotate: false - xy: 511, 411 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -repair-point-icon-editor - rotate: false - xy: 239, 105 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -rocks-icon-editor - rotate: false - xy: 409, 275 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -saltrocks-icon-editor - rotate: false - xy: 579, 445 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -sandrocks-icon-editor - rotate: false - xy: 171, 3 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -scorch-icon-editor - rotate: false - xy: 307, 139 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -scrap-wall-icon-editor - rotate: false - xy: 579, 411 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -shale-boulder-icon-editor - rotate: false - xy: 239, 37 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -shalerocks-icon-editor - rotate: false - xy: 273, 71 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -shock-mine-icon-editor - rotate: false - xy: 341, 139 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -shrubs-icon-editor - rotate: false - xy: 409, 207 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -snowrocks-icon-editor - rotate: false - xy: 545, 343 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -spawn-icon-editor - rotate: false - xy: 273, 37 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -sporerocks-icon-editor - rotate: false - xy: 477, 241 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -tendrils-icon-editor - rotate: false - xy: 681, 445 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -casing - rotate: false - xy: 860, 51 - size: 8, 16 - orig: 8, 16 - offset: 0, 0 - index: -1 -laser - rotate: false - xy: 870, 19 - size: 4, 48 - orig: 4, 48 - offset: 0, 0 - index: -1 -minelaser - rotate: false - xy: 876, 19 - size: 4, 48 - orig: 4, 48 - offset: 0, 0 - index: -1 -scale_marker - rotate: false - xy: 787, 233 - size: 4, 4 - orig: 4, 4 - offset: 0, 0 - index: -1 -scorch1 - rotate: false - xy: 681, 275 - size: 28, 100 - orig: 28, 100 - offset: 0, 0 - index: -1 -scorch2 - rotate: false - xy: 711, 275 - size: 28, 100 - orig: 28, 100 - offset: 0, 0 - index: -1 -scorch3 - rotate: false - xy: 741, 309 - size: 28, 100 - orig: 28, 100 - offset: 0, 0 - index: -1 -scorch4 - rotate: false - xy: 771, 343 - size: 28, 100 - orig: 28, 100 - offset: 0, 0 - index: -1 -scorch5 - rotate: false - xy: 801, 377 - size: 28, 100 - orig: 28, 100 - offset: 0, 0 - index: -1 -shot - rotate: false - xy: 375, 173 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -transfer - rotate: false - xy: 882, 19 - size: 4, 48 - orig: 4, 48 - offset: 0, 0 - index: -1 -transfer-arrow - rotate: false - xy: 749, 445 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -alloy-smelter-icon-small - rotate: false - xy: 715, 385 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -arc-icon-small - rotate: false - xy: 511, 147 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -battery-icon-small - rotate: false - xy: 545, 181 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -battery-large-icon-small - rotate: false - xy: 579, 215 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -blast-drill-icon-small - rotate: false - xy: 613, 243 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -blast-mixer-icon-small - rotate: false - xy: 741, 283 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -bridge-conduit-icon-small - rotate: false - xy: 771, 317 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -bridge-conveyor-icon-small - rotate: false - xy: 817, 487 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -char-icon-small - rotate: false - xy: 375, 11 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -cliffs-icon-small - rotate: false - xy: 843, 487 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -coal-centrifuge-icon-small - rotate: false - xy: 869, 487 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -combustion-generator-icon-small - rotate: false - xy: 895, 487 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -conduit-icon-small - rotate: false - xy: 921, 487 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -container-icon-small - rotate: false - xy: 947, 487 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -conveyor-icon-small - rotate: false - xy: 973, 487 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -copper-wall-icon-small - rotate: false - xy: 999, 487 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -copper-wall-large-icon-small - rotate: false - xy: 644, 277 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -core-foundation-icon-small - rotate: false - xy: 438, 41 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -core-nucleus-icon-small - rotate: false - xy: 831, 461 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -core-shard-icon-small - rotate: false - xy: 831, 435 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -craters-icon-small - rotate: false - xy: 857, 461 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -crawler-factory-icon-small - rotate: false - xy: 831, 409 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -cryofluidmixer-icon-small - rotate: false - xy: 857, 435 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -cultivator-icon-small - rotate: false - xy: 883, 461 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -cyclone-icon-small - rotate: false - xy: 831, 383 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -dagger-factory-icon-small - rotate: false - xy: 857, 409 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -dark-metal-icon-small - rotate: false - xy: 883, 435 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -dark-panel-1-icon-small - rotate: false - xy: 909, 461 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -dark-panel-2-icon-small - rotate: false - xy: 857, 383 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -dark-panel-3-icon-small - rotate: false - xy: 883, 409 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -dark-panel-4-icon-small - rotate: false - xy: 909, 435 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -dark-panel-5-icon-small - rotate: false - xy: 935, 461 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -dark-panel-6-icon-small - rotate: false - xy: 883, 383 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -darksand-icon-small - rotate: false - xy: 909, 409 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -darksand-tainted-water-icon-small - rotate: false - xy: 935, 435 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -darksand-water-icon-small - rotate: false - xy: 961, 461 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -dart-mech-pad-icon-small - rotate: false - xy: 909, 383 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -deepwater-icon-small - rotate: false - xy: 935, 409 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -delta-mech-pad-icon-small - rotate: false - xy: 961, 435 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -differential-generator-icon-small - rotate: false - xy: 987, 461 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -distributor-icon-small - rotate: false - xy: 935, 383 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -door-icon-small - rotate: false - xy: 961, 409 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -door-large-icon-small - rotate: false - xy: 987, 435 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -dunerocks-icon-small - rotate: false - xy: 961, 383 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -duo-icon-small - rotate: false - xy: 987, 409 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -force-projector-icon-medium - rotate: false - xy: 137, 275 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -force-projector-icon-small - rotate: false - xy: 987, 383 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -fortress-factory-icon-medium - rotate: false - xy: 171, 309 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -fortress-factory-icon-small - rotate: false - xy: 401, 7 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -fuse-icon-medium - rotate: false - xy: 205, 343 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -fuse-icon-small - rotate: false - xy: 427, 7 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -ghoul-factory-icon-medium - rotate: false - xy: 239, 377 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -ghoul-factory-icon-small - rotate: false - xy: 511, 121 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -glaive-ship-pad-icon-medium - rotate: false - xy: 273, 411 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -glaive-ship-pad-icon-small - rotate: false - xy: 506, 95 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -graphite-press-icon-medium - rotate: false - xy: 307, 445 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -graphite-press-icon-small - rotate: false - xy: 506, 69 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -grass-icon-small - rotate: false - xy: 537, 147 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -hail - rotate: false - xy: 341, 479 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -hail-icon-full - rotate: false - xy: 35, 139 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -hail-icon-small - rotate: false - xy: 537, 121 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -holostone-icon-small - rotate: false - xy: 532, 95 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -hotrock-icon-small - rotate: false - xy: 532, 69 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -ice-icon-small - rotate: false - xy: 571, 181 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -ice-snow-icon-small - rotate: false - xy: 563, 155 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -icerocks-icon-small - rotate: false - xy: 563, 129 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -ignarock-icon-small - rotate: false - xy: 771, 291 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -impact-reactor-icon-medium - rotate: false - xy: 171, 275 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -impact-reactor-icon-small - rotate: false - xy: 767, 265 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -incinerator-icon-small - rotate: false - xy: 801, 325 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -item-blast-compound-medium - rotate: false - xy: 793, 257 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -item-blast-compound-small - rotate: false - xy: 995, 69 - size: 16, 16 - orig: 16, 16 - offset: 0, 0 - index: -1 -item-coal-medium - rotate: false - xy: 767, 239 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -item-coal-small - rotate: false - xy: 698, 83 - size: 16, 16 - orig: 16, 16 - offset: 0, 0 - index: -1 -item-copper-medium - rotate: false - xy: 793, 231 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -item-copper-small - rotate: false - xy: 698, 65 - size: 16, 16 - orig: 16, 16 - offset: 0, 0 - index: -1 -item-graphite-medium - rotate: false - xy: 644, 251 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -item-graphite-small - rotate: false - xy: 716, 83 - size: 16, 16 - orig: 16, 16 - offset: 0, 0 - index: -1 -item-lead-medium - rotate: false - xy: 670, 249 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -item-lead-small - rotate: false - xy: 716, 65 - size: 16, 16 - orig: 16, 16 - offset: 0, 0 - index: -1 -item-metaglass-medium - rotate: false - xy: 696, 249 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -item-metaglass-small - rotate: false - xy: 713, 47 - size: 16, 16 - orig: 16, 16 - offset: 0, 0 - index: -1 -item-phase-fabric-medium - rotate: false - xy: 464, 41 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -item-phase-fabric-small - rotate: false - xy: 713, 29 - size: 16, 16 - orig: 16, 16 - offset: 0, 0 - index: -1 -item-plastanium-medium - rotate: false - xy: 453, 15 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -item-plastanium-small - rotate: false - xy: 713, 11 - size: 16, 16 - orig: 16, 16 - offset: 0, 0 - index: -1 -item-pyratite-medium - rotate: false - xy: 479, 15 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -item-pyratite-small - rotate: false - xy: 731, 47 - size: 16, 16 - orig: 16, 16 - offset: 0, 0 - index: -1 -item-sand-medium - rotate: false - xy: 589, 155 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -item-sand-small - rotate: false - xy: 731, 29 - size: 16, 16 - orig: 16, 16 - offset: 0, 0 - index: -1 -item-scrap-medium - rotate: false - xy: 589, 129 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -item-scrap-small - rotate: false - xy: 731, 11 - size: 16, 16 - orig: 16, 16 - offset: 0, 0 - index: -1 -item-silicon-medium - rotate: false - xy: 563, 103 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -item-silicon-small - rotate: false - xy: 749, 91 - size: 16, 16 - orig: 16, 16 - offset: 0, 0 - index: -1 -item-source-icon-small - rotate: false - xy: 589, 103 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -item-spore-pod-medium - rotate: false - xy: 558, 77 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -item-spore-pod-small - rotate: false - xy: 767, 83 - size: 16, 16 - orig: 16, 16 - offset: 0, 0 - index: -1 -item-surge-alloy-medium - rotate: false - xy: 584, 77 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -item-surge-alloy-small - rotate: false - xy: 734, 65 - size: 16, 16 - orig: 16, 16 - offset: 0, 0 - index: -1 -item-thorium-medium - rotate: false - xy: 623, 189 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -item-thorium-small - rotate: false - xy: 749, 47 - size: 16, 16 - orig: 16, 16 - offset: 0, 0 - index: -1 -item-titanium-medium - rotate: false - xy: 615, 163 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -item-titanium-small - rotate: false - xy: 749, 29 - size: 16, 16 - orig: 16, 16 - offset: 0, 0 - index: -1 -item-void-icon-small - rotate: false - xy: 615, 137 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -javelin-ship-pad-icon-medium - rotate: false - xy: 35, 71 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -javelin-ship-pad-icon-small - rotate: false - xy: 615, 111 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -junction-icon-small - rotate: false - xy: 490, 43 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -kiln-icon-medium - rotate: false - xy: 103, 139 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -kiln-icon-small - rotate: false - xy: 516, 43 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -lancer-icon-medium - rotate: false - xy: 137, 173 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -lancer-icon-small - rotate: false - xy: 505, 17 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -laser-drill-icon-medium - rotate: false - xy: 171, 207 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -laser-drill-icon-small - rotate: false - xy: 542, 43 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -launch-pad-icon-medium - rotate: false - xy: 205, 241 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -launch-pad-icon-small - rotate: false - xy: 531, 17 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -launch-pad-large-icon-medium - rotate: false - xy: 239, 275 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -launch-pad-large-icon-small - rotate: false - xy: 568, 51 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -liquid-junction-icon-small - rotate: false - xy: 594, 51 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -liquid-router-icon-full - rotate: false - xy: 443, 479 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -liquid-router-icon-small - rotate: false - xy: 610, 77 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -liquid-source-icon-small - rotate: false - xy: 620, 51 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -liquid-tank-icon-medium - rotate: false - xy: 137, 139 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -liquid-tank-icon-small - rotate: false - xy: 557, 17 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -magmarock-icon-small - rotate: false - xy: 583, 25 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -mass-driver-icon-medium - rotate: false - xy: 205, 207 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -mass-driver-icon-small - rotate: false - xy: 609, 25 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -mechanical-drill-icon-medium - rotate: false - xy: 239, 241 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -mechanical-drill-icon-small - rotate: false - xy: 635, 25 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -mechanical-pump-icon-small - rotate: false - xy: 641, 163 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -meltdown-icon-medium - rotate: false - xy: 341, 343 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -meltdown-icon-small - rotate: false - xy: 641, 137 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -melter-icon-small - rotate: false - xy: 641, 111 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -mend-projector-icon-medium - rotate: false - xy: 409, 411 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -mend-projector-icon-small - rotate: false - xy: 636, 85 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -mender-icon-small - rotate: false - xy: 646, 59 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -metal-floor-2-icon-small - rotate: false - xy: 662, 85 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -metal-floor-3-icon-small - rotate: false - xy: 672, 59 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -metal-floor-5-icon-small - rotate: false - xy: 661, 33 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -metal-floor-damaged-icon-small - rotate: false - xy: 687, 33 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -metal-floor-icon-small - rotate: false - xy: 661, 7 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -moss-icon-small - rotate: false - xy: 687, 7 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -multi-press-icon-medium - rotate: false - xy: 35, 3 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -multi-press-icon-small - rotate: false - xy: 831, 357 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -oil-extractor-icon-medium - rotate: false - xy: 69, 37 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -oil-extractor-icon-small - rotate: false - xy: 857, 357 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -omega-mech-pad-icon-medium - rotate: false - xy: 103, 71 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -omega-mech-pad-icon-small - rotate: false - xy: 883, 357 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -ore-coal-icon-full - rotate: false - xy: 137, 105 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -ore-coal-icon-medium - rotate: false - xy: 137, 105 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -ore-coal-icon-small - rotate: false - xy: 909, 357 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -ore-copper-icon-full - rotate: false - xy: 171, 139 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -ore-copper-icon-medium - rotate: false - xy: 171, 139 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -ore-copper-icon-small - rotate: false - xy: 935, 357 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -ore-lead-icon-full - rotate: false - xy: 205, 173 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -ore-lead-icon-medium - rotate: false - xy: 205, 173 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -ore-lead-icon-small - rotate: false - xy: 961, 357 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -ore-scrap-icon-full - rotate: false - xy: 239, 207 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -ore-scrap-icon-medium - rotate: false - xy: 239, 207 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -ore-scrap-icon-small - rotate: false - xy: 987, 357 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -ore-thorium-icon-full - rotate: false - xy: 273, 241 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -ore-thorium-icon-medium - rotate: false - xy: 273, 241 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -ore-thorium-icon-small - rotate: false - xy: 827, 331 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -ore-titanium-icon-full - rotate: false - xy: 307, 275 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -ore-titanium-icon-medium - rotate: false - xy: 307, 275 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -ore-titanium-icon-small - rotate: false - xy: 853, 331 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -overdrive-projector-icon-medium - rotate: false - xy: 341, 309 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -overdrive-projector-icon-small - rotate: false - xy: 879, 331 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -overflow-gate-icon-small - rotate: false - xy: 905, 331 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -pebbles-icon-small - rotate: false - xy: 931, 331 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -phantom-factory-icon-medium - rotate: false - xy: 443, 411 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -phantom-factory-icon-small - rotate: false - xy: 957, 331 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -phase-conduit-icon-small - rotate: false - xy: 983, 331 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -phase-conveyor-icon-small - rotate: false - xy: 631, 217 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -phase-wall-icon-small - rotate: false - xy: 657, 223 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -phase-wall-large-icon-medium - rotate: false - xy: 307, 241 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -phase-wall-large-icon-small - rotate: false - xy: 683, 223 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -phase-weaver-icon-medium - rotate: false - xy: 341, 275 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -phase-weaver-icon-small - rotate: false - xy: 709, 223 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -pine-icon-medium - rotate: false - xy: 375, 309 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -pine-icon-small - rotate: false - xy: 735, 231 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -plastanium-compressor-icon-medium - rotate: false - xy: 409, 343 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -plastanium-compressor-icon-small - rotate: false - xy: 735, 205 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -pneumatic-drill-icon-medium - rotate: false - xy: 443, 377 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -pneumatic-drill-icon-small - rotate: false - xy: 761, 213 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -power-node-icon-small - rotate: false - xy: 787, 205 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -power-node-large-icon-medium - rotate: false - xy: 511, 445 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -power-node-large-icon-small - rotate: false - xy: 761, 187 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -power-source-icon-small - rotate: false - xy: 787, 179 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -power-void-icon-small - rotate: false - xy: 827, 305 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -pulse-conduit-icon-full - rotate: false - xy: 205, 105 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -pulse-conduit-icon-small - rotate: false - xy: 853, 305 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -pulverizer-icon-full - rotate: false - xy: 545, 445 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -pulverizer-icon-small - rotate: false - xy: 879, 305 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -pyratite-mixer-icon-medium - rotate: false - xy: 137, 3 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -pyratite-mixer-icon-small - rotate: false - xy: 905, 305 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -repair-point - rotate: false - xy: 171, 37 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -repair-point-icon-full - rotate: false - xy: 273, 139 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -repair-point-icon-small - rotate: false - xy: 931, 305 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -revenant-factory-icon-medium - rotate: false - xy: 307, 173 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -revenant-factory-icon-small - rotate: false - xy: 957, 305 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -ripple-icon-medium - rotate: false - xy: 341, 207 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -ripple-icon-small - rotate: false - xy: 983, 305 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -rock-icon-medium - rotate: false - xy: 375, 241 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -rock-icon-small - rotate: false - xy: 823, 279 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -rocks-icon-small - rotate: false - xy: 849, 279 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -rotary-pump-icon-medium - rotate: false - xy: 443, 309 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -rotary-pump-icon-small - rotate: false - xy: 875, 279 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -router-icon-small - rotate: false - xy: 901, 279 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -rtg-generator-icon-medium - rotate: false - xy: 511, 377 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -rtg-generator-icon-small - rotate: false - xy: 927, 279 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -salt-icon-small - rotate: false - xy: 953, 279 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -saltrocks-icon-small - rotate: false - xy: 979, 279 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -salvo-icon-medium - rotate: false - xy: 613, 479 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -salvo-icon-small - rotate: false - xy: 819, 253 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -sand-icon-small - rotate: false - xy: 845, 253 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -sand-water-icon-small - rotate: false - xy: 871, 253 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -sandrocks-icon-small - rotate: false - xy: 897, 253 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -scatter-icon-medium - rotate: false - xy: 205, 37 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -scatter-icon-small - rotate: false - xy: 923, 253 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -scorch - rotate: false - xy: 239, 71 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -scorch-icon-full - rotate: false - xy: 341, 173 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -scorch-icon-small - rotate: false - xy: 949, 253 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -scrap-wall-gigantic-icon-medium - rotate: false - xy: 511, 343 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -scrap-wall-gigantic-icon-small - rotate: false - xy: 975, 253 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -scrap-wall-huge-icon-medium - rotate: false - xy: 545, 377 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -scrap-wall-huge-icon-small - rotate: false - xy: 819, 227 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -scrap-wall-icon-small - rotate: false - xy: 845, 227 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -scrap-wall-large-icon-medium - rotate: false - xy: 613, 445 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -scrap-wall-large-icon-small - rotate: false - xy: 871, 227 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -separator-icon-medium - rotate: false - xy: 205, 3 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -separator-icon-small - rotate: false - xy: 897, 227 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -shale-boulder-icon-small - rotate: false - xy: 865, 201 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -shale-icon-small - rotate: false - xy: 923, 227 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -shalerocks-icon-small - rotate: false - xy: 891, 201 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -shock-mine-icon-small - rotate: false - xy: 949, 227 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -shrubs-icon-small - rotate: false - xy: 917, 201 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -silicon-smelter-icon-medium - rotate: false - xy: 443, 241 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -silicon-smelter-icon-small - rotate: false - xy: 975, 227 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -snow-icon-small - rotate: false - xy: 943, 201 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -snowrock-icon-medium - rotate: false - xy: 511, 309 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -snowrock-icon-small - rotate: false - xy: 969, 201 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -snowrocks-icon-small - rotate: false - xy: 865, 175 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -solar-panel-icon-small - rotate: false - xy: 891, 175 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -solar-panel-large-icon-medium - rotate: false - xy: 613, 411 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -solar-panel-large-icon-small - rotate: false - xy: 917, 175 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -sorter-icon-small - rotate: false - xy: 943, 175 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -spawn-icon-small - rotate: false - xy: 969, 175 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -spectre-icon-medium - rotate: false - xy: 307, 71 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -spectre-icon-small - rotate: false - xy: 839, 164 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -spirit-factory-icon-medium - rotate: false - xy: 341, 105 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -spirit-factory-icon-small - rotate: false - xy: 813, 159 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -spore-cluster-icon-medium - rotate: false - xy: 375, 139 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -spore-cluster-icon-small - rotate: false - xy: 865, 149 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -spore-moss-icon-small - rotate: false - xy: 891, 149 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -spore-pine-icon-medium - rotate: false - xy: 409, 173 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -spore-pine-icon-small - rotate: false - xy: 917, 149 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -spore-press-icon-medium - rotate: false - xy: 443, 207 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -spore-press-icon-small - rotate: false - xy: 943, 149 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -sporerocks-icon-small - rotate: false - xy: 969, 149 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -stone-icon-small - rotate: false - xy: 839, 138 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -surge-tower-icon-medium - rotate: false - xy: 511, 275 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -surge-tower-icon-small - rotate: false - xy: 865, 123 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -surge-wall-icon-small - rotate: false - xy: 891, 123 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -surge-wall-large-icon-medium - rotate: false - xy: 579, 343 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -surge-wall-large-icon-small - rotate: false - xy: 917, 123 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -swarmer-icon-medium - rotate: false - xy: 613, 377 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -swarmer-icon-small - rotate: false - xy: 943, 123 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -tainted-water-icon-small - rotate: false - xy: 969, 123 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -tar-icon-small - rotate: false - xy: 649, 191 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -tau-mech-pad-icon-medium - rotate: false - xy: 647, 411 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -tau-mech-pad-icon-small - rotate: false - xy: 675, 197 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -tendrils-icon-small - rotate: false - xy: 701, 197 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -thermal-generator-icon-medium - rotate: false - xy: 715, 479 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -thermal-generator-icon-small - rotate: false - xy: 995, 201 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -thermal-pump-icon-medium - rotate: false - xy: 273, 3 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -thermal-pump-icon-small - rotate: false - xy: 995, 175 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -thorium-reactor-icon-medium - rotate: false - xy: 307, 37 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -thorium-reactor-icon-small - rotate: false - xy: 995, 149 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -thorium-wall-icon-small - rotate: false - xy: 995, 123 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -thorium-wall-large-icon-medium - rotate: false - xy: 375, 105 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -thorium-wall-large-icon-small - rotate: false - xy: 667, 165 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -thruster-icon-medium - rotate: false - xy: 409, 139 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -thruster-icon-small - rotate: false - xy: 667, 139 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -titan-factory-icon-medium - rotate: false - xy: 443, 173 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -titan-factory-icon-small - rotate: false - xy: 667, 113 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -titanium-conveyor-icon-small - rotate: false - xy: 693, 171 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -titanium-wall-icon-small - rotate: false - xy: 693, 145 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -titanium-wall-large-icon-medium - rotate: false - xy: 715, 411 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -titanium-wall-large-icon-small - rotate: false - xy: 693, 119 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -trident-ship-pad-icon-medium - rotate: false - xy: 783, 479 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -trident-ship-pad-icon-small - rotate: false - xy: 719, 171 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -turbine-generator-icon-medium - rotate: false - xy: 341, 3 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -turbine-generator-icon-small - rotate: false - xy: 719, 145 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -unloader-icon-small - rotate: false - xy: 719, 119 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -vault-icon-medium - rotate: false - xy: 409, 71 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -vault-icon-small - rotate: false - xy: 745, 161 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -water-extractor-icon-medium - rotate: false - xy: 443, 105 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -water-extractor-icon-small - rotate: false - xy: 745, 135 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -water-icon-small - rotate: false - xy: 745, 109 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -wave-icon-medium - rotate: false - xy: 477, 139 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -wave-icon-small - rotate: false - xy: 771, 153 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -white-tree-dead-icon-medium - rotate: false - xy: 511, 173 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -white-tree-dead-icon-small - rotate: false - xy: 771, 127 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -white-tree-icon-medium - rotate: false - xy: 545, 207 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -white-tree-icon-small - rotate: false - xy: 771, 101 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -wraith-factory-icon-medium - rotate: false - xy: 579, 241 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -wraith-factory-icon-small - rotate: false - xy: 797, 133 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -item-biomatter - rotate: false - xy: 239, 343 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -item-blast-compound +phase-conduit rotate: false xy: 273, 377 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -item-coal +phase-conduit-icon-editor + rotate: false + xy: 273, 377 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +phase-conduit-arrow rotate: false xy: 307, 411 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -item-copper +phase-conduit-bridge rotate: false xy: 341, 445 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -item-graphite +phase-conduit-end rotate: false xy: 375, 479 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -item-lead +pulse-conduit-top-0 rotate: false - xy: 1, 71 + xy: 137, 173 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -item-metaglass +pulse-conduit-top-1 rotate: false - xy: 35, 105 + xy: 171, 207 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -item-phase-fabric +pulse-conduit-top-2 rotate: false - xy: 69, 139 + xy: 205, 241 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -item-plastanium +pulse-conduit-top-3 rotate: false - xy: 103, 173 + xy: 239, 275 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -item-pyratite - rotate: false - xy: 137, 207 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -item-sand - rotate: false - xy: 171, 241 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -item-scrap - rotate: false - xy: 205, 275 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -item-silicon - rotate: false - xy: 239, 309 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -item-spore-pod - rotate: false - xy: 307, 377 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -item-surge-alloy - rotate: false - xy: 341, 411 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -item-thorium - rotate: false - xy: 375, 445 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -item-titanium - rotate: false - xy: 409, 479 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -liquid-cryofluid +pulse-conduit-top-4 rotate: false xy: 273, 309 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -liquid-oil +pulse-conduit-top-5 + rotate: false + xy: 307, 343 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +pulse-conduit-top-6 rotate: false xy: 341, 377 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -liquid-slag +power-node + rotate: false + xy: 341, 411 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +power-node-icon-editor + rotate: false + xy: 341, 411 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +power-source + rotate: false + xy: 409, 479 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +power-void + rotate: false + xy: 35, 71 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +power-void-icon-editor + rotate: false + xy: 35, 71 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +rtg-generator-top + rotate: false + xy: 443, 445 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +solar-panel + rotate: false + xy: 409, 343 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +solar-panel-icon-editor + rotate: false + xy: 409, 343 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +incinerator + rotate: false + xy: 137, 479 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +incinerator-icon-editor + rotate: false + xy: 137, 479 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +item-source + rotate: false + xy: 1, 241 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +item-source-icon-editor + rotate: false + xy: 1, 241 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +item-void + rotate: false + xy: 171, 411 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +item-void-icon-editor + rotate: false + xy: 171, 411 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +liquid-source + rotate: false + xy: 171, 343 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +liquid-source-icon-editor + rotate: false + xy: 171, 343 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +melter + rotate: false + xy: 69, 207 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +melter-icon-editor + rotate: false + xy: 69, 207 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +pulverizer + rotate: false + xy: 375, 411 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +pulverizer-rotator + rotate: false + xy: 1, 3 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +unloader + rotate: false + xy: 613, 445 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +unloader-icon-editor + rotate: false + xy: 613, 445 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +scorch-heat + rotate: false + xy: 171, 139 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +repair-point-base + rotate: false + xy: 103, 105 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +phase-wall + rotate: false + xy: 137, 207 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +phase-wall-icon-editor + rotate: false + xy: 137, 207 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +scrap-wall1 + rotate: false + xy: 273, 241 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +scrap-wall-icon-editor + rotate: false + xy: 273, 241 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +scrap-wall2 + rotate: false + xy: 307, 275 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +scrap-wall3 + rotate: false + xy: 341, 309 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +scrap-wall4 + rotate: false + xy: 375, 343 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +scrap-wall5 + rotate: false + xy: 375, 343 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +surge-wall + rotate: false + xy: 307, 207 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +surge-wall-icon-editor + rotate: false + xy: 307, 207 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +thorium-wall + rotate: false + xy: 579, 479 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +thorium-wall-icon-editor + rotate: false + xy: 579, 479 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +titanium-wall + rotate: false + xy: 443, 275 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +titanium-wall-icon-editor + rotate: false + xy: 443, 275 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +hail-icon-editor + rotate: false + xy: 69, 445 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +icerocks-icon-editor + rotate: false + xy: 1, 343 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +liquid-router-icon-editor + rotate: false + xy: 1, 173 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +pebbles-icon-editor + rotate: false + xy: 205, 309 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +power-source-icon-editor + rotate: false + xy: 1, 37 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +pulse-conduit-icon-editor + rotate: false + xy: 69, 105 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +pulverizer-icon-editor + rotate: false + xy: 409, 445 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +repair-point-icon-editor + rotate: false + xy: 137, 139 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +rocks-icon-editor + rotate: false + xy: 307, 309 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +saltrocks-icon-editor + rotate: false + xy: 477, 479 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +sandrocks-icon-editor + rotate: false + xy: 69, 37 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +scorch-icon-editor + rotate: false + xy: 205, 173 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +shale-boulder-icon-editor + rotate: false + xy: 103, 37 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +shalerocks-icon-editor + rotate: false + xy: 137, 71 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +shock-mine-icon-editor + rotate: false + xy: 205, 139 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +shrubs-icon-editor + rotate: false + xy: 273, 207 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +snowrocks-icon-editor + rotate: false + xy: 375, 309 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +spawn-icon-editor + rotate: false + xy: 511, 445 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +sporerocks-icon-editor + rotate: false + xy: 239, 139 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +tendrils-icon-editor + rotate: false + xy: 443, 343 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +casing + rotate: false + xy: 661, 259 + size: 8, 16 + orig: 8, 16 + offset: 0, 0 + index: -1 +laser + rotate: false + xy: 1019, 231 + size: 4, 48 + orig: 4, 48 + offset: 0, 0 + index: -1 +minelaser + rotate: false + xy: 619, 23 + size: 4, 48 + orig: 4, 48 + offset: 0, 0 + index: -1 +scale_marker + rotate: false + xy: 549, 131 + size: 4, 4 + orig: 4, 4 + offset: 0, 0 + index: -1 +scorch1 + rotate: false + xy: 443, 173 + size: 28, 100 + orig: 28, 100 + offset: 0, 0 + index: -1 +scorch2 + rotate: false + xy: 473, 173 + size: 28, 100 + orig: 28, 100 + offset: 0, 0 + index: -1 +scorch3 + rotate: false + xy: 503, 207 + size: 28, 100 + orig: 28, 100 + offset: 0, 0 + index: -1 +scorch4 + rotate: false + xy: 533, 241 + size: 28, 100 + orig: 28, 100 + offset: 0, 0 + index: -1 +scorch5 + rotate: false + xy: 563, 275 + size: 28, 100 + orig: 28, 100 + offset: 0, 0 + index: -1 +shot + rotate: false + xy: 239, 173 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +transfer + rotate: false + xy: 625, 23 + size: 4, 48 + orig: 4, 48 + offset: 0, 0 + index: -1 +transfer-arrow + rotate: false + xy: 511, 343 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +alloy-smelter-icon-small + rotate: false + xy: 477, 283 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +arc-icon-small + rotate: false + xy: 239, 11 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +battery-icon-small + rotate: false + xy: 273, 45 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +battery-large-icon-small + rotate: false + xy: 307, 79 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +blast-drill-icon-small + rotate: false + xy: 341, 113 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +blast-mixer-icon-small + rotate: false + xy: 375, 141 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +bridge-conduit-icon-small + rotate: false + xy: 503, 181 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +bridge-conveyor-icon-small + rotate: false + xy: 533, 215 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +char-icon-small + rotate: false + xy: 579, 385 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +cliffs-icon-small + rotate: false + xy: 710, 487 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +coal-centrifuge-icon-small + rotate: false + xy: 710, 461 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +combustion-generator-icon-small + rotate: false + xy: 736, 487 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +conduit-icon-small + rotate: false + xy: 736, 461 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +container-icon-small + rotate: false + xy: 762, 487 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +conveyor-icon-small + rotate: false + xy: 762, 461 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +copper-wall-icon-small + rotate: false + xy: 788, 487 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +copper-wall-large-icon-small + rotate: false + xy: 788, 461 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +core-foundation-icon-small + rotate: false + xy: 814, 487 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +core-nucleus-icon-small + rotate: false + xy: 814, 461 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +core-shard-icon-small + rotate: false + xy: 840, 487 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +craters-icon-small + rotate: false + xy: 840, 461 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +crawler-factory-icon-small + rotate: false + xy: 866, 487 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +cryofluidmixer-icon-small + rotate: false + xy: 866, 461 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +cultivator-icon-small + rotate: false + xy: 892, 487 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +cyclone-icon-small + rotate: false + xy: 892, 461 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +dagger-factory-icon-small + rotate: false + xy: 918, 487 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +dark-metal-icon-small + rotate: false + xy: 918, 461 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +dark-panel-1-icon-small + rotate: false + xy: 944, 487 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +dark-panel-2-icon-small + rotate: false + xy: 944, 461 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +dark-panel-3-icon-small + rotate: false + xy: 970, 487 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +dark-panel-4-icon-small + rotate: false + xy: 970, 461 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +dark-panel-5-icon-small + rotate: false + xy: 996, 487 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +dark-panel-6-icon-small + rotate: false + xy: 996, 461 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +darksand-icon-small + rotate: false + xy: 406, 175 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +darksand-tainted-water-icon-small + rotate: false + xy: 642, 415 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +darksand-water-icon-small + rotate: false + xy: 605, 381 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +dart-mech-pad-icon-small + rotate: false + xy: 710, 435 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +deepwater-icon-small + rotate: false + xy: 736, 435 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +delta-mech-pad-icon-small + rotate: false + xy: 762, 435 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +differential-generator-icon-small + rotate: false + xy: 788, 435 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +distributor-icon-small + rotate: false + xy: 814, 435 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +door-icon-small + rotate: false + xy: 840, 435 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +door-large-icon-small + rotate: false + xy: 866, 435 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +dunerocks-icon-small + rotate: false + xy: 892, 435 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +duo-icon-small + rotate: false + xy: 918, 435 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +force-projector-icon-medium + rotate: false + xy: 1, 445 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +force-projector-icon-small + rotate: false + xy: 944, 435 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +fortress-factory-icon-medium + rotate: false + xy: 35, 479 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +fortress-factory-icon-small + rotate: false + xy: 970, 435 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +fuse-icon-medium + rotate: false + xy: 1, 411 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +fuse-icon-small + rotate: false + xy: 996, 435 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +ghoul-factory-icon-medium + rotate: false + xy: 35, 445 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +ghoul-factory-icon-small + rotate: false + xy: 631, 381 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +glaive-ship-pad-icon-medium + rotate: false + xy: 69, 479 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +glaive-ship-pad-icon-small + rotate: false + xy: 593, 355 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +graphite-press-icon-medium + rotate: false + xy: 1, 377 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +graphite-press-icon-small + rotate: false + xy: 593, 329 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +grass-icon-small + rotate: false + xy: 619, 355 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +hail + rotate: false + xy: 35, 411 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +hail-icon-full + rotate: false + xy: 103, 479 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +hail-icon-small + rotate: false + xy: 593, 303 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +holostone-icon-small + rotate: false + xy: 619, 329 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +hotrock-icon-small + rotate: false + xy: 593, 277 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +ice-icon-small + rotate: false + xy: 619, 303 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +ice-snow-icon-small + rotate: false + xy: 619, 277 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +icerocks-icon-small + rotate: false + xy: 645, 355 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +ignarock-icon-small + rotate: false + xy: 265, 11 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +impact-reactor-icon-medium + rotate: false + xy: 103, 445 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +impact-reactor-icon-small + rotate: false + xy: 299, 45 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +incinerator-icon-small + rotate: false + xy: 291, 19 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +item-blast-compound-medium + rotate: false + xy: 325, 37 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +item-blast-compound-small + rotate: false + xy: 603, 187 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +item-coal-medium + rotate: false + xy: 317, 11 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +item-coal-small + rotate: false + xy: 603, 169 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +item-copper-medium + rotate: false + xy: 367, 113 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +item-copper-small + rotate: false + xy: 639, 205 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +item-graphite-medium + rotate: false + xy: 359, 87 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +item-graphite-small + rotate: false + xy: 621, 187 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +item-lead-medium + rotate: false + xy: 359, 61 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +item-lead-small + rotate: false + xy: 657, 205 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +item-metaglass-medium + rotate: false + xy: 351, 35 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +item-metaglass-small + rotate: false + xy: 621, 169 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +item-phase-fabric-medium + rotate: false + xy: 343, 9 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +item-phase-fabric-small + rotate: false + xy: 617, 151 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +item-plastanium-medium + rotate: false + xy: 503, 155 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +item-plastanium-small + rotate: false + xy: 639, 187 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +item-pyratite-medium + rotate: false + xy: 533, 189 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +item-pyratite-small + rotate: false + xy: 675, 205 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +item-sand-medium + rotate: false + xy: 529, 163 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +item-sand-small + rotate: false + xy: 617, 133 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +item-scrap-medium + rotate: false + xy: 563, 223 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +item-scrap-small + rotate: false + xy: 639, 169 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +item-silicon-medium + rotate: false + xy: 559, 197 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +item-silicon-small + rotate: false + xy: 635, 151 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +item-source-icon-small + rotate: false + xy: 406, 149 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +item-spore-pod-medium + rotate: false + xy: 432, 147 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +item-spore-pod-small + rotate: false + xy: 657, 187 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +item-surge-alloy-medium + rotate: false + xy: 458, 147 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +item-surge-alloy-small + rotate: false + xy: 693, 205 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +item-thorium-medium + rotate: false + xy: 668, 415 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +item-thorium-small + rotate: false + xy: 635, 133 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +item-titanium-medium + rotate: false + xy: 657, 389 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +item-titanium-small + rotate: false + xy: 657, 169 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +item-void-icon-small + rotate: false + xy: 683, 389 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +javelin-ship-pad-icon-medium + rotate: false + xy: 205, 445 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +javelin-ship-pad-icon-small + rotate: false + xy: 671, 363 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +junction-icon-small + rotate: false + xy: 671, 337 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +kiln-icon-medium + rotate: false + xy: 1, 207 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +kiln-icon-small + rotate: false + xy: 671, 311 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +lancer-icon-medium + rotate: false + xy: 35, 241 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +lancer-icon-small + rotate: false + xy: 671, 285 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +laser-drill-icon-medium + rotate: false + xy: 69, 275 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +laser-drill-icon-small + rotate: false + xy: 697, 363 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +launch-pad-icon-medium + rotate: false + xy: 103, 309 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +launch-pad-icon-small + rotate: false + xy: 697, 337 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +launch-pad-large-icon-medium + rotate: false + xy: 137, 343 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +launch-pad-large-icon-small + rotate: false + xy: 697, 311 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +liquid-junction-icon-small + rotate: false + xy: 697, 285 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +liquid-router-icon-full + rotate: false + xy: 35, 207 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +liquid-router-icon-small + rotate: false + xy: 385, 87 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +liquid-source-icon-small + rotate: false + xy: 385, 61 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +liquid-tank-icon-medium + rotate: false + xy: 205, 377 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +liquid-tank-icon-small + rotate: false + xy: 377, 35 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +magmarock-icon-small + rotate: false + xy: 369, 9 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +mass-driver-icon-medium + rotate: false + xy: 273, 445 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +mass-driver-icon-small + rotate: false + xy: 529, 137 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +mechanical-drill-icon-medium + rotate: false + xy: 307, 479 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +mechanical-drill-icon-small + rotate: false + xy: 559, 171 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +mechanical-pump-icon-small + rotate: false + xy: 555, 145 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +meltdown-icon-medium + rotate: false + xy: 35, 173 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +meltdown-icon-small + rotate: false + xy: 671, 259 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +melter-icon-small + rotate: false + xy: 697, 259 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +mend-projector-icon-medium + rotate: false + xy: 103, 241 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +mend-projector-icon-small + rotate: false + xy: 403, 35 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +mender-icon-small + rotate: false + xy: 395, 9 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +metal-floor-2-icon-small + rotate: false + xy: 555, 119 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +metal-floor-3-icon-small + rotate: false + xy: 421, 9 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +metal-floor-5-icon-small + rotate: false + xy: 393, 115 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +metal-floor-damaged-icon-small + rotate: false + xy: 419, 121 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +metal-floor-icon-small + rotate: false + xy: 445, 121 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +moss-icon-small + rotate: false + xy: 471, 121 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +multi-press-icon-medium + rotate: false + xy: 205, 343 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +multi-press-icon-small + rotate: false + xy: 497, 129 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +oil-extractor-icon-medium + rotate: false + xy: 239, 377 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +oil-extractor-icon-small + rotate: false + xy: 497, 103 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +omega-mech-pad-icon-medium + rotate: false + xy: 273, 411 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +omega-mech-pad-icon-small + rotate: false + xy: 523, 111 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +ore-coal-icon-full + rotate: false + xy: 307, 445 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +ore-coal-icon-medium + rotate: false + xy: 307, 445 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +ore-coal-icon-small + rotate: false + xy: 523, 85 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +ore-copper-icon-full + rotate: false + xy: 341, 479 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +ore-copper-icon-medium + rotate: false + xy: 341, 479 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +ore-copper-icon-small + rotate: false + xy: 549, 93 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +ore-lead-icon-full + rotate: false + xy: 1, 105 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +ore-lead-icon-medium + rotate: false + xy: 1, 105 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +ore-lead-icon-small + rotate: false + xy: 549, 67 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +ore-scrap-icon-full + rotate: false + xy: 35, 139 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +ore-scrap-icon-medium + rotate: false + xy: 35, 139 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +ore-scrap-icon-small + rotate: false + xy: 411, 89 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +ore-thorium-icon-full + rotate: false + xy: 69, 173 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +ore-thorium-icon-medium + rotate: false + xy: 69, 173 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +ore-thorium-icon-small + rotate: false + xy: 411, 63 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +ore-titanium-icon-full + rotate: false + xy: 103, 207 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +ore-titanium-icon-medium + rotate: false + xy: 103, 207 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +ore-titanium-icon-small + rotate: false + xy: 437, 95 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +overdrive-projector-icon-medium + rotate: false + xy: 137, 241 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +overdrive-projector-icon-small + rotate: false + xy: 463, 95 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +overflow-gate-icon-small + rotate: false + xy: 437, 69 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +pebbles-icon-small + rotate: false + xy: 463, 69 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +phantom-factory-icon-medium + rotate: false + xy: 239, 343 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +phantom-factory-icon-small + rotate: false + xy: 489, 77 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +phase-conduit-icon-small + rotate: false + xy: 489, 51 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +phase-conveyor-icon-small + rotate: false + xy: 515, 59 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +phase-wall-icon-small + rotate: false + xy: 515, 33 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +phase-wall-large-icon-medium + rotate: false + xy: 171, 241 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +phase-wall-large-icon-small + rotate: false + xy: 541, 41 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +phase-weaver-icon-medium + rotate: false + xy: 205, 275 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +phase-weaver-icon-small + rotate: false + xy: 541, 15 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +pine-icon-medium + rotate: false + xy: 239, 309 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +pine-icon-small + rotate: false + xy: 567, 41 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +plastanium-compressor-icon-medium + rotate: false + xy: 273, 343 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +plastanium-compressor-icon-small + rotate: false + xy: 567, 15 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +pneumatic-drill-icon-medium + rotate: false + xy: 307, 377 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +pneumatic-drill-icon-small + rotate: false + xy: 429, 37 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +power-node-icon-small + rotate: false + xy: 455, 43 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +power-node-large-icon-medium + rotate: false + xy: 375, 445 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +power-node-large-icon-small + rotate: false + xy: 575, 93 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +power-source-icon-small + rotate: false + xy: 575, 67 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +power-void-icon-small + rotate: false + xy: 593, 41 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +pulse-conduit-icon-full + rotate: false + xy: 103, 139 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +pulse-conduit-icon-small + rotate: false + xy: 593, 15 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +pulverizer-icon-full + rotate: false + xy: 443, 479 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +pulverizer-icon-small + rotate: false + xy: 447, 11 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +pyratite-mixer-icon-medium + rotate: false + xy: 35, 37 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +pyratite-mixer-icon-small + rotate: false + xy: 709, 409 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +repair-point rotate: false xy: 69, 71 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -liquid-water +repair-point-icon-full rotate: false xy: 171, 173 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 +repair-point-icon-small + rotate: false + xy: 735, 409 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +revenant-factory-icon-medium + rotate: false + xy: 205, 207 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +revenant-factory-icon-small + rotate: false + xy: 761, 409 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +ripple-icon-medium + rotate: false + xy: 239, 241 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +ripple-icon-small + rotate: false + xy: 787, 409 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +rock-icon-medium + rotate: false + xy: 273, 275 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +rock-icon-small + rotate: false + xy: 813, 409 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +rocks-icon-small + rotate: false + xy: 839, 409 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +rotary-pump-icon-medium + rotate: false + xy: 341, 343 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +rotary-pump-icon-small + rotate: false + xy: 865, 409 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +router-icon-small + rotate: false + xy: 891, 409 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +rtg-generator-icon-medium + rotate: false + xy: 409, 411 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +rtg-generator-icon-small + rotate: false + xy: 917, 409 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +salt-icon-small + rotate: false + xy: 943, 409 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +saltrocks-icon-small + rotate: false + xy: 969, 409 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +salvo-icon-medium + rotate: false + xy: 35, 3 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +salvo-icon-small + rotate: false + xy: 995, 409 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +sand-icon-small + rotate: false + xy: 723, 383 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +sand-water-icon-small + rotate: false + xy: 723, 357 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +sandrocks-icon-small + rotate: false + xy: 749, 383 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +scatter-icon-medium + rotate: false + xy: 103, 71 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +scatter-icon-small + rotate: false + xy: 723, 331 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +scorch + rotate: false + xy: 137, 105 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +scorch-icon-full + rotate: false + xy: 239, 207 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +scorch-icon-small + rotate: false + xy: 749, 357 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +scrap-wall-gigantic-icon-medium + rotate: false + xy: 409, 377 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +scrap-wall-gigantic-icon-small + rotate: false + xy: 775, 383 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +scrap-wall-huge-icon-medium + rotate: false + xy: 443, 411 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +scrap-wall-huge-icon-small + rotate: false + xy: 723, 305 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +scrap-wall-icon-small + rotate: false + xy: 749, 331 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +scrap-wall-large-icon-medium + rotate: false + xy: 477, 445 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +scrap-wall-large-icon-small + rotate: false + xy: 775, 357 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +separator-icon-medium + rotate: false + xy: 69, 3 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +separator-icon-small + rotate: false + xy: 749, 305 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +shale-boulder-icon-small + rotate: false + xy: 775, 331 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +shale-icon-small + rotate: false + xy: 801, 341 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +shalerocks-icon-small + rotate: false + xy: 827, 383 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +shock-mine-icon-small + rotate: false + xy: 749, 279 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +shrubs-icon-small + rotate: false + xy: 775, 305 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +silicon-smelter-icon-medium + rotate: false + xy: 307, 241 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +silicon-smelter-icon-small + rotate: false + xy: 801, 315 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +snow-icon-small + rotate: false + xy: 827, 357 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +snowrock-icon-medium + rotate: false + xy: 341, 275 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +snowrock-icon-small + rotate: false + xy: 853, 383 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +snowrocks-icon-small + rotate: false + xy: 775, 279 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +solar-panel-icon-small + rotate: false + xy: 801, 289 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +solar-panel-large-icon-medium + rotate: false + xy: 443, 377 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +solar-panel-large-icon-small + rotate: false + xy: 827, 331 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +sorter-icon-small + rotate: false + xy: 853, 357 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +spawn-icon-small + rotate: false + xy: 879, 383 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +spectre-icon-medium + rotate: false + xy: 545, 479 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +spectre-icon-small + rotate: false + xy: 827, 305 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +spirit-factory-icon-medium + rotate: false + xy: 103, 3 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +spirit-factory-icon-small + rotate: false + xy: 853, 331 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +spore-cluster-icon-medium + rotate: false + xy: 137, 37 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +spore-cluster-icon-small + rotate: false + xy: 879, 357 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +spore-moss-icon-small + rotate: false + xy: 905, 383 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +spore-pine-icon-medium + rotate: false + xy: 171, 71 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +spore-pine-icon-small + rotate: false + xy: 853, 305 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +spore-press-icon-medium + rotate: false + xy: 205, 105 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +spore-press-icon-small + rotate: false + xy: 879, 331 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +sporerocks-icon-small + rotate: false + xy: 905, 357 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +stone-icon-small + rotate: false + xy: 931, 383 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +surge-tower-icon-medium + rotate: false + xy: 273, 173 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +surge-tower-icon-small + rotate: false + xy: 879, 305 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +surge-wall-icon-small + rotate: false + xy: 905, 331 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +surge-wall-large-icon-medium + rotate: false + xy: 341, 241 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +surge-wall-large-icon-small + rotate: false + xy: 931, 357 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +swarmer-icon-medium + rotate: false + xy: 375, 275 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +swarmer-icon-small + rotate: false + xy: 957, 383 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +tainted-water-icon-small + rotate: false + xy: 905, 305 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +tar-icon-small + rotate: false + xy: 931, 331 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +tau-mech-pad-icon-medium + rotate: false + xy: 409, 309 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +tau-mech-pad-icon-small + rotate: false + xy: 957, 357 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +tendrils-icon-small + rotate: false + xy: 983, 383 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +thermal-generator-icon-medium + rotate: false + xy: 477, 377 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +thermal-generator-icon-small + rotate: false + xy: 931, 305 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +thermal-pump-icon-medium + rotate: false + xy: 511, 411 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +thermal-pump-icon-small + rotate: false + xy: 957, 331 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +thorium-reactor-icon-medium + rotate: false + xy: 545, 445 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +thorium-reactor-icon-small + rotate: false + xy: 983, 357 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +thorium-wall-icon-small + rotate: false + xy: 957, 305 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +thorium-wall-large-icon-medium + rotate: false + xy: 137, 3 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +thorium-wall-large-icon-small + rotate: false + xy: 983, 331 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +thruster-icon-medium + rotate: false + xy: 171, 37 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +thruster-icon-small + rotate: false + xy: 983, 305 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +titan-factory-icon-medium + rotate: false + xy: 205, 71 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +titan-factory-icon-small + rotate: false + xy: 827, 279 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +titanium-conveyor-icon-small + rotate: false + xy: 853, 279 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +titanium-wall-icon-small + rotate: false + xy: 879, 279 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +titanium-wall-large-icon-medium + rotate: false + xy: 477, 309 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +titanium-wall-large-icon-small + rotate: false + xy: 905, 279 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +trident-ship-pad-icon-medium + rotate: false + xy: 545, 377 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +trident-ship-pad-icon-small + rotate: false + xy: 931, 279 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +turbine-generator-icon-medium + rotate: false + xy: 579, 411 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +turbine-generator-icon-small + rotate: false + xy: 957, 279 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +unloader-icon-small + rotate: false + xy: 983, 279 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +vault-icon-medium + rotate: false + xy: 647, 479 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +vault-icon-small + rotate: false + xy: 801, 263 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +water-extractor-icon-medium + rotate: false + xy: 205, 3 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +water-extractor-icon-small + rotate: false + xy: 827, 253 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +water-icon-small + rotate: false + xy: 853, 253 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +wave-icon-medium + rotate: false + xy: 239, 37 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +wave-icon-small + rotate: false + xy: 879, 253 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +white-tree-dead-icon-medium + rotate: false + xy: 273, 71 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +white-tree-dead-icon-small + rotate: false + xy: 905, 253 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +white-tree-icon-medium + rotate: false + xy: 307, 105 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +white-tree-icon-small + rotate: false + xy: 931, 253 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +wraith-factory-icon-medium + rotate: false + xy: 341, 139 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +wraith-factory-icon-small + rotate: false + xy: 957, 253 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +item-biomatter + rotate: false + xy: 1, 309 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +item-blast-compound + rotate: false + xy: 35, 343 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +item-coal + rotate: false + xy: 69, 377 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +item-copper + rotate: false + xy: 103, 411 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +item-graphite + rotate: false + xy: 137, 445 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +item-lead + rotate: false + xy: 171, 479 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +item-metaglass + rotate: false + xy: 1, 275 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +item-phase-fabric + rotate: false + xy: 35, 309 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +item-plastanium + rotate: false + xy: 69, 343 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +item-pyratite + rotate: false + xy: 103, 377 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +item-sand + rotate: false + xy: 137, 411 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +item-scrap + rotate: false + xy: 171, 445 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +item-silicon + rotate: false + xy: 205, 479 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +item-spore-pod + rotate: false + xy: 35, 275 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +item-surge-alloy + rotate: false + xy: 69, 309 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +item-thorium + rotate: false + xy: 103, 343 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +item-titanium + rotate: false + xy: 137, 377 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +liquid-cryofluid + rotate: false + xy: 171, 377 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +liquid-oil + rotate: false + xy: 239, 445 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +liquid-slag + rotate: false + xy: 137, 309 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +liquid-water + rotate: false + xy: 239, 411 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 blank rotate: false - xy: 644, 306 + xy: 406, 204 size: 1, 1 orig: 1, 1 offset: 0, 0 index: -1 clear rotate: false - xy: 644, 303 + xy: 406, 201 size: 1, 1 orig: 1, 1 offset: 0, 0 index: -1 clear-editor rotate: false - xy: 644, 303 + xy: 406, 201 size: 1, 1 orig: 1, 1 offset: 0, 0 index: -1 bar rotate: false - xy: 443, 67 + xy: 647, 441 size: 27, 36 split: 9, 9, 9, 9 orig: 27, 36 @@ -9455,7 +9378,7 @@ bar index: -1 bar-top rotate: false - xy: 409, 33 + xy: 613, 407 size: 27, 36 split: 9, 10, 9, 10 orig: 27, 36 @@ -9463,7 +9386,7 @@ bar-top index: -1 button-select rotate: false - xy: 801, 351 + xy: 563, 249 size: 24, 24 split: 4, 4, 4, 4 orig: 24, 24 @@ -9471,896 +9394,896 @@ button-select index: -1 clear rotate: false - xy: 1013, 475 + xy: 709, 397 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 editor-clear rotate: false - xy: 1013, 475 + xy: 709, 397 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 cursor rotate: false - xy: 761, 251 + xy: 523, 149 size: 4, 4 orig: 4, 4 offset: 0, 0 index: -1 empty-sector rotate: false - xy: 103, 241 + xy: 1, 479 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 icon-crafting rotate: false - xy: 619, 7 + xy: 983, 243 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-defense rotate: false - xy: 637, 7 + xy: 1001, 261 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-distribution rotate: false - xy: 815, 97 + xy: 585, 205 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-effect rotate: false - xy: 833, 120 + xy: 585, 187 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-liquid rotate: false - xy: 851, 87 + xy: 625, 241 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-power rotate: false - xy: 941, 105 + xy: 759, 243 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-production rotate: false - xy: 941, 87 + xy: 777, 243 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-turret rotate: false - xy: 887, 69 + xy: 643, 223 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-units rotate: false - xy: 923, 69 + xy: 679, 223 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-upgrade rotate: false - xy: 959, 69 + xy: 603, 205 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 controller-cursor rotate: false - xy: 783, 461 + xy: 545, 359 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-about rotate: false - xy: 797, 163 + xy: 785, 263 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-add rotate: false - xy: 783, 445 + xy: 545, 343 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-admin rotate: false - xy: 749, 411 + xy: 589, 223 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-admin-small rotate: false - xy: 715, 377 + xy: 317, 37 size: 6, 6 orig: 6, 6 offset: 0, 0 index: -1 icon-areaDelete rotate: false - xy: 1013, 463 + xy: 511, 311 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-arrow rotate: false - xy: 722, 257 + xy: 291, 1 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-arrow-16 rotate: false - xy: 722, 257 + xy: 291, 1 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-arrow-down rotate: false - xy: 1013, 451 + xy: 813, 251 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-arrow-left rotate: false - xy: 1013, 439 + xy: 527, 21 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-arrow-right rotate: false - xy: 1013, 427 + xy: 581, 121 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-arrow-up rotate: false - xy: 1013, 415 + xy: 593, 121 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-back rotate: false - xy: 749, 427 + xy: 484, 155 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-ban rotate: false - xy: 823, 143 + xy: 1009, 393 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-break rotate: false - xy: 797, 115 + xy: 983, 261 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-cancel rotate: false - xy: 797, 97 + xy: 749, 261 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-cancel-2 rotate: false - xy: 605, 215 + xy: 645, 329 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 icon-chat rotate: false - xy: 1013, 403 + xy: 605, 121 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-check rotate: false - xy: 583, 7 + xy: 767, 261 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-check-2 rotate: false - xy: 597, 189 + xy: 645, 303 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 icon-copy rotate: false - xy: 601, 7 + xy: 723, 250 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-cursor rotate: false - xy: 1013, 391 + xy: 617, 121 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-database rotate: false - xy: 729, 103 + xy: 1009, 377 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-database-small rotate: false - xy: 1013, 379 + xy: 629, 121 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-dev-builds rotate: false - xy: 745, 189 + xy: 1009, 361 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-diagonal rotate: false - xy: 815, 115 + xy: 1001, 243 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-discord rotate: false - xy: 1009, 341 + xy: 1009, 345 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-donate rotate: false - xy: 1009, 325 + xy: 1009, 329 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-dots rotate: false - xy: 1009, 309 + xy: 1009, 313 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-editor rotate: false - xy: 505, 1 + xy: 1009, 297 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-egg rotate: false - xy: 521, 1 + xy: 1009, 281 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-elevation rotate: false - xy: 833, 102 + xy: 585, 169 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-eraser rotate: false - xy: 693, 101 + xy: 581, 151 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-exit rotate: false - xy: 537, 1 + xy: 653, 153 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-file rotate: false - xy: 711, 101 + xy: 581, 133 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-file-image rotate: false - xy: 1005, 267 + xy: 589, 257 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-file-text rotate: false - xy: 553, 1 + xy: 675, 189 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-fill rotate: false - xy: 1001, 249 + xy: 589, 239 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-floppy rotate: false - xy: 749, 13 + xy: 653, 137 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-floppy-16 rotate: false - xy: 1001, 231 + xy: 607, 259 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-folder rotate: false - xy: 785, 81 + xy: 675, 173 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-folder-parent rotate: false - xy: 801, 81 + xy: 691, 189 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-github rotate: false - xy: 817, 81 + xy: 691, 173 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-google-play rotate: false - xy: 752, 65 + xy: 715, 234 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-grid rotate: false - xy: 833, 84 + xy: 607, 241 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-hold rotate: false - xy: 1013, 367 + xy: 641, 121 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-holdDelete rotate: false - xy: 1013, 111 + xy: 653, 125 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-home rotate: false - xy: 768, 67 + xy: 715, 218 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-host rotate: false - xy: 784, 65 + xy: 711, 202 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-info rotate: false - xy: 800, 65 + xy: 707, 186 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-itch.io rotate: false - xy: 816, 65 + xy: 707, 170 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-item rotate: false - xy: 1013, 99 + xy: 665, 125 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-items-none rotate: false - xy: 823, 133 + xy: 239, 1 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icon-line rotate: false - xy: 851, 105 + xy: 625, 259 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-link rotate: false - xy: 768, 51 + xy: 669, 153 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-liquid-small rotate: false - xy: 1013, 87 + xy: 601, 109 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-load rotate: false - xy: 767, 35 + xy: 669, 137 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-load-image rotate: false - xy: 869, 105 + xy: 643, 259 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-load-map rotate: false - xy: 869, 87 + xy: 643, 241 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-loading rotate: false - xy: 887, 105 + xy: 661, 241 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-locked rotate: false - xy: 887, 87 + xy: 679, 241 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-logic rotate: false - xy: 1013, 75 + xy: 601, 97 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-map rotate: false - xy: 784, 49 + xy: 685, 157 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-menu rotate: false - xy: 1013, 63 + xy: 613, 109 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-menu-large rotate: false - xy: 905, 105 + xy: 697, 241 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-missing rotate: false - xy: 749, 1 + xy: 601, 85 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-mission-background rotate: false - xy: 1005, 285 + xy: 511, 323 size: 18, 18 orig: 18, 18 offset: 0, 0 index: -1 icon-mission-battle rotate: false - xy: 851, 126 + xy: 625, 109 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-mission-defense rotate: false - xy: 569, 5 + xy: 613, 97 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-mission-done rotate: false - xy: 734, 91 + xy: 601, 73 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-none rotate: false - xy: 453, 3 + xy: 637, 109 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-paste rotate: false - xy: 905, 87 + xy: 599, 151 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-pause rotate: false - xy: 465, 3 + xy: 625, 97 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-pencil rotate: false - xy: 923, 105 + xy: 599, 133 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-pencil-small rotate: false - xy: 800, 49 + xy: 685, 141 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-pick rotate: false - xy: 923, 87 + xy: 741, 243 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-play rotate: false - xy: 477, 3 + xy: 613, 85 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-play-2 rotate: false - xy: 816, 49 + xy: 701, 154 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-play-custom rotate: false - xy: 783, 33 + xy: 701, 138 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-players rotate: false - xy: 489, 3 + xy: 637, 97 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-power-requirement rotate: false - xy: 103, 207 + xy: 35, 377 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 icon-power-small rotate: false - xy: 847, 24 + xy: 625, 85 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-quit rotate: false - xy: 799, 33 + xy: 685, 125 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-redo rotate: false - xy: 959, 105 + xy: 795, 245 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-refresh rotate: false - xy: 815, 33 + xy: 701, 122 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rename rotate: false - xy: 767, 19 + xy: 731, 227 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-resize rotate: false - xy: 959, 87 + xy: 473, 25 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-rotate rotate: false - xy: 783, 17 + xy: 747, 227 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rotate-arrow rotate: false - xy: 799, 17 + xy: 763, 227 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rotate-left rotate: false - xy: 815, 17 + xy: 779, 227 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rotate-right rotate: false - xy: 765, 1 + xy: 795, 229 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-save rotate: false - xy: 781, 1 + xy: 731, 211 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-save-image rotate: false - xy: 977, 105 + xy: 473, 7 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-save-map rotate: false - xy: 977, 87 + xy: 491, 33 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-settings rotate: false - xy: 847, 12 + xy: 613, 73 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-spray rotate: false - xy: 995, 105 + xy: 491, 15 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-terrain rotate: false - xy: 995, 87 + xy: 509, 15 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-tools rotate: false - xy: 797, 1 + xy: 747, 211 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-touch rotate: false - xy: 848, 56 + xy: 637, 85 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-touchDelete rotate: false - xy: 848, 44 + xy: 625, 73 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-trash rotate: false - xy: 813, 1 + xy: 763, 211 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-trash-16 rotate: false - xy: 851, 69 + xy: 607, 223 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-tree rotate: false - xy: 869, 69 + xy: 625, 223 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-tree-locked rotate: false - xy: 137, 241 + xy: 69, 411 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 icon-trello rotate: false - xy: 829, 1 + xy: 779, 211 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-tutorial rotate: false - xy: 833, 68 + xy: 795, 213 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-undo rotate: false - xy: 905, 69 + xy: 661, 223 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-unlocked rotate: false - xy: 941, 69 + xy: 697, 223 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-unlocks rotate: false - xy: 832, 52 + xy: 717, 154 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-wiki rotate: false - xy: 832, 36 + xy: 717, 138 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-zone rotate: false - xy: 741, 257 + xy: 645, 277 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 icon-zoom rotate: false - xy: 977, 69 + xy: 621, 205 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-zoom-small rotate: false - xy: 831, 20 + xy: 717, 122 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 inventory rotate: false - xy: 797, 283 + xy: 333, 63 size: 24, 40 split: 10, 10, 10, 14 orig: 24, 40 @@ -10368,7 +10291,7 @@ inventory index: -1 scroll rotate: false - xy: 839, 190 + xy: 723, 268 size: 24, 35 split: 10, 10, 6, 5 orig: 24, 35 @@ -10376,7 +10299,7 @@ scroll index: -1 scroll-knob-vertical-black rotate: false - xy: 813, 185 + xy: 801, 367 size: 24, 40 split: 10, 10, 6, 10 orig: 24, 40 @@ -10384,63 +10307,63 @@ scroll-knob-vertical-black index: -1 sector-select rotate: false - xy: 647, 479 + xy: 511, 479 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 selection rotate: false - xy: 678, 340 + xy: 440, 238 size: 1, 1 orig: 1, 1 offset: 0, 0 index: -1 slider rotate: false - xy: 678, 330 + xy: 1022, 503 size: 1, 8 orig: 1, 8 offset: 0, 0 index: -1 slider-knob rotate: false - xy: 613, 269 + xy: 375, 167 size: 29, 38 orig: 29, 38 offset: 0, 0 index: -1 slider-knob-down rotate: false - xy: 647, 303 + xy: 409, 201 size: 29, 38 orig: 29, 38 offset: 0, 0 index: -1 slider-knob-over rotate: false - xy: 647, 303 + xy: 409, 201 size: 29, 38 orig: 29, 38 offset: 0, 0 index: -1 slider-vertical rotate: false - xy: 851, 123 + xy: 675, 170 size: 8, 1 orig: 8, 1 offset: 0, 0 index: -1 white rotate: false - xy: 506, 134 + xy: 676, 474 size: 3, 3 orig: 3, 3 offset: 0, 0 index: -1 window-empty rotate: false - xy: 477, 76 + xy: 681, 450 size: 27, 61 split: 8, 8, 44, 11 orig: 27, 61 @@ -10452,1367 +10375,1354 @@ size: 1024,1024 format: RGBA8888 filter: Nearest,Nearest repeat: none -dark-panel-1-edge - rotate: false - xy: 645, 911 - size: 288, 96 - orig: 288, 96 - offset: 0, 0 - index: -1 -dark-panel-2-edge - rotate: false - xy: 645, 813 - size: 288, 96 - orig: 288, 96 - offset: 0, 0 - index: -1 -dark-panel-3-edge - rotate: false - xy: 645, 715 - size: 288, 96 - orig: 288, 96 - offset: 0, 0 - index: -1 -dark-panel-4-edge - rotate: false - xy: 645, 617 - size: 288, 96 - orig: 288, 96 - offset: 0, 0 - index: -1 -dark-panel-5-edge - rotate: false - xy: 1, 589 - size: 288, 96 - orig: 288, 96 - offset: 0, 0 - index: -1 -dark-panel-6-edge - rotate: false - xy: 291, 589 - size: 288, 96 - orig: 288, 96 - offset: 0, 0 - index: -1 -darksand-edge - rotate: false - xy: 581, 519 - size: 288, 96 - orig: 288, 96 - offset: 0, 0 - index: -1 -darksand-tainted-water-edge - rotate: false - xy: 1, 491 - size: 288, 96 - orig: 288, 96 - offset: 0, 0 - index: -1 -darksand-water-edge - rotate: false - xy: 291, 491 - size: 288, 96 - orig: 288, 96 - offset: 0, 0 - index: -1 -deepwater-edge - rotate: false - xy: 581, 421 - size: 288, 96 - orig: 288, 96 - offset: 0, 0 - index: -1 -edge-stencil - rotate: false - xy: 1, 393 - size: 288, 96 - orig: 288, 96 - offset: 0, 0 - index: -1 -grass-edge - rotate: false - xy: 291, 393 - size: 288, 96 - orig: 288, 96 - offset: 0, 0 - index: -1 -holostone-edge - rotate: false - xy: 581, 323 - size: 288, 96 - orig: 288, 96 - offset: 0, 0 - index: -1 -ice-edge - rotate: false - xy: 1, 295 - size: 288, 96 - orig: 288, 96 - offset: 0, 0 - index: -1 -ice-snow-edge - rotate: false - xy: 291, 295 - size: 288, 96 - orig: 288, 96 - offset: 0, 0 - index: -1 -ignarock-edge - rotate: false - xy: 581, 225 - size: 288, 96 - orig: 288, 96 - offset: 0, 0 - index: -1 -metal-floor-2-edge - rotate: false - xy: 1, 197 - size: 288, 96 - orig: 288, 96 - offset: 0, 0 - index: -1 -metal-floor-3-edge - rotate: false - xy: 291, 197 - size: 288, 96 - orig: 288, 96 - offset: 0, 0 - index: -1 -metal-floor-5-edge - rotate: false - xy: 581, 127 - size: 288, 96 - orig: 288, 96 - offset: 0, 0 - index: -1 -metal-floor-damaged-edge - rotate: false - xy: 1, 99 - size: 288, 96 - orig: 288, 96 - offset: 0, 0 - index: -1 -metal-floor-edge - rotate: false - xy: 291, 99 - size: 288, 96 - orig: 288, 96 - offset: 0, 0 - index: -1 -moss-edge - rotate: false - xy: 581, 29 - size: 288, 96 - orig: 288, 96 - offset: 0, 0 - index: -1 -pebbles-edge - rotate: false - xy: 1, 1 - size: 288, 96 - orig: 288, 96 - offset: 0, 0 - index: -1 -salt-edge - rotate: false - xy: 291, 1 - size: 288, 96 - orig: 288, 96 - offset: 0, 0 - index: -1 -white-tree - rotate: false - xy: 1, 687 - size: 320, 320 - orig: 320, 320 - offset: 0, 0 - index: -1 -white-tree-dead - rotate: false - xy: 323, 687 - size: 320, 320 - orig: 320, 320 - offset: 0, 0 - index: -1 - -sprites_fallback7.png -size: 1024,1024 -format: RGBA8888 -filter: Nearest,Nearest -repeat: none char1 rotate: false - xy: 713, 735 + xy: 781, 789 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 char2 rotate: false - xy: 763, 785 + xy: 879, 887 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 char3 rotate: false - xy: 1, 309 + xy: 585, 495 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cliffs1 rotate: false - xy: 183, 491 + xy: 781, 755 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 coal1 rotate: false - xy: 473, 589 + xy: 879, 853 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 coal2 rotate: false - xy: 981, 939 + xy: 585, 461 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 coal3 rotate: false - xy: 673, 653 + xy: 265, 47 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 copper1 rotate: false - xy: 713, 701 + xy: 265, 13 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 copper2 rotate: false - xy: 797, 785 + xy: 295, 341 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 copper3 rotate: false - xy: 1, 275 + xy: 295, 307 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 craters1 rotate: false - xy: 217, 491 + xy: 295, 273 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 craters2 rotate: false - xy: 507, 589 + xy: 295, 239 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 craters3 rotate: false - xy: 981, 905 + xy: 295, 205 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 craters4 rotate: false - xy: 979, 871 + xy: 295, 171 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 craters5 rotate: false - xy: 831, 785 + xy: 295, 137 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 craters6 rotate: false - xy: 1, 241 + xy: 295, 103 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -creeptree - rotate: false - xy: 871, 905 - size: 108, 108 - orig: 108, 108 - offset: 0, 0 - index: -1 dark-metal-large rotate: false - xy: 581, 753 + xy: 1, 15 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 dark-metal1 rotate: false - xy: 251, 491 + xy: 329, 347 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 dark-metal2 rotate: false - xy: 541, 589 + xy: 329, 313 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 dark-panel-1 rotate: false - xy: 1, 207 + xy: 363, 347 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 +dark-panel-1-edge + rotate: false + xy: 323, 921 + size: 96, 96 + orig: 96, 96 + offset: 0, 0 + index: -1 dark-panel-2 rotate: false - xy: 1, 173 + xy: 329, 279 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 +dark-panel-2-edge + rotate: false + xy: 1, 277 + size: 96, 96 + orig: 96, 96 + offset: 0, 0 + index: -1 dark-panel-3 rotate: false - xy: 1, 139 + xy: 363, 313 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 +dark-panel-3-edge + rotate: false + xy: 323, 823 + size: 96, 96 + orig: 96, 96 + offset: 0, 0 + index: -1 dark-panel-4 rotate: false - xy: 1, 105 + xy: 397, 347 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 +dark-panel-4-edge + rotate: false + xy: 421, 921 + size: 96, 96 + orig: 96, 96 + offset: 0, 0 + index: -1 dark-panel-5 rotate: false - xy: 1, 71 + xy: 329, 245 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 +dark-panel-5-edge + rotate: false + xy: 1, 179 + size: 96, 96 + orig: 96, 96 + offset: 0, 0 + index: -1 dark-panel-6 rotate: false - xy: 1, 37 + xy: 363, 279 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 +dark-panel-6-edge + rotate: false + xy: 99, 277 + size: 96, 96 + orig: 96, 96 + offset: 0, 0 + index: -1 +darksand-edge + rotate: false + xy: 323, 725 + size: 96, 96 + orig: 96, 96 + offset: 0, 0 + index: -1 darksand-tainted-water rotate: false - xy: 359, 523 + xy: 363, 245 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 +darksand-tainted-water-edge + rotate: false + xy: 421, 823 + size: 96, 96 + orig: 96, 96 + offset: 0, 0 + index: -1 darksand-water rotate: false - xy: 393, 523 + xy: 397, 279 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 +darksand-water-edge + rotate: false + xy: 519, 921 + size: 96, 96 + orig: 96, 96 + offset: 0, 0 + index: -1 darksand1 rotate: false - xy: 1, 3 + xy: 397, 313 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 darksand2 rotate: false - xy: 291, 523 + xy: 431, 347 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 darksand3 rotate: false - xy: 325, 523 + xy: 329, 211 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 deepwater rotate: false - xy: 285, 489 + xy: 431, 313 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 +deepwater-edge + rotate: false + xy: 1, 81 + size: 96, 96 + orig: 96, 96 + offset: 0, 0 + index: -1 dunerocks-large rotate: false - xy: 1, 459 + xy: 617, 659 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 dunerocks1 rotate: false - xy: 319, 489 + xy: 465, 347 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 dunerocks2 rotate: false - xy: 353, 489 + xy: 329, 177 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 +edge + rotate: false + xy: 363, 211 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +edge-stencil + rotate: false + xy: 99, 179 + size: 96, 96 + orig: 96, 96 + offset: 0, 0 + index: -1 +edgier + rotate: false + xy: 397, 245 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +grass-edge + rotate: false + xy: 197, 277 + size: 96, 96 + orig: 96, 96 + offset: 0, 0 + index: -1 grass1 rotate: false - xy: 387, 489 + xy: 431, 279 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 grass2 rotate: false - xy: 937, 829 + xy: 465, 313 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 grass3 rotate: false - xy: 871, 805 + xy: 329, 143 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 +holostone-edge + rotate: false + xy: 323, 627 + size: 96, 96 + orig: 96, 96 + offset: 0, 0 + index: -1 holostone1 rotate: false - xy: 427, 539 + xy: 363, 177 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 holostone2 rotate: false - xy: 51, 359 + xy: 397, 211 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 holostone3 rotate: false - xy: 117, 425 + xy: 431, 245 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 hotrock1 rotate: false - xy: 747, 735 + xy: 465, 279 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 hotrock2 rotate: false - xy: 747, 701 + xy: 329, 109 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 hotrock3 rotate: false - xy: 781, 751 + xy: 363, 143 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 +ice-edge + rotate: false + xy: 421, 725 + size: 96, 96 + orig: 96, 96 + offset: 0, 0 + index: -1 +ice-snow-edge + rotate: false + xy: 519, 823 + size: 96, 96 + orig: 96, 96 + offset: 0, 0 + index: -1 ice-snow1 rotate: false - xy: 35, 309 + xy: 363, 109 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ice-snow2 rotate: false - xy: 35, 275 + xy: 397, 143 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ice-snow3 rotate: false - xy: 35, 241 + xy: 431, 177 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ice1 rotate: false - xy: 781, 717 + xy: 397, 177 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ice2 rotate: false - xy: 815, 751 + xy: 431, 211 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ice3 rotate: false - xy: 815, 717 + xy: 465, 245 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 icerocks-large rotate: false - xy: 291, 557 + xy: 715, 757 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 icerocks1 rotate: false - xy: 35, 207 + xy: 465, 211 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 icerocks2 rotate: false - xy: 35, 173 + xy: 397, 109 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 +ignarock-edge + rotate: false + xy: 617, 921 + size: 96, 96 + orig: 96, 96 + offset: 0, 0 + index: -1 ignarock1 rotate: false - xy: 35, 139 + xy: 431, 143 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ignarock2 rotate: false - xy: 35, 105 + xy: 465, 177 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ignarock3 rotate: false - xy: 35, 71 + xy: 431, 109 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 lead1 rotate: false - xy: 35, 37 + xy: 465, 143 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 lead2 rotate: false - xy: 35, 3 + xy: 465, 109 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 lead3 rotate: false - xy: 473, 555 + xy: 977, 943 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 magmarock1 rotate: false - xy: 507, 555 + xy: 499, 347 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 magmarock2 rotate: false - xy: 541, 555 + xy: 499, 313 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 magmarock3 rotate: false - xy: 183, 457 + xy: 499, 279 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 metal-floor rotate: false - xy: 217, 457 + xy: 499, 245 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 metal-floor-2 rotate: false - xy: 251, 457 + xy: 499, 211 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 +metal-floor-2-edge + rotate: false + xy: 99, 81 + size: 96, 96 + orig: 96, 96 + offset: 0, 0 + index: -1 metal-floor-3 rotate: false - xy: 285, 455 + xy: 499, 177 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 +metal-floor-3-edge + rotate: false + xy: 197, 179 + size: 96, 96 + orig: 96, 96 + offset: 0, 0 + index: -1 metal-floor-5 rotate: false - xy: 319, 455 + xy: 499, 143 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 +metal-floor-5-edge + rotate: false + xy: 323, 529 + size: 96, 96 + orig: 96, 96 + offset: 0, 0 + index: -1 +metal-floor-damaged-edge + rotate: false + xy: 421, 627 + size: 96, 96 + orig: 96, 96 + offset: 0, 0 + index: -1 metal-floor-damaged1 rotate: false - xy: 353, 455 + xy: 499, 109 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 metal-floor-damaged2 rotate: false - xy: 387, 455 + xy: 619, 509 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 metal-floor-damaged3 rotate: false - xy: 427, 505 + xy: 619, 475 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 +metal-floor-edge + rotate: false + xy: 519, 725 + size: 96, 96 + orig: 96, 96 + offset: 0, 0 + index: -1 +moss-edge + rotate: false + xy: 617, 823 + size: 96, 96 + orig: 96, 96 + offset: 0, 0 + index: -1 moss1 rotate: false - xy: 421, 471 + xy: 667, 557 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 moss2 rotate: false - xy: 461, 521 + xy: 701, 557 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 moss3 rotate: false - xy: 495, 521 + xy: 653, 509 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal1 rotate: false - xy: 529, 521 + xy: 653, 475 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal2 rotate: false - xy: 85, 375 + xy: 687, 523 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal3 rotate: false - xy: 781, 683 + xy: 687, 489 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper1 rotate: false - xy: 815, 683 + xy: 619, 441 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper2 rotate: false - xy: 849, 751 + xy: 653, 441 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper3 rotate: false - xy: 849, 717 + xy: 687, 455 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead1 rotate: false - xy: 849, 683 + xy: 721, 523 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead2 rotate: false - xy: 421, 437 + xy: 721, 489 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead3 rotate: false - xy: 461, 487 + xy: 721, 455 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap1 rotate: false - xy: 495, 487 + xy: 687, 421 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap2 rotate: false - xy: 529, 487 + xy: 721, 421 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap3 rotate: false - xy: 455, 453 + xy: 299, 69 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium1 rotate: false - xy: 489, 453 + xy: 299, 35 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium2 rotate: false - xy: 523, 453 + xy: 333, 75 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium3 rotate: false - xy: 85, 341 + xy: 333, 41 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium1 rotate: false - xy: 69, 307 + xy: 367, 75 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium2 rotate: false - xy: 69, 273 + xy: 367, 41 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium3 rotate: false - xy: 69, 239 + xy: 401, 75 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pebbles1 rotate: false - xy: 69, 205 + xy: 401, 41 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pebbles2 rotate: false - xy: 69, 171 + xy: 435, 75 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pebbles3 rotate: false - xy: 69, 137 + xy: 435, 41 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pine rotate: false - xy: 581, 637 + xy: 323, 381 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 rock1 rotate: false - xy: 713, 769 + xy: 617, 543 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 rock2 rotate: false - xy: 1, 343 + xy: 373, 381 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 rocks-large rotate: false - xy: 871, 839 + xy: 813, 855 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 rocks1 rotate: false - xy: 69, 103 + xy: 469, 75 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 rocks2 rotate: false - xy: 69, 69 + xy: 469, 41 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 salt rotate: false - xy: 69, 35 + xy: 503, 75 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 +salt-edge + rotate: false + xy: 715, 921 + size: 96, 96 + orig: 96, 96 + offset: 0, 0 + index: -1 saltrocks-large rotate: false - xy: 581, 687 + xy: 911, 953 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 saltrocks1 rotate: false - xy: 69, 1 + xy: 503, 41 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 saltrocks2 rotate: false - xy: 119, 391 + xy: 299, 1 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sand-edge rotate: false - xy: 1, 917 - size: 288, 96 - orig: 288, 96 + xy: 197, 81 + size: 96, 96 + orig: 96, 96 offset: 0, 0 index: -1 sand-water rotate: false - xy: 523, 419 + xy: 435, 7 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sand-water-edge rotate: false - xy: 1, 819 - size: 288, 96 - orig: 288, 96 + xy: 323, 431 + size: 96, 96 + orig: 96, 96 offset: 0, 0 index: -1 sand1 rotate: false - xy: 119, 357 + xy: 333, 7 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sand2 rotate: false - xy: 455, 419 + xy: 367, 7 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sand3 rotate: false - xy: 489, 419 + xy: 401, 7 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sandrocks-large rotate: false - xy: 647, 753 + xy: 519, 463 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 sandrocks1 rotate: false - xy: 103, 307 + xy: 469, 7 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sandrocks2 rotate: false - xy: 103, 273 + xy: 503, 7 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap1 rotate: false - xy: 103, 239 + xy: 725, 641 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap2 rotate: false - xy: 103, 205 + xy: 725, 607 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap3 rotate: false - xy: 103, 171 + xy: 735, 573 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 shale-boulder1 rotate: false - xy: 103, 35 + xy: 849, 819 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 shale-boulder2 rotate: false - xy: 103, 1 + xy: 849, 785 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 shale-edge rotate: false - xy: 291, 917 - size: 288, 96 - orig: 288, 96 + xy: 421, 529 + size: 96, 96 + orig: 96, 96 offset: 0, 0 index: -1 shale1 rotate: false - xy: 103, 137 + xy: 815, 821 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 shale2 rotate: false - xy: 103, 103 + xy: 815, 787 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 shale3 rotate: false - xy: 103, 69 + xy: 815, 753 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 shalerocks-large rotate: false - xy: 1, 393 + xy: 67, 15 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 shalerocks1 rotate: false - xy: 581, 603 + xy: 849, 751 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 shalerocks2 rotate: false - xy: 575, 569 + xy: 883, 819 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 shrubs-large rotate: false - xy: 67, 459 + xy: 617, 593 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 shrubs1 rotate: false - xy: 615, 603 + xy: 883, 785 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 shrubs2 rotate: false - xy: 609, 569 + xy: 883, 751 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 snow-edge rotate: false - xy: 1, 721 - size: 288, 96 - orig: 288, 96 + xy: 519, 627 + size: 96, 96 + orig: 96, 96 offset: 0, 0 index: -1 snow1 rotate: false - xy: 649, 611 + xy: 523, 429 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 snow2 rotate: false - xy: 683, 619 + xy: 523, 395 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 snow3 rotate: false - xy: 707, 653 + xy: 533, 361 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 snowrock1 rotate: false - xy: 67, 409 + xy: 423, 381 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 snowrock2 rotate: false - xy: 133, 475 + xy: 473, 381 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 snowrocks-large rotate: false - xy: 357, 557 + xy: 133, 15 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 snowrocks1 rotate: false - xy: 717, 619 + xy: 533, 327 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 snowrocks2 rotate: false - xy: 741, 667 + xy: 533, 293 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -spawn-edge +spawn rotate: false - xy: 291, 819 - size: 288, 96 - orig: 288, 96 + xy: 533, 259 + size: 32, 32 + orig: 32, 32 offset: 0, 0 index: -1 spore-cluster1 rotate: false - xy: 981, 973 + xy: 977, 977 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 spore-cluster2 rotate: false - xy: 937, 863 + xy: 683, 633 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 spore-cluster3 rotate: false - xy: 631, 645 + xy: 683, 591 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 spore-moss-edge rotate: false - xy: 581, 917 - size: 288, 96 - orig: 288, 96 + xy: 617, 725 + size: 96, 96 + orig: 96, 96 offset: 0, 0 index: -1 spore-moss1 rotate: false - xy: 575, 535 + xy: 533, 225 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 spore-moss2 rotate: false - xy: 609, 535 + xy: 533, 191 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 spore-moss3 rotate: false - xy: 563, 501 + xy: 533, 157 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 spore-pine rotate: false - xy: 423, 573 + xy: 683, 675 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 sporerocks-large rotate: false - xy: 647, 687 + xy: 199, 15 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 sporerocks1 rotate: false - xy: 597, 501 + xy: 533, 123 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sporerocks2 rotate: false - xy: 563, 467 + xy: 537, 89 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 stone-edge rotate: false - xy: 1, 623 - size: 288, 96 - orig: 288, 96 + xy: 715, 823 + size: 96, 96 + orig: 96, 96 offset: 0, 0 index: -1 stone1 rotate: false - xy: 597, 467 + xy: 537, 55 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 stone2 rotate: false - xy: 557, 433 + xy: 537, 21 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 stone3 rotate: false - xy: 591, 433 + xy: 557, 427 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 tainted-water rotate: false - xy: 557, 399 + xy: 733, 723 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 tainted-water-edge rotate: false - xy: 291, 721 - size: 288, 96 - orig: 288, 96 + xy: 813, 921 + size: 96, 96 + orig: 96, 96 offset: 0, 0 index: -1 tar rotate: false - xy: 591, 399 + xy: 733, 689 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 tar-edge rotate: false - xy: 581, 819 - size: 288, 96 - orig: 288, 96 - offset: 0, 0 - index: -1 -tendrils-edge - rotate: false - xy: 1, 525 - size: 288, 96 - orig: 288, 96 + xy: 421, 431 + size: 96, 96 + orig: 96, 96 offset: 0, 0 index: -1 tendrils1 rotate: false - xy: 631, 501 + xy: 767, 721 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 tendrils2 rotate: false - xy: 631, 467 + xy: 767, 687 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 tendrils3 rotate: false - xy: 625, 433 + xy: 801, 719 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 thorium1 rotate: false - xy: 625, 399 + xy: 801, 685 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 thorium2 rotate: false - xy: 751, 633 + xy: 835, 717 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 thorium3 rotate: false - xy: 785, 649 + xy: 869, 717 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium1 rotate: false - xy: 819, 649 + xy: 835, 683 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium2 rotate: false - xy: 853, 649 + xy: 869, 683 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium3 rotate: false - xy: 785, 615 + xy: 759, 653 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 water rotate: false - xy: 819, 615 + xy: 759, 619 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 water-edge rotate: false - xy: 291, 623 - size: 288, 96 - orig: 288, 96 + xy: 519, 529 + size: 96, 96 + orig: 96, 96 + offset: 0, 0 + index: -1 +white-tree + rotate: false + xy: 1, 697 + size: 320, 320 + orig: 320, 320 + offset: 0, 0 + index: -1 +white-tree-dead + rotate: false + xy: 1, 375 + size: 320, 320 + orig: 320, 320 offset: 0, 0 index: -1 diff --git a/core/assets/sprites/sprites_fallback.png b/core/assets/sprites/sprites_fallback.png index 2fe93bf680..bb1ac34103 100644 Binary files a/core/assets/sprites/sprites_fallback.png and b/core/assets/sprites/sprites_fallback.png differ diff --git a/core/assets/sprites/sprites_fallback2.png b/core/assets/sprites/sprites_fallback2.png index c3e725fb09..142dfcffe0 100644 Binary files a/core/assets/sprites/sprites_fallback2.png and b/core/assets/sprites/sprites_fallback2.png differ diff --git a/core/assets/sprites/sprites_fallback3.png b/core/assets/sprites/sprites_fallback3.png index d1366f8d99..b54e392254 100644 Binary files a/core/assets/sprites/sprites_fallback3.png and b/core/assets/sprites/sprites_fallback3.png differ diff --git a/core/assets/sprites/sprites_fallback4.png b/core/assets/sprites/sprites_fallback4.png index 5bbf265a48..94f3c42c50 100644 Binary files a/core/assets/sprites/sprites_fallback4.png and b/core/assets/sprites/sprites_fallback4.png differ diff --git a/core/assets/sprites/sprites_fallback5.png b/core/assets/sprites/sprites_fallback5.png index 46781d2e93..03046ffb6e 100644 Binary files a/core/assets/sprites/sprites_fallback5.png and b/core/assets/sprites/sprites_fallback5.png differ diff --git a/core/assets/sprites/sprites_fallback6.png b/core/assets/sprites/sprites_fallback6.png index c27409840e..8762b3e5af 100644 Binary files a/core/assets/sprites/sprites_fallback6.png and b/core/assets/sprites/sprites_fallback6.png differ diff --git a/core/assets/sprites/sprites_fallback7.png b/core/assets/sprites/sprites_fallback7.png deleted file mode 100644 index fdc9f89c42..0000000000 Binary files a/core/assets/sprites/sprites_fallback7.png and /dev/null differ diff --git a/core/src/io/anuke/mindustry/Vars.java b/core/src/io/anuke/mindustry/Vars.java index 297c78f82d..6c187799b9 100644 --- a/core/src/io/anuke/mindustry/Vars.java +++ b/core/src/io/anuke/mindustry/Vars.java @@ -105,6 +105,8 @@ public class Vars{ public static FileHandle screenshotDirectory; /** data subdirectory used for custom mmaps */ public static FileHandle customMapDirectory; + /** tmp subdirectory for map conversion */ + public static FileHandle tmpDirectory; /** data subdirectory used for saves */ public static FileHandle saveDirectory; /** old map file extension, for conversion */ @@ -206,5 +208,6 @@ public class Vars{ screenshotDirectory = dataDirectory.child("screenshots/"); customMapDirectory = dataDirectory.child("maps/"); saveDirectory = dataDirectory.child("saves/"); + tmpDirectory = dataDirectory.child("tmp/"); } } diff --git a/core/src/io/anuke/mindustry/ai/Pathfinder.java b/core/src/io/anuke/mindustry/ai/Pathfinder.java index 85890bba56..026cdbe0e7 100644 --- a/core/src/io/anuke/mindustry/ai/Pathfinder.java +++ b/core/src/io/anuke/mindustry/ai/Pathfinder.java @@ -5,8 +5,7 @@ import io.anuke.arc.collection.IntArray; import io.anuke.arc.collection.IntQueue; import io.anuke.arc.math.geom.Geometry; import io.anuke.arc.math.geom.Point2; -import io.anuke.arc.util.Structs; -import io.anuke.arc.util.Time; +import io.anuke.arc.util.*; import io.anuke.mindustry.game.EventType.TileChangeEvent; import io.anuke.mindustry.game.EventType.WorldLoadEvent; import io.anuke.mindustry.game.Team; @@ -40,6 +39,10 @@ public class Pathfinder{ }); } + public void updateSolid(Tile tile){ + update(tile, tile.getTeam()); + } + public void update(){ if(Net.client() || paths == null) return; @@ -95,6 +98,10 @@ public class Pathfinder{ if(paths != null && paths[team.ordinal()] != null && paths[team.ordinal()].weights != null){ PathData path = paths[team.ordinal()]; + if(!path.frontier.isEmpty()){ + return; + } + //impassable tiles have a weight of float.max if(!passable(tile, team)){ path.weights[tile.x][tile.y] = Float.MAX_VALUE; diff --git a/core/src/io/anuke/mindustry/ai/WaveSpawner.java b/core/src/io/anuke/mindustry/ai/WaveSpawner.java index 1be663b807..bba51232c8 100644 --- a/core/src/io/anuke/mindustry/ai/WaveSpawner.java +++ b/core/src/io/anuke/mindustry/ai/WaveSpawner.java @@ -14,12 +14,13 @@ import io.anuke.mindustry.entities.type.BaseUnit; import io.anuke.mindustry.game.EventType.WorldLoadEvent; import io.anuke.mindustry.game.SpawnGroup; import io.anuke.mindustry.net.Net; +import io.anuke.mindustry.world.Tile; import static io.anuke.mindustry.Vars.*; public class WaveSpawner{ private Array flySpawns = new Array<>(); - private Array groundSpawns = new Array<>(); + private Array groundSpawns = new Array<>(); private boolean spawning = false; public WaveSpawner(){ @@ -30,6 +31,10 @@ public class WaveSpawner{ return groundSpawns.size; } + public Array getGroundSpawns(){ + return groundSpawns; + } + /** @return true if the player is near a ground spawn point. */ public boolean playerNear(){ return groundSpawns.contains(g -> Mathf.dst(g.x * tilesize, g.y * tilesize, player.x, player.y) < state.rules.dropZoneRadius); @@ -59,9 +64,9 @@ public class WaveSpawner{ } } }else{ - for(GroundSpawn spawn : groundSpawns){ - spawnX = spawn.x * tilesize; - spawnY = spawn.y * tilesize; + for(Tile spawn : groundSpawns){ + spawnX = spawn.worldx(); + spawnY = spawn.worldy(); spread = tilesize * 2; for(int i = 0; i < spawned; i++){ @@ -102,10 +107,7 @@ public class WaveSpawner{ } private void addSpawns(int x, int y){ - GroundSpawn spawn = new GroundSpawn(); - spawn.x = x; - spawn.y = y; - groundSpawns.add(spawn); + groundSpawns.add(world.tile(x, y)); FlyerSpawn fspawn = new FlyerSpawn(); fspawn.angle = Angles.angle(world.width() / 2f, world.height() / 2f, x, y); diff --git a/core/src/io/anuke/mindustry/content/Blocks.java b/core/src/io/anuke/mindustry/content/Blocks.java index db737c9608..020128e9e9 100644 --- a/core/src/io/anuke/mindustry/content/Blocks.java +++ b/core/src/io/anuke/mindustry/content/Blocks.java @@ -114,6 +114,9 @@ public class Blocks implements ContentList{ } spawn = new OverlayFloor("spawn"){ + { + variants = 0; + } public void draw(Tile tile){} }; @@ -496,19 +499,7 @@ public class Blocks implements ContentList{ GenericCrafterEntity entity = tile.entity(); Draw.rect(reg(bottomRegion), tile.drawx(), tile.drawy()); - - float progress = 0.5f; - - Shaders.build.region = reg(weaveRegion); - Shaders.build.progress = progress; - Shaders.build.color.set(Pal.accent); - Shaders.build.color.a = entity.warmup; - Shaders.build.time = -entity.totalProgress / 10f; - - Draw.shader(Shaders.build, false); - Shaders.build.apply(); Draw.rect(reg(weaveRegion), tile.drawx(), tile.drawy(), entity.totalProgress); - Draw.shader(); Draw.color(Pal.accent); Draw.alpha(entity.warmup); @@ -940,7 +931,7 @@ public class Blocks implements ContentList{ itemCapacity = 120; reloadTime = 200f; range = 440f; - consumes.power(2f); + consumes.power(1.75f); }}; //endregion @@ -1299,8 +1290,8 @@ public class Blocks implements ContentList{ Items.scrap, Bullets.flakScrap, Items.lead, Bullets.flakLead ); - reload = 15f; - range = 180f; + reload = 16f; + range = 175f; size = 2; burstSpacing = 5f; shots = 2; @@ -1499,7 +1490,7 @@ public class Blocks implements ContentList{ ammo(Items.graphite, Bullets.fuseShot); reload = 40f; shootShake = 4f; - range = 80f; + range = 110f; recoil = 5f; restitution = 0.1f; size = 3; @@ -1544,7 +1535,7 @@ public class Blocks implements ContentList{ reload = 50f; firingMoveFract = 0.5f; shootDuration = 220f; - powerUse = 10f; + powerUse = 14f; health = 200 * size * size; consumes.add(new ConsumeLiquidFilter(liquid -> liquid.temperature <= 0.5f && liquid.flammability < 0.1f, 0.5f)).update(false); diff --git a/core/src/io/anuke/mindustry/content/Bullets.java b/core/src/io/anuke/mindustry/content/Bullets.java index 9119ed9575..feefe33d8f 100644 --- a/core/src/io/anuke/mindustry/content/Bullets.java +++ b/core/src/io/anuke/mindustry/content/Bullets.java @@ -579,11 +579,12 @@ public class Bullets implements ContentList{ fuseShot = new BulletType(0.01f, 70){ int rays = 3; - float rayLength = 80f; + float rayLength = 120f; { hitEffect = Fx.hitFuse; - lifetime = 13f; + shootEffect = smokeEffect = Fx.none; + lifetime = 10f; despawnEffect = Fx.none; pierce = true; } @@ -599,14 +600,15 @@ public class Bullets implements ContentList{ public void draw(Bullet b){ super.draw(b); Draw.color(Color.WHITE, Pal.surge, b.fin()); + //Draw.alpha(b.fout()); for(int i = 0; i < 7; i++){ Tmp.v1.trns(b.rot(), i * 8f); float sl = Mathf.clamp(b.fout() - 0.5f) * (80f - i * 10); Shapes.tri(b.x + Tmp.v1.x, b.y + Tmp.v1.y, 4f, sl, b.rot() + 90); Shapes.tri(b.x + Tmp.v1.x, b.y + Tmp.v1.y, 4f, sl, b.rot() - 90); } - Shapes.tri(b.x, b.y, 13f, (rayLength + 50) * b.fout(), b.rot()); - Shapes.tri(b.x, b.y, 13f, 10f * b.fout(), b.rot() + 180f); + Shapes.tri(b.x, b.y, 20f * b.fout(), (rayLength + 50), b.rot()); + Shapes.tri(b.x, b.y, 20f * b.fout(), 10f, b.rot() + 180f); Draw.reset(); } }; diff --git a/core/src/io/anuke/mindustry/content/Mechs.java b/core/src/io/anuke/mindustry/content/Mechs.java index d19aaae610..af6448725a 100644 --- a/core/src/io/anuke/mindustry/content/Mechs.java +++ b/core/src/io/anuke/mindustry/content/Mechs.java @@ -35,7 +35,7 @@ public class Mechs implements ContentList{ boostSpeed = 0.95f; buildPower = 1.2f; engineColor = Color.valueOf("ffd37f"); - health = 300f; + health = 250f; weapon = new Weapon("blaster"){{ length = 1.5f; @@ -51,10 +51,6 @@ public class Mechs implements ContentList{ player.healBy(Time.delta() * 0.09f); } - @Override - public boolean alwaysUnlocked(){ - return true; - } }; delta = new Mech("delta-mech", false){ @@ -66,7 +62,7 @@ public class Mechs implements ContentList{ boostSpeed = 0.95f; itemCapacity = 15; mass = 0.9f; - health = 250f; + health = 150f; buildPower = 0.9f; weaponOffsetX = -1; weaponOffsetY = -1; @@ -75,7 +71,7 @@ public class Mechs implements ContentList{ weapon = new Weapon("shockgun"){{ shake = 2f; length = 1f; - reload = 40f; + reload = 45f; shotDelay = 3f; roundrobin = true; shots = 2; @@ -163,12 +159,12 @@ public class Mechs implements ContentList{ weaponOffsetX = 1; weaponOffsetY = 0; engineColor = Color.valueOf("feb380"); - health = 300f; + health = 320f; buildPower = 1.5f; weapon = new Weapon("swarmer"){{ length = 1.5f; recoil = 4f; - reload = 60f; + reload = 45f; shots = 4; spacing = 8f; inaccuracy = 8f; @@ -240,6 +236,11 @@ public class Mechs implements ContentList{ bullet = Bullets.standardCopper; }}; } + + @Override + public boolean alwaysUnlocked(){ + return true; + } }; javelin = new Mech("javelin-ship", true){ @@ -316,7 +317,7 @@ public class Mechs implements ContentList{ itemCapacity = 30; engineColor = Color.valueOf("84f491"); cellTrnsY = 1f; - buildPower = 2f; + buildPower = 2.5f; weapon = new Weapon("bomber"){{ length = 0f; width = 2f; @@ -329,7 +330,7 @@ public class Mechs implements ContentList{ velocityRnd = 1f; inaccuracy = 20f; ignoreRotation = true; - bullet = new BombBulletType(14f, 25f, "shell"){{ + bullet = new BombBulletType(16f, 25f, "shell"){{ bulletWidth = 10f; bulletHeight = 14f; hitEffect = Fx.flakExplosion; diff --git a/core/src/io/anuke/mindustry/core/Control.java b/core/src/io/anuke/mindustry/core/Control.java index 7bfb76aac8..97574e4662 100644 --- a/core/src/io/anuke/mindustry/core/Control.java +++ b/core/src/io/anuke/mindustry/core/Control.java @@ -135,7 +135,7 @@ public class Control implements ApplicationListener{ Net.host(port); player.isAdmin = true; }catch(IOException e){ - ui.showError(Core.bundle.format("server.error", Strings.parseException(e, false))); + ui.showError(Core.bundle.format("server.error", Strings.parseException(e, true))); Core.app.post(() -> state.set(State.menu)); } } diff --git a/core/src/io/anuke/mindustry/core/Logic.java b/core/src/io/anuke/mindustry/core/Logic.java index 191abb61b3..d5f60f9d32 100644 --- a/core/src/io/anuke/mindustry/core/Logic.java +++ b/core/src/io/anuke/mindustry/core/Logic.java @@ -15,6 +15,7 @@ import io.anuke.mindustry.game.EventType.*; import io.anuke.mindustry.game.*; import io.anuke.mindustry.net.Net; import io.anuke.mindustry.type.Item; +import io.anuke.mindustry.type.ItemStack; import io.anuke.mindustry.world.Tile; import static io.anuke.mindustry.Vars.*; @@ -59,6 +60,19 @@ public class Logic implements ApplicationListener{ state.set(State.playing); state.wavetime = state.rules.waveSpacing * 2; //grace period of 2x wave time before game starts Events.fire(new PlayEvent()); + + //add starting items + if(!world.isZone()){ + for(Team team : Team.all){ + if(state.teams.isActive(team)){ + for(Tile core : state.teams.get(team).cores){ + for(ItemStack stack : state.rules.startingItems){ + core.entity.items.add(stack.item, stack.amount); + } + } + } + } + } } public void reset(){ diff --git a/core/src/io/anuke/mindustry/core/NetServer.java b/core/src/io/anuke/mindustry/core/NetServer.java index 461a7a65c9..44f0a7aae1 100644 --- a/core/src/io/anuke/mindustry/core/NetServer.java +++ b/core/src/io/anuke/mindustry/core/NetServer.java @@ -234,7 +234,7 @@ public class NetServer implements ApplicationListener{ } player.remove(); netServer.connections.remove(player.con.id); - Log.info("&lc{0} has disconnected.", player.name); + Log.info("&lm[{1}] &lc{0} has disconnected.", player.name, player.uuid); } private static float compound(float speed, float drag){ @@ -248,16 +248,16 @@ public class NetServer implements ApplicationListener{ @Remote(targets = Loc.client, unreliable = true) public static void onClientShapshot( - Player player, - int snapshotID, - float x, float y, - float pointerX, float pointerY, - float rotation, float baseRotation, - float xVelocity, float yVelocity, - Tile mining, - boolean boosting, boolean shooting, boolean chatting, - BuildRequest[] requests, - float viewX, float viewY, float viewWidth, float viewHeight + Player player, + int snapshotID, + float x, float y, + float pointerX, float pointerY, + float rotation, float baseRotation, + float xVelocity, float yVelocity, + Tile mining, + boolean boosting, boolean shooting, boolean chatting, + BuildRequest[] requests, + float viewX, float viewY, float viewWidth, float viewHeight ){ NetConnection connection = player.con; if(connection == null || snapshotID < connection.lastRecievedClientSnapshot) return; @@ -296,7 +296,7 @@ public class NetServer implements ApplicationListener{ } vector.set(x - player.getInterpolator().target.x, y - player.getInterpolator().target.y); - vector.limit(maxMove); + //vector.limit(maxMove); float prevx = player.x, prevy = player.y; player.set(player.getInterpolator().target.x, player.getInterpolator().target.y); @@ -372,7 +372,7 @@ public class NetServer implements ApplicationListener{ player.add(); player.con.hasConnected = true; Call.sendMessage("[accent]" + player.name + "[accent] has connected."); - Log.info("&y{0} has connected.", player.name); + Log.info("&lm[{1}] &y{0} has connected. ", player.name, player.uuid); } public boolean isWaitingForPlayers(){ diff --git a/core/src/io/anuke/mindustry/core/Platform.java b/core/src/io/anuke/mindustry/core/Platform.java index 381865907b..85026c9335 100644 --- a/core/src/io/anuke/mindustry/core/Platform.java +++ b/core/src/io/anuke/mindustry/core/Platform.java @@ -4,6 +4,7 @@ import io.anuke.arc.Core; import io.anuke.arc.Input.TextInput; import io.anuke.arc.files.FileHandle; import io.anuke.arc.function.Consumer; +import io.anuke.arc.function.Predicate; import io.anuke.arc.math.RandomXS128; import io.anuke.arc.scene.ui.TextField; import io.anuke.arc.util.serialization.Base64Coder; @@ -66,14 +67,14 @@ public abstract class Platform{ } /** - * Show a file chooser. Desktop only. + * Show a file chooser. * @param text File chooser title text * @param content Description of the type of files to be loaded * @param cons Selection listener * @param open Whether to open or save files * @param filetype File extension to filter */ - public void showFileChooser(String text, String content, Consumer cons, boolean open, String filetype){ + public void showFileChooser(String text, String content, Consumer cons, boolean open, Predicate filetype){ } /** Hide the app. Android only. */ diff --git a/core/src/io/anuke/mindustry/core/UI.java b/core/src/io/anuke/mindustry/core/UI.java index 446ff0ef9d..ef57acaa8b 100644 --- a/core/src/io/anuke/mindustry/core/UI.java +++ b/core/src/io/anuke/mindustry/core/UI.java @@ -25,8 +25,7 @@ import io.anuke.mindustry.ui.dialogs.*; import io.anuke.mindustry.ui.fragments.*; import static io.anuke.arc.scene.actions.Actions.*; -import static io.anuke.mindustry.Vars.control; -import static io.anuke.mindustry.Vars.disableUI; +import static io.anuke.mindustry.Vars.*; public class UI implements ApplicationListener{ private FreeTypeFontGenerator generator; @@ -244,8 +243,17 @@ public class UI implements ApplicationListener{ } public void showError(String text){ - new Dialog("$error.title", "dialog"){{ - cont.margin(15).add(text).width(400f).wrap().get().setAlignment(Align.center, Align.center); + new Dialog("", "dialog"){{ + setFillParent(true); + cont.add("$error.title"); + cont.row(); + cont.margin(15).pane(t -> { + Label l = t.add(text).pad(14f).get(); + l.setAlignment(Align.center, Align.left); + if(mobile){ + t.getCell(l).wrap().width(400f); + } + }); buttons.addButton("$ok", this::hide).size(90, 50).pad(4); }}.show(); } diff --git a/core/src/io/anuke/mindustry/editor/DrawOperation.java b/core/src/io/anuke/mindustry/editor/DrawOperation.java index ee71b7e2b9..adf2551079 100755 --- a/core/src/io/anuke/mindustry/editor/DrawOperation.java +++ b/core/src/io/anuke/mindustry/editor/DrawOperation.java @@ -12,8 +12,13 @@ import static io.anuke.mindustry.Vars.content; import static io.anuke.mindustry.Vars.world; public class DrawOperation{ + private MapEditor editor; private LongArray array = new LongArray(); + public DrawOperation(MapEditor editor) { + this.editor = editor; + } + public boolean isEmpty(){ return array.isEmpty(); } @@ -22,23 +27,25 @@ public class DrawOperation{ array.add(op); } - public void undo(MapEditor editor){ + public void undo(){ for(int i = array.size - 1; i >= 0; i--){ - long l = array.get(i); - array.set(i, TileOp.get(TileOp.x(l), TileOp.y(l), TileOp.type(l), get(editor.tile(TileOp.x(l), TileOp.y(l)), TileOp.type(l)))); - set(editor, editor.tile(TileOp.x(l), TileOp.y(l)), TileOp.type(l), TileOp.value(l)); + updateTile(i); } } - public void redo(MapEditor editor){ + public void redo(){ for(int i = 0; i < array.size; i++){ - long l = array.get(i); - array.set(i, TileOp.get(TileOp.x(l), TileOp.y(l), TileOp.type(l), get(editor.tile(TileOp.x(l), TileOp.y(l)), TileOp.type(l)))); - set(editor, editor.tile(TileOp.x(l), TileOp.y(l)), TileOp.type(l), TileOp.value(l)); + updateTile(i); } } - short get(Tile tile, byte type){ + private void updateTile(int i) { + long l = array.get(i); + array.set(i, TileOp.get(TileOp.x(l), TileOp.y(l), TileOp.type(l), getTile(editor.tile(TileOp.x(l), TileOp.y(l)), TileOp.type(l)))); + setTile(editor.tile(TileOp.x(l), TileOp.y(l)), TileOp.type(l), TileOp.value(l)); + } + + short getTile(Tile tile, byte type){ if(type == OpType.floor.ordinal()){ return tile.floorID(); }else if(type == OpType.block.ordinal()){ @@ -53,7 +60,7 @@ public class DrawOperation{ throw new IllegalArgumentException("Invalid type."); } - void set(MapEditor editor, Tile tile, byte type, short to){ + void setTile(Tile tile, byte type, short to){ editor.load(() -> { if(type == OpType.floor.ordinal()){ tile.setFloor((Floor)content.block(to)); diff --git a/core/src/io/anuke/mindustry/editor/EditorTile.java b/core/src/io/anuke/mindustry/editor/EditorTile.java index e7e694d75b..41234e1578 100644 --- a/core/src/io/anuke/mindustry/editor/EditorTile.java +++ b/core/src/io/anuke/mindustry/editor/EditorTile.java @@ -99,7 +99,7 @@ public class EditorTile extends Tile{ } if(overlayID() == overlay) return; - op(OpType.overlay, overlay); + op(OpType.overlay, this.overlay); super.setOverlayID(overlay); } diff --git a/core/src/io/anuke/mindustry/editor/EditorTool.java b/core/src/io/anuke/mindustry/editor/EditorTool.java index 41cab43717..7eb6ffa334 100644 --- a/core/src/io/anuke/mindustry/editor/EditorTool.java +++ b/core/src/io/anuke/mindustry/editor/EditorTool.java @@ -50,7 +50,7 @@ public enum EditorTool{ IntArray stack = new IntArray(); Block dest; - boolean isfloor; + boolean isFloor; MapEditor data; public void touched(MapEditor editor, int x, int y){ @@ -64,14 +64,14 @@ public enum EditorTool{ } data = editor; - isfloor = editor.drawBlock instanceof Floor; + isFloor = editor.drawBlock instanceof Floor; Block floor = tile.floor(); Block block = tile.block(); boolean synth = editor.drawBlock.synthetic(); Block draw = editor.drawBlock; - dest = draw instanceof OverlayFloor ? tile.overlay() : isfloor ? floor : block; + dest = draw instanceof OverlayFloor ? tile.overlay() : isFloor ? floor : block; if(dest == draw || block instanceof BlockPart || block.isMultiblock()){ return; @@ -85,7 +85,7 @@ public enum EditorTool{ IntPositionConsumer writer = (px, py) -> { Tile write = editor.tile(px, py); - if(isfloor){ + if(isFloor){ if(alt && !(draw instanceof OverlayFloor)){ Block ore = write.overlay(); write.setFloor((Floor)draw); @@ -167,7 +167,7 @@ public enum EditorTool{ boolean eq(int px, int py){ Tile tile = data.tile(px, py); - return (data.drawBlock instanceof OverlayFloor ? tile.overlay() : isfloor ? tile.floor() : tile.block()) == dest && !(data.drawBlock instanceof OverlayFloor && tile.floor().isLiquid); + return (data.drawBlock instanceof OverlayFloor ? tile.overlay() : isFloor ? tile.floor() : tile.block()) == dest && !(data.drawBlock instanceof OverlayFloor && tile.floor().isLiquid); } }, spray{ diff --git a/core/src/io/anuke/mindustry/editor/MapEditor.java b/core/src/io/anuke/mindustry/editor/MapEditor.java index 73cbae12a1..13824d0d8a 100644 --- a/core/src/io/anuke/mindustry/editor/MapEditor.java +++ b/core/src/io/anuke/mindustry/editor/MapEditor.java @@ -240,13 +240,13 @@ public class MapEditor{ public void undo(){ if(stack.canUndo()){ - stack.undo(this); + stack.undo(); } } public void redo(){ if(stack.canRedo()){ - stack.redo(this); + stack.redo(); } } @@ -267,7 +267,7 @@ public class MapEditor{ public void addTileOp(long data){ if(loading) return; - if(currentOp == null) currentOp = new DrawOperation(); + if(currentOp == null) currentOp = new DrawOperation(this); currentOp.addOperation(data); renderer.updatePoint(TileOp.x(data), TileOp.y(data)); diff --git a/core/src/io/anuke/mindustry/editor/MapEditorDialog.java b/core/src/io/anuke/mindustry/editor/MapEditorDialog.java index 00cec9c417..2bd3d9bd27 100644 --- a/core/src/io/anuke/mindustry/editor/MapEditorDialog.java +++ b/core/src/io/anuke/mindustry/editor/MapEditorDialog.java @@ -21,9 +21,9 @@ import io.anuke.mindustry.Vars; import io.anuke.mindustry.core.GameState.State; import io.anuke.mindustry.core.Platform; import io.anuke.mindustry.game.*; -import io.anuke.mindustry.io.JsonIO; -import io.anuke.mindustry.io.MapIO; +import io.anuke.mindustry.io.*; import io.anuke.mindustry.maps.Map; +import io.anuke.mindustry.ui.dialogs.FileChooser; import io.anuke.mindustry.ui.dialogs.FloatingDialog; import io.anuke.mindustry.world.Block; import io.anuke.mindustry.world.Block.Icon; @@ -93,14 +93,16 @@ public class MapEditorDialog extends Dialog implements Disposable{ "$editor.importmap", "$editor.importmap.description", "icon-load-map", (Runnable)loadDialog::show, "$editor.importfile", "$editor.importfile.description", "icon-file", (Runnable)() -> Platform.instance.showFileChooser("$editor.loadmap", "Map Files", file -> ui.loadAnd(() -> { - try{ - //TODO what if it's an image? users should be warned for their stupidity - editor.beginEdit(MapIO.createMap(file, true)); - }catch(Exception e){ - ui.showError(Core.bundle.format("editor.errorload", Strings.parseException(e, false))); - Log.err(e); - } - }), true, mapExtension), + world.maps.tryCatchMapError(() -> { + if(MapIO.isImage(file)){ + ui.showInfo("$editor.errorimage"); + }else if(file.extension().equalsIgnoreCase(oldMapExtension)){ + editor.beginEdit(world.maps.makeLegacyMap(file)); + }else{ + editor.beginEdit(MapIO.createMap(file, true)); + } + }); + }), true, FileChooser.anyMapFiles), "$editor.importimage", "$editor.importimage.description", "icon-file-image", (Runnable)() -> Platform.instance.showFileChooser("$loadimage", "Image Files", file -> @@ -110,10 +112,10 @@ public class MapEditorDialog extends Dialog implements Disposable{ editor.beginEdit(pixmap); pixmap.dispose(); }catch(Exception e){ - ui.showError(Core.bundle.format("editor.errorload", Strings.parseException(e, false))); + ui.showError(Core.bundle.format("editor.errorload", Strings.parseException(e, true))); Log.err(e); } - }), true, "png")) + }), true, FileChooser.pngFiles)) ); t.addImageTextButton("$editor.export", "icon-save-map", isize, () -> @@ -127,11 +129,11 @@ public class MapEditorDialog extends Dialog implements Disposable{ } MapIO.writeMap(result, editor.createMap(result)); }catch(Exception e){ - ui.showError(Core.bundle.format("editor.errorsave", Strings.parseException(e, false))); + ui.showError(Core.bundle.format("editor.errorsave", Strings.parseException(e, true))); Log.err(e); } }); - }, false, mapExtension)); + }, false, FileChooser.mapFiles)); }); menu.cont.row(); @@ -153,12 +155,11 @@ public class MapEditorDialog extends Dialog implements Disposable{ } }); - loadDialog = new MapLoadDialog(map -> - ui.loadAnd(() -> { + loadDialog = new MapLoadDialog(map -> ui.loadAnd(() -> { try{ editor.beginEdit(map); }catch(Exception e){ - ui.showError(Core.bundle.format("editor.errorload", Strings.parseException(e, false))); + ui.showError(Core.bundle.format("editor.errorload", Strings.parseException(e, true))); Log.err(e); } })); @@ -188,13 +189,14 @@ public class MapEditorDialog extends Dialog implements Disposable{ }); shown(() -> { - //clear units, rules and other unnecessary stuff - logic.reset(); + saved = true; if(!Core.settings.getBool("landscape")) Platform.instance.beginForceLandscape(); editor.clearOp(); Core.scene.setScrollFocus(view); if(!shownWithMap){ + //clear units, rules and other unnecessary stuff + logic.reset(); state.rules = new Rules(); editor.beginEdit(200, 200); } @@ -231,7 +233,7 @@ public class MapEditorDialog extends Dialog implements Disposable{ hide(); //only reset the player; logic.reset() will clear entities, which we do not want player.reset(); - state.rules = Gamemode.editor.apply(new Rules()); + state.rules = Gamemode.editor.apply(lastSavedRules.copy()); world.setMap(new Map(StringMap.of( "name", "Editor Playtesting", "width", editor.width(), @@ -256,6 +258,7 @@ public class MapEditorDialog extends Dialog implements Disposable{ private void save(){ String name = editor.getTags().get("name", "").trim(); editor.getTags().put("rules", JsonIO.write(state.rules)); + player.dead = true; if(name.isEmpty()){ infoDialog.show(); @@ -335,7 +338,7 @@ public class MapEditorDialog extends Dialog implements Disposable{ show(); }catch(Exception e){ Log.err(e); - ui.showError(Core.bundle.format("editor.errorload", Strings.parseException(e, false))); + ui.showError(Core.bundle.format("editor.errorload", Strings.parseException(e, true))); } }); } diff --git a/core/src/io/anuke/mindustry/editor/MapGenerateDialog.java b/core/src/io/anuke/mindustry/editor/MapGenerateDialog.java index 02d5453b22..4a26bff475 100644 --- a/core/src/io/anuke/mindustry/editor/MapGenerateDialog.java +++ b/core/src/io/anuke/mindustry/editor/MapGenerateDialog.java @@ -27,21 +27,22 @@ import static io.anuke.mindustry.Vars.*; @SuppressWarnings("unchecked") public class MapGenerateDialog extends FloatingDialog{ + private final Supplier[] filterTypes = new Supplier[]{NoiseFilter::new, ScatterFilter::new, TerrainFilter::new, DistortFilter::new, RiverNoiseFilter::new, OreFilter::new, MedianFilter::new}; private final MapEditor editor; + private Pixmap pixmap; private Texture texture; private GenerateInput input = new GenerateInput(); private Array filters = new Array<>(); private int scaling = mobile ? 3 : 1; - private Supplier[] filterTypes = new Supplier[]{NoiseFilter::new, ScatterFilter::new, TerrainFilter::new, DistortFilter::new, RiverNoiseFilter::new, OreFilter::new}; private Table filterTable; private AsyncExecutor executor = new AsyncExecutor(1); private AsyncResult result; private boolean generating; - private DummyTile returnTile = new DummyTile(); + private GenTile returnTile = new GenTile(); - private DummyTile[][] buffer1, buffer2; + private GenTile[][] buffer1, buffer2; public MapGenerateDialog(MapEditor editor){ super("$editor.generate"); @@ -98,12 +99,12 @@ public class MapGenerateDialog extends FloatingDialog{ rebuildFilters(); } - DummyTile[][] create(){ - DummyTile[][] out = new DummyTile[editor.width() / scaling][editor.height() / scaling]; + GenTile[][] create(){ + GenTile[][] out = new GenTile[editor.width() / scaling][editor.height() / scaling]; for(int x = 0; x < out.length; x++){ for(int y = 0; y < out[0].length; y++){ - out[x][y] = new DummyTile(); + out[x][y] = new GenTile(); } } return out; @@ -187,7 +188,7 @@ public class MapGenerateDialog extends FloatingDialog{ selection.show(); } - DummyTile dset(Tile tile){ + GenTile dset(Tile tile){ returnTile.set(tile); return returnTile; } @@ -208,11 +209,11 @@ public class MapGenerateDialog extends FloatingDialog{ } //writeback buffer - DummyTile[][] writeTiles = new DummyTile[editor.width()][editor.height()]; + GenTile[][] writeTiles = new GenTile[editor.width()][editor.height()]; for(int x = 0; x < editor.width(); x++){ for(int y = 0; y < editor.height(); y++){ - writeTiles[x][y] = new DummyTile(); + writeTiles[x][y] = new GenTile(); } } @@ -233,7 +234,7 @@ public class MapGenerateDialog extends FloatingDialog{ for(int x = 0; x < editor.width(); x++){ for(int y = 0; y < editor.height(); y++){ Tile tile = editor.tile(x, y); - DummyTile write = writeTiles[x][y]; + GenTile write = writeTiles[x][y]; tile.rotation(write.rotation); tile.setFloor((Floor)content.block(write.floor)); @@ -278,7 +279,7 @@ public class MapGenerateDialog extends FloatingDialog{ for(int px = 0; px < pixmap.getWidth(); px++){ for(int py = 0; py < pixmap.getHeight(); py++){ int x = px * scaling, y = py * scaling; - DummyTile tile = buffer1[px][py]; + GenTile tile = buffer1[px][py]; input.begin(editor, x, y, content.block(tile.floor), content.block(tile.block), content.block(tile.ore)); filter.apply(input); buffer2[px][py].set(input.floor, input.block, input.ore, Team.all[tile.team], tile.rotation); @@ -299,7 +300,7 @@ public class MapGenerateDialog extends FloatingDialog{ Tile tile = editor.tile(px * scaling, py * scaling); color = MapIO.colorFor(tile.floor(), tile.block(), tile.overlay(), Team.none); }else{ - DummyTile tile = buffer1[px][py]; + GenTile tile = buffer1[px][py]; color = MapIO.colorFor(content.block(tile.floor), content.block(tile.block), content.block(tile.ore), Team.none); } pixmap.drawPixel(px, pixmap.getHeight() - 1 - py, color); @@ -321,7 +322,7 @@ public class MapGenerateDialog extends FloatingDialog{ }); } - public static class DummyTile{ + public static class GenTile{ public byte team, rotation; public short block, floor, ore; @@ -333,7 +334,7 @@ public class MapGenerateDialog extends FloatingDialog{ this.rotation = (byte)rotation; } - void set(DummyTile other){ + void set(GenTile other){ this.floor = other.floor; this.block = other.block; this.ore = other.ore; diff --git a/core/src/io/anuke/mindustry/editor/MapInfoDialog.java b/core/src/io/anuke/mindustry/editor/MapInfoDialog.java index efd049d11f..7f9fca20e6 100644 --- a/core/src/io/anuke/mindustry/editor/MapInfoDialog.java +++ b/core/src/io/anuke/mindustry/editor/MapInfoDialog.java @@ -12,13 +12,13 @@ import io.anuke.mindustry.ui.dialogs.FloatingDialog; public class MapInfoDialog extends FloatingDialog{ private final MapEditor editor; - private final WaveInfoDialog waveinfo; - private final CustomRulesDialog ruleinfo = new CustomRulesDialog(); + private final WaveInfoDialog waveInfo; + private final CustomRulesDialog ruleInfo = new CustomRulesDialog(); public MapInfoDialog(MapEditor editor){ super("$editor.mapinfo"); this.editor = editor; - this.waveinfo = new WaveInfoDialog(editor); + this.waveInfo = new WaveInfoDialog(editor); addCloseButton(); @@ -58,11 +58,11 @@ public class MapInfoDialog extends FloatingDialog{ cont.row(); cont.add("$editor.rules").padRight(8).left(); - cont.addButton("$edit", () -> ruleinfo.show(Vars.state.rules, () -> Vars.state.rules = new Rules())).left().width(200f);; + cont.addButton("$edit", () -> ruleInfo.show(Vars.state.rules, () -> Vars.state.rules = new Rules())).left().width(200f);; cont.row(); cont.add("$editor.waves").padRight(8).left(); - cont.addButton("$edit", waveinfo::show).left().width(200f); + cont.addButton("$edit", waveInfo::show).left().width(200f); name.change(); description.change(); diff --git a/core/src/io/anuke/mindustry/editor/MapRenderer.java b/core/src/io/anuke/mindustry/editor/MapRenderer.java index decc0c18d3..3bca816d61 100644 --- a/core/src/io/anuke/mindustry/editor/MapRenderer.java +++ b/core/src/io/anuke/mindustry/editor/MapRenderer.java @@ -19,7 +19,7 @@ import io.anuke.mindustry.world.blocks.BlockPart; import static io.anuke.mindustry.Vars.tilesize; public class MapRenderer implements Disposable{ - private static final int chunksize = 64; + private static final int chunkSize = 64; private IndexedRenderer[][] chunks; private IntSet updates = new IntSet(); private IntSet delayedUpdates = new IntSet(); @@ -41,11 +41,11 @@ public class MapRenderer implements Disposable{ } } - chunks = new IndexedRenderer[(int)Math.ceil((float)width / chunksize)][(int)Math.ceil((float)height / chunksize)]; + chunks = new IndexedRenderer[(int)Math.ceil((float)width / chunkSize)][(int)Math.ceil((float)height / chunkSize)]; for(int x = 0; x < chunks.length; x++){ for(int y = 0; y < chunks[0].length; y++){ - chunks[x][y] = new IndexedRenderer(chunksize * chunksize * 2); + chunks[x][y] = new IndexedRenderer(chunkSize * chunkSize * 2); } } this.width = width; @@ -97,7 +97,7 @@ public class MapRenderer implements Disposable{ } private void render(int wx, int wy){ - int x = wx / chunksize, y = wy / chunksize; + int x = wx / chunkSize, y = wy / chunkSize; IndexedRenderer mesh = chunks[x][y]; Tile tile = editor.tiles()[wx][wy]; @@ -107,8 +107,8 @@ public class MapRenderer implements Disposable{ TextureRegion region; - int idxWall = (wx % chunksize) + (wy % chunksize) * chunksize; - int idxDecal = (wx % chunksize) + (wy % chunksize) * chunksize + chunksize * chunksize; + int idxWall = (wx % chunkSize) + (wy % chunkSize) * chunkSize; + int idxDecal = (wx % chunkSize) + (wy % chunkSize) * chunkSize + chunkSize * chunkSize; if(wall != Blocks.air && (wall.synthetic() || wall instanceof BlockPart)){ region = !Core.atlas.isFound(wall.editorIcon()) ? Core.atlas.find("clear-editor") : wall.editorIcon(); @@ -145,8 +145,8 @@ public class MapRenderer implements Disposable{ } mesh.draw(idxDecal, region, - wx * tilesize + offsetX, wy * tilesize + offsetY, - region.getWidth() * Draw.scl, region.getHeight() * Draw.scl); + wx * tilesize + offsetX, wy * tilesize + offsetY, + region.getWidth() * Draw.scl, region.getHeight() * Draw.scl); mesh.setColor(Color.WHITE); } diff --git a/core/src/io/anuke/mindustry/editor/OperationStack.java b/core/src/io/anuke/mindustry/editor/OperationStack.java index aa53bb3afa..7927cbb026 100755 --- a/core/src/io/anuke/mindustry/editor/OperationStack.java +++ b/core/src/io/anuke/mindustry/editor/OperationStack.java @@ -34,18 +34,18 @@ public class OperationStack{ return !(index > -1 || stack.size + index < 0); } - public void undo(MapEditor editor){ + public void undo(){ if(!canUndo()) return; - stack.get(stack.size - 1 + index).undo(editor); + stack.get(stack.size - 1 + index).undo(); index--; } - public void redo(MapEditor editor){ + public void redo(){ if(!canRedo()) return; index++; - stack.get(stack.size - 1 + index).redo(editor); + stack.get(stack.size - 1 + index).redo(); } } diff --git a/core/src/io/anuke/mindustry/editor/generation/DistortFilter.java b/core/src/io/anuke/mindustry/editor/generation/DistortFilter.java index f2233be7bf..3fab21d3a5 100644 --- a/core/src/io/anuke/mindustry/editor/generation/DistortFilter.java +++ b/core/src/io/anuke/mindustry/editor/generation/DistortFilter.java @@ -1,6 +1,6 @@ package io.anuke.mindustry.editor.generation; -import io.anuke.mindustry.editor.MapGenerateDialog.DummyTile; +import io.anuke.mindustry.editor.MapGenerateDialog.GenTile; import io.anuke.mindustry.editor.generation.FilterOption.SliderOption; import io.anuke.mindustry.world.blocks.Floor; @@ -11,14 +11,14 @@ public class DistortFilter extends GenerateFilter{ { options( - new SliderOption("scale", () -> scl, f -> scl = f, 1f, 400f), - new SliderOption("mag", () -> mag, f -> mag = f, 0.5f, 100f) + new SliderOption("scale", () -> scl, f -> scl = f, 1f, 400f), + new SliderOption("mag", () -> mag, f -> mag = f, 0.5f, 100f) ); } @Override public void apply(){ - DummyTile tile = in.tile(in.x / (in.scaling) + (noise(in.x, in.y, scl, mag) - mag / 2f) / in.scaling, in.y / (in.scaling) + (noise(in.x, in.y + o, scl, mag) - mag / 2f) / in.scaling); + GenTile tile = in.tile(in.x / (in.scaling) + (noise(in.x, in.y, scl, mag) - mag / 2f) / in.scaling, in.y / (in.scaling) + (noise(in.x, in.y + o, scl, mag) - mag / 2f) / in.scaling); in.floor = content.block(tile.floor); if(!content.block(tile.block).synthetic() && !in.block.synthetic()) in.block = content.block(tile.block); diff --git a/core/src/io/anuke/mindustry/editor/generation/GenerateFilter.java b/core/src/io/anuke/mindustry/editor/generation/GenerateFilter.java index bd8551b23a..9105a7b4e8 100644 --- a/core/src/io/anuke/mindustry/editor/generation/GenerateFilter.java +++ b/core/src/io/anuke/mindustry/editor/generation/GenerateFilter.java @@ -7,14 +7,14 @@ import io.anuke.arc.util.noise.RidgedPerlin; import io.anuke.arc.util.noise.Simplex; import io.anuke.mindustry.content.Blocks; import io.anuke.mindustry.editor.MapEditor; -import io.anuke.mindustry.editor.MapGenerateDialog.DummyTile; +import io.anuke.mindustry.editor.MapGenerateDialog.GenTile; import io.anuke.mindustry.world.Block; import io.anuke.mindustry.world.blocks.Floor; public abstract class GenerateFilter{ - protected float o = (float)(Math.random() * 10000000.0); - protected long seed; - protected GenerateInput in; + protected transient float o = (float)(Math.random() * 10000000.0); + protected transient long seed; + protected transient GenerateInput in; public FilterOption[] options; @@ -88,12 +88,12 @@ public abstract class GenerateFilter{ pnoise.setSeed((int)(filter.seed + 1)); } - DummyTile tile(float x, float y){ + GenTile tile(float x, float y){ return buffer.get(Mathf.clamp((int)x, 0, width - 1), Mathf.clamp((int)y, 0, height - 1)); } public interface TileProvider{ - DummyTile get(int x, int y); + GenTile get(int x, int y); } } } diff --git a/core/src/io/anuke/mindustry/editor/generation/MedianFilter.java b/core/src/io/anuke/mindustry/editor/generation/MedianFilter.java new file mode 100644 index 0000000000..548b861f8c --- /dev/null +++ b/core/src/io/anuke/mindustry/editor/generation/MedianFilter.java @@ -0,0 +1,46 @@ +package io.anuke.mindustry.editor.generation; + +import io.anuke.arc.collection.IntArray; +import io.anuke.arc.math.Mathf; +import io.anuke.mindustry.editor.MapGenerateDialog.GenTile; +import io.anuke.mindustry.editor.generation.FilterOption.SliderOption; + +import static io.anuke.mindustry.Vars.content; + +public class MedianFilter extends GenerateFilter{ + float radius = 2; + float percentile = 0.5f; + IntArray blocks = new IntArray(), floors = new IntArray(); + + { + options( + new SliderOption("radius", () -> radius, f -> radius = f, 1f, 12f), + new SliderOption("percentile", () -> percentile, f -> percentile = f, 0f, 1f) + ); + } + + @Override + public void apply(){ + int rad = (int)radius; + blocks.clear(); + floors.clear(); + for(int x = -rad; x <= rad; x++){ + for(int y = -rad; y <= rad; y++){ + if(Mathf.dst2(x, y) > rad*rad) continue; + + GenTile tile = in.tile(in.x + x, in.y + y); + blocks.add(tile.block); + floors.add(tile.floor); + } + } + + floors.sort(); + blocks.sort(); + + int index = Math.min((int)(floors.size * percentile), floors.size - 1); + int floor = floors.get(index), block = blocks.get(index); + + in.floor = content.block(floor); + if(!content.block(block).synthetic() && !in.block.synthetic()) in.block = content.block(block); + } +} diff --git a/core/src/io/anuke/mindustry/entities/bullet/LiquidBulletType.java b/core/src/io/anuke/mindustry/entities/bullet/LiquidBulletType.java index e3fe41f828..cc2b97ca46 100644 --- a/core/src/io/anuke/mindustry/entities/bullet/LiquidBulletType.java +++ b/core/src/io/anuke/mindustry/entities/bullet/LiquidBulletType.java @@ -28,6 +28,7 @@ public class LiquidBulletType extends BulletType{ statusDuration = 90f; despawnEffect = Fx.none; hitEffect = Fx.hitLiquid; + smokeEffect = Fx.none; shootEffect = Fx.none; drag = 0.009f; knockback = 0.55f; diff --git a/core/src/io/anuke/mindustry/entities/effect/Decal.java b/core/src/io/anuke/mindustry/entities/effect/Decal.java index 72d251d9be..79b2c3276d 100644 --- a/core/src/io/anuke/mindustry/entities/effect/Decal.java +++ b/core/src/io/anuke/mindustry/entities/effect/Decal.java @@ -1,12 +1,12 @@ package io.anuke.mindustry.entities.effect; -import io.anuke.arc.graphics.Color; import io.anuke.arc.graphics.g2d.Draw; import io.anuke.arc.math.Mathf; import io.anuke.mindustry.entities.EntityGroup; import io.anuke.mindustry.entities.impl.TimedEntity; import io.anuke.mindustry.entities.traits.BelowLiquidTrait; import io.anuke.mindustry.entities.traits.DrawTrait; +import io.anuke.mindustry.graphics.Pal; import static io.anuke.mindustry.Vars.groundEffectGroup; @@ -14,7 +14,6 @@ import static io.anuke.mindustry.Vars.groundEffectGroup; * Class for creating block rubble on the ground. */ public abstract class Decal extends TimedEntity implements BelowLiquidTrait, DrawTrait{ - private static final Color color = Color.valueOf("3a3635"); @Override public float lifetime(){ @@ -23,7 +22,7 @@ public abstract class Decal extends TimedEntity implements BelowLiquidTrait, Dra @Override public void draw(){ - Draw.color(color.r, color.g, color.b, 1f - Mathf.curve(fin(), 0.98f)); + Draw.color(Pal.rubble.r, Pal.rubble.g, Pal.rubble.b, 1f - Mathf.curve(fin(), 0.98f)); drawDecal(); Draw.color(); } diff --git a/core/src/io/anuke/mindustry/entities/effect/Fire.java b/core/src/io/anuke/mindustry/entities/effect/Fire.java index fa1b74b106..a7eb817a15 100644 --- a/core/src/io/anuke/mindustry/entities/effect/Fire.java +++ b/core/src/io/anuke/mindustry/entities/effect/Fire.java @@ -1,13 +1,11 @@ package io.anuke.mindustry.entities.effect; +import io.anuke.annotations.Annotations.Remote; import io.anuke.arc.collection.IntMap; import io.anuke.arc.math.Mathf; import io.anuke.arc.math.geom.Geometry; import io.anuke.arc.math.geom.Point2; -import io.anuke.arc.util.Structs; -import io.anuke.arc.util.Time; -import io.anuke.arc.util.pooling.Pool.Poolable; -import io.anuke.arc.util.pooling.Pools; +import io.anuke.arc.util.*; import io.anuke.mindustry.content.*; import io.anuke.mindustry.entities.*; import io.anuke.mindustry.entities.impl.TimedEntity; @@ -22,7 +20,7 @@ import java.io.*; import static io.anuke.mindustry.Vars.*; -public class Fire extends TimedEntity implements SaveTrait, SyncTrait, Poolable{ +public class Fire extends TimedEntity implements SaveTrait, SyncTrait{ private static final IntMap map = new IntMap<>(); private static final float baseLifetime = 1000f, spreadChance = 0.05f, fireballChance = 0.07f; @@ -36,6 +34,11 @@ public class Fire extends TimedEntity implements SaveTrait, SyncTrait, Poolable{ public Fire(){ } + @Remote + public static void onRemoveFire(int fid){ + fireGroup.removeByID(fid); + } + /** Start a fire on the tile. If there already is a file there, refreshes its lifetime. */ public static void create(Tile tile){ if(Net.client() || tile == null) return; //not clientside. @@ -43,7 +46,7 @@ public class Fire extends TimedEntity implements SaveTrait, SyncTrait, Poolable{ Fire fire = map.get(tile.pos()); if(fire == null){ - fire = Pools.obtain(Fire.class, Fire::new); + fire = new Fire(); fire.tile = tile; fire.lifetime = baseLifetime; fire.set(tile.worldx(), tile.worldy()); @@ -94,12 +97,12 @@ public class Fire extends TimedEntity implements SaveTrait, SyncTrait, Poolable{ time = Mathf.clamp(time + Time.delta(), 0, lifetime()); - if(time >= lifetime() || tile == null){ - remove(); + if(Net.client()){ return; } - if(Net.client()){ + if(time >= lifetime() || tile == null){ + remove(); return; } @@ -176,6 +179,7 @@ public class Fire extends TimedEntity implements SaveTrait, SyncTrait, Poolable{ x = Pos.x(pos) * tilesize; y = Pos.y(pos) * tilesize; + tile = world.tile(pos); } @Override @@ -184,6 +188,7 @@ public class Fire extends TimedEntity implements SaveTrait, SyncTrait, Poolable{ tile = null; baseFlammability = -1; puddleFlammability = 0f; + incrementID(); } @Override @@ -198,9 +203,9 @@ public class Fire extends TimedEntity implements SaveTrait, SyncTrait, Poolable{ @Override public void removed(){ if(tile != null){ + Call.onRemoveFire(id); map.remove(tile.pos()); } - reset(); } @Override diff --git a/core/src/io/anuke/mindustry/entities/impl/BaseEntity.java b/core/src/io/anuke/mindustry/entities/impl/BaseEntity.java index 4fb4462c03..e2da48908e 100755 --- a/core/src/io/anuke/mindustry/entities/impl/BaseEntity.java +++ b/core/src/io/anuke/mindustry/entities/impl/BaseEntity.java @@ -58,4 +58,9 @@ public abstract class BaseEntity implements Entity{ public String toString(){ return getClass() + " " + id; } + + /** Increments this entity's ID. Used for pooled entities.*/ + public void incrementID(){ + id = lastid++; + } } diff --git a/core/src/io/anuke/mindustry/entities/traits/BuilderTrait.java b/core/src/io/anuke/mindustry/entities/traits/BuilderTrait.java index 7787b834c1..d4d0e47560 100644 --- a/core/src/io/anuke/mindustry/entities/traits/BuilderTrait.java +++ b/core/src/io/anuke/mindustry/entities/traits/BuilderTrait.java @@ -165,7 +165,7 @@ public interface BuilderTrait extends Entity, TeamTrait{ output.writeInt(Pos.get(request.x, request.y)); output.writeFloat(request.progress); if(!request.breaking){ - output.writeByte(request.block.id); + output.writeShort(request.block.id); output.writeByte(request.rotation); } }else{ @@ -189,7 +189,7 @@ public interface BuilderTrait extends Entity, TeamTrait{ if(type == 1){ //remove request = new BuildRequest(Pos.x(position), Pos.y(position)); }else{ //place - byte block = input.readByte(); + short block = input.readShort(); byte rotation = input.readByte(); request = new BuildRequest(Pos.x(position), Pos.y(position), rotation, content.block(block)); } diff --git a/core/src/io/anuke/mindustry/entities/type/BaseUnit.java b/core/src/io/anuke/mindustry/entities/type/BaseUnit.java index f54ef58bcd..334b21db3c 100644 --- a/core/src/io/anuke/mindustry/entities/type/BaseUnit.java +++ b/core/src/io/anuke/mindustry/entities/type/BaseUnit.java @@ -23,6 +23,7 @@ import io.anuke.mindustry.gen.Call; import io.anuke.mindustry.net.Net; import io.anuke.mindustry.type.*; import io.anuke.mindustry.world.Tile; +import io.anuke.mindustry.world.blocks.units.UnitFactory.UnitFactoryEntity; import io.anuke.mindustry.world.meta.BlockFlag; import java.io.*; @@ -264,7 +265,7 @@ public abstract class BaseUnit extends Unit implements ShooterTrait{ avoidOthers(); - if(spawner != noSpawner && (world.tile(spawner) == null || world.tile(spawner).entity == null)){ + if(spawner != noSpawner && (world.tile(spawner) == null || !(world.tile(spawner).entity instanceof UnitFactoryEntity))){ kill(); } diff --git a/core/src/io/anuke/mindustry/entities/type/Player.java b/core/src/io/anuke/mindustry/entities/type/Player.java index c68727da15..41f98ef021 100644 --- a/core/src/io/anuke/mindustry/entities/type/Player.java +++ b/core/src/io/anuke/mindustry/entities/type/Player.java @@ -559,7 +559,7 @@ public class Player extends Unit implements BuilderTrait, ShooterTrait{ updateShooting(); //server simulates player shooting } return; - }else{ + }else if(world.isZone()){ //unlock mech when used data.unlockContent(mech); } @@ -665,10 +665,10 @@ public class Player extends Unit implements BuilderTrait, ShooterTrait{ attractDst = 0f; if(tapping){ - velocity.setAngle(Mathf.slerpDelta(velocity.angle(), angleTo(moveTarget), 0.1f)); + velocity.setAngle(angleTo(moveTarget)); } - if(dst(moveTarget) < 2f){ + if(dst(moveTarget) <= 2f * Time.delta()){ if(tapping){ Tile tile = ((TileEntity)moveTarget).tile; tile.block().tapped(tile, this); @@ -680,7 +680,7 @@ public class Player extends Unit implements BuilderTrait, ShooterTrait{ moveTarget = null; } - movement.set(targetX - x, targetY - y).limit(isBoosting && !mech.flying ? mech.boostSpeed : mech.speed); + movement.set((targetX - x) / Time.delta(), (targetY - y) / Time.delta()).limit(isBoosting && !mech.flying ? mech.boostSpeed : mech.speed); movement.setAngle(Mathf.slerp(movement.angle(), velocity.angle(), 0.05f)); if(dst(targetX, targetY) < attractDst){ @@ -795,7 +795,7 @@ public class Player extends Unit implements BuilderTrait, ShooterTrait{ } public boolean isShooting(){ - return isShooting && (!isBoosting || mech.flying); + return isShooting && (!isBoosting || mech.flying) && mining == null; } public void updateRespawning(){ diff --git a/core/src/io/anuke/mindustry/entities/type/Unit.java b/core/src/io/anuke/mindustry/entities/type/Unit.java index 6579af6c97..1eb1b48269 100644 --- a/core/src/io/anuke/mindustry/entities/type/Unit.java +++ b/core/src/io/anuke/mindustry/entities/type/Unit.java @@ -9,8 +9,7 @@ import io.anuke.arc.graphics.g2d.TextureRegion; import io.anuke.arc.math.Mathf; import io.anuke.arc.math.geom.Geometry; import io.anuke.arc.math.geom.Vector2; -import io.anuke.arc.util.Time; -import io.anuke.arc.util.Tmp; +import io.anuke.arc.util.*; import io.anuke.mindustry.content.Blocks; import io.anuke.mindustry.content.Fx; import io.anuke.mindustry.entities.*; @@ -256,6 +255,16 @@ public abstract class Unit extends DestructibleEntity implements SaveTrait, Targ kill(); } + //apply knockback based on spawns + if(getTeam() != waveTeam){ + float relativeSize = state.rules.dropZoneRadius + getSize()/2f + 1f; + for(Tile spawn : world.spawner.getGroundSpawns()){ + if(withinDst(spawn.worldx(), spawn.worldy(), relativeSize)){ + velocity.add(Tmp.v1.set(this).sub(spawn.worldx(), spawn.worldy()).setLength(0.1f + 1f - dst(spawn) / relativeSize).scl(0.45f * Time.delta())); + } + } + } + if(isFlying()){ drownTime = 0f; move(velocity.x * Time.delta(), velocity.y * Time.delta()); diff --git a/core/src/io/anuke/mindustry/game/DefaultWaves.java b/core/src/io/anuke/mindustry/game/DefaultWaves.java index 4a4899da30..37f0ff3806 100644 --- a/core/src/io/anuke/mindustry/game/DefaultWaves.java +++ b/core/src/io/anuke/mindustry/game/DefaultWaves.java @@ -11,13 +11,20 @@ public class DefaultWaves{ if(spawns == null && UnitTypes.dagger != null){ spawns = Array.with( new SpawnGroup(UnitTypes.dagger){{ - end = 8; + end = 10; + unitScaling = 2f; + }}, + + new SpawnGroup(UnitTypes.crawler){{ + begin = 4; + end = 13; + unitAmount = 2; unitScaling = 1.5f; }}, new SpawnGroup(UnitTypes.wraith){{ begin = 12; - end = 14; + end = 16; unitScaling = 1f; }}, @@ -29,7 +36,7 @@ public class DefaultWaves{ }}, new SpawnGroup(UnitTypes.titan){{ - begin = 9; + begin = 7; spacing = 3; unitScaling = 2; @@ -39,7 +46,7 @@ public class DefaultWaves{ new SpawnGroup(UnitTypes.dagger){{ begin = 8; unitScaling = 1; - unitAmount = 1; + unitAmount = 4; spacing = 2; }}, diff --git a/core/src/io/anuke/mindustry/game/EventType.java b/core/src/io/anuke/mindustry/game/EventType.java index f55079b0c0..872f74a1c1 100644 --- a/core/src/io/anuke/mindustry/game/EventType.java +++ b/core/src/io/anuke/mindustry/game/EventType.java @@ -1,6 +1,5 @@ package io.anuke.mindustry.game; -import io.anuke.arc.Events.Event; import io.anuke.mindustry.core.GameState.State; import io.anuke.mindustry.entities.traits.BuilderTrait; import io.anuke.mindustry.entities.type.Unit; @@ -10,7 +9,7 @@ import io.anuke.mindustry.world.Tile; public class EventType{ /** Called when a zone's requirements are met. */ - public static class ZoneRequireCompleteEvent implements Event{ + public static class ZoneRequireCompleteEvent{ public final Zone zone, required; public ZoneRequireCompleteEvent(Zone zone, Zone required){ @@ -20,7 +19,7 @@ public class EventType{ } /** Called when a zone's requirements are met. */ - public static class ZoneConfigureCompleteEvent implements Event{ + public static class ZoneConfigureCompleteEvent{ public final Zone zone; public ZoneConfigureCompleteEvent(Zone zone){ @@ -29,23 +28,23 @@ public class EventType{ } /** Called when the game is first loaded. */ - public static class GameLoadEvent implements Event{ + public static class GameLoadEvent{ } - public static class PlayEvent implements Event{ + public static class PlayEvent{ } - public static class ResetEvent implements Event{ + public static class ResetEvent{ } - public static class WaveEvent implements Event{ + public static class WaveEvent{ } - public static class GameOverEvent implements Event{ + public static class GameOverEvent{ public final Team winner; public GameOverEvent(Team winner){ @@ -54,12 +53,12 @@ public class EventType{ } /** Called when a game begins and the world is loaded. */ - public static class WorldLoadEvent implements Event{ + public static class WorldLoadEvent{ } /** Called from the logic thread. Do not access graphics here! */ - public static class TileChangeEvent implements Event{ + public static class TileChangeEvent{ public final Tile tile; public TileChangeEvent(Tile tile){ @@ -67,7 +66,7 @@ public class EventType{ } } - public static class StateChangeEvent implements Event{ + public static class StateChangeEvent{ public final State from, to; public StateChangeEvent(State from, State to){ @@ -76,7 +75,7 @@ public class EventType{ } } - public static class UnlockEvent implements Event{ + public static class UnlockEvent{ public final UnlockableContent content; public UnlockEvent(UnlockableContent content){ @@ -88,7 +87,7 @@ public class EventType{ * Called when block building begins by placing down the BuildBlock. * The tile's block will nearly always be a BuildBlock. */ - public static class BlockBuildBeginEvent implements Event{ + public static class BlockBuildBeginEvent{ public final Tile tile; public final Team team; public final boolean breaking; @@ -100,7 +99,7 @@ public class EventType{ } } - public static class BlockBuildEndEvent implements Event{ + public static class BlockBuildEndEvent{ public final Tile tile; public final Team team; public final boolean breaking; @@ -116,7 +115,7 @@ public class EventType{ * Called when a player or drone begins building something. * This does not necessarily happen when a new BuildBlock is created. */ - public static class BuildSelectEvent implements Event{ + public static class BuildSelectEvent{ public final Tile tile; public final Team team; public final BuilderTrait builder; @@ -130,7 +129,7 @@ public class EventType{ } } - public static class BlockDestroyEvent implements Event{ + public static class BlockDestroyEvent{ public final Tile tile; public BlockDestroyEvent(Tile tile){ @@ -138,7 +137,7 @@ public class EventType{ } } - public static class UnitDestroyEvent implements Event{ + public static class UnitDestroyEvent{ public final Unit unit; public UnitDestroyEvent(Unit unit){ @@ -146,7 +145,7 @@ public class EventType{ } } - public static class ResizeEvent implements Event{ + public static class ResizeEvent{ } } diff --git a/core/src/io/anuke/mindustry/game/Gamemode.java b/core/src/io/anuke/mindustry/game/Gamemode.java index 41a77c1949..6118b273ef 100644 --- a/core/src/io/anuke/mindustry/game/Gamemode.java +++ b/core/src/io/anuke/mindustry/game/Gamemode.java @@ -28,10 +28,10 @@ public enum Gamemode{ rules.respawnTime = 60 * 10; rules.buildCostMultiplier = 0.5f; rules.buildSpeedMultiplier = 2f; - rules.playerDamageMultiplier = 0.45f; - rules.playerHealthMultiplier = 0.8f; + rules.playerDamageMultiplier = 0.33f; + rules.playerHealthMultiplier = 0.5f; rules.unitBuildSpeedMultiplier = 3f; - rules.unitHealthMultiplier = 2f; + rules.unitHealthMultiplier = 3f; rules.attackMode = true; }), editor(true, rules -> { diff --git a/core/src/io/anuke/mindustry/game/Rules.java b/core/src/io/anuke/mindustry/game/Rules.java index 63babc963b..90b6521a55 100644 --- a/core/src/io/anuke/mindustry/game/Rules.java +++ b/core/src/io/anuke/mindustry/game/Rules.java @@ -2,7 +2,9 @@ package io.anuke.mindustry.game; import io.anuke.annotations.Annotations.Serialize; import io.anuke.arc.collection.Array; +import io.anuke.mindustry.content.Items; import io.anuke.mindustry.io.JsonIO; +import io.anuke.mindustry.type.ItemStack; import io.anuke.mindustry.type.Zone; /** @@ -63,6 +65,8 @@ public class Rules{ public boolean attackMode = false; /** Whether this is the editor gamemode. */ public boolean editor = false; + /** Items that the player starts with here. Not applicable to zones.*/ + public Array startingItems = Array.with(new ItemStack(Items.copper, 200)); /** Copies this ruleset exactly. Not very efficient at all, do not use often. */ public Rules copy(){ diff --git a/core/src/io/anuke/mindustry/game/Teams.java b/core/src/io/anuke/mindustry/game/Teams.java index 1dc52906f1..bf328255ca 100644 --- a/core/src/io/anuke/mindustry/game/Teams.java +++ b/core/src/io/anuke/mindustry/game/Teams.java @@ -28,7 +28,7 @@ public class Teams{ /** Returns whether a team is active, e.g. whether it has any cores remaining. */ public boolean isActive(Team team){ //the enemy wave team is always active - return (Vars.state.rules.waves && team == Vars.waveTeam) || get(team).cores.size > 0; + return team == Vars.waveTeam || get(team).cores.size > 0; } /** Returns a set of all teams that are enemies of this team. */ diff --git a/core/src/io/anuke/mindustry/graphics/Pal.java b/core/src/io/anuke/mindustry/graphics/Pal.java index e13ed16723..aa4ca6f7e7 100644 --- a/core/src/io/anuke/mindustry/graphics/Pal.java +++ b/core/src/io/anuke/mindustry/graphics/Pal.java @@ -35,6 +35,7 @@ public class Pal{ darkishGray = new Color(0.3f, 0.3f, 0.3f, 1f), darkerGray = new Color(0.2f, 0.2f, 0.2f, 1f), ammo = Color.valueOf("ff8947"), + rubble = Color.valueOf("1c1817"), boostTo = Color.valueOf("ffad4d"), boostFrom = Color.valueOf("ff7f57"), diff --git a/core/src/io/anuke/mindustry/input/MobileInput.java b/core/src/io/anuke/mindustry/input/MobileInput.java index 16dd78802b..662ee53a0c 100644 --- a/core/src/io/anuke/mindustry/input/MobileInput.java +++ b/core/src/io/anuke/mindustry/input/MobileInput.java @@ -42,8 +42,6 @@ public class MobileInput extends InputHandler implements GestureListener{ //gesture data private Vector2 vector = new Vector2(); private float lastDistance = -1f; - /** Set of completed guides. */ - //private ObjectSet guides = new ObjectSet<>(); /** Position where the player started dragging a line. */ private int lineStartX, lineStartY; @@ -311,7 +309,7 @@ public class MobileInput extends InputHandler implements GestureListener{ }).visible(() -> !selection.isEmpty()); Core.scene.table(t -> { - t.bottom().left().visible(() -> player.isBuilding() || block != null || mode == breaking); + t.bottom().left().visible(() -> (player.isBuilding() || block != null || mode == breaking) && !state.is(State.menu)); t.addImageTextButton("$cancel", "icon-cancel", 16*2, () -> { player.clearBuilding(); mode = none; diff --git a/core/src/io/anuke/mindustry/io/BundleLoader.java b/core/src/io/anuke/mindustry/io/BundleLoader.java index 84f4f78965..74a123b23f 100644 --- a/core/src/io/anuke/mindustry/io/BundleLoader.java +++ b/core/src/io/anuke/mindustry/io/BundleLoader.java @@ -59,6 +59,5 @@ public class BundleLoader{ Locale.setDefault(locale); Core.bundle = I18NBundle.createBundle(handle, locale); } - } } diff --git a/core/src/io/anuke/mindustry/io/JsonIO.java b/core/src/io/anuke/mindustry/io/JsonIO.java index da5182fc32..064e97cbd8 100644 --- a/core/src/io/anuke/mindustry/io/JsonIO.java +++ b/core/src/io/anuke/mindustry/io/JsonIO.java @@ -5,13 +5,13 @@ import io.anuke.arc.util.serialization.JsonValue; import io.anuke.mindustry.Vars; import io.anuke.mindustry.game.Rules; import io.anuke.mindustry.game.SpawnGroup; -import io.anuke.mindustry.type.ContentType; -import io.anuke.mindustry.type.Zone; +import io.anuke.mindustry.type.*; public class JsonIO{ private static Json json = new Json(){{ setIgnoreUnknownFields(true); setElementType(Rules.class, "spawns", SpawnGroup.class); + setElementType(Rules.class, "startingItems", ItemStack.class); setSerializer(Zone.class, new Serializer(){ @Override @@ -24,6 +24,18 @@ public class JsonIO{ return Vars.content.getByName(ContentType.zone, jsonData.asString()); } }); + + setSerializer(Item.class, new Serializer(){ + @Override + public void write(Json json, Item object, Class knownType){ + json.writeValue(object.name); + } + + @Override + public Item read(Json json, JsonValue jsonData, Class type){ + return Vars.content.getByName(ContentType.item, jsonData.asString()); + } + }); }}; public static String write(Object object){ diff --git a/core/src/io/anuke/mindustry/io/LegacyMapIO.java b/core/src/io/anuke/mindustry/io/LegacyMapIO.java index 0773534617..2c65b1f2e7 100644 --- a/core/src/io/anuke/mindustry/io/LegacyMapIO.java +++ b/core/src/io/anuke/mindustry/io/LegacyMapIO.java @@ -40,6 +40,8 @@ public class LegacyMapIO{ for(int x = 0; x < map.width; x++){ for(int y = 0; y < map.height; y++){ tiles[x][y] = new CachedTile(); + tiles[x][y].x = (short)x; + tiles[x][y].y = (short)y; } } state.rules.spawns = groups; @@ -53,6 +55,9 @@ public class LegacyMapIO{ //meta is uncompressed int version = stream.readInt(); + if(version != 1){ + throw new IOException("Outdated legacy map format"); + } int build = stream.readInt(); short width = stream.readShort(), height = stream.readShort(); byte tagAmount = stream.readByte(); diff --git a/core/src/io/anuke/mindustry/io/SaveVersion.java b/core/src/io/anuke/mindustry/io/SaveVersion.java index f46853dcf5..508ab698a4 100644 --- a/core/src/io/anuke/mindustry/io/SaveVersion.java +++ b/core/src/io/anuke/mindustry/io/SaveVersion.java @@ -6,11 +6,15 @@ import io.anuke.arc.util.Time; import io.anuke.arc.util.io.CounterInputStream; import io.anuke.mindustry.entities.Entities; import io.anuke.mindustry.entities.EntityGroup; -import io.anuke.mindustry.entities.traits.*; +import io.anuke.mindustry.entities.traits.Entity; +import io.anuke.mindustry.entities.traits.SaveTrait; +import io.anuke.mindustry.entities.traits.TypeTrait; import io.anuke.mindustry.game.*; import io.anuke.mindustry.maps.Map; import io.anuke.mindustry.type.ContentType; -import io.anuke.mindustry.world.*; +import io.anuke.mindustry.world.Block; +import io.anuke.mindustry.world.Tile; +import io.anuke.mindustry.world.WorldContext; import java.io.*; @@ -71,6 +75,7 @@ public abstract class SaveVersion extends SaveFileReader{ state.wavetime = map.getFloat("wavetime", state.rules.waveSpacing); state.stats = JsonIO.read(Stats.class, map.get("stats", "{}")); state.rules = JsonIO.read(Rules.class, map.get("rules", "{}")); + if(state.rules.spawns.isEmpty()) state.rules.spawns = DefaultWaves.get(); Map worldmap = world.maps.byName(map.get("mapname", "\\\\\\")); world.setMap(worldmap == null ? new Map(StringMap.of( "name", map.get("mapname", "Unknown"), @@ -170,10 +175,14 @@ public abstract class SaveVersion extends SaveFileReader{ tile.setBlock(block); if(tile.entity != null){ - readChunk(stream, true, in -> { - byte version = in.readByte(); - tile.entity.read(in, version); - }); + try{ + readChunk(stream, true, in -> { + byte version = in.readByte(); + tile.entity.read(in, version); + }); + }catch(Exception e){ + throw new IOException("Failed to read tile entity of block: " + block, e); + } }else{ int consecutives = stream.readUnsignedByte(); diff --git a/core/src/io/anuke/mindustry/maps/Map.java b/core/src/io/anuke/mindustry/maps/Map.java index 2833ddb782..07ed0efb1d 100644 --- a/core/src/io/anuke/mindustry/maps/Map.java +++ b/core/src/io/anuke/mindustry/maps/Map.java @@ -5,6 +5,7 @@ import io.anuke.arc.collection.StringMap; import io.anuke.arc.files.FileHandle; import io.anuke.arc.graphics.Texture; import io.anuke.mindustry.Vars; +import io.anuke.mindustry.game.DefaultWaves; import io.anuke.mindustry.game.Rules; import io.anuke.mindustry.io.JsonIO; @@ -57,7 +58,9 @@ public class Map implements Comparable{ /** This creates a new instance.*/ public Rules rules(){ - return JsonIO.read(Rules.class, tags.get("rules", "{}")); + Rules result = JsonIO.read(Rules.class, tags.get("rules", "{}")); + if(result.spawns.isEmpty()) result.spawns = DefaultWaves.get(); + return result; } /** Whether this map has a core of the enemy 'wave' team. Default: true. diff --git a/core/src/io/anuke/mindustry/maps/Maps.java b/core/src/io/anuke/mindustry/maps/Maps.java index ba37fe1ad5..03597baa48 100644 --- a/core/src/io/anuke/mindustry/maps/Maps.java +++ b/core/src/io/anuke/mindustry/maps/Maps.java @@ -3,12 +3,13 @@ package io.anuke.mindustry.maps; import io.anuke.arc.Core; import io.anuke.arc.collection.*; import io.anuke.arc.files.FileHandle; +import io.anuke.arc.function.ExceptionRunnable; import io.anuke.arc.graphics.Texture; -import io.anuke.arc.util.Disposable; -import io.anuke.arc.util.Log; +import io.anuke.arc.util.*; import io.anuke.arc.util.serialization.Json; import io.anuke.mindustry.game.SpawnGroup; -import io.anuke.mindustry.io.*; +import io.anuke.mindustry.io.LegacyMapIO; +import io.anuke.mindustry.io.MapIO; import java.io.IOException; import java.io.StringWriter; @@ -17,7 +18,7 @@ import static io.anuke.mindustry.Vars.*; public class Maps implements Disposable{ /** List of all built-in maps. Filenames only. */ - private static final String[] defaultMapNames = {"fortress"}; + private static final String[] defaultMapNames = {"fortress", "labyrinth", "islands"}; /** All maps stored in an ordered array. */ private Array maps = new Array<>(); /** Serializer for meta. */ @@ -116,6 +117,14 @@ public class Maps implements Disposable{ } } + /** Creates a legacy map by converting it to a non-legacy map and pasting it in a temp directory. + * Should be followed up by {@link #importMap(FileHandle)} .*/ + public Map makeLegacyMap(FileHandle file) throws IOException{ + FileHandle dst = tmpDirectory.child("conversion_map." + mapExtension); + LegacyMapIO.convertMap(file, dst); + return MapIO.createMap(dst, true); + } + /** Import a map, then save it. This updates all values and stored data necessary. */ public void importMap(FileHandle file) throws IOException{ FileHandle dest = findFile(); @@ -124,6 +133,24 @@ public class Maps implements Disposable{ loadMap(dest, true); } + /** Attempts to run the following code; + * catches any errors and attempts to display them in a readable way.*/ + public void tryCatchMapError(ExceptionRunnable run){ + try{ + run.run(); + }catch(Exception e){ + Log.err(e); + + if("Outdated legacy map format".equals(e.getMessage())){ + ui.showError("$editor.errorlegacy"); + }else if(e.getMessage() != null && e.getMessage().contains("Incorrect header!")){ + ui.showError("$editor.errorheader"); + }else{ + ui.showError(Core.bundle.format("editor.errorload", Strings.parseException(e, true))); + } + } + } + /** Removes a map completely. */ public void removeMap(Map map){ if(map.texture != null){ diff --git a/core/src/io/anuke/mindustry/net/Net.java b/core/src/io/anuke/mindustry/net/Net.java index 7b6b770e65..58fa2716aa 100644 --- a/core/src/io/anuke/mindustry/net/Net.java +++ b/core/src/io/anuke/mindustry/net/Net.java @@ -6,8 +6,7 @@ import io.anuke.arc.collection.*; import io.anuke.arc.function.BiConsumer; import io.anuke.arc.function.Consumer; import io.anuke.arc.net.HttpRequestBuilder; -import io.anuke.arc.util.Log; -import io.anuke.arc.util.Time; +import io.anuke.arc.util.*; import io.anuke.arc.util.pooling.Pools; import io.anuke.mindustry.core.Platform; import io.anuke.mindustry.gen.Call; @@ -67,7 +66,7 @@ public class Net{ }else if(error.equals("alreadyconnected")){ error = Core.bundle.get("error.alreadyconnected"); }else if(!error.isEmpty()){ - error = Core.bundle.get("error.any") + "\n" + t.getClass().getSimpleName() + "\n" + (t.getMessage() == null ? "" : t.getMessage()); + error = Core.bundle.get("error.any") + "\n" + Strings.parseException(e, true); } ui.showText("", Core.bundle.format("connectfail", error)); diff --git a/core/src/io/anuke/mindustry/type/ItemStack.java b/core/src/io/anuke/mindustry/type/ItemStack.java index b99cf26069..8067c56cd9 100644 --- a/core/src/io/anuke/mindustry/type/ItemStack.java +++ b/core/src/io/anuke/mindustry/type/ItemStack.java @@ -1,16 +1,24 @@ package io.anuke.mindustry.type; import io.anuke.arc.collection.Array; +import io.anuke.mindustry.content.Items; public class ItemStack implements Comparable{ public Item item; public int amount; public ItemStack(Item item, int amount){ + if(item == null) item = Items.copper; this.item = item; this.amount = amount; } + //serialization only + public ItemStack(){ + //prevent nulls. + item = Items.copper; + } + public boolean equals(ItemStack other){ return other != null && other.item == item && other.amount == amount; } diff --git a/core/src/io/anuke/mindustry/ui/ItemDisplay.java b/core/src/io/anuke/mindustry/ui/ItemDisplay.java index 1e7dd9fbbf..728d99a710 100644 --- a/core/src/io/anuke/mindustry/ui/ItemDisplay.java +++ b/core/src/io/anuke/mindustry/ui/ItemDisplay.java @@ -6,6 +6,8 @@ import io.anuke.mindustry.type.ItemStack; /** An item image with text. */ public class ItemDisplay extends Table{ + public final Item item; + public final int amount; public ItemDisplay(Item item){ this(item, 0); @@ -14,5 +16,8 @@ public class ItemDisplay extends Table{ public ItemDisplay(Item item, int amount){ add(new ItemImage(new ItemStack(item, amount))).size(8 * 4); add(item.localizedName()).padLeft(4); + + this.item = item; + this.amount = amount; } } diff --git a/core/src/io/anuke/mindustry/ui/LiquidDisplay.java b/core/src/io/anuke/mindustry/ui/LiquidDisplay.java index efa010f207..86f5323102 100644 --- a/core/src/io/anuke/mindustry/ui/LiquidDisplay.java +++ b/core/src/io/anuke/mindustry/ui/LiquidDisplay.java @@ -10,8 +10,15 @@ import io.anuke.mindustry.world.meta.StatUnit; /** An ItemDisplay, but for liquids. */ public class LiquidDisplay extends Table{ + public final Liquid liquid; + public final float amount; + public final boolean perSecond; public LiquidDisplay(Liquid liquid, float amount, boolean perSecond){ + this.liquid = liquid; + this.amount = amount; + this.perSecond = perSecond; + add(new Stack(){{ add(new Image(liquid.getContentIcon())); diff --git a/core/src/io/anuke/mindustry/ui/dialogs/CustomGameDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/CustomGameDialog.java index 02444c8b06..0aabd0272b 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/CustomGameDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/CustomGameDialog.java @@ -12,7 +12,8 @@ import io.anuke.mindustry.ui.BorderImage; import static io.anuke.mindustry.Vars.world; -public class CustomGameDialog extends FloatingDialog{ +public class +CustomGameDialog extends FloatingDialog{ private MapPlayDialog dialog = new MapPlayDialog(); public CustomGameDialog(){ diff --git a/core/src/io/anuke/mindustry/ui/dialogs/CustomRulesDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/CustomRulesDialog.java index 062b85b567..6233e762f2 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/CustomRulesDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/CustomRulesDialog.java @@ -42,10 +42,10 @@ public class CustomRulesDialog extends FloatingDialog{ title("$rules.title.waves"); check("$rules.waves", b -> rules.waves = b, () -> rules.waves); - check("$rules.wavetimer", b -> rules.waveTimer = b, () -> rules.waveTimer, () -> rules.waves); - check("$rules.waitForWaveToEnd", b -> rules.waitForWaveToEnd = b, () -> rules.waitForWaveToEnd, () -> rules.waves); - number("$rules.wavespacing", false, f -> rules.waveSpacing = f * 60f, () -> rules.waveSpacing / 60f, () -> rules.waves); - number("$rules.dropzoneradius", false, f -> rules.dropZoneRadius = f * tilesize, () -> rules.dropZoneRadius / tilesize, () -> rules.waves); + check("$rules.wavetimer", b -> rules.waveTimer = b, () -> rules.waveTimer); + check("$rules.waitForWaveToEnd", b -> rules.waitForWaveToEnd = b, () -> rules.waitForWaveToEnd); + number("$rules.wavespacing", false, f -> rules.waveSpacing = f * 60f, () -> rules.waveSpacing / 60f, () -> true); + number("$rules.dropzoneradius", false, f -> rules.dropZoneRadius = f * tilesize, () -> rules.dropZoneRadius / tilesize, () -> true); title("$rules.title.respawns"); check("$rules.limitedRespawns", b -> rules.limitedRespawns = b, () -> rules.limitedRespawns); diff --git a/core/src/io/anuke/mindustry/ui/dialogs/FileChooser.java b/core/src/io/anuke/mindustry/ui/dialogs/FileChooser.java index ca35333bef..89317ab552 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/FileChooser.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/FileChooser.java @@ -12,6 +12,7 @@ import io.anuke.arc.scene.ui.layout.Table; import io.anuke.arc.scene.ui.layout.Unit; import io.anuke.arc.util.*; import io.anuke.arc.util.pooling.Pools; +import io.anuke.mindustry.Vars; import io.anuke.mindustry.core.Platform; import java.util.Arrays; @@ -29,12 +30,26 @@ public class FileChooser extends FloatingDialog{ private Predicate filter; private Consumer selectListener; private boolean open; + private int lastWidth = Core.graphics.getWidth(), lastHeight = Core.graphics.getHeight(); + + public static final Predicate pngFiles = str -> str.equals("png"); + public static final Predicate anyMapFiles = str -> str.equals(Vars.oldMapExtension) || str.equals(Vars.mapExtension); + public static final Predicate mapFiles = str -> str.equals(Vars.mapExtension); + public static final Predicate saveFiles = str -> str.equals(Vars.saveExtension); public FileChooser(String title, Predicate filter, boolean open, Consumer result){ super(title); this.open = open; this.filter = filter; this.selectListener = result; + + update(() -> { + if(Core.graphics.getWidth() != lastWidth || Core.graphics.getHeight() != lastHeight){ + updateFiles(false); + lastHeight = Core.graphics.getHeight(); + lastWidth = Core.graphics.getWidth(); + } + }); } private void setupWidgets(){ @@ -268,14 +283,6 @@ public class FileChooser extends FloatingDialog{ return this; } - public void fileSelected(Consumer listener){ - this.selectListener = listener; - } - - public interface FileHandleFilter{ - boolean accept(FileHandle file); - } - public class FileHistory{ private Array history = new Array<>(); private int index; diff --git a/core/src/io/anuke/mindustry/ui/dialogs/HostDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/HostDialog.java index a8f40dc583..dacb8fe5e4 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/HostDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/HostDialog.java @@ -56,7 +56,7 @@ public class HostDialog extends FloatingDialog{ Net.host(Vars.port); player.isAdmin = true; }catch(IOException e){ - ui.showError(Core.bundle.format("server.error", Strings.parseException(e, false))); + ui.showError(Core.bundle.format("server.error", Strings.parseException(e, true))); } ui.loadfrag.hide(); hide(); diff --git a/core/src/io/anuke/mindustry/ui/dialogs/LoadDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/LoadDialog.java index efdaf0adbd..880dfb3eb5 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/LoadDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/LoadDialog.java @@ -90,16 +90,16 @@ public class LoadDialog extends FloatingDialog{ slot.exportFile(file); setup(); }catch(IOException e){ - ui.showError(Core.bundle.format("save.export.fail", Strings.parseException(e, false))); + ui.showError(Core.bundle.format("save.export.fail", Strings.parseException(e, true))); } - }, false, saveExtension); + }, false, FileChooser.saveFiles); }else{ try{ FileHandle file = Core.files.local("save-" + slot.getName() + "." + Vars.saveExtension); slot.exportFile(file); Platform.instance.shareFile(file); }catch(Exception e){ - ui.showError(Core.bundle.format("save.export.fail", Strings.parseException(e, false))); + ui.showError(Core.bundle.format("save.export.fail", Strings.parseException(e, true))); } } }).size(14 * 3).right(); @@ -155,12 +155,12 @@ public class LoadDialog extends FloatingDialog{ setup(); }catch(IOException e){ e.printStackTrace(); - ui.showError(Core.bundle.format("save.import.fail", Strings.parseException(e, false))); + ui.showError(Core.bundle.format("save.import.fail", Strings.parseException(e, true))); } }else{ ui.showError("$save.import.invalid"); } - }, true, saveExtension); + }, true, FileChooser.saveFiles); }).fillX().margin(10f).minWidth(300f).height(70f).pad(4f).padRight(-4); } diff --git a/core/src/io/anuke/mindustry/ui/dialogs/MapPlayDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/MapPlayDialog.java index ab22b52549..e2938b143a 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/MapPlayDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/MapPlayDialog.java @@ -16,7 +16,7 @@ public class MapPlayDialog extends FloatingDialog{ Difficulty difficulty = Difficulty.normal; CustomRulesDialog dialog = new CustomRulesDialog(); Rules rules; - Gamemode selectedGamemode; + Gamemode selectedGamemode = Gamemode.survival; public MapPlayDialog(){ super(""); @@ -28,6 +28,8 @@ public class MapPlayDialog extends FloatingDialog{ cont.clearChildren(); rules = map.rules(); + rules = selectedGamemode.apply(map.rules()); + Table selmode = new Table(); selmode.add("$level.mode").colspan(4); selmode.row(); @@ -43,8 +45,8 @@ public class MapPlayDialog extends FloatingDialog{ } modes.addButton(mode.toString(), "toggle", () -> { - selectedGamemode = selectedGamemode == mode ? null : mode; - rules = selectedGamemode == null ? map.rules() : mode.apply(map.rules()); + selectedGamemode = mode; + rules = mode.apply(map.rules()); }).update(b -> b.setChecked(selectedGamemode == mode)).size(140f, 54f); if(i++ % 2 == 1) modes.row(); } @@ -81,7 +83,7 @@ public class MapPlayDialog extends FloatingDialog{ cont.add(sdif); cont.row(); - cont.add(new BorderImage(map.texture, 3f)).size(250f).get().setScaling(Scaling.fit); + cont.add(new BorderImage(map.texture, 3f)).size(mobile && !Core.graphics.isPortrait() ? 150f : 250f).get().setScaling(Scaling.fit); buttons.clearChildren(); addCloseButton(); diff --git a/core/src/io/anuke/mindustry/ui/dialogs/MapsDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/MapsDialog.java index 1205146ccd..aefa5e64c9 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/MapsDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/MapsDialog.java @@ -5,7 +5,7 @@ import io.anuke.arc.graphics.Color; import io.anuke.arc.scene.event.Touchable; import io.anuke.arc.scene.ui.*; import io.anuke.arc.scene.ui.layout.Table; -import io.anuke.arc.util.*; +import io.anuke.arc.util.Scaling; import io.anuke.mindustry.Vars; import io.anuke.mindustry.core.Platform; import io.anuke.mindustry.io.MapIO; @@ -23,8 +23,19 @@ public class MapsDialog extends FloatingDialog{ addCloseButton(); buttons.addImageTextButton("$editor.importmap", "icon-add", 14 * 2, () -> { Platform.instance.showFileChooser("$editor.importmap", "Map File", file -> { - try{ - Map map = MapIO.createMap(file, true); + world.maps.tryCatchMapError(() -> { + if(MapIO.isImage(file)){ + ui.showError("$editor.errorimage"); + return; + } + + Map map; + if(file.extension().equalsIgnoreCase(mapExtension)){ + map = MapIO.createMap(file, true); + }else{ + map = world.maps.makeLegacyMap(file); + } + String name = map.tags.get("name"); if(name == null){ ui.showError("$editor.errorname"); @@ -34,27 +45,21 @@ public class MapsDialog extends FloatingDialog{ Map conflict = world.maps.all().find(m -> m.name().equals(name)); if(conflict != null && !conflict.custom){ - ui.showError(Core.bundle.format("editor.import.exists", name)); + ui.showInfo(Core.bundle.format("editor.import.exists", name)); }else if(conflict != null){ ui.showConfirm("$confirm", "$editor.overwrite.confirm", () -> { - try{ + world.maps.tryCatchMapError(() -> { world.maps.importMap(file); setup(); - }catch(Exception e){ - ui.showError(Core.bundle.format("editor.errorload", Strings.parseException(e, false))); - Log.err(e); - } + }); }); }else{ - world.maps.importMap(file); + world.maps.importMap(map.file); setup(); } - }catch(Exception e){ - ui.showError(Core.bundle.format("editor.errorload", Strings.parseException(e, false))); - Log.err(e); - } - }, true, mapExtension); + }); + }, true, FileChooser.anyMapFiles); }).size(230f, 64f); shown(this::setup); diff --git a/core/src/io/anuke/mindustry/ui/dialogs/SettingsMenuDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/SettingsMenuDialog.java index cb870470fe..ac19e1a480 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/SettingsMenuDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/SettingsMenuDialog.java @@ -178,7 +178,6 @@ public class SettingsMenuDialog extends SettingsDialog{ graphics.sliderPref("fpscap", 125, 5, 125, 5, s -> (s > 120 ? Core.bundle.get("setting.fpscap.none") : Core.bundle.format("setting.fpscap.text", s))); graphics.sliderPref("chatopacity", 100, 0, 100, 5, s -> s + "%"); - if(!mobile){ graphics.checkPref("vsync", true, b -> Core.graphics.setVSync(b)); graphics.checkPref("fullscreen", false, b -> { @@ -221,6 +220,22 @@ public class SettingsMenuDialog extends SettingsDialog{ graphics.checkPref("animatedshields", !mobile); graphics.checkPref("lasers", true); graphics.checkPref("pixelate", false); + + //TODO is this necessary? + /* + graphics.checkPref("linear", false, b -> { + for(Texture tex : Core.atlas.getTextures()){ + TextureFilter filter = b ? TextureFilter.Linear : TextureFilter.Nearest; + tex.setFilter(filter, filter); + } + }); + + if(Core.settings.getBool("linear")){ + for(Texture tex : Core.atlas.getTextures()){ + TextureFilter filter = TextureFilter.Linear; + tex.setFilter(filter, filter); + } + }*/ } private void back(){ diff --git a/core/src/io/anuke/mindustry/world/Block.java b/core/src/io/anuke/mindustry/world/Block.java index 3c77052b8c..177922ac47 100644 --- a/core/src/io/anuke/mindustry/world/Block.java +++ b/core/src/io/anuke/mindustry/world/Block.java @@ -73,8 +73,6 @@ public class Block extends BlockStorage{ public Layer layer2 = null; /** whether this block can be replaced in all cases */ public boolean alwaysReplace = false; - /** whether this block has instant transfer checking. used for calculations to prevent infinite loops. */ - public boolean instantTransfer = false; /** The block group. Unless {@link #canReplace} is overriden, blocks in the same group can replace each other. */ public BlockGroup group = BlockGroup.none; /** List of block flags. Used for AI indexing. */ @@ -105,6 +103,8 @@ public class Block extends BlockStorage{ public float buildCost; /** Whether this block is visible and can currently be built. */ public BooleanProvider buildVisibility = () -> false; + /** Whether this block has instant transfer.*/ + public boolean instantTransfer = false; public boolean alwaysUnlocked = false; protected TextureRegion[] cacheRegions = {}; diff --git a/core/src/io/anuke/mindustry/world/CachedTile.java b/core/src/io/anuke/mindustry/world/CachedTile.java index 05f3b16144..dde20ba3be 100644 --- a/core/src/io/anuke/mindustry/world/CachedTile.java +++ b/core/src/io/anuke/mindustry/world/CachedTile.java @@ -1,6 +1,5 @@ package io.anuke.mindustry.world; -import io.anuke.arc.collection.IntMap; import io.anuke.mindustry.entities.type.TileEntity; import io.anuke.mindustry.game.Team; import io.anuke.mindustry.world.modules.*; @@ -10,7 +9,6 @@ import io.anuke.mindustry.world.modules.*; * Prevents garbage when loading previews. */ public class CachedTile extends Tile{ - private static IntMap entities = new IntMap<>(); public CachedTile(){ super(0, 0); @@ -23,7 +21,8 @@ public class CachedTile extends Tile{ @Override protected void preChanged(){ - super.setTeam(Team.none); + //this basically overrides the old tile code and doesn't remove from proximity + team = 0; } @Override @@ -33,19 +32,14 @@ public class CachedTile extends Tile{ Block block = block(); if(block.hasEntity()){ - //cache all entity types so only one is ever created per block type. do not add it. - if(!entities.containsKey(block.id)){ - TileEntity n = block.newEntity(); - n.cons = new ConsumeModule(entity); - n.tile = this; - if(block.hasItems) n.items = new ItemModule(); - if(block.hasLiquids) n.liquids = new LiquidModule(); - if(block.hasPower) n.power = new PowerModule(); - entities.put(block.id, n); - } - - entity = entities.get(block.id); - + TileEntity n = block.newEntity(); + n.cons = new ConsumeModule(entity); + n.tile = this; + n.block = block; + if(block.hasItems) n.items = new ItemModule(); + if(block.hasLiquids) n.liquids = new LiquidModule(); + if(block.hasPower) n.power = new PowerModule(); + entity = n; } } } diff --git a/core/src/io/anuke/mindustry/world/DirectionalItemBuffer.java b/core/src/io/anuke/mindustry/world/DirectionalItemBuffer.java new file mode 100644 index 0000000000..2f5d7538b6 --- /dev/null +++ b/core/src/io/anuke/mindustry/world/DirectionalItemBuffer.java @@ -0,0 +1,77 @@ +package io.anuke.mindustry.world; + +import io.anuke.annotations.Annotations.Struct; +import io.anuke.arc.util.Time; +import io.anuke.mindustry.gen.BufferItem; +import io.anuke.mindustry.type.Item; + +import java.io.*; + +import static io.anuke.mindustry.Vars.content; + +public class DirectionalItemBuffer{ + public final long[][] buffers; + public final int[] indexes; + private final float speed; + + public DirectionalItemBuffer(int capacity, float speed){ + this.buffers = new long[4][capacity]; + this.indexes = new int[5]; + this.speed = speed; + } + + public boolean accepts(int buffer){ + return indexes[buffer] < buffers[buffer].length; + } + + public void accept(int buffer, Item item){ + if(!accepts(buffer)) return; + buffers[buffer][indexes[buffer]++] = BufferItem.get((byte)item.id, Time.time()); + } + + public Item poll(int buffer){ + if(indexes[buffer] > 0){ + long l = buffers[buffer][0]; + float time = BufferItem.time(l); + + if(Time.time() >= time + speed || Time.time() < time){ + return content.item(BufferItem.item(l)); + } + } + return null; + } + + public void remove(int buffer){ + System.arraycopy(buffers[buffer], 1, buffers[buffer], 0, indexes[buffer] - 1); + indexes[buffer] --; + } + + public void write(DataOutput stream) throws IOException{ + for(int i = 0; i < 4; i++){ + stream.writeByte(indexes[i]); + stream.writeByte(buffers[i].length); + for(long l : buffers[i]){ + stream.writeLong(l); + } + } + } + + public void read(DataInput stream) throws IOException{ + for(int i = 0; i < 4; i++){ + indexes[i] = stream.readByte(); + byte length = stream.readByte(); + for(int j = 0; j < length; j++){ + long value = stream.readLong(); + if(j < buffers[i].length){ + buffers[i][j] = value; + } + } + } + } + + @Struct + class BufferItemStruct{ + byte item; + float time; + } +} diff --git a/core/src/io/anuke/mindustry/world/Tile.java b/core/src/io/anuke/mindustry/world/Tile.java index 1e458fc34e..cac7d27a7f 100644 --- a/core/src/io/anuke/mindustry/world/Tile.java +++ b/core/src/io/anuke/mindustry/world/Tile.java @@ -439,6 +439,6 @@ public class Tile implements Position, TargetTrait{ @Override public String toString(){ - return floor.name + ":" + block.name + ":" + content.block(overlay) + "[" + x + "," + y + "] " + "entity=" + (entity == null ? "null" : (entity.getClass())); + return floor.name + ":" + block.name + ":" + content.block(overlay) + "[" + x + "," + y + "] " + "entity=" + (entity == null ? "null" : (entity.getClass())) + ":" + getTeam(); } } \ No newline at end of file diff --git a/core/src/io/anuke/mindustry/world/blocks/BlockPart.java b/core/src/io/anuke/mindustry/world/blocks/BlockPart.java index e177217ffa..21da5964dd 100644 --- a/core/src/io/anuke/mindustry/world/blocks/BlockPart.java +++ b/core/src/io/anuke/mindustry/world/blocks/BlockPart.java @@ -1,5 +1,7 @@ package io.anuke.mindustry.world.blocks; +import io.anuke.mindustry.type.Item; +import io.anuke.mindustry.type.Liquid; import io.anuke.mindustry.world.Block; import io.anuke.mindustry.world.Tile; @@ -28,6 +30,28 @@ public class BlockPart extends Block{ return parts[dx + maxSize/2][dy + maxSize/2]; } + @Override + public boolean acceptItem(Item item, Tile tile, Tile source){ + return tile.link().block().acceptItem(item, tile.link(), source); + } + + @Override + public void handleItem(Item item, Tile tile, Tile source){ + tile.link().block().handleItem(item, tile.link(), source); + } + + @Override + public void handleLiquid(Tile tile, Tile source, Liquid liquid, float amount){ + Block block = tile.link().block(); + block.handleLiquid(tile.link(), source, liquid, amount); + } + + @Override + public boolean acceptLiquid(Tile tile, Tile source, Liquid liquid, float amount){ + Block block = tile.link().block(); + return block.hasLiquids && block.acceptLiquid(tile.link(), source, liquid, amount); + } + @Override public Tile linked(Tile tile){ return tile.getNearby(-dx, -dy); diff --git a/core/src/io/anuke/mindustry/world/blocks/Floor.java b/core/src/io/anuke/mindustry/world/blocks/Floor.java index 51d4a5aa32..dbd0218a4f 100644 --- a/core/src/io/anuke/mindustry/world/blocks/Floor.java +++ b/core/src/io/anuke/mindustry/world/blocks/Floor.java @@ -3,6 +3,7 @@ package io.anuke.mindustry.world.blocks; import io.anuke.arc.Core; import io.anuke.arc.collection.Array; import io.anuke.arc.collection.IntSet; +import io.anuke.arc.graphics.Color; import io.anuke.arc.graphics.g2d.Draw; import io.anuke.arc.graphics.g2d.TextureRegion; import io.anuke.arc.math.Mathf; @@ -56,6 +57,7 @@ public class Floor extends Block{ protected byte eq = 0; protected Array blenders = new Array<>(); protected IntSet blended = new IntSet(); + protected TextureRegion edgeRegion, edgierRegion; public Floor(String name){ super(name); @@ -82,6 +84,8 @@ public class Floor extends Block{ edges = Core.atlas.find(name + "-edge").split(size, size); } region = variantRegions[0]; + edgeRegion = Core.atlas.find("edge"); + edgierRegion = Core.atlas.find("edgier"); } @Override @@ -140,14 +144,32 @@ public class Floor extends Block{ Point2 point = Geometry.d8[i]; Tile other = tile.getNearby(point); if(other != null && other.floor() == block){ - TextureRegion region = edge((Floor)block, type(i), 2 - (point.x + 1), 2 - (point.y + 1)); + TextureRegion region = edge((Floor)block, 2 - (point.x + 1), 2 - (point.y + 1)); Draw.rect(region, tile.worldx(), tile.worldy()); + + if(!sameLayer && block.cacheLayer.ordinal() > cacheLayer.ordinal()){ + Draw.rect(block.variantRegions()[0], tile.worldx() + point.x*tilesize, tile.worldy() + point.y*tilesize); + } } } } } + //'new' style of edges with shadows instead of colors, not used currently + protected void drawEdgesFlat(Tile tile, boolean sameLayer){ + for(int i = 0; i < 4; i++){ + Tile other = tile.getNearby(i); + if(other != null && doEdge(other.floor(), sameLayer)){ + Color color = other.floor().color; + Draw.color(color.r, color.g, color.b, 1f); + Draw.rect(edgeRegion, tile.worldx(), tile.worldy(), i*90); + } + } + Draw.color(); + } + + protected TextureRegion[][] edges(){ return ((Floor)blendGroup).edges; } @@ -160,28 +182,12 @@ public class Floor extends Block{ return true; } - int type(int i){ - if(!eq(i - 1) && !eq(i + 1)){ - //case 0: touching - return 0; - }else if(eq(i - 1) && eq(i - 2) && eq(i + 1) && eq(i + 2)){ - //case 2: surrounded - return 2; - }else if(eq(i - 1) && eq(i + 1)){ - //case 1: flat - return 1; - }else{ - //case 0 is rounded, so it's the safest choice, should work for most possibilities - return 0; - } - } - boolean eq(int i){ return (eq & (1 << Mathf.mod(i, 8))) != 0; } - TextureRegion edge(Floor block, int type, int x, int y){ - return block.edges()[x + type * 3][2 - y]; + TextureRegion edge(Floor block, int x, int y){ + return block.edges()[x][2 - y]; } } \ No newline at end of file diff --git a/core/src/io/anuke/mindustry/world/blocks/defense/Door.java b/core/src/io/anuke/mindustry/world/blocks/defense/Door.java index 07454f6849..04da951cff 100644 --- a/core/src/io/anuke/mindustry/world/blocks/defense/Door.java +++ b/core/src/io/anuke/mindustry/world/blocks/defense/Door.java @@ -16,6 +16,8 @@ import io.anuke.mindustry.world.Tile; import java.io.*; +import static io.anuke.mindustry.Vars.world; + public class Door extends Wall{ protected final Rectangle rect = new Rectangle(); @@ -68,6 +70,7 @@ public class Door extends Wall{ } entity.open = !entity.open; + world.pathfinder.updateSolid(tile); if(!entity.open){ Effects.effect(closefx, tile.drawx(), tile.drawy()); }else{ diff --git a/core/src/io/anuke/mindustry/world/blocks/defense/ForceProjector.java b/core/src/io/anuke/mindustry/world/blocks/defense/ForceProjector.java index 1db6033d79..c0a857f625 100644 --- a/core/src/io/anuke/mindustry/world/blocks/defense/ForceProjector.java +++ b/core/src/io/anuke/mindustry/world/blocks/defense/ForceProjector.java @@ -60,6 +60,11 @@ public class ForceProjector extends Block{ consumes.add(new ConsumeLiquidFilter(liquid -> liquid.temperature <= 0.5f && liquid.flammability < 0.1f, 0.1f)).boost().update(false); } + @Override + public boolean outputsItems(){ + return false; + } + @Override public void load(){ super.load(); diff --git a/core/src/io/anuke/mindustry/world/blocks/defense/MendProjector.java b/core/src/io/anuke/mindustry/world/blocks/defense/MendProjector.java index dc8075a680..2afb132878 100644 --- a/core/src/io/anuke/mindustry/world/blocks/defense/MendProjector.java +++ b/core/src/io/anuke/mindustry/world/blocks/defense/MendProjector.java @@ -45,6 +45,11 @@ public class MendProjector extends Block{ hasItems = true; } + @Override + public boolean outputsItems(){ + return false; + } + @Override public void load(){ super.load(); diff --git a/core/src/io/anuke/mindustry/world/blocks/defense/OverdriveProjector.java b/core/src/io/anuke/mindustry/world/blocks/defense/OverdriveProjector.java index 98293c8066..711a45dc74 100644 --- a/core/src/io/anuke/mindustry/world/blocks/defense/OverdriveProjector.java +++ b/core/src/io/anuke/mindustry/world/blocks/defense/OverdriveProjector.java @@ -43,6 +43,11 @@ public class OverdriveProjector extends Block{ canOverdrive = false; } + @Override + public boolean outputsItems(){ + return false; + } + @Override public void load(){ super.load(); diff --git a/core/src/io/anuke/mindustry/world/blocks/distribution/Junction.java b/core/src/io/anuke/mindustry/world/blocks/distribution/Junction.java index 3760197ac8..febd11f5d7 100644 --- a/core/src/io/anuke/mindustry/world/blocks/distribution/Junction.java +++ b/core/src/io/anuke/mindustry/world/blocks/distribution/Junction.java @@ -1,13 +1,18 @@ package io.anuke.mindustry.world.blocks.distribution; -import io.anuke.arc.util.*; +import io.anuke.arc.util.Time; import io.anuke.mindustry.entities.type.TileEntity; +import io.anuke.mindustry.entities.type.Unit; +import io.anuke.mindustry.gen.BufferItem; import io.anuke.mindustry.type.Item; import io.anuke.mindustry.world.Block; +import io.anuke.mindustry.world.DirectionalItemBuffer; import io.anuke.mindustry.world.Tile; import io.anuke.mindustry.world.meta.BlockGroup; -import java.io.*; +import java.io.DataInput; +import java.io.DataOutput; +import java.io.IOException; import static io.anuke.mindustry.Vars.content; @@ -23,6 +28,11 @@ public class Junction extends Block{ group = BlockGroup.transportation; } + @Override + public int acceptStack(Item item, int amount, Tile tile, Unit source){ + return 0; + } + @Override public boolean outputsItems(){ return true; @@ -31,19 +41,19 @@ public class Junction extends Block{ @Override public void update(Tile tile){ JunctionEntity entity = tile.entity(); + DirectionalItemBuffer buffer = entity.buffer; for(int i = 0; i < 4; i++){ - Buffer buffer = entity.buffers[i]; - - if(buffer.index > 0){ - if(buffer.index > buffer.items.length) buffer.index = buffer.items.length; - long l = buffer.items[0]; - float time = Float.intBitsToFloat(Pack.leftInt(l)); + if(buffer.indexes[i] > 0){ + if(buffer.indexes[i] > capacity) buffer.indexes[i] = capacity; + long l = buffer.buffers[i][0]; + float time = BufferItem.time(l); if(Time.time() >= time + speed || Time.time() < time){ - Item item = content.item(Pack.rightInt(l)); + Item item = content.item(BufferItem.item(l)); Tile dest = tile.getNearby(i); + if(dest != null) dest = dest.link(); //skip blocks that don't want the item, keep waiting until they do if(dest == null || !dest.block().acceptItem(item, dest, tile)){ @@ -51,8 +61,8 @@ public class Junction extends Block{ } dest.block().handleItem(item, dest, tile); - System.arraycopy(buffer.items, 1, buffer.items, 0, buffer.index - 1); - buffer.index--; + System.arraycopy(buffer.buffers[i], 1, buffer.buffers[i], 0, buffer.indexes[i] - 1); + buffer.indexes[i] --; } } } @@ -61,9 +71,8 @@ public class Junction extends Block{ @Override public void handleItem(Item item, Tile tile, Tile source){ JunctionEntity entity = tile.entity(); - long value = Pack.longInt(Float.floatToIntBits(Time.time()), item.id); int relative = source.relativeTo(tile.x, tile.y); - entity.buffers[relative].add(value); + entity.buffer.accept(relative, item); } @Override @@ -71,7 +80,7 @@ public class Junction extends Block{ JunctionEntity entity = tile.entity(); int relative = source.relativeTo(tile.x, tile.y); - if(entity == null || relative == -1 || entity.buffers[relative].full()) + if(entity == null || relative == -1 || !entity.buffer.accepts(relative)) return false; Tile to = tile.getNearby(relative); return to != null && to.link().entity != null; @@ -83,55 +92,18 @@ public class Junction extends Block{ } class JunctionEntity extends TileEntity{ - Buffer[] buffers = {new Buffer(), new Buffer(), new Buffer(), new Buffer()}; + DirectionalItemBuffer buffer = new DirectionalItemBuffer(capacity, speed); @Override public void write(DataOutput stream) throws IOException{ super.write(stream); - for(Buffer b : buffers){ - b.write(stream); - } + buffer.write(stream); } @Override public void read(DataInput stream, byte revision) throws IOException{ super.read(stream, revision); - for(Buffer b : buffers){ - b.read(stream); - } - } - } - - class Buffer{ - long[] items = new long[capacity]; - int index; - - void add(long id){ - if(full()) return; - items[index++] = id; - } - - boolean full(){ - return index >= items.length - 1; - } - - void write(DataOutput stream) throws IOException{ - stream.writeByte((byte)index); - stream.writeByte((byte)items.length); - for(long l : items){ - stream.writeLong(l); - } - } - - void read(DataInput stream) throws IOException{ - index = stream.readByte(); - byte length = stream.readByte(); - for(int i = 0; i < length; i++){ - long l = stream.readLong(); - if(i < items.length){ - items[i] = l; - } - } + buffer.read(stream); } } } diff --git a/core/src/io/anuke/mindustry/world/blocks/distribution/MassDriver.java b/core/src/io/anuke/mindustry/world/blocks/distribution/MassDriver.java index ee83e508ae..f04e47cb4e 100644 --- a/core/src/io/anuke/mindustry/world/blocks/distribution/MassDriver.java +++ b/core/src/io/anuke/mindustry/world/blocks/distribution/MassDriver.java @@ -78,7 +78,7 @@ public class MassDriver extends Block{ //reload regardless of state if(entity.reload > 0f){ - entity.reload = Mathf.clamp(entity.reload - entity.delta() / reloadTime); + entity.reload = Mathf.clamp(entity.reload - entity.delta() / reloadTime * entity.power.satisfaction); } //cleanup waiting shooters that are not valid @@ -114,7 +114,7 @@ public class MassDriver extends Block{ } //align to shooter rotation - entity.rotation = Mathf.slerpDelta(entity.rotation, tile.angleTo(entity.currentShooter()), rotateSpeed); + entity.rotation = Mathf.slerpDelta(entity.rotation, tile.angleTo(entity.currentShooter()), rotateSpeed * entity.power.satisfaction); }else if(entity.state == DriverState.shooting){ //if there's nothing to shoot at OR someone wants to shoot at this thing, bail if(!hasLink || !entity.waitingShooters.isEmpty()){ @@ -133,7 +133,7 @@ public class MassDriver extends Block{ other.waitingShooters.add(tile); //align to target location - entity.rotation = Mathf.slerpDelta(entity.rotation, targetRotation, rotateSpeed); + entity.rotation = Mathf.slerpDelta(entity.rotation, targetRotation, rotateSpeed * entity.power.satisfaction); //fire when it's the first in the queue and angles are ready. if(other.currentShooter() == tile && @@ -214,7 +214,8 @@ public class MassDriver extends Block{ @Override public boolean acceptItem(Item item, Tile tile, Tile source){ - return tile.entity.items.total() < itemCapacity; + //mass drivers that ouput only cannot accept items + return tile.entity.items.total() < itemCapacity && linkValid(tile); } @Override diff --git a/core/src/io/anuke/mindustry/world/blocks/distribution/OverflowGate.java b/core/src/io/anuke/mindustry/world/blocks/distribution/OverflowGate.java index de9532a56c..7b77932bd0 100644 --- a/core/src/io/anuke/mindustry/world/blocks/distribution/OverflowGate.java +++ b/core/src/io/anuke/mindustry/world/blocks/distribution/OverflowGate.java @@ -2,21 +2,43 @@ package io.anuke.mindustry.world.blocks.distribution; import io.anuke.arc.math.Mathf; import io.anuke.arc.util.Time; +import io.anuke.mindustry.entities.type.TileEntity; import io.anuke.mindustry.type.Item; -import io.anuke.mindustry.world.Edges; -import io.anuke.mindustry.world.Tile; +import io.anuke.mindustry.world.*; +import io.anuke.mindustry.world.meta.BlockGroup; -public class OverflowGate extends Router{ +import java.io.*; + +public class OverflowGate extends Block{ + protected float speed = 8f; public OverflowGate(String name){ super(name); hasItems = true; - speed = 1f; + solid = true; + update = true; + group = BlockGroup.transportation; } + @Override + public boolean outputsItems(){ + return true; + } + + @Override + public int removeStack(Tile tile, Item item, int amount){ + OverflowGateEntity entity = tile.entity(); + int result = super.removeStack(tile, item, amount); + if(result != 0 && item == entity.lastItem){ + entity.lastItem = null; + } + return result; + } + + @Override public void update(Tile tile){ - SplitterEntity entity = tile.entity(); + OverflowGateEntity entity = tile.entity(); if(entity.lastItem == null && entity.items.total() > 0){ entity.items.clear(); @@ -36,6 +58,21 @@ public class OverflowGate extends Router{ } @Override + public boolean acceptItem(Item item, Tile tile, Tile source){ + OverflowGateEntity entity = tile.entity(); + + return tile.getTeam() == source.getTeam() && entity.lastItem == null && entity.items.total() == 0; + } + + @Override + public void handleItem(Item item, Tile tile, Tile source){ + OverflowGateEntity entity = tile.entity(); + entity.items.add(item, 1); + entity.lastItem = item; + entity.time = 0f; + entity.lastInput = source; + } + Tile getTileTarget(Tile tile, Item item, Tile src, boolean flip){ int from = tile.relativeTo(src.x, src.y); if(from == -1) return null; @@ -60,14 +97,43 @@ public class OverflowGate extends Router{ }else{ if(tile.rotation() == 0){ to = a; - if(flip) tile.rotation((byte)1); + if(flip) tile.rotation((byte) 1); }else{ to = b; - if(flip) tile.rotation((byte)0); + if(flip) tile.rotation((byte) 0); } } } return to; } + + @Override + public TileEntity newEntity(){ + return new OverflowGateEntity(); + } + + public class OverflowGateEntity extends TileEntity{ + Item lastItem; + Tile lastInput; + float time; + + @Override + public byte version(){ + return 2; + } + + @Override + public void write(DataOutput stream) throws IOException{ + super.write(stream); + } + + @Override + public void read(DataInput stream, byte revision) throws IOException{ + super.read(stream, revision); + if(revision == 1){ + new DirectionalItemBuffer(25, 0f).read(stream); + } + } + } } diff --git a/core/src/io/anuke/mindustry/world/blocks/distribution/Router.java b/core/src/io/anuke/mindustry/world/blocks/distribution/Router.java index 21a7baf18c..1294e8a2b2 100644 --- a/core/src/io/anuke/mindustry/world/blocks/distribution/Router.java +++ b/core/src/io/anuke/mindustry/world/blocks/distribution/Router.java @@ -21,7 +21,7 @@ public class Router extends Block{ @Override public void update(Tile tile){ - SplitterEntity entity = tile.entity(); + RouterEntity entity = tile.entity(); if(entity.lastItem == null && entity.items.total() > 0){ entity.items.clear(); @@ -42,14 +42,14 @@ public class Router extends Block{ @Override public boolean acceptItem(Item item, Tile tile, Tile source){ - SplitterEntity entity = tile.entity(); + RouterEntity entity = tile.entity(); return tile.getTeam() == source.getTeam() && entity.lastItem == null && entity.items.total() == 0; } @Override public void handleItem(Item item, Tile tile, Tile source){ - SplitterEntity entity = tile.entity(); + RouterEntity entity = tile.entity(); entity.items.add(item, 1); entity.lastItem = item; entity.time = 0f; @@ -72,7 +72,7 @@ public class Router extends Block{ @Override public int removeStack(Tile tile, Item item, int amount){ - SplitterEntity entity = tile.entity(); + RouterEntity entity = tile.entity(); int result = super.removeStack(tile, item, amount); if(result != 0 && item == entity.lastItem){ entity.lastItem = null; @@ -82,10 +82,10 @@ public class Router extends Block{ @Override public TileEntity newEntity(){ - return new SplitterEntity(); + return new RouterEntity(); } - public class SplitterEntity extends TileEntity{ + public class RouterEntity extends TileEntity{ Item lastItem; Tile lastInput; float time; diff --git a/core/src/io/anuke/mindustry/world/blocks/distribution/Sorter.java b/core/src/io/anuke/mindustry/world/blocks/distribution/Sorter.java index ff5888dfbf..ef1047157a 100644 --- a/core/src/io/anuke/mindustry/world/blocks/distribution/Sorter.java +++ b/core/src/io/anuke/mindustry/world/blocks/distribution/Sorter.java @@ -1,17 +1,14 @@ package io.anuke.mindustry.world.blocks.distribution; -import io.anuke.annotations.Annotations.Loc; -import io.anuke.annotations.Annotations.Remote; +import io.anuke.annotations.Annotations.*; import io.anuke.arc.Core; import io.anuke.arc.graphics.g2d.Draw; import io.anuke.arc.math.Mathf; import io.anuke.arc.scene.ui.layout.Table; -import io.anuke.mindustry.entities.type.Player; -import io.anuke.mindustry.entities.type.TileEntity; +import io.anuke.mindustry.entities.type.*; import io.anuke.mindustry.gen.Call; import io.anuke.mindustry.type.Item; -import io.anuke.mindustry.world.Block; -import io.anuke.mindustry.world.Tile; +import io.anuke.mindustry.world.*; import io.anuke.mindustry.world.blocks.ItemSelection; import io.anuke.mindustry.world.meta.BlockGroup; @@ -75,6 +72,10 @@ public class Sorter extends Block{ to.block().handleItem(item, to, tile); } + boolean isSame(Tile tile, Tile other){ + return other != null && other.block() == this && other.entity().sortItem == tile.entity().sortItem; + } + Tile getTileTarget(Item item, Tile dest, Tile source, boolean flip){ SorterEntity entity = dest.entity(); @@ -83,14 +84,18 @@ public class Sorter extends Block{ Tile to; if(item == entity.sortItem){ + //prevent 3-chains + if(isSame(dest, source) && isSame(dest, dest.getNearby(dir))){ + return null; + } to = dest.getNearby(dir); }else{ Tile a = dest.getNearby(Mathf.mod(dir - 1, 4)); Tile b = dest.getNearby(Mathf.mod(dir + 1, 4)); boolean ac = a != null && !(a.block().instantTransfer && source.block().instantTransfer) && - a.block().acceptItem(item, a, dest); + a.block().acceptItem(item, a, dest); boolean bc = b != null && !(b.block().instantTransfer && source.block().instantTransfer) && - b.block().acceptItem(item, b, dest); + b.block().acceptItem(item, b, dest); if(ac && !bc){ to = a; @@ -128,19 +133,27 @@ public class Sorter extends Block{ return new SorterEntity(); } - public static class SorterEntity extends TileEntity{ - public Item sortItem; + + public class SorterEntity extends TileEntity{ + Item sortItem; + + @Override + public byte version(){ + return 2; + } @Override public void write(DataOutput stream) throws IOException{ super.write(stream); - stream.writeShort(sortItem == null ? -1 : sortItem.id); } @Override public void read(DataInput stream, byte revision) throws IOException{ super.read(stream, revision); sortItem = content.item(stream.readShort()); + if(revision == 1){ + new ItemBuffer(20, 45f).read(stream); + } } } } diff --git a/core/src/io/anuke/mindustry/world/blocks/sandbox/ItemSource.java b/core/src/io/anuke/mindustry/world/blocks/sandbox/ItemSource.java index c9b4e55d12..3a6cc3cabe 100644 --- a/core/src/io/anuke/mindustry/world/blocks/sandbox/ItemSource.java +++ b/core/src/io/anuke/mindustry/world/blocks/sandbox/ItemSource.java @@ -1,16 +1,46 @@ package io.anuke.mindustry.world.blocks.sandbox; +import io.anuke.annotations.Annotations.Loc; +import io.anuke.annotations.Annotations.Remote; +import io.anuke.arc.Core; +import io.anuke.arc.graphics.g2d.Draw; +import io.anuke.arc.scene.ui.layout.Table; +import io.anuke.mindustry.entities.type.Player; +import io.anuke.mindustry.entities.type.TileEntity; +import io.anuke.mindustry.gen.Call; import io.anuke.mindustry.type.Item; +import io.anuke.mindustry.world.Block; import io.anuke.mindustry.world.Tile; -import io.anuke.mindustry.world.blocks.distribution.Sorter; +import io.anuke.mindustry.world.blocks.ItemSelection; +import io.anuke.mindustry.world.meta.BlockGroup; -public class ItemSource extends Sorter{ +import java.io.*; + +import static io.anuke.mindustry.Vars.content; + +public class ItemSource extends Block{ + private static Item lastItem; public ItemSource(String name){ super(name); hasItems = true; update = true; solid = true; + group = BlockGroup.transportation; + configurable = true; + } + + @Remote(targets = Loc.both, called = Loc.both, forward = true) + public static void setItemSourceItem(Player player, Tile tile, Item item){ + ItemSourceEntity entity = tile.entity(); + if(entity != null){ + entity.outputItem = item; + } + } + + @Override + public void playerPlaced(Tile tile){ + Core.app.post(() -> Call.setItemSourceItem(null, tile, lastItem)); } @Override @@ -25,17 +55,59 @@ public class ItemSource extends Sorter{ } @Override - public void update(Tile tile){ - SorterEntity entity = tile.entity(); - if(entity.sortItem == null) return; + public void draw(Tile tile){ + super.draw(tile); - entity.items.set(entity.sortItem, 1); - tryDump(tile, entity.sortItem); - entity.items.set(entity.sortItem, 0); + ItemSourceEntity entity = tile.entity(); + if(entity.outputItem == null) return; + + Draw.color(entity.outputItem.color); + Draw.rect("center", tile.worldx(), tile.worldy()); + Draw.color(); + } + + @Override + public void update(Tile tile){ + ItemSourceEntity entity = tile.entity(); + if(entity.outputItem == null) return; + + entity.items.set(entity.outputItem, 1); + tryDump(tile, entity.outputItem); + entity.items.set(entity.outputItem, 0); + } + + @Override + public void buildTable(Tile tile, Table table){ + ItemSourceEntity entity = tile.entity(); + ItemSelection.buildItemTable(table, () -> entity.outputItem, item -> { + lastItem = item; + Call.setItemSourceItem(null, tile, item); + }); } @Override public boolean acceptItem(Item item, Tile tile, Tile source){ return false; } + + @Override + public TileEntity newEntity(){ + return new ItemSourceEntity(); + } + + public class ItemSourceEntity extends TileEntity{ + Item outputItem; + + @Override + public void write(DataOutput stream) throws IOException{ + super.write(stream); + stream.writeShort(outputItem == null ? -1 : outputItem.id); + } + + @Override + public void read(DataInput stream, byte revision) throws IOException{ + super.read(stream, revision); + outputItem = content.item(stream.readShort()); + } + } } diff --git a/core/src/io/anuke/mindustry/world/blocks/sandbox/LiquidSource.java b/core/src/io/anuke/mindustry/world/blocks/sandbox/LiquidSource.java index 52f506d35a..c84e772533 100644 --- a/core/src/io/anuke/mindustry/world/blocks/sandbox/LiquidSource.java +++ b/core/src/io/anuke/mindustry/world/blocks/sandbox/LiquidSource.java @@ -66,7 +66,7 @@ public class LiquidSource extends Block{ if(entity.source != null){ Draw.color(entity.source.color); - Draw.rect("blank", tile.worldx(), tile.worldy(), 4f, 4f); + Draw.rect("center", tile.worldx(), tile.worldy()); Draw.color(); } } diff --git a/core/src/io/anuke/mindustry/world/blocks/units/MechPad.java b/core/src/io/anuke/mindustry/world/blocks/units/MechPad.java index b298f11773..8f521349b6 100644 --- a/core/src/io/anuke/mindustry/world/blocks/units/MechPad.java +++ b/core/src/io/anuke/mindustry/world/blocks/units/MechPad.java @@ -81,8 +81,8 @@ public class MechPad extends Block{ protected static boolean checkValidTap(Tile tile, Player player){ MechFactoryEntity entity = tile.entity(); - return Math.abs(player.x - tile.drawx()) <= tile.block().size * tilesize / 2f && - Math.abs(player.y - tile.drawy()) <= tile.block().size * tilesize / 2f && entity.cons.valid() && entity.player == null; + return Math.abs(player.x - tile.drawx()) <= tile.block().size * tilesize && + Math.abs(player.y - tile.drawy()) <= tile.block().size * tilesize && entity.cons.valid() && entity.player == null; } @Override diff --git a/desktop/src/io/anuke/mindustry/desktop/DesktopPlatform.java b/desktop/src/io/anuke/mindustry/desktop/DesktopPlatform.java index 22b334b1eb..fa935f50a9 100644 --- a/desktop/src/io/anuke/mindustry/desktop/DesktopPlatform.java +++ b/desktop/src/io/anuke/mindustry/desktop/DesktopPlatform.java @@ -1,14 +1,11 @@ package io.anuke.mindustry.desktop; -import club.minnced.discord.rpc.DiscordEventHandlers; -import club.minnced.discord.rpc.DiscordRPC; -import club.minnced.discord.rpc.DiscordRichPresence; +import club.minnced.discord.rpc.*; import io.anuke.arc.collection.Array; import io.anuke.arc.files.FileHandle; import io.anuke.arc.function.Consumer; -import io.anuke.arc.util.Log; -import io.anuke.arc.util.OS; -import io.anuke.arc.util.Strings; +import io.anuke.arc.function.Predicate; +import io.anuke.arc.util.*; import io.anuke.arc.util.serialization.Base64Coder; import io.anuke.mindustry.core.GameState.State; import io.anuke.mindustry.core.Platform; @@ -69,8 +66,8 @@ public class DesktopPlatform extends Platform{ } @Override - public void showFileChooser(String text, String content, Consumer cons, boolean open, String filter){ - new FileChooser(text, file -> file.extension().equalsIgnoreCase(filter), open, cons).show(); + public void showFileChooser(String text, String content, Consumer cons, boolean open, Predicate filetype){ + new FileChooser(text, file -> filetype.test(file.extension().toLowerCase()), open, cons).show(); } @Override diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 5f1b1201a7..f4d7b2bf61 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/ios/src/io/anuke/mindustry/IOSLauncher.java b/ios/src/io/anuke/mindustry/IOSLauncher.java index 7f9e9f43e2..1c01b4307d 100644 --- a/ios/src/io/anuke/mindustry/IOSLauncher.java +++ b/ios/src/io/anuke/mindustry/IOSLauncher.java @@ -103,7 +103,7 @@ public class IOSLauncher extends IOSApplication.Delegate{ SaveSlot slot = control.saves.importSave(file); ui.load.runLoadSave(slot); }catch(IOException e){ - ui.showError(Core.bundle.format("save.import.fail", Strings.parseException(e, false))); + ui.showError(Core.bundle.format("save.import.fail", Strings.parseException(e, true))); } }else{ ui.showError("save.import.invalid"); diff --git a/server/src/io/anuke/mindustry/server/ServerControl.java b/server/src/io/anuke/mindustry/server/ServerControl.java index 03214a847d..e674546239 100644 --- a/server/src/io/anuke/mindustry/server/ServerControl.java +++ b/server/src/io/anuke/mindustry/server/ServerControl.java @@ -157,7 +157,7 @@ public class ServerControl implements ApplicationListener{ ? "[YELLOW]The " + event.winner.name() + " team is victorious![]" : "[SCARLET]Game over![]") + "\nNext selected map:[accent] " + map.name() + "[]" + (map.tags.containsKey("author") && !map.tags.get("author").trim().isEmpty() ? " by[accent] " + map.author() + "[]" : "") + "." + - "\nNew game begins in " + roundExtraTime + " seconds."); + "\nNew game begins in " + roundExtraTime + "[] seconds."); info("Selected next map to be {0}.", map.name()); @@ -235,9 +235,9 @@ public class ServerControl implements ApplicationListener{ info("Loading map..."); logic.reset(); - state.rules = preset.apply(result.rules()); try{ world.loadMap(result); + state.rules = preset.apply(result.rules()); logic.play(); info("Map loaded."); diff --git a/tools/build.gradle b/tools/build.gradle index 23dfbcf530..a855252e25 100644 --- a/tools/build.gradle +++ b/tools/build.gradle @@ -3,7 +3,9 @@ apply plugin: "java" sourceCompatibility = 1.8 sourceSets.main.java.srcDirs = ["src/"] + import com.badlogic.gdx.graphics.Color +import com.badlogic.gdx.utils.IntArray import com.badlogic.gdx.tools.texturepacker.TexturePacker import javax.imageio.ImageIO @@ -86,18 +88,48 @@ def antialias = { File file -> ImageIO.write(out, "png", file) } +def medianBlur = { File file -> + def image = ImageIO.read(file) + def result = new BufferedImage(image.width, image.height, BufferedImage.TYPE_INT_ARGB) + def radius = 4 + IntArray array = new IntArray() + + def getRGB = { int ix, int iy -> + return image.getRGB(Math.max(Math.min(ix, image.width - 1), 0), Math.max(Math.min(iy, image.height - 1), 0)) + } + + for(int x = 0; x < image.width; x++){ + for(int y = 0; y < image.height; y++){ + array.clear() + + for(int dx = -radius; dx <= radius; dx ++){ + for(int dy = -radius; dy <= radius; dy ++){ + if(dx*dx + dy*dy <= radius*radius){ + array.add(getRGB(x + dx, y + dy)) + } + } + } + + array.sort() + + result.setRGB(x, y, array.get((int)(array.size / 2))) + } + } + + ImageIO.write(result, "png", file) +} + def scaleImage = { File file -> def image = ImageIO.read(file) for(int iteration in 0..1){ - def scaled = new BufferedImage(image.getWidth() * 2, image.getHeight() * 2, BufferedImage.TYPE_INT_ARGB) + def scaled = new BufferedImage(image.width * 2, image.height * 2, BufferedImage.TYPE_INT_ARGB) def getRGB = { int ix, int iy -> - //if(ix <= 0 || iy <= 0 || ix >= image.width || iy >= image.height) return 0 return image.getRGB(Math.max(Math.min(ix, image.width - 1), 0), Math.max(Math.min(iy, image.height - 1), 0)) } - for(int x = 0; x < image.getWidth(); x++){ - for(int y = 0; y < image.getHeight(); y++){ + for(int x = 0; x < image.width; x++){ + for(int y = 0; y < image.height; y++){ int p = image.getRGB(x, y) int p1 = p, p2 = p, p3 = p, p4 = p @@ -181,12 +213,10 @@ task scaleSprites(){ doLast{ copy{ - from "../core/assets-raw/sprites_replacement/" + from "../core/assets-raw/sprites/" into "../core/assets-raw/sprites_out/" } } - - dependsOn 'scaleSprites4x' } task scaleImages(){ diff --git a/tools/src/io/anuke/mindustry/Generators.java b/tools/src/io/anuke/mindustry/Generators.java index 6b476619c3..443f81a883 100644 --- a/tools/src/io/anuke/mindustry/Generators.java +++ b/tools/src/io/anuke/mindustry/Generators.java @@ -10,8 +10,7 @@ import io.anuke.mindustry.ImagePacker.GenRegion; import io.anuke.mindustry.type.*; import io.anuke.mindustry.world.Block; import io.anuke.mindustry.world.Block.Icon; -import io.anuke.mindustry.world.blocks.Floor; -import io.anuke.mindustry.world.blocks.OreBlock; +import io.anuke.mindustry.world.blocks.*; import java.io.IOException; import java.nio.file.Files; @@ -71,7 +70,7 @@ public class Generators{ ImagePacker.generate("block-icons", () -> { Image colors = new Image(content.blocks().size, 1); - Color outlineColor = new Color(0, 0, 0, 0.3f); + Color outlineColor = Color.valueOf("4d4e58"); for(Block block : content.blocks()){ TextureRegion[] regions = block.getGeneratedIcons(); @@ -96,7 +95,7 @@ public class Generators{ try{ Image last = null; if(block.outlineIcon){ - int radius = 3; + int radius = 4; GenRegion region = (GenRegion)regions[regions.length - 1]; Image base = ImagePacker.get(region); Image out = last = new Image(region.getWidth(), region.getHeight()); @@ -283,7 +282,7 @@ public class Generators{ }); ImagePacker.generate("edges", () -> { - content.blocks().each(b -> b instanceof Floor, floor -> { + content.blocks().each(b -> b instanceof Floor && !(b instanceof OverlayFloor), floor -> { if(ImagePacker.has(floor.name + "-edge") || floor.blendGroup != floor){ return;