diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index dea711fef0..11546580da 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -19,7 +19,7 @@ assignees: '' **Link(s) to mod(s) used**: *The mod repositories or zip files that are related to the issue, if applicable.* -**Save file**: *The save file you were playing on when the bug happened. REQUIRED for any issue that happens in-game.* +**Save file**: *The (zipped) save file you were playing on when the bug happened. THIS IS REQUIRED FOR ANY ISSUE HAPPENING IN-GAME, REGARDLESS OF WHETHER YOU THINK IT HAPPENS EVERYWHERE. DO NOT DELETE OR OMIT THIS LINE UNLESS YOU ARE SURE THAT THE ISSUE DOES NOT HAPPEN IN-GAME.* **Crash report**: *The contents of relevant crash report files. REQUIRED if you are reporting a crash.* diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 4b79df9a48..490c317f03 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -3,18 +3,6 @@ name: Java CI on: [push] jobs: - buildJava8: - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v1 - - name: Set up JDK 8 - uses: actions/setup-java@v1 - with: - java-version: 8 - - name: Run unit tests with gradle and Java 8 - run: ./gradlew compileJava - buildJava14: runs-on: ubuntu-latest @@ -26,3 +14,14 @@ jobs: java-version: 14 - name: Run unit tests with gradle and Java 14 run: ./gradlew compileJava + buildJava15: + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v1 + - name: Set up JDK 15 + uses: actions/setup-java@v1 + with: + java-version: 15 + - name: Run unit tests with gradle and Java 15 + run: ./gradlew compileJava diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 58eed0c4fd..143a73d6b8 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -4,33 +4,38 @@ This is for code contributions. For translations, see [TRANSLATING](TRANSLATING. ## Basic Guidelines -#### Use an IDE. +### Use an IDE. Specifically, IntelliJ IDEA. Download the (free) Community Edition of it [here](https://www.jetbrains.com/idea/download/). Some people use other tools, like VS Code, but I would personally not recommend them for Java development. -#### Always test your changes. +### Always test your changes. Do not submit something without at least running the game to see if it compiles. If you are submitting a new block, make sure it has a name and description, and that it works correctly in-game. If you are changing existing block mechanics, test them out first. - -#### Do not make large changes before discussing them first. +### Do not make large changes before discussing them first. If you are interested in adding a large mechanic/feature or changing large amounts of code, first contact me (Anuken) via [Discord](https://discord.gg/mindustry) (preferred method) or via e-mail (*anukendev@gmail.com*). For most changes, this should not be necessary. I just want to know if you're doing something big so I can offer advice and/or make sure you're not wasting your time on it. +### Do not include packed sprites in your pull request. +When making a pull request that changes or adds new sprites, do not add the modified atlas & `spritesX.png` files to your final pull request. These are a frequent source of conflicts. + ## Style Guidelines -#### Follow the formatting guidelines. +### Follow the formatting guidelines. This means: - No spaces around parentheses: `if(condition){`, `SomeType s = (SomeType)object` - Same-line braces. - 4 spaces indentation -- `camelCase`, **even for constants or enums**. Why? Because `SCREAMING_CASE` is ugly, annoying to type and does not achieve anything useful. Constants are *less* dangerous than variables, not more. +- `camelCase`, **even for constants or enums**. Why? Because `SCREAMING_CASE` is ugly, annoying to type and does not achieve anything useful. Constants are *less* dangerous than variables, not more. Any reasonable IDE should highlight them for you anyway. - No underscores for anything. (Yes, I know `Bindings` violates this principle, but that's for legacy reasons and really should be cleaned up some day) - Do not use braceless `if/else` statements. `if(x) statement else statement2` should **never** be done. In very specific situations, having braceless if-statements on one line is allowed: `if(cond) return;` would be valid. +- Prefer single-line javadoc `/** @return for example */` instead of multiline javadoc whenver possible +- Short method/variable names (multipleLongWords should be avoided if it's possible to so reasonably, especially for variables) +- Use wildcard imports - `import some.package.*` - for everything. This makes incorrect class usage more obvious (*e.g. arc.util.Timer vs java.util.Timer*) and leads to cleaner-looking code. Import [this style file](.github/Mindustry-CodeStyle-IJ.xml) into IntelliJ to get correct formatting when developing Mindustry. -#### Do not use incompatible Java features (java.util.function, java.awt). +### Do not use incompatible Java features (java.util.function, java.awt). Android and RoboVM (iOS) do not support many of Java 8's features, such as the packages `java.util.function`, `java.util.stream` or `forEach` in collections. Do not use these in your code. If you need to use functional interfaces, use the ones in `arc.func`, which are more or less the same with different naming schemes. @@ -39,7 +44,7 @@ The same applies to any class *outside* of the standard `java.[n]io` / `java.net In general, if you are using IntelliJ, you should be warned about platform incompatiblities. -#### Use `arc` collections and classes when possible. +### Use `arc` collections and classes when possible. Instead of using `java.util.List`, `java.util.HashMap`, and other standard Java collections, use `Seq`, `ObjectMap` and other equivalents from `arc.struct`. Why? Because that's what the rest of the codebase uses, and the standard collections have a lot of cruft and usability issues associated with them. In the rare case that concurrency is required, you may use the standard Java classes for that purpose (e.g. `CopyOnWriteArrayList`). @@ -52,21 +57,21 @@ What you'll usually need to change: - *Many others* -#### Avoid boxed types (Integer, Boolean) +### Avoid boxed types (Integer, Boolean) Never create variables or collections with boxed types `Seq` or `ObjectMap`. Use the collections specialized for this task, e.g. `IntSeq` and `IntMap`. -#### Do not allocate anything if possible. +### Do not allocate anything if possible. Never allocate `new` objects in the main loop. If you absolutely require new objects, use `Pools` to obtain and free object instances. Otherwise, use the `Tmp` variables for things like vector/shape operations, or create `static` variables for re-use. If using a list, make it a static variable and clear it every time it is used. Re-use as much as possible. -#### Avoid bloated code and unnecessary getters/setters. +### Avoid bloated code and unnecessary getters/setters. This is situational, but in essence what it means is to avoid using any sort of getters and setters unless absolutely necessary. Public or protected fields should suffice for most things. If something needs to be encapsulated in the future, IntelliJ can handle it with a few clicks. -#### Do not create methods unless necessary. +### Do not create methods unless necessary. Unless a block of code is very large or used in more than 1-2 places, don't split it up into a separate method. Making unnecessary methods only creates confusion, and may slightly decrease performance. ## Other Notes diff --git a/annotations/src/main/java/mindustry/annotations/entity/EntityProcess.java b/annotations/src/main/java/mindustry/annotations/entity/EntityProcess.java index 88b3b30438..94c988272d 100644 --- a/annotations/src/main/java/mindustry/annotations/entity/EntityProcess.java +++ b/annotations/src/main/java/mindustry/annotations/entity/EntityProcess.java @@ -3,7 +3,6 @@ package mindustry.annotations.entity; import arc.files.*; import arc.func.*; import arc.struct.*; -import arc.util.ArcAnnotate.*; import arc.util.*; import arc.util.io.*; import arc.util.pooling.Pool.*; @@ -77,9 +76,10 @@ public class EntityProcess extends BaseProcessor{ if(elem.is(Modifier.ABSTRACT) || elem.is(Modifier.NATIVE)) continue; //get all statements in the method, store them methodBlocks.put(elem.descString(), elem.tree().getBody().toString() - //replace all self() invocations with this - .replaceAll("this\\.<(.*)>self\\(\\)", "this") - .replaceAll("self\\(\\)", "this") + .replaceAll("this\\.<(.*)>self\\(\\)", "this") //fix parameterized self() calls + .replaceAll("self\\(\\)", "this") //fix self() calls + .replaceAll(" yield ", "") //fix enchanced switch + .replaceAll("\\/\\*missing\\*\\/", "var") //fix vars ); } } diff --git a/annotations/src/main/java/mindustry/annotations/util/Selement.java b/annotations/src/main/java/mindustry/annotations/util/Selement.java index 1a4c6b784a..ca7a9ce5ad 100644 --- a/annotations/src/main/java/mindustry/annotations/util/Selement.java +++ b/annotations/src/main/java/mindustry/annotations/util/Selement.java @@ -1,7 +1,7 @@ package mindustry.annotations.util; import arc.struct.*; -import arc.util.ArcAnnotate.*; +import arc.util.*; import com.squareup.javapoet.*; import com.sun.tools.javac.code.Attribute.*; import mindustry.annotations.*; @@ -19,7 +19,8 @@ public class Selement{ this.e = e; } - public @Nullable String doc(){ + @Nullable + public String doc(){ return BaseProcessor.elementu.getDocComment(e); } diff --git a/annotations/src/main/resources/revisions/AmmoDistributeBuilderCommanderPayloadUnit/0.json b/annotations/src/main/resources/revisions/AmmoDistributeBuilderCommanderPayloadUnit/0.json new file mode 100644 index 0000000000..826bd02faf --- /dev/null +++ b/annotations/src/main/resources/revisions/AmmoDistributeBuilderCommanderPayloadUnit/0.json @@ -0,0 +1 @@ +{fields:[{name:ammo,type:float},{name:armor,type:float},{name:controller,type:mindustry.entities.units.UnitController},{name:elevation,type:float},{name:health,type:float},{name:isShooting,type:boolean},{name:mounts,type:"mindustry.entities.units.WeaponMount[]"},{name:payloads,type:arc.struct.Seq},{name:plans,type:arc.struct.Queue},{name:rotation,type:float},{name:shield,type:float},{name:spawnedByCore,type:boolean},{name:stack,type:mindustry.type.ItemStack},{name:statuses,type:arc.struct.Seq},{name:team,type:mindustry.game.Team},{name:type,type:mindustry.type.UnitType},{name:x,type:float},{name:y,type:float}]} \ No newline at end of file diff --git a/build.gradle b/build.gradle index 267503915a..e2a00358b6 100644 --- a/build.gradle +++ b/build.gradle @@ -173,23 +173,38 @@ allprojects{ } tasks.withType(JavaCompile){ - sourceCompatibility = 1.8 - targetCompatibility = 1.8 + targetCompatibility = 8 + sourceCompatibility = 14 options.encoding = "UTF-8" options.compilerArgs += ["-Xlint:deprecation"] } } -//compile with java 8 compatibility for everything except the annotati project +configure(project(":annotations")){ + tasks.withType(JavaCompile){ + targetCompatibility = 8 + sourceCompatibility = 8 + } +} + +//compile with java 8 compatibility for everything except the annotation project configure(subprojects - project(":annotations")){ tasks.withType(JavaCompile){ if(JavaVersion.current() != JavaVersion.VERSION_1_8){ - options.compilerArgs.addAll(['--release', '8']) + options.compilerArgs.addAll(['--release', '8', '--enable-preview']) + } + + doFirst{ + options.compilerArgs = options.compilerArgs.findAll{it != '--enable-preview' } } } tasks.withType(Javadoc){ - options.addStringOption('Xdoclint:none', '-quiet') + options{ + addStringOption('Xdoclint:none', '-quiet') + addBooleanOption('-enable-preview', true) + addStringOption('-release', '14') + } } } @@ -288,6 +303,8 @@ project(":core"){ compileOnly project(":annotations") annotationProcessor project(":annotations") + annotationProcessor 'com.github.Anuken:jabel:40eec868af' + } } diff --git a/core/assets-raw/sprites/blocks/campaign/core-silo.png b/core/assets-raw/sprites/blocks/campaign/core-silo.png deleted file mode 100644 index dbb0b6d70c..0000000000 Binary files a/core/assets-raw/sprites/blocks/campaign/core-silo.png and /dev/null differ diff --git a/core/assets-raw/sprites/blocks/defense/parallax.png b/core/assets-raw/sprites/blocks/defense/parallax.png index d9224ab066..2b6109e0b1 100644 Binary files a/core/assets-raw/sprites/blocks/defense/parallax.png and b/core/assets-raw/sprites/blocks/defense/parallax.png differ diff --git a/core/assets-raw/sprites/blocks/defense/segment.png b/core/assets-raw/sprites/blocks/defense/segment.png index 57bd53d61d..57da490c5f 100644 Binary files a/core/assets-raw/sprites/blocks/defense/segment.png and b/core/assets-raw/sprites/blocks/defense/segment.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 fb10892472..5af4b45d78 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/production/cryofluidmixer-bottom.png b/core/assets-raw/sprites/blocks/production/cryofluid-mixer-bottom.png similarity index 100% rename from core/assets-raw/sprites/blocks/production/cryofluidmixer-bottom.png rename to core/assets-raw/sprites/blocks/production/cryofluid-mixer-bottom.png diff --git a/core/assets-raw/sprites/blocks/production/cryofluidmixer-liquid.png b/core/assets-raw/sprites/blocks/production/cryofluid-mixer-liquid.png similarity index 100% rename from core/assets-raw/sprites/blocks/production/cryofluidmixer-liquid.png rename to core/assets-raw/sprites/blocks/production/cryofluid-mixer-liquid.png diff --git a/core/assets-raw/sprites/blocks/production/cryofluidmixer-top.png b/core/assets-raw/sprites/blocks/production/cryofluid-mixer-top.png similarity index 100% rename from core/assets-raw/sprites/blocks/production/cryofluidmixer-top.png rename to core/assets-raw/sprites/blocks/production/cryofluid-mixer-top.png diff --git a/core/assets-raw/sprites/blocks/turrets/arc.png b/core/assets-raw/sprites/blocks/turrets/arc.png index f214c4aa0f..106963aa68 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/duo.png b/core/assets-raw/sprites/blocks/turrets/duo.png index c234ccb38c..147d78f16f 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/foreshadow-heat.png b/core/assets-raw/sprites/blocks/turrets/foreshadow-heat.png new file mode 100644 index 0000000000..e0902e17d4 Binary files /dev/null and b/core/assets-raw/sprites/blocks/turrets/foreshadow-heat.png differ diff --git a/core/assets-raw/sprites/blocks/turrets/foreshadow.png b/core/assets-raw/sprites/blocks/turrets/foreshadow.png new file mode 100644 index 0000000000..5a27960a73 Binary files /dev/null and b/core/assets-raw/sprites/blocks/turrets/foreshadow.png differ diff --git a/core/assets-raw/sprites/blocks/turrets/hail.png b/core/assets-raw/sprites/blocks/turrets/hail.png index 4333d6ef7e..10001df6ed 100644 Binary files a/core/assets-raw/sprites/blocks/turrets/hail.png and b/core/assets-raw/sprites/blocks/turrets/hail.png differ diff --git a/core/assets-raw/sprites/blocks/turrets/lancer.png b/core/assets-raw/sprites/blocks/turrets/lancer.png index e119639eb5..08f1ea9e30 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/salvo-panel-left.png b/core/assets-raw/sprites/blocks/turrets/salvo-panel-left.png deleted file mode 100644 index de0af2f724..0000000000 Binary files a/core/assets-raw/sprites/blocks/turrets/salvo-panel-left.png and /dev/null 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 deleted file mode 100644 index 462f082f2a..0000000000 Binary files a/core/assets-raw/sprites/blocks/turrets/salvo-panel-right.png and /dev/null differ diff --git a/core/assets-raw/sprites/blocks/turrets/salvo.png b/core/assets-raw/sprites/blocks/turrets/salvo.png index 63db15cded..4904a913a5 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 82d01d22c2..f4f0d73954 100644 Binary files a/core/assets-raw/sprites/blocks/turrets/scatter.png and b/core/assets-raw/sprites/blocks/turrets/scatter.png differ diff --git a/core/assets-raw/sprites/blocks/turrets/scorch.png b/core/assets-raw/sprites/blocks/turrets/scorch.png index 54616726e5..abbd3b5188 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/tsunami-liquid.png b/core/assets-raw/sprites/blocks/turrets/tsunami-liquid.png new file mode 100644 index 0000000000..8c88e9a0be Binary files /dev/null and b/core/assets-raw/sprites/blocks/turrets/tsunami-liquid.png differ diff --git a/core/assets-raw/sprites/blocks/turrets/tsunami-top.png b/core/assets-raw/sprites/blocks/turrets/tsunami-top.png new file mode 100644 index 0000000000..fc3b172fd2 Binary files /dev/null and b/core/assets-raw/sprites/blocks/turrets/tsunami-top.png differ diff --git a/core/assets-raw/sprites/blocks/turrets/tsunami.png b/core/assets-raw/sprites/blocks/turrets/tsunami.png new file mode 100644 index 0000000000..b11d2c2307 Binary files /dev/null and b/core/assets-raw/sprites/blocks/turrets/tsunami.png differ diff --git a/core/assets-raw/sprites/blocks/turrets/wave.png b/core/assets-raw/sprites/blocks/turrets/wave.png index e557fa43b2..58d5d46e55 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/ui/logo.png b/core/assets-raw/sprites/ui/logo.png index 0a1778c104..e064a8a450 100644 Binary files a/core/assets-raw/sprites/ui/logo.png and b/core/assets-raw/sprites/ui/logo.png differ diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index d308127f39..647901a572 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -851,6 +851,7 @@ rules.title.unit = Units rules.title.experimental = Experimental rules.title.environment = Environment rules.lighting = Lighting +rules.enemyLights = Enemy Lights rules.fire = Fire rules.explosions = Block/Unit Explosion Damage rules.ambientlight = Ambient Light @@ -1047,7 +1048,7 @@ block.underflow-gate.name = Underflow Gate block.silicon-smelter.name = Silicon Smelter block.phase-weaver.name = Phase Weaver block.pulverizer.name = Pulverizer -block.cryofluidmixer.name = Cryofluid Mixer +block.cryofluid-mixer.name = Cryofluid Mixer block.melter.name = Melter block.incinerator.name = Incinerator block.spore-press.name = Spore Press @@ -1079,6 +1080,7 @@ block.power-source.name = Power Infinite block.unloader.name = Unloader block.vault.name = Vault block.wave.name = Wave +block.tsunami.name = Tsunami block.swarmer.name = Swarmer block.salvo.name = Salvo block.ripple.name = Ripple @@ -1118,6 +1120,7 @@ block.arc.name = Arc block.rtg-generator.name = RTG Generator block.spectre.name = Spectre block.meltdown.name = Meltdown +block.foreshadow.name = Foreshadow block.container.name = Container block.launch-pad.name = Launch Pad block.launch-pad-large.name = Large Launch Pad @@ -1204,7 +1207,7 @@ block.kiln.description = Smelts sand and lead into the compound known as metagla block.plastanium-compressor.description = Produces plastanium from oil and titanium. block.phase-weaver.description = Synthesizes phase fabric from radioactive thorium and sand. Requires massive amounts of power to function. block.alloy-smelter.description = Combines titanium, lead, silicon and copper to produce surge alloy. -block.cryofluidmixer.description = Mixes water and fine titanium powder into cryofluid. Essential for thorium reactor usage. +block.cryofluid-mixer.description = Mixes water and fine titanium powder into cryofluid. Essential for thorium reactor usage. block.blast-mixer.description = Crushes and mixes clusters of spores with pyratite to produce blast compound. block.pyratite-mixer.description = Mixes coal, lead and sand into highly flammable pyratite. block.melter.description = Melts down scrap into slag for further processing or usage in wave turrets. diff --git a/core/assets/bundles/bundle_be.properties b/core/assets/bundles/bundle_be.properties index daeeb0e525..f62aba4377 100644 --- a/core/assets/bundles/bundle_be.properties +++ b/core/assets/bundles/bundle_be.properties @@ -1043,7 +1043,7 @@ block.underflow-gate.name = Залішнi шлюз block.silicon-smelter.name = Крэмнявы плавільны завод block.phase-weaver.name = Фазавы ткач block.pulverizer.name = Здрабняльнік -block.cryofluidmixer.name = Мешалка крыягеннай вадкасці +block.cryofluid-mixer.name = Мешалка крыягеннай вадкасці block.melter.name = Плавільня block.incinerator.name = Мусарасжыгатель block.spore-press.name = Споравы прэс @@ -1199,7 +1199,7 @@ block.kiln.description = выплавляемым пясок і свінец ў block.plastanium-compressor.description = Вырабляе пластан з нафты ды тытана. block.phase-weaver.description = Сінтэзуе фазавую тканіна з радыеактыўнага торыя і пяску. Патрабуецца вялікая колькасць энергіі для працы. block.alloy-smelter.description = Аб'ядноўвае тытан, свінец, крэмній і медзь для вытворчасці кінэтычнага сплаву. -block.cryofluidmixer.description = змешваюцца ваду і дробны тытанавы парашок у криогеннную вадкасць. Неад'емная частка пры выкарыстання ториевого рэактара +block.cryofluid-mixer.description = змешваюцца ваду і дробны тытанавы парашок у криогеннную вадкасць. Неад'емная частка пры выкарыстання ториевого рэактара block.blast-mixer.description = расціскаюць і змешвае навалы спрэчка з пиротитом для атрымання выбуховага рэчыва. block.pyratite-mixer.description = Змешвае вугаль, свінец і пясок у гаручы піратыт block.melter.description = Плавіць металалом ў шлак для далейшай апрацоўкі або выкарыстання ў турэлях «Хваля». diff --git a/core/assets/bundles/bundle_cs.properties b/core/assets/bundles/bundle_cs.properties index c4a3a6c4e7..cf8896d1d0 100644 --- a/core/assets/bundles/bundle_cs.properties +++ b/core/assets/bundles/bundle_cs.properties @@ -1047,7 +1047,7 @@ block.underflow-gate.name = Brána s podtokem block.silicon-smelter.name = Křemíková huť block.phase-weaver.name = Tkalcovna pro fázovou tkaninu block.pulverizer.name = Rozmělňovač -block.cryofluidmixer.name = Míchačka na chladící kapalinu +block.cryofluid-mixer.name = Míchačka na chladící kapalinu block.melter.name = Tavírna block.incinerator.name = Spalovna block.spore-press.name = Lis na spóry @@ -1204,7 +1204,7 @@ block.kiln.description = Taví písek a olovo na směs známou jako metasklo. Vy block.plastanium-compressor.description = Produkuje plastanu z titanu a nafty. block.phase-weaver.description = Produkuje fázovou tkaninu z radioaktivního thoria a písku. Spotřebuje k tomu výrazné množství energie. block.alloy-smelter.description = Produkuje rázovou slitinu z titanu, olova, křemíku a mědi. -block.cryofluidmixer.description = Míchá vodu a jemný titanová prášek do chladící kapaliny, nezbytné například pro thoriový reaktor. +block.cryofluid-mixer.description = Míchá vodu a jemný titanová prášek do chladící kapaliny, nezbytné například pro thoriový reaktor. block.blast-mixer.description = Drtí a míchá shluky spór s pyratitem, čímž vzniká výbušnina. block.pyratite-mixer.description = Míchá uhlí, olovo a písek do vysoce hořlavého pyratitu. block.melter.description = Taví šrot do roztaveného kovu pro další zpracování, nebo pro munici do střílny Vlna. diff --git a/core/assets/bundles/bundle_da.properties b/core/assets/bundles/bundle_da.properties index 3f94fbdd9f..0e9d2ce889 100644 --- a/core/assets/bundles/bundle_da.properties +++ b/core/assets/bundles/bundle_da.properties @@ -1043,7 +1043,7 @@ block.underflow-gate.name = Underflow Gate block.silicon-smelter.name = Silicon Smelter block.phase-weaver.name = Phase Weaver block.pulverizer.name = Pulverizer -block.cryofluidmixer.name = Cryofluid Mixer +block.cryofluid-mixer.name = Cryofluid Mixer block.melter.name = Melter block.incinerator.name = Incinerator block.spore-press.name = Spore Press @@ -1199,7 +1199,7 @@ block.kiln.description = Smelts sand and lead into the compound known as metagla block.plastanium-compressor.description = Produces plastanium from oil and titanium. block.phase-weaver.description = Synthesizes phase fabric from radioactive thorium and sand. Requires massive amounts of power to function. block.alloy-smelter.description = Combines titanium, lead, silicon and copper to produce surge alloy. -block.cryofluidmixer.description = Mixes water and fine titanium powder into cryofluid. Essential for thorium reactor usage. +block.cryofluid-mixer.description = Mixes water and fine titanium powder into cryofluid. Essential for thorium reactor usage. block.blast-mixer.description = Crushes and mixes clusters of spores with pyratite to produce blast compound. block.pyratite-mixer.description = Mixes coal, lead and sand into highly flammable pyratite. block.melter.description = Melts down scrap into slag for further processing or usage in wave turrets. diff --git a/core/assets/bundles/bundle_de.properties b/core/assets/bundles/bundle_de.properties index 2231d79456..67311e3451 100644 --- a/core/assets/bundles/bundle_de.properties +++ b/core/assets/bundles/bundle_de.properties @@ -1043,7 +1043,7 @@ block.underflow-gate.name = Unterlauftor block.silicon-smelter.name = Silizium-Schmelzer block.phase-weaver.name = Phasenweber block.pulverizer.name = Pulverisierer -block.cryofluidmixer.name = Kryoflüssigkeitsmixer +block.cryofluid-mixer.name = Kryoflüssigkeitsmixer block.melter.name = Schmelzer block.incinerator.name = Verbrennungsanlage block.spore-press.name = Sporenpresse @@ -1199,7 +1199,7 @@ block.kiln.description = Schmelzt Sand und Blei zu Metaglass. Erfordert kleine M block.plastanium-compressor.description = Produziert Plastanium aus Öl und Titan. block.phase-weaver.description = Produziert Phasengewebe aus radioaktivem Thorium und großen Mengen an Sand. block.alloy-smelter.description = Verarbeitet Titan, Blei, Silizium und Kupfer zu einer Stromstoßlegierung. -block.cryofluidmixer.description = Verarbeitet Wasser mit Titan zu einer Kryoflüssigkeit, die viel effizienter kühlt. +block.cryofluid-mixer.description = Verarbeitet Wasser mit Titan zu einer Kryoflüssigkeit, die viel effizienter kühlt. block.blast-mixer.description = Verwendet Sporen, um Pyratit in eine weniger enzündliche aber explosive Mischung umzuwandeln. block.pyratite-mixer.description = Vermischt Kohle, Blei und Sand zu hochentzündlichem Pyratit. block.melter.description = Erhitzt Schrott auf extrem hohe Temperaturen, um Lava zu erhalten. diff --git a/core/assets/bundles/bundle_es.properties b/core/assets/bundles/bundle_es.properties index 93d422040e..8c538a6974 100644 --- a/core/assets/bundles/bundle_es.properties +++ b/core/assets/bundles/bundle_es.properties @@ -1043,7 +1043,7 @@ block.underflow-gate.name = Compuerta de Subdesbordamiento block.silicon-smelter.name = Horno para Silicio block.phase-weaver.name = Tejedor de Fase block.pulverizer.name = Pulverizador -block.cryofluidmixer.name = Mezclador de Criogénicos +block.cryofluid-mixer.name = Mezclador de Criogénicos block.melter.name = Fundidor block.incinerator.name = Incinerador block.spore-press.name = Prensa de Esporas @@ -1199,7 +1199,7 @@ block.kiln.description = Funde arena y plomo en metacristal. Requiere cantidades block.plastanium-compressor.description = Produce plastanio con aceite y titanio. block.phase-weaver.description = Produce tejido de fase del torio radioactivo y altas cantidades de arena. block.alloy-smelter.description = Produce aleación eléctrica con titanio, plomo, silicio y cobre. -block.cryofluidmixer.description = Combina agua y titanio en líquido criogénico, que es mucho más eficiente para enfriar. +block.cryofluid-mixer.description = Combina agua y titanio en líquido criogénico, que es mucho más eficiente para enfriar. block.blast-mixer.description = Usa aceite para transformar pirotita en un objeto menos inflamable pero más explosivo: el compuesto explosivo. block.pyratite-mixer.description = Mezcla carbón, plomo y arena en pirotita altamente inflamable. block.melter.description = Calienta piedra a temperaturas muy altas para obtener lava. diff --git a/core/assets/bundles/bundle_et.properties b/core/assets/bundles/bundle_et.properties index 0565a4920b..d5ac8cfb74 100644 --- a/core/assets/bundles/bundle_et.properties +++ b/core/assets/bundles/bundle_et.properties @@ -1043,7 +1043,7 @@ block.underflow-gate.name = Underflow Gate block.silicon-smelter.name = Ränisulatusahi block.phase-weaver.name = Faaskangakuduja block.pulverizer.name = Metallijahvataja -block.cryofluidmixer.name = Krüosegisti +block.cryofluid-mixer.name = Krüosegisti block.melter.name = Metallisulataja block.incinerator.name = Tuhastusahi block.spore-press.name = Spooripress @@ -1199,7 +1199,7 @@ block.kiln.description = Sulatab liiva ja plii metaklaasiks. Väike energiatarve block.plastanium-compressor.description = Toodab naftast ja titaanist plastiumit. block.phase-weaver.description = Sünteesib faaskangast radioaktiivsest tooriumist ja liivast. Tohutu energiatarve. block.alloy-smelter.description = Kombineerib titaaniumi, plii, räni ja vase voogsulamiks. -block.cryofluidmixer.description = Toodab krüovedelikku, segades kokku vee ja peene titaanpulbri. Hädavajalik tooriumreaktori toimimiseks. +block.cryofluid-mixer.description = Toodab krüovedelikku, segades kokku vee ja peene titaanpulbri. Hädavajalik tooriumreaktori toimimiseks. block.blast-mixer.description = Purustab spoorikobaraid ja segab neid püratiidiga, et toota lõhkeainet. block.pyratite-mixer.description = Segab söe, plii ja liiva tuleohtlikuks püratiidiks. block.melter.description = Sulatab vanametalli räbuks, mida saab kas edasi töödelda või kasutada pritskahurites. diff --git a/core/assets/bundles/bundle_eu.properties b/core/assets/bundles/bundle_eu.properties index 1c77a1068c..5ef1a41b71 100644 --- a/core/assets/bundles/bundle_eu.properties +++ b/core/assets/bundles/bundle_eu.properties @@ -1043,7 +1043,7 @@ block.underflow-gate.name = Underflow Gate block.silicon-smelter.name = Silizio galdategia block.phase-weaver.name = Fase ehulea block.pulverizer.name = Birringailua -block.cryofluidmixer.name = Krio-isurkari nahasgailua +block.cryofluid-mixer.name = Krio-isurkari nahasgailua block.melter.name = Urtzailea block.incinerator.name = Erraustegia block.spore-press.name = Espora prentsa @@ -1199,7 +1199,7 @@ block.kiln.description = Hondarra eta beruna galdatzen ditu metabeira izeneko ko block.plastanium-compressor.description = Plastanioa ekoizten du olioa eta titanioa erabiliz. block.phase-weaver.description = Fasezko ehuna sintetizatzen du torio erradioaktiboa eta hondarra erabiliz. Energia kopurua handia behar du jarduteko. block.alloy-smelter.description = Titanioa, beruna, silizioa eta kobrea konbinatzen ditu tirain aleazioa ekoizteko. -block.cryofluidmixer.description = Ura eta titanio hauts fina nahasten ditu krio-isurkia ekoizteko. Toriozko erreaktorea erabiltzeko ezinbestekoa. +block.cryofluid-mixer.description = Ura eta titanio hauts fina nahasten ditu krio-isurkia ekoizteko. Toriozko erreaktorea erabiltzeko ezinbestekoa. block.blast-mixer.description = Espora sortak eta piratita txikitu eta nahasten ditu lehergai konposatua ekoizteko. block.pyratite-mixer.description = Ikatza, beruna, eta hondarra nahasten ditu oso sukoia den piratita sortuz. block.melter.description = Metala zepara urtzen du, prozesatzen jarraitzeko edo olatu dorreetan erabiltzeko. diff --git a/core/assets/bundles/bundle_fi.properties b/core/assets/bundles/bundle_fi.properties index a65555994c..ae351b8764 100644 --- a/core/assets/bundles/bundle_fi.properties +++ b/core/assets/bundles/bundle_fi.properties @@ -1043,7 +1043,7 @@ block.underflow-gate.name = Underflow Gate block.silicon-smelter.name = Silicon Smelter block.phase-weaver.name = Phase Weaver block.pulverizer.name = Pulverizer -block.cryofluidmixer.name = Cryofluid Mixer +block.cryofluid-mixer.name = Cryofluid Mixer block.melter.name = Melter block.incinerator.name = Incinerator block.spore-press.name = Spore Press @@ -1199,7 +1199,7 @@ block.kiln.description = Smelts sand and lead into the compound known as metagla block.plastanium-compressor.description = Produces plastanium from oil and titanium. block.phase-weaver.description = Synthesizes phase fabric from radioactive thorium and sand. Requires massive amounts of power to function. block.alloy-smelter.description = Combines titanium, lead, silicon and copper to produce surge alloy. -block.cryofluidmixer.description = Mixes water and fine titanium powder into cryofluid. Essential for thorium reactor usage. +block.cryofluid-mixer.description = Mixes water and fine titanium powder into cryofluid. Essential for thorium reactor usage. block.blast-mixer.description = Crushes and mixes clusters of spores with pyratite to produce blast compound. block.pyratite-mixer.description = Mixes coal, lead and sand into highly flammable pyratite. block.melter.description = Melts down scrap into slag for further processing or usage in wave turrets. diff --git a/core/assets/bundles/bundle_fil.properties b/core/assets/bundles/bundle_fil.properties index 27dea1e7c7..86c3c0737a 100644 --- a/core/assets/bundles/bundle_fil.properties +++ b/core/assets/bundles/bundle_fil.properties @@ -1043,7 +1043,7 @@ block.underflow-gate.name = Underflow Gate block.silicon-smelter.name = Silicon Smelter block.phase-weaver.name = Phase Weaver block.pulverizer.name = Pulverizer -block.cryofluidmixer.name = Cryofluid Mixer +block.cryofluid-mixer.name = Cryofluid Mixer block.melter.name = Melter block.incinerator.name = Incinerator block.spore-press.name = Spore Press @@ -1199,7 +1199,7 @@ block.kiln.description = Smelts sand and lead into the compound known as metagla block.plastanium-compressor.description = Produces plastanium from oil and titanium. block.phase-weaver.description = Synthesizes phase fabric from radioactive thorium and sand. Requires massive amounts of power to function. block.alloy-smelter.description = Combines titanium, lead, silicon and copper to produce surge alloy. -block.cryofluidmixer.description = Mixes water and fine titanium powder into cryofluid. Essential for thorium reactor usage. +block.cryofluid-mixer.description = Mixes water and fine titanium powder into cryofluid. Essential for thorium reactor usage. block.blast-mixer.description = Crushes and mixes clusters of spores with pyratite to produce blast compound. block.pyratite-mixer.description = Mixes coal, lead and sand into highly flammable pyratite. block.melter.description = Melts down scrap into slag for further processing or usage in wave turrets. diff --git a/core/assets/bundles/bundle_fr.properties b/core/assets/bundles/bundle_fr.properties index 798e482994..e7749d7347 100644 --- a/core/assets/bundles/bundle_fr.properties +++ b/core/assets/bundles/bundle_fr.properties @@ -1043,7 +1043,7 @@ block.underflow-gate.name = Barrière de Refoulement block.silicon-smelter.name = Fonderie de Silicium block.phase-weaver.name = Tisseur à Phase block.pulverizer.name = Pulvérisateur -block.cryofluidmixer.name = Refroidisseur +block.cryofluid-mixer.name = Refroidisseur block.melter.name = Four à Fusion block.incinerator.name = Incinérateur block.spore-press.name = Presse à Spore @@ -1199,7 +1199,7 @@ block.kiln.description = Fait fondre le sable et le plomb en verre trempé. Néc block.plastanium-compressor.description = Produit du plastanium à partir de pétrole et de titane. block.phase-weaver.description = Produit du tissu phasé à partir de thoriums et de grandes quantités de sable. Nécessite une quantité massive d'énergie pour fonctionner. block.alloy-smelter.description = Produit un alliage superchargé à l'aide de titane, de plomb, de silicium et de cuivre. -block.cryofluidmixer.description = Mélange de l’eau et de la fine poudre de titane pour former du liquide cryogénique. Indispensable lors de l'utilisation de réacteurs aux thoriums. +block.cryofluid-mixer.description = Mélange de l’eau et de la fine poudre de titane pour former du liquide cryogénique. Indispensable lors de l'utilisation de réacteurs aux thoriums. block.blast-mixer.description = Écrase et mélange les amas de spores avec de la pyratite pour produire un mélange explosif. block.pyratite-mixer.description = Mélange le charbon, le plomb et le sable en pyratite hautement inflammable. block.melter.description = Fait fondre la ferraille en scories pour un traitement ultérieur ou une utilisation dans les tourelles « Onde ». diff --git a/core/assets/bundles/bundle_fr_BE.properties b/core/assets/bundles/bundle_fr_BE.properties index f3d33f1028..02fe5e58b1 100644 --- a/core/assets/bundles/bundle_fr_BE.properties +++ b/core/assets/bundles/bundle_fr_BE.properties @@ -1043,7 +1043,7 @@ block.underflow-gate.name = Underflow Gate block.silicon-smelter.name = Fonderie de silicium block.phase-weaver.name = Tisseur à phase block.pulverizer.name = Pulvérisateur -block.cryofluidmixer.name = Refroidisseur +block.cryofluid-mixer.name = Refroidisseur block.melter.name = Four à Fusion block.incinerator.name = Incinérateur block.spore-press.name = Spore presse @@ -1199,7 +1199,7 @@ block.kiln.description = Fait fondre le sable et le plomb en métaverre. Nécess block.plastanium-compressor.description = Produit du plastanium à partir de pétrole et de titane. block.phase-weaver.description = Produit un tissu de phase à partir de thorium radioactif et de grandes quantités de sable. block.alloy-smelter.description = Produit un alliage de surtension à partir de titane, plomb, silicium et cuivre. -block.cryofluidmixer.description = L'eau et le titane combinés forment un fluide cryo beaucoup plus efficace pour le refroidissement. +block.cryofluid-mixer.description = L'eau et le titane combinés forment un fluide cryo beaucoup plus efficace pour le refroidissement. block.blast-mixer.description = Utilise du pétrole pour transformer la pyratite en un composé explosif moins inflammable mais plus explosif. block.pyratite-mixer.description = Mélange le charbon, le plomb et le sable en pyratite hautement inflammable. block.melter.description = Chauffe la pierre à des températures très élevées pour obtenir de la lave. diff --git a/core/assets/bundles/bundle_hu.properties b/core/assets/bundles/bundle_hu.properties index 76522053f7..b28d471cdd 100644 --- a/core/assets/bundles/bundle_hu.properties +++ b/core/assets/bundles/bundle_hu.properties @@ -1043,7 +1043,7 @@ block.underflow-gate.name = Underflow Gate block.silicon-smelter.name = Silicon Smelter block.phase-weaver.name = Phase Weaver block.pulverizer.name = Pulverizer -block.cryofluidmixer.name = Cryofluid Mixer +block.cryofluid-mixer.name = Cryofluid Mixer block.melter.name = Melter block.incinerator.name = Incinerator block.spore-press.name = Spore Press @@ -1199,7 +1199,7 @@ block.kiln.description = Smelts sand and lead into the compound known as metagla block.plastanium-compressor.description = Produces plastanium from oil and titanium. block.phase-weaver.description = Synthesizes phase fabric from radioactive thorium and sand. Requires massive amounts of power to function. block.alloy-smelter.description = Combines titanium, lead, silicon and copper to produce surge alloy. -block.cryofluidmixer.description = Mixes water and fine titanium powder into cryofluid. Essential for thorium reactor usage. +block.cryofluid-mixer.description = Mixes water and fine titanium powder into cryofluid. Essential for thorium reactor usage. block.blast-mixer.description = Crushes and mixes clusters of spores with pyratite to produce blast compound. block.pyratite-mixer.description = Mixes coal, lead and sand into highly flammable pyratite. block.melter.description = Melts down scrap into slag for further processing or usage in wave turrets. diff --git a/core/assets/bundles/bundle_in_ID.properties b/core/assets/bundles/bundle_in_ID.properties index 4131d7def0..32aabb9eb5 100644 --- a/core/assets/bundles/bundle_in_ID.properties +++ b/core/assets/bundles/bundle_in_ID.properties @@ -1043,7 +1043,7 @@ block.underflow-gate.name = Gerbang Tidak Meluap block.silicon-smelter.name = Pelebur Silikon block.phase-weaver.name = Pengrajut Phase block.pulverizer.name = Pulverisator -block.cryofluidmixer.name = Penyampur Cairan Dingin +block.cryofluid-mixer.name = Penyampur Cairan Dingin block.melter.name = Pencair block.incinerator.name = Penghangus block.spore-press.name = Penekan Spora @@ -1199,7 +1199,7 @@ block.kiln.description = Membakar pasir dan timah menjadi kaca meta. Membutuhkan block.plastanium-compressor.description = Memproduksi plastanium dari minyak dan titanium. block.phase-weaver.description = Memproduksi kain phase dari thorium dan banyak pasir. block.alloy-smelter.description = Memproduksi campuran logam dari titanium, timah, silikon dan tembaga. -block.cryofluidmixer.description = Mencampur air dan titanium menjadi cairan dingin yang lebih efisien untuk pendingin. +block.cryofluid-mixer.description = Mencampur air dan titanium menjadi cairan dingin yang lebih efisien untuk pendingin. block.blast-mixer.description = Menggunakan minyak untuk membentuk pyratite menjadi senyawa peledak yang kurang mudah terbakar tetapi lebih eksplosif. block.pyratite-mixer.description = Mencampur batu bara, timah dan pasir menjadi pyratite yang sangat mudah terbakar. block.melter.description = Melelehkan kepingan menjadi terak untuk proses selanjutnya atau digunakan menara. diff --git a/core/assets/bundles/bundle_it.properties b/core/assets/bundles/bundle_it.properties index bacb61ebdd..c10f894851 100644 --- a/core/assets/bundles/bundle_it.properties +++ b/core/assets/bundles/bundle_it.properties @@ -1043,7 +1043,7 @@ block.underflow-gate.name = Separatore per Eccesso Inverso block.silicon-smelter.name = Fonderia block.phase-weaver.name = Tessitore di Fase block.pulverizer.name = Polverizzatore -block.cryofluidmixer.name = Miscelatore di Liquidi +block.cryofluid-mixer.name = Miscelatore di Liquidi block.melter.name = Fonditore block.incinerator.name = Inceneritore block.spore-press.name = Pressa di Spore @@ -1199,7 +1199,7 @@ block.kiln.description = Fonde la sabbia ed il piombo in vetro metallico. Richie block.plastanium-compressor.description = Produce plastanio da petrolio e titanio. block.phase-weaver.description = Produce tessuto di fase da torio radioattivo ed elevate quantità di sabbia. block.alloy-smelter.description = Produce leghe di sovratensione da titanio, piombo, silicio e rame. -block.cryofluidmixer.description = Combina acqua e titanio in criofluido che è molto più efficiente per il raffreddamento. +block.cryofluid-mixer.description = Combina acqua e titanio in criofluido che è molto più efficiente per il raffreddamento. block.blast-mixer.description = Frantuma e mescola le spore con la pirite per produrre composto esplosivo. block.pyratite-mixer.description = Mescola carbone, piombo e sabbia in pirite altamente infiammabile. block.melter.description = Riscalda la pietra a temperature molto elevate per ottenere scoria liquida. diff --git a/core/assets/bundles/bundle_ja.properties b/core/assets/bundles/bundle_ja.properties index c5d498b872..fdb915ff96 100644 --- a/core/assets/bundles/bundle_ja.properties +++ b/core/assets/bundles/bundle_ja.properties @@ -1043,7 +1043,7 @@ block.underflow-gate.name = アンダーフローゲート block.silicon-smelter.name = シリコン溶鉱炉 block.phase-weaver.name = フェーズ織機 block.pulverizer.name = 粉砕機 -block.cryofluidmixer.name = 冷却ミキサー +block.cryofluid-mixer.name = 冷却ミキサー block.melter.name = 融合機 block.incinerator.name = 焼却炉 block.spore-press.name = 胞子圧縮機 @@ -1199,7 +1199,7 @@ block.kiln.description = 砂と鉛を溶かしてメタガラスを生成しま block.plastanium-compressor.description = オイルとチタンからプラスタニウムを製造します。 block.phase-weaver.description = 放射性トリウムと多量の砂からフェーズファイバーを製造します。 block.alloy-smelter.description = チタンや鉛、シリコン、銅からサージ合金を製造します。 -block.cryofluidmixer.description = 水とチタンから冷却に効率的な冷却水を製造します。 +block.cryofluid-mixer.description = 水とチタンから冷却に効率的な冷却水を製造します。 block.blast-mixer.description = 可燃性のピラタイトを石油を使用してさらに爆発性化合物にします。 block.pyratite-mixer.description = 石炭、鉛、砂から燃えやすいピラタイトを製造します。 block.melter.description = 石を熱で溶かして溶岩を生成します。 diff --git a/core/assets/bundles/bundle_ko.properties b/core/assets/bundles/bundle_ko.properties index f0b2e73317..87f3d00a1b 100644 --- a/core/assets/bundles/bundle_ko.properties +++ b/core/assets/bundles/bundle_ko.properties @@ -1043,7 +1043,7 @@ block.underflow-gate.name = 불포화 필터 block.silicon-smelter.name = 실리콘 제련소 block.phase-weaver.name = 메타 합성기 block.pulverizer.name = 분쇄기 -block.cryofluidmixer.name = 냉각수 제조기 +block.cryofluid-mixer.name = 냉각수 제조기 block.melter.name = 융해기 block.incinerator.name = 소각로 block.spore-press.name = 포자 압축기 @@ -1199,7 +1199,7 @@ block.kiln.description = 모래를 제련하여 강화 유리라고 알려진 block.plastanium-compressor.description = 석유와 티타늄으로 플라스터늄을 생산합니다. block.phase-weaver.description = 방사성 토륨과 모래에서 메타를 합성합니다. 작동하려면 엄청난 양의 전력이 필요합니다. block.alloy-smelter.description = 티타늄, 납, 실리콘, 구리를 결합하여 설금을 생산합니다. -block.cryofluidmixer.description = 물과 미세 티타늄 분말을 냉각수로 혼합합니다. 토륨 원자로 사용에 필수적입니다. +block.cryofluid-mixer.description = 물과 미세 티타늄 분말을 냉각수로 혼합합니다. 토륨 원자로 사용에 필수적입니다. block.blast-mixer.description = 포자 클러스터를 파이라타이트와 분쇄하고 혼합하여 폭발물을 만듭니다. block.pyratite-mixer.description = 석탄, 납, 모래를 가연성이 높은 파이라타이트로 만듭니다. block.melter.description = 웨이브 포탑에서 추가 처리 또는 사용을 위해 고철을 광재로 녹입니다. diff --git a/core/assets/bundles/bundle_lt.properties b/core/assets/bundles/bundle_lt.properties index ca4ffed5ba..a318c53f5f 100644 --- a/core/assets/bundles/bundle_lt.properties +++ b/core/assets/bundles/bundle_lt.properties @@ -1043,7 +1043,7 @@ block.underflow-gate.name = Neperpildymo Užtvara block.silicon-smelter.name = Silicio Lydykla block.phase-weaver.name = Fazinė Audykla block.pulverizer.name = Pulverizatorius -block.cryofluidmixer.name = Krio Skysčio Maišytojas +block.cryofluid-mixer.name = Krio Skysčio Maišytojas block.melter.name = Lydytuvas block.incinerator.name = Deginimo krosnis block.spore-press.name = Sporų Presas @@ -1199,7 +1199,7 @@ block.kiln.description = Sulydo smėlį ir stiklą į junginį žinomą kaip met block.plastanium-compressor.description = Gamina plastaniumą iš naftos ir titano. block.phase-weaver.description = Susintetina fazinį audinį iš radioaktyvaus torio ir smėlio. Veikimui reikalingas didžiulis kiekis energijos. block.alloy-smelter.description = Sumaišo titaną, šviną, silicį ir varį į viršįtampį lydinį. -block.cryofluidmixer.description = Maišo vandenį ir smulkias titano dulkes į krio skystį. Būtinas torio reaktoriaus naudojimui. +block.cryofluid-mixer.description = Maišo vandenį ir smulkias titano dulkes į krio skystį. Būtinas torio reaktoriaus naudojimui. block.blast-mixer.description = Susmulkina ir sumaišo sporas su piratitu ir pagamina sprogųjį junginį. block.pyratite-mixer.description = Sumaišo anglį, šviną ir smėlį į itin degų piratitą. block.melter.description = Išlydo metalo laužą į šlaką tolesniam apdorojimui arba naudojimui wave bokštuose. diff --git a/core/assets/bundles/bundle_nl.properties b/core/assets/bundles/bundle_nl.properties index 55b1b765f0..634b6eb00e 100644 --- a/core/assets/bundles/bundle_nl.properties +++ b/core/assets/bundles/bundle_nl.properties @@ -1043,7 +1043,7 @@ block.underflow-gate.name = Underflow Gate block.silicon-smelter.name = Siliciumsmelter block.phase-weaver.name = Phase Weaver block.pulverizer.name = Vermorzelaar -block.cryofluidmixer.name = Cryofluid Mixer +block.cryofluid-mixer.name = Cryofluid Mixer block.melter.name = Smelter block.incinerator.name = Verbrandingsoven block.spore-press.name = Schimmelpers @@ -1199,7 +1199,7 @@ block.kiln.description = Smelts sand and lead into metaglass. Requires small amo block.plastanium-compressor.description = Produces plastanium from oil and titanium. block.phase-weaver.description = Produces phase fabric from radioactive thorium and high amounts of sand. block.alloy-smelter.description = Produces surge alloy from titanium, lead, silicon and copper. -block.cryofluidmixer.description = Combines water and titanium into cryofluid which is much more efficient for cooling. +block.cryofluid-mixer.description = Combines water and titanium into cryofluid which is much more efficient for cooling. block.blast-mixer.description = Uses oil for transforming pyratite into the less flammable but more explosive blast compound. block.pyratite-mixer.description = Mixes coal, lead and sand into highly flammable pyratite. block.melter.description = Melts down scrap into slag for further processing or usage in turrets. diff --git a/core/assets/bundles/bundle_nl_BE.properties b/core/assets/bundles/bundle_nl_BE.properties index e7c574de34..ce59b257f7 100644 --- a/core/assets/bundles/bundle_nl_BE.properties +++ b/core/assets/bundles/bundle_nl_BE.properties @@ -1043,7 +1043,7 @@ block.underflow-gate.name = Underflow Gate block.silicon-smelter.name = Silicon Smelter block.phase-weaver.name = Phase Weaver block.pulverizer.name = Pulverizer -block.cryofluidmixer.name = Cryofluid Mixer +block.cryofluid-mixer.name = Cryofluid Mixer block.melter.name = Melter block.incinerator.name = Incinerator block.spore-press.name = Spore Press @@ -1199,7 +1199,7 @@ block.kiln.description = Smelts sand and lead into metaglass. Requires small amo block.plastanium-compressor.description = Produces plastanium from oil and titanium. block.phase-weaver.description = Produces phase fabric from radioactive thorium and high amounts of sand. block.alloy-smelter.description = Produces surge alloy from titanium, lead, silicon and copper. -block.cryofluidmixer.description = Combines water and titanium into cryofluid which is much more efficient for cooling. +block.cryofluid-mixer.description = Combines water and titanium into cryofluid which is much more efficient for cooling. block.blast-mixer.description = Uses oil for transforming pyratite into the less flammable but more explosive blast compound. block.pyratite-mixer.description = Mixes coal, lead and sand into highly flammable pyratite. block.melter.description = Melts down scrap into slag for further processing or usage in turrets. diff --git a/core/assets/bundles/bundle_pl.properties b/core/assets/bundles/bundle_pl.properties index 8ed68e8273..f0c67c6a88 100644 --- a/core/assets/bundles/bundle_pl.properties +++ b/core/assets/bundles/bundle_pl.properties @@ -1043,7 +1043,7 @@ block.underflow-gate.name = Brama Niedomiaru block.silicon-smelter.name = Huta Krzemu block.phase-weaver.name = Fazowa Fabryka block.pulverizer.name = Rozkruszacz -block.cryofluidmixer.name = Mieszacz Lodocieczy +block.cryofluid-mixer.name = Mieszacz Lodocieczy block.melter.name = Przetapiacz block.incinerator.name = Spalacz block.spore-press.name = Prasa Zarodników @@ -1199,7 +1199,7 @@ block.kiln.description = Stapia ołów i piasek na metaszkło. Wymaga małej ilo block.plastanium-compressor.description = Wytwarza plastan z oleju i tytanu. block.phase-weaver.description = Produkuje Włókna Fazowe z radioaktywnego toru i dużych ilości piasku. block.alloy-smelter.description = Produkuje stop Elektrum z tytanu, ołowiu, krzemu i miedzi. -block.cryofluidmixer.description = Łączy wodę i tytan w lodociecz, który jest znacznie bardziej wydajny w chłodzeniu niż woda. +block.cryofluid-mixer.description = Łączy wodę i tytan w lodociecz, który jest znacznie bardziej wydajny w chłodzeniu niż woda. block.blast-mixer.description = Kruszy i miesza skupiska zarodników z piratytem, tworząc związek wybuchowy. block.pyratite-mixer.description = Miesza węgiel, ołów i piasek tworząc bardzo łatwopalny piratian. block.melter.description = Przetapia złom na żużel do dalszego przetwarzania lub użycia w wieżyczkach diff --git a/core/assets/bundles/bundle_pt_BR.properties b/core/assets/bundles/bundle_pt_BR.properties index b7490dd8f2..7754faa059 100644 --- a/core/assets/bundles/bundle_pt_BR.properties +++ b/core/assets/bundles/bundle_pt_BR.properties @@ -1043,7 +1043,7 @@ block.underflow-gate.name = Comporta invertida block.silicon-smelter.name = Fundidora de silicio block.phase-weaver.name = Palheta de fase block.pulverizer.name = Pulverizador -block.cryofluidmixer.name = Misturador de Crio Fluido +block.cryofluid-mixer.name = Misturador de Crio Fluido block.melter.name = Aparelho de fusão block.incinerator.name = Incinerador block.spore-press.name = Prensa de Esporo @@ -1199,7 +1199,7 @@ block.kiln.description = Derrete chumbo e areia no composto conhecido como metav block.plastanium-compressor.description = Produz plastânio usando petróleo e titânio. block.phase-weaver.description = Produz tecido de fase usando tório radioativo e areia. Requer massivas quantidades de energia para funcionar. block.alloy-smelter.description = Combina titânio, chumbo, silicio e cobre para produzir liga de surto. -block.cryofluidmixer.description = Mistura água e pó fino de titânio para produzir criofluido. Essencial para o uso do reator a tório. +block.cryofluid-mixer.description = Mistura água e pó fino de titânio para produzir criofluido. Essencial para o uso do reator a tório. block.blast-mixer.description = Quebra e mistura aglomerados de esporos com piratita para produzir composto de explosão. block.pyratite-mixer.description = Mistura carvão, chumbo e areia em piratita altamente inflamável. block.melter.description = Derrete sucata em escória para processamento posterior ou uso em torretas. diff --git a/core/assets/bundles/bundle_pt_PT.properties b/core/assets/bundles/bundle_pt_PT.properties index 903b761736..0b6948191b 100644 --- a/core/assets/bundles/bundle_pt_PT.properties +++ b/core/assets/bundles/bundle_pt_PT.properties @@ -1043,7 +1043,7 @@ block.underflow-gate.name = Portão Desobrecarregado block.silicon-smelter.name = Fundidora de silicio block.phase-weaver.name = Palheta de fase block.pulverizer.name = Pulverizador -block.cryofluidmixer.name = Misturador de Crio Fluido +block.cryofluid-mixer.name = Misturador de Crio Fluido block.melter.name = Aparelho de fusão block.incinerator.name = Incinerador block.spore-press.name = Prensa de Esporo @@ -1199,7 +1199,7 @@ block.kiln.description = Derrete chumbo e areia no composto conhecido como metav block.plastanium-compressor.description = Produz plastânio usando petróleo e titânio. block.phase-weaver.description = Produz tecido de fase usando tório radioativo e areia. Requer massivas quantidades de energia para funcionar. block.alloy-smelter.description = Combina titânio, chumbo, silicio e cobre para produzir liga de surto. -block.cryofluidmixer.description = Mistura água e pó fino de titânio para produzir criofluido. Essencial para o uso do reator a tório. +block.cryofluid-mixer.description = Mistura água e pó fino de titânio para produzir criofluido. Essencial para o uso do reator a tório. block.blast-mixer.description = Quebra e mistura aglomerados de esporos com piratita para produzir composto de explosão. block.pyratite-mixer.description = Mistura carvão, chumbo e areia em piratita altamente inflamável block.melter.description = Derrete sucata em escória para processamento posterior ou uso em torretas. diff --git a/core/assets/bundles/bundle_ro.properties b/core/assets/bundles/bundle_ro.properties index 0a3e005854..221ab0aab6 100644 --- a/core/assets/bundles/bundle_ro.properties +++ b/core/assets/bundles/bundle_ro.properties @@ -1043,7 +1043,7 @@ block.underflow-gate.name = Poartă de Subversare block.silicon-smelter.name = Topitor de Silicon block.phase-weaver.name = Țesătorie de Fază block.pulverizer.name = Pulverizator -block.cryofluidmixer.name = Mixer de Criofluid +block.cryofluid-mixer.name = Mixer de Criofluid block.melter.name = Topitor block.incinerator.name = Incinerator block.spore-press.name = Presă de Spori @@ -1199,7 +1199,7 @@ block.kiln.description = Toarnă nisip și plumb în compusul numit metasticlă. block.plastanium-compressor.description = Produce plastaniu din petrol și titan. block.phase-weaver.description = Sintetizează fibră-fază din toriu radioactiv și nisip. Necesită electricitate pt a funcționa. block.alloy-smelter.description = Combină titan, plumb, silicon și cupru pt a produce supra aliaj. -block.cryofluidmixer.description = Amestecă apă și pudră fină de titan în criofluid. Esențial pt folosirea în reactoarele de toriu. +block.cryofluid-mixer.description = Amestecă apă și pudră fină de titan în criofluid. Esențial pt folosirea în reactoarele de toriu. block.blast-mixer.description = Zdrobește și amestecă gramezi de spori cu piratită pt a produce un compus explozibil. block.pyratite-mixer.description = Amestecă niște cărbune, plumb și nisip în inflamabila piratită. block.melter.description = Topește fierul vechi în zgură pt procesare ulterioară sau folosire în armele Wave. diff --git a/core/assets/bundles/bundle_ru.properties b/core/assets/bundles/bundle_ru.properties index 79979b5c18..716cf580fa 100644 --- a/core/assets/bundles/bundle_ru.properties +++ b/core/assets/bundles/bundle_ru.properties @@ -1054,7 +1054,7 @@ block.underflow-gate.name = Избыточный шлюз block.silicon-smelter.name = Кремниевая плавильня block.phase-weaver.name = Фазовый ткач block.pulverizer.name = Измельчитель -block.cryofluidmixer.name = Мешалка криогенной жидкости +block.cryofluid-mixer.name = Мешалка криогенной жидкости block.melter.name = Плавильня block.incinerator.name = Мусоросжигатель block.spore-press.name = Споровый пресс @@ -1211,7 +1211,7 @@ block.kiln.description = Выплавляет песок и свинец в со block.plastanium-compressor.description = Производит пластан из нефти и титана. block.phase-weaver.description = Синтезирует фазовую ткань из радиоактивного тория и песка. Требуется огромное количество энергии для работы. block.alloy-smelter.description = Объединяет титан, свинец, кремний и медь для производства кинетического сплава. -block.cryofluidmixer.description = Смешивает воду и мелкий титановый порошок в криогенную жидкость. Неотъемлемая часть при использования ториевого реактора +block.cryofluid-mixer.description = Смешивает воду и мелкий титановый порошок в криогенную жидкость. Неотъемлемая часть при использования ториевого реактора block.blast-mixer.description = Раздавливает и смешивает скопления спор с пиротитом для получения взрывчатого вещества. block.pyratite-mixer.description = Смешивает уголь, свинец и песок в легковоспламеняющийся пиротит. block.melter.description = Плавит металлолом в шлак для дальнейшей обработки или использования в турелях «Волна». diff --git a/core/assets/bundles/bundle_sv.properties b/core/assets/bundles/bundle_sv.properties index 0102844ace..0d29e6a89e 100644 --- a/core/assets/bundles/bundle_sv.properties +++ b/core/assets/bundles/bundle_sv.properties @@ -1043,7 +1043,7 @@ block.underflow-gate.name = Underflow Gate block.silicon-smelter.name = Kiselsmältare block.phase-weaver.name = Phase Weaver block.pulverizer.name = Pulveriserare -block.cryofluidmixer.name = Cryofluid Mixer +block.cryofluid-mixer.name = Cryofluid Mixer block.melter.name = Smältare block.incinerator.name = Förbrännare block.spore-press.name = Spore Press @@ -1199,7 +1199,7 @@ block.kiln.description = Smelts sand and lead into the compound known as metagla block.plastanium-compressor.description = Produces plastanium from oil and titanium. block.phase-weaver.description = Synthesizes phase fabric from radioactive thorium and sand. Requires massive amounts of power to function. block.alloy-smelter.description = Combines titanium, lead, silicon and copper to produce surge alloy. -block.cryofluidmixer.description = Mixes water and fine titanium powder into cryofluid. Essential for thorium reactor usage. +block.cryofluid-mixer.description = Mixes water and fine titanium powder into cryofluid. Essential for thorium reactor usage. block.blast-mixer.description = Crushes and mixes clusters of spores with pyratite to produce blast compound. block.pyratite-mixer.description = Mixes coal, lead and sand into highly flammable pyratite. block.melter.description = Melts down scrap into slag for further processing or usage in wave turrets. diff --git a/core/assets/bundles/bundle_th.properties b/core/assets/bundles/bundle_th.properties index 72028722d0..6a89ac29ca 100644 --- a/core/assets/bundles/bundle_th.properties +++ b/core/assets/bundles/bundle_th.properties @@ -1043,7 +1043,7 @@ block.underflow-gate.name = Underflow Gate block.silicon-smelter.name = เตาเผาซิลิกอน block.phase-weaver.name = เครื่องทอใยเฟส block.pulverizer.name = เครื่องบด -block.cryofluidmixer.name = เครื่องผสมสารหล่อเย็น +block.cryofluid-mixer.name = เครื่องผสมสารหล่อเย็น block.melter.name = เตาหลอม block.incinerator.name = เตาเผาขยะ block.spore-press.name = เครื่องอัดสปอร์ @@ -1199,7 +1199,7 @@ block.kiln.description = เผาทรายและตะกั่วเป block.plastanium-compressor.description = ผลิตพลาสตาเนี่ยมจากน้ำมันและไทเทเนี่ยม. block.phase-weaver.description = สังเคราะห์ใยเฟสจากทอเรี่ยมที่มีรังสีและทราย. จำเป็นต้องใช้พลังงานจำนวนมากจึงจะทำงานง. block.alloy-smelter.description = ผสมไทเทเนี่ยม, ตะกั่ว, ซิลิก้อนและทองแดงเพื่อที่จะผลิตเซิร์จอัลลอย. -block.cryofluidmixer.description = ผสมน้ำและผงไทเทเนี่ยมบริสุทธิ์เป็นไครโยฟลูอิด. สำคัญสำหรับเตาปฏิกรณ์ทอเรี่ยม. +block.cryofluid-mixer.description = ผสมน้ำและผงไทเทเนี่ยมบริสุทธิ์เป็นไครโยฟลูอิด. สำคัญสำหรับเตาปฏิกรณ์ทอเรี่ยม. block.blast-mixer.description = บอและผสมสปอร์กับไพไรต์เพื่อผลิตสารประกอบระเบิด. block.pyratite-mixer.description = ผสมถ่านหิน, ตะกั่วและทรายเข้าด้วยกันเป็นไฟไรต์ที่ติดไฟได้ง่าย. block.melter.description = หลอมเศษเหล็กเป็กกากแร่เพื่อใช้สำหรับกระบวนการต่อไปหรือใช้ในป้อมปืนเวฟ. diff --git a/core/assets/bundles/bundle_tk.properties b/core/assets/bundles/bundle_tk.properties index 21f0cb129c..edfae05b29 100644 --- a/core/assets/bundles/bundle_tk.properties +++ b/core/assets/bundles/bundle_tk.properties @@ -1043,7 +1043,7 @@ block.underflow-gate.name = Underflow Gate block.silicon-smelter.name = Silikon eritici block.phase-weaver.name = Dokumaci block.pulverizer.name = pulvarizor -block.cryofluidmixer.name = Cryosivisi karistiricisi +block.cryofluid-mixer.name = Cryosivisi karistiricisi block.melter.name = eritici block.incinerator.name = isi firini block.spore-press.name = Spore Press @@ -1199,7 +1199,7 @@ block.kiln.description = Smelts sand and lead into metaglass. Requires small amo block.plastanium-compressor.description = Produces plastanium from oil and titanium. block.phase-weaver.description = Produces phase fabric from radioactive thorium and high amounts of sand. block.alloy-smelter.description = Produces surge alloy from titanium, lead, silicon and copper. -block.cryofluidmixer.description = Combines water and titanium into cryofluid which is much more efficient for cooling. +block.cryofluid-mixer.description = Combines water and titanium into cryofluid which is much more efficient for cooling. block.blast-mixer.description = Uses oil for transforming pyratite into the less flammable but more explosive blast compound. block.pyratite-mixer.description = Mixes coal, lead and sand into highly flammable pyratite. block.melter.description = Heats up stone to very high temperatures to obtain lava. diff --git a/core/assets/bundles/bundle_tr.properties b/core/assets/bundles/bundle_tr.properties index 5ebb31a858..1fd6a6618e 100644 --- a/core/assets/bundles/bundle_tr.properties +++ b/core/assets/bundles/bundle_tr.properties @@ -1043,7 +1043,7 @@ block.underflow-gate.name = Underflow Gate block.silicon-smelter.name = Silikon Fırını block.phase-weaver.name = Faz Örücü block.pulverizer.name = Pulverizatör -block.cryofluidmixer.name = Kriyosıvı Mikseri +block.cryofluid-mixer.name = Kriyosıvı Mikseri block.melter.name = Eritici block.incinerator.name = Yakıcı block.spore-press.name = Spor Presi @@ -1199,7 +1199,7 @@ block.kiln.description = Kum ve kurşunu eritir ve metacam olarak bilinen malzem block.plastanium-compressor.description = Petrol ve titanyumdan plastanyum üretir. block.phase-weaver.description = Kum ve radyoaktif toryumdan faz örgüsü üretir. Çalışması için çok miktarda enerji gerekir. block.alloy-smelter.description = Akı alaşımı üretmek için titanyum, kurşun, silikon ve bakırı birleştirir. -block.cryofluidmixer.description = Su ve titanyum tozunu karıştırıp kriyosıvı üretir. Toryum reaktörü kullanımı için gereklidir. +block.cryofluid-mixer.description = Su ve titanyum tozunu karıştırıp kriyosıvı üretir. Toryum reaktörü kullanımı için gereklidir. block.blast-mixer.description = Patlayıcı bileşen üretmek için spor kapsüllerini pirratit ile ezer ve karıştırır. block.pyratite-mixer.description = Kömür, kurşun ve kumu karıştırıp oldukça yanıcı olan pirratit üretir. block.melter.description = Wave taretlerinde kullanılması veya daha çok işlemesi için hurdayı eritip cürufa çevirir. diff --git a/core/assets/bundles/bundle_uk_UA.properties b/core/assets/bundles/bundle_uk_UA.properties index 631e56dac5..df5bfc1db1 100644 --- a/core/assets/bundles/bundle_uk_UA.properties +++ b/core/assets/bundles/bundle_uk_UA.properties @@ -1043,7 +1043,7 @@ block.underflow-gate.name = Недостатній затвор block.silicon-smelter.name = Кремнієвий плавильний завод block.phase-weaver.name = Фазовий ткач block.pulverizer.name = Подрібнювач -block.cryofluidmixer.name = Змішувач кріогенної рідини +block.cryofluid-mixer.name = Змішувач кріогенної рідини block.melter.name = Плавильня block.incinerator.name = Сміттєспалювальний завод block.spore-press.name = Споровий прес @@ -1199,7 +1199,7 @@ block.kiln.description = Виплавляє пісок та свинець у с block.plastanium-compressor.description = Виробляє пластаній із нафти та титану. block.phase-weaver.description = Синтезує фазову тканину з радіоактивного торію та піску. Для роботи потрібна велика кількість енергії. block.alloy-smelter.description = Поєднує титан, свинець, кремній і мідь для отримання кінетичного сплаву. -block.cryofluidmixer.description = Змішує воду і дрібний порошок титану в кріогенну рідину. Основне використання в торієвому реактору. +block.cryofluid-mixer.description = Змішує воду і дрібний порошок титану в кріогенну рідину. Основне використання в торієвому реактору. block.blast-mixer.description = Подрібнює і змішує скупчення спор із піротитом для отримання вибухової суміші. block.pyratite-mixer.description = Змішує вугілля, свинець та пісок у легкозаймистий піротит. block.melter.description = Розплавляє брухт у шлак для подальшого перероблювання, або використання в баштах «Хвиля». diff --git a/core/assets/bundles/bundle_zh_CN.properties b/core/assets/bundles/bundle_zh_CN.properties index 069bc2ed8e..506a29aa99 100644 --- a/core/assets/bundles/bundle_zh_CN.properties +++ b/core/assets/bundles/bundle_zh_CN.properties @@ -1043,7 +1043,7 @@ block.underflow-gate.name = 反向溢流门 block.silicon-smelter.name = 硅冶炼厂 block.phase-weaver.name = 相织物编织器 block.pulverizer.name = 粉碎机 -block.cryofluidmixer.name = 冷冻液混合器 +block.cryofluid-mixer.name = 冷冻液混合器 block.melter.name = 熔炉 block.incinerator.name = 焚化炉 block.spore-press.name = 孢子压缩机 @@ -1199,7 +1199,7 @@ block.kiln.description = 将铅和沙子熔炼成钢化玻璃，需要少量电 block.plastanium-compressor.description = 用石油和钛生产塑钢。 block.phase-weaver.description = 用放射性钍和大量沙子生产相织物。 block.alloy-smelter.description = 用钛、铅、硅和铜生产巨浪合金。 -block.cryofluidmixer.description = 将水和细的钛粉混成冷却液。钍反应堆的必备之物。 +block.cryofluid-mixer.description = 将水和细的钛粉混成冷却液。钍反应堆的必备之物。 block.blast-mixer.description = 用油料将硫转化为不易燃但更具爆炸性的爆炸化合物。 block.pyratite-mixer.description = 将煤、铅和沙子混合成高度易燃的硫。 block.melter.description = 将废料熔化成矿渣，以便进一步加工或用于炮塔弹药。 diff --git a/core/assets/bundles/bundle_zh_TW.properties b/core/assets/bundles/bundle_zh_TW.properties index ae572fdb39..85efa9a527 100644 --- a/core/assets/bundles/bundle_zh_TW.properties +++ b/core/assets/bundles/bundle_zh_TW.properties @@ -1043,7 +1043,7 @@ block.underflow-gate.name = 反向溢流器 block.silicon-smelter.name = 煉矽廠 block.phase-weaver.name = 相織布編織器 block.pulverizer.name = 粉碎機 -block.cryofluidmixer.name = 冷凍液混合器 +block.cryofluid-mixer.name = 冷凍液混合器 block.melter.name = 熔爐 block.incinerator.name = 焚化爐 block.spore-press.name = 孢子壓縮機 @@ -1199,7 +1199,7 @@ block.kiln.description = 將沙子和鉛熔煉成鋼化玻璃。需要少量能 block.plastanium-compressor.description = 將原油和鈦壓縮製造塑鋼。 block.phase-weaver.description = 使用放射性的釷和大量的沙子生產相織布。需要巨量能量。 block.alloy-smelter.description = 使用鈦、鉛、矽和銅以生產波動合金。 -block.cryofluidmixer.description = 混合水和研磨的鈦粉製造冷卻效率更高的冷凍液。對釷反應堆是必要的。 +block.cryofluid-mixer.description = 混合水和研磨的鈦粉製造冷卻效率更高的冷凍液。對釷反應堆是必要的。 block.blast-mixer.description = 混合胞子碎塊將火焰彈變成比較不易燃但更具爆炸性的爆炸混合物。 block.pyratite-mixer.description = 混合煤、鉛和沙子混合成為易燃的火焰彈。 block.melter.description = 將廢料加熱到很高的溫度產生熔渣，用於進一步製程或波浪炮。 diff --git a/core/assets/contributors b/core/assets/contributors index 7cff98715f..69de5a3d8e 100644 --- a/core/assets/contributors +++ b/core/assets/contributors @@ -94,3 +94,4 @@ The Slaylord ThePlayerA YellOw139 PetrGasparik +LeoDog896 diff --git a/core/assets/icons/icons.properties b/core/assets/icons/icons.properties index e5778f6442..b07514ea1b 100755 --- a/core/assets/icons/icons.properties +++ b/core/assets/icons/icons.properties @@ -62,7 +62,7 @@ 63674=plastanium-compressor|block-plastanium-compressor-medium 63673=phase-weaver|block-phase-weaver-medium 63672=alloy-smelter|block-alloy-smelter-medium -63671=cryofluidmixer|block-cryofluidmixer-medium +63671=cryofluid-mixer|block-cryofluid-mixer-medium 63670=blast-mixer|block-blast-mixer-medium 63669=pyratite-mixer|block-pyratite-mixer-medium 63668=melter|block-melter-medium @@ -311,3 +311,5 @@ 63425=vela|unit-vela-medium 63424=corvus|unit-corvus-medium 63423=memory-bank|block-memory-bank-medium +63422=foreshadow|block-foreshadow-medium +63421=tsunami|block-tsunami-medium diff --git a/core/assets/music/game4.ogg b/core/assets/music/game4.ogg index 5b9dbe5ee4..051c414540 100644 Binary files a/core/assets/music/game4.ogg and b/core/assets/music/game4.ogg differ diff --git a/core/assets/scripts/global.js b/core/assets/scripts/global.js index 8910dbd2a9..81a07f2bef 100755 --- a/core/assets/scripts/global.js +++ b/core/assets/scripts/global.js @@ -108,7 +108,6 @@ importPackage(Packages.mindustry.world.draw) importPackage(Packages.mindustry.world.meta) importPackage(Packages.mindustry.world.meta.values) importPackage(Packages.mindustry.world.modules) -importPackage(Packages.mindustry.world.producers) const PlayerIpUnbanEvent = Packages.mindustry.game.EventType.PlayerIpUnbanEvent const PlayerIpBanEvent = Packages.mindustry.game.EventType.PlayerIpBanEvent const PlayerUnbanEvent = Packages.mindustry.game.EventType.PlayerUnbanEvent @@ -118,6 +117,7 @@ const PlayerConnect = Packages.mindustry.game.EventType.PlayerConnect const PlayerJoin = Packages.mindustry.game.EventType.PlayerJoin const UnitChangeEvent = Packages.mindustry.game.EventType.UnitChangeEvent const UnitCreateEvent = Packages.mindustry.game.EventType.UnitCreateEvent +const UnitDrownEvent = Packages.mindustry.game.EventType.UnitDrownEvent const UnitDestroyEvent = Packages.mindustry.game.EventType.UnitDestroyEvent const BlockDestroyEvent = Packages.mindustry.game.EventType.BlockDestroyEvent const BuildSelectEvent = Packages.mindustry.game.EventType.BuildSelectEvent @@ -128,6 +128,7 @@ const UnlockEvent = Packages.mindustry.game.EventType.UnlockEvent const StateChangeEvent = Packages.mindustry.game.EventType.StateChangeEvent const TileChangeEvent = Packages.mindustry.game.EventType.TileChangeEvent const GameOverEvent = Packages.mindustry.game.EventType.GameOverEvent +const TapEvent = Packages.mindustry.game.EventType.TapEvent const ConfigEvent = Packages.mindustry.game.EventType.ConfigEvent const DepositEvent = Packages.mindustry.game.EventType.DepositEvent const WithdrawEvent = Packages.mindustry.game.EventType.WithdrawEvent diff --git a/core/assets/sprites/block_colors.png b/core/assets/sprites/block_colors.png index 2e56024196..ccbd6ed7e2 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/fallback/sprites.atlas b/core/assets/sprites/fallback/sprites.atlas index f667e53905..13e8478d73 100644 --- a/core/assets/sprites/fallback/sprites.atlas +++ b/core/assets/sprites/fallback/sprites.atlas @@ -779,457 +779,443 @@ size: 2048,2048 format: rgba8888 filter: nearest,nearest repeat: none -core-silo - rotate: false - xy: 195, 1466 - size: 160, 160 - orig: 160, 160 - offset: 0, 0 - index: -1 launch-pad rotate: false - xy: 1565, 1467 + xy: 813, 99 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 launch-pad-large rotate: false - xy: 725, 363 + xy: 725, 1041 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 launch-pad-light rotate: false - xy: 1663, 1467 + xy: 813, 1 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 force-projector rotate: false - xy: 1349, 773 + xy: 1527, 1221 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 force-projector-top rotate: false - xy: 1349, 675 + xy: 1625, 1193 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 overdrive-dome rotate: false - xy: 1561, 1271 + xy: 1589, 1095 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 overdrive-dome-top rotate: false - xy: 1463, 1173 + xy: 1687, 1095 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 block-loader rotate: false - xy: 1055, 479 + xy: 1267, 529 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 block-unloader rotate: false - xy: 1157, 969 + xy: 1231, 235 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 mass-driver-base rotate: false - xy: 1663, 1369 + xy: 1009, 5 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 payload-conveyor rotate: false - xy: 1659, 1271 + xy: 1785, 1095 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 payload-conveyor-edge rotate: false - xy: 1561, 1173 + xy: 1589, 997 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 payload-conveyor-top rotate: false - xy: 1757, 1271 + xy: 1687, 997 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 payload-router-top rotate: false - xy: 1757, 1271 + xy: 1687, 997 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 payload-router rotate: false - xy: 1659, 1173 + xy: 1785, 997 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 payload-router-edge rotate: false - xy: 1757, 1173 + xy: 1883, 1095 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 payload-router-over rotate: false - xy: 1353, 1075 + xy: 1883, 997 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 blast-drill rotate: false - xy: 335, 571 + xy: 335, 1233 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 blast-drill-rim rotate: false - xy: 335, 441 + xy: 335, 1103 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 blast-drill-rotator rotate: false - xy: 325, 311 + xy: 465, 1233 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 blast-drill-top rotate: false - xy: 325, 181 + xy: 335, 973 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 laser-drill rotate: false - xy: 1349, 89 + xy: 1491, 1025 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 laser-drill-rim rotate: false - xy: 1271, 1467 + xy: 813, 295 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 laser-drill-rotator rotate: false - xy: 1369, 1467 + xy: 911, 295 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 laser-drill-top rotate: false - xy: 1467, 1467 + xy: 813, 197 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 oil-extractor rotate: false - xy: 1267, 1173 + xy: 1205, 137 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 oil-extractor-liquid rotate: false - xy: 1365, 1271 + xy: 1205, 39 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 oil-extractor-rotator rotate: false - xy: 1463, 1271 + xy: 1303, 137 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 oil-extractor-top rotate: false - xy: 1365, 1173 + xy: 1303, 39 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 place-arrow rotate: false - xy: 1353, 977 + xy: 1919, 1193 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 liquid-tank-bottom rotate: false - xy: 1761, 1467 + xy: 911, 197 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 liquid-tank-liquid rotate: false - xy: 1271, 1369 + xy: 911, 99 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 liquid-tank-top rotate: false - xy: 1369, 1369 + xy: 911, 1 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 thermal-pump rotate: false - xy: 1447, 879 + xy: 1365, 847 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 hyper-processor rotate: false - xy: 1349, 381 + xy: 1491, 1123 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 logic-display rotate: false - xy: 1467, 1369 + xy: 1009, 201 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 battery-large rotate: false - xy: 957, 437 + xy: 1169, 921 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 battery-large-top rotate: false - xy: 957, 339 + xy: 1169, 823 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 differential-generator rotate: false - xy: 1251, 773 + xy: 1445, 1319 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 differential-generator-liquid rotate: false - xy: 1251, 675 + xy: 1543, 1319 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 differential-generator-top rotate: false - xy: 1251, 577 + xy: 1641, 1389 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 impact-reactor rotate: false - xy: 725, 1273 + xy: 595, 583 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 impact-reactor-bottom rotate: false - xy: 725, 1143 + xy: 595, 453 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 impact-reactor-light rotate: false - xy: 725, 1013 + xy: 585, 323 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 impact-reactor-plasma-0 rotate: false - xy: 725, 883 + xy: 585, 193 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 impact-reactor-plasma-1 rotate: false - xy: 725, 753 + xy: 585, 63 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 impact-reactor-plasma-2 rotate: false - xy: 725, 623 + xy: 725, 1301 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 impact-reactor-plasma-3 rotate: false - xy: 725, 493 + xy: 725, 1171 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 solar-panel-large rotate: false - xy: 1745, 977 + xy: 1883, 899 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 thorium-reactor rotate: false - xy: 1447, 781 + xy: 1365, 749 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 thorium-reactor-lights rotate: false - xy: 1545, 879 + xy: 1365, 651 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 thorium-reactor-top rotate: false - xy: 1447, 683 + xy: 1365, 553 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 alloy-smelter rotate: false - xy: 957, 633 + xy: 1071, 725 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 alloy-smelter-top rotate: false - xy: 957, 535 + xy: 1071, 627 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 -blast-mixer - rotate: false - xy: 1879, 570 - size: 64, 64 - orig: 64, 64 - offset: 0, 0 - index: -1 block-forge rotate: false - xy: 1059, 969 + xy: 1267, 725 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 disassembler rotate: false - xy: 1251, 479 + xy: 1739, 1389 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 disassembler-liquid rotate: false - xy: 1251, 381 + xy: 1837, 1389 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 disassembler-spinner rotate: false - xy: 1251, 283 + xy: 1641, 1291 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 multi-press rotate: false - xy: 1761, 1369 + xy: 1107, 137 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 silicon-crucible rotate: false - xy: 1647, 977 + xy: 1687, 899 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 silicon-crucible-top rotate: false - xy: 1745, 1075 + xy: 1785, 899 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 core-foundation rotate: false - xy: 465, 571 + xy: 465, 583 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 core-foundation-team rotate: false - xy: 465, 441 + xy: 335, 453 size: 128, 128 orig: 128, 128 offset: 0, 0 @@ -1250,350 +1236,350 @@ core-nucleus-team index: -1 core-shard rotate: false - xy: 1153, 773 + xy: 1331, 1141 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 core-shard-team rotate: false - xy: 1153, 675 + xy: 1295, 1039 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 vault rotate: false - xy: 1545, 781 + xy: 1463, 535 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 vault-team rotate: false - xy: 1643, 879 + xy: 1561, 801 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 -block-2 - rotate: false - xy: 1945, 572 - size: 64, 64 - orig: 64, 64 - offset: 0, 0 - index: -1 block-3 rotate: false - xy: 957, 241 + xy: 1169, 725 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 block-4 rotate: false - xy: 325, 51 + xy: 465, 1103 + size: 128, 128 + orig: 128, 128 + offset: 0, 0 + index: -1 +foreshadow-heat + rotate: false + xy: 595, 713 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 meltdown-heat rotate: false - xy: 585, 193 + xy: 725, 781 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 ripple-heat rotate: false - xy: 1451, 977 + xy: 1401, 39 + size: 96, 96 + orig: 96, 96 + offset: 0, 0 + index: -1 +tsunami-liquid + rotate: false + xy: 1463, 731 + size: 96, 96 + orig: 96, 96 + offset: 0, 0 + index: -1 +tsunami-top + rotate: false + xy: 1463, 633 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 additive-reconstructor rotate: false - xy: 957, 927 + xy: 1099, 1019 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 additive-reconstructor-top rotate: false - xy: 957, 829 + xy: 1071, 921 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 air-factory rotate: false - xy: 957, 731 + xy: 1071, 823 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 factory-in-3 rotate: false - xy: 1251, 185 + xy: 1739, 1291 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 factory-in-5 rotate: false - xy: 163, 8 + xy: 163, 170 size: 160, 160 orig: 160, 160 offset: 0, 0 index: -1 factory-out-3 rotate: false - xy: 1251, 87 + xy: 1837, 1291 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 factory-out-5 rotate: false - xy: 389, 1745 + xy: 163, 8 size: 160, 160 orig: 160, 160 offset: 0, 0 index: -1 factory-top-3 rotate: false - xy: 1349, 871 + xy: 1429, 1221 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 ground-factory rotate: false - xy: 1349, 479 + xy: 1821, 1193 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 multiplicative-reconstructor rotate: false - xy: 551, 1745 + xy: 389, 1745 size: 160, 160 orig: 160, 160 offset: 0, 0 index: -1 multiplicative-reconstructor-top rotate: false - xy: 713, 1745 + xy: 551, 1745 size: 160, 160 orig: 160, 160 offset: 0, 0 index: -1 naval-factory rotate: false - xy: 1267, 1271 + xy: 1107, 39 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 scrap-wall-gigantic rotate: false - xy: 1385, 1565 + xy: 985, 1313 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 scrap-wall-huge2 rotate: false - xy: 1549, 977 + xy: 1491, 927 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 scrap-wall-huge3 rotate: false - xy: 1647, 1075 + xy: 1589, 899 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 thruster rotate: false - xy: 1645, 1565 + xy: 985, 1183 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 circle-end rotate: false - xy: 855, 1030 + xy: 969, 852 size: 100, 199 orig: 100, 199 offset: 0, 0 index: -1 large-bomb rotate: false - xy: 715, 1 + xy: 1245, 1341 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 large-bomb-back rotate: false - xy: 817, 1 + xy: 855, 495 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 laser-end rotate: false - xy: 1813, 710 + xy: 1945, 1543 size: 72, 72 orig: 72, 72 offset: 0, 0 index: -1 minelaser-end rotate: false - xy: 1813, 636 + xy: 1951, 325 size: 72, 72 orig: 72, 72 offset: 0, 0 index: -1 parallax-laser-end rotate: false - xy: 1889, 784 + xy: 1609, 303 size: 72, 72 orig: 72, 72 offset: 0, 0 index: -1 arkyid-foot rotate: false - xy: 1887, 638 + xy: 1757, 319 size: 70, 70 orig: 70, 70 offset: 0, 0 index: -1 arkyid-joint-base rotate: false - xy: 1807, 564 + xy: 1829, 319 size: 70, 70 orig: 70, 70 offset: 0, 0 index: -1 arkyid-leg-base rotate: false - xy: 969, 1393 + xy: 725, 455 size: 104, 64 orig: 104, 64 offset: 0, 0 index: -1 arkyid-outline rotate: false - xy: 335, 1091 + xy: 1067, 1443 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 arkyid-wreck0 rotate: false - xy: 335, 961 + xy: 1197, 1443 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 arkyid-wreck1 rotate: false - xy: 335, 831 + xy: 357, 1363 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 arkyid-wreck2 rotate: false - xy: 335, 701 + xy: 487, 1363 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 artillery-mount-outline rotate: false - xy: 1789, 420 + xy: 1755, 247 size: 70, 70 orig: 70, 70 offset: 0, 0 index: -1 atrax-outline rotate: false - xy: 1641, 593 + xy: 1519, 245 size: 88, 64 orig: 88, 64 offset: 0, 0 index: -1 atrax-wreck0 rotate: false - xy: 1045, 21 + xy: 1499, 179 size: 88, 64 orig: 88, 64 offset: 0, 0 index: -1 atrax-wreck1 rotate: false - xy: 1135, 21 + xy: 1499, 113 size: 88, 64 orig: 88, 64 offset: 0, 0 index: -1 atrax-wreck2 rotate: false - xy: 1225, 21 + xy: 1499, 47 size: 88, 64 orig: 88, 64 offset: 0, 0 index: -1 beam-weapon-outline rotate: false - xy: 1837, 858 + xy: 1827, 555 size: 80, 80 orig: 80, 80 offset: 0, 0 index: -1 block-additive-reconstructor-full rotate: false - xy: 1075, 1361 + xy: 1169, 627 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 block-air-factory-full rotate: false - xy: 1071, 1263 + xy: 1197, 1019 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 block-blast-drill-full rotate: false - xy: 465, 1221 + xy: 335, 843 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 -block-command-center-full - rotate: false - xy: 1933, 504 - size: 64, 64 - orig: 64, 64 - offset: 0, 0 - index: -1 -block-container-full - rotate: false - xy: 1933, 438 - size: 64, 64 - orig: 64, 64 - offset: 0, 0 - index: -1 block-core-foundation-full rotate: false - xy: 465, 1091 + xy: 465, 973 size: 128, 128 orig: 128, 128 offset: 0, 0 @@ -1607,91 +1593,70 @@ block-core-nucleus-full index: -1 block-core-shard-full rotate: false - xy: 1071, 1165 + xy: 1267, 921 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 -block-cryofluidmixer-full - rotate: false - xy: 1897, 202 - size: 64, 64 - orig: 64, 64 - offset: 0, 0 - index: -1 -block-cultivator-full - rotate: false - xy: 1897, 136 - size: 64, 64 - orig: 64, 64 - offset: 0, 0 - index: -1 block-cyclone-full rotate: false - xy: 1059, 1067 + xy: 1267, 823 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 +block-foreshadow-full + rotate: false + xy: 335, 713 + size: 128, 128 + orig: 128, 128 + offset: 0, 0 + index: -1 block-fuse-full rotate: false - xy: 1055, 871 + xy: 1267, 627 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 block-ground-factory-full rotate: false - xy: 1055, 773 + xy: 1035, 397 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 block-impact-reactor-full rotate: false - xy: 465, 961 + xy: 465, 843 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 -block-lancer-full - rotate: false - xy: 1893, 70 - size: 64, 64 - orig: 64, 64 - offset: 0, 0 - index: -1 block-laser-drill-full rotate: false - xy: 1055, 675 + xy: 1071, 529 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 block-liquid-tank-full rotate: false - xy: 1055, 577 + xy: 1169, 529 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 block-mass-driver-full rotate: false - xy: 1055, 381 + xy: 1133, 431 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 -block-mechanical-drill-full - rotate: false - xy: 1891, 4 - size: 64, 64 - orig: 64, 64 - offset: 0, 0 - index: -1 block-meltdown-full rotate: false - xy: 465, 831 + xy: 335, 583 size: 128, 128 orig: 128, 128 offset: 0, 0 @@ -1705,203 +1670,126 @@ block-multiplicative-reconstructor-full index: -1 block-naval-factory-full rotate: false - xy: 1055, 283 + xy: 1231, 431 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 block-oil-extractor-full rotate: false - xy: 1055, 185 + xy: 1329, 431 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 -block-parallax-full - rotate: false - xy: 1959, 70 - size: 64, 64 - orig: 64, 64 - offset: 0, 0 - index: -1 block-payload-conveyor-full rotate: false - xy: 957, 143 + xy: 1133, 333 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 payload-conveyor-icon rotate: false - xy: 957, 143 + xy: 1133, 333 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 block-payload-router-full rotate: false - xy: 1055, 87 + xy: 1231, 333 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 payload-router-icon rotate: false - xy: 1055, 87 + xy: 1231, 333 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 -block-phase-weaver-full - rotate: false - xy: 1957, 4 - size: 64, 64 - orig: 64, 64 - offset: 0, 0 - index: -1 -block-pneumatic-drill-full - rotate: false - xy: 1961, 718 - size: 64, 64 - orig: 64, 64 - offset: 0, 0 - index: -1 block-ripple-full rotate: false - xy: 947, 45 + xy: 1329, 333 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 -block-salvo-full - rotate: false - xy: 1961, 652 - size: 64, 64 - orig: 64, 64 - offset: 0, 0 - index: -1 -block-scatter-full - rotate: false - xy: 1861, 426 - size: 64, 64 - orig: 64, 64 - offset: 0, 0 - index: -1 block-scrap-wall-huge-full rotate: false - xy: 1157, 1067 + xy: 1035, 299 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 scrap-wall-huge1 rotate: false - xy: 1157, 1067 + xy: 1035, 299 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 -block-scrap-wall-large-full - rotate: false - xy: 1861, 360 - size: 64, 64 - orig: 64, 64 - offset: 0, 0 - index: -1 -block-segment-full - rotate: false - xy: 1927, 372 - size: 64, 64 - orig: 64, 64 - offset: 0, 0 - index: -1 block-spectre-full rotate: false - xy: 465, 701 + xy: 465, 713 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 -block-spore-press-full +block-tsunami-full rotate: false - xy: 1899, 294 - size: 64, 64 - orig: 64, 64 - offset: 0, 0 - index: -1 -block-steam-generator-full - rotate: false - xy: 1965, 306 - size: 64, 64 - orig: 64, 64 - offset: 0, 0 - index: -1 -block-swarmer-full - rotate: false - xy: 1965, 240 - size: 64, 64 - orig: 64, 64 - offset: 0, 0 - index: -1 -block-vault-full - rotate: false - xy: 1153, 871 + xy: 1133, 235 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 -block-water-extractor-full +block-vault-full rotate: false - xy: 1963, 174 - size: 64, 64 - orig: 64, 64 - offset: 0, 0 - index: -1 -block-wave-full - rotate: false - xy: 1963, 835 - size: 64, 64 - orig: 64, 64 + xy: 1329, 235 + size: 96, 96 + orig: 96, 96 offset: 0, 0 index: -1 bryde-outline rotate: false - xy: 665, 1403 + xy: 675, 1573 size: 140, 140 orig: 140, 140 offset: 0, 0 index: -1 bryde-wreck0 rotate: false - xy: 829, 1573 + xy: 817, 1573 size: 140, 140 orig: 140, 140 offset: 0, 0 index: -1 bryde-wreck1 rotate: false - xy: 971, 1573 + xy: 959, 1573 size: 140, 140 orig: 140, 140 offset: 0, 0 index: -1 bryde-wreck2 rotate: false - xy: 1113, 1573 + xy: 1101, 1573 size: 140, 140 orig: 140, 140 offset: 0, 0 index: -1 core-foundation-team-crux rotate: false - xy: 455, 311 + xy: 465, 453 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 core-foundation-team-sharded rotate: false - xy: 455, 181 + xy: 325, 323 size: 128, 128 orig: 128, 128 offset: 0, 0 @@ -1922,399 +1810,392 @@ core-nucleus-team-sharded index: -1 core-shard-team-crux rotate: false - xy: 1153, 577 + xy: 1393, 1043 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 core-shard-team-sharded rotate: false - xy: 1153, 479 + xy: 1357, 1515 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 corvus-foot rotate: false - xy: 1447, 262 + xy: 1427, 289 size: 90, 90 orig: 90, 90 offset: 0, 0 index: -1 corvus-joint-base rotate: false - xy: 1789, 348 + xy: 1827, 247 size: 70, 70 orig: 70, 70 offset: 0, 0 index: -1 toxopid-joint-base rotate: false - xy: 1789, 348 + xy: 1827, 247 size: 70, 70 orig: 70, 70 offset: 0, 0 index: -1 cracks-3-0 rotate: false - xy: 1153, 381 + xy: 1455, 1515 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 cracks-3-1 rotate: false - xy: 1153, 283 + xy: 1553, 1515 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 cracks-3-2 rotate: false - xy: 1153, 185 + xy: 1651, 1487 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 cracks-3-3 rotate: false - xy: 1153, 87 + xy: 1749, 1487 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 cracks-3-4 rotate: false - xy: 1169, 1263 + xy: 1847, 1487 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 cracks-3-5 rotate: false - xy: 1169, 1165 + xy: 1347, 1417 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 cracks-3-6 rotate: false - xy: 1255, 1067 + xy: 1347, 1319 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 cracks-3-7 rotate: false - xy: 1255, 969 + xy: 1445, 1417 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 cracks-4-0 rotate: false - xy: 455, 51 + xy: 325, 193 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 cracks-4-1 rotate: false - xy: 595, 1233 + xy: 455, 323 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 cracks-4-2 rotate: false - xy: 595, 1103 + xy: 325, 63 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 cracks-4-3 rotate: false - xy: 595, 973 + xy: 455, 193 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 cracks-4-4 rotate: false - xy: 595, 843 + xy: 455, 63 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 cracks-4-5 rotate: false - xy: 595, 713 + xy: 595, 1233 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 cracks-4-6 rotate: false - xy: 595, 583 + xy: 595, 1103 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 cracks-4-7 rotate: false - xy: 595, 453 + xy: 595, 973 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 cracks-5-0 rotate: false - xy: 173, 1304 + xy: 195, 1466 size: 160, 160 orig: 160, 160 offset: 0, 0 index: -1 cracks-5-1 rotate: false - xy: 173, 1142 + xy: 173, 1304 size: 160, 160 orig: 160, 160 offset: 0, 0 index: -1 cracks-5-2 rotate: false - xy: 173, 980 + xy: 173, 1142 size: 160, 160 orig: 160, 160 offset: 0, 0 index: -1 cracks-5-3 rotate: false - xy: 173, 818 + xy: 173, 980 size: 160, 160 orig: 160, 160 offset: 0, 0 index: -1 cracks-5-4 rotate: false - xy: 173, 656 + xy: 173, 818 size: 160, 160 orig: 160, 160 offset: 0, 0 index: -1 cracks-5-5 rotate: false - xy: 173, 494 + xy: 173, 656 size: 160, 160 orig: 160, 160 offset: 0, 0 index: -1 cracks-5-6 rotate: false - xy: 163, 332 + xy: 173, 494 size: 160, 160 orig: 160, 160 offset: 0, 0 index: -1 cracks-5-7 rotate: false - xy: 163, 170 + xy: 163, 332 size: 160, 160 orig: 160, 160 offset: 0, 0 index: -1 cyclone rotate: false - xy: 1251, 871 + xy: 1543, 1417 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 +foreshadow + rotate: false + xy: 595, 843 + size: 128, 128 + orig: 128, 128 + offset: 0, 0 + index: -1 fortress-leg rotate: false - xy: 585, 1 + xy: 325, 1 size: 80, 60 orig: 80, 60 offset: 0, 0 index: -1 fortress-outline rotate: false - xy: 855, 866 + xy: 969, 606 size: 100, 80 orig: 100, 80 offset: 0, 0 index: -1 fortress-wreck0 rotate: false - xy: 855, 784 + xy: 1357, 1613 size: 100, 80 orig: 100, 80 offset: 0, 0 index: -1 fortress-wreck1 rotate: false - xy: 855, 702 + xy: 1459, 1613 size: 100, 80 orig: 100, 80 offset: 0, 0 index: -1 fortress-wreck2 rotate: false - xy: 855, 620 + xy: 1561, 1613 size: 100, 80 orig: 100, 80 offset: 0, 0 index: -1 fuse rotate: false - xy: 1349, 577 + xy: 1723, 1193 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 gamma-outline rotate: false - xy: 1683, 117 + xy: 1967, 105 size: 68, 68 orig: 68, 68 offset: 0, 0 index: -1 gamma-wreck0 rotate: false - xy: 1753, 117 - size: 68, 68 - orig: 68, 68 - offset: 0, 0 - index: -1 -gamma-wreck1 - rotate: false - xy: 1863, 494 - size: 68, 68 - orig: 68, 68 - offset: 0, 0 - index: -1 -gamma-wreck2 - rotate: false - xy: 1611, 98 + xy: 1967, 35 size: 68, 68 orig: 68, 68 offset: 0, 0 index: -1 horizon-outline rotate: false - xy: 1739, 752 + xy: 1837, 1687 size: 72, 72 orig: 72, 72 offset: 0, 0 index: -1 horizon-wreck0 rotate: false - xy: 1739, 678 + xy: 1911, 1691 size: 72, 72 orig: 72, 72 offset: 0, 0 index: -1 horizon-wreck1 rotate: false - xy: 1733, 604 + xy: 1867, 1613 size: 72, 72 orig: 72, 72 offset: 0, 0 index: -1 horizon-wreck2 rotate: false - xy: 1815, 784 + xy: 1941, 1617 size: 72, 72 orig: 72, 72 offset: 0, 0 index: -1 large-bullet-mount-outline rotate: false - xy: 1539, 156 + xy: 1679, 55 size: 70, 97 orig: 70, 97 offset: 0, 0 index: -1 large-laser-mount-outline rotate: false - xy: 1173, 1371 + xy: 715, 65 size: 96, 192 orig: 96, 192 offset: 0, 0 index: -1 large-purple-mount-outline rotate: false - xy: 1611, 248 + xy: 1823, 148 size: 70, 97 orig: 70, 97 offset: 0, 0 index: -1 mass-driver rotate: false - xy: 1565, 1369 + xy: 1009, 103 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 mega-outline rotate: false - xy: 855, 314 + xy: 1245, 1239 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 mega-wreck0 rotate: false - xy: 855, 212 + xy: 1229, 1137 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 mega-wreck1 rotate: false - xy: 845, 110 + xy: 831, 393 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 mega-wreck2 rotate: false - xy: 969, 1209 + xy: 933, 393 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 meltdown rotate: false - xy: 595, 323 + xy: 725, 911 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 minke-outline rotate: false - xy: 1859, 1434 + xy: 1589, 142 size: 88, 101 orig: 88, 101 offset: 0, 0 index: -1 minke-wreck0 rotate: false - xy: 1949, 1434 + xy: 1589, 39 size: 88, 101 orig: 88, 101 offset: 0, 0 index: -1 minke-wreck1 rotate: false - xy: 1859, 1331 + xy: 1935, 1384 size: 88, 101 orig: 88, 101 offset: 0, 0 index: -1 minke-wreck2 rotate: false - xy: 1949, 1331 + xy: 1757, 719 size: 88, 101 orig: 88, 101 offset: 0, 0 @@ -2326,65 +2207,37 @@ omura-cannon-outline orig: 192, 277 offset: 0, 0 index: -1 -pulsar-outline - rotate: false - xy: 1681, 57 - size: 68, 58 - orig: 68, 58 - offset: 0, 0 - index: -1 -pulsar-wreck0 - rotate: false - xy: 1751, 57 - size: 68, 58 - orig: 68, 58 - offset: 0, 0 - index: -1 -pulsar-wreck1 - rotate: false - xy: 1827, 138 - size: 68, 58 - orig: 68, 58 - offset: 0, 0 - index: -1 -pulsar-wreck2 - rotate: false - xy: 1823, 78 - size: 68, 58 - orig: 68, 58 - offset: 0, 0 - index: -1 quasar-leg rotate: false - xy: 1543, 442 + xy: 1937, 735 size: 80, 80 orig: 80, 80 offset: 0, 0 index: -1 quasar-outline rotate: false - xy: 1543, 360 + xy: 1705, 481 size: 80, 80 orig: 80, 80 offset: 0, 0 index: -1 quasar-wreck0 rotate: false - xy: 1627, 511 + xy: 1705, 399 size: 80, 80 orig: 80, 80 offset: 0, 0 index: -1 quasar-wreck1 rotate: false - xy: 1625, 429 + xy: 1787, 473 size: 80, 80 orig: 80, 80 offset: 0, 0 index: -1 quasar-wreck2 rotate: false - xy: 1625, 347 + xy: 1869, 473 size: 80, 80 orig: 80, 80 offset: 0, 0 @@ -2398,56 +2251,56 @@ reign-leg index: -1 reign-weapon-outline rotate: false - xy: 1843, 1022 + xy: 1742, 579 size: 83, 138 orig: 83, 138 offset: 0, 0 index: -1 ripple rotate: false - xy: 1451, 1075 + xy: 1401, 137 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 risso-outline rotate: false - xy: 1683, 267 + xy: 1823, 68 size: 70, 78 orig: 70, 78 offset: 0, 0 index: -1 risso-wreck0 rotate: false - xy: 1683, 187 + xy: 1895, 167 size: 70, 78 orig: 70, 78 offset: 0, 0 index: -1 risso-wreck1 rotate: false - xy: 1755, 267 + xy: 1895, 87 size: 70, 78 orig: 70, 78 offset: 0, 0 index: -1 risso-wreck2 rotate: false - xy: 1755, 187 + xy: 1895, 7 size: 70, 78 orig: 70, 78 offset: 0, 0 index: -1 scepter-leg rotate: false - xy: 1255, 1565 + xy: 855, 1183 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 vela-leg rotate: false - xy: 1255, 1565 + xy: 855, 1183 size: 128, 128 orig: 128, 128 offset: 0, 0 @@ -2482,161 +2335,154 @@ scepter-wreck2 index: -1 sei-launcher-outline rotate: false - xy: 1707, 429 + xy: 1869, 391 size: 80, 80 orig: 80, 80 offset: 0, 0 index: -1 spectre rotate: false - xy: 1515, 1565 + xy: 855, 1053 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 spiroct-outline rotate: false - xy: 1447, 508 + xy: 1757, 822 size: 94, 75 orig: 94, 75 offset: 0, 0 index: -1 spiroct-wreck0 rotate: false - xy: 1545, 606 + xy: 1561, 549 size: 94, 75 orig: 94, 75 offset: 0, 0 index: -1 spiroct-wreck1 rotate: false - xy: 1643, 725 + xy: 1853, 822 size: 94, 75 orig: 94, 75 offset: 0, 0 index: -1 spiroct-wreck2 rotate: false - xy: 1447, 431 + xy: 1427, 458 size: 94, 75 orig: 94, 75 offset: 0, 0 index: -1 toxopid-foot rotate: false - xy: 1447, 170 + xy: 1523, 443 size: 90, 90 orig: 90, 90 offset: 0, 0 index: -1 toxopid-leg rotate: false - xy: 665, 1545 + xy: 1685, 1687 size: 150, 72 orig: 150, 72 offset: 0, 0 index: -1 toxopid-outline rotate: false - xy: 1037, 1715 + xy: 875, 1715 size: 160, 190 orig: 160, 190 offset: 0, 0 index: -1 toxopid-wreck0 rotate: false - xy: 1199, 1715 + xy: 1037, 1715 size: 160, 190 orig: 160, 190 offset: 0, 0 index: -1 toxopid-wreck1 rotate: false - xy: 1361, 1695 + xy: 1199, 1715 size: 160, 190 orig: 160, 190 offset: 0, 0 index: -1 toxopid-wreck2 rotate: false - xy: 1523, 1695 + xy: 1361, 1695 size: 160, 190 orig: 160, 190 offset: 0, 0 index: -1 +tsunami + rotate: false + xy: 1463, 829 + size: 96, 96 + orig: 96, 96 + offset: 0, 0 + index: -1 unit-arkyid-full rotate: false - xy: 1775, 1565 + xy: 1115, 1313 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 unit-atrax-full rotate: false - xy: 1855, 1265 + xy: 1935, 1318 size: 88, 64 orig: 88, 64 offset: 0, 0 index: -1 unit-bryde-full rotate: false - xy: 357, 1351 + xy: 665, 1431 size: 140, 140 orig: 140, 140 offset: 0, 0 index: -1 unit-fortress-full rotate: false - xy: 957, 1127 + xy: 1115, 1117 size: 100, 80 orig: 100, 80 offset: 0, 0 index: -1 -unit-gamma-full - rotate: false - xy: 1821, 8 - size: 68, 68 - orig: 68, 68 - offset: 0, 0 - index: -1 unit-horizon-full rotate: false - xy: 1887, 710 + xy: 1683, 325 size: 72, 72 orig: 72, 72 offset: 0, 0 index: -1 unit-mega-full rotate: false - xy: 957, 1025 + xy: 957, 495 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 unit-minke-full rotate: false - xy: 1855, 1162 + xy: 1847, 719 size: 88, 101 orig: 88, 101 offset: 0, 0 index: -1 -unit-pulsar-full - rotate: false - xy: 1928, 967 - size: 68, 58 - orig: 68, 58 - offset: 0, 0 - index: -1 unit-quasar-full rotate: false - xy: 1707, 347 + xy: 1951, 473 size: 80, 80 orig: 80, 80 offset: 0, 0 index: -1 unit-risso-full rotate: false - xy: 1827, 268 + xy: 1967, 245 size: 70, 78 orig: 70, 78 offset: 0, 0 @@ -2650,14 +2496,14 @@ unit-scepter-full index: -1 unit-spiroct-full rotate: false - xy: 1447, 354 + xy: 1427, 381 size: 94, 75 orig: 94, 75 offset: 0, 0 index: -1 unit-toxopid-full rotate: false - xy: 1685, 1695 + xy: 1523, 1695 size: 160, 190 orig: 160, 190 offset: 0, 0 @@ -2671,21 +2517,21 @@ unit-vela-full index: -1 unit-zenith-full rotate: false - xy: 1905, 1651 + xy: 1243, 1601 size: 112, 112 orig: 112, 112 offset: 0, 0 index: -1 vault-team-crux rotate: false - xy: 1447, 585 + xy: 1561, 703 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 vault-team-sharded rotate: false - xy: 1545, 683 + xy: 1659, 801 size: 96, 96 orig: 96, 96 offset: 0, 0 @@ -2720,63 +2566,56 @@ vela-wreck2 index: -1 zenith-outline rotate: false - xy: 931, 1459 + xy: 1115, 1199 size: 112, 112 orig: 112, 112 offset: 0, 0 index: -1 zenith-wreck0 rotate: false - xy: 1045, 1459 + xy: 855, 825 size: 112, 112 orig: 112, 112 offset: 0, 0 index: -1 zenith-wreck1 rotate: false - xy: 855, 1345 + xy: 855, 711 size: 112, 112 orig: 112, 112 offset: 0, 0 index: -1 zenith-wreck2 rotate: false - xy: 855, 1231 + xy: 855, 597 size: 112, 112 orig: 112, 112 offset: 0, 0 index: -1 arkyid rotate: false - xy: 499, 1363 + xy: 807, 1443 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 arkyid-cell rotate: false - xy: 335, 1221 + xy: 937, 1443 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 atrax rotate: false - xy: 1447, 104 + xy: 1523, 377 size: 88, 64 orig: 88, 64 offset: 0, 0 index: -1 -atrax-base - rotate: false - xy: 1925, 901 - size: 64, 64 - orig: 64, 64 - offset: 0, 0 - index: -1 atrax-cell rotate: false - xy: 1643, 659 + xy: 1519, 311 size: 88, 64 orig: 88, 64 offset: 0, 0 @@ -2797,70 +2636,70 @@ bryde-cell index: -1 corvus-base rotate: false - xy: 367, 1619 + xy: 1685, 1761 size: 152, 124 orig: 152, 124 offset: 0, 0 index: -1 fortress rotate: false - xy: 969, 1311 + xy: 969, 770 size: 100, 80 orig: 100, 80 offset: 0, 0 index: -1 fortress-cell rotate: false - xy: 855, 948 + xy: 969, 688 size: 100, 80 orig: 100, 80 offset: 0, 0 index: -1 gamma rotate: false - xy: 1827, 198 + xy: 1967, 175 size: 68, 68 orig: 68, 68 offset: 0, 0 index: -1 horizon rotate: false - xy: 1315, 13 + xy: 1347, 1245 size: 72, 72 orig: 72, 72 offset: 0, 0 index: -1 horizon-cell rotate: false - xy: 1741, 826 + xy: 1951, 399 size: 72, 72 orig: 72, 72 offset: 0, 0 index: -1 mega rotate: false - xy: 855, 518 + xy: 1663, 1585 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 mega-cell rotate: false - xy: 855, 416 + xy: 1765, 1585 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 minke rotate: false - xy: 1447, 1 + xy: 1615, 446 size: 88, 101 orig: 88, 101 offset: 0, 0 index: -1 minke-cell rotate: false - xy: 585, 63 + xy: 725, 651 size: 128, 128 orig: 128, 128 offset: 0, 0 @@ -2872,58 +2711,51 @@ omura-cannon-heat orig: 192, 277 offset: 0, 0 index: -1 -pulsar - rotate: false - xy: 1609, 38 - size: 68, 58 - orig: 68, 58 - offset: 0, 0 - index: -1 quasar rotate: false - xy: 1945, 1109 + xy: 1909, 637 size: 80, 80 orig: 80, 80 offset: 0, 0 index: -1 quasar-base rotate: false - xy: 1928, 1027 + xy: 1909, 555 size: 80, 80 orig: 80, 80 offset: 0, 0 index: -1 quasar-cell rotate: false - xy: 1545, 524 + xy: 1949, 817 size: 80, 80 orig: 80, 80 offset: 0, 0 index: -1 reign-base rotate: false - xy: 521, 1619 + xy: 367, 1619 size: 152, 124 orig: 152, 124 offset: 0, 0 index: -1 reign-cell rotate: false - xy: 675, 1619 + xy: 521, 1619 size: 152, 124 orig: 152, 124 offset: 0, 0 index: -1 risso rotate: false - xy: 1611, 168 + xy: 1751, 68 size: 70, 78 orig: 70, 78 offset: 0, 0 index: -1 risso-cell rotate: false - xy: 1549, 1075 + xy: 1393, 945 size: 96, 96 orig: 96, 96 offset: 0, 0 @@ -2937,42 +2769,42 @@ scepter index: -1 scepter-base rotate: false - xy: 725, 233 + xy: 725, 521 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 vela-base rotate: false - xy: 725, 233 + xy: 725, 521 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 scepter-cell rotate: false - xy: 715, 103 + xy: 855, 1313 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 spiroct rotate: false - xy: 1643, 802 + xy: 1561, 626 size: 94, 75 orig: 94, 75 offset: 0, 0 index: -1 spiroct-cell rotate: false - xy: 1741, 900 + xy: 1659, 724 size: 94, 75 orig: 94, 75 offset: 0, 0 index: -1 toxopid rotate: false - xy: 875, 1715 + xy: 713, 1715 size: 160, 190 orig: 160, 190 offset: 0, 0 @@ -3007,35 +2839,35 @@ vela-weapon-heat index: -1 artillery-mount rotate: false - xy: 1791, 492 + xy: 1683, 253 size: 70, 70 orig: 70, 70 offset: 0, 0 index: -1 beam-weapon rotate: false - xy: 1843, 940 + xy: 1827, 637 size: 80, 80 orig: 80, 80 offset: 0, 0 index: -1 large-bullet-mount rotate: false - xy: 1539, 255 + xy: 1679, 154 size: 70, 97 orig: 70, 97 offset: 0, 0 index: -1 large-laser-mount rotate: false - xy: 1349, 187 + xy: 715, 259 size: 96, 192 orig: 96, 192 offset: 0, 0 index: -1 large-purple-mount rotate: false - xy: 1537, 57 + xy: 1751, 148 size: 70, 97 orig: 70, 97 offset: 0, 0 @@ -3049,28 +2881,28 @@ omura-cannon-heat index: -1 reign-weapon rotate: false - xy: 1945, 1191 + xy: 1657, 563 size: 83, 138 orig: 83, 138 offset: 0, 0 index: -1 sei-launcher rotate: false - xy: 1709, 511 + xy: 1787, 391 size: 80, 80 orig: 80, 80 offset: 0, 0 index: -1 zenith rotate: false - xy: 1905, 1537 + xy: 855, 939 size: 112, 112 orig: 112, 112 offset: 0, 0 index: -1 zenith-cell rotate: false - xy: 817, 1459 + xy: 985, 1069 size: 112, 112 orig: 112, 112 offset: 0, 0 @@ -3083,4459 +2915,4655 @@ filter: nearest,nearest repeat: none launchpod rotate: false - xy: 397, 893 + xy: 1201, 891 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 mend-projector rotate: false - xy: 199, 563 + xy: 339, 825 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 mend-projector-top rotate: false - xy: 265, 629 + xy: 405, 825 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 mender rotate: false - xy: 1577, 697 + xy: 785, 95 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 mender-top rotate: false - xy: 1611, 697 + xy: 785, 61 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 overdrive-projector rotate: false - xy: 331, 695 + xy: 471, 825 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 overdrive-projector-top rotate: false - xy: 397, 761 + xy: 537, 825 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 shock-mine rotate: false - xy: 1981, 601 + xy: 819, 163 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-arrow rotate: false - xy: 1849, 737 + xy: 425, 197 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conveyor rotate: false - xy: 1985, 771 + xy: 445, 61 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conveyor-bridge rotate: false - xy: 1985, 737 + xy: 445, 27 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conveyor-end rotate: false - xy: 331, 335 + xy: 462, 333 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 center rotate: false - xy: 330, 301 + xy: 462, 299 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-0-0 rotate: false - xy: 2013, 907 + xy: 133, 495 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-armored-conveyor-full rotate: false - xy: 2013, 907 + xy: 133, 495 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-0-1 rotate: false - xy: 1727, 849 + xy: 133, 461 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-0-2 rotate: false - xy: 1761, 879 + xy: 133, 427 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-0-3 rotate: false - xy: 1795, 879 + xy: 167, 367 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-1-0 rotate: false - xy: 1829, 879 + xy: 190, 333 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-1-1 rotate: false - xy: 2013, 873 + xy: 190, 299 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-1-2 rotate: false - xy: 893, 825 + xy: 187, 265 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-1-3 rotate: false - xy: 927, 825 + xy: 187, 231 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-2-0 rotate: false - xy: 931, 791 + xy: 187, 197 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-2-1 rotate: false - xy: 965, 791 + xy: 201, 367 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-2-2 rotate: false - xy: 999, 791 + xy: 224, 333 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-2-3 rotate: false - xy: 1033, 791 + xy: 224, 299 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-3-0 rotate: false - xy: 1067, 791 + xy: 221, 265 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-3-1 rotate: false - xy: 1101, 791 + xy: 221, 231 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-3-2 rotate: false - xy: 1135, 791 + xy: 221, 197 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-3-3 rotate: false - xy: 1169, 791 + xy: 235, 367 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-4-0 rotate: false - xy: 1203, 791 + xy: 258, 333 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-4-1 rotate: false - xy: 1237, 791 + xy: 258, 299 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-4-2 rotate: false - xy: 1271, 791 + xy: 255, 265 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-4-3 rotate: false - xy: 1305, 791 + xy: 255, 231 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-0-1 rotate: false - xy: 1063, 757 + xy: 493, 231 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-0-2 rotate: false - xy: 961, 655 + xy: 493, 197 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-0-3 rotate: false - xy: 995, 689 + xy: 507, 367 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-1-0 rotate: false - xy: 1029, 723 + xy: 513, 163 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-1-1 rotate: false - xy: 1097, 757 + xy: 513, 129 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-1-2 rotate: false - xy: 961, 621 + xy: 513, 95 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-1-3 rotate: false - xy: 995, 655 + xy: 513, 61 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-2-0 rotate: false - xy: 1029, 689 + xy: 513, 27 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-2-1 rotate: false - xy: 1063, 723 + xy: 530, 333 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-2-2 rotate: false - xy: 1131, 757 + xy: 530, 299 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-2-3 rotate: false - xy: 995, 621 + xy: 527, 265 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-3-0 rotate: false - xy: 1029, 655 + xy: 527, 231 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-3-1 rotate: false - xy: 1063, 689 + xy: 527, 197 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-3-2 rotate: false - xy: 1097, 723 + xy: 541, 367 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-3-3 rotate: false - xy: 1165, 757 + xy: 547, 163 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-4-0 rotate: false - xy: 1029, 621 + xy: 547, 129 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-4-1 rotate: false - xy: 1063, 655 + xy: 547, 95 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-4-2 rotate: false - xy: 1097, 689 + xy: 547, 61 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-4-3 rotate: false - xy: 1131, 723 + xy: 547, 27 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plastanium-conveyor rotate: false - xy: 1641, 663 + xy: 847, 469 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plastanium-conveyor-0 rotate: false - xy: 1641, 629 + xy: 881, 463 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plastanium-conveyor-1 rotate: false - xy: 1675, 663 + xy: 915, 463 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plastanium-conveyor-2 rotate: false - xy: 1675, 629 + xy: 813, 447 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plastanium-conveyor-edge rotate: false - xy: 1573, 595 + xy: 847, 435 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plastanium-conveyor-stack rotate: false - xy: 1607, 595 + xy: 881, 429 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-0-1 rotate: false - xy: 1777, 539 + xy: 938, 293 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-0-2 rotate: false - xy: 1811, 539 + xy: 938, 259 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-0-3 rotate: false - xy: 1845, 533 + xy: 935, 225 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-1-0 rotate: false - xy: 1879, 533 + xy: 935, 191 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-1-1 rotate: false - xy: 1913, 533 + xy: 955, 157 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-1-2 rotate: false - xy: 1947, 533 + xy: 955, 123 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-1-3 rotate: false - xy: 1981, 533 + xy: 955, 89 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-2-0 rotate: false - xy: 2015, 533 + xy: 955, 55 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-2-1 rotate: false - xy: 1437, 561 + xy: 955, 21 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-2-2 rotate: false - xy: 1471, 561 + xy: 171, 709 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-2-3 rotate: false - xy: 1505, 531 + xy: 171, 675 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-3-0 rotate: false - xy: 1539, 529 + xy: 171, 641 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-3-1 rotate: false - xy: 1573, 527 + xy: 171, 607 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-3-2 rotate: false - xy: 1607, 527 + xy: 171, 573 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-3-3 rotate: false - xy: 1641, 527 + xy: 205, 725 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-4-0 rotate: false - xy: 1675, 527 + xy: 205, 691 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-4-1 rotate: false - xy: 1709, 509 + xy: 205, 657 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-4-2 rotate: false - xy: 1743, 505 + xy: 205, 623 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-4-3 rotate: false - xy: 1777, 505 + xy: 205, 589 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cross rotate: false - xy: 1199, 723 + xy: 581, 61 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 distributor rotate: false - xy: 199, 761 + xy: 541, 891 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 inverted-sorter rotate: false - xy: 1267, 723 + xy: 615, 95 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 junction rotate: false - xy: 1747, 709 + xy: 717, 27 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 overflow-gate rotate: false - xy: 1505, 667 + xy: 847, 571 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conveyor rotate: false - xy: 1539, 597 + xy: 881, 531 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conveyor-arrow rotate: false - xy: 1573, 663 + xy: 915, 531 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conveyor-bridge rotate: false - xy: 1573, 629 + xy: 881, 497 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conveyor-end rotate: false - xy: 1607, 663 + xy: 915, 497 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 router rotate: false - xy: 1985, 669 + xy: 836, 265 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sorter rotate: false - xy: 1709, 577 + xy: 819, 95 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 underflow-gate rotate: false - xy: 1879, 499 + xy: 273, 667 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 drill-top rotate: false - xy: 397, 959 + xy: 739, 891 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 steam-generator-liquid rotate: false - xy: 397, 959 + xy: 739, 891 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 mechanical-drill rotate: false - xy: 529, 959 + xy: 1861, 891 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 mechanical-drill-rotator rotate: false - xy: 1, 365 + xy: 1927, 891 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 mechanical-drill-top rotate: false - xy: 67, 431 + xy: 207, 825 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 pneumatic-drill rotate: false - xy: 331, 629 + xy: 1131, 825 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 pneumatic-drill-rotator rotate: false - xy: 397, 695 + xy: 1197, 825 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 pneumatic-drill-top rotate: false - xy: 463, 761 + xy: 1263, 825 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 water-extractor rotate: false - xy: 727, 827 + xy: 1923, 759 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 water-extractor-liquid rotate: false - xy: 793, 893 + xy: 67, 697 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 water-extractor-rotator rotate: false - xy: 859, 959 + xy: 67, 631 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 water-extractor-top rotate: false - xy: 1, 35 + xy: 67, 565 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-border rotate: false - xy: 397, 8 + xy: 241, 27 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-middle rotate: false - xy: 465, 8 + xy: 323, 197 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-select rotate: false - xy: 1645, 765 + xy: 391, 265 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-liquid rotate: false - xy: 961, 757 + xy: 479, 95 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conduit rotate: false - xy: 1883, 737 + xy: 439, 367 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conduit-arrow rotate: false - xy: 1917, 737 + xy: 445, 163 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conveyor-arrow rotate: false - xy: 1917, 737 + xy: 445, 163 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conduit-bridge rotate: false - xy: 1951, 771 + xy: 445, 129 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conduit-end rotate: false - xy: 1951, 737 + xy: 445, 95 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom rotate: false - xy: 811, 327 + xy: 459, 197 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-0 rotate: false - xy: 811, 293 + xy: 473, 367 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-1 rotate: false - xy: 927, 753 + xy: 479, 163 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-2 rotate: false - xy: 927, 719 + xy: 479, 129 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-3 rotate: false - xy: 927, 719 + xy: 479, 129 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-4 rotate: false - xy: 927, 719 + xy: 479, 129 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-0 rotate: false - xy: 995, 757 + xy: 479, 61 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-1 rotate: false - xy: 961, 723 + xy: 479, 27 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-2 rotate: false - xy: 1029, 757 + xy: 496, 333 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-3 rotate: false - xy: 961, 689 + xy: 496, 299 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-3 rotate: false - xy: 961, 689 + xy: 496, 299 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-4 rotate: false - xy: 995, 723 + xy: 493, 265 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-junction rotate: false - xy: 1849, 703 + xy: 731, 265 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-overflow-gate rotate: false - xy: 1951, 703 + xy: 745, 367 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-overflow-gate-top rotate: false - xy: 1985, 703 + xy: 751, 163 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-router-bottom rotate: false - xy: 1403, 591 + xy: 751, 129 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-router-liquid rotate: false - xy: 1441, 731 + xy: 751, 95 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-router-top rotate: false - xy: 1475, 731 + xy: 751, 61 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 mechanical-pump rotate: false - xy: 1471, 629 + xy: 779, 367 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 mechanical-pump-liquid rotate: false - xy: 1471, 595 + xy: 813, 617 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 rotary-pump-liquid rotate: false - xy: 1471, 595 + xy: 813, 617 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 thermal-pump-liquid rotate: false - xy: 1471, 595 + xy: 813, 617 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conduit rotate: false - xy: 1505, 633 + xy: 813, 549 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conduit-arrow rotate: false - xy: 1505, 599 + xy: 847, 537 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conduit-bridge rotate: false - xy: 1539, 665 + xy: 813, 515 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conduit-end rotate: false - xy: 1539, 631 + xy: 847, 503 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plated-conduit-cap rotate: false - xy: 1675, 595 + xy: 813, 413 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plated-conduit-top-0 rotate: false - xy: 1713, 679 + xy: 847, 401 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plated-conduit-top-1 rotate: false - xy: 1747, 675 + xy: 813, 379 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plated-conduit-top-2 rotate: false - xy: 1781, 675 + xy: 881, 395 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plated-conduit-top-3 rotate: false - xy: 1815, 675 + xy: 915, 395 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plated-conduit-top-4 rotate: false - xy: 1709, 645 + xy: 847, 367 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-0 rotate: false - xy: 1811, 641 + xy: 847, 333 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-1 rotate: false - xy: 1743, 607 + xy: 881, 327 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-2 rotate: false - xy: 1777, 607 + xy: 915, 327 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-4 rotate: false - xy: 1811, 607 + xy: 802, 311 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 rotary-pump rotate: false - xy: 133, 365 + xy: 1659, 825 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 logic-processor rotate: false - xy: 463, 959 + xy: 1267, 891 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 memory-bank rotate: false - xy: 133, 497 + xy: 273, 825 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 memory-cell rotate: false - xy: 1543, 699 + xy: 785, 129 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 message rotate: false - xy: 1645, 697 + xy: 785, 27 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 micro-processor rotate: false - xy: 1679, 697 + xy: 813, 583 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 switch rotate: false - xy: 1675, 561 + xy: 921, 89 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 switch-on rotate: false - xy: 1709, 543 + xy: 921, 55 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 battery rotate: false - xy: 1339, 791 + xy: 255, 197 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 battery-top rotate: false - xy: 1761, 845 + xy: 241, 163 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 combustion-generator rotate: false - xy: 743, 293 + xy: 459, 265 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 combustion-generator-top rotate: false - xy: 777, 293 + xy: 459, 231 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 diode rotate: false - xy: 1267, 757 + xy: 581, 27 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 diode-arrow rotate: false - xy: 1131, 621 + xy: 598, 333 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 illuminator rotate: false - xy: 1165, 621 + xy: 609, 367 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 illuminator-top rotate: false - xy: 1199, 655 + xy: 615, 163 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 power-node rotate: false - xy: 1709, 611 + xy: 881, 361 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 power-node-large rotate: false - xy: 529, 827 + xy: 1329, 825 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 power-source rotate: false - xy: 1743, 641 + xy: 915, 361 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 power-void rotate: false - xy: 1777, 641 + xy: 813, 345 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 rtg-generator rotate: false - xy: 199, 431 + xy: 1725, 825 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 rtg-generator-top rotate: false - xy: 1845, 635 + xy: 833, 231 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 solar-panel rotate: false - xy: 2015, 601 + xy: 819, 129 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 steam-generator rotate: false - xy: 793, 959 + xy: 1131, 759 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 steam-generator-cap rotate: false - xy: 1, 101 + xy: 1197, 759 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 steam-generator-top rotate: false - xy: 67, 167 + xy: 1263, 759 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 steam-generator-turbine0 rotate: false - xy: 133, 233 + xy: 1329, 759 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 steam-generator-turbine1 rotate: false - xy: 199, 299 + xy: 1395, 759 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 surge-tower rotate: false - xy: 265, 365 + xy: 1461, 759 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 thermal-generator rotate: false - xy: 463, 563 + xy: 1659, 759 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +blast-mixer + rotate: false + xy: 1, 697 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 coal-centrifuge rotate: false - xy: 1, 959 + xy: 1, 103 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 -cryofluidmixer-bottom +cryofluid-mixer-bottom rotate: false - xy: 199, 827 + xy: 1927, 957 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 -cryofluidmixer-liquid +cryofluid-mixer-liquid rotate: false - xy: 265, 893 + xy: 211, 891 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 -cryofluidmixer-top +cryofluid-mixer-top rotate: false - xy: 331, 959 + xy: 277, 891 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cultivator rotate: false - xy: 1, 563 + xy: 343, 891 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cultivator-middle rotate: false - xy: 67, 629 + xy: 409, 891 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cultivator-top rotate: false - xy: 133, 695 + xy: 475, 891 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 graphite-press rotate: false - xy: 67, 563 + xy: 871, 891 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 incinerator rotate: false - xy: 1233, 689 + xy: 615, 129 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-source rotate: false - xy: 1403, 693 + xy: 700, 333 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-void rotate: false - xy: 1713, 713 + xy: 717, 61 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 kiln rotate: false - xy: 133, 629 + xy: 937, 891 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 kiln-top rotate: false - xy: 199, 695 + xy: 1003, 891 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 silicon-smelter-top rotate: false - xy: 199, 695 + xy: 1003, 891 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 liquid-source rotate: false - xy: 1437, 663 + xy: 768, 299 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-void rotate: false - xy: 1437, 629 + xy: 765, 265 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 melter rotate: false - xy: 1509, 701 + xy: 785, 163 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-weaver rotate: false - xy: 595, 959 + xy: 735, 825 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 phase-weaver-bottom rotate: false - xy: 1, 299 + xy: 801, 825 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 phase-weaver-weave rotate: false - xy: 67, 365 + xy: 867, 825 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 plastanium-compressor rotate: false - xy: 133, 431 + xy: 933, 825 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 plastanium-compressor-top rotate: false - xy: 199, 497 + xy: 999, 825 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 pulverizer rotate: false - xy: 1849, 669 + xy: 802, 277 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulverizer-rotator rotate: false - xy: 1883, 669 + xy: 799, 243 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pyratite-mixer rotate: false - xy: 661, 959 + xy: 1461, 825 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 separator rotate: false - xy: 133, 299 + xy: 471, 759 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 separator-liquid rotate: false - xy: 199, 365 + xy: 537, 759 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 separator-spinner rotate: false - xy: 265, 431 + xy: 603, 759 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 silicon-smelter rotate: false - xy: 331, 497 + xy: 669, 759 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 spore-press rotate: false - xy: 397, 563 + xy: 735, 759 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 spore-press-frame0 rotate: false - xy: 463, 629 + xy: 801, 759 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 spore-press-frame1 rotate: false - xy: 529, 695 + xy: 867, 759 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 spore-press-frame2 rotate: false - xy: 595, 761 + xy: 933, 759 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 spore-press-liquid rotate: false - xy: 661, 827 + xy: 999, 759 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 spore-press-top rotate: false - xy: 727, 893 + xy: 1065, 759 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 boulder1 rotate: false - xy: 393, 347 + xy: 1527, 709 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 boulder2 rotate: false - xy: 529, 523 + xy: 1577, 709 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 dacite-boulder1 rotate: false - xy: 443, 347 + xy: 697, 651 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 dacite-boulder2 rotate: false - xy: 457, 447 + xy: 747, 651 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 sand-boulder1 rotate: false - xy: 1879, 635 + xy: 870, 293 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sand-boulder2 rotate: false - xy: 1913, 635 + xy: 904, 293 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 shale-boulder1 rotate: false - xy: 1913, 601 + xy: 867, 191 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 shale-boulder2 rotate: false - xy: 1947, 601 + xy: 901, 191 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 snow-boulder1 rotate: false - xy: 761, 671 + xy: 1547, 509 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 snow-boulder2 rotate: false - xy: 811, 669 + xy: 1597, 509 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 spore-cluster1 rotate: false - xy: 1261, 825 + xy: 1317, 509 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 spore-cluster2 rotate: false - xy: 1303, 825 + xy: 1359, 509 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 spore-cluster3 rotate: false - xy: 1345, 825 + xy: 1401, 509 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 container rotate: false - xy: 133, 959 + xy: 1069, 957 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 container-team rotate: false - xy: 1, 761 + xy: 1135, 957 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 unloader rotate: false - xy: 1913, 499 + xy: 239, 599 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 unloader-center rotate: false - xy: 1947, 499 + xy: 273, 633 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 arc-heat rotate: false - xy: 1727, 883 + xy: 133, 529 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-1 rotate: false - xy: 1795, 845 + xy: 241, 129 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 +block-2 + rotate: false + xy: 71, 767 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 hail-heat rotate: false - xy: 1517, 879 + xy: 1945, 407 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 lancer-heat rotate: false - xy: 331, 827 + xy: 1135, 891 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 salvo-heat rotate: false - xy: 331, 563 - size: 64, 64 - orig: 64, 64 - offset: 0, 0 - index: -1 -salvo-panel-left - rotate: false - xy: 397, 629 - size: 64, 64 - orig: 64, 64 - offset: 0, 0 - index: -1 -salvo-panel-right - rotate: false - xy: 463, 695 + xy: 1857, 825 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 scorch-heat rotate: false - xy: 1981, 635 + xy: 904, 259 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 wave-liquid rotate: false - xy: 133, 167 + xy: 67, 433 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 wave-top rotate: false - xy: 199, 233 + xy: 67, 367 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 command-center rotate: false - xy: 1, 893 + xy: 871, 957 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 command-center-team rotate: false - xy: 67, 959 + xy: 1, 37 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 rally-point rotate: false - xy: 1, 233 + xy: 1527, 825 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 repair-point-base rotate: false - xy: 1951, 669 + xy: 836, 299 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 resupply-point rotate: false - xy: 67, 299 + xy: 1593, 825 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 copper-wall rotate: false - xy: 1199, 757 + xy: 564, 333 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 copper-wall-large rotate: false - xy: 199, 959 + xy: 1333, 957 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 door rotate: false - xy: 1165, 655 + xy: 598, 299 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 door-large rotate: false - xy: 265, 827 + xy: 607, 891 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 door-large-open rotate: false - xy: 331, 893 + xy: 673, 891 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 door-open rotate: false - xy: 1199, 689 + xy: 595, 265 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-wall rotate: false - xy: 1607, 629 + xy: 813, 481 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-wall-large rotate: false - xy: 529, 893 + xy: 669, 825 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 plastanium-wall rotate: false - xy: 1641, 595 + xy: 915, 429 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plastanium-wall-large rotate: false - xy: 265, 563 + xy: 1065, 825 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 scrap-wall-large1 rotate: false - xy: 595, 827 + xy: 141, 771 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 scrap-wall-large2 rotate: false - xy: 661, 893 + xy: 207, 759 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 scrap-wall-large3 rotate: false - xy: 727, 959 + xy: 273, 759 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 scrap-wall-large4 rotate: false - xy: 1, 167 + xy: 339, 759 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 scrap-wall2 rotate: false - xy: 2015, 635 + xy: 867, 225 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap-wall3 rotate: false - xy: 1845, 601 + xy: 901, 225 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap-wall4 rotate: false - xy: 1879, 601 + xy: 833, 197 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap-wall5 rotate: false - xy: 1879, 601 + xy: 833, 197 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 surge-wall rotate: false - xy: 1641, 561 + xy: 921, 123 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 surge-wall-large rotate: false - xy: 331, 431 + xy: 1527, 759 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 thorium-wall rotate: false - xy: 1743, 539 + xy: 921, 21 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 thorium-wall-large rotate: false - xy: 529, 629 + xy: 1725, 759 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 titanium-wall rotate: false - xy: 1811, 505 + xy: 239, 667 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-wall-large rotate: false - xy: 595, 695 + xy: 1791, 759 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 bullet rotate: false - xy: 1737, 971 + xy: 1993, 969 size: 52, 52 orig: 52, 52 offset: 0, 0 index: -1 bullet-back rotate: false - xy: 1791, 971 + xy: 821, 705 size: 52, 52 orig: 52, 52 offset: 0, 0 index: -1 casing rotate: false - xy: 497, 429 + xy: 1987, 473 size: 8, 16 orig: 8, 16 offset: 0, 0 index: -1 circle-mid rotate: false - xy: 2045, 672 + xy: 975, 244 size: 1, 199 orig: 1, 199 offset: 0, 0 index: -1 error rotate: false - xy: 571, 473 + xy: 1147, 659 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 laser rotate: false - xy: 469, 297 + xy: 1977, 709 size: 4, 48 orig: 4, 48 offset: 0, 0 index: -1 minelaser rotate: false - xy: 745, 605 + xy: 1983, 709 size: 4, 48 orig: 4, 48 offset: 0, 0 index: -1 missile rotate: false - xy: 893, 787 + xy: 133, 677 size: 36, 36 orig: 36, 36 offset: 0, 0 index: -1 missile-back rotate: false - xy: 1387, 829 + xy: 133, 639 size: 36, 36 orig: 36, 36 offset: 0, 0 index: -1 parallax-laser rotate: false - xy: 751, 605 + xy: 975, 445 size: 4, 48 orig: 4, 48 offset: 0, 0 index: -1 particle rotate: false - xy: 1219, 825 + xy: 1275, 509 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 scale_marker rotate: false - xy: 1, 1 + xy: 1191, 603 size: 4, 4 orig: 4, 4 offset: 0, 0 index: -1 shell rotate: false - xy: 1425, 833 + xy: 133, 601 size: 36, 36 orig: 36, 36 offset: 0, 0 index: -1 shell-back rotate: false - xy: 1463, 833 + xy: 133, 563 size: 36, 36 orig: 36, 36 offset: 0, 0 index: -1 transfer rotate: false - xy: 587, 579 + xy: 981, 449 size: 4, 48 orig: 4, 48 offset: 0, 0 index: -1 transfer-arrow rotate: false - xy: 1845, 499 + xy: 239, 633 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 white rotate: false - xy: 275, 1 + xy: 1197, 704 size: 3, 3 orig: 3, 3 offset: 0, 0 index: -1 alpha-outline rotate: false - xy: 1563, 919 + xy: 1027, 709 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 alpha-wreck0 rotate: false - xy: 1613, 917 + xy: 1077, 709 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 alpha-wreck1 rotate: false - xy: 1663, 917 + xy: 1127, 709 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 alpha-wreck2 rotate: false - xy: 1713, 917 + xy: 1177, 709 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 arc rotate: false - xy: 2013, 941 + xy: 133, 367 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 arkyid-leg rotate: false - xy: 463, 505 + xy: 67, 132 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 artillery-outline rotate: false - xy: 1813, 913 + xy: 1277, 701 size: 48, 56 orig: 48, 56 offset: 0, 0 index: -1 atrax-foot rotate: false - xy: 67, 1 + xy: 1945, 449 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 atrax-joint rotate: false - xy: 39, 7 + xy: 175, 743 size: 26, 26 orig: 26, 26 offset: 0, 0 index: -1 atrax-leg rotate: false - xy: 325, 14 + xy: 137, 743 size: 36, 26 orig: 36, 26 offset: 0, 0 index: -1 atrax-leg-base rotate: false - xy: 1, 7 + xy: 133, 715 size: 36, 26 orig: 36, 26 offset: 0, 0 index: -1 beta-outline rotate: false - xy: 595, 639 + xy: 67, 20 size: 56, 54 orig: 56, 54 offset: 0, 0 index: -1 beta-wreck0 rotate: false - xy: 661, 705 + xy: 1989, 835 size: 56, 54 orig: 56, 54 offset: 0, 0 index: -1 beta-wreck1 rotate: false - xy: 727, 771 + xy: 1989, 779 size: 56, 54 orig: 56, 54 offset: 0, 0 index: -1 beta-wreck2 rotate: false - xy: 793, 837 + xy: 1989, 723 size: 56, 54 orig: 56, 54 offset: 0, 0 index: -1 block-arc-full rotate: false - xy: 1829, 845 + xy: 241, 95 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-basalt-full rotate: false - xy: 363, 8 + xy: 241, 61 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-boulder-full rotate: false - xy: 1913, 923 + xy: 1377, 709 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 block-char-full rotate: false - xy: 431, 8 + xy: 269, 367 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 +block-command-center-full + rotate: false + xy: 141, 837 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 block-conduit-full rotate: false - xy: 1863, 839 + xy: 275, 163 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 +block-container-full + rotate: false + xy: 277, 957 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 block-conveyor-full rotate: false - xy: 1897, 839 + xy: 275, 129 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-0-0 rotate: false - xy: 1897, 839 + xy: 275, 129 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-craters-full rotate: false - xy: 1931, 839 + xy: 275, 95 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 +block-cryofluid-mixer-full + rotate: false + xy: 1, 631 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +block-cultivator-full + rotate: false + xy: 343, 957 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 block-dacite-boulder-full rotate: false - xy: 1963, 925 + xy: 1427, 709 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 block-dacite-full rotate: false - xy: 1965, 841 + xy: 275, 61 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-dacite-wall-full rotate: false - xy: 1727, 815 + xy: 275, 27 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-dark-metal-full rotate: false - xy: 1761, 811 + xy: 292, 333 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-darksand-full rotate: false - xy: 1795, 811 + xy: 292, 299 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-dirt-full rotate: false - xy: 1829, 811 + xy: 289, 265 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-dirt-wall-full rotate: false - xy: 1863, 805 + xy: 289, 231 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-dune-wall-full rotate: false - xy: 1897, 805 + xy: 289, 197 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-duo-full rotate: false - xy: 1931, 805 + xy: 303, 367 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-grass-full rotate: false - xy: 1965, 807 + xy: 309, 163 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-hail-full rotate: false - xy: 1999, 839 + xy: 309, 129 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-hotrock-full rotate: false - xy: 1999, 805 + xy: 309, 95 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ice-full rotate: false - xy: 1373, 791 + xy: 309, 61 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ice-snow-full rotate: false - xy: 1407, 795 + xy: 309, 27 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ice-wall-full rotate: false - xy: 1441, 799 + xy: 326, 333 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 +block-lancer-full + rotate: false + xy: 1, 565 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 block-liquid-router-full rotate: false - xy: 1475, 799 + xy: 326, 299 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-magmarock-full rotate: false - xy: 1509, 803 + xy: 323, 265 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 +block-mechanical-drill-full + rotate: false + xy: 409, 957 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 block-metal-floor-damaged-full rotate: false - xy: 1543, 801 + xy: 323, 231 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-moss-full rotate: false - xy: 721, 463 + xy: 337, 367 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-mud-full rotate: false - xy: 707, 429 + xy: 343, 163 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ore-coal-full rotate: false - xy: 741, 429 + xy: 343, 129 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ore-copper-full rotate: false - xy: 755, 463 + xy: 343, 95 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ore-lead-full rotate: false - xy: 747, 395 + xy: 343, 61 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ore-scrap-full rotate: false - xy: 747, 361 + xy: 343, 27 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ore-thorium-full rotate: false - xy: 743, 327 + xy: 360, 333 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ore-titanium-full rotate: false - xy: 775, 429 + xy: 360, 299 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 +block-parallax-full + rotate: false + xy: 1, 499 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 block-pebbles-full rotate: false - xy: 781, 395 + xy: 357, 265 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 +block-phase-weaver-full + rotate: false + xy: 475, 957 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 block-plated-conduit-full rotate: false - xy: 781, 361 + xy: 357, 231 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 +block-pneumatic-drill-full + rotate: false + xy: 1, 433 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 block-pulse-conduit-full rotate: false - xy: 777, 327 + xy: 357, 197 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-pulverizer-full rotate: false - xy: 1577, 799 + xy: 371, 367 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-repair-point-full rotate: false - xy: 1611, 799 + xy: 377, 163 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-salt-wall-full rotate: false - xy: 1645, 799 + xy: 377, 129 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 +block-salvo-full + rotate: false + xy: 541, 957 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 block-sand-boulder-full rotate: false - xy: 1679, 799 + xy: 377, 95 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-sand-full rotate: false - xy: 1509, 769 + xy: 377, 61 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-sand-wall-full rotate: false - xy: 1543, 767 + xy: 377, 27 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 +block-scatter-full + rotate: false + xy: 1, 367 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 block-scorch-full rotate: false - xy: 1577, 765 + xy: 394, 333 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-scrap-wall-full rotate: false - xy: 1611, 765 + xy: 394, 299 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap-wall1 rotate: false - xy: 1611, 765 + xy: 394, 299 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 +block-scrap-wall-large-full + rotate: false + xy: 607, 957 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +block-segment-full + rotate: false + xy: 1, 301 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 block-shale-boulder-full rotate: false - xy: 1679, 765 + xy: 391, 231 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-shale-full rotate: false - xy: 1713, 781 + xy: 391, 197 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-shale-wall-full rotate: false - xy: 1713, 747 + xy: 405, 367 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-shrubs-full rotate: false - xy: 1747, 777 + xy: 411, 163 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-snow-boulder-full rotate: false - xy: 397, 397 + xy: 1477, 709 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 block-snow-full rotate: false - xy: 1781, 777 + xy: 411, 129 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-snow-wall-full rotate: false - xy: 1815, 777 + xy: 411, 95 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-spore-cluster-full rotate: false - xy: 109, 1 + xy: 1987, 431 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-spore-moss-full rotate: false - xy: 1747, 743 + xy: 411, 61 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 +block-spore-press-full + rotate: false + xy: 673, 957 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 block-spore-wall-full rotate: false - xy: 1781, 743 + xy: 411, 27 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 +block-steam-generator-full + rotate: false + xy: 1, 235 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 block-stone-full rotate: false - xy: 1815, 743 + xy: 428, 333 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-stone-wall-full rotate: false - xy: 1849, 771 + xy: 428, 299 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 +block-swarmer-full + rotate: false + xy: 739, 957 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 block-tendrils-full rotate: false - xy: 1883, 771 + xy: 425, 265 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-titanium-conveyor-full rotate: false - xy: 1917, 771 + xy: 425, 231 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-0-0 rotate: false - xy: 1917, 771 + xy: 425, 231 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 +block-water-extractor-full + rotate: false + xy: 1, 169 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +block-wave-full + rotate: false + xy: 805, 957 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 command-center-team-crux rotate: false - xy: 1, 827 + xy: 937, 957 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 command-center-team-sharded rotate: false - xy: 67, 893 + xy: 1003, 957 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 container-team-crux rotate: false - xy: 67, 827 + xy: 1201, 957 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 container-team-sharded rotate: false - xy: 133, 893 + xy: 1267, 957 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 corvus-joint rotate: false - xy: 331, 369 + xy: 67, 240 size: 60, 60 orig: 60, 60 offset: 0, 0 index: -1 corvus-leg rotate: false - xy: 1981, 463 + xy: 949, 495 size: 30, 68 orig: 30, 68 offset: 0, 0 index: -1 corvus-leg-base rotate: false - xy: 729, 539 + xy: 307, 635 size: 30, 64 orig: 30, 64 offset: 0, 0 index: -1 cracks-1-0 rotate: false - xy: 1063, 621 + xy: 564, 299 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cracks-1-1 rotate: false - xy: 1097, 655 + xy: 561, 265 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cracks-1-2 rotate: false - xy: 1131, 689 + xy: 561, 231 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cracks-1-3 rotate: false - xy: 1165, 723 + xy: 561, 197 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cracks-1-4 rotate: false - xy: 1233, 757 + xy: 575, 367 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cracks-1-5 rotate: false - xy: 1097, 621 + xy: 581, 163 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cracks-1-6 rotate: false - xy: 1131, 655 + xy: 581, 129 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cracks-1-7 rotate: false - xy: 1165, 689 + xy: 581, 95 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cracks-2-0 rotate: false - xy: 1, 695 + xy: 1399, 957 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cracks-2-1 rotate: false - xy: 67, 761 + xy: 1465, 957 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cracks-2-2 rotate: false - xy: 133, 827 + xy: 1531, 957 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cracks-2-3 rotate: false - xy: 199, 893 + xy: 1597, 957 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cracks-2-4 rotate: false - xy: 265, 959 + xy: 1663, 957 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cracks-2-5 rotate: false - xy: 1, 629 + xy: 1729, 957 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cracks-2-6 rotate: false - xy: 67, 695 + xy: 1795, 957 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cracks-2-7 rotate: false - xy: 133, 761 + xy: 1861, 957 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 crawler-leg rotate: false - xy: 793, 787 + xy: 1777, 709 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 crawler-outline rotate: false - xy: 1863, 873 + xy: 1827, 709 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 crawler-wreck0 rotate: false - xy: 1913, 873 + xy: 1877, 709 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 crawler-wreck1 rotate: false - xy: 1963, 875 + xy: 1927, 709 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 crawler-wreck2 rotate: false - xy: 447, 397 + xy: 647, 653 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 dagger-leg rotate: false - xy: 497, 373 + xy: 897, 657 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 dagger-outline rotate: false - xy: 493, 323 + xy: 947, 659 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 dagger-wreck0 rotate: false - xy: 557, 423 + xy: 997, 659 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 dagger-wreck1 rotate: false - xy: 547, 373 + xy: 1047, 659 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 dagger-wreck2 rotate: false - xy: 543, 323 + xy: 1097, 659 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 duo rotate: false - xy: 1233, 723 + xy: 595, 231 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 eruption-outline rotate: false - xy: 191, 109 + xy: 1247, 643 size: 48, 56 orig: 48, 56 offset: 0, 0 index: -1 flamethrower-outline rotate: false - xy: 225, 51 + xy: 1397, 651 size: 48, 56 orig: 48, 56 offset: 0, 0 index: -1 flare-outline rotate: false - xy: 225, 1 + xy: 1497, 659 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 flare-wreck0 rotate: false - xy: 607, 423 + xy: 1547, 659 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 flare-wreck1 rotate: false - xy: 597, 373 + xy: 1597, 659 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 flare-wreck2 rotate: false - xy: 593, 323 + xy: 1647, 659 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 +gamma-wreck1 + rotate: false + xy: 1, 953 + size: 68, 68 + orig: 68, 68 + offset: 0, 0 + index: -1 +gamma-wreck2 + rotate: false + xy: 1, 883 + size: 68, 68 + orig: 68, 68 + offset: 0, 0 + index: -1 hail rotate: false - xy: 1301, 757 + xy: 595, 197 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 heal-shotgun-weapon-outline rotate: false - xy: 1897, 973 + xy: 875, 707 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 heal-weapon-mount-outline rotate: false - xy: 647, 373 + xy: 1797, 659 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 heal-weapon-outline rotate: false - xy: 643, 323 + xy: 1847, 659 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-blast-compound-large rotate: false - xy: 1559, 877 + xy: 1987, 389 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-blast-compound-medium rotate: false - xy: 1199, 621 + xy: 615, 27 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-blast-compound-small rotate: false - xy: 1417, 941 + xy: 1993, 891 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-blast-compound-tiny rotate: false - xy: 151, 25 + xy: 2029, 455 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-blast-compound-xlarge rotate: false - xy: 697, 373 + xy: 1897, 659 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-coal-large rotate: false - xy: 1601, 875 + xy: 1797, 417 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-coal-medium rotate: false - xy: 1267, 689 + xy: 632, 299 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-coal-small rotate: false - xy: 365, 343 + xy: 133, 401 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-coal-tiny rotate: false - xy: 475, 329 + xy: 1923, 425 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-coal-xlarge rotate: false - xy: 693, 323 + xy: 1947, 659 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-copper-large rotate: false - xy: 1643, 875 + xy: 1839, 417 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-copper-medium rotate: false - xy: 1369, 757 + xy: 629, 231 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-copper-small rotate: false - xy: 2013, 507 + xy: 2019, 891 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-copper-tiny rotate: false - xy: 1417, 923 + xy: 1275, 575 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-copper-xlarge rotate: false - xy: 265, 192 + xy: 1997, 673 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-graphite-large rotate: false - xy: 1685, 875 + xy: 1881, 401 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-graphite-medium rotate: false - xy: 1267, 655 + xy: 643, 367 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-graphite-small rotate: false - xy: 2013, 481 + xy: 159, 401 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-graphite-tiny rotate: false - xy: 815, 411 + xy: 417, 683 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-graphite-xlarge rotate: false - xy: 257, 142 + xy: 1997, 623 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-lead-large rotate: false - xy: 861, 541 + xy: 897, 565 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-lead-medium rotate: false - xy: 1335, 723 + xy: 649, 129 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-lead-small rotate: false - xy: 761, 587 + xy: 273, 607 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-lead-tiny rotate: false - xy: 787, 595 + xy: 949, 347 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-lead-xlarge rotate: false - xy: 917, 909 + xy: 1297, 601 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-metaglass-large rotate: false - xy: 903, 529 + xy: 939, 565 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-metaglass-medium rotate: false - xy: 1301, 655 + xy: 649, 61 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-metaglass-small rotate: false - xy: 761, 561 + xy: 949, 469 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-metaglass-tiny rotate: false - xy: 761, 543 + xy: 1085, 507 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-metaglass-xlarge rotate: false - xy: 967, 917 + xy: 1347, 601 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-phase-fabric-large rotate: false - xy: 945, 529 + xy: 981, 567 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-phase-fabric-medium rotate: false - xy: 1369, 723 + xy: 666, 333 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-phase-fabric-small rotate: false - xy: 2013, 455 + xy: 981, 499 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-phase-fabric-tiny rotate: false - xy: 151, 7 + xy: 2029, 437 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-phase-fabric-xlarge rotate: false - xy: 1017, 917 + xy: 1397, 601 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-plastanium-large rotate: false - xy: 1517, 837 + xy: 1023, 567 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-plastanium-medium rotate: false - xy: 1335, 655 + xy: 663, 265 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-plastanium-small rotate: false - xy: 2019, 779 + xy: 339, 675 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-plastanium-tiny rotate: false - xy: 815, 393 + xy: 1923, 407 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-plastanium-xlarge rotate: false - xy: 1067, 917 + xy: 1447, 609 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-pyratite-large rotate: false - xy: 1559, 835 + xy: 1065, 567 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-pyratite-medium rotate: false - xy: 1335, 621 + xy: 663, 197 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-pyratite-small rotate: false - xy: 2019, 753 + xy: 949, 443 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-pyratite-tiny rotate: false - xy: 787, 577 + xy: 1275, 557 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-pyratite-xlarge rotate: false - xy: 1117, 917 + xy: 1497, 609 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-sand-large rotate: false - xy: 1601, 833 + xy: 1107, 567 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-sand-medium rotate: false - xy: 1369, 621 + xy: 683, 163 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-sand-small rotate: false - xy: 2019, 727 + xy: 1007, 499 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-sand-tiny rotate: false - xy: 815, 375 + xy: 417, 665 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-sand-xlarge rotate: false - xy: 1167, 917 + xy: 1547, 609 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-scrap-large rotate: false - xy: 1643, 833 + xy: 1149, 567 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-scrap-medium rotate: false - xy: 1441, 765 + xy: 683, 95 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-scrap-small rotate: false - xy: 2019, 701 + xy: 339, 649 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-scrap-tiny rotate: false - xy: 787, 559 + xy: 435, 683 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-scrap-xlarge rotate: false - xy: 1217, 917 + xy: 1597, 609 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-silicon-large rotate: false - xy: 1685, 833 + xy: 1191, 551 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-silicon-medium rotate: false - xy: 1403, 727 + xy: 683, 27 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-silicon-small rotate: false - xy: 2019, 675 + xy: 365, 675 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-silicon-tiny rotate: false - xy: 763, 525 + xy: 949, 329 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-silicon-xlarge rotate: false - xy: 1267, 917 + xy: 1647, 609 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-spore-pod-large rotate: false - xy: 851, 851 + xy: 1233, 551 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-spore-pod-medium rotate: false - xy: 1403, 625 + xy: 697, 265 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-spore-pod-small rotate: false - xy: 241, 116 + xy: 949, 417 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-spore-pod-tiny rotate: false - xy: 763, 507 + xy: 1103, 507 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-spore-pod-xlarge rotate: false - xy: 1317, 917 + xy: 1697, 609 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-surge-alloy-large rotate: false - xy: 721, 497 + xy: 981, 525 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-surge-alloy-medium rotate: false - xy: 1543, 733 + xy: 697, 197 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-surge-alloy-small rotate: false - xy: 365, 317 + xy: 949, 391 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-surge-alloy-tiny rotate: false - xy: 893, 883 + xy: 2029, 419 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-surge-alloy-xlarge rotate: false - xy: 1367, 917 + xy: 1747, 609 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-thorium-large rotate: false - xy: 967, 825 + xy: 1023, 525 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-thorium-medium rotate: false - xy: 1611, 731 + xy: 717, 163 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-thorium-small rotate: false - xy: 391, 321 + xy: 1033, 499 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-thorium-tiny rotate: false - xy: 893, 865 + xy: 435, 665 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-thorium-xlarge rotate: false - xy: 777, 721 + xy: 1797, 609 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-titanium-large rotate: false - xy: 1009, 825 + xy: 1065, 525 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-titanium-medium rotate: false - xy: 1679, 731 + xy: 717, 95 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-titanium-small rotate: false - xy: 417, 321 + xy: 365, 649 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-titanium-tiny rotate: false - xy: 475, 311 + xy: 453, 683 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-titanium-xlarge rotate: false - xy: 843, 787 + xy: 1847, 609 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 lancer rotate: false - xy: 265, 761 + xy: 1069, 891 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 large-artillery-outline rotate: false - xy: 877, 719 + xy: 1947, 591 size: 48, 66 orig: 48, 66 offset: 0, 0 index: -1 large-weapon-outline rotate: false - xy: 629, 539 + xy: 1447, 559 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 liquid-cryofluid-large rotate: false - xy: 1051, 825 + xy: 1107, 525 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 liquid-cryofluid-medium rotate: false - xy: 1815, 709 + xy: 734, 299 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-cryofluid-small rotate: false - xy: 443, 321 + xy: 391, 675 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 liquid-cryofluid-tiny rotate: false - xy: 493, 305 + xy: 1121, 507 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 liquid-cryofluid-xlarge rotate: false - xy: 679, 539 + xy: 1497, 559 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 liquid-oil-large rotate: false - xy: 1093, 825 + xy: 1149, 525 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 liquid-oil-medium rotate: false - xy: 1917, 703 + xy: 731, 197 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-oil-small rotate: false - xy: 809, 429 + xy: 949, 365 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 liquid-oil-tiny rotate: false - xy: 511, 305 + xy: 2029, 401 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 liquid-oil-xlarge rotate: false - xy: 671, 489 + xy: 1547, 559 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 liquid-slag-large rotate: false - xy: 1135, 825 + xy: 1191, 509 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 liquid-slag-medium rotate: false - xy: 1471, 697 + xy: 768, 333 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-slag-small rotate: false - xy: 835, 543 + xy: 1059, 499 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 liquid-slag-tiny rotate: false - xy: 529, 305 + xy: 453, 665 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 liquid-slag-xlarge rotate: false - xy: 315, 192 + xy: 1597, 559 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 liquid-water-large rotate: false - xy: 1177, 825 + xy: 1233, 509 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 liquid-water-medium rotate: false - xy: 1437, 595 + xy: 765, 197 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-water-small rotate: false - xy: 809, 543 + xy: 391, 649 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 liquid-water-tiny rotate: false - xy: 547, 305 + xy: 471, 683 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 liquid-water-xlarge rotate: false - xy: 307, 142 + xy: 1647, 559 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 mace-leg rotate: false - xy: 199, 629 + xy: 1531, 891 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 mace-outline rotate: false - xy: 265, 695 + xy: 1597, 891 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 mace-wreck0 rotate: false - xy: 331, 761 + xy: 1663, 891 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 mace-wreck1 rotate: false - xy: 397, 827 + xy: 1729, 891 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 mace-wreck2 rotate: false - xy: 463, 893 + xy: 1795, 891 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 missiles-mount-outline rotate: false - xy: 325, 92 + xy: 1797, 559 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 mono-outline rotate: false - xy: 375, 92 + xy: 1947, 541 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 mono-wreck0 rotate: false - xy: 375, 42 + xy: 1997, 523 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 mono-wreck1 rotate: false - xy: 967, 867 + xy: 847, 605 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 mono-wreck2 rotate: false - xy: 1017, 867 + xy: 897, 607 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 mount-purple-weapon-outline rotate: false - xy: 1067, 867 + xy: 997, 609 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 mount-weapon-outline rotate: false - xy: 1167, 867 + xy: 1097, 609 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 nova-leg rotate: false - xy: 1267, 867 + xy: 1197, 593 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 nova-outline rotate: false - xy: 133, 109 + xy: 125, 70 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 nova-wreck0 rotate: false - xy: 199, 175 + xy: 125, 12 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 nova-wreck1 rotate: false - xy: 265, 242 + xy: 183, 128 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 nova-wreck2 rotate: false - xy: 983, 967 + xy: 183, 70 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 parallax rotate: false - xy: 463, 827 + xy: 603, 825 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 poly-outline rotate: false - xy: 1157, 967 + xy: 241, 701 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 poly-wreck0 rotate: false - xy: 1215, 967 + xy: 299, 701 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 poly-wreck1 rotate: false - xy: 1273, 967 + xy: 357, 701 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 poly-wreck2 rotate: false - xy: 1331, 967 + xy: 415, 701 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 pulsar-leg rotate: false - xy: 595, 893 + xy: 1395, 825 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 +pulsar-outline + rotate: false + xy: 1, 823 + size: 68, 58 + orig: 68, 58 + offset: 0, 0 + index: -1 +pulsar-wreck0 + rotate: false + xy: 71, 903 + size: 68, 58 + orig: 68, 58 + offset: 0, 0 + index: -1 +pulsar-wreck1 + rotate: false + xy: 141, 963 + size: 68, 58 + orig: 68, 58 + offset: 0, 0 + index: -1 +pulsar-wreck2 + rotate: false + xy: 1, 763 + size: 68, 58 + orig: 68, 58 + offset: 0, 0 + index: -1 repair-point rotate: false - xy: 1917, 669 + xy: 799, 209 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 salvo rotate: false - xy: 265, 497 + xy: 1791, 825 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 scatter rotate: false - xy: 529, 761 + xy: 1923, 825 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 scepter-weapon-outline rotate: false - xy: 1505, 921 + xy: 589, 655 size: 56, 102 orig: 56, 102 offset: 0, 0 index: -1 scorch rotate: false - xy: 1947, 635 + xy: 870, 259 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 segment rotate: false - xy: 67, 233 + xy: 405, 759 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 small-basic-weapon-outline rotate: false - xy: 1417, 871 + xy: 1347, 551 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 small-mount-weapon-outline rotate: false - xy: 711, 655 + xy: 1447, 509 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 spiroct-foot rotate: false - xy: 911, 571 + xy: 1897, 443 size: 46, 46 orig: 46, 46 offset: 0, 0 index: -1 spiroct-joint rotate: false - xy: 1743, 573 + xy: 819, 61 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 spiroct-leg rotate: false - xy: 275, 6 + xy: 1, 1 size: 48, 34 orig: 48, 34 offset: 0, 0 index: -1 spiroct-leg-base rotate: false - xy: 861, 683 + xy: 1647, 523 size: 48, 34 orig: 48, 34 offset: 0, 0 index: -1 spiroct-weapon-outline rotate: false - xy: 761, 613 + xy: 1747, 501 size: 48, 56 orig: 48, 56 offset: 0, 0 index: -1 splash-0 rotate: false - xy: 1777, 573 + xy: 819, 27 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-1 rotate: false - xy: 1811, 573 + xy: 853, 157 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-10 rotate: false - xy: 1573, 561 + xy: 887, 21 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-11 rotate: false - xy: 1607, 561 + xy: 921, 157 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-2 rotate: false - xy: 1845, 567 + xy: 853, 123 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-3 rotate: false - xy: 1879, 567 + xy: 887, 157 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-4 rotate: false - xy: 1913, 567 + xy: 853, 89 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-5 rotate: false - xy: 1947, 567 + xy: 887, 123 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-6 rotate: false - xy: 1981, 567 + xy: 853, 55 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-7 rotate: false - xy: 2015, 567 + xy: 887, 89 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-8 rotate: false - xy: 1505, 565 + xy: 887, 55 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-9 rotate: false - xy: 1539, 563 + xy: 853, 21 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 swarmer rotate: false - xy: 397, 497 + xy: 1593, 759 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 unit-alpha-full rotate: false - xy: 365, 192 + xy: 1797, 509 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 unit-beta-full rotate: false - xy: 1563, 969 + xy: 647, 703 size: 56, 54 orig: 56, 54 offset: 0, 0 index: -1 unit-crawler-full rotate: false - xy: 811, 619 + xy: 1847, 509 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 unit-dagger-full rotate: false - xy: 861, 633 + xy: 1647, 473 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 unit-flare-full rotate: false - xy: 407, 142 + xy: 1897, 491 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 +unit-gamma-full + rotate: false + xy: 71, 833 + size: 68, 68 + orig: 68, 68 + offset: 0, 0 + index: -1 unit-mace-full rotate: false - xy: 661, 761 + xy: 1857, 759 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 unit-mono-full rotate: false - xy: 425, 92 + xy: 1947, 491 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 unit-nova-full rotate: false - xy: 1621, 967 + xy: 705, 701 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 unit-poly-full rotate: false - xy: 1679, 967 + xy: 763, 701 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 +unit-pulsar-full + rotate: false + xy: 141, 903 + size: 68, 58 + orig: 68, 58 + offset: 0, 0 + index: -1 wave rotate: false - xy: 67, 101 + xy: 67, 499 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 zenith-missiles-outline rotate: false - xy: 811, 569 + xy: 1847, 459 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-blast-compound rotate: false - xy: 1335, 757 + xy: 615, 61 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-coal rotate: false - xy: 1233, 655 + xy: 632, 333 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-copper rotate: false - xy: 1301, 723 + xy: 629, 265 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-graphite rotate: false - xy: 1233, 621 + xy: 629, 197 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-lead rotate: false - xy: 1301, 689 + xy: 649, 163 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-metaglass rotate: false - xy: 1267, 621 + xy: 649, 95 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-phase-fabric rotate: false - xy: 1335, 689 + xy: 649, 27 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-plastanium rotate: false - xy: 1301, 621 + xy: 666, 299 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-pyratite rotate: false - xy: 1369, 689 + xy: 663, 231 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-sand rotate: false - xy: 1369, 655 + xy: 677, 367 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-scrap rotate: false - xy: 1407, 761 + xy: 683, 129 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-silicon rotate: false - xy: 1475, 765 + xy: 683, 61 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-spore-pod rotate: false - xy: 1403, 659 + xy: 700, 299 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-surge-alloy rotate: false - xy: 1509, 735 + xy: 697, 231 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-thorium rotate: false - xy: 1577, 731 + xy: 711, 367 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-titanium rotate: false - xy: 1645, 731 + xy: 717, 129 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-cryofluid rotate: false - xy: 1781, 709 + xy: 734, 333 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-oil rotate: false - xy: 1883, 703 + xy: 731, 231 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-slag rotate: false - xy: 1437, 697 + xy: 751, 27 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-water rotate: false - xy: 1471, 663 + xy: 765, 231 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 blank rotate: false - xy: 1737, 968 + xy: 799, 296 size: 1, 1 orig: 1, 1 offset: 0, 0 index: -1 shape-3 rotate: false - xy: 265, 300 + xy: 67, 302 size: 63, 63 orig: 63, 63 offset: 0, 0 index: -1 alpha rotate: false - xy: 1949, 975 + xy: 927, 709 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 alpha-cell rotate: false - xy: 1999, 975 + xy: 977, 709 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 +atrax-base + rotate: false + xy: 211, 957 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 beta rotate: false - xy: 529, 573 + xy: 67, 76 size: 56, 54 orig: 56, 54 offset: 0, 0 index: -1 beta-cell rotate: false - xy: 1863, 923 + xy: 1327, 709 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 crawler rotate: false - xy: 595, 589 + xy: 1627, 709 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 crawler-base rotate: false - xy: 661, 655 + xy: 1677, 709 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 crawler-cell rotate: false - xy: 727, 721 + xy: 1727, 709 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 dagger rotate: false - xy: 521, 473 + xy: 797, 651 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 dagger-base rotate: false - xy: 507, 423 + xy: 847, 655 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 flare rotate: false - xy: 175, 1 + xy: 1447, 659 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 fortress-base rotate: false - xy: 1, 497 + xy: 805, 891 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 gamma-cell rotate: false - xy: 859, 901 + xy: 129, 244 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 mace rotate: false - xy: 1, 431 + xy: 1333, 891 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 mace-base rotate: false - xy: 67, 497 + xy: 1399, 891 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 mace-cell rotate: false - xy: 133, 563 + xy: 1465, 891 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 mono rotate: false - xy: 325, 42 + xy: 1847, 559 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 mono-cell rotate: false - xy: 357, 142 + xy: 1897, 541 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 nova rotate: false - xy: 925, 967 + xy: 129, 186 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 nova-base rotate: false - xy: 1217, 867 + xy: 1147, 609 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 nova-cell rotate: false - xy: 67, 43 + xy: 125, 128 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 poly rotate: false - xy: 1041, 967 + xy: 183, 12 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 poly-cell rotate: false - xy: 1099, 967 + xy: 132, 309 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 power-cell rotate: false - xy: 1389, 967 + xy: 473, 701 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 +pulsar + rotate: false + xy: 71, 963 + size: 68, 58 + orig: 68, 58 + offset: 0, 0 + index: -1 pulsar-base rotate: false - xy: 1317, 867 + xy: 1247, 593 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 pulsar-cell rotate: false - xy: 397, 447 + xy: 67, 190 size: 58, 48 orig: 58, 48 offset: 0, 0 index: -1 vanguard rotate: false - xy: 425, 42 + xy: 1997, 473 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 vanguard-cell rotate: false - xy: 911, 669 + xy: 1697, 451 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 artillery rotate: false - xy: 1763, 913 + xy: 1227, 701 size: 48, 56 orig: 48, 56 offset: 0, 0 index: -1 eruption rotate: false - xy: 125, 43 + xy: 1197, 643 size: 48, 56 orig: 48, 56 offset: 0, 0 index: -1 flakgun rotate: false - xy: 579, 523 + xy: 1297, 651 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 flamethrower rotate: false - xy: 175, 51 + xy: 1347, 651 size: 48, 56 orig: 48, 56 offset: 0, 0 index: -1 heal-shotgun-weapon rotate: false - xy: 1845, 973 + xy: 1993, 917 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 heal-weapon rotate: false - xy: 621, 473 + xy: 1697, 659 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 heal-weapon-mount rotate: false - xy: 657, 423 + xy: 1747, 659 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 large-artillery rotate: false - xy: 827, 719 + xy: 1897, 591 size: 48, 66 orig: 48, 66 offset: 0, 0 index: -1 large-weapon rotate: false - xy: 645, 589 + xy: 1997, 573 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 missiles rotate: false - xy: 275, 92 + xy: 1697, 559 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 missiles-mount rotate: false - xy: 275, 42 + xy: 1747, 559 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 mount-purple-weapon rotate: false - xy: 917, 859 + xy: 947, 609 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 mount-weapon rotate: false - xy: 1117, 867 + xy: 1047, 609 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 scepter-weapon rotate: false - xy: 1447, 921 + xy: 531, 655 size: 56, 102 orig: 56, 102 offset: 0, 0 index: -1 small-basic-weapon rotate: false - xy: 1367, 867 + xy: 1297, 551 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 small-mount-weapon rotate: false - xy: 1467, 871 + xy: 1397, 551 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 small-weapon rotate: false - xy: 695, 605 + xy: 1497, 509 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 spiroct-weapon rotate: false - xy: 323, 242 + xy: 1697, 501 size: 48, 56 orig: 48, 56 offset: 0, 0 index: -1 weapon rotate: false - xy: 911, 619 + xy: 1747, 451 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 zenith-missiles rotate: false - xy: 861, 583 + xy: 1797, 459 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -9296,2233 +9324,2247 @@ filter: nearest,nearest repeat: none additive-reconstructor-icon-editor rotate: false - xy: 613, 743 + xy: 613, 763 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 air-factory-icon-editor rotate: false - xy: 1717, 905 + xy: 1847, 925 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 alloy-smelter-icon-editor rotate: false - xy: 711, 743 + xy: 711, 763 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 arc-icon-editor rotate: false - xy: 2011, 969 + xy: 1667, 627 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-icon-editor rotate: false - xy: 1751, 665 + xy: 423, 375 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 basalt-icon-editor rotate: false - xy: 1793, 707 + xy: 423, 341 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-basalt1 rotate: false - xy: 1793, 707 + xy: 423, 341 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 battery-icon-editor rotate: false - xy: 2011, 935 + xy: 423, 307 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 battery-large-icon-editor rotate: false - xy: 1815, 905 + xy: 1945, 925 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 blast-drill-icon-editor rotate: false - xy: 1, 3 + xy: 1, 23 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 blast-mixer-icon-editor rotate: false - xy: 1103, 807 + xy: 1397, 827 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-border-editor rotate: false - xy: 1827, 707 + xy: 423, 273 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-forge-icon-editor rotate: false - xy: 809, 743 + xy: 809, 763 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 block-loader-icon-editor rotate: false - xy: 1913, 905 + xy: 227, 281 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 block-unloader-icon-editor rotate: false - xy: 227, 261 + xy: 227, 183 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 boulder-icon-editor rotate: false - xy: 1601, 691 + xy: 1793, 843 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 bridge-conduit-icon-editor rotate: false - xy: 2011, 901 + xy: 423, 239 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conveyor-icon-editor rotate: false - xy: 1861, 707 + xy: 327, 81 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 char-icon-editor rotate: false - xy: 2011, 867 + xy: 361, 81 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-char1 rotate: false - xy: 2011, 867 + xy: 361, 81 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 clear-editor rotate: false - xy: 615, 544 + xy: 2043, 1020 size: 1, 1 orig: 1, 1 offset: 0, 0 index: -1 cliff-icon-editor rotate: false - xy: 1895, 707 + xy: 1009, 497 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 coal-centrifuge-icon-editor rotate: false - xy: 1169, 807 + xy: 1463, 827 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 combustion-generator-icon-editor rotate: false - xy: 2011, 833 + xy: 1043, 497 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 command-center-icon-editor rotate: false - xy: 1235, 807 + xy: 1529, 827 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 conduit-icon-editor rotate: false - xy: 1929, 707 + xy: 1077, 497 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 container-icon-editor rotate: false - xy: 1301, 807 + xy: 1595, 827 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 conveyor-icon-editor rotate: false - xy: 1963, 707 + xy: 1111, 497 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 copper-wall-icon-editor rotate: false - xy: 131, 1 + xy: 1145, 497 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 copper-wall-large-icon-editor rotate: false - xy: 1367, 807 + xy: 1661, 827 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 core-foundation-icon-editor rotate: false - xy: 323, 389 + xy: 323, 409 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 core-nucleus-icon-editor rotate: false - xy: 613, 841 + xy: 613, 861 size: 160, 160 orig: 160, 160 offset: 0, 0 index: -1 core-shard-icon-editor rotate: false - xy: 227, 163 + xy: 517, 635 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 craters-icon-editor rotate: false - xy: 165, 1 + xy: 1179, 497 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-craters1 rotate: false - xy: 165, 1 + xy: 1179, 497 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -cryofluidmixer-icon-editor +cryofluid-mixer-icon-editor rotate: false - xy: 1433, 807 + xy: 1727, 827 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cultivator-icon-editor rotate: false - xy: 1499, 807 + xy: 943, 501 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cyclone-icon-editor rotate: false - xy: 517, 615 + xy: 131, 55 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 dacite-boulder-icon-editor rotate: false - xy: 1601, 641 + xy: 1667, 711 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 dacite-icon-editor rotate: false - xy: 943, 447 + xy: 1213, 497 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-dacite1 rotate: false - xy: 943, 447 + xy: 1213, 497 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 dacite-wall-icon-editor rotate: false - xy: 1601, 607 + xy: 1247, 497 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 dark-metal-icon-editor rotate: false - xy: 1635, 607 + xy: 1281, 497 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 dark-panel-1-icon-editor rotate: false - xy: 1669, 607 + xy: 1315, 497 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-dark-panel-1 rotate: false - xy: 1669, 607 + xy: 1315, 497 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 dark-panel-2-icon-editor rotate: false - xy: 1703, 607 + xy: 1349, 497 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-dark-panel-2 rotate: false - xy: 1703, 607 + xy: 1349, 497 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 dark-panel-3-icon-editor rotate: false - xy: 977, 447 + xy: 649, 435 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-dark-panel-3 rotate: false - xy: 977, 447 + xy: 649, 435 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 dark-panel-4-icon-editor rotate: false - xy: 229, 31 + xy: 683, 435 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-dark-panel-4 rotate: false - xy: 229, 31 + xy: 683, 435 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 dark-panel-5-icon-editor rotate: false - xy: 263, 31 + xy: 717, 435 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-dark-panel-5 rotate: false - xy: 263, 31 + xy: 717, 435 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 dark-panel-6-icon-editor rotate: false - xy: 423, 355 + xy: 751, 435 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-dark-panel-6 rotate: false - xy: 423, 355 + xy: 751, 435 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 darksand-icon-editor rotate: false - xy: 423, 321 + xy: 785, 435 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-darksand1 rotate: false - xy: 423, 321 + xy: 785, 435 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 darksand-tainted-water-icon-editor rotate: false - xy: 423, 287 + xy: 819, 435 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 darksand-water-icon-editor rotate: false - xy: 423, 253 + xy: 853, 435 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 deepwater-icon-editor rotate: false - xy: 423, 219 + xy: 887, 435 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-deepwater rotate: false - xy: 423, 219 + xy: 887, 435 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 differential-generator-icon-editor rotate: false - xy: 131, 35 + xy: 517, 537 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 diode-icon-editor rotate: false - xy: 327, 61 + xy: 395, 81 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 dirt-icon-editor rotate: false - xy: 361, 61 + xy: 1383, 497 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-dirt1 rotate: false - xy: 361, 61 + xy: 1383, 497 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 dirt-wall-icon-editor rotate: false - xy: 1997, 707 + xy: 1793, 809 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 disassembler-icon-editor rotate: false - xy: 517, 517 + xy: 325, 311 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 distributor-icon-editor rotate: false - xy: 1565, 807 + xy: 1007, 729 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 door-icon-editor rotate: false - xy: 649, 415 + xy: 1783, 775 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 door-large-icon-editor rotate: false - xy: 1631, 807 + xy: 1007, 663 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 dune-wall-icon-editor rotate: false - xy: 683, 415 + xy: 1717, 727 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 duo-icon-editor rotate: false - xy: 717, 415 + xy: 1717, 693 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-basalt2 rotate: false - xy: 751, 415 + xy: 1717, 659 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-basalt3 rotate: false - xy: 785, 415 + xy: 1701, 625 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-char2 rotate: false - xy: 819, 415 + xy: 1735, 625 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-char3 rotate: false - xy: 853, 415 + xy: 985, 463 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-craters2 rotate: false - xy: 887, 415 + xy: 1019, 463 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-craters3 rotate: false - xy: 395, 61 + xy: 1053, 463 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-dacite2 rotate: false - xy: 1751, 631 + xy: 1087, 463 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-dacite3 rotate: false - xy: 921, 413 + xy: 1121, 463 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-darksand-tainted-water1 rotate: false - xy: 1737, 597 + xy: 1223, 463 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-darksand-tainted-water2 rotate: false - xy: 1771, 597 + xy: 1257, 463 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-darksand-tainted-water3 rotate: false - xy: 1785, 665 + xy: 1291, 463 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-darksand-water1 rotate: false - xy: 1785, 631 + xy: 1325, 463 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-darksand-water2 rotate: false - xy: 1819, 673 + xy: 1359, 463 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-darksand-water3 rotate: false - xy: 1819, 639 + xy: 1393, 463 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-darksand2 rotate: false - xy: 955, 413 + xy: 1155, 463 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-darksand3 rotate: false - xy: 989, 413 + xy: 1189, 463 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-dirt2 rotate: false - xy: 1853, 673 + xy: 1817, 775 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-dirt3 rotate: false - xy: 1853, 639 + xy: 1851, 793 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-grass1 rotate: false - xy: 1887, 673 + xy: 1885, 793 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 grass-icon-editor rotate: false - xy: 1887, 673 + xy: 1885, 793 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-grass2 rotate: false - xy: 1887, 639 + xy: 1919, 793 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-grass3 rotate: false - xy: 1921, 673 + xy: 1953, 793 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-hotrock1 rotate: false - xy: 1921, 639 + xy: 1987, 793 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 hotrock-icon-editor rotate: false - xy: 1921, 639 + xy: 1987, 793 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-hotrock2 rotate: false - xy: 1955, 673 + xy: 1851, 759 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-hotrock3 rotate: false - xy: 1955, 639 + xy: 1885, 759 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-ice-snow1 rotate: false - xy: 1839, 605 + xy: 425, 205 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ice-snow-icon-editor rotate: false - xy: 1839, 605 + xy: 425, 205 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-ice-snow2 rotate: false - xy: 1873, 605 + xy: 425, 171 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-ice-snow3 rotate: false - xy: 1907, 605 + xy: 425, 137 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-ice1 rotate: false - xy: 1989, 673 + xy: 1919, 759 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ice-icon-editor rotate: false - xy: 1989, 673 + xy: 1919, 759 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-ice2 rotate: false - xy: 1989, 639 + xy: 1953, 759 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-ice3 rotate: false - xy: 1805, 597 + xy: 1987, 759 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-magmarock1 rotate: false - xy: 1941, 605 + xy: 429, 103 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 magmarock-icon-editor rotate: false - xy: 1941, 605 + xy: 429, 103 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-magmarock2 rotate: false - xy: 1975, 605 + xy: 429, 69 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-magmarock3 rotate: false - xy: 2009, 605 + xy: 231, 51 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-metal-floor rotate: false - xy: 1839, 571 + xy: 265, 51 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 metal-floor-icon-editor rotate: false - xy: 1839, 571 + xy: 265, 51 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-metal-floor-2 rotate: false - xy: 1873, 571 + xy: 231, 17 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 metal-floor-2-icon-editor rotate: false - xy: 1873, 571 + xy: 231, 17 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-metal-floor-3 rotate: false - xy: 1907, 571 + xy: 265, 17 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 metal-floor-3-icon-editor rotate: false - xy: 1907, 571 + xy: 265, 17 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-metal-floor-5 rotate: false - xy: 1941, 571 + xy: 299, 47 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 metal-floor-5-icon-editor rotate: false - xy: 1941, 571 + xy: 299, 47 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-metal-floor-damaged1 rotate: false - xy: 1975, 571 + xy: 333, 47 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 metal-floor-damaged-icon-editor rotate: false - xy: 1975, 571 + xy: 333, 47 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-metal-floor-damaged2 rotate: false - xy: 2009, 571 + xy: 367, 47 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-metal-floor-damaged3 rotate: false - xy: 425, 185 + xy: 299, 13 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-moss1 rotate: false - xy: 425, 151 + xy: 333, 13 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 moss-icon-editor rotate: false - xy: 425, 151 + xy: 333, 13 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-moss2 rotate: false - xy: 425, 117 + xy: 367, 13 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-moss3 rotate: false - xy: 429, 83 + xy: 401, 35 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-mud1 rotate: false - xy: 429, 49 + xy: 435, 35 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 mud-icon-editor rotate: false - xy: 429, 49 + xy: 435, 35 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-mud2 rotate: false - xy: 1011, 477 + xy: 401, 1 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-mud3 rotate: false - xy: 1045, 477 + xy: 435, 1 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-ore-coal1 rotate: false - xy: 457, 385 + xy: 985, 429 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-ore-coal2 rotate: false - xy: 457, 351 + xy: 1019, 429 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-ore-coal3 rotate: false - xy: 491, 385 + xy: 1053, 429 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-ore-copper1 rotate: false - xy: 457, 317 + xy: 1087, 429 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-ore-copper2 rotate: false - xy: 525, 385 + xy: 1121, 429 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-ore-copper3 rotate: false - xy: 491, 351 + xy: 1155, 429 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-ore-lead1 rotate: false - xy: 457, 283 + xy: 1189, 429 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-ore-lead2 rotate: false - xy: 559, 385 + xy: 1223, 429 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-ore-lead3 rotate: false - xy: 491, 317 + xy: 1257, 429 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-ore-scrap1 rotate: false - xy: 525, 351 + xy: 1291, 429 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-ore-scrap2 rotate: false - xy: 457, 249 + xy: 1325, 429 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-ore-scrap3 rotate: false - xy: 593, 385 + xy: 1359, 429 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-ore-thorium1 rotate: false - xy: 491, 283 + xy: 1393, 429 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-ore-thorium2 rotate: false - xy: 525, 317 + xy: 457, 405 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-ore-thorium3 rotate: false - xy: 559, 351 + xy: 491, 405 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-ore-titanium1 rotate: false - xy: 491, 249 + xy: 457, 371 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-ore-titanium2 rotate: false - xy: 525, 283 + xy: 525, 405 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-ore-titanium3 rotate: false - xy: 559, 317 + xy: 457, 337 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-pebbles1 rotate: false - xy: 593, 351 + xy: 491, 371 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-pebbles2 rotate: false - xy: 525, 249 + xy: 559, 405 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-pebbles3 rotate: false - xy: 559, 283 + xy: 457, 303 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-salt rotate: false - xy: 593, 317 + xy: 491, 337 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 salt-icon-editor rotate: false - xy: 593, 317 + xy: 491, 337 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-sand-water1 rotate: false - xy: 627, 381 + xy: 491, 303 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-sand-water2 rotate: false - xy: 627, 347 + xy: 525, 337 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-sand-water3 rotate: false - xy: 661, 381 + xy: 559, 371 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-sand1 rotate: false - xy: 559, 249 + xy: 525, 371 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sand-icon-editor rotate: false - xy: 559, 249 + xy: 525, 371 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-sand2 rotate: false - xy: 593, 283 + xy: 593, 405 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-sand3 rotate: false - xy: 593, 249 + xy: 457, 269 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-shale1 rotate: false - xy: 627, 313 + xy: 491, 269 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 shale-icon-editor rotate: false - xy: 627, 313 + xy: 491, 269 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-shale2 rotate: false - xy: 661, 347 + xy: 525, 303 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-shale3 rotate: false - xy: 695, 381 + xy: 559, 337 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-slag rotate: false - xy: 627, 279 + xy: 593, 371 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 slag-icon-editor rotate: false - xy: 627, 279 + xy: 593, 371 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-snow1 rotate: false - xy: 661, 313 + xy: 525, 269 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-snow2 rotate: false - xy: 695, 347 + xy: 559, 303 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-snow3 rotate: false - xy: 729, 381 + xy: 593, 337 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-spawn rotate: false - xy: 661, 279 + xy: 559, 269 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-spore-moss1 rotate: false - xy: 695, 313 + xy: 593, 303 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 spore-moss-icon-editor rotate: false - xy: 695, 313 + xy: 593, 303 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-spore-moss2 rotate: false - xy: 729, 347 + xy: 593, 269 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-spore-moss3 rotate: false - xy: 763, 381 + xy: 627, 401 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-stone1 rotate: false - xy: 695, 279 + xy: 627, 367 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 stone-icon-editor rotate: false - xy: 695, 279 + xy: 627, 367 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-stone2 rotate: false - xy: 729, 313 + xy: 661, 401 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-stone3 rotate: false - xy: 763, 347 + xy: 627, 333 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-tainted-water rotate: false - xy: 797, 381 + xy: 661, 367 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 tainted-water-icon-editor rotate: false - xy: 797, 381 + xy: 661, 367 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-tar rotate: false - xy: 729, 279 + xy: 695, 401 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 tar-icon-editor rotate: false - xy: 729, 279 + xy: 695, 401 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-tendrils1 rotate: false - xy: 763, 313 + xy: 627, 299 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-tendrils2 rotate: false - xy: 797, 347 + xy: 661, 333 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-tendrils3 rotate: false - xy: 831, 381 + xy: 695, 367 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-water rotate: false - xy: 763, 279 + xy: 729, 401 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 water-icon-editor rotate: false - xy: 763, 279 + xy: 729, 401 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 exponential-reconstructor-icon-editor rotate: false - xy: 1, 133 + xy: 1, 153 size: 224, 224 orig: 224, 224 offset: 0, 0 index: -1 force-projector-icon-editor rotate: false - xy: 325, 291 + xy: 325, 213 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 +foreshadow-icon-editor + rotate: false + xy: 937, 893 + size: 128, 128 + orig: 128, 128 + offset: 0, 0 + index: -1 fuse-icon-editor rotate: false - xy: 325, 193 + xy: 615, 665 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 graphite-press-icon-editor rotate: false - xy: 943, 481 + xy: 1073, 729 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 ground-factory-icon-editor rotate: false - xy: 615, 645 + xy: 615, 567 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 hail-icon-editor rotate: false - xy: 797, 313 + xy: 661, 299 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 hyper-processor-icon-editor rotate: false - xy: 615, 547 + xy: 713, 665 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 ice-wall-icon-editor rotate: false - xy: 831, 347 + xy: 695, 333 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 illuminator-icon-editor rotate: false - xy: 865, 381 + xy: 729, 367 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 impact-reactor-icon-editor rotate: false - xy: 937, 873 + xy: 1067, 893 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 incinerator-icon-editor rotate: false - xy: 797, 279 + xy: 763, 401 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 inverted-sorter-icon-editor rotate: false - xy: 831, 313 + xy: 695, 299 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-source-icon-editor rotate: false - xy: 865, 347 + xy: 729, 333 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-void-icon-editor rotate: false - xy: 831, 279 + xy: 763, 367 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 junction-icon-editor rotate: false - xy: 865, 313 + xy: 797, 401 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 kiln-icon-editor rotate: false - xy: 1007, 709 + xy: 1007, 597 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 lancer-icon-editor rotate: false - xy: 1007, 643 + xy: 1073, 663 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 large-logic-display-icon-editor rotate: false - xy: 323, 519 + xy: 323, 539 size: 192, 192 orig: 192, 192 offset: 0, 0 index: -1 laser-drill-icon-editor rotate: false - xy: 713, 645 + xy: 713, 567 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 launch-pad-icon-editor rotate: false - xy: 713, 547 + xy: 811, 665 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 launch-pad-large-icon-editor rotate: false - xy: 1067, 873 + xy: 1197, 893 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 liquid-junction-icon-editor rotate: false - xy: 865, 279 + xy: 729, 299 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-router-icon-editor rotate: false - xy: 627, 245 + xy: 763, 333 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-source-icon-editor rotate: false - xy: 661, 245 + xy: 797, 367 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-tank-icon-editor rotate: false - xy: 811, 645 + xy: 811, 567 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 liquid-void-icon-editor rotate: false - xy: 695, 245 + xy: 831, 401 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 logic-display-icon-editor rotate: false - xy: 811, 547 + xy: 229, 85 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 logic-processor-icon-editor rotate: false - xy: 1007, 577 + xy: 1139, 729 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 mass-driver-icon-editor rotate: false - xy: 229, 65 + xy: 327, 115 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 mechanical-drill-icon-editor rotate: false - xy: 1009, 511 + xy: 1073, 597 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 mechanical-pump-icon-editor rotate: false - xy: 729, 245 + xy: 763, 299 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 meltdown-icon-editor rotate: false - xy: 1197, 873 + xy: 1327, 893 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 melter-icon-editor rotate: false - xy: 763, 245 + xy: 797, 333 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 memory-bank-icon-editor rotate: false - xy: 1103, 741 + xy: 1139, 663 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 memory-cell-icon-editor rotate: false - xy: 797, 245 + xy: 831, 367 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 mend-projector-icon-editor rotate: false - xy: 1169, 741 + xy: 1205, 729 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 mender-icon-editor rotate: false - xy: 831, 245 + xy: 865, 401 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 message-icon-editor rotate: false - xy: 865, 245 + xy: 797, 299 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 micro-processor-icon-editor rotate: false - xy: 899, 379 + xy: 831, 333 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 multi-press-icon-editor rotate: false - xy: 327, 95 + xy: 453, 439 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 multiplicative-reconstructor-icon-editor rotate: false - xy: 775, 841 + xy: 775, 861 size: 160, 160 orig: 160, 160 offset: 0, 0 index: -1 naval-factory-icon-editor rotate: false - xy: 453, 419 + xy: 551, 439 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 oil-extractor-icon-editor rotate: false - xy: 551, 419 + xy: 649, 469 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 overdrive-dome-icon-editor rotate: false - xy: 649, 449 + xy: 747, 469 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 overdrive-projector-icon-editor rotate: false - xy: 1235, 741 + xy: 1139, 597 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 overflow-gate-icon-editor rotate: false - xy: 899, 345 + xy: 865, 367 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 parallax-icon-editor rotate: false - xy: 1301, 741 + xy: 1205, 663 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 payload-conveyor-icon-editor rotate: false - xy: 747, 449 + xy: 845, 469 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 payload-router-icon-editor rotate: false - xy: 845, 449 + xy: 1847, 827 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 pebbles-icon-editor rotate: false - xy: 933, 379 + xy: 831, 299 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conduit-icon-editor rotate: false - xy: 899, 311 + xy: 865, 333 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conveyor-icon-editor rotate: false - xy: 933, 345 + xy: 865, 299 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-wall-icon-editor rotate: false - xy: 967, 379 + xy: 627, 265 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-wall-large-icon-editor rotate: false - xy: 1367, 741 + xy: 1271, 729 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 phase-weaver-icon-editor rotate: false - xy: 1433, 741 + xy: 1205, 597 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 pine-icon-editor rotate: false - xy: 1651, 691 + xy: 1733, 777 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 plastanium-compressor-icon-editor rotate: false - xy: 1499, 741 + xy: 1271, 663 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 plastanium-conveyor-icon-editor rotate: false - xy: 899, 277 + xy: 661, 265 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plastanium-wall-icon-editor rotate: false - xy: 933, 311 + xy: 695, 265 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plastanium-wall-large-icon-editor rotate: false - xy: 1565, 741 + xy: 1271, 597 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 plated-conduit-icon-editor rotate: false - xy: 967, 345 + xy: 729, 265 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pneumatic-drill-icon-editor rotate: false - xy: 1631, 741 + xy: 1337, 729 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 power-node-icon-editor rotate: false - xy: 933, 277 + xy: 763, 265 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 power-node-large-icon-editor rotate: false - xy: 1697, 741 + xy: 1337, 663 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 power-source-icon-editor rotate: false - xy: 967, 311 + xy: 797, 265 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 power-void-icon-editor rotate: false - xy: 967, 277 + xy: 831, 265 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-icon-editor rotate: false - xy: 899, 243 + xy: 865, 265 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulverizer-icon-editor rotate: false - xy: 933, 243 + xy: 899, 401 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pyratite-mixer-icon-editor rotate: false - xy: 1763, 741 + xy: 1337, 597 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 repair-point-icon-editor rotate: false - xy: 967, 243 + xy: 899, 367 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 resupply-point-icon-editor rotate: false - xy: 1829, 741 + xy: 1009, 531 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 ripple-icon-editor rotate: false - xy: 1717, 807 + xy: 1945, 827 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 rotary-pump-icon-editor rotate: false - xy: 1895, 741 + xy: 1075, 531 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 router-icon-editor rotate: false - xy: 1001, 379 + xy: 899, 333 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 rtg-generator-icon-editor rotate: false - xy: 1961, 741 + xy: 1141, 531 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 salt-wall-icon-editor rotate: false - xy: 1001, 345 + xy: 899, 299 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 salvo-icon-editor rotate: false - xy: 1073, 675 + xy: 1207, 531 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 sand-boulder-icon-editor rotate: false - xy: 1001, 311 + xy: 899, 265 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sand-wall-icon-editor rotate: false - xy: 1001, 277 + xy: 459, 235 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sand-water-icon-editor rotate: false - xy: 1001, 243 + xy: 459, 201 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scatter-icon-editor rotate: false - xy: 1073, 609 + xy: 1273, 531 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 scorch-icon-editor rotate: false - xy: 459, 215 + xy: 493, 235 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap-wall-gigantic-icon-editor rotate: false - xy: 1327, 873 + xy: 1457, 893 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 scrap-wall-huge-icon-editor rotate: false - xy: 1815, 807 + xy: 907, 763 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 scrap-wall-icon-editor rotate: false - xy: 493, 215 + xy: 459, 167 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap-wall-large-icon-editor rotate: false - xy: 1139, 675 + xy: 1339, 531 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 segment-icon-editor rotate: false - xy: 1139, 609 + xy: 1403, 761 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 separator-icon-editor rotate: false - xy: 1205, 675 + xy: 1403, 695 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 shale-boulder-icon-editor rotate: false - xy: 459, 181 + xy: 493, 201 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 shale-wall-icon-editor rotate: false - xy: 527, 215 + xy: 527, 235 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 shock-mine-icon-editor rotate: false - xy: 459, 147 + xy: 493, 167 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 shrubs-icon-editor rotate: false - xy: 493, 181 + xy: 527, 201 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 silicon-crucible-icon-editor rotate: false - xy: 1913, 807 + xy: 909, 665 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 silicon-smelter-icon-editor rotate: false - xy: 1205, 609 + xy: 1469, 761 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 snow-boulder-icon-editor rotate: false - xy: 1651, 641 + xy: 1667, 661 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 snow-icon-editor rotate: false - xy: 561, 215 + xy: 561, 235 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 snow-pine-icon-editor rotate: false - xy: 1701, 691 + xy: 131, 5 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 snow-wall-icon-editor rotate: false - xy: 493, 147 + xy: 527, 167 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 solar-panel-icon-editor rotate: false - xy: 527, 181 + xy: 561, 201 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 solar-panel-large-icon-editor rotate: false - xy: 907, 743 + xy: 909, 567 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 sorter-icon-editor rotate: false - xy: 527, 147 + xy: 561, 167 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 spawn-icon-editor rotate: false - xy: 561, 181 + xy: 463, 133 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 spectre-icon-editor rotate: false - xy: 1457, 873 + xy: 1587, 893 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 spore-cluster-icon-editor rotate: false - xy: 1751, 699 + xy: 943, 459 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 spore-pine-icon-editor rotate: false - xy: 1701, 641 + xy: 181, 5 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 spore-press-icon-editor rotate: false - xy: 1271, 675 + xy: 1403, 629 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 spore-wall-icon-editor rotate: false - xy: 561, 147 + xy: 463, 99 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 steam-generator-icon-editor rotate: false - xy: 1271, 609 + xy: 1469, 695 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 stone-wall-icon-editor rotate: false - xy: 1023, 443 + xy: 497, 133 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 surge-tower-icon-editor rotate: false - xy: 1337, 675 + xy: 1535, 761 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 surge-wall-icon-editor rotate: false - xy: 1057, 443 + xy: 497, 99 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 surge-wall-large-icon-editor rotate: false - xy: 1337, 609 + xy: 1469, 629 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 swarmer-icon-editor rotate: false - xy: 1403, 675 + xy: 1535, 695 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 switch-icon-editor rotate: false - xy: 463, 113 + xy: 531, 133 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 tendrils-icon-editor rotate: false - xy: 463, 79 + xy: 531, 99 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 tetrative-reconstructor-icon-editor rotate: false - xy: 323, 713 + xy: 323, 733 size: 288, 288 orig: 288, 288 offset: 0, 0 index: -1 thermal-generator-icon-editor rotate: false - xy: 1403, 609 + xy: 1601, 761 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 thermal-pump-icon-editor rotate: false - xy: 909, 645 + xy: 1005, 795 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 thorium-reactor-icon-editor rotate: false - xy: 909, 547 + xy: 1103, 795 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 thorium-wall-icon-editor rotate: false - xy: 497, 113 + xy: 565, 133 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 thorium-wall-large-icon-editor rotate: false - xy: 1469, 675 + xy: 1535, 629 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 thruster-icon-editor rotate: false - xy: 1587, 873 + xy: 1717, 893 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 titanium-conveyor-icon-editor rotate: false - xy: 497, 79 + xy: 565, 99 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-wall-icon-editor rotate: false - xy: 531, 113 + xy: 469, 65 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-wall-large-icon-editor rotate: false - xy: 1469, 609 + xy: 1601, 695 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 +tsunami-icon-editor + rotate: false + xy: 1201, 795 + size: 96, 96 + orig: 96, 96 + offset: 0, 0 + index: -1 underflow-gate-icon-editor rotate: false - xy: 531, 79 + xy: 469, 31 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 unloader-icon-editor rotate: false - xy: 463, 45 + xy: 503, 65 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 vault-icon-editor rotate: false - xy: 1005, 775 + xy: 1299, 795 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 water-extractor-icon-editor rotate: false - xy: 1535, 675 + xy: 1667, 761 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 wave-icon-editor rotate: false - xy: 1535, 609 + xy: 1601, 629 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 white-tree-dead-icon-editor rotate: false - xy: 1, 681 + xy: 1, 701 size: 320, 320 orig: 320, 320 offset: 0, 0 index: -1 white-tree-icon-editor rotate: false - xy: 1, 359 + xy: 1, 379 size: 320, 320 orig: 320, 320 offset: 0, 0 @@ -11542,7 +11584,7 @@ alpha-bg index: -1 bar rotate: false - xy: 752, 86 + xy: 1048, 560 size: 27, 36 split: 9, 9, 9, 9 orig: 27, 36 @@ -11550,7 +11592,7 @@ bar index: -1 bar-top rotate: false - xy: 723, 86 + xy: 1455, 483 size: 27, 36 split: 9, 10, 9, 10 orig: 27, 36 @@ -11565,21 +11607,21 @@ block-additive-reconstructor-large index: -1 block-additive-reconstructor-medium rotate: false - xy: 877, 371 + xy: 1627, 618 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-additive-reconstructor-small rotate: false - xy: 1029, 555 + xy: 1013, 359 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-additive-reconstructor-tiny rotate: false - xy: 301, 1 + xy: 327, 1 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -11600,7 +11642,7 @@ block-air-factory-large index: -1 block-air-factory-medium rotate: false - xy: 915, 492 + xy: 1665, 647 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -11614,7 +11656,7 @@ block-air-factory-small index: -1 block-air-factory-tiny rotate: false - xy: 319, 1 + xy: 881, 1 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -11628,14 +11670,14 @@ block-air-factory-xlarge index: -1 block-alloy-smelter-large rotate: false - xy: 651, 307 + xy: 651, 274 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-alloy-smelter-medium rotate: false - xy: 949, 492 + xy: 1699, 647 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -11649,7 +11691,7 @@ block-alloy-smelter-small index: -1 block-alloy-smelter-tiny rotate: false - xy: 331, 598 + xy: 899, 1 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -11663,14 +11705,14 @@ block-alloy-smelter-xlarge index: -1 block-arc-large rotate: false - xy: 551, 174 + xy: 551, 141 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-arc-medium rotate: false - xy: 913, 458 + xy: 2014, 907 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -11684,7 +11726,7 @@ block-arc-small index: -1 block-arc-tiny rotate: false - xy: 309, 672 + xy: 917, 1 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -11698,14 +11740,14 @@ block-arc-xlarge index: -1 block-armored-conveyor-large rotate: false - xy: 546, 132 + xy: 451, 74 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-armored-conveyor-medium rotate: false - xy: 947, 458 + xy: 1909, 689 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -11719,7 +11761,7 @@ block-armored-conveyor-small index: -1 block-armored-conveyor-tiny rotate: false - xy: 1426, 214 + xy: 935, 1 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -11733,28 +11775,28 @@ block-armored-conveyor-xlarge index: -1 block-basalt-large rotate: false - xy: 451, 74 + xy: 646, 232 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-basalt-medium rotate: false - xy: 1589, 647 + xy: 1989, 857 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-basalt-small rotate: false - xy: 419, 7 + xy: 781, 690 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-basalt-tiny rotate: false - xy: 331, 580 + xy: 953, 1 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -11768,35 +11810,35 @@ block-basalt-xlarge index: -1 block-battery-large rotate: false - xy: 446, 32 + xy: 401, 34 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-battery-large-large rotate: false - xy: 651, 265 + xy: 443, 32 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-battery-large-medium rotate: false - xy: 1623, 658 + xy: 1661, 613 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-battery-large-small rotate: false - xy: 722, 26 + xy: 1251, 427 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-battery-large-tiny rotate: false - xy: 1444, 214 + xy: 971, 1 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -11810,21 +11852,21 @@ block-battery-large-xlarge index: -1 block-battery-medium rotate: false - xy: 1657, 661 + xy: 1695, 613 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-battery-small rotate: false - xy: 810, 98 + xy: 1420, 461 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-battery-tiny rotate: false - xy: 1462, 214 + xy: 989, 1 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -11838,28 +11880,28 @@ block-battery-xlarge index: -1 block-blast-drill-large rotate: false - xy: 644, 223 + xy: 501, 100 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-blast-drill-medium rotate: false - xy: 1691, 660 + xy: 351, 6 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-blast-drill-small rotate: false - xy: 752, 60 + xy: 1277, 427 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-blast-drill-tiny rotate: false - xy: 1480, 214 + xy: 1007, 1 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -11873,28 +11915,28 @@ block-blast-drill-xlarge index: -1 block-blast-mixer-large rotate: false - xy: 701, 334 + xy: 543, 99 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-blast-mixer-medium rotate: false - xy: 1979, 899 + xy: 881, 563 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-blast-mixer-small rotate: false - xy: 836, 98 + xy: 1303, 427 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-blast-mixer-tiny rotate: false - xy: 1498, 214 + xy: 1025, 1 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -11908,28 +11950,28 @@ block-blast-mixer-xlarge index: -1 block-block-forge-large rotate: false - xy: 693, 292 + xy: 593, 133 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-block-forge-medium rotate: false - xy: 2013, 907 + xy: 915, 563 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-block-forge-small rotate: false - xy: 810, 72 + xy: 1329, 427 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-block-forge-tiny rotate: false - xy: 1516, 214 + xy: 1043, 1 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -11943,28 +11985,28 @@ block-block-forge-xlarge index: -1 block-block-loader-large rotate: false - xy: 693, 250 + xy: 585, 91 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-block-loader-medium rotate: false - xy: 1989, 865 + xy: 877, 529 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-block-loader-small rotate: false - xy: 862, 98 + xy: 1484, 489 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-block-loader-tiny rotate: false - xy: 856, 2 + xy: 1061, 1 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -11978,28 +12020,28 @@ block-block-loader-xlarge index: -1 block-block-unloader-large rotate: false - xy: 686, 208 + xy: 493, 58 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-block-unloader-medium rotate: false - xy: 1989, 831 + xy: 877, 495 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-block-unloader-small rotate: false - xy: 836, 72 + xy: 1510, 489 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-block-unloader-tiny rotate: false - xy: 874, 2 + xy: 1079, 1 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -12013,28 +12055,28 @@ block-block-unloader-xlarge index: -1 block-boulder-large rotate: false - xy: 751, 536 + xy: 535, 57 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-boulder-medium rotate: false - xy: 1989, 797 + xy: 911, 529 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-boulder-small rotate: false - xy: 888, 98 + xy: 1355, 433 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-boulder-tiny rotate: false - xy: 892, 2 + xy: 1097, 1 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -12048,28 +12090,28 @@ block-boulder-xlarge index: -1 block-bridge-conduit-large rotate: false - xy: 751, 494 + xy: 577, 49 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-bridge-conduit-medium rotate: false - xy: 1985, 763 + xy: 877, 461 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-bridge-conduit-small rotate: false - xy: 862, 72 + xy: 1115, 393 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-bridge-conduit-tiny rotate: false - xy: 910, 2 + xy: 331, 598 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -12083,28 +12125,28 @@ block-bridge-conduit-xlarge index: -1 block-bridge-conveyor-large rotate: false - xy: 793, 536 + xy: 485, 16 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-bridge-conveyor-medium rotate: false - xy: 1741, 703 + xy: 911, 495 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-bridge-conveyor-small rotate: false - xy: 914, 98 + xy: 1081, 375 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-bridge-conveyor-tiny rotate: false - xy: 928, 2 + xy: 1096, 193 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -12118,28 +12160,28 @@ block-bridge-conveyor-xlarge index: -1 block-char-large rotate: false - xy: 751, 452 + xy: 527, 15 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-char-medium rotate: false - xy: 1133, 618 + xy: 877, 427 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-char-small rotate: false - xy: 888, 72 + xy: 1076, 349 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-char-tiny rotate: false - xy: 946, 2 + xy: 464, 14 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -12153,28 +12195,28 @@ block-char-xlarge index: -1 block-cliff-large rotate: false - xy: 793, 494 + xy: 569, 7 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-cliff-medium rotate: false - xy: 1167, 618 + xy: 911, 461 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-cliff-small rotate: false - xy: 940, 98 + xy: 1446, 457 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-cliff-tiny rotate: false - xy: 964, 2 + xy: 309, 672 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -12188,28 +12230,28 @@ block-cliff-xlarge index: -1 block-coal-centrifuge-large rotate: false - xy: 835, 536 + xy: 751, 536 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-coal-centrifuge-medium rotate: false - xy: 1201, 618 + xy: 877, 393 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-coal-centrifuge-small rotate: false - xy: 914, 72 + xy: 1472, 457 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-coal-centrifuge-tiny rotate: false - xy: 1943, 757 + xy: 1534, 221 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -12223,28 +12265,28 @@ block-coal-centrifuge-xlarge index: -1 block-combustion-generator-large rotate: false - xy: 751, 410 + xy: 751, 494 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-combustion-generator-medium rotate: false - xy: 1235, 618 + xy: 911, 427 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-combustion-generator-small rotate: false - xy: 966, 98 + xy: 1498, 463 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-combustion-generator-tiny rotate: false - xy: 1961, 757 + xy: 1552, 221 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -12258,28 +12300,28 @@ block-combustion-generator-xlarge index: -1 block-command-center-large rotate: false - xy: 793, 452 + xy: 793, 536 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-command-center-medium rotate: false - xy: 1269, 618 + xy: 911, 393 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-command-center-small rotate: false - xy: 940, 72 + xy: 1524, 463 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-command-center-tiny rotate: false - xy: 1722, 183 + xy: 331, 580 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -12293,28 +12335,28 @@ block-command-center-xlarge index: -1 block-conduit-large rotate: false - xy: 835, 494 + xy: 751, 452 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-conduit-medium rotate: false - xy: 1303, 618 + xy: 877, 359 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-conduit-small rotate: false - xy: 966, 72 + xy: 1107, 367 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-conduit-tiny rotate: false - xy: 1945, 739 + xy: 1510, 195 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -12328,28 +12370,28 @@ block-conduit-xlarge index: -1 block-container-large rotate: false - xy: 793, 410 + xy: 793, 494 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-container-medium rotate: false - xy: 1337, 618 + xy: 911, 359 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-container-small rotate: false - xy: 445, 6 + xy: 1102, 341 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-container-tiny rotate: false - xy: 1945, 721 + xy: 1563, 495 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -12363,28 +12405,28 @@ block-container-xlarge index: -1 block-conveyor-large rotate: false - xy: 835, 452 + xy: 835, 536 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-conveyor-medium rotate: false - xy: 1371, 618 + xy: 872, 325 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-conveyor-small rotate: false - xy: 992, 87 + xy: 1102, 315 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-conveyor-tiny rotate: false - xy: 1963, 739 + xy: 1570, 216 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -12398,35 +12440,35 @@ block-conveyor-xlarge index: -1 block-copper-wall-large rotate: false - xy: 835, 410 + xy: 751, 410 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-copper-wall-large-large rotate: false - xy: 751, 368 + xy: 793, 452 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-copper-wall-large-medium rotate: false - xy: 1405, 618 + xy: 906, 325 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-copper-wall-large-small rotate: false - xy: 1018, 87 + xy: 1102, 289 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-copper-wall-large-tiny rotate: false - xy: 1963, 721 + xy: 1534, 203 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -12440,21 +12482,21 @@ block-copper-wall-large-xlarge index: -1 block-copper-wall-medium rotate: false - xy: 1439, 618 + xy: 869, 291 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-copper-wall-small rotate: false - xy: 1929, 568 + xy: 1102, 263 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-copper-wall-tiny rotate: false - xy: 1962, 703 + xy: 1552, 203 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -12468,28 +12510,28 @@ block-copper-wall-xlarge index: -1 block-core-foundation-large rotate: false - xy: 793, 368 + xy: 835, 494 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-core-foundation-medium rotate: false - xy: 1473, 618 + xy: 903, 291 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-core-foundation-small rotate: false - xy: 992, 61 + xy: 1096, 237 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-core-foundation-tiny rotate: false - xy: 1962, 685 + xy: 1570, 198 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -12503,28 +12545,28 @@ block-core-foundation-xlarge index: -1 block-core-nucleus-large rotate: false - xy: 835, 368 + xy: 793, 410 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-core-nucleus-medium rotate: false - xy: 1507, 618 + xy: 1133, 589 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-core-nucleus-small rotate: false - xy: 1018, 61 + xy: 1096, 211 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-core-nucleus-tiny rotate: false - xy: 1962, 667 + xy: 1588, 216 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -12538,28 +12580,28 @@ block-core-nucleus-xlarge index: -1 block-core-shard-large rotate: false - xy: 743, 326 + xy: 835, 452 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-core-shard-medium rotate: false - xy: 1541, 618 + xy: 1167, 589 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-core-shard-small rotate: false - xy: 810, 46 + xy: 1141, 393 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-core-shard-tiny rotate: false - xy: 1962, 649 + xy: 1588, 198 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -12573,28 +12615,28 @@ block-core-shard-xlarge index: -1 block-craters-large rotate: false - xy: 785, 326 + xy: 835, 410 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-craters-medium rotate: false - xy: 1125, 584 + xy: 1201, 589 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-craters-small rotate: false - xy: 836, 46 + xy: 1133, 367 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-craters-tiny rotate: false - xy: 1962, 631 + xy: 1510, 177 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -12606,35 +12648,35 @@ block-craters-xlarge orig: 48, 48 offset: 0, 0 index: -1 -block-cryofluidmixer-large +block-cryofluid-mixer-large rotate: false - xy: 827, 326 + xy: 751, 368 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-cryofluidmixer-medium +block-cryofluid-mixer-medium rotate: false - xy: 1159, 584 + xy: 1235, 589 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-cryofluidmixer-small +block-cryofluid-mixer-small rotate: false - xy: 862, 46 + xy: 1128, 341 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-cryofluidmixer-tiny +block-cryofluid-mixer-tiny rotate: false - xy: 1960, 613 + xy: 1528, 185 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-cryofluidmixer-xlarge +block-cryofluid-mixer-xlarge rotate: false xy: 907, 975 size: 48, 48 @@ -12643,28 +12685,28 @@ block-cryofluidmixer-xlarge index: -1 block-cultivator-large rotate: false - xy: 735, 284 + xy: 793, 368 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-cultivator-medium rotate: false - xy: 1193, 584 + xy: 1269, 589 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-cultivator-small rotate: false - xy: 888, 46 + xy: 1128, 315 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-cultivator-tiny rotate: false - xy: 1960, 595 + xy: 1546, 185 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -12678,28 +12720,28 @@ block-cultivator-xlarge index: -1 block-cyclone-large rotate: false - xy: 777, 284 + xy: 835, 368 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-cyclone-medium rotate: false - xy: 1227, 584 + xy: 1303, 589 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-cyclone-small rotate: false - xy: 914, 46 + xy: 1128, 289 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-cyclone-tiny rotate: false - xy: 1981, 745 + xy: 1528, 167 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -12713,28 +12755,28 @@ block-cyclone-xlarge index: -1 block-dacite-boulder-large rotate: false - xy: 819, 284 + xy: 746, 326 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-dacite-boulder-medium rotate: false - xy: 1261, 584 + xy: 1337, 589 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-dacite-boulder-small rotate: false - xy: 940, 46 + xy: 1128, 263 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-dacite-boulder-tiny rotate: false - xy: 1981, 727 + xy: 1546, 167 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -12748,56 +12790,56 @@ block-dacite-boulder-xlarge index: -1 block-dacite-large rotate: false - xy: 735, 242 + xy: 788, 326 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-dacite-medium rotate: false - xy: 1295, 584 + xy: 1371, 589 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-dacite-small rotate: false - xy: 966, 46 + xy: 1122, 237 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-dacite-tiny rotate: false - xy: 1999, 745 + xy: 1564, 180 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-dacite-wall-large rotate: false - xy: 777, 242 + xy: 830, 326 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-dacite-wall-medium rotate: false - xy: 1329, 584 + xy: 1405, 589 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-dacite-wall-small rotate: false - xy: 992, 35 + xy: 1122, 211 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-dacite-wall-tiny rotate: false - xy: 1999, 727 + xy: 1582, 180 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -12818,28 +12860,28 @@ block-dacite-xlarge index: -1 block-dark-metal-large rotate: false - xy: 819, 242 + xy: 701, 284 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-dark-metal-medium rotate: false - xy: 1363, 584 + xy: 1439, 589 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-dark-metal-small rotate: false - xy: 1018, 35 + xy: 1167, 395 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-dark-metal-tiny rotate: false - xy: 2017, 737 + xy: 1564, 162 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -12853,28 +12895,28 @@ block-dark-metal-xlarge index: -1 block-dark-panel-1-large rotate: false - xy: 728, 200 + xy: 743, 284 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-dark-panel-1-medium rotate: false - xy: 1397, 584 + xy: 1473, 589 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-dark-panel-1-small rotate: false - xy: 752, 34 + xy: 1193, 398 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-dark-panel-1-tiny rotate: false - xy: 2017, 719 + xy: 1582, 162 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -12888,28 +12930,28 @@ block-dark-panel-1-xlarge index: -1 block-dark-panel-2-large rotate: false - xy: 770, 200 + xy: 785, 284 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-dark-panel-2-medium rotate: false - xy: 1431, 584 + xy: 1507, 589 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-dark-panel-2-small rotate: false - xy: 778, 35 + xy: 1219, 399 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-dark-panel-2-tiny rotate: false - xy: 1166, 188 + xy: 1600, 180 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -12923,28 +12965,28 @@ block-dark-panel-2-xlarge index: -1 block-dark-panel-3-large rotate: false - xy: 812, 200 + xy: 827, 284 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-dark-panel-3-medium rotate: false - xy: 1465, 584 + xy: 1541, 589 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-dark-panel-3-small rotate: false - xy: 1044, 79 + xy: 1159, 367 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-dark-panel-3-tiny rotate: false - xy: 1184, 188 + xy: 1600, 162 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -12958,28 +13000,28 @@ block-dark-panel-3-xlarge index: -1 block-dark-panel-4-large rotate: false - xy: 601, 184 + xy: 635, 133 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-dark-panel-4-medium rotate: false - xy: 1499, 584 + xy: 1575, 589 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-dark-panel-4-small rotate: false - xy: 1044, 53 + xy: 1154, 341 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-dark-panel-4-tiny rotate: false - xy: 1166, 170 + xy: 1330, 205 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -12993,28 +13035,28 @@ block-dark-panel-4-xlarge index: -1 block-dark-panel-5-large rotate: false - xy: 643, 181 + xy: 627, 91 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-dark-panel-5-medium rotate: false - xy: 1533, 584 + xy: 1943, 681 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-dark-panel-5-small rotate: false - xy: 1070, 79 + xy: 1154, 315 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-dark-panel-5-tiny rotate: false - xy: 1202, 188 + xy: 1348, 205 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -13028,28 +13070,28 @@ block-dark-panel-5-xlarge index: -1 block-dark-panel-6-large rotate: false - xy: 685, 166 + xy: 619, 49 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-dark-panel-6-medium rotate: false - xy: 1575, 613 + xy: 949, 563 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-dark-panel-6-small rotate: false - xy: 1070, 53 + xy: 1154, 289 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-dark-panel-6-tiny rotate: false - xy: 1166, 152 + xy: 1408, 210 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -13063,49 +13105,49 @@ block-dark-panel-6-xlarge index: -1 block-darksand-large rotate: false - xy: 727, 158 + xy: 611, 7 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-darksand-medium rotate: false - xy: 1567, 579 + xy: 945, 529 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-darksand-small rotate: false - xy: 1096, 79 + xy: 1154, 263 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-darksand-tainted-water-large rotate: false - xy: 769, 158 + xy: 669, 91 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-darksand-tainted-water-medium rotate: false - xy: 1609, 613 + xy: 945, 495 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-darksand-tainted-water-small rotate: false - xy: 1096, 53 + xy: 1148, 237 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-darksand-tainted-water-tiny rotate: false - xy: 1184, 170 + xy: 1426, 205 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -13119,35 +13161,35 @@ block-darksand-tainted-water-xlarge index: -1 block-darksand-tiny rotate: false - xy: 1166, 134 + xy: 1536, 495 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-darksand-water-large rotate: false - xy: 811, 158 + xy: 661, 49 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-darksand-water-medium rotate: false - xy: 1601, 579 + xy: 945, 461 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-darksand-water-small rotate: false - xy: 1122, 79 + xy: 1148, 211 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-darksand-water-tiny rotate: false - xy: 1202, 170 + xy: 1550, 477 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -13168,28 +13210,28 @@ block-darksand-xlarge index: -1 block-deepwater-large rotate: false - xy: 501, 83 + xy: 653, 7 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-deepwater-medium rotate: false - xy: 1725, 660 + xy: 945, 427 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-deepwater-small rotate: false - xy: 1122, 53 + xy: 1581, 524 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-deepwater-tiny rotate: false - xy: 1184, 152 + xy: 1568, 477 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -13203,28 +13245,28 @@ block-deepwater-xlarge index: -1 block-differential-generator-large rotate: false - xy: 869, 326 + xy: 703, 49 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-differential-generator-medium rotate: false - xy: 995, 555 + xy: 945, 393 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-differential-generator-small rotate: false - xy: 1044, 27 + xy: 1607, 524 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-differential-generator-tiny rotate: false - xy: 1166, 116 + xy: 1586, 480 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -13238,28 +13280,28 @@ block-differential-generator-xlarge index: -1 block-diode-large rotate: false - xy: 861, 284 + xy: 695, 7 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-diode-medium rotate: false - xy: 987, 521 + xy: 945, 359 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-diode-small rotate: false - xy: 1070, 27 + xy: 1633, 519 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-diode-tiny rotate: false - xy: 1202, 152 + xy: 1604, 480 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -13273,56 +13315,56 @@ block-diode-xlarge index: -1 block-dirt-large rotate: false - xy: 861, 242 + xy: 737, 7 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-dirt-medium rotate: false - xy: 983, 487 + xy: 940, 325 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-dirt-small rotate: false - xy: 1096, 27 + xy: 1659, 519 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-dirt-tiny rotate: false - xy: 1184, 134 + xy: 1563, 459 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-dirt-wall-large rotate: false - xy: 854, 200 + xy: 646, 190 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-dirt-wall-medium rotate: false - xy: 981, 453 + xy: 937, 291 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-dirt-wall-small rotate: false - xy: 1122, 27 + xy: 1685, 519 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-dirt-wall-tiny rotate: false - xy: 1202, 134 + xy: 1563, 441 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -13343,28 +13385,28 @@ block-dirt-xlarge index: -1 block-disassembler-large rotate: false - xy: 853, 158 + xy: 821, 933 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-disassembler-medium rotate: false - xy: 1775, 703 + xy: 1609, 584 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-disassembler-small rotate: false - xy: 1148, 79 + xy: 1711, 519 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-disassembler-tiny rotate: false - xy: 1184, 116 + xy: 1563, 423 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -13378,28 +13420,28 @@ block-disassembler-xlarge index: -1 block-distributor-large rotate: false - xy: 903, 284 + xy: 863, 933 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-distributor-medium rotate: false - xy: 1809, 705 + xy: 1643, 579 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-distributor-small rotate: false - xy: 1148, 53 + xy: 1737, 519 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-distributor-tiny rotate: false - xy: 1202, 116 + xy: 1563, 405 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -13413,35 +13455,35 @@ block-distributor-xlarge index: -1 block-door-large rotate: false - xy: 903, 242 + xy: 905, 933 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-door-large-large rotate: false - xy: 896, 200 + xy: 947, 933 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-door-large-medium rotate: false - xy: 1759, 669 + xy: 1677, 579 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-door-large-small rotate: false - xy: 1148, 27 + xy: 1763, 519 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-door-large-tiny rotate: false - xy: 1426, 196 + xy: 1563, 387 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -13455,21 +13497,21 @@ block-door-large-xlarge index: -1 block-door-medium rotate: false - xy: 1843, 705 + xy: 1711, 579 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-door-small rotate: false - xy: 1955, 568 + xy: 1789, 519 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-door-tiny rotate: false - xy: 1444, 196 + xy: 1581, 459 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -13483,28 +13525,28 @@ block-door-xlarge index: -1 block-dune-wall-large rotate: false - xy: 895, 158 + xy: 989, 933 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-dune-wall-medium rotate: false - xy: 1877, 711 + xy: 1729, 613 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-dune-wall-small rotate: false - xy: 804, 20 + xy: 1815, 519 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-dune-wall-tiny rotate: false - xy: 1462, 196 + xy: 1581, 441 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -13518,28 +13560,28 @@ block-dune-wall-xlarge index: -1 block-duo-large rotate: false - xy: 546, 90 + xy: 1031, 933 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-duo-medium rotate: false - xy: 1793, 669 + xy: 1733, 647 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-duo-small rotate: false - xy: 830, 20 + xy: 1841, 519 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-duo-tiny rotate: false - xy: 1480, 196 + xy: 1581, 423 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -13553,28 +13595,28 @@ block-duo-xlarge index: -1 block-exponential-reconstructor-large rotate: false - xy: 938, 200 + xy: 1073, 933 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-exponential-reconstructor-medium rotate: false - xy: 1827, 671 + xy: 1745, 579 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-exponential-reconstructor-small rotate: false - xy: 856, 20 + xy: 1867, 519 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-exponential-reconstructor-tiny rotate: false - xy: 1498, 196 + xy: 1581, 405 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -13588,28 +13630,28 @@ block-exponential-reconstructor-xlarge index: -1 block-force-projector-large rotate: false - xy: 937, 158 + xy: 1115, 933 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-force-projector-medium rotate: false - xy: 1861, 671 + xy: 1763, 613 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-force-projector-small rotate: false - xy: 882, 20 + xy: 1893, 519 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-force-projector-tiny rotate: false - xy: 1516, 196 + xy: 1581, 387 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -13621,5504 +13663,5574 @@ block-force-projector-xlarge orig: 48, 48 offset: 0, 0 index: -1 -block-fuse-large - rotate: false - xy: 821, 933 - size: 40, 40 - orig: 40, 40 - offset: 0, 0 - index: -1 -block-fuse-medium - rotate: false - xy: 1895, 677 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -block-fuse-small - rotate: false - xy: 908, 20 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -block-fuse-tiny - rotate: false - xy: 1534, 209 - size: 16, 16 - orig: 16, 16 - offset: 0, 0 - index: -1 -block-fuse-xlarge - rotate: false - xy: 695, 866 - size: 48, 48 - orig: 48, 48 - offset: 0, 0 - index: -1 -block-graphite-press-large - rotate: false - xy: 863, 933 - size: 40, 40 - orig: 40, 40 - offset: 0, 0 - index: -1 -block-graphite-press-medium - rotate: false - xy: 1759, 635 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -block-graphite-press-small - rotate: false - xy: 934, 20 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -block-graphite-press-tiny - rotate: false - xy: 1552, 209 - size: 16, 16 - orig: 16, 16 - offset: 0, 0 - index: -1 -block-graphite-press-xlarge - rotate: false - xy: 101, 478 - size: 48, 48 - orig: 48, 48 - offset: 0, 0 - index: -1 -block-grass-large - rotate: false - xy: 905, 933 - size: 40, 40 - orig: 40, 40 - offset: 0, 0 - index: -1 -block-grass-medium - rotate: false - xy: 1793, 635 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -block-grass-small - rotate: false - xy: 960, 20 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -block-grass-tiny - rotate: false - xy: 1570, 209 - size: 16, 16 - orig: 16, 16 - offset: 0, 0 - index: -1 -block-grass-xlarge - rotate: false - xy: 101, 428 - size: 48, 48 - orig: 48, 48 - offset: 0, 0 - index: -1 -block-ground-factory-large - rotate: false - xy: 947, 933 - size: 40, 40 - orig: 40, 40 - offset: 0, 0 - index: -1 -block-ground-factory-medium - rotate: false - xy: 1827, 637 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -block-ground-factory-small - rotate: false - xy: 778, 9 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -block-ground-factory-tiny - rotate: false - xy: 1588, 209 - size: 16, 16 - orig: 16, 16 - offset: 0, 0 - index: -1 -block-ground-factory-xlarge - rotate: false - xy: 101, 378 - size: 48, 48 - orig: 48, 48 - offset: 0, 0 - index: -1 -block-hail-large - rotate: false - xy: 989, 933 - size: 40, 40 - orig: 40, 40 - offset: 0, 0 - index: -1 -block-hail-medium - rotate: false - xy: 1861, 637 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -block-hail-small - rotate: false - xy: 986, 9 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -block-hail-tiny - rotate: false - xy: 1606, 209 - size: 16, 16 - orig: 16, 16 - offset: 0, 0 - index: -1 -block-hail-xlarge - rotate: false - xy: 101, 328 - size: 48, 48 - orig: 48, 48 - offset: 0, 0 - index: -1 -block-hotrock-large - rotate: false - xy: 1031, 933 - size: 40, 40 - orig: 40, 40 - offset: 0, 0 - index: -1 -block-hotrock-medium - rotate: false - xy: 1895, 643 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -block-hotrock-small - rotate: false - xy: 1012, 9 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -block-hotrock-tiny - rotate: false - xy: 1624, 209 - size: 16, 16 - orig: 16, 16 - offset: 0, 0 - index: -1 -block-hotrock-xlarge - rotate: false - xy: 101, 278 - size: 48, 48 - orig: 48, 48 - offset: 0, 0 - index: -1 -block-hyper-processor-large - rotate: false - xy: 1073, 933 - size: 40, 40 - orig: 40, 40 - offset: 0, 0 - index: -1 -block-hyper-processor-medium - rotate: false - xy: 1635, 579 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -block-hyper-processor-small - rotate: false - xy: 1038, 1 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -block-hyper-processor-tiny - rotate: false - xy: 1534, 191 - size: 16, 16 - orig: 16, 16 - offset: 0, 0 - index: -1 -block-hyper-processor-xlarge - rotate: false - xy: 101, 228 - size: 48, 48 - orig: 48, 48 - offset: 0, 0 - index: -1 -block-ice-large - rotate: false - xy: 1115, 933 - size: 40, 40 - orig: 40, 40 - offset: 0, 0 - index: -1 -block-ice-medium - rotate: false - xy: 1021, 521 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -block-ice-small - rotate: false - xy: 1064, 1 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -block-ice-snow-large +block-foreshadow-large rotate: false xy: 1157, 933 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-ice-snow-medium +block-foreshadow-medium rotate: false - xy: 1017, 487 + xy: 1767, 647 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-ice-snow-small +block-foreshadow-small rotate: false - xy: 1090, 1 + xy: 1919, 519 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-ice-snow-tiny +block-foreshadow-tiny rotate: false - xy: 1552, 191 + xy: 1575, 369 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-ice-snow-xlarge +block-foreshadow-xlarge rotate: false - xy: 101, 178 + xy: 695, 866 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-ice-tiny - rotate: false - xy: 1570, 191 - size: 16, 16 - orig: 16, 16 - offset: 0, 0 - index: -1 -block-ice-wall-large +block-fuse-large rotate: false xy: 1199, 933 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-ice-wall-medium +block-fuse-medium rotate: false - xy: 1015, 453 + xy: 1779, 579 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-ice-wall-small +block-fuse-small rotate: false - xy: 1116, 1 + xy: 1945, 519 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-ice-wall-tiny +block-fuse-tiny rotate: false - xy: 1588, 191 + xy: 1575, 351 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-ice-wall-xlarge +block-fuse-xlarge rotate: false - xy: 101, 128 + xy: 101, 478 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-ice-xlarge - rotate: false - xy: 101, 78 - size: 48, 48 - orig: 48, 48 - offset: 0, 0 - index: -1 -block-illuminator-large +block-graphite-press-large rotate: false xy: 1241, 933 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-illuminator-medium +block-graphite-press-medium rotate: false - xy: 1055, 547 + xy: 1797, 613 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-illuminator-small +block-graphite-press-small rotate: false - xy: 1142, 1 + xy: 1971, 519 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-illuminator-tiny +block-graphite-press-tiny rotate: false - xy: 1606, 191 + xy: 1575, 333 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-illuminator-xlarge +block-graphite-press-xlarge rotate: false - xy: 101, 28 + xy: 101, 428 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-impact-reactor-large +block-grass-large rotate: false xy: 1283, 933 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-impact-reactor-medium +block-grass-medium rotate: false - xy: 1089, 547 + xy: 1801, 647 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-impact-reactor-small +block-grass-small rotate: false - xy: 1168, 1 + xy: 1997, 519 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-impact-reactor-tiny +block-grass-tiny rotate: false - xy: 1624, 191 + xy: 1575, 315 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-impact-reactor-xlarge +block-grass-xlarge rotate: false - xy: 231, 608 + xy: 101, 378 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-incinerator-large +block-ground-factory-large rotate: false xy: 1325, 933 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-incinerator-medium +block-ground-factory-medium rotate: false - xy: 1055, 513 + xy: 1813, 579 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-incinerator-small +block-ground-factory-small rotate: false - xy: 748, 8 + xy: 2023, 519 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-incinerator-tiny +block-ground-factory-tiny rotate: false - xy: 1642, 193 + xy: 1599, 462 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-incinerator-xlarge +block-ground-factory-xlarge rotate: false - xy: 231, 558 + xy: 101, 328 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-inverted-sorter-large +block-hail-large rotate: false xy: 1367, 933 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-inverted-sorter-medium +block-hail-medium rotate: false - xy: 1089, 513 + xy: 1831, 613 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-inverted-sorter-small +block-hail-small rotate: false - xy: 1151, 388 + xy: 1581, 498 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-inverted-sorter-tiny +block-hail-tiny rotate: false - xy: 1660, 193 + xy: 1599, 444 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-inverted-sorter-xlarge +block-hail-xlarge rotate: false - xy: 745, 866 + xy: 101, 278 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-item-source-large +block-hotrock-large rotate: false xy: 1409, 933 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-item-source-medium +block-hotrock-medium rotate: false - xy: 1051, 479 + xy: 1835, 647 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-item-source-small +block-hotrock-small rotate: false - xy: 1177, 388 + xy: 1607, 498 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-item-source-tiny +block-hotrock-tiny rotate: false - xy: 1678, 193 + xy: 1599, 426 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-item-source-xlarge +block-hotrock-xlarge rotate: false - xy: 151, 508 + xy: 101, 228 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-item-void-large +block-hyper-processor-large rotate: false xy: 1451, 933 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-item-void-medium +block-hyper-processor-medium rotate: false - xy: 1085, 479 + xy: 1847, 579 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-item-void-small +block-hyper-processor-small rotate: false - xy: 1203, 388 + xy: 1633, 493 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-item-void-tiny +block-hyper-processor-tiny rotate: false - xy: 1740, 183 + xy: 1599, 408 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-item-void-xlarge +block-hyper-processor-xlarge rotate: false - xy: 151, 458 + xy: 101, 178 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-junction-large +block-ice-large rotate: false xy: 1493, 933 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-junction-medium +block-ice-medium rotate: false - xy: 1049, 445 + xy: 1865, 613 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-junction-small +block-ice-small rotate: false - xy: 1229, 388 + xy: 1659, 493 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-junction-tiny - rotate: false - xy: 1220, 188 - size: 16, 16 - orig: 16, 16 - offset: 0, 0 - index: -1 -block-junction-xlarge - rotate: false - xy: 201, 508 - size: 48, 48 - orig: 48, 48 - offset: 0, 0 - index: -1 -block-kiln-large +block-ice-snow-large rotate: false xy: 1535, 933 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-kiln-medium +block-ice-snow-medium rotate: false - xy: 1083, 445 + xy: 1869, 647 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-kiln-small +block-ice-snow-small rotate: false - xy: 1255, 388 + xy: 1685, 493 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-kiln-tiny +block-ice-snow-tiny rotate: false - xy: 1220, 170 + xy: 1599, 390 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-kiln-xlarge +block-ice-snow-xlarge rotate: false - xy: 151, 408 + xy: 101, 128 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-lancer-large +block-ice-tiny + rotate: false + xy: 1593, 369 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +block-ice-wall-large rotate: false xy: 1577, 933 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-lancer-medium +block-ice-wall-medium rotate: false - xy: 1895, 609 + xy: 1903, 655 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-lancer-small +block-ice-wall-small rotate: false - xy: 1281, 388 + xy: 1711, 493 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-lancer-tiny +block-ice-wall-tiny rotate: false - xy: 1220, 152 + xy: 1593, 351 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-lancer-xlarge +block-ice-wall-xlarge rotate: false - xy: 201, 458 + xy: 101, 78 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-large-logic-display-large +block-ice-xlarge + rotate: false + xy: 101, 28 + size: 48, 48 + orig: 48, 48 + offset: 0, 0 + index: -1 +block-illuminator-large rotate: false xy: 1619, 933 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-large-logic-display-medium +block-illuminator-medium rotate: false - xy: 488, 40 + xy: 1937, 647 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-large-logic-display-small +block-illuminator-small rotate: false - xy: 1307, 388 + xy: 1737, 493 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-large-logic-display-tiny +block-illuminator-tiny rotate: false - xy: 1220, 134 + xy: 1593, 333 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-large-logic-display-xlarge +block-illuminator-xlarge rotate: false - xy: 151, 358 + xy: 231, 608 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-laser-drill-large +block-impact-reactor-large rotate: false xy: 1661, 933 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-laser-drill-medium +block-impact-reactor-medium rotate: false - xy: 522, 49 + xy: 1881, 579 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-laser-drill-small +block-impact-reactor-small rotate: false - xy: 1333, 388 + xy: 1763, 493 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-laser-drill-tiny +block-impact-reactor-tiny rotate: false - xy: 1220, 116 + xy: 1593, 315 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-laser-drill-xlarge +block-impact-reactor-xlarge rotate: false - xy: 201, 408 + xy: 231, 558 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-launch-pad-large +block-incinerator-large rotate: false xy: 1703, 933 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-launch-pad-large-large +block-incinerator-medium + rotate: false + xy: 1899, 613 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +block-incinerator-small + rotate: false + xy: 1789, 493 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +block-incinerator-tiny + rotate: false + xy: 1596, 297 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +block-incinerator-xlarge + rotate: false + xy: 745, 866 + size: 48, 48 + orig: 48, 48 + offset: 0, 0 + index: -1 +block-inverted-sorter-large rotate: false xy: 1745, 933 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-launch-pad-large-medium +block-inverted-sorter-medium rotate: false - xy: 556, 56 + xy: 1933, 613 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-launch-pad-large-small +block-inverted-sorter-small rotate: false - xy: 1359, 388 + xy: 1815, 493 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-launch-pad-large-tiny +block-inverted-sorter-tiny rotate: false - xy: 1174, 98 + xy: 1596, 279 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-launch-pad-large-xlarge +block-inverted-sorter-xlarge rotate: false - xy: 151, 308 + xy: 151, 508 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-launch-pad-medium - rotate: false - xy: 522, 15 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -block-launch-pad-small - rotate: false - xy: 1385, 388 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -block-launch-pad-tiny - rotate: false - xy: 1174, 80 - size: 16, 16 - orig: 16, 16 - offset: 0, 0 - index: -1 -block-launch-pad-xlarge - rotate: false - xy: 201, 358 - size: 48, 48 - orig: 48, 48 - offset: 0, 0 - index: -1 -block-liquid-junction-large +block-item-source-large rotate: false xy: 1787, 933 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-liquid-junction-medium +block-item-source-medium rotate: false - xy: 556, 22 + xy: 1915, 579 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-liquid-junction-small +block-item-source-small rotate: false - xy: 1411, 388 + xy: 1841, 493 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-liquid-junction-tiny +block-item-source-tiny rotate: false - xy: 1192, 98 + xy: 1596, 261 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-liquid-junction-xlarge +block-item-source-xlarge rotate: false - xy: 151, 258 + xy: 151, 458 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-liquid-router-large +block-item-void-large rotate: false xy: 1829, 933 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-liquid-router-medium +block-item-void-medium rotate: false - xy: 488, 6 + xy: 1949, 579 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-liquid-router-small +block-item-void-small rotate: false - xy: 1437, 388 + xy: 1867, 493 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-liquid-router-tiny +block-item-void-tiny rotate: false - xy: 1174, 62 + xy: 1596, 243 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-liquid-router-xlarge +block-item-void-xlarge rotate: false - xy: 201, 308 + xy: 201, 508 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-liquid-source-large +block-junction-large rotate: false xy: 1871, 933 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-liquid-source-medium +block-junction-medium rotate: false - xy: 588, 140 + xy: 1967, 613 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-liquid-source-small +block-junction-small rotate: false - xy: 1463, 388 + xy: 1893, 493 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-liquid-source-tiny +block-junction-tiny rotate: false - xy: 1210, 98 + xy: 1617, 462 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-liquid-source-xlarge +block-junction-xlarge rotate: false - xy: 151, 208 + xy: 151, 408 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-liquid-tank-large +block-kiln-large rotate: false xy: 1913, 933 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-liquid-tank-medium +block-kiln-medium rotate: false - xy: 588, 106 + xy: 1971, 647 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-liquid-tank-small +block-kiln-small rotate: false - xy: 1489, 388 + xy: 1919, 493 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-liquid-tank-tiny +block-kiln-tiny rotate: false - xy: 1192, 80 + xy: 1617, 444 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-liquid-tank-xlarge +block-kiln-xlarge rotate: false - xy: 201, 258 + xy: 201, 458 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-liquid-void-large +block-lancer-large rotate: false xy: 1955, 933 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-liquid-void-medium +block-lancer-medium rotate: false - xy: 590, 72 + xy: 1977, 681 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-liquid-void-small +block-lancer-small rotate: false - xy: 1515, 388 + xy: 1945, 493 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-liquid-void-tiny +block-lancer-tiny rotate: false - xy: 1174, 44 + xy: 1617, 426 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-liquid-void-xlarge +block-lancer-xlarge rotate: false - xy: 151, 158 + xy: 151, 358 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-logic-display-large +block-large-logic-display-large rotate: false xy: 845, 891 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-logic-display-medium +block-large-logic-display-medium rotate: false - xy: 590, 38 + xy: 1983, 579 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-logic-display-small +block-large-logic-display-small rotate: false - xy: 1150, 362 + xy: 1971, 493 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-logic-display-tiny +block-large-logic-display-tiny rotate: false - xy: 1210, 80 + xy: 1617, 408 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-logic-display-xlarge +block-large-logic-display-xlarge rotate: false - xy: 201, 208 + xy: 201, 408 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-logic-processor-large +block-laser-drill-large rotate: false xy: 887, 891 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-logic-processor-medium +block-laser-drill-medium rotate: false - xy: 590, 4 + xy: 2001, 613 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-logic-processor-small +block-laser-drill-small rotate: false - xy: 1176, 362 + xy: 1997, 493 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-logic-processor-tiny +block-laser-drill-tiny rotate: false - xy: 1192, 62 + xy: 1617, 390 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-logic-processor-xlarge +block-laser-drill-xlarge rotate: false - xy: 151, 108 + xy: 151, 308 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-magmarock-large +block-launch-pad-large rotate: false xy: 929, 891 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-magmarock-medium - rotate: false - xy: 622, 147 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -block-magmarock-small - rotate: false - xy: 1202, 362 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -block-magmarock-tiny - rotate: false - xy: 1210, 62 - size: 16, 16 - orig: 16, 16 - offset: 0, 0 - index: -1 -block-magmarock-xlarge - rotate: false - xy: 201, 158 - size: 48, 48 - orig: 48, 48 - offset: 0, 0 - index: -1 -block-mass-driver-large +block-launch-pad-large-large rotate: false xy: 971, 891 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-mass-driver-medium +block-launch-pad-large-medium rotate: false - xy: 622, 113 + xy: 2005, 647 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-mass-driver-small +block-launch-pad-large-small rotate: false - xy: 1228, 362 + xy: 2023, 493 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-mass-driver-tiny +block-launch-pad-large-tiny rotate: false - xy: 1192, 44 + xy: 1611, 372 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-mass-driver-xlarge +block-launch-pad-large-xlarge rotate: false - xy: 151, 58 + xy: 201, 358 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-mechanical-drill-large +block-launch-pad-medium + rotate: false + xy: 1989, 823 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +block-launch-pad-small + rotate: false + xy: 1355, 407 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +block-launch-pad-tiny + rotate: false + xy: 1611, 354 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +block-launch-pad-xlarge + rotate: false + xy: 151, 258 + size: 48, 48 + orig: 48, 48 + offset: 0, 0 + index: -1 +block-liquid-junction-large rotate: false xy: 1013, 891 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-mechanical-drill-medium +block-liquid-junction-medium rotate: false - xy: 624, 79 + xy: 1988, 789 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-mechanical-drill-small +block-liquid-junction-small rotate: false - xy: 1254, 362 + xy: 1381, 433 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-mechanical-drill-tiny +block-liquid-junction-tiny rotate: false - xy: 1210, 44 + xy: 1611, 336 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-mechanical-drill-xlarge +block-liquid-junction-xlarge rotate: false - xy: 201, 108 + xy: 201, 308 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-mechanical-pump-large +block-liquid-router-large rotate: false xy: 1055, 891 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-mechanical-pump-medium +block-liquid-router-medium rotate: false - xy: 624, 45 + xy: 1987, 755 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-mechanical-pump-small +block-liquid-router-small rotate: false - xy: 1280, 362 + xy: 1381, 407 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-mechanical-pump-tiny +block-liquid-router-tiny rotate: false - xy: 1228, 98 + xy: 1611, 318 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-mechanical-pump-xlarge +block-liquid-router-xlarge rotate: false - xy: 201, 58 + xy: 151, 208 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-meltdown-large +block-liquid-source-large rotate: false xy: 1097, 891 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-meltdown-medium +block-liquid-source-medium rotate: false - xy: 624, 11 + xy: 1986, 721 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-meltdown-small +block-liquid-source-small rotate: false - xy: 1306, 362 + xy: 1407, 434 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-meltdown-tiny +block-liquid-source-tiny rotate: false - xy: 1228, 80 + xy: 1614, 300 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-meltdown-xlarge +block-liquid-source-xlarge rotate: false - xy: 251, 508 + xy: 201, 258 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-melter-large +block-liquid-tank-large rotate: false xy: 1139, 891 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-melter-medium +block-liquid-tank-medium rotate: false - xy: 656, 132 + xy: 869, 257 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-melter-small +block-liquid-tank-small rotate: false - xy: 1332, 362 + xy: 1407, 408 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-melter-tiny +block-liquid-tank-tiny rotate: false - xy: 1228, 62 + xy: 1614, 282 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-melter-xlarge +block-liquid-tank-xlarge rotate: false - xy: 251, 458 + xy: 151, 158 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-memory-bank-large +block-liquid-void-large rotate: false xy: 1181, 891 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-memory-bank-medium +block-liquid-void-medium rotate: false - xy: 690, 132 + xy: 903, 257 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-memory-bank-small +block-liquid-void-small rotate: false - xy: 1358, 362 + xy: 1433, 431 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-memory-bank-tiny +block-liquid-void-tiny rotate: false - xy: 1228, 44 + xy: 1614, 264 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-memory-bank-xlarge +block-liquid-void-xlarge rotate: false - xy: 251, 408 + xy: 201, 208 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-memory-cell-large +block-logic-display-large rotate: false xy: 1223, 891 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-memory-cell-medium +block-logic-display-medium rotate: false - xy: 724, 124 + xy: 937, 257 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-memory-cell-small +block-logic-display-small rotate: false - xy: 1384, 362 + xy: 1459, 431 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-memory-cell-tiny +block-logic-display-tiny rotate: false - xy: 1981, 709 + xy: 1614, 246 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-memory-cell-xlarge +block-logic-display-xlarge rotate: false - xy: 251, 358 + xy: 151, 108 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-mend-projector-large +block-logic-processor-large rotate: false xy: 1265, 891 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-mend-projector-medium +block-logic-processor-medium rotate: false - xy: 758, 124 + xy: 1091, 571 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-mend-projector-small +block-logic-processor-small rotate: false - xy: 1410, 362 + xy: 1433, 405 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-mend-projector-tiny +block-logic-processor-tiny rotate: false - xy: 1999, 709 + xy: 1629, 372 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-mend-projector-xlarge +block-logic-processor-xlarge rotate: false - xy: 251, 308 + xy: 201, 158 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-mender-large +block-magmarock-large rotate: false xy: 1307, 891 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-mender-medium +block-magmarock-medium rotate: false - xy: 792, 124 + xy: 1125, 555 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-mender-small +block-magmarock-small rotate: false - xy: 1436, 362 + xy: 1459, 405 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-mender-tiny +block-magmarock-tiny rotate: false - xy: 1980, 691 + xy: 1629, 354 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-mender-xlarge +block-magmarock-xlarge rotate: false - xy: 251, 258 + xy: 151, 58 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-message-large +block-mass-driver-large rotate: false xy: 1349, 891 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-message-medium +block-mass-driver-medium rotate: false - xy: 826, 124 + xy: 1159, 555 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-message-small +block-mass-driver-small rotate: false - xy: 1462, 362 + xy: 1485, 431 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-message-tiny +block-mass-driver-tiny rotate: false - xy: 1980, 673 + xy: 1629, 336 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-message-xlarge +block-mass-driver-xlarge rotate: false - xy: 251, 208 + xy: 201, 108 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-metal-floor-2-large +block-mechanical-drill-large rotate: false xy: 1391, 891 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-metal-floor-2-medium +block-mechanical-drill-medium rotate: false - xy: 860, 124 + xy: 1193, 555 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-metal-floor-2-small +block-mechanical-drill-small rotate: false - xy: 1488, 362 + xy: 1485, 405 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-metal-floor-2-tiny +block-mechanical-drill-tiny rotate: false - xy: 1998, 691 + xy: 1629, 318 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-metal-floor-2-xlarge +block-mechanical-drill-xlarge rotate: false - xy: 251, 158 + xy: 201, 58 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-metal-floor-3-large +block-mechanical-pump-large rotate: false xy: 1433, 891 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-metal-floor-3-medium +block-mechanical-pump-medium rotate: false - xy: 894, 124 + xy: 1227, 555 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-metal-floor-3-small +block-mechanical-pump-small rotate: false - xy: 1514, 362 + xy: 1511, 437 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-metal-floor-3-tiny +block-mechanical-pump-tiny rotate: false - xy: 1980, 655 + xy: 1632, 300 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-metal-floor-3-xlarge +block-mechanical-pump-xlarge rotate: false - xy: 251, 108 + xy: 251, 508 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-metal-floor-5-large +block-meltdown-large rotate: false xy: 1475, 891 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-metal-floor-5-medium +block-meltdown-medium rotate: false - xy: 928, 124 + xy: 1261, 555 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-metal-floor-5-small +block-meltdown-small rotate: false - xy: 1149, 336 + xy: 1511, 411 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-metal-floor-5-tiny +block-meltdown-tiny rotate: false - xy: 1998, 673 + xy: 1632, 282 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-metal-floor-5-xlarge +block-meltdown-xlarge rotate: false - xy: 251, 58 + xy: 251, 458 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-metal-floor-damaged-large +block-melter-large rotate: false xy: 1517, 891 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-metal-floor-damaged-medium +block-melter-medium rotate: false - xy: 962, 124 + xy: 1295, 555 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-metal-floor-damaged-small +block-melter-small rotate: false - xy: 1149, 310 + xy: 1537, 437 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-metal-floor-damaged-tiny +block-melter-tiny rotate: false - xy: 1980, 637 + xy: 1632, 264 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-metal-floor-damaged-xlarge +block-melter-xlarge rotate: false - xy: 151, 8 + xy: 251, 408 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-metal-floor-large +block-memory-bank-large rotate: false xy: 1559, 891 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-metal-floor-medium +block-memory-bank-medium rotate: false - xy: 658, 98 + xy: 1329, 555 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-metal-floor-small +block-memory-bank-small rotate: false - xy: 1175, 336 + xy: 1537, 411 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-metal-floor-tiny +block-memory-bank-tiny rotate: false - xy: 1998, 655 + xy: 1632, 246 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-metal-floor-xlarge +block-memory-bank-xlarge rotate: false - xy: 201, 8 + xy: 251, 358 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-micro-processor-large +block-memory-cell-large rotate: false xy: 1601, 891 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-micro-processor-medium +block-memory-cell-medium rotate: false - xy: 658, 64 + xy: 1363, 555 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-micro-processor-small +block-memory-cell-small rotate: false - xy: 1149, 284 + xy: 1185, 369 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-micro-processor-tiny +block-memory-cell-tiny rotate: false - xy: 1998, 637 + xy: 1635, 475 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-micro-processor-xlarge +block-memory-cell-xlarge rotate: false - xy: 251, 8 + xy: 251, 308 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-moss-large +block-mend-projector-large rotate: false xy: 1643, 891 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-moss-medium +block-mend-projector-medium rotate: false - xy: 658, 30 + xy: 1397, 555 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-moss-small +block-mend-projector-small rotate: false - xy: 1201, 336 + xy: 1174, 237 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-moss-tiny +block-mend-projector-tiny rotate: false - xy: 2017, 701 + xy: 1635, 457 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-moss-xlarge +block-mend-projector-xlarge rotate: false - xy: 281, 619 + xy: 251, 258 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-mud-large +block-mender-large rotate: false xy: 1685, 891 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-mud-medium +block-mender-medium rotate: false - xy: 1657, 627 + xy: 1431, 555 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-mud-small +block-mender-small rotate: false - xy: 1175, 310 + xy: 1174, 211 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-mud-tiny +block-mender-tiny rotate: false - xy: 2016, 683 + xy: 1653, 475 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-mud-xlarge +block-mender-xlarge rotate: false - xy: 281, 569 + xy: 251, 208 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-multi-press-large +block-message-large rotate: false xy: 1727, 891 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-multi-press-medium +block-message-medium rotate: false - xy: 1691, 626 + xy: 1465, 555 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-multi-press-small +block-message-small rotate: false - xy: 1227, 336 + xy: 1245, 399 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-multi-press-tiny +block-message-tiny rotate: false - xy: 2016, 665 + xy: 1635, 439 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-multi-press-xlarge +block-message-xlarge rotate: false - xy: 301, 519 + xy: 251, 158 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-multiplicative-reconstructor-large +block-metal-floor-2-large rotate: false xy: 1769, 891 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-multiplicative-reconstructor-medium +block-metal-floor-2-medium rotate: false - xy: 1725, 626 + xy: 1499, 555 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-multiplicative-reconstructor-small +block-metal-floor-2-small rotate: false - xy: 1201, 310 + xy: 1271, 401 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-multiplicative-reconstructor-tiny +block-metal-floor-2-tiny rotate: false - xy: 2016, 647 + xy: 1653, 457 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-multiplicative-reconstructor-xlarge +block-metal-floor-2-xlarge rotate: false - xy: 301, 469 + xy: 251, 108 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-naval-factory-large +block-metal-floor-3-large rotate: false xy: 1811, 891 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-naval-factory-medium +block-metal-floor-3-medium rotate: false - xy: 1759, 601 + xy: 1533, 555 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-naval-factory-small +block-metal-floor-3-small rotate: false - xy: 1175, 284 + xy: 1297, 401 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-naval-factory-tiny +block-metal-floor-3-tiny rotate: false - xy: 2016, 629 + xy: 1671, 475 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-naval-factory-xlarge +block-metal-floor-3-xlarge rotate: false - xy: 301, 419 + xy: 251, 58 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-oil-extractor-large +block-metal-floor-5-large rotate: false xy: 1853, 891 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-oil-extractor-medium +block-metal-floor-5-medium rotate: false - xy: 1793, 601 + xy: 1567, 555 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-oil-extractor-small +block-metal-floor-5-small rotate: false - xy: 1253, 336 + xy: 1323, 401 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-oil-extractor-tiny +block-metal-floor-5-tiny rotate: false - xy: 1980, 619 + xy: 1635, 421 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-oil-extractor-xlarge +block-metal-floor-5-xlarge rotate: false - xy: 301, 369 + xy: 151, 8 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-ore-coal-large +block-metal-floor-damaged-large rotate: false xy: 1895, 891 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-ore-coal-medium +block-metal-floor-damaged-medium rotate: false - xy: 1827, 603 + xy: 1601, 550 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-ore-coal-small +block-metal-floor-damaged-small rotate: false - xy: 1227, 310 + xy: 1511, 385 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-ore-coal-tiny +block-metal-floor-damaged-tiny rotate: false - xy: 1998, 619 + xy: 1653, 439 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-ore-coal-xlarge +block-metal-floor-damaged-xlarge rotate: false - xy: 301, 319 + xy: 201, 8 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-ore-copper-large +block-metal-floor-large rotate: false xy: 1937, 891 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-ore-copper-medium +block-metal-floor-medium rotate: false - xy: 1861, 603 + xy: 1635, 545 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-ore-copper-small +block-metal-floor-small rotate: false - xy: 1201, 284 + xy: 1537, 385 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-ore-copper-tiny +block-metal-floor-tiny rotate: false - xy: 1978, 601 + xy: 1671, 457 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-ore-copper-xlarge +block-metal-floor-xlarge rotate: false - xy: 301, 269 + xy: 251, 8 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-ore-lead-large +block-micro-processor-large rotate: false xy: 859, 849 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-ore-lead-medium +block-micro-processor-medium rotate: false - xy: 1895, 575 + xy: 1669, 545 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-ore-lead-small +block-micro-processor-small rotate: false - xy: 1279, 336 + xy: 1180, 341 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-ore-lead-tiny +block-micro-processor-tiny rotate: false - xy: 1996, 601 + xy: 1689, 475 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-ore-lead-xlarge +block-micro-processor-xlarge rotate: false - xy: 301, 219 + xy: 281, 619 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-ore-scrap-large +block-moss-large rotate: false xy: 859, 807 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-ore-scrap-medium +block-moss-medium rotate: false - xy: 1119, 479 + xy: 1703, 545 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-ore-scrap-small +block-moss-small rotate: false - xy: 1253, 310 + xy: 1180, 315 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-ore-scrap-tiny +block-moss-tiny rotate: false - xy: 1981, 583 + xy: 1635, 403 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-ore-scrap-xlarge +block-moss-xlarge rotate: false - xy: 301, 169 + xy: 281, 569 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-ore-thorium-large +block-mud-large rotate: false xy: 901, 849 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-ore-thorium-medium +block-mud-medium rotate: false - xy: 1117, 445 + xy: 1737, 545 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-ore-thorium-small +block-mud-small rotate: false - xy: 1227, 284 + xy: 1180, 289 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-ore-thorium-tiny +block-mud-tiny rotate: false - xy: 1981, 565 + xy: 1653, 421 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-ore-thorium-xlarge +block-mud-xlarge rotate: false - xy: 301, 119 + xy: 301, 519 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-ore-titanium-large +block-multi-press-large rotate: false xy: 859, 765 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-ore-titanium-medium +block-multi-press-medium rotate: false - xy: 913, 424 + xy: 1771, 545 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-ore-titanium-small +block-multi-press-small rotate: false - xy: 1305, 336 + xy: 1180, 263 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-ore-titanium-tiny +block-multi-press-tiny rotate: false - xy: 1999, 583 + xy: 1671, 439 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-ore-titanium-xlarge +block-multi-press-xlarge rotate: false - xy: 301, 69 + xy: 301, 469 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-overdrive-dome-large - rotate: false - xy: 943, 849 - size: 40, 40 - orig: 40, 40 - offset: 0, 0 - index: -1 -block-overdrive-dome-medium - rotate: false - xy: 947, 424 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -block-overdrive-dome-small - rotate: false - xy: 1279, 310 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -block-overdrive-dome-tiny - rotate: false - xy: 1999, 565 - size: 16, 16 - orig: 16, 16 - offset: 0, 0 - index: -1 -block-overdrive-dome-xlarge - rotate: false - xy: 301, 19 - size: 48, 48 - orig: 48, 48 - offset: 0, 0 - index: -1 -block-overdrive-projector-large +block-multiplicative-reconstructor-large rotate: false xy: 901, 807 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-overdrive-projector-medium +block-multiplicative-reconstructor-medium rotate: false - xy: 981, 419 + xy: 1805, 545 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-overdrive-projector-small +block-multiplicative-reconstructor-small rotate: false - xy: 1253, 284 + xy: 1200, 237 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-overdrive-projector-tiny +block-multiplicative-reconstructor-tiny rotate: false - xy: 2016, 611 + xy: 1689, 457 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-overdrive-projector-xlarge +block-multiplicative-reconstructor-xlarge rotate: false - xy: 795, 878 + xy: 301, 419 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-overflow-gate-large +block-naval-factory-large + rotate: false + xy: 943, 849 + size: 40, 40 + orig: 40, 40 + offset: 0, 0 + index: -1 +block-naval-factory-medium + rotate: false + xy: 1839, 545 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +block-naval-factory-small + rotate: false + xy: 1200, 211 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +block-naval-factory-tiny + rotate: false + xy: 1707, 475 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +block-naval-factory-xlarge + rotate: false + xy: 301, 369 + size: 48, 48 + orig: 48, 48 + offset: 0, 0 + index: -1 +block-oil-extractor-large rotate: false xy: 859, 723 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-overflow-gate-medium +block-oil-extractor-medium rotate: false - xy: 1015, 419 + xy: 1873, 545 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-overflow-gate-small +block-oil-extractor-small rotate: false - xy: 1331, 336 + xy: 1211, 372 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-overflow-gate-tiny +block-oil-extractor-tiny rotate: false - xy: 2017, 593 + xy: 1653, 403 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-overflow-gate-xlarge +block-oil-extractor-xlarge rotate: false - xy: 309, 816 + xy: 301, 319 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-parallax-large - rotate: false - xy: 985, 849 - size: 40, 40 - orig: 40, 40 - offset: 0, 0 - index: -1 -block-parallax-medium - rotate: false - xy: 1049, 411 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -block-parallax-small - rotate: false - xy: 1305, 310 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -block-parallax-tiny - rotate: false - xy: 2017, 575 - size: 16, 16 - orig: 16, 16 - offset: 0, 0 - index: -1 -block-parallax-xlarge - rotate: false - xy: 309, 766 - size: 48, 48 - orig: 48, 48 - offset: 0, 0 - index: -1 -block-payload-conveyor-large - rotate: false - xy: 943, 807 - size: 40, 40 - orig: 40, 40 - offset: 0, 0 - index: -1 -block-payload-conveyor-medium - rotate: false - xy: 1083, 411 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -block-payload-conveyor-small - rotate: false - xy: 1279, 284 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -block-payload-conveyor-tiny - rotate: false - xy: 2017, 557 - size: 16, 16 - orig: 16, 16 - offset: 0, 0 - index: -1 -block-payload-conveyor-xlarge - rotate: false - xy: 359, 816 - size: 48, 48 - orig: 48, 48 - offset: 0, 0 - index: -1 -block-payload-router-large +block-ore-coal-large rotate: false xy: 901, 765 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-payload-router-medium +block-ore-coal-medium rotate: false - xy: 1117, 411 + xy: 1907, 545 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-payload-router-small +block-ore-coal-small rotate: false - xy: 1357, 336 + xy: 1237, 373 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-payload-router-tiny +block-ore-coal-tiny rotate: false - xy: 1280, 193 + xy: 1671, 421 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-payload-router-xlarge +block-ore-coal-xlarge rotate: false - xy: 309, 716 + xy: 301, 269 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-pebbles-large +block-ore-copper-large + rotate: false + xy: 943, 807 + size: 40, 40 + orig: 40, 40 + offset: 0, 0 + index: -1 +block-ore-copper-medium + rotate: false + xy: 1941, 545 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +block-ore-copper-small + rotate: false + xy: 1263, 373 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +block-ore-copper-tiny + rotate: false + xy: 1689, 439 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +block-ore-copper-xlarge + rotate: false + xy: 301, 219 + size: 48, 48 + orig: 48, 48 + offset: 0, 0 + index: -1 +block-ore-lead-large + rotate: false + xy: 985, 849 + size: 40, 40 + orig: 40, 40 + offset: 0, 0 + index: -1 +block-ore-lead-medium + rotate: false + xy: 1975, 545 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +block-ore-lead-small + rotate: false + xy: 1289, 375 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +block-ore-lead-tiny + rotate: false + xy: 1707, 457 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +block-ore-lead-xlarge + rotate: false + xy: 301, 169 + size: 48, 48 + orig: 48, 48 + offset: 0, 0 + index: -1 +block-ore-scrap-large rotate: false xy: 859, 681 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-pebbles-medium +block-ore-scrap-medium rotate: false - xy: 912, 390 + xy: 2009, 545 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-pebbles-small +block-ore-scrap-small rotate: false - xy: 1331, 310 + xy: 1315, 375 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-pebbles-tiny +block-ore-scrap-tiny rotate: false - xy: 1298, 193 + xy: 1725, 475 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-pebbles-xlarge +block-ore-scrap-xlarge rotate: false - xy: 359, 766 + xy: 301, 119 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-phase-conduit-large - rotate: false - xy: 1027, 849 - size: 40, 40 - orig: 40, 40 - offset: 0, 0 - index: -1 -block-phase-conduit-medium - rotate: false - xy: 946, 390 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -block-phase-conduit-small - rotate: false - xy: 1305, 284 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -block-phase-conduit-tiny - rotate: false - xy: 1669, 609 - size: 16, 16 - orig: 16, 16 - offset: 0, 0 - index: -1 -block-phase-conduit-xlarge - rotate: false - xy: 409, 816 - size: 48, 48 - orig: 48, 48 - offset: 0, 0 - index: -1 -block-phase-conveyor-large - rotate: false - xy: 985, 807 - size: 40, 40 - orig: 40, 40 - offset: 0, 0 - index: -1 -block-phase-conveyor-medium - rotate: false - xy: 911, 356 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -block-phase-conveyor-small - rotate: false - xy: 1383, 336 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -block-phase-conveyor-tiny - rotate: false - xy: 1669, 591 - size: 16, 16 - orig: 16, 16 - offset: 0, 0 - index: -1 -block-phase-conveyor-xlarge - rotate: false - xy: 359, 716 - size: 48, 48 - orig: 48, 48 - offset: 0, 0 - index: -1 -block-phase-wall-large - rotate: false - xy: 943, 765 - size: 40, 40 - orig: 40, 40 - offset: 0, 0 - index: -1 -block-phase-wall-large-large +block-ore-thorium-large rotate: false xy: 901, 723 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-phase-wall-large-medium +block-ore-thorium-medium rotate: false - xy: 945, 356 + xy: 974, 325 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-phase-wall-large-small +block-ore-thorium-small rotate: false - xy: 1357, 310 + xy: 1341, 375 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-phase-wall-large-tiny +block-ore-thorium-tiny rotate: false - xy: 1669, 573 + xy: 1671, 403 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-phase-wall-large-xlarge +block-ore-thorium-xlarge rotate: false - xy: 409, 766 + xy: 301, 69 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-phase-wall-medium +block-ore-titanium-large rotate: false - xy: 980, 385 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -block-phase-wall-small - rotate: false - xy: 1331, 284 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -block-phase-wall-tiny - rotate: false - xy: 1669, 555 - size: 16, 16 - orig: 16, 16 - offset: 0, 0 - index: -1 -block-phase-wall-xlarge - rotate: false - xy: 459, 816 - size: 48, 48 - orig: 48, 48 - offset: 0, 0 - index: -1 -block-phase-weaver-large - rotate: false - xy: 1069, 849 + xy: 943, 765 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-phase-weaver-medium +block-ore-titanium-medium rotate: false - xy: 1014, 385 + xy: 971, 291 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-phase-weaver-small +block-ore-titanium-small rotate: false - xy: 1409, 336 + xy: 1367, 381 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-phase-weaver-tiny +block-ore-titanium-tiny rotate: false - xy: 1687, 608 + xy: 1689, 421 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-phase-weaver-xlarge +block-ore-titanium-xlarge rotate: false - xy: 409, 716 + xy: 301, 19 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-pine-large +block-overdrive-dome-large rotate: false - xy: 1027, 807 + xy: 985, 807 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-pine-medium +block-overdrive-dome-medium rotate: false - xy: 979, 351 + xy: 971, 257 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-pine-small +block-overdrive-dome-small rotate: false - xy: 1383, 310 + xy: 1393, 381 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-pine-tiny +block-overdrive-dome-tiny rotate: false - xy: 1705, 608 + xy: 1707, 439 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-pine-xlarge +block-overdrive-dome-xlarge rotate: false - xy: 459, 766 + xy: 795, 878 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-plastanium-compressor-large +block-overdrive-projector-large rotate: false - xy: 985, 765 + xy: 1027, 849 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-plastanium-compressor-medium +block-overdrive-projector-medium rotate: false - xy: 1013, 351 + xy: 688, 240 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-plastanium-compressor-small +block-overdrive-projector-small rotate: false - xy: 1357, 284 + xy: 1419, 379 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-plastanium-compressor-tiny +block-overdrive-projector-tiny rotate: false - xy: 1687, 590 + xy: 1725, 457 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-plastanium-compressor-xlarge +block-overdrive-projector-xlarge rotate: false - xy: 509, 816 + xy: 309, 816 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-plastanium-conveyor-large - rotate: false - xy: 943, 723 - size: 40, 40 - orig: 40, 40 - offset: 0, 0 - index: -1 -block-plastanium-conveyor-medium - rotate: false - xy: 1048, 377 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -block-plastanium-conveyor-small - rotate: false - xy: 1435, 336 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -block-plastanium-conveyor-tiny - rotate: false - xy: 1723, 608 - size: 16, 16 - orig: 16, 16 - offset: 0, 0 - index: -1 -block-plastanium-conveyor-xlarge - rotate: false - xy: 459, 716 - size: 48, 48 - orig: 48, 48 - offset: 0, 0 - index: -1 -block-plastanium-wall-large +block-overflow-gate-large rotate: false xy: 901, 681 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-plastanium-wall-large-large +block-overflow-gate-medium rotate: false - xy: 1111, 849 - size: 40, 40 - orig: 40, 40 - offset: 0, 0 - index: -1 -block-plastanium-wall-large-medium - rotate: false - xy: 1082, 377 + xy: 688, 206 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-plastanium-wall-large-small +block-overflow-gate-small rotate: false - xy: 1409, 310 + xy: 1445, 379 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-plastanium-wall-large-tiny +block-overflow-gate-tiny rotate: false - xy: 1741, 608 + xy: 1743, 475 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-plastanium-wall-large-xlarge +block-overflow-gate-xlarge rotate: false - xy: 509, 766 + xy: 309, 766 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-plastanium-wall-medium +block-parallax-large rotate: false - xy: 1116, 377 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -block-plastanium-wall-small - rotate: false - xy: 1383, 284 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -block-plastanium-wall-tiny - rotate: false - xy: 1687, 572 - size: 16, 16 - orig: 16, 16 - offset: 0, 0 - index: -1 -block-plastanium-wall-xlarge - rotate: false - xy: 559, 816 - size: 48, 48 - orig: 48, 48 - offset: 0, 0 - index: -1 -block-plated-conduit-large - rotate: false - xy: 1069, 807 + xy: 943, 723 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-plated-conduit-medium +block-parallax-medium rotate: false - xy: 1047, 343 + xy: 722, 250 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-plated-conduit-small +block-parallax-small rotate: false - xy: 1461, 336 + xy: 1471, 379 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-plated-conduit-tiny +block-parallax-tiny rotate: false - xy: 1705, 590 + xy: 1689, 403 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-plated-conduit-xlarge +block-parallax-xlarge rotate: false - xy: 509, 716 + xy: 359, 816 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-pneumatic-drill-large +block-payload-conveyor-large rotate: false - xy: 1027, 765 + xy: 985, 765 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-pneumatic-drill-medium +block-payload-conveyor-medium rotate: false - xy: 1081, 343 + xy: 756, 250 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-pneumatic-drill-small +block-payload-conveyor-small rotate: false - xy: 1435, 310 + xy: 1367, 355 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-pneumatic-drill-tiny +block-payload-conveyor-tiny rotate: false - xy: 1705, 572 + xy: 1707, 421 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-pneumatic-drill-xlarge +block-payload-conveyor-xlarge rotate: false - xy: 559, 766 + xy: 309, 716 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-power-node-large +block-payload-router-large rotate: false - xy: 985, 723 + xy: 1027, 807 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-power-node-large-large +block-payload-router-medium + rotate: false + xy: 722, 216 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +block-payload-router-small + rotate: false + xy: 1393, 355 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +block-payload-router-tiny + rotate: false + xy: 1725, 439 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +block-payload-router-xlarge + rotate: false + xy: 359, 766 + size: 48, 48 + orig: 48, 48 + offset: 0, 0 + index: -1 +block-pebbles-large + rotate: false + xy: 1069, 849 + size: 40, 40 + orig: 40, 40 + offset: 0, 0 + index: -1 +block-pebbles-medium + rotate: false + xy: 790, 250 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +block-pebbles-small + rotate: false + xy: 1419, 353 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +block-pebbles-tiny + rotate: false + xy: 1743, 457 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +block-pebbles-xlarge + rotate: false + xy: 409, 816 + size: 48, 48 + orig: 48, 48 + offset: 0, 0 + index: -1 +block-phase-conduit-large rotate: false xy: 943, 681 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-power-node-large-medium +block-phase-conduit-medium rotate: false - xy: 1115, 343 + xy: 756, 216 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-power-node-large-small +block-phase-conduit-small rotate: false - xy: 1409, 284 + xy: 1445, 353 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-power-node-large-tiny +block-phase-conduit-tiny rotate: false - xy: 1723, 590 + xy: 1761, 475 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-power-node-large-xlarge +block-phase-conduit-xlarge rotate: false - xy: 609, 816 + xy: 359, 716 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-power-node-medium +block-phase-conveyor-large rotate: false - xy: 945, 322 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -block-power-node-small - rotate: false - xy: 1487, 336 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -block-power-node-tiny - rotate: false - xy: 1741, 590 - size: 16, 16 - orig: 16, 16 - offset: 0, 0 - index: -1 -block-power-node-xlarge - rotate: false - xy: 559, 716 - size: 48, 48 - orig: 48, 48 - offset: 0, 0 - index: -1 -block-power-source-large - rotate: false - xy: 1153, 849 + xy: 985, 723 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-power-source-medium +block-phase-conveyor-medium rotate: false - xy: 945, 288 + xy: 824, 250 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-power-source-small +block-phase-conveyor-small rotate: false - xy: 1461, 310 + xy: 1471, 353 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-power-source-tiny +block-phase-conveyor-tiny rotate: false - xy: 1723, 572 + xy: 1707, 403 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-power-source-xlarge +block-phase-conveyor-xlarge rotate: false - xy: 609, 766 + xy: 409, 766 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-power-void-large +block-phase-wall-large rotate: false - xy: 1111, 807 + xy: 1027, 765 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-power-void-medium +block-phase-wall-large-large rotate: false - xy: 979, 317 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -block-power-void-small - rotate: false - xy: 1435, 284 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -block-power-void-tiny - rotate: false - xy: 1741, 572 - size: 16, 16 - orig: 16, 16 - offset: 0, 0 - index: -1 -block-power-void-xlarge - rotate: false - xy: 659, 816 - size: 48, 48 - orig: 48, 48 - offset: 0, 0 - index: -1 -block-pulse-conduit-large - rotate: false - xy: 1069, 765 + xy: 1069, 807 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-pulse-conduit-medium +block-phase-wall-large-medium rotate: false - xy: 1013, 317 + xy: 790, 216 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-pulse-conduit-small +block-phase-wall-large-small rotate: false - xy: 1513, 336 + xy: 1497, 359 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-pulse-conduit-tiny +block-phase-wall-large-tiny rotate: false - xy: 1759, 583 + xy: 1725, 421 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-pulse-conduit-xlarge +block-phase-wall-large-xlarge rotate: false - xy: 609, 716 + xy: 459, 816 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-pulverizer-large +block-phase-wall-medium rotate: false - xy: 1027, 723 + xy: 824, 216 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +block-phase-wall-small + rotate: false + xy: 1523, 359 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +block-phase-wall-tiny + rotate: false + xy: 1743, 439 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +block-phase-wall-xlarge + rotate: false + xy: 409, 716 + size: 48, 48 + orig: 48, 48 + offset: 0, 0 + index: -1 +block-phase-weaver-large + rotate: false + xy: 1111, 849 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-pulverizer-medium +block-phase-weaver-medium rotate: false - xy: 945, 254 + xy: 858, 223 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-pulverizer-small +block-phase-weaver-small rotate: false - xy: 1487, 310 + xy: 1549, 359 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-pulverizer-tiny +block-phase-weaver-tiny rotate: false - xy: 1777, 583 + xy: 1761, 457 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-pulverizer-xlarge +block-phase-weaver-xlarge rotate: false - xy: 659, 766 + xy: 459, 766 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-pyratite-mixer-large +block-pine-large rotate: false xy: 985, 681 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-pyratite-mixer-medium +block-pine-medium rotate: false - xy: 979, 283 + xy: 892, 223 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-pyratite-mixer-small +block-pine-small rotate: false - xy: 1461, 284 + xy: 1497, 333 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-pyratite-mixer-tiny +block-pine-tiny rotate: false - xy: 1795, 583 + xy: 1779, 475 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-pyratite-mixer-xlarge +block-pine-xlarge rotate: false - xy: 709, 816 + xy: 509, 816 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-repair-point-large +block-plastanium-compressor-large rotate: false - xy: 1195, 849 + xy: 1027, 723 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-repair-point-medium +block-plastanium-compressor-medium rotate: false - xy: 1013, 283 + xy: 926, 223 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-repair-point-small +block-plastanium-compressor-small rotate: false - xy: 1513, 310 + xy: 1523, 333 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-repair-point-tiny +block-plastanium-compressor-tiny rotate: false - xy: 1687, 554 + xy: 1725, 403 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-repair-point-xlarge +block-plastanium-compressor-xlarge rotate: false - xy: 659, 716 + xy: 459, 716 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-resupply-point-large +block-plastanium-conveyor-large rotate: false - xy: 1153, 807 + xy: 1069, 765 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-resupply-point-medium +block-plastanium-conveyor-medium rotate: false - xy: 1047, 309 + xy: 960, 223 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-resupply-point-small +block-plastanium-conveyor-small rotate: false - xy: 1487, 284 + xy: 1549, 333 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-resupply-point-tiny +block-plastanium-conveyor-tiny rotate: false - xy: 1705, 554 + xy: 1743, 421 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-resupply-point-xlarge +block-plastanium-conveyor-xlarge rotate: false - xy: 709, 766 + xy: 509, 766 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-ripple-large +block-plastanium-wall-large rotate: false - xy: 1111, 765 + xy: 1111, 807 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-ripple-medium +block-plastanium-wall-large-large rotate: false - xy: 1081, 309 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -block-ripple-small - rotate: false - xy: 1513, 284 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -block-ripple-tiny - rotate: false - xy: 1723, 554 - size: 16, 16 - orig: 16, 16 - offset: 0, 0 - index: -1 -block-ripple-xlarge - rotate: false - xy: 709, 716 - size: 48, 48 - orig: 48, 48 - offset: 0, 0 - index: -1 -block-rotary-pump-large - rotate: false - xy: 1069, 723 + xy: 1153, 849 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-rotary-pump-medium +block-plastanium-wall-large-medium rotate: false - xy: 1115, 309 + xy: 688, 172 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-rotary-pump-small +block-plastanium-wall-large-small rotate: false - xy: 1150, 258 + xy: 1119, 185 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-rotary-pump-tiny +block-plastanium-wall-large-tiny rotate: false - xy: 1741, 554 + xy: 1761, 439 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-rotary-pump-xlarge +block-plastanium-wall-large-xlarge rotate: false - xy: 759, 816 + xy: 559, 816 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-router-large +block-plastanium-wall-medium + rotate: false + xy: 722, 182 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +block-plastanium-wall-small + rotate: false + xy: 1119, 159 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +block-plastanium-wall-tiny + rotate: false + xy: 1779, 457 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +block-plastanium-wall-xlarge + rotate: false + xy: 509, 716 + size: 48, 48 + orig: 48, 48 + offset: 0, 0 + index: -1 +block-plated-conduit-large rotate: false xy: 1027, 681 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-router-medium +block-plated-conduit-medium rotate: false - xy: 979, 249 + xy: 756, 182 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-router-small +block-plated-conduit-small rotate: false - xy: 1150, 232 + xy: 1145, 185 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-router-tiny +block-plated-conduit-tiny rotate: false - xy: 1759, 565 + xy: 1797, 475 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-router-xlarge +block-plated-conduit-xlarge rotate: false - xy: 759, 766 + xy: 559, 766 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-rtg-generator-large +block-pneumatic-drill-large rotate: false - xy: 1237, 849 + xy: 1069, 723 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-rtg-generator-medium +block-pneumatic-drill-medium rotate: false - xy: 1013, 249 + xy: 790, 182 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-rtg-generator-small +block-pneumatic-drill-small rotate: false - xy: 1176, 258 + xy: 1119, 133 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-rtg-generator-tiny +block-pneumatic-drill-tiny rotate: false - xy: 1777, 565 + xy: 1743, 403 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-rtg-generator-xlarge +block-pneumatic-drill-xlarge rotate: false - xy: 759, 716 + xy: 609, 816 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-salt-large +block-power-node-large rotate: false - xy: 1195, 807 + xy: 1111, 765 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-salt-medium +block-power-node-large-large rotate: false - xy: 1047, 275 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -block-salt-small - rotate: false - xy: 1202, 258 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -block-salt-tiny - rotate: false - xy: 1795, 565 - size: 16, 16 - orig: 16, 16 - offset: 0, 0 - index: -1 -block-salt-wall-large - rotate: false - xy: 1153, 765 + xy: 1153, 807 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-salt-wall-medium +block-power-node-large-medium rotate: false - xy: 1081, 275 + xy: 824, 182 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-salt-wall-small +block-power-node-large-small rotate: false - xy: 1176, 232 + xy: 1145, 159 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-salt-wall-tiny +block-power-node-large-tiny rotate: false - xy: 1813, 583 + xy: 1761, 421 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-salt-wall-xlarge +block-power-node-large-xlarge rotate: false - xy: 809, 828 + xy: 559, 716 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-salt-xlarge +block-power-node-medium rotate: false - xy: 809, 778 + xy: 858, 189 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +block-power-node-small + rotate: false + xy: 1171, 185 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +block-power-node-tiny + rotate: false + xy: 1779, 439 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +block-power-node-xlarge + rotate: false + xy: 609, 766 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-salvo-large +block-power-source-large rotate: false - xy: 1111, 723 + xy: 1195, 849 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-salvo-medium +block-power-source-medium rotate: false - xy: 1115, 275 + xy: 892, 189 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-salvo-small +block-power-source-small rotate: false - xy: 1228, 258 + xy: 1119, 107 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-salvo-tiny +block-power-source-tiny rotate: false - xy: 1813, 565 + xy: 1797, 457 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-salvo-xlarge +block-power-source-xlarge rotate: false - xy: 809, 728 + xy: 659, 816 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-sand-boulder-large +block-power-void-large rotate: false xy: 1069, 681 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-sand-boulder-medium +block-power-void-medium rotate: false - xy: 980, 215 + xy: 926, 189 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-sand-boulder-small +block-power-void-small rotate: false - xy: 1202, 232 + xy: 1145, 133 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-sand-boulder-tiny +block-power-void-tiny rotate: false - xy: 1831, 585 + xy: 1815, 475 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-sand-boulder-xlarge +block-power-void-xlarge rotate: false - xy: 809, 678 + xy: 609, 716 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-sand-large +block-pulse-conduit-large rotate: false - xy: 1279, 849 + xy: 1111, 723 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-sand-medium +block-pulse-conduit-medium rotate: false - xy: 1014, 215 + xy: 960, 189 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-sand-small +block-pulse-conduit-small rotate: false - xy: 1254, 258 + xy: 1171, 159 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-sand-tiny +block-pulse-conduit-tiny rotate: false - xy: 1831, 567 + xy: 1761, 403 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-sand-wall-large +block-pulse-conduit-xlarge rotate: false - xy: 1237, 807 + xy: 659, 766 + size: 48, 48 + orig: 48, 48 + offset: 0, 0 + index: -1 +block-pulverizer-large + rotate: false + xy: 1153, 765 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-sand-wall-medium +block-pulverizer-medium rotate: false - xy: 980, 181 + xy: 677, 138 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-sand-wall-small +block-pulverizer-small rotate: false - xy: 1228, 232 + xy: 1197, 185 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-sand-wall-tiny +block-pulverizer-tiny rotate: false - xy: 1849, 585 + xy: 1779, 421 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-sand-wall-xlarge +block-pulverizer-xlarge rotate: false - xy: 331, 666 + xy: 709, 816 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-sand-water-large +block-pyratite-mixer-large rotate: false - xy: 1195, 765 + xy: 1195, 807 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-sand-water-medium +block-pyratite-mixer-medium rotate: false - xy: 1014, 181 + xy: 994, 223 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-sand-water-small +block-pyratite-mixer-small rotate: false - xy: 1280, 258 + xy: 1119, 81 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-sand-water-tiny +block-pyratite-mixer-tiny rotate: false - xy: 1849, 567 + xy: 1797, 439 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-sand-water-xlarge +block-pyratite-mixer-xlarge rotate: false - xy: 331, 616 + xy: 659, 716 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-sand-xlarge +block-repair-point-large rotate: false - xy: 381, 666 - size: 48, 48 - orig: 48, 48 - offset: 0, 0 - index: -1 -block-scatter-large - rotate: false - xy: 1153, 723 + xy: 1237, 849 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-scatter-medium +block-repair-point-medium rotate: false - xy: 996, 147 + xy: 994, 189 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-scatter-small +block-repair-point-small rotate: false - xy: 1254, 232 + xy: 1145, 107 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-scatter-tiny +block-repair-point-tiny rotate: false - xy: 1867, 585 + xy: 1815, 457 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-scatter-xlarge +block-repair-point-xlarge rotate: false - xy: 381, 616 + xy: 709, 766 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-scorch-large +block-resupply-point-large rotate: false xy: 1111, 681 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-scorch-medium +block-resupply-point-medium rotate: false - xy: 996, 113 + xy: 711, 138 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-scorch-small +block-resupply-point-small rotate: false - xy: 1306, 258 + xy: 1171, 133 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-scorch-tiny +block-resupply-point-tiny rotate: false - xy: 1867, 567 + xy: 1833, 475 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-scorch-xlarge +block-resupply-point-xlarge rotate: false - xy: 431, 666 + xy: 709, 716 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-scrap-wall-gigantic-large +block-ripple-large rotate: false - xy: 1321, 849 + xy: 1153, 723 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-scrap-wall-gigantic-medium +block-ripple-medium rotate: false - xy: 1030, 147 + xy: 711, 104 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-scrap-wall-gigantic-small +block-ripple-small rotate: false - xy: 1280, 232 + xy: 1197, 159 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-scrap-wall-gigantic-tiny +block-ripple-tiny rotate: false - xy: 1759, 547 + xy: 1779, 403 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-scrap-wall-gigantic-xlarge +block-ripple-xlarge rotate: false - xy: 431, 616 + xy: 759, 816 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-scrap-wall-huge-large +block-rotary-pump-large rotate: false - xy: 1279, 807 + xy: 1195, 765 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-scrap-wall-huge-medium +block-rotary-pump-medium rotate: false - xy: 1030, 113 + xy: 745, 148 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-scrap-wall-huge-small +block-rotary-pump-small rotate: false - xy: 1332, 258 + xy: 1119, 55 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-scrap-wall-huge-tiny +block-rotary-pump-tiny rotate: false - xy: 1777, 547 + xy: 1797, 421 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-scrap-wall-huge-xlarge +block-rotary-pump-xlarge rotate: false - xy: 481, 666 + xy: 759, 766 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-scrap-wall-large +block-router-large rotate: false - xy: 1237, 765 + xy: 1237, 807 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-scrap-wall-large-large +block-router-medium rotate: false - xy: 1195, 723 + xy: 779, 148 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +block-router-small + rotate: false + xy: 1145, 81 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +block-router-tiny + rotate: false + xy: 1815, 439 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +block-router-xlarge + rotate: false + xy: 759, 716 + size: 48, 48 + orig: 48, 48 + offset: 0, 0 + index: -1 +block-rtg-generator-large + rotate: false + xy: 1279, 849 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-scrap-wall-large-medium +block-rtg-generator-medium rotate: false - xy: 1048, 241 + xy: 745, 114 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-scrap-wall-large-small +block-rtg-generator-small rotate: false - xy: 1306, 232 + xy: 1171, 107 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-scrap-wall-large-tiny +block-rtg-generator-tiny rotate: false - xy: 1795, 547 + xy: 1833, 457 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-scrap-wall-large-xlarge +block-rtg-generator-xlarge rotate: false - xy: 481, 616 + xy: 809, 828 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-scrap-wall-medium - rotate: false - xy: 1048, 207 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -block-scrap-wall-small - rotate: false - xy: 1358, 258 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -block-scrap-wall-tiny - rotate: false - xy: 1813, 547 - size: 16, 16 - orig: 16, 16 - offset: 0, 0 - index: -1 -block-scrap-wall-xlarge - rotate: false - xy: 531, 666 - size: 48, 48 - orig: 48, 48 - offset: 0, 0 - index: -1 -block-segment-large +block-salt-large rotate: false xy: 1153, 681 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-segment-medium +block-salt-medium rotate: false - xy: 1082, 241 + xy: 779, 114 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-segment-small +block-salt-small rotate: false - xy: 1332, 232 + xy: 1197, 133 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-segment-tiny +block-salt-tiny rotate: false - xy: 1831, 549 + xy: 1851, 475 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-segment-xlarge +block-salt-wall-large rotate: false - xy: 531, 616 - size: 48, 48 - orig: 48, 48 - offset: 0, 0 - index: -1 -block-separator-large - rotate: false - xy: 1363, 849 + xy: 1195, 723 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-separator-medium +block-salt-wall-medium rotate: false - xy: 1082, 207 + xy: 813, 148 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-separator-small +block-salt-wall-small rotate: false - xy: 1384, 258 + xy: 1119, 29 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-separator-tiny +block-salt-wall-tiny rotate: false - xy: 1849, 549 + xy: 1797, 403 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-separator-xlarge +block-salt-wall-xlarge rotate: false - xy: 581, 666 + xy: 809, 778 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-shale-boulder-large +block-salt-xlarge rotate: false - xy: 1321, 807 + xy: 809, 728 + size: 48, 48 + orig: 48, 48 + offset: 0, 0 + index: -1 +block-salvo-large + rotate: false + xy: 1237, 765 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-shale-boulder-medium +block-salvo-medium rotate: false - xy: 1116, 241 + xy: 813, 114 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-shale-boulder-small +block-salvo-small rotate: false - xy: 1358, 232 + xy: 1145, 55 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-shale-boulder-tiny +block-salvo-tiny rotate: false - xy: 1867, 549 + xy: 1815, 421 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-shale-boulder-xlarge +block-salvo-xlarge rotate: false - xy: 581, 616 + xy: 809, 678 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-shale-large +block-sand-boulder-large rotate: false - xy: 1279, 765 + xy: 1279, 807 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-shale-medium +block-sand-boulder-medium rotate: false - xy: 1116, 207 + xy: 745, 80 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-shale-small +block-sand-boulder-small rotate: false - xy: 1410, 258 + xy: 1171, 81 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-shale-tiny +block-sand-boulder-tiny rotate: false - xy: 1701, 536 + xy: 1833, 439 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-shale-wall-large +block-sand-boulder-xlarge rotate: false - xy: 1237, 723 + xy: 331, 666 + size: 48, 48 + orig: 48, 48 + offset: 0, 0 + index: -1 +block-sand-large + rotate: false + xy: 1321, 849 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-shale-wall-medium +block-sand-medium rotate: false - xy: 1064, 173 + xy: 779, 80 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-shale-wall-small +block-sand-small rotate: false - xy: 1384, 232 + xy: 1197, 107 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-shale-wall-tiny +block-sand-tiny rotate: false - xy: 1701, 518 + xy: 1851, 457 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-shale-wall-xlarge - rotate: false - xy: 631, 666 - size: 48, 48 - orig: 48, 48 - offset: 0, 0 - index: -1 -block-shale-xlarge - rotate: false - xy: 631, 616 - size: 48, 48 - orig: 48, 48 - offset: 0, 0 - index: -1 -block-shock-mine-large +block-sand-wall-large rotate: false xy: 1195, 681 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-shock-mine-medium +block-sand-wall-medium rotate: false - xy: 1064, 139 + xy: 813, 80 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-shock-mine-small +block-sand-wall-small rotate: false - xy: 1436, 258 + xy: 1145, 29 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-shock-mine-tiny +block-sand-wall-tiny rotate: false - xy: 1719, 536 + xy: 1869, 475 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-shock-mine-xlarge +block-sand-wall-xlarge rotate: false - xy: 681, 666 + xy: 331, 616 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-shrubs-large +block-sand-water-large rotate: false - xy: 1405, 849 + xy: 1237, 723 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-shrubs-medium +block-sand-water-medium rotate: false - xy: 1098, 173 + xy: 847, 148 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-shrubs-small +block-sand-water-small rotate: false - xy: 1410, 232 + xy: 1171, 55 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-shrubs-tiny +block-sand-water-tiny rotate: false - xy: 1737, 536 + xy: 1815, 403 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-shrubs-xlarge +block-sand-water-xlarge rotate: false - xy: 681, 616 + xy: 381, 666 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-silicon-crucible-large +block-sand-xlarge rotate: false - xy: 1363, 807 + xy: 381, 616 + size: 48, 48 + orig: 48, 48 + offset: 0, 0 + index: -1 +block-scatter-large + rotate: false + xy: 1279, 765 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-silicon-crucible-medium +block-scatter-medium rotate: false - xy: 1098, 139 + xy: 847, 114 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-silicon-crucible-small +block-scatter-small rotate: false - xy: 1462, 258 + xy: 1197, 81 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-silicon-crucible-tiny +block-scatter-tiny rotate: false - xy: 1719, 518 + xy: 1833, 421 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-silicon-crucible-xlarge +block-scatter-xlarge rotate: false - xy: 731, 666 + xy: 431, 666 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-silicon-smelter-large +block-scorch-large rotate: false - xy: 1321, 765 + xy: 1321, 807 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-silicon-smelter-medium +block-scorch-medium rotate: false - xy: 1064, 105 + xy: 847, 80 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-silicon-smelter-small +block-scorch-small rotate: false - xy: 1436, 232 + xy: 1171, 29 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-silicon-smelter-tiny +block-scorch-tiny rotate: false - xy: 1737, 518 + xy: 1851, 439 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-silicon-smelter-xlarge +block-scorch-xlarge rotate: false - xy: 731, 616 + xy: 431, 616 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-slag-large +block-scrap-wall-gigantic-large rotate: false - xy: 1279, 723 + xy: 1363, 849 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-slag-medium +block-scrap-wall-gigantic-medium rotate: false - xy: 1098, 105 + xy: 881, 155 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-slag-small +block-scrap-wall-gigantic-small rotate: false - xy: 1488, 258 + xy: 1197, 55 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-slag-tiny +block-scrap-wall-gigantic-tiny rotate: false - xy: 1755, 529 + xy: 1869, 457 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-slag-xlarge +block-scrap-wall-gigantic-xlarge rotate: false - xy: 781, 628 + xy: 481, 666 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-snow-boulder-large +block-scrap-wall-huge-large rotate: false xy: 1237, 681 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-snow-boulder-medium +block-scrap-wall-huge-medium rotate: false - xy: 1132, 173 + xy: 881, 121 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-snow-boulder-small +block-scrap-wall-huge-small rotate: false - xy: 1462, 232 + xy: 1197, 29 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-snow-boulder-tiny +block-scrap-wall-huge-tiny rotate: false - xy: 1773, 529 + xy: 1887, 475 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-snow-boulder-xlarge +block-scrap-wall-huge-xlarge rotate: false - xy: 831, 628 + xy: 481, 616 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-snow-large +block-scrap-wall-large rotate: false - xy: 1447, 849 + xy: 1279, 723 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-snow-medium +block-scrap-wall-large-large rotate: false - xy: 1132, 139 + xy: 1321, 765 + size: 40, 40 + orig: 40, 40 + offset: 0, 0 + index: -1 +block-scrap-wall-large-medium + rotate: false + xy: 915, 155 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-snow-pine-large +block-scrap-wall-large-small rotate: false - xy: 1405, 807 - size: 40, 40 - orig: 40, 40 + xy: 1119, 3 + size: 24, 24 + orig: 24, 24 offset: 0, 0 index: -1 -block-snow-pine-medium +block-scrap-wall-large-tiny rotate: false - xy: 1132, 105 + xy: 1833, 403 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +block-scrap-wall-large-xlarge + rotate: false + xy: 531, 666 + size: 48, 48 + orig: 48, 48 + offset: 0, 0 + index: -1 +block-scrap-wall-medium + rotate: false + xy: 881, 87 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-snow-pine-small +block-scrap-wall-small rotate: false - xy: 1488, 232 + xy: 1145, 3 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-snow-pine-tiny +block-scrap-wall-tiny rotate: false - xy: 1791, 529 + xy: 1851, 421 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-snow-pine-xlarge +block-scrap-wall-xlarge rotate: false - xy: 781, 578 + xy: 531, 616 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-snow-small +block-segment-large rotate: false - xy: 1514, 258 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -block-snow-tiny - rotate: false - xy: 1809, 529 - size: 16, 16 - orig: 16, 16 - offset: 0, 0 - index: -1 -block-snow-wall-large - rotate: false - xy: 1363, 765 + xy: 1363, 807 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-snow-wall-medium +block-segment-medium rotate: false - xy: 1125, 550 + xy: 915, 121 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-snow-wall-small +block-segment-small rotate: false - xy: 1514, 232 + xy: 1171, 3 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-snow-wall-tiny +block-segment-tiny rotate: false - xy: 1731, 500 + xy: 1869, 439 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-snow-wall-xlarge +block-segment-xlarge rotate: false - xy: 831, 578 + xy: 581, 666 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-snow-xlarge +block-separator-large rotate: false - xy: 351, 566 - size: 48, 48 - orig: 48, 48 - offset: 0, 0 - index: -1 -block-solar-panel-large - rotate: false - xy: 1321, 723 + xy: 1405, 849 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-solar-panel-large-large +block-separator-medium + rotate: false + xy: 949, 155 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +block-separator-small + rotate: false + xy: 1197, 3 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +block-separator-tiny + rotate: false + xy: 1887, 457 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +block-separator-xlarge + rotate: false + xy: 581, 616 + size: 48, 48 + orig: 48, 48 + offset: 0, 0 + index: -1 +block-shale-boulder-large rotate: false xy: 1279, 681 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-solar-panel-large-medium +block-shale-boulder-medium rotate: false - xy: 1159, 550 + xy: 915, 87 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-solar-panel-large-small +block-shale-boulder-small rotate: false - xy: 1541, 383 + xy: 1206, 343 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-solar-panel-large-tiny +block-shale-boulder-tiny rotate: false - xy: 1731, 482 + xy: 1905, 475 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-solar-panel-large-xlarge +block-shale-boulder-xlarge rotate: false - xy: 351, 516 + xy: 631, 666 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-solar-panel-medium +block-shale-large rotate: false - xy: 1193, 550 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -block-solar-panel-small - rotate: false - xy: 1567, 383 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -block-solar-panel-tiny - rotate: false - xy: 1731, 464 - size: 16, 16 - orig: 16, 16 - offset: 0, 0 - index: -1 -block-solar-panel-xlarge - rotate: false - xy: 401, 566 - size: 48, 48 - orig: 48, 48 - offset: 0, 0 - index: -1 -block-sorter-large - rotate: false - xy: 1489, 849 + xy: 1321, 723 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-sorter-medium +block-shale-medium rotate: false - xy: 1227, 550 + xy: 949, 121 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-sorter-small +block-shale-small rotate: false - xy: 1593, 383 + xy: 1206, 317 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-sorter-tiny +block-shale-tiny rotate: false - xy: 1731, 446 + xy: 1851, 403 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-sorter-xlarge +block-shale-wall-large rotate: false - xy: 351, 466 - size: 48, 48 - orig: 48, 48 - offset: 0, 0 - index: -1 -block-spawn-large - rotate: false - xy: 1447, 807 + xy: 1363, 765 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-spawn-medium +block-shale-wall-medium rotate: false - xy: 1261, 550 + xy: 983, 155 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-spawn-small +block-shale-wall-small rotate: false - xy: 1619, 383 + xy: 1206, 291 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-spawn-tiny +block-shale-wall-tiny rotate: false - xy: 1755, 511 + xy: 1869, 421 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-spawn-xlarge +block-shale-wall-xlarge rotate: false - xy: 401, 516 + xy: 631, 616 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-spectre-large +block-shale-xlarge rotate: false - xy: 1405, 765 + xy: 681, 666 + size: 48, 48 + orig: 48, 48 + offset: 0, 0 + index: -1 +block-shock-mine-large + rotate: false + xy: 1405, 807 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-spectre-medium +block-shock-mine-medium rotate: false - xy: 1295, 550 + xy: 949, 87 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-spectre-small +block-shock-mine-small rotate: false - xy: 1645, 383 + xy: 1206, 265 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-spectre-tiny +block-shock-mine-tiny rotate: false - xy: 1773, 511 + xy: 1887, 439 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-spectre-xlarge +block-shock-mine-xlarge rotate: false - xy: 451, 566 + xy: 681, 616 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-spore-cluster-large +block-shrubs-large rotate: false - xy: 1363, 723 + xy: 1447, 849 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-spore-cluster-medium +block-shrubs-medium rotate: false - xy: 1329, 550 + xy: 983, 121 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-spore-cluster-small +block-shrubs-small rotate: false - xy: 1671, 383 + xy: 1226, 239 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-spore-cluster-tiny +block-shrubs-tiny rotate: false - xy: 1791, 511 + xy: 1905, 457 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-spore-cluster-xlarge +block-shrubs-xlarge rotate: false - xy: 351, 416 + xy: 731, 666 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-spore-moss-large +block-silicon-crucible-large rotate: false xy: 1321, 681 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-spore-moss-medium +block-silicon-crucible-medium rotate: false - xy: 1363, 550 + xy: 983, 87 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-spore-moss-small +block-silicon-crucible-small rotate: false - xy: 1697, 383 + xy: 1226, 213 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-spore-moss-tiny +block-silicon-crucible-tiny rotate: false - xy: 1809, 511 + xy: 1923, 475 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-spore-moss-xlarge +block-silicon-crucible-xlarge rotate: false - xy: 401, 466 + xy: 731, 616 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-spore-pine-large +block-silicon-smelter-large rotate: false - xy: 1531, 849 + xy: 1363, 723 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-spore-pine-medium +block-silicon-smelter-medium rotate: false - xy: 1397, 550 + xy: 1017, 155 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-spore-pine-small +block-silicon-smelter-small rotate: false - xy: 1540, 357 + xy: 1223, 185 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-spore-pine-tiny +block-silicon-smelter-tiny rotate: false - xy: 1749, 493 + xy: 1869, 403 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-spore-pine-xlarge +block-silicon-smelter-xlarge rotate: false - xy: 451, 516 + xy: 781, 628 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-spore-press-large +block-slag-large rotate: false - xy: 1489, 807 + xy: 1405, 765 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-spore-press-medium +block-slag-medium rotate: false - xy: 1431, 550 + xy: 1017, 121 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-spore-press-small +block-slag-small rotate: false - xy: 1566, 357 + xy: 1223, 159 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-spore-press-tiny +block-slag-tiny rotate: false - xy: 1767, 493 + xy: 1887, 421 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-spore-press-xlarge +block-slag-xlarge rotate: false - xy: 501, 566 + xy: 831, 628 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-spore-wall-large +block-snow-boulder-large rotate: false - xy: 1447, 765 + xy: 1447, 807 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-spore-wall-medium +block-snow-boulder-medium rotate: false - xy: 1465, 550 + xy: 1017, 87 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-spore-wall-small +block-snow-boulder-small rotate: false - xy: 1592, 357 + xy: 1223, 133 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-spore-wall-tiny +block-snow-boulder-tiny rotate: false - xy: 1749, 475 + xy: 1905, 439 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-spore-wall-xlarge +block-snow-boulder-xlarge rotate: false - xy: 351, 366 + xy: 781, 578 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-steam-generator-large +block-snow-large rotate: false - xy: 1405, 723 + xy: 1489, 849 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-steam-generator-medium +block-snow-medium rotate: false - xy: 1499, 550 + xy: 881, 53 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-steam-generator-small - rotate: false - xy: 1618, 357 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -block-steam-generator-tiny - rotate: false - xy: 1785, 493 - size: 16, 16 - orig: 16, 16 - offset: 0, 0 - index: -1 -block-steam-generator-xlarge - rotate: false - xy: 401, 416 - size: 48, 48 - orig: 48, 48 - offset: 0, 0 - index: -1 -block-stone-large +block-snow-pine-large rotate: false xy: 1363, 681 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-stone-medium +block-snow-pine-medium rotate: false - xy: 1533, 550 + xy: 915, 53 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-stone-small +block-snow-pine-small rotate: false - xy: 1644, 357 + xy: 1223, 107 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-stone-tiny +block-snow-pine-tiny rotate: false - xy: 1767, 475 + xy: 1923, 457 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-stone-wall-large +block-snow-pine-xlarge rotate: false - xy: 1573, 849 + xy: 831, 578 + size: 48, 48 + orig: 48, 48 + offset: 0, 0 + index: -1 +block-snow-small + rotate: false + xy: 1223, 81 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +block-snow-tiny + rotate: false + xy: 1941, 475 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +block-snow-wall-large + rotate: false + xy: 1405, 723 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-stone-wall-medium +block-snow-wall-medium rotate: false - xy: 1123, 516 + xy: 949, 53 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-stone-wall-small +block-snow-wall-small rotate: false - xy: 1670, 357 + xy: 1223, 55 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-stone-wall-tiny +block-snow-wall-tiny rotate: false - xy: 1749, 457 + xy: 1887, 403 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-stone-wall-xlarge +block-snow-wall-xlarge rotate: false - xy: 451, 466 + xy: 351, 566 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-stone-xlarge +block-snow-xlarge rotate: false - xy: 501, 516 + xy: 351, 516 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-surge-tower-large +block-solar-panel-large rotate: false - xy: 1531, 807 + xy: 1447, 765 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-surge-tower-medium +block-solar-panel-large-large rotate: false - xy: 1157, 516 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -block-surge-tower-small - rotate: false - xy: 1696, 357 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -block-surge-tower-tiny - rotate: false - xy: 1803, 493 - size: 16, 16 - orig: 16, 16 - offset: 0, 0 - index: -1 -block-surge-tower-xlarge - rotate: false - xy: 551, 566 - size: 48, 48 - orig: 48, 48 - offset: 0, 0 - index: -1 -block-surge-wall-large - rotate: false - xy: 1489, 765 + xy: 1489, 807 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-surge-wall-large-large +block-solar-panel-large-medium rotate: false - xy: 1447, 723 + xy: 983, 53 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +block-solar-panel-large-small + rotate: false + xy: 1223, 29 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +block-solar-panel-large-tiny + rotate: false + xy: 1905, 421 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +block-solar-panel-large-xlarge + rotate: false + xy: 401, 566 + size: 48, 48 + orig: 48, 48 + offset: 0, 0 + index: -1 +block-solar-panel-medium + rotate: false + xy: 1017, 53 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +block-solar-panel-small + rotate: false + xy: 1223, 3 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +block-solar-panel-tiny + rotate: false + xy: 1923, 439 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +block-solar-panel-xlarge + rotate: false + xy: 351, 466 + size: 48, 48 + orig: 48, 48 + offset: 0, 0 + index: -1 +block-sorter-large + rotate: false + xy: 1531, 849 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-surge-wall-large-medium +block-sorter-medium rotate: false - xy: 1191, 516 + xy: 979, 529 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-surge-wall-large-small +block-sorter-small rotate: false - xy: 1539, 331 + xy: 1289, 349 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-surge-wall-large-tiny +block-sorter-tiny rotate: false - xy: 1785, 475 + xy: 1941, 457 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-surge-wall-large-xlarge +block-sorter-xlarge rotate: false - xy: 351, 316 + xy: 401, 516 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-surge-wall-medium - rotate: false - xy: 1225, 516 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -block-surge-wall-small - rotate: false - xy: 1539, 305 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -block-surge-wall-tiny - rotate: false - xy: 1767, 457 - size: 16, 16 - orig: 16, 16 - offset: 0, 0 - index: -1 -block-surge-wall-xlarge - rotate: false - xy: 401, 366 - size: 48, 48 - orig: 48, 48 - offset: 0, 0 - index: -1 -block-swarmer-large +block-spawn-large rotate: false xy: 1405, 681 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-swarmer-medium +block-spawn-medium rotate: false - xy: 1259, 516 + xy: 979, 495 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-swarmer-small +block-spawn-small rotate: false - xy: 1565, 331 + xy: 1315, 349 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-swarmer-tiny +block-spawn-tiny rotate: false - xy: 1803, 475 + xy: 1959, 475 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-swarmer-xlarge +block-spawn-xlarge rotate: false - xy: 451, 416 + xy: 451, 566 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-switch-large +block-spectre-large rotate: false - xy: 1615, 849 + xy: 1447, 723 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-switch-medium +block-spectre-medium rotate: false - xy: 1293, 516 + xy: 979, 461 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-switch-small +block-spectre-small rotate: false - xy: 1565, 305 + xy: 1341, 349 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-switch-tiny +block-spectre-tiny rotate: false - xy: 1785, 457 + xy: 1905, 403 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-switch-xlarge +block-spectre-xlarge rotate: false - xy: 501, 466 + xy: 351, 416 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-tainted-water-large +block-spore-cluster-large rotate: false - xy: 1573, 807 + xy: 1489, 765 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-tainted-water-medium +block-spore-cluster-medium rotate: false - xy: 1327, 516 + xy: 979, 427 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-tainted-water-small +block-spore-cluster-small rotate: false - xy: 1591, 331 + xy: 1367, 329 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-tainted-water-tiny +block-spore-cluster-tiny rotate: false - xy: 1803, 457 + xy: 1923, 421 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-tainted-water-xlarge +block-spore-cluster-xlarge rotate: false - xy: 551, 516 + xy: 401, 466 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-tar-large +block-spore-moss-large rotate: false - xy: 1531, 765 + xy: 1531, 807 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-tar-medium +block-spore-moss-medium rotate: false - xy: 1361, 516 + xy: 979, 393 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-tar-small +block-spore-moss-small rotate: false - xy: 1591, 305 + xy: 1393, 329 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-tar-tiny +block-spore-moss-tiny rotate: false - xy: 1885, 557 + xy: 1941, 439 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-tar-xlarge +block-spore-moss-xlarge rotate: false - xy: 601, 566 + xy: 451, 516 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-tendrils-large +block-spore-pine-large rotate: false - xy: 1489, 723 + xy: 1573, 849 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-tendrils-medium +block-spore-pine-medium rotate: false - xy: 1395, 516 + xy: 979, 359 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-tendrils-small +block-spore-pine-small rotate: false - xy: 1617, 331 + xy: 1419, 327 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-tendrils-tiny +block-spore-pine-tiny rotate: false - xy: 1903, 557 + xy: 1959, 457 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-tendrils-xlarge +block-spore-pine-xlarge rotate: false - xy: 351, 266 + xy: 501, 566 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-tetrative-reconstructor-large +block-spore-press-large rotate: false xy: 1447, 681 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-tetrative-reconstructor-medium +block-spore-press-medium rotate: false - xy: 1429, 516 + xy: 1008, 325 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-tetrative-reconstructor-small +block-spore-press-small rotate: false - xy: 1617, 305 + xy: 1445, 327 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-tetrative-reconstructor-tiny +block-spore-press-tiny rotate: false - xy: 1885, 539 + xy: 1977, 475 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-tetrative-reconstructor-xlarge +block-spore-press-xlarge rotate: false - xy: 401, 316 + xy: 351, 366 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-thermal-generator-large +block-spore-wall-large rotate: false - xy: 1657, 849 + xy: 1489, 723 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-thermal-generator-medium +block-spore-wall-medium rotate: false - xy: 1463, 516 + xy: 1005, 291 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-thermal-generator-small +block-spore-wall-small rotate: false - xy: 1643, 331 + xy: 1471, 327 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-thermal-generator-tiny +block-spore-wall-tiny rotate: false - xy: 1903, 539 + xy: 1923, 403 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-thermal-generator-xlarge +block-spore-wall-xlarge rotate: false - xy: 451, 366 + xy: 401, 416 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-thermal-pump-large +block-steam-generator-large rotate: false - xy: 1615, 807 + xy: 1531, 765 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-thermal-pump-medium +block-steam-generator-medium rotate: false - xy: 1497, 516 + xy: 1005, 257 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-thermal-pump-small +block-steam-generator-small rotate: false - xy: 1643, 305 + xy: 1497, 307 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-thermal-pump-tiny +block-steam-generator-tiny rotate: false - xy: 1921, 550 + xy: 1941, 421 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-thermal-pump-xlarge +block-steam-generator-xlarge rotate: false - xy: 501, 416 + xy: 451, 466 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-thorium-reactor-large +block-stone-large rotate: false - xy: 1573, 765 + xy: 1573, 807 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-thorium-reactor-medium +block-stone-medium rotate: false - xy: 1531, 516 + xy: 1028, 223 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-thorium-reactor-small +block-stone-small rotate: false - xy: 1669, 331 + xy: 1523, 307 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-thorium-reactor-tiny +block-stone-tiny rotate: false - xy: 1939, 550 + xy: 1959, 439 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-thorium-reactor-xlarge +block-stone-wall-large rotate: false - xy: 551, 466 - size: 48, 48 - orig: 48, 48 - offset: 0, 0 - index: -1 -block-thorium-wall-large - rotate: false - xy: 1531, 723 + xy: 1615, 849 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-thorium-wall-large-large +block-stone-wall-medium + rotate: false + xy: 1028, 189 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +block-stone-wall-small + rotate: false + xy: 1549, 307 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +block-stone-wall-tiny + rotate: false + xy: 1977, 457 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +block-stone-wall-xlarge + rotate: false + xy: 501, 516 + size: 48, 48 + orig: 48, 48 + offset: 0, 0 + index: -1 +block-stone-xlarge + rotate: false + xy: 551, 566 + size: 48, 48 + orig: 48, 48 + offset: 0, 0 + index: -1 +block-surge-tower-large rotate: false xy: 1489, 681 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-thorium-wall-large-medium +block-surge-tower-medium rotate: false - xy: 1153, 482 + xy: 1051, 155 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-thorium-wall-large-small +block-surge-tower-small rotate: false - xy: 1669, 305 + xy: 1232, 346 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-thorium-wall-large-tiny +block-surge-tower-tiny rotate: false - xy: 1957, 550 + xy: 1995, 475 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-thorium-wall-large-xlarge +block-surge-tower-xlarge rotate: false - xy: 601, 516 + xy: 351, 316 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-thorium-wall-medium +block-surge-wall-large rotate: false - xy: 1187, 482 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -block-thorium-wall-small - rotate: false - xy: 1695, 331 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -block-thorium-wall-tiny - rotate: false - xy: 1921, 532 - size: 16, 16 - orig: 16, 16 - offset: 0, 0 - index: -1 -block-thorium-wall-xlarge - rotate: false - xy: 651, 566 - size: 48, 48 - orig: 48, 48 - offset: 0, 0 - index: -1 -block-thruster-large - rotate: false - xy: 1699, 849 + xy: 1531, 723 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-thruster-medium +block-surge-wall-large-large rotate: false - xy: 1221, 482 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -block-thruster-small - rotate: false - xy: 1695, 305 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -block-thruster-tiny - rotate: false - xy: 1939, 532 - size: 16, 16 - orig: 16, 16 - offset: 0, 0 - index: -1 -block-thruster-xlarge - rotate: false - xy: 351, 216 - size: 48, 48 - orig: 48, 48 - offset: 0, 0 - index: -1 -block-titanium-conveyor-large - rotate: false - xy: 1657, 807 + xy: 1573, 765 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-titanium-conveyor-medium +block-surge-wall-large-medium rotate: false - xy: 1255, 482 + xy: 1051, 121 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-titanium-conveyor-small +block-surge-wall-large-small rotate: false - xy: 1723, 383 + xy: 1232, 320 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-titanium-conveyor-tiny +block-surge-wall-large-tiny rotate: false - xy: 1957, 532 + xy: 1941, 403 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-titanium-conveyor-xlarge +block-surge-wall-large-xlarge rotate: false - xy: 401, 266 + xy: 401, 366 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-titanium-wall-large +block-surge-wall-medium rotate: false - xy: 1615, 765 + xy: 1051, 87 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +block-surge-wall-small + rotate: false + xy: 1232, 294 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +block-surge-wall-tiny + rotate: false + xy: 1959, 421 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +block-surge-wall-xlarge + rotate: false + xy: 451, 416 + size: 48, 48 + orig: 48, 48 + offset: 0, 0 + index: -1 +block-swarmer-large + rotate: false + xy: 1615, 807 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-titanium-wall-large-large +block-swarmer-medium rotate: false - xy: 1573, 723 + xy: 1051, 53 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +block-swarmer-small + rotate: false + xy: 1232, 268 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +block-swarmer-tiny + rotate: false + xy: 1977, 439 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +block-swarmer-xlarge + rotate: false + xy: 501, 466 + size: 48, 48 + orig: 48, 48 + offset: 0, 0 + index: -1 +block-switch-large + rotate: false + xy: 1657, 849 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-titanium-wall-large-medium +block-switch-medium rotate: false - xy: 1289, 482 + xy: 2011, 687 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-titanium-wall-large-small +block-switch-small rotate: false - xy: 1722, 357 + xy: 1258, 347 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-titanium-wall-large-tiny +block-switch-tiny rotate: false - xy: 1975, 547 + xy: 1995, 457 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-titanium-wall-large-xlarge +block-switch-xlarge rotate: false - xy: 451, 316 + xy: 551, 516 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-titanium-wall-medium - rotate: false - xy: 1323, 482 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -block-titanium-wall-small - rotate: false - xy: 1721, 331 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -block-titanium-wall-tiny - rotate: false - xy: 1993, 547 - size: 16, 16 - orig: 16, 16 - offset: 0, 0 - index: -1 -block-titanium-wall-xlarge - rotate: false - xy: 501, 366 - size: 48, 48 - orig: 48, 48 - offset: 0, 0 - index: -1 -block-underflow-gate-large +block-tainted-water-large rotate: false xy: 1531, 681 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-underflow-gate-medium +block-tainted-water-medium rotate: false - xy: 1357, 482 + xy: 779, 46 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-underflow-gate-small +block-tainted-water-small rotate: false - xy: 1721, 305 + xy: 1258, 321 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-underflow-gate-tiny +block-tainted-water-tiny rotate: false - xy: 1975, 529 + xy: 2013, 475 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-underflow-gate-xlarge +block-tainted-water-xlarge rotate: false - xy: 551, 416 + xy: 601, 566 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-unloader-large +block-tar-large rotate: false - xy: 1741, 849 + xy: 1573, 723 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-unloader-medium +block-tar-medium rotate: false - xy: 1391, 482 + xy: 779, 12 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-unloader-small +block-tar-small rotate: false - xy: 1540, 279 + xy: 1258, 295 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-unloader-tiny +block-tar-tiny rotate: false - xy: 1993, 529 + xy: 2031, 475 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-unloader-xlarge +block-tar-xlarge rotate: false - xy: 601, 466 + xy: 351, 266 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-vault-large +block-tendrils-large rotate: false - xy: 1699, 807 + xy: 1615, 765 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-vault-medium +block-tendrils-medium rotate: false - xy: 1425, 482 + xy: 813, 46 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-vault-small +block-tendrils-small rotate: false - xy: 1540, 253 + xy: 1258, 269 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-vault-tiny +block-tendrils-tiny rotate: false - xy: 2011, 539 + xy: 1959, 403 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-vault-xlarge +block-tendrils-xlarge rotate: false - xy: 651, 516 + xy: 401, 316 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-water-extractor-large +block-tetrative-reconstructor-large rotate: false - xy: 1657, 765 + xy: 1657, 807 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-water-extractor-medium +block-tetrative-reconstructor-medium rotate: false - xy: 1459, 482 + xy: 847, 46 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-water-extractor-small +block-tetrative-reconstructor-small rotate: false - xy: 1566, 279 + xy: 1284, 323 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-water-extractor-tiny +block-tetrative-reconstructor-tiny rotate: false - xy: 2011, 521 + xy: 1977, 421 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-water-extractor-xlarge +block-tetrative-reconstructor-xlarge rotate: false - xy: 701, 566 + xy: 451, 366 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-water-large +block-thermal-generator-large rotate: false - xy: 1615, 723 + xy: 1699, 849 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-water-medium +block-thermal-generator-medium rotate: false - xy: 1493, 482 + xy: 813, 12 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-water-small +block-thermal-generator-small rotate: false - xy: 1566, 253 + xy: 1310, 323 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-water-tiny +block-thermal-generator-tiny rotate: false - xy: 1821, 493 + xy: 1995, 439 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-water-xlarge +block-thermal-generator-xlarge rotate: false - xy: 351, 166 + xy: 501, 416 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-wave-large +block-thermal-pump-large rotate: false xy: 1573, 681 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-wave-medium +block-thermal-pump-medium rotate: false - xy: 1527, 482 + xy: 847, 12 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-wave-small +block-thermal-pump-small rotate: false - xy: 1592, 279 + xy: 1284, 297 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-wave-tiny +block-thermal-pump-tiny rotate: false - xy: 1821, 475 + xy: 2013, 457 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-wave-xlarge +block-thermal-pump-xlarge rotate: false - xy: 401, 216 + xy: 551, 466 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-white-tree-dead-large +block-thorium-reactor-large rotate: false - xy: 1783, 849 + xy: 1615, 723 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-white-tree-dead-medium +block-thorium-reactor-medium rotate: false - xy: 1567, 545 + xy: 881, 19 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-white-tree-dead-small +block-thorium-reactor-small rotate: false - xy: 1592, 253 + xy: 1336, 323 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-white-tree-dead-tiny +block-thorium-reactor-tiny rotate: false - xy: 1821, 457 + xy: 2031, 457 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-white-tree-dead-xlarge +block-thorium-reactor-xlarge rotate: false - xy: 451, 266 + xy: 601, 516 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-white-tree-large +block-thorium-wall-large + rotate: false + xy: 1657, 765 + size: 40, 40 + orig: 40, 40 + offset: 0, 0 + index: -1 +block-thorium-wall-large-large + rotate: false + xy: 1699, 807 + size: 40, 40 + orig: 40, 40 + offset: 0, 0 + index: -1 +block-thorium-wall-large-medium + rotate: false + xy: 915, 19 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +block-thorium-wall-large-small + rotate: false + xy: 1284, 271 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +block-thorium-wall-large-tiny + rotate: false + xy: 1977, 403 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +block-thorium-wall-large-xlarge + rotate: false + xy: 651, 566 + size: 48, 48 + orig: 48, 48 + offset: 0, 0 + index: -1 +block-thorium-wall-medium + rotate: false + xy: 949, 19 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +block-thorium-wall-small + rotate: false + xy: 1310, 297 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +block-thorium-wall-tiny + rotate: false + xy: 1995, 421 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +block-thorium-wall-xlarge + rotate: false + xy: 351, 216 + size: 48, 48 + orig: 48, 48 + offset: 0, 0 + index: -1 +block-thruster-large + rotate: false + xy: 1741, 849 + size: 40, 40 + orig: 40, 40 + offset: 0, 0 + index: -1 +block-thruster-medium + rotate: false + xy: 983, 19 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +block-thruster-small + rotate: false + xy: 1310, 271 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +block-thruster-tiny + rotate: false + xy: 2013, 439 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +block-thruster-xlarge + rotate: false + xy: 401, 266 + size: 48, 48 + orig: 48, 48 + offset: 0, 0 + index: -1 +block-titanium-conveyor-large + rotate: false + xy: 1615, 681 + size: 40, 40 + orig: 40, 40 + offset: 0, 0 + index: -1 +block-titanium-conveyor-medium + rotate: false + xy: 1017, 19 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +block-titanium-conveyor-small + rotate: false + xy: 1336, 297 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +block-titanium-conveyor-tiny + rotate: false + xy: 2031, 439 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +block-titanium-conveyor-xlarge + rotate: false + xy: 451, 316 + size: 48, 48 + orig: 48, 48 + offset: 0, 0 + index: -1 +block-titanium-wall-large + rotate: false + xy: 1657, 723 + size: 40, 40 + orig: 40, 40 + offset: 0, 0 + index: -1 +block-titanium-wall-large-large + rotate: false + xy: 1699, 765 + size: 40, 40 + orig: 40, 40 + offset: 0, 0 + index: -1 +block-titanium-wall-large-medium + rotate: false + xy: 1051, 19 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +block-titanium-wall-large-small + rotate: false + xy: 1336, 271 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +block-titanium-wall-large-tiny + rotate: false + xy: 1995, 403 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +block-titanium-wall-large-xlarge + rotate: false + xy: 501, 366 + size: 48, 48 + orig: 48, 48 + offset: 0, 0 + index: -1 +block-titanium-wall-medium + rotate: false + xy: 1039, 291 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +block-titanium-wall-small + rotate: false + xy: 1362, 303 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +block-titanium-wall-tiny + rotate: false + xy: 2013, 421 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +block-titanium-wall-xlarge + rotate: false + xy: 551, 416 + size: 48, 48 + orig: 48, 48 + offset: 0, 0 + index: -1 +block-tsunami-large rotate: false xy: 1741, 807 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-white-tree-medium +block-tsunami-medium rotate: false - xy: 1601, 545 + xy: 1039, 257 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-white-tree-small +block-tsunami-small rotate: false - xy: 1618, 279 + xy: 1388, 303 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-white-tree-tiny +block-tsunami-tiny rotate: false - xy: 1827, 511 + xy: 2031, 421 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-white-tree-xlarge +block-tsunami-xlarge + rotate: false + xy: 601, 466 + size: 48, 48 + orig: 48, 48 + offset: 0, 0 + index: -1 +block-underflow-gate-large + rotate: false + xy: 1783, 849 + size: 40, 40 + orig: 40, 40 + offset: 0, 0 + index: -1 +block-underflow-gate-medium + rotate: false + xy: 1062, 223 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +block-underflow-gate-small + rotate: false + xy: 1362, 277 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +block-underflow-gate-tiny + rotate: false + xy: 2013, 403 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +block-underflow-gate-xlarge + rotate: false + xy: 651, 516 + size: 48, 48 + orig: 48, 48 + offset: 0, 0 + index: -1 +block-unloader-large + rotate: false + xy: 1657, 681 + size: 40, 40 + orig: 40, 40 + offset: 0, 0 + index: -1 +block-unloader-medium + rotate: false + xy: 1062, 189 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +block-unloader-small + rotate: false + xy: 1388, 277 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +block-unloader-tiny + rotate: false + xy: 2031, 403 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +block-unloader-xlarge + rotate: false + xy: 701, 566 + size: 48, 48 + orig: 48, 48 + offset: 0, 0 + index: -1 +block-vault-large + rotate: false + xy: 1699, 723 + size: 40, 40 + orig: 40, 40 + offset: 0, 0 + index: -1 +block-vault-medium + rotate: false + xy: 1085, 155 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +block-vault-small + rotate: false + xy: 1414, 301 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +block-vault-tiny + rotate: false + xy: 1647, 385 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +block-vault-xlarge + rotate: false + xy: 351, 166 + size: 48, 48 + orig: 48, 48 + offset: 0, 0 + index: -1 +block-water-extractor-large + rotate: false + xy: 1741, 765 + size: 40, 40 + orig: 40, 40 + offset: 0, 0 + index: -1 +block-water-extractor-medium + rotate: false + xy: 1085, 121 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +block-water-extractor-small + rotate: false + xy: 1440, 301 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +block-water-extractor-tiny + rotate: false + xy: 1647, 367 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +block-water-extractor-xlarge + rotate: false + xy: 401, 216 + size: 48, 48 + orig: 48, 48 + offset: 0, 0 + index: -1 +block-water-large + rotate: false + xy: 1783, 807 + size: 40, 40 + orig: 40, 40 + offset: 0, 0 + index: -1 +block-water-medium + rotate: false + xy: 1085, 87 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +block-water-small + rotate: false + xy: 1466, 301 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +block-water-tiny + rotate: false + xy: 1665, 385 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +block-water-xlarge + rotate: false + xy: 451, 266 + size: 48, 48 + orig: 48, 48 + offset: 0, 0 + index: -1 +block-wave-large + rotate: false + xy: 1825, 849 + size: 40, 40 + orig: 40, 40 + offset: 0, 0 + index: -1 +block-wave-medium + rotate: false + xy: 1085, 53 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +block-wave-small + rotate: false + xy: 1414, 275 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +block-wave-tiny + rotate: false + xy: 1647, 349 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +block-wave-xlarge rotate: false xy: 501, 316 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 +block-white-tree-dead-large + rotate: false + xy: 1699, 681 + size: 40, 40 + orig: 40, 40 + offset: 0, 0 + index: -1 +block-white-tree-dead-medium + rotate: false + xy: 1085, 19 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +block-white-tree-dead-small + rotate: false + xy: 1440, 275 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +block-white-tree-dead-tiny + rotate: false + xy: 1665, 367 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +block-white-tree-dead-xlarge + rotate: false + xy: 551, 366 + size: 48, 48 + orig: 48, 48 + offset: 0, 0 + index: -1 +block-white-tree-large + rotate: false + xy: 1741, 723 + size: 40, 40 + orig: 40, 40 + offset: 0, 0 + index: -1 +block-white-tree-medium + rotate: false + xy: 983, 571 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +block-white-tree-small + rotate: false + xy: 1466, 275 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +block-white-tree-tiny + rotate: false + xy: 1683, 385 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +block-white-tree-xlarge + rotate: false + xy: 601, 416 + size: 48, 48 + orig: 48, 48 + offset: 0, 0 + index: -1 button rotate: false - xy: 1699, 694 + xy: 1437, 652 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -19126,7 +19238,7 @@ button index: -1 button-disabled rotate: false - xy: 1867, 745 + xy: 1133, 652 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -19134,7 +19246,7 @@ button-disabled index: -1 button-down rotate: false - xy: 1909, 778 + xy: 1133, 623 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -19142,7 +19254,7 @@ button-down index: -1 button-edge-1 rotate: false - xy: 1049, 610 + xy: 1171, 652 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -19150,7 +19262,7 @@ button-edge-1 index: -1 button-edge-2 rotate: false - xy: 1133, 652 + xy: 1171, 623 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -19158,7 +19270,7 @@ button-edge-2 index: -1 button-edge-3 rotate: false - xy: 1087, 610 + xy: 1209, 652 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -19166,7 +19278,7 @@ button-edge-3 index: -1 button-edge-4 rotate: false - xy: 1171, 652 + xy: 1209, 623 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -19174,7 +19286,7 @@ button-edge-4 index: -1 button-right-disabled rotate: false - xy: 1171, 652 + xy: 1209, 623 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -19182,7 +19294,7 @@ button-right-disabled index: -1 button-edge-over-4 rotate: false - xy: 1209, 652 + xy: 1247, 652 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -19190,7 +19302,7 @@ button-edge-over-4 index: -1 button-over rotate: false - xy: 1247, 652 + xy: 1247, 623 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -19206,7 +19318,7 @@ button-red index: -1 button-right rotate: false - xy: 1399, 652 + xy: 1323, 623 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -19214,7 +19326,7 @@ button-right index: -1 button-right-down rotate: false - xy: 1323, 652 + xy: 1285, 623 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -19222,7 +19334,7 @@ button-right-down index: -1 button-right-over rotate: false - xy: 1361, 652 + xy: 1323, 652 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -19230,7 +19342,7 @@ button-right-over index: -1 button-select rotate: false - xy: 1618, 253 + xy: 1492, 281 size: 24, 24 split: 4, 4, 4, 4 orig: 24, 24 @@ -19238,7 +19350,7 @@ button-select index: -1 button-square rotate: false - xy: 1513, 652 + xy: 1399, 652 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -19246,7 +19358,7 @@ button-square index: -1 button-square-down rotate: false - xy: 1437, 652 + xy: 1361, 652 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -19254,7 +19366,7 @@ button-square-down index: -1 button-square-over rotate: false - xy: 1475, 652 + xy: 1361, 623 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -19262,7 +19374,7 @@ button-square-over index: -1 button-trans rotate: false - xy: 1551, 652 + xy: 1399, 623 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -19270,42 +19382,42 @@ button-trans index: -1 check-disabled rotate: false - xy: 1635, 545 + xy: 1013, 521 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 check-off rotate: false - xy: 1565, 511 + xy: 1013, 487 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 check-on rotate: false - xy: 1599, 511 + xy: 1013, 453 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 check-on-disabled rotate: false - xy: 1633, 511 + xy: 1013, 419 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 check-on-over rotate: false - xy: 1561, 477 + xy: 1013, 385 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 check-over rotate: false - xy: 1595, 477 + xy: 1047, 521 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -19326,7 +19438,7 @@ crater index: -1 cursor rotate: false - xy: 1867, 739 + xy: 1937, 683 size: 4, 4 orig: 4, 4 offset: 0, 0 @@ -19340,7 +19452,7 @@ discord-banner index: -1 flat-down-base rotate: false - xy: 1049, 581 + xy: 1437, 623 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -19355,7 +19467,7 @@ info-banner index: -1 inventory rotate: false - xy: 1644, 263 + xy: 1518, 265 size: 24, 40 split: 10, 10, 10, 14 orig: 24, 40 @@ -19363,147 +19475,147 @@ inventory index: -1 item-blast-compound-icon rotate: false - xy: 1629, 477 + xy: 1047, 487 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-coal-icon rotate: false - xy: 1663, 477 + xy: 1047, 453 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-copper-icon rotate: false - xy: 1667, 511 + xy: 1047, 419 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-graphite-icon rotate: false - xy: 1697, 477 + xy: 1047, 385 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-lead-icon rotate: false - xy: 1153, 448 + xy: 1042, 351 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-metaglass-icon rotate: false - xy: 1187, 448 + xy: 1081, 537 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-phase-fabric-icon rotate: false - xy: 1221, 448 + xy: 1081, 503 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-plastanium-icon rotate: false - xy: 1255, 448 + xy: 1081, 469 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-pyratite-icon rotate: false - xy: 1289, 448 + xy: 1081, 435 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-sand-icon rotate: false - xy: 1323, 448 + xy: 1081, 401 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-scrap-icon rotate: false - xy: 1357, 448 + xy: 1115, 521 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-silicon-icon rotate: false - xy: 1391, 448 + xy: 1149, 521 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-spore-pod-icon rotate: false - xy: 1425, 448 + xy: 1115, 487 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-surge-alloy-icon rotate: false - xy: 1459, 448 + xy: 1183, 521 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-thorium-icon rotate: false - xy: 1493, 448 + xy: 1149, 487 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-titanium-icon rotate: false - xy: 1527, 448 + xy: 1115, 453 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-cryofluid-icon rotate: false - xy: 1151, 414 + xy: 1217, 521 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-oil-icon rotate: false - xy: 1185, 414 + xy: 1183, 487 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-slag-icon rotate: false - xy: 1219, 414 + xy: 1149, 453 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-water-icon rotate: false - xy: 1253, 414 + xy: 1115, 419 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 logic-node rotate: false - xy: 1287, 414 + xy: 1251, 521 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -19524,7 +19636,7 @@ nomap index: -1 pane rotate: false - xy: 1951, 862 + xy: 1475, 623 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -19532,7 +19644,7 @@ pane index: -1 pane-2 rotate: false - xy: 1087, 581 + xy: 1475, 652 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -19540,7 +19652,7 @@ pane-2 index: -1 scroll rotate: false - xy: 1696, 268 + xy: 1492, 244 size: 24, 35 split: 10, 10, 6, 5 orig: 24, 35 @@ -19563,63 +19675,63 @@ scroll-knob-horizontal-black index: -1 scroll-knob-vertical-black rotate: false - xy: 1670, 263 + xy: 1544, 265 size: 24, 40 orig: 24, 40 offset: 0, 0 index: -1 scroll-knob-vertical-thin rotate: false - xy: 2035, 713 + xy: 1249, 171 size: 12, 40 orig: 12, 40 offset: 0, 0 index: -1 selection rotate: false - xy: 821, 975 + xy: 1611, 315 size: 1, 1 orig: 1, 1 offset: 0, 0 index: -1 slider rotate: false - xy: 2014, 601 + xy: 1039, 375 size: 1, 8 orig: 1, 8 offset: 0, 0 index: -1 slider-knob rotate: false - xy: 692, 92 + xy: 1017, 565 size: 29, 38 orig: 29, 38 offset: 0, 0 index: -1 slider-knob-down rotate: false - xy: 1929, 594 + xy: 1489, 515 size: 29, 38 orig: 29, 38 offset: 0, 0 index: -1 slider-knob-over rotate: false - xy: 692, 52 + xy: 1520, 515 size: 29, 38 orig: 29, 38 offset: 0, 0 index: -1 slider-vertical rotate: false - xy: 309, 866 + xy: 1183, 421 size: 8, 1 orig: 8, 1 offset: 0, 0 index: -1 underline rotate: false - xy: 919, 568 + xy: 1589, 652 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -19627,7 +19739,7 @@ underline index: -1 underline-2 rotate: false - xy: 1951, 833 + xy: 1513, 652 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -19635,7 +19747,7 @@ underline-2 index: -1 underline-disabled rotate: false - xy: 1951, 804 + xy: 1513, 623 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -19643,7 +19755,7 @@ underline-disabled index: -1 underline-red rotate: false - xy: 1947, 775 + xy: 1551, 652 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -19651,7 +19763,7 @@ underline-red index: -1 underline-white rotate: false - xy: 881, 568 + xy: 1551, 623 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -19659,42 +19771,42 @@ underline-white index: -1 unit-alpha-large rotate: false - xy: 1699, 765 + xy: 1783, 765 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 unit-alpha-medium rotate: false - xy: 1321, 414 + xy: 1217, 487 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 unit-alpha-small rotate: false - xy: 1722, 279 + xy: 1518, 239 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 unit-alpha-tiny rotate: false - xy: 1827, 529 + xy: 1647, 331 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 unit-alpha-xlarge rotate: false - xy: 551, 366 + xy: 651, 466 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 unit-antumbra-large rotate: false - xy: 877, 526 + xy: 1951, 849 size: 36, 40 orig: 36, 40 offset: 0, 0 @@ -19708,182 +19820,182 @@ unit-antumbra-medium index: -1 unit-antumbra-small rotate: false - xy: 1358, 206 + xy: 418, 8 size: 21, 24 orig: 21, 24 offset: 0, 0 index: -1 unit-antumbra-tiny rotate: false - xy: 1048, 189 + xy: 1444, 205 size: 14, 16 orig: 14, 16 offset: 0, 0 index: -1 unit-antumbra-xlarge rotate: false - xy: 401, 33 + xy: 601, 225 size: 43, 48 orig: 43, 48 offset: 0, 0 index: -1 unit-arkyid-large rotate: false - xy: 1657, 723 + xy: 1825, 807 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 unit-arkyid-medium rotate: false - xy: 1355, 414 + xy: 1183, 453 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 unit-arkyid-small rotate: false - xy: 1540, 227 + xy: 1544, 239 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 unit-arkyid-tiny rotate: false - xy: 1845, 531 + xy: 1665, 349 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 unit-arkyid-xlarge rotate: false - xy: 601, 416 + xy: 701, 516 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 unit-atrax-large rotate: false - xy: 1615, 692 + xy: 1867, 860 size: 40, 29 orig: 40, 29 offset: 0, 0 index: -1 unit-atrax-medium rotate: false - xy: 911, 331 + xy: 745, 55 size: 32, 23 orig: 32, 23 offset: 0, 0 index: -1 unit-atrax-small rotate: false - xy: 804, 1 + xy: 1075, 330 size: 24, 17 orig: 24, 17 offset: 0, 0 index: -1 unit-atrax-tiny rotate: false - xy: 656, 168 + xy: 711, 91 size: 16, 11 orig: 16, 11 offset: 0, 0 index: -1 unit-atrax-xlarge rotate: false - xy: 651, 480 + xy: 351, 130 size: 48, 34 orig: 48, 34 offset: 0, 0 index: -1 unit-beta-large rotate: false - xy: 1825, 851 + xy: 1741, 683 size: 40, 38 orig: 40, 38 offset: 0, 0 index: -1 unit-beta-medium rotate: false - xy: 351, 1 + xy: 1149, 421 size: 32, 30 orig: 32, 30 offset: 0, 0 index: -1 unit-beta-small rotate: false - xy: 722, 1 + xy: 1362, 252 size: 24, 23 orig: 24, 23 offset: 0, 0 index: -1 unit-beta-tiny rotate: false - xy: 1174, 27 + xy: 1683, 368 size: 16, 15 orig: 16, 15 offset: 0, 0 index: -1 unit-beta-xlarge rotate: false - xy: 701, 518 + xy: 401, 168 size: 48, 46 orig: 48, 46 offset: 0, 0 index: -1 unit-bryde-large rotate: false - xy: 1783, 807 + xy: 1783, 723 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 unit-bryde-medium rotate: false - xy: 1389, 414 + xy: 1285, 521 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 unit-bryde-small rotate: false - xy: 1566, 227 + xy: 1388, 251 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 unit-bryde-tiny rotate: false - xy: 1863, 531 + xy: 1701, 385 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 unit-bryde-xlarge rotate: false - xy: 351, 116 + xy: 451, 216 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 unit-corvus-large rotate: false - xy: 1741, 779 + xy: 1825, 779 size: 40, 26 orig: 40, 26 offset: 0, 0 index: -1 unit-corvus-medium rotate: false - xy: 114, 6 + xy: 1042, 329 size: 31, 20 orig: 31, 20 offset: 0, 0 index: -1 unit-corvus-small rotate: false - xy: 692, 1 + xy: 1867, 681 size: 24, 15 orig: 24, 15 offset: 0, 0 @@ -19897,154 +20009,154 @@ unit-corvus-tiny index: -1 unit-corvus-xlarge rotate: false - xy: 401, 183 + xy: 501, 283 size: 48, 31 orig: 48, 31 offset: 0, 0 index: -1 unit-crawler-large rotate: false - xy: 1699, 723 + xy: 1867, 818 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 unit-crawler-medium rotate: false - xy: 1423, 414 + xy: 1251, 487 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 unit-crawler-small rotate: false - xy: 1592, 227 + xy: 1414, 249 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 unit-crawler-tiny rotate: false - xy: 1845, 513 + xy: 1665, 331 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 unit-crawler-xlarge rotate: false - xy: 451, 216 + xy: 551, 316 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 unit-dagger-large rotate: false - xy: 1825, 809 + xy: 1909, 849 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 unit-dagger-medium rotate: false - xy: 1457, 414 + xy: 1217, 453 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 unit-dagger-small rotate: false - xy: 1618, 227 + xy: 1440, 249 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 unit-dagger-tiny rotate: false - xy: 1863, 513 + xy: 1683, 350 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 unit-dagger-xlarge rotate: false - xy: 501, 266 + xy: 601, 366 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 unit-eclipse-large rotate: false - xy: 1867, 849 + xy: 1825, 737 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 unit-eclipse-medium rotate: false - xy: 1491, 414 + xy: 1319, 521 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 unit-eclipse-small rotate: false - xy: 1644, 237 + xy: 1466, 249 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 unit-eclipse-tiny rotate: false - xy: 1881, 521 + xy: 1701, 367 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 unit-eclipse-xlarge rotate: false - xy: 551, 316 + xy: 651, 416 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 unit-flare-large rotate: false - xy: 1741, 737 + xy: 1867, 776 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 unit-flare-medium rotate: false - xy: 1525, 414 + xy: 1285, 487 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 unit-flare-small rotate: false - xy: 1670, 237 + xy: 1570, 281 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 unit-flare-tiny rotate: false - xy: 1899, 521 + xy: 1719, 385 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 unit-flare-xlarge rotate: false - xy: 601, 366 + xy: 701, 466 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 unit-fortress-large rotate: false - xy: 1783, 773 + xy: 1783, 689 size: 40, 32 orig: 40, 32 offset: 0, 0 @@ -20058,175 +20170,175 @@ unit-fortress-medium index: -1 unit-fortress-small rotate: false - xy: 556, 1 + xy: 1570, 260 size: 24, 19 orig: 24, 19 offset: 0, 0 index: -1 unit-fortress-tiny rotate: false - xy: 522, 1 + xy: 965, 597 size: 16, 12 orig: 16, 12 offset: 0, 0 index: -1 unit-fortress-xlarge rotate: false - xy: 651, 440 + xy: 351, 90 size: 48, 38 orig: 48, 38 offset: 0, 0 index: -1 unit-gamma-large rotate: false - xy: 1909, 849 + xy: 1909, 807 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 unit-gamma-medium rotate: false - xy: 1561, 443 + xy: 1251, 453 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 unit-gamma-small rotate: false - xy: 1696, 242 + xy: 1570, 234 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 unit-gamma-tiny rotate: false - xy: 1881, 503 + xy: 1683, 332 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 unit-gamma-xlarge rotate: false - xy: 701, 468 + xy: 401, 118 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 unit-horizon-large rotate: false - xy: 1867, 807 + xy: 1825, 695 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 unit-horizon-medium rotate: false - xy: 1595, 443 + xy: 1353, 521 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 unit-horizon-small rotate: false - xy: 1722, 253 + xy: 1252, 242 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 unit-horizon-tiny rotate: false - xy: 1899, 503 + xy: 1701, 349 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 unit-horizon-xlarge rotate: false - xy: 351, 66 + xy: 451, 166 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 unit-mace-large rotate: false - xy: 1909, 807 + xy: 1867, 734 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 unit-mace-medium rotate: false - xy: 1629, 443 + xy: 1319, 487 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 unit-mace-small rotate: false - xy: 1722, 227 + xy: 1252, 216 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 unit-mace-tiny rotate: false - xy: 1917, 514 + xy: 1719, 367 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 unit-mace-xlarge rotate: false - xy: 401, 133 + xy: 501, 233 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 unit-mega-large rotate: false - xy: 881, 639 + xy: 1909, 765 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 unit-mega-medium rotate: false - xy: 1663, 443 + xy: 1285, 453 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 unit-mega-small rotate: false - xy: 1696, 216 + xy: 1278, 243 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 unit-mega-tiny rotate: false - xy: 1935, 514 + xy: 1737, 385 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 unit-mega-xlarge rotate: false - xy: 451, 166 + xy: 551, 266 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 unit-minke-large rotate: false - xy: 877, 455 + xy: 1951, 765 size: 34, 40 orig: 34, 40 offset: 0, 0 index: -1 unit-minke-medium rotate: false - xy: 723, 52 + xy: 2020, 721 size: 27, 32 orig: 27, 32 offset: 0, 0 @@ -20240,154 +20352,154 @@ unit-minke-small index: -1 unit-minke-tiny rotate: false - xy: 2034, 683 + xy: 1773, 349 size: 13, 16 orig: 13, 16 offset: 0, 0 index: -1 unit-minke-xlarge rotate: false - xy: 601, 226 + xy: 601, 175 size: 41, 48 orig: 41, 48 offset: 0, 0 index: -1 unit-mono-large rotate: false - xy: 881, 597 + xy: 881, 639 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 unit-mono-medium rotate: false - xy: 1697, 443 + xy: 1387, 521 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 unit-mono-small rotate: false - xy: 1722, 201 + xy: 1278, 217 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 unit-mono-tiny rotate: false - xy: 1953, 514 + xy: 1719, 349 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 unit-mono-xlarge rotate: false - xy: 501, 216 + xy: 601, 316 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 unit-nova-large rotate: false - xy: 923, 639 + xy: 881, 597 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 unit-nova-medium rotate: false - xy: 1559, 409 + xy: 1353, 487 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 unit-nova-small rotate: false - xy: 1644, 211 + xy: 1304, 245 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 unit-nova-tiny rotate: false - xy: 1917, 496 + xy: 1737, 367 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 unit-nova-xlarge rotate: false - xy: 551, 266 + xy: 651, 366 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 unit-oct-large rotate: false - xy: 965, 639 + xy: 923, 639 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 unit-oct-medium rotate: false - xy: 1593, 409 + xy: 1319, 453 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 unit-oct-small rotate: false - xy: 1670, 211 + xy: 1330, 245 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 unit-oct-tiny rotate: false - xy: 1935, 496 + xy: 1755, 385 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 unit-oct-xlarge rotate: false - xy: 601, 316 + xy: 701, 416 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 unit-omura-large rotate: false - xy: 2019, 755 + xy: 1551, 513 size: 28, 40 orig: 28, 40 offset: 0, 0 index: -1 unit-omura-medium rotate: false - xy: 1729, 409 + xy: 1486, 189 size: 22, 32 orig: 22, 32 offset: 0, 0 index: -1 unit-omura-small rotate: false - xy: 1953, 488 + xy: 1737, 341 size: 16, 24 orig: 16, 24 offset: 0, 0 index: -1 unit-omura-tiny rotate: false - xy: 337, 1 + xy: 1077, 580 size: 11, 16 orig: 11, 16 offset: 0, 0 index: -1 unit-omura-xlarge rotate: false - xy: 877, 405 + xy: 1951, 715 size: 33, 48 orig: 33, 48 offset: 0, 0 @@ -20401,420 +20513,420 @@ unit-poly-large index: -1 unit-poly-medium rotate: false - xy: 1627, 409 + xy: 1421, 521 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 unit-poly-small rotate: false - xy: 1696, 190 + xy: 1304, 219 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 unit-poly-tiny rotate: false - xy: 1971, 511 + xy: 1755, 367 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 unit-poly-xlarge rotate: false - xy: 651, 390 + xy: 351, 40 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 unit-pulsar-large rotate: false - xy: 1825, 773 + xy: 1867, 698 size: 40, 34 orig: 40, 34 offset: 0, 0 index: -1 unit-pulsar-medium rotate: false - xy: 658, 1 + xy: 1183, 424 size: 32, 27 orig: 32, 27 offset: 0, 0 index: -1 unit-pulsar-small rotate: false - xy: 1150, 210 + xy: 1330, 223 size: 24, 20 orig: 24, 20 offset: 0, 0 index: -1 unit-pulsar-tiny rotate: false - xy: 1192, 29 + xy: 644, 175 size: 16, 13 orig: 16, 13 offset: 0, 0 index: -1 unit-pulsar-xlarge rotate: false - xy: 701, 426 + xy: 401, 76 size: 48, 40 orig: 48, 40 offset: 0, 0 index: -1 unit-quad-large rotate: false - xy: 1007, 639 + xy: 1909, 723 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 unit-quad-medium rotate: false - xy: 1929, 683 + xy: 385, 1 size: 31, 31 orig: 31, 31 offset: 0, 0 index: -1 unit-quad-small rotate: false - xy: 1176, 206 + xy: 1356, 226 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 unit-quad-tiny rotate: false - xy: 471, 15 + xy: 1701, 332 size: 15, 15 orig: 15, 15 offset: 0, 0 index: -1 unit-quad-xlarge rotate: false - xy: 401, 83 + xy: 451, 116 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 unit-quasar-large rotate: false - xy: 965, 597 + xy: 965, 639 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 unit-quasar-medium rotate: false - xy: 1661, 409 + xy: 1387, 487 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 unit-quasar-small rotate: false - xy: 1202, 206 + xy: 1382, 225 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 unit-quasar-tiny rotate: false - xy: 1989, 511 + xy: 1773, 385 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 unit-quasar-xlarge rotate: false - xy: 451, 116 + xy: 501, 183 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 unit-reign-large rotate: false - xy: 1657, 695 + xy: 965, 611 size: 40, 26 orig: 40, 26 offset: 0, 0 index: -1 unit-reign-medium rotate: false - xy: 1929, 661 + xy: 114, 6 size: 31, 20 orig: 31, 20 offset: 0, 0 index: -1 unit-reign-small rotate: false - xy: 830, 3 + xy: 301, 2 size: 24, 15 orig: 24, 15 offset: 0, 0 index: -1 unit-reign-tiny rotate: false - xy: 945, 242 + xy: 781, 678 size: 15, 10 orig: 15, 10 offset: 0, 0 index: -1 unit-reign-xlarge rotate: false - xy: 351, 33 + xy: 551, 233 size: 48, 31 orig: 48, 31 offset: 0, 0 index: -1 unit-risso-large rotate: false - xy: 915, 526 + xy: 1951, 807 size: 35, 40 orig: 35, 40 offset: 0, 0 index: -1 unit-risso-medium rotate: false - xy: 692, 18 + xy: 2017, 579 size: 28, 32 orig: 28, 32 offset: 0, 0 index: -1 unit-risso-small rotate: false - xy: 1381, 206 + xy: 441, 6 size: 21, 24 orig: 21, 24 offset: 0, 0 index: -1 unit-risso-tiny rotate: false - xy: 1316, 193 + xy: 1791, 385 size: 14, 16 orig: 14, 16 offset: 0, 0 index: -1 unit-risso-xlarge rotate: false - xy: 501, 125 + xy: 701, 326 size: 43, 48 orig: 43, 48 offset: 0, 0 index: -1 unit-scepter-large rotate: false - xy: 1783, 739 + xy: 1007, 647 size: 40, 32 orig: 40, 32 offset: 0, 0 index: -1 unit-scepter-medium rotate: false - xy: 385, 5 + xy: 1353, 459 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 unit-scepter-small rotate: false - xy: 1228, 211 + xy: 1408, 228 size: 24, 19 orig: 24, 19 offset: 0, 0 index: -1 unit-scepter-tiny rotate: false - xy: 1971, 496 + xy: 662, 175 size: 16, 13 orig: 16, 13 offset: 0, 0 index: -1 unit-scepter-xlarge rotate: false - xy: 501, 175 + xy: 601, 275 size: 48, 39 orig: 48, 39 offset: 0, 0 index: -1 unit-sei-large rotate: false - xy: 1049, 639 + xy: 1007, 605 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 unit-sei-medium rotate: false - xy: 1695, 409 + xy: 1455, 521 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 unit-sei-small rotate: false - xy: 1254, 206 + xy: 1434, 223 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 unit-sei-tiny rotate: false - xy: 1210, 26 + xy: 1755, 349 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 unit-sei-xlarge rotate: false - xy: 551, 216 + xy: 651, 316 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 unit-spiroct-large rotate: false - xy: 1867, 774 + xy: 1049, 648 size: 40, 31 orig: 40, 31 offset: 0, 0 index: -1 unit-spiroct-medium rotate: false - xy: 1929, 634 + xy: 1387, 460 size: 31, 25 orig: 31, 25 offset: 0, 0 index: -1 unit-spiroct-small rotate: false - xy: 1280, 211 + xy: 1460, 228 size: 24, 19 orig: 24, 19 offset: 0, 0 index: -1 unit-spiroct-tiny rotate: false - xy: 471, 1 + xy: 2022, 789 size: 15, 12 orig: 15, 12 offset: 0, 0 index: -1 unit-spiroct-xlarge rotate: false - xy: 601, 276 + xy: 701, 376 size: 48, 38 orig: 48, 38 offset: 0, 0 index: -1 unit-toxopid-large rotate: false - xy: 952, 526 + xy: 1979, 891 size: 33, 40 orig: 33, 40 offset: 0, 0 index: -1 unit-toxopid-medium rotate: false - xy: 781, 682 + xy: 2021, 755 size: 26, 32 orig: 26, 32 offset: 0, 0 index: -1 unit-toxopid-small rotate: false - xy: 1404, 206 + xy: 1512, 213 size: 20, 24 orig: 20, 24 offset: 0, 0 index: -1 unit-toxopid-tiny rotate: false - xy: 2034, 665 + xy: 1791, 367 size: 13, 16 orig: 13, 16 offset: 0, 0 index: -1 unit-toxopid-xlarge rotate: false - xy: 1007, 589 + xy: 1049, 598 size: 40, 48 orig: 40, 48 offset: 0, 0 index: -1 unit-vela-large rotate: false - xy: 1825, 739 + xy: 1091, 647 size: 40, 32 orig: 40, 32 offset: 0, 0 index: -1 unit-vela-medium rotate: false - xy: 1909, 750 + xy: 1217, 425 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 unit-vela-small rotate: false - xy: 1306, 211 + xy: 1486, 223 size: 24, 19 orig: 24, 19 offset: 0, 0 index: -1 unit-vela-tiny rotate: false - xy: 1989, 496 + xy: 482, 1 size: 16, 13 orig: 16, 13 offset: 0, 0 index: -1 unit-vela-xlarge rotate: false - xy: 651, 349 + xy: 501, 142 size: 48, 39 orig: 48, 39 offset: 0, 0 index: -1 unit-zenith-large rotate: false - xy: 1091, 639 + xy: 1091, 605 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 unit-zenith-medium rotate: false - xy: 1911, 716 + xy: 1421, 487 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 unit-zenith-small rotate: false - xy: 1332, 206 + xy: 1460, 202 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 unit-zenith-tiny rotate: false - xy: 1228, 26 + xy: 1773, 367 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 unit-zenith-xlarge rotate: false - xy: 701, 376 + xy: 551, 183 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 wavepane rotate: false - xy: 957, 568 + xy: 1589, 623 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -20822,7 +20934,7 @@ wavepane index: -1 white-pane rotate: false - xy: 877, 497 + xy: 1627, 652 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -20830,14 +20942,14 @@ white-pane index: -1 whiteui rotate: false - xy: 446, 78 + xy: 746, 371 size: 3, 3 orig: 3, 3 offset: 0, 0 index: -1 window-empty rotate: false - xy: 781, 61 + xy: 1073, 266 size: 27, 61 split: 4, 4, 2, 2 orig: 27, 61 diff --git a/core/assets/sprites/fallback/sprites3.png b/core/assets/sprites/fallback/sprites3.png index 4f3869aa13..05f78947ea 100644 Binary files a/core/assets/sprites/fallback/sprites3.png and b/core/assets/sprites/fallback/sprites3.png differ diff --git a/core/assets/sprites/fallback/sprites4.png b/core/assets/sprites/fallback/sprites4.png index b7d5c539ae..a54ba96e8b 100644 Binary files a/core/assets/sprites/fallback/sprites4.png and b/core/assets/sprites/fallback/sprites4.png differ diff --git a/core/assets/sprites/fallback/sprites5.png b/core/assets/sprites/fallback/sprites5.png index 60da597583..c9946bf655 100644 Binary files a/core/assets/sprites/fallback/sprites5.png and b/core/assets/sprites/fallback/sprites5.png differ diff --git a/core/assets/sprites/fallback/sprites7.png b/core/assets/sprites/fallback/sprites7.png index 3c08869d1d..8ba18e157c 100644 Binary files a/core/assets/sprites/fallback/sprites7.png and b/core/assets/sprites/fallback/sprites7.png differ diff --git a/core/assets/sprites/fallback/sprites8.png b/core/assets/sprites/fallback/sprites8.png index 8a820d514a..4cb8e05377 100644 Binary files a/core/assets/sprites/fallback/sprites8.png and b/core/assets/sprites/fallback/sprites8.png differ diff --git a/core/assets/sprites/sprites.atlas b/core/assets/sprites/sprites.atlas index 2d267c4455..303a643a31 100644 --- a/core/assets/sprites/sprites.atlas +++ b/core/assets/sprites/sprites.atlas @@ -4,198 +4,191 @@ size: 4096,4096 format: rgba8888 filter: nearest,nearest repeat: none -core-silo - rotate: false - xy: 1501, 1904 - size: 160, 160 - orig: 160, 160 - offset: 0, 0 - index: -1 launch-pad rotate: false - xy: 3785, 2613 + xy: 1951, 2545 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 launch-pad-large rotate: false - xy: 3263, 2957 + xy: 1703, 3035 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 launch-pad-light rotate: false - xy: 3883, 2593 + xy: 2245, 2643 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 launchpod rotate: false - xy: 2612, 1868 + xy: 2013, 1618 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 force-projector rotate: false - xy: 3099, 2729 + xy: 2918, 2757 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 force-projector-top rotate: false - xy: 3197, 2729 + xy: 1657, 2643 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 mend-projector rotate: false - xy: 2683, 2400 + xy: 2029, 760 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 mend-projector-top rotate: false - xy: 2725, 2334 + xy: 2091, 1156 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 mender rotate: false - xy: 2531, 1532 + xy: 3323, 2187 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 mender-top rotate: false - xy: 2565, 1566 + xy: 2439, 812 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 overdrive-dome rotate: false - xy: 2903, 2631 + xy: 2245, 2447 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 overdrive-dome-top rotate: false - xy: 3001, 2631 + xy: 2343, 2447 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 overdrive-projector rotate: false - xy: 2725, 2268 + xy: 2095, 1090 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 overdrive-projector-top rotate: false - xy: 2725, 2202 + xy: 2095, 1024 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 shock-mine rotate: false - xy: 2293, 1450 + xy: 3585, 2319 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-loader rotate: false - xy: 2013, 232 + xy: 1899, 2937 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 block-unloader rotate: false - xy: 1801, 2937 + xy: 1644, 2741 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 bridge-arrow rotate: false - xy: 2123, 1552 + xy: 2361, 1746 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conveyor rotate: false - xy: 2123, 1484 + xy: 2361, 1576 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conveyor-bridge rotate: false - xy: 2157, 1484 + xy: 2361, 1542 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conveyor-end rotate: false - xy: 2191, 1820 + xy: 2279, 718 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 center rotate: false - xy: 2225, 1820 + xy: 2279, 684 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-0-0 rotate: false - xy: 1053, 8 + xy: 1981, 1518 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-armored-conveyor-full rotate: false - xy: 1053, 8 + xy: 1981, 1518 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-0-1 rotate: false - xy: 2315, 2067 + xy: 1053, 8 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-0-2 rotate: false - xy: 4017, 3587 + xy: 2319, 1160 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-0-3 rotate: false - xy: 1117, 2609 + xy: 2277, 1076 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -209,7 +202,7 @@ armored-conveyor-1-0 index: -1 armored-conveyor-1-1 rotate: false - xy: 1776, 2861 + xy: 4005, 3587 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -223,1071 +216,1071 @@ armored-conveyor-1-2 index: -1 armored-conveyor-1-3 rotate: false - xy: 4051, 3587 + xy: 2319, 1126 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-2-0 rotate: false - xy: 1113, 2251 + xy: 2277, 1042 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-2-1 rotate: false - xy: 1121, 8 + xy: 1113, 2251 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-2-2 rotate: false - xy: 1155, 8 + xy: 4039, 3587 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-2-3 rotate: false - xy: 1189, 8 + xy: 1121, 8 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-3-0 rotate: false - xy: 3795, 3089 + xy: 2277, 1008 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-3-1 rotate: false - xy: 2255, 2265 + xy: 1155, 8 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-3-2 rotate: false - xy: 3851, 2439 + xy: 2277, 974 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-3-3 rotate: false - xy: 3885, 2443 + xy: 1189, 8 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-4-0 rotate: false - xy: 3869, 2405 + xy: 2277, 940 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-4-1 rotate: false - xy: 3869, 2371 + xy: 2277, 906 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-4-2 rotate: false - xy: 3869, 2337 + xy: 1654, 3015 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-4-3 rotate: false - xy: 3869, 2303 + xy: 3559, 2622 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-0-1 rotate: false - xy: 2225, 1616 + xy: 2347, 642 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-0-2 rotate: false - xy: 2191, 1548 + xy: 2313, 608 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-0-3 rotate: false - xy: 2225, 1582 + xy: 2347, 608 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-1-0 rotate: false - xy: 2191, 1514 + xy: 2313, 574 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-1-1 rotate: false - xy: 2225, 1548 + xy: 2347, 574 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-1-2 rotate: false - xy: 2225, 1514 + xy: 2313, 540 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-1-3 rotate: false - xy: 2191, 1480 + xy: 2347, 540 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-2-0 rotate: false - xy: 2225, 1480 + xy: 2313, 506 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-2-1 rotate: false - xy: 2259, 1790 + xy: 2347, 506 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-2-2 rotate: false - xy: 2259, 1756 + xy: 2313, 472 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-2-3 rotate: false - xy: 2293, 1790 + xy: 2347, 472 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-3-0 rotate: false - xy: 2259, 1722 + xy: 2313, 438 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-3-1 rotate: false - xy: 2293, 1756 + xy: 2347, 438 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-3-2 rotate: false - xy: 2259, 1688 + xy: 2317, 404 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-3-3 rotate: false - xy: 2293, 1722 + xy: 2351, 404 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-4-0 rotate: false - xy: 2259, 1654 + xy: 2381, 710 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-4-1 rotate: false - xy: 2293, 1688 + xy: 2381, 676 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-4-2 rotate: false - xy: 2259, 1620 + xy: 2381, 642 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-4-3 rotate: false - xy: 2293, 1654 + xy: 2381, 608 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plastanium-conveyor rotate: false - xy: 2667, 1600 + xy: 3347, 2337 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plastanium-conveyor-0 rotate: false - xy: 2701, 1634 + xy: 3347, 2303 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plastanium-conveyor-1 rotate: false - xy: 2599, 1498 + xy: 3381, 2337 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plastanium-conveyor-2 rotate: false - xy: 2633, 1532 + xy: 3381, 2303 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plastanium-conveyor-edge rotate: false - xy: 2667, 1566 + xy: 3415, 2337 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plastanium-conveyor-stack rotate: false - xy: 2701, 1600 + xy: 3415, 2303 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-0-1 rotate: false - xy: 2053, 1296 + xy: 2511, 2109 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-0-2 rotate: false - xy: 2087, 1330 + xy: 2395, 2075 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-0-3 rotate: false - xy: 2053, 1262 + xy: 2395, 2041 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-1-0 rotate: false - xy: 2087, 1296 + xy: 2429, 2075 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-1-1 rotate: false - xy: 2053, 1228 + xy: 2395, 2007 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-1-2 rotate: false - xy: 2087, 1262 + xy: 2463, 2075 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-1-3 rotate: false - xy: 2087, 1228 + xy: 2429, 2041 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-2-0 rotate: false - xy: 2123, 1416 + xy: 2395, 1973 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-2-1 rotate: false - xy: 2157, 1416 + xy: 2497, 2075 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-2-2 rotate: false - xy: 2121, 1382 + xy: 2463, 2041 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-2-3 rotate: false - xy: 2121, 1348 + xy: 2429, 2007 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-3-0 rotate: false - xy: 2155, 1382 + xy: 2395, 1939 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-3-1 rotate: false - xy: 2121, 1314 + xy: 2497, 2041 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-3-2 rotate: false - xy: 2155, 1348 + xy: 2463, 2007 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-3-3 rotate: false - xy: 2121, 1280 + xy: 2429, 1973 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-4-0 rotate: false - xy: 2155, 1314 + xy: 2395, 1905 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-4-1 rotate: false - xy: 2121, 1246 + xy: 2497, 2007 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-4-2 rotate: false - xy: 2155, 1280 + xy: 2463, 1973 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-4-3 rotate: false - xy: 2155, 1246 + xy: 2429, 1939 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cross rotate: false - xy: 2327, 1740 + xy: 3085, 2227 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 distributor rotate: false - xy: 2546, 1802 + xy: 2845, 2331 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 inverted-sorter rotate: false - xy: 2327, 1604 + xy: 3245, 2357 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 junction rotate: false - xy: 2531, 1668 + xy: 3211, 2283 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 mass-driver-base rotate: false - xy: 2217, 2741 + xy: 2343, 2545 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 overflow-gate rotate: false - xy: 2667, 1668 + xy: 2449, 710 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 payload-conveyor rotate: false - xy: 3099, 2631 + xy: 2441, 2447 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 payload-conveyor-edge rotate: false - xy: 3197, 2631 + xy: 2539, 2447 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 payload-conveyor-top rotate: false - xy: 3295, 2631 + xy: 2637, 2643 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 payload-router-top rotate: false - xy: 3295, 2631 + xy: 2637, 2643 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 payload-router rotate: false - xy: 3393, 2611 + xy: 2637, 2545 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 payload-router-edge rotate: false - xy: 3491, 2611 + xy: 2637, 2447 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 payload-router-over rotate: false - xy: 1755, 2643 + xy: 2735, 2647 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 phase-conveyor rotate: false - xy: 2667, 1634 + xy: 2449, 540 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conveyor-arrow rotate: false - xy: 2701, 1668 + xy: 2449, 506 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conveyor-bridge rotate: false - xy: 2565, 1498 + xy: 2449, 472 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conveyor-end rotate: false - xy: 2599, 1532 + xy: 2449, 438 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 router rotate: false - xy: 2019, 1387 + xy: 3493, 2201 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sorter rotate: false - xy: 2361, 1434 + xy: 3527, 2253 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 underflow-gate rotate: false - xy: 2259, 1416 + xy: 2463, 1939 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 blast-drill rotate: false - xy: 3961, 3079 + xy: 1805, 1148 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 blast-drill-rim rotate: false - xy: 1747, 802 + xy: 3263, 3099 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 blast-drill-rotator rotate: false - xy: 2973, 3087 + xy: 3393, 3099 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 blast-drill-top rotate: false - xy: 3103, 3087 + xy: 1899, 1018 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 drill-top rotate: false - xy: 2593, 2330 + xy: 2911, 2265 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 steam-generator-liquid rotate: false - xy: 2593, 2330 + xy: 2911, 2265 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 laser-drill rotate: false - xy: 1657, 2437 + xy: 1657, 2447 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 laser-drill-rim rotate: false - xy: 1703, 2339 + xy: 1951, 2643 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 laser-drill-rotator rotate: false - xy: 1703, 2241 + xy: 2049, 2643 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 laser-drill-top rotate: false - xy: 3687, 2613 + xy: 2147, 2643 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 mechanical-drill rotate: false - xy: 2659, 2334 + xy: 2029, 1024 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 mechanical-drill-rotator rotate: false - xy: 2659, 2268 + xy: 2029, 958 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 mechanical-drill-top rotate: false - xy: 2659, 2202 + xy: 2029, 892 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 oil-extractor rotate: false - xy: 2511, 2741 + xy: 2539, 2545 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 oil-extractor-liquid rotate: false - xy: 2609, 2741 + xy: 1951, 2447 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 oil-extractor-rotator rotate: false - xy: 2707, 2647 + xy: 2049, 2447 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 oil-extractor-top rotate: false - xy: 2805, 2631 + xy: 2147, 2447 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 pneumatic-drill rotate: false - xy: 2678, 1736 + xy: 2147, 430 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 pneumatic-drill-rotator rotate: false - xy: 2744, 2004 + xy: 2647, 2245 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 pneumatic-drill-top rotate: false - xy: 2744, 1938 + xy: 2713, 2249 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 water-extractor rotate: false - xy: 3079, 2433 + xy: 2145, 1958 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 water-extractor-liquid rotate: false - xy: 3211, 2499 + xy: 2145, 1892 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 water-extractor-rotator rotate: false - xy: 3145, 2433 + xy: 2145, 1826 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 water-extractor-top rotate: false - xy: 3277, 2499 + xy: 2145, 1760 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-border rotate: false - xy: 3903, 2273 + xy: 2353, 1152 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-middle rotate: false - xy: 2089, 1806 + xy: 2379, 914 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-select rotate: false - xy: 2157, 1824 + xy: 1524, 2635 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-liquid rotate: false - xy: 2225, 1718 + xy: 2279, 446 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 place-arrow rotate: false - xy: 1853, 2643 + xy: 2735, 2549 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 bridge-conduit rotate: false - xy: 2157, 1586 + xy: 2361, 1712 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conduit-arrow rotate: false - xy: 2123, 1518 + xy: 2361, 1678 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conveyor-arrow rotate: false - xy: 2123, 1518 + xy: 2361, 1678 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conduit-bridge rotate: false - xy: 2157, 1552 + xy: 2361, 1644 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conduit-end rotate: false - xy: 2157, 1518 + xy: 2361, 1610 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom rotate: false - xy: 2225, 1786 + xy: 2279, 582 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-0 rotate: false - xy: 2191, 1718 + xy: 2279, 548 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-1 rotate: false - xy: 2225, 1752 + xy: 2279, 514 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-2 rotate: false - xy: 2191, 1684 + xy: 2279, 480 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-3 rotate: false - xy: 2191, 1684 + xy: 2279, 480 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-4 rotate: false - xy: 2191, 1684 + xy: 2279, 480 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-0 rotate: false - xy: 2191, 1650 + xy: 2313, 710 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-1 rotate: false - xy: 2225, 1684 + xy: 2347, 710 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-2 rotate: false - xy: 2191, 1616 + xy: 2313, 676 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-3 rotate: false - xy: 2225, 1650 + xy: 2347, 676 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-3 rotate: false - xy: 2225, 1650 + xy: 2347, 676 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-4 rotate: false - xy: 2191, 1582 + xy: 2313, 642 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-junction rotate: false - xy: 2497, 1600 + xy: 3313, 2289 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-overflow-gate rotate: false - xy: 2633, 1702 + xy: 3153, 2199 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-overflow-gate-top rotate: false - xy: 2463, 1532 + xy: 3187, 2249 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-router-bottom rotate: false - xy: 2497, 1566 + xy: 3187, 2215 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-router-liquid rotate: false - xy: 2531, 1600 + xy: 3221, 2249 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-router-top rotate: false - xy: 2565, 1634 + xy: 3221, 2215 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-tank-bottom rotate: false - xy: 3981, 2573 + xy: 2049, 2545 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 liquid-tank-liquid rotate: false - xy: 1825, 2741 + xy: 2147, 2545 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 liquid-tank-top rotate: false - xy: 1923, 2741 + xy: 2343, 2643 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 mechanical-pump rotate: false - xy: 2599, 1634 + xy: 3187, 2181 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 mechanical-pump-liquid rotate: false - xy: 2633, 1668 + xy: 3221, 2181 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 rotary-pump-liquid rotate: false - xy: 2633, 1668 + xy: 3221, 2181 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 thermal-pump-liquid rotate: false - xy: 2633, 1668 + xy: 3221, 2181 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conduit rotate: false - xy: 2531, 1498 + xy: 2449, 676 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conduit-arrow rotate: false - xy: 2565, 1532 + xy: 2449, 642 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conduit-bridge rotate: false - xy: 2599, 1566 + xy: 2449, 608 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conduit-end rotate: false - xy: 2633, 1600 + xy: 2449, 574 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plated-conduit-cap rotate: false - xy: 2667, 1532 + xy: 3449, 2303 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plated-conduit-top-0 rotate: false - xy: 2701, 1566 + xy: 3483, 2337 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plated-conduit-top-1 rotate: false - xy: 2667, 1498 + xy: 3483, 2303 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plated-conduit-top-2 rotate: false - xy: 2701, 1532 + xy: 3357, 2269 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plated-conduit-top-3 rotate: false - xy: 2701, 1498 + xy: 3357, 2235 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plated-conduit-top-4 rotate: false - xy: 2463, 1464 + xy: 3391, 2269 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-0 rotate: false - xy: 2599, 1464 + xy: 3391, 2201 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-1 rotate: false - xy: 2633, 1464 + xy: 3425, 2235 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-2 rotate: false - xy: 2667, 1464 + xy: 3459, 2269 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-4 rotate: false - xy: 2701, 1464 + xy: 3425, 2201 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 rotary-pump rotate: false - xy: 2810, 2004 + xy: 2079, 1882 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 thermal-pump rotate: false - xy: 2049, 2545 + xy: 3127, 2671 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 hyper-processor rotate: false - xy: 3491, 2709 + xy: 1853, 2643 size: 96, 96 orig: 96, 96 offset: 0, 0 @@ -1301,728 +1294,728 @@ large-logic-display index: -1 logic-display rotate: false - xy: 2021, 2741 + xy: 2245, 2545 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 logic-processor rotate: false - xy: 2612, 1802 + xy: 2013, 1552 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 memory-bank rotate: false - xy: 2683, 2466 + xy: 2029, 826 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 memory-cell rotate: false - xy: 2497, 1498 + xy: 3289, 2187 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 message rotate: false - xy: 2599, 1600 + xy: 2439, 778 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 micro-processor rotate: false - xy: 2633, 1634 + xy: 2439, 744 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 switch rotate: false - xy: 2087, 1398 + xy: 2409, 2109 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 switch-on rotate: false - xy: 2053, 1330 + xy: 2443, 2109 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 battery rotate: false - xy: 3869, 2269 + xy: 3593, 2622 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 battery-large rotate: false - xy: 1877, 820 + xy: 1935, 1224 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 battery-large-top rotate: false - xy: 1975, 918 + xy: 3231, 2989 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 battery-top rotate: false - xy: 3903, 2409 + xy: 2291, 80 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 combustion-generator rotate: false - xy: 2191, 1786 + xy: 2279, 650 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 combustion-generator-top rotate: false - xy: 2191, 1752 + xy: 2279, 616 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 differential-generator rotate: false - xy: 2315, 2839 + xy: 2330, 2741 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 differential-generator-liquid rotate: false - xy: 2413, 2839 + xy: 2526, 2839 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 differential-generator-top rotate: false - xy: 2511, 2839 + xy: 2428, 2741 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 diode rotate: false - xy: 2327, 1706 + xy: 3085, 2193 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 diode-arrow rotate: false - xy: 2361, 1740 + xy: 3119, 2267 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 illuminator rotate: false - xy: 2361, 1672 + xy: 3279, 2391 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 illuminator-top rotate: false - xy: 2395, 1706 + xy: 3313, 2391 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 impact-reactor rotate: false - xy: 2483, 3035 + xy: 3913, 3079 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 impact-reactor-bottom rotate: false - xy: 2613, 3035 + xy: 1817, 1908 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 impact-reactor-light rotate: false - xy: 2743, 3071 + xy: 1817, 1778 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 impact-reactor-plasma-0 rotate: false - xy: 2743, 2941 + xy: 1817, 1648 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 impact-reactor-plasma-1 rotate: false - xy: 2873, 2957 + xy: 1817, 1518 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 impact-reactor-plasma-2 rotate: false - xy: 3003, 2957 + xy: 2143, 238 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 impact-reactor-plasma-3 rotate: false - xy: 3133, 2957 + xy: 2143, 108 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 power-node rotate: false - xy: 2497, 1464 + xy: 3357, 2201 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 power-node-large rotate: false - xy: 2744, 1872 + xy: 2779, 2249 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 power-source rotate: false - xy: 2531, 1464 + xy: 3391, 2235 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 power-void rotate: false - xy: 2565, 1464 + xy: 3425, 2269 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 rtg-generator rotate: false - xy: 2810, 1938 + xy: 2079, 1816 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 rtg-generator-top rotate: false - xy: 2019, 1353 + xy: 3357, 2167 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 solar-panel rotate: false - xy: 2327, 1434 + xy: 3527, 2287 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 solar-panel-large rotate: false - xy: 2147, 2643 + xy: 3029, 2671 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 steam-generator rotate: false - xy: 2749, 2499 + xy: 2213, 562 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 steam-generator-cap rotate: false - xy: 2749, 2433 + xy: 2213, 496 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 steam-generator-top rotate: false - xy: 2815, 2499 + xy: 2213, 430 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 steam-generator-turbine0 rotate: false - xy: 2881, 2499 + xy: 2037, 2222 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 steam-generator-turbine1 rotate: false - xy: 2815, 2433 + xy: 2103, 2222 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 surge-tower rotate: false - xy: 2947, 2499 + xy: 2027, 2156 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 thermal-generator rotate: false - xy: 2947, 2433 + xy: 2159, 2156 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 thorium-reactor rotate: false - xy: 1951, 2447 + xy: 3029, 2573 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 thorium-reactor-lights rotate: false - xy: 2245, 2643 + xy: 3029, 2475 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 thorium-reactor-top rotate: false - xy: 2147, 2545 + xy: 3127, 2573 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 alloy-smelter rotate: false - xy: 1953, 1016 + xy: 1919, 1420 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 alloy-smelter-top rotate: false - xy: 1877, 918 + xy: 1935, 1322 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 blast-mixer rotate: false - xy: 2581, 2598 + xy: 1825, 2043 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-forge rotate: false - xy: 1985, 722 + xy: 3281, 2695 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 coal-centrifuge rotate: false - xy: 2381, 2170 + xy: 3874, 2651 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 -cryofluidmixer-bottom +cryofluid-mixer-bottom rotate: false - xy: 2480, 1934 + xy: 3029, 2409 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 -cryofluidmixer-liquid +cryofluid-mixer-liquid rotate: false - xy: 2480, 1868 + xy: 3095, 2409 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 -cryofluidmixer-top +cryofluid-mixer-top rotate: false - xy: 2546, 2000 + xy: 3373, 2371 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cultivator rotate: false - xy: 2546, 1934 + xy: 3439, 2371 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cultivator-middle rotate: false - xy: 2546, 1868 + xy: 2833, 2397 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cultivator-top rotate: false - xy: 2480, 1802 + xy: 2899, 2397 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 disassembler rotate: false - xy: 2609, 2839 + xy: 2526, 2741 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 disassembler-liquid rotate: false - xy: 2707, 2843 + xy: 2624, 2839 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 disassembler-spinner rotate: false - xy: 2707, 2745 + xy: 2624, 2741 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 graphite-press rotate: false - xy: 2593, 2198 + xy: 2013, 1948 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 incinerator rotate: false - xy: 2429, 1740 + xy: 3211, 2351 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-source rotate: false - xy: 2429, 1468 + xy: 2415, 472 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-void rotate: false - xy: 2497, 1634 + xy: 3313, 2323 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 kiln rotate: false - xy: 2579, 2132 + xy: 2013, 1882 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 kiln-top rotate: false - xy: 2579, 2066 + xy: 2013, 1816 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 silicon-smelter-top rotate: false - xy: 2579, 2066 + xy: 2013, 1816 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 liquid-source rotate: false - xy: 2463, 1498 + xy: 3289, 2255 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-void rotate: false - xy: 2497, 1532 + xy: 3289, 2221 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 melter rotate: false - xy: 2701, 1702 + xy: 3255, 2187 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 multi-press rotate: false - xy: 2315, 2741 + xy: 2539, 2643 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 phase-weaver rotate: false - xy: 2711, 2136 + xy: 2095, 826 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 phase-weaver-bottom rotate: false - xy: 2711, 2070 + xy: 2095, 760 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 phase-weaver-weave rotate: false - xy: 2678, 2000 + xy: 2147, 694 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 plastanium-compressor rotate: false - xy: 2678, 1934 + xy: 2147, 628 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 plastanium-compressor-top rotate: false - xy: 2678, 1868 + xy: 2147, 562 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 pulverizer rotate: false - xy: 2055, 1466 + xy: 3459, 2235 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulverizer-rotator rotate: false - xy: 2089, 1466 + xy: 3459, 2201 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pyratite-mixer rotate: false - xy: 2744, 1740 + xy: 2911, 2199 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 separator rotate: false - xy: 3165, 2565 + xy: 2099, 1222 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 separator-liquid rotate: false - xy: 3231, 2565 + xy: 2157, 1156 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 separator-spinner rotate: false - xy: 3297, 2565 + xy: 2161, 1090 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 silicon-crucible rotate: false - xy: 1951, 2545 + xy: 2931, 2561 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 silicon-crucible-top rotate: false - xy: 1853, 2447 + xy: 2931, 2463 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 silicon-smelter rotate: false - xy: 3363, 2545 + xy: 2161, 1024 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 spore-press rotate: false - xy: 3429, 2545 + xy: 2161, 958 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 spore-press-frame0 rotate: false - xy: 3495, 2545 + xy: 2161, 892 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 spore-press-frame1 rotate: false - xy: 3561, 2545 + xy: 2161, 826 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 spore-press-frame2 rotate: false - xy: 3627, 2547 + xy: 2161, 760 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 spore-press-liquid rotate: false - xy: 3693, 2547 + xy: 2213, 694 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 spore-press-top rotate: false - xy: 3759, 2547 + xy: 2213, 628 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 boulder1 rotate: false - xy: 2843, 2113 + xy: 1604, 2999 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 boulder2 rotate: false - xy: 1559, 3057 + xy: 3796, 2610 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 dacite-boulder1 rotate: false - xy: 1604, 2857 + xy: 2221, 2086 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 dacite-boulder2 rotate: false - xy: 3319, 2371 + xy: 2211, 2036 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 sand-boulder1 rotate: false - xy: 2019, 1319 + xy: 3391, 2167 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sand-boulder2 rotate: false - xy: 2019, 1285 + xy: 3425, 2167 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 shale-boulder1 rotate: false - xy: 2225, 1446 + xy: 3551, 2321 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 shale-boulder2 rotate: false - xy: 2259, 1450 + xy: 3585, 2353 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 snow-boulder1 rotate: false - xy: 2926, 1767 + xy: 2315, 1286 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 snow-boulder2 rotate: false - xy: 2976, 1981 + xy: 2357, 1486 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 spore-cluster1 rotate: false - xy: 1738, 2895 + xy: 1641, 6 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 spore-cluster2 rotate: false - xy: 1780, 2895 + xy: 2277, 1152 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 spore-cluster3 rotate: false - xy: 1696, 2853 + xy: 2277, 1110 size: 40, 40 orig: 40, 40 offset: 0, 0 @@ -2057,28 +2050,28 @@ white-tree-shadow index: -1 container rotate: false - xy: 2381, 2038 + xy: 4022, 2709 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 container-team rotate: false - xy: 2348, 1972 + xy: 4006, 2643 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 core-foundation rotate: false - xy: 1817, 1456 + xy: 2017, 628 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 core-foundation-team rotate: false - xy: 1817, 1326 + xy: 2017, 498 size: 128, 128 orig: 128, 128 offset: 0, 0 @@ -2099,147 +2092,154 @@ core-nucleus-team index: -1 core-shard rotate: false - xy: 1997, 2937 + xy: 1840, 2839 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 core-shard-team rotate: false - xy: 2095, 2937 + xy: 1742, 2741 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 unloader rotate: false - xy: 2293, 1416 + xy: 2429, 1905 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 unloader-center rotate: false - xy: 2189, 1378 + xy: 2395, 1837 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 vault rotate: false - xy: 2049, 2447 + xy: 3323, 2511 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 vault-team rotate: false - xy: 2343, 2643 + xy: 3421, 2511 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 arc-heat rotate: false - xy: 773, 1 + xy: 2820, 2855 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-1 rotate: false - xy: 3903, 2375 + xy: 2291, 46 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-2 rotate: false - xy: 2439, 2528 + xy: 1895, 2212 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-3 rotate: false - xy: 1975, 820 + xy: 3329, 3001 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 block-4 rotate: false - xy: 3233, 3087 + xy: 1899, 888 + size: 128, 128 + orig: 128, 128 + offset: 0, 0 + index: -1 +foreshadow-heat + rotate: false + xy: 3783, 3079 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 hail-heat rotate: false - xy: 1016, 3073 + xy: 781, 1 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 lancer-heat rotate: false - xy: 2612, 1934 + xy: 2013, 1684 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 meltdown-heat rotate: false - xy: 3003, 2827 + xy: 1963, 3035 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 ripple-heat rotate: false - xy: 1951, 2643 + xy: 2833, 2659 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 salvo-heat rotate: false - xy: 2810, 1806 - size: 64, 64 - orig: 64, 64 - offset: 0, 0 - index: -1 -salvo-panel-left - rotate: false - xy: 2810, 1740 - size: 64, 64 - orig: 64, 64 - offset: 0, 0 - index: -1 -salvo-panel-right - rotate: false - xy: 2703, 2581 + xy: 2079, 1684 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 scorch-heat rotate: false - xy: 2019, 1217 + xy: 3493, 2167 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 +tsunami-liquid + rotate: false + xy: 3225, 2597 + size: 96, 96 + orig: 96, 96 + offset: 0, 0 + index: -1 +tsunami-top + rotate: false + xy: 3225, 2499 + size: 96, 96 + orig: 96, 96 + offset: 0, 0 + index: -1 wave-liquid rotate: false - xy: 3277, 2433 + xy: 2145, 1628 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 wave-top rotate: false - xy: 3343, 2479 + xy: 2145, 1562 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -2253,28 +2253,28 @@ additive-reconstructor index: -1 additive-reconstructor-top rotate: false - xy: 1757, 1004 + xy: 1559, 2571 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 air-factory rotate: false - xy: 1855, 1016 + xy: 1559, 2473 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 command-center rotate: false - xy: 2381, 2104 + xy: 3961, 2775 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 command-center-team rotate: false - xy: 2461, 2198 + xy: 3956, 2709 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -2295,14 +2295,14 @@ exponential-reconstructor-top index: -1 factory-in-3 rotate: false - xy: 2805, 2729 + xy: 2722, 2843 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 factory-in-5 rotate: false - xy: 1563, 446 + xy: 1563, 608 size: 160, 160 orig: 160, 160 offset: 0, 0 @@ -2323,14 +2323,14 @@ factory-in-9 index: -1 factory-out-3 rotate: false - xy: 2903, 2729 + xy: 2722, 2745 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 factory-out-5 rotate: false - xy: 1559, 284 + xy: 1563, 446 size: 160, 160 orig: 160, 160 offset: 0, 0 @@ -2351,56 +2351,56 @@ factory-out-9 index: -1 factory-top-3 rotate: false - xy: 3001, 2729 + xy: 2820, 2757 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 ground-factory rotate: false - xy: 3393, 2709 + xy: 1755, 2643 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 multiplicative-reconstructor rotate: false - xy: 1559, 122 + xy: 1559, 284 size: 160, 160 orig: 160, 160 offset: 0, 0 index: -1 multiplicative-reconstructor-top rotate: false - xy: 1725, 608 + xy: 1559, 122 size: 160, 160 orig: 160, 160 offset: 0, 0 index: -1 naval-factory rotate: false - xy: 2413, 2741 + xy: 2441, 2545 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 rally-point rotate: false - xy: 2777, 2136 + xy: 2079, 2014 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 repair-point-base rotate: false - xy: 2019, 1421 + xy: 3493, 2235 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 resupply-point rotate: false - xy: 2777, 2070 + xy: 2079, 1948 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -2421,224 +2421,224 @@ tetrative-reconstructor-top index: -1 copper-wall rotate: false - xy: 2259, 1586 + xy: 2381, 574 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 copper-wall-large rotate: false - xy: 2414, 1972 + xy: 2317, 2301 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 door rotate: false - xy: 2327, 1672 + xy: 3119, 2233 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 door-large rotate: false - xy: 2551, 2462 + xy: 2911, 2331 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 door-large-open rotate: false - xy: 2551, 2396 + xy: 2845, 2265 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 door-open rotate: false - xy: 2361, 1706 + xy: 3119, 2199 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-wall rotate: false - xy: 2633, 1566 + xy: 2453, 404 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-wall-large rotate: false - xy: 2645, 2066 + xy: 2095, 892 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 plastanium-wall rotate: false - xy: 2633, 1498 + xy: 3449, 2337 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plastanium-wall-large rotate: false - xy: 2678, 1802 + xy: 2147, 496 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 scrap-wall-gigantic rotate: false - xy: 3393, 2807 + xy: 2613, 3035 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 scrap-wall-huge2 rotate: false - xy: 1853, 2545 + xy: 2833, 2463 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 scrap-wall-huge3 rotate: false - xy: 2049, 2643 + xy: 2931, 2659 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 scrap-wall-large1 rotate: false - xy: 2835, 2565 + xy: 2079, 1552 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 scrap-wall-large2 rotate: false - xy: 2901, 2565 + xy: 2083, 1486 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 scrap-wall-large3 rotate: false - xy: 2967, 2565 + xy: 2083, 1420 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 scrap-wall-large4 rotate: false - xy: 3033, 2565 + xy: 2099, 1354 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 scrap-wall2 rotate: false - xy: 2123, 1450 + xy: 3517, 2355 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap-wall3 rotate: false - xy: 2157, 1450 + xy: 3517, 2321 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap-wall4 rotate: false - xy: 2191, 1446 + xy: 3551, 2355 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap-wall5 rotate: false - xy: 2191, 1446 + xy: 3551, 2355 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 surge-wall rotate: false - xy: 2053, 1364 + xy: 2375, 2109 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 surge-wall-large rotate: false - xy: 2881, 2433 + xy: 2093, 2156 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 thorium-wall rotate: false - xy: 2087, 1364 + xy: 2477, 2109 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 thorium-wall-large rotate: false - xy: 3079, 2499 + xy: 2155, 2090 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 thruster rotate: false - xy: 3653, 2937 + xy: 2743, 2941 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 titanium-wall rotate: false - xy: 2191, 1412 + xy: 2395, 1871 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-wall-large rotate: false - xy: 3013, 2433 + xy: 2169, 2222 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 bullet rotate: false - xy: 1251, 1119 + xy: 4043, 3285 size: 52, 52 orig: 52, 52 offset: 0, 0 index: -1 bullet-back rotate: false - xy: 2965, 2379 + xy: 4043, 3231 size: 52, 52 orig: 52, 52 offset: 0, 0 index: -1 casing rotate: false - xy: 1103, 1371 + xy: 3517, 2303 size: 8, 16 orig: 8, 16 offset: 0, 0 index: -1 circle-end rotate: false - xy: 1440, 2640 + xy: 1440, 2754 size: 100, 199 orig: 100, 199 offset: 0, 0 @@ -2659,21 +2659,21 @@ circle-shadow index: -1 error rotate: false - xy: 4041, 2523 + xy: 2211, 1636 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 large-bomb rotate: false - xy: 3885, 2977 + xy: 2189, 6 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 large-bomb-back rotate: false - xy: 3783, 2813 + xy: 2873, 2855 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -2687,7 +2687,7 @@ laser index: -1 laser-end rotate: false - xy: 1947, 1709 + xy: 3299, 2425 size: 72, 72 orig: 72, 72 offset: 0, 0 @@ -2701,21 +2701,21 @@ minelaser index: -1 minelaser-end rotate: false - xy: 1947, 1635 + xy: 3373, 2437 size: 72, 72 orig: 72, 72 offset: 0, 0 index: -1 missile rotate: false - xy: 2683, 2941 + xy: 1683, 10 size: 36, 36 orig: 36, 36 offset: 0, 0 index: -1 missile-back rotate: false - xy: 1683, 10 + xy: 1113, 2319 size: 36, 36 orig: 36, 36 offset: 0, 0 @@ -2729,14 +2729,14 @@ parallax-laser index: -1 parallax-laser-end rotate: false - xy: 1947, 1561 + xy: 3447, 2437 size: 72, 72 orig: 72, 72 offset: 0, 0 index: -1 particle rotate: false - xy: 1696, 2895 + xy: 1109, 2601 size: 40, 40 orig: 40, 40 offset: 0, 0 @@ -2750,14 +2750,14 @@ scale_marker index: -1 shell rotate: false - xy: 1113, 2319 + xy: 3967, 3583 size: 36, 36 orig: 36, 36 offset: 0, 0 index: -1 shell-back rotate: false - xy: 1738, 2857 + xy: 2683, 2941 size: 36, 36 orig: 36, 36 offset: 0, 0 @@ -2771,42 +2771,42 @@ transfer index: -1 transfer-arrow rotate: false - xy: 2225, 1412 + xy: 2497, 1973 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 white rotate: false - xy: 1910, 2130 + xy: 3652, 2791 size: 3, 3 orig: 3, 3 offset: 0, 0 index: -1 alpha-outline rotate: false - xy: 3019, 2383 + xy: 3225, 2719 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 alpha-wreck0 rotate: false - xy: 2907, 2217 + xy: 3323, 2645 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 alpha-wreck1 rotate: false - xy: 3069, 2383 + xy: 2590, 2251 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 alpha-wreck2 rotate: false - xy: 3119, 2383 + xy: 3035, 2245 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -2841,28 +2841,28 @@ antumbra-wreck2 index: -1 arc rotate: false - xy: 2208, 2064 + xy: 1947, 1518 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 arkyid-foot rotate: false - xy: 173, 1 + xy: 3652, 2605 size: 70, 70 orig: 70, 70 offset: 0, 0 index: -1 arkyid-joint-base rotate: false - xy: 1947, 1415 + xy: 3601, 2533 size: 70, 70 orig: 70, 70 offset: 0, 0 index: -1 arkyid-leg rotate: false - xy: 773, 35 + xy: 1063, 3315 size: 56, 56 orig: 56, 56 offset: 0, 0 @@ -2876,14 +2876,14 @@ arkyid-leg-base index: -1 arkyid-outline rotate: false - xy: 3831, 3209 + xy: 3263, 3229 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 arkyid-wreck0 rotate: false - xy: 3961, 3209 + xy: 3393, 3229 size: 128, 128 orig: 128, 128 offset: 0, 0 @@ -2897,21 +2897,21 @@ arkyid-wreck1 index: -1 arkyid-wreck2 rotate: false - xy: 3831, 3079 + xy: 1805, 1278 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 artillery-mount-outline rotate: false - xy: 1947, 1271 + xy: 3724, 2605 size: 70, 70 orig: 70, 70 offset: 0, 0 index: -1 artillery-outline rotate: false - xy: 3169, 2375 + xy: 4043, 3115 size: 48, 56 orig: 48, 56 offset: 0, 0 @@ -2925,7 +2925,7 @@ atrax-foot index: -1 atrax-joint rotate: false - xy: 2447, 2038 + xy: 1317, 3183 size: 26, 26 orig: 26, 26 offset: 0, 0 @@ -2939,161 +2939,161 @@ atrax-leg index: -1 atrax-leg-base rotate: false - xy: 2419, 2368 + xy: 1817, 1408 size: 36, 26 orig: 36, 26 offset: 0, 0 index: -1 atrax-outline rotate: false - xy: 1757, 938 + xy: 1935, 1158 size: 88, 64 orig: 88, 64 offset: 0, 0 index: -1 atrax-wreck0 rotate: false - xy: 1801, 2304 + xy: 3907, 3013 size: 88, 64 orig: 88, 64 offset: 0, 0 index: -1 atrax-wreck1 rotate: false - xy: 1993, 2381 + xy: 691, 27 size: 88, 64 orig: 88, 64 offset: 0, 0 index: -1 atrax-wreck2 rotate: false - xy: 2083, 2381 + xy: 91, 7 size: 88, 64 orig: 88, 64 offset: 0, 0 index: -1 beam-weapon-outline rotate: false - xy: 2173, 2262 + xy: 3477, 2611 size: 80, 80 orig: 80, 80 offset: 0, 0 index: -1 beta-outline rotate: false - xy: 1063, 3317 + xy: 2683, 2979 size: 56, 54 orig: 56, 54 offset: 0, 0 index: -1 beta-wreck0 rotate: false - xy: 2683, 2979 + xy: 3016, 2799 size: 56, 54 orig: 56, 54 offset: 0, 0 index: -1 beta-wreck1 rotate: false - xy: 3474, 2489 + xy: 3161, 2419 size: 56, 54 orig: 56, 54 offset: 0, 0 index: -1 beta-wreck2 rotate: false - xy: 1063, 3261 + xy: 2965, 2407 size: 56, 54 orig: 56, 54 offset: 0, 0 index: -1 block-additive-reconstructor-full rotate: false - xy: 1887, 722 + xy: 3281, 2891 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 block-air-factory-full rotate: false - xy: 1887, 624 + xy: 3281, 2793 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 block-arc-full rotate: false - xy: 3903, 2341 + xy: 2291, 12 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-basalt-full rotate: false - xy: 3903, 2307 + xy: 2357, 1186 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-blast-drill-full rotate: false - xy: 3363, 3087 + xy: 1899, 758 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 block-boulder-full rotate: false - xy: 3269, 2383 + xy: 1001, 1131 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 block-char-full rotate: false - xy: 2013, 2 + xy: 2353, 1118 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-command-center-full rotate: false - xy: 2263, 2299 + xy: 1961, 2212 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-conduit-full rotate: false - xy: 2047, 2 + xy: 2391, 1186 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-container-full rotate: false - xy: 2329, 2299 + xy: 1895, 2146 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-conveyor-full rotate: false - xy: 2081, 2 + xy: 2387, 1152 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-0-0 rotate: false - xy: 2081, 2 + xy: 2387, 1152 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-core-foundation-full rotate: false - xy: 3493, 3067 + xy: 1887, 628 size: 128, 128 orig: 128, 128 offset: 0, 0 @@ -3107,98 +3107,98 @@ block-core-nucleus-full index: -1 block-core-shard-full rotate: false - xy: 1887, 526 + xy: 3379, 2903 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 block-craters-full rotate: false - xy: 1738, 2823 + xy: 2387, 1118 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-cryofluidmixer-full +block-cryofluid-mixer-full rotate: false - xy: 2315, 2233 + xy: 1961, 2146 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-cultivator-full rotate: false - xy: 2315, 2167 + xy: 1891, 2080 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-cyclone-full rotate: false - xy: 1887, 428 + xy: 3379, 2805 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 block-dacite-boulder-full rotate: false - xy: 1001, 1131 + xy: 3035, 2195 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 block-dacite-full rotate: false - xy: 1738, 2789 + xy: 2319, 1092 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-dacite-wall-full rotate: false - xy: 1738, 2755 + xy: 2311, 1058 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-dark-metal-full rotate: false - xy: 2021, 1829 + xy: 2311, 1024 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-darksand-full rotate: false - xy: 2021, 1795 + xy: 2311, 990 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-dirt-full rotate: false - xy: 2021, 1761 + xy: 2311, 956 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-dirt-wall-full rotate: false - xy: 2021, 1727 + xy: 2311, 922 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-dune-wall-full rotate: false - xy: 2021, 1693 + xy: 2353, 1084 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-duo-full rotate: false - xy: 2021, 1659 + xy: 2387, 1084 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3210,142 +3210,149 @@ block-exponential-reconstructor-full orig: 224, 224 offset: 0, 0 index: -1 +block-foreshadow-full + rotate: false + xy: 1887, 498 + size: 128, 128 + orig: 128, 128 + offset: 0, 0 + index: -1 block-fuse-full rotate: false - xy: 1985, 624 + xy: 3379, 2707 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 block-grass-full rotate: false - xy: 2021, 1625 + xy: 2345, 1050 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ground-factory-full rotate: false - xy: 1985, 526 + xy: 3379, 2609 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 block-hail-full rotate: false - xy: 2021, 1591 + xy: 2345, 1016 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-hotrock-full rotate: false - xy: 2021, 1557 + xy: 2379, 1050 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ice-full rotate: false - xy: 2021, 1523 + xy: 2345, 982 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ice-snow-full rotate: false - xy: 2021, 1489 + xy: 2379, 1016 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ice-wall-full rotate: false - xy: 2055, 1840 + xy: 2345, 948 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-impact-reactor-full rotate: false - xy: 3623, 3067 + xy: 1887, 368 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 block-lancer-full rotate: false - xy: 2315, 2101 + xy: 1957, 2080 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-laser-drill-full rotate: false - xy: 1985, 428 + xy: 1703, 2937 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 block-liquid-router-full rotate: false - xy: 2089, 1840 + xy: 2379, 982 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-liquid-tank-full rotate: false - xy: 2013, 330 + xy: 1801, 2937 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 block-magmarock-full rotate: false - xy: 2055, 1806 + xy: 2379, 948 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-mass-driver-full rotate: false - xy: 2013, 134 + xy: 1997, 2937 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 block-mechanical-drill-full rotate: false - xy: 2343, 2500 + xy: 1947, 2014 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-meltdown-full rotate: false - xy: 1817, 1716 + xy: 1883, 238 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 block-metal-floor-damaged-full rotate: false - xy: 2055, 1772 + xy: 2345, 914 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-moss-full rotate: false - xy: 2055, 1738 + xy: 2311, 888 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-mud-full rotate: false - xy: 2089, 1772 + xy: 2277, 872 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3359,357 +3366,357 @@ block-multiplicative-reconstructor-full index: -1 block-naval-factory-full rotate: false - xy: 2013, 36 + xy: 2095, 2937 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 block-oil-extractor-full rotate: false - xy: 1542, 2743 + xy: 2193, 2937 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 block-ore-coal-full rotate: false - xy: 2055, 1704 + xy: 2345, 880 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ore-copper-full rotate: false - xy: 2089, 1738 + xy: 2379, 880 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ore-lead-full rotate: false - xy: 2055, 1670 + xy: 2269, 838 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ore-scrap-full rotate: false - xy: 2089, 1704 + xy: 2269, 804 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ore-thorium-full rotate: false - xy: 2055, 1636 + xy: 2269, 770 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ore-titanium-full rotate: false - xy: 2089, 1670 + xy: 2311, 854 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-parallax-full rotate: false - xy: 2353, 2434 + xy: 1947, 1948 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-payload-conveyor-full rotate: false - xy: 1542, 2645 + xy: 2291, 2937 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 payload-conveyor-icon rotate: false - xy: 1542, 2645 + xy: 2291, 2937 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 block-payload-router-full rotate: false - xy: 1559, 2547 + xy: 2389, 2937 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 payload-router-icon rotate: false - xy: 1559, 2547 + xy: 2389, 2937 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 block-pebbles-full rotate: false - xy: 2055, 1602 + xy: 2345, 846 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-phase-weaver-full rotate: false - xy: 2353, 2368 + xy: 1947, 1882 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-plated-conduit-full rotate: false - xy: 2089, 1636 + xy: 2379, 846 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-pneumatic-drill-full rotate: false - xy: 2395, 2302 + xy: 1947, 1816 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-pulse-conduit-full rotate: false - xy: 2055, 1568 + xy: 2303, 820 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-pulverizer-full rotate: false - xy: 2089, 1602 + xy: 2303, 786 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-repair-point-full rotate: false - xy: 2055, 1534 + xy: 2337, 812 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ripple-full rotate: false - xy: 1559, 2449 + xy: 2487, 2937 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 block-salt-wall-full rotate: false - xy: 2089, 1568 + xy: 2371, 812 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-salvo-full rotate: false - xy: 2419, 2462 + xy: 1947, 1750 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-sand-boulder-full rotate: false - xy: 2055, 1500 + xy: 2337, 778 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-sand-full rotate: false - xy: 2089, 1534 + xy: 2371, 778 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-sand-wall-full rotate: false - xy: 2089, 1500 + xy: 2303, 752 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-scatter-full rotate: false - xy: 2419, 2396 + xy: 1947, 1684 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-scorch-full rotate: false - xy: 2123, 1824 + xy: 2337, 744 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-scrap-wall-full rotate: false - xy: 2123, 1790 + xy: 2371, 744 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap-wall1 rotate: false - xy: 2123, 1790 + xy: 2371, 744 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-scrap-wall-huge-full rotate: false - xy: 1703, 2937 + xy: 2585, 2937 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 scrap-wall-huge1 rotate: false - xy: 1703, 2937 + xy: 2585, 2937 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 block-scrap-wall-large-full rotate: false - xy: 2485, 2462 + xy: 1947, 1618 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-segment-full rotate: false - xy: 2485, 2396 + xy: 1947, 1552 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-shale-boulder-full rotate: false - xy: 2123, 1756 + xy: 1638, 2965 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-shale-full rotate: false - xy: 2157, 1790 + xy: 2575, 2159 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-shale-wall-full rotate: false - xy: 2123, 1722 + xy: 2575, 2125 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-shrubs-full rotate: false - xy: 2157, 1756 + xy: 2361, 2052 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-snow-boulder-full rotate: false - xy: 2843, 2163 + xy: 1554, 2999 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 block-snow-full rotate: false - xy: 2123, 1688 + xy: 2361, 2018 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-snow-wall-full rotate: false - xy: 2157, 1722 + xy: 2361, 1984 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-spectre-full rotate: false - xy: 1817, 1586 + xy: 1883, 108 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 block-spore-cluster-full rotate: false - xy: 758, 3251 + xy: 1891, 2038 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-spore-moss-full rotate: false - xy: 2123, 1654 + xy: 2361, 1950 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-spore-press-full rotate: false - xy: 2505, 2528 + xy: 3829, 2792 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-spore-wall-full rotate: false - xy: 2157, 1688 + xy: 2361, 1916 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-steam-generator-full rotate: false - xy: 2571, 2532 + xy: 3895, 2783 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-stone-full rotate: false - xy: 2123, 1620 + xy: 2361, 1882 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-stone-wall-full rotate: false - xy: 2157, 1654 + xy: 2361, 1848 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-swarmer-full rotate: false - xy: 2461, 2330 + xy: 3824, 2726 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-tendrils-full rotate: false - xy: 2123, 1586 + xy: 2361, 1814 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3723,105 +3730,112 @@ block-tetrative-reconstructor-full index: -1 block-titanium-conveyor-full rotate: false - xy: 2157, 1620 + xy: 2361, 1780 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-0-0 rotate: false - xy: 2157, 1620 + xy: 2361, 1780 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 +block-tsunami-full + rotate: false + xy: 1644, 2839 + size: 96, 96 + orig: 96, 96 + offset: 0, 0 + index: -1 block-vault-full rotate: false - xy: 1899, 2937 + xy: 1742, 2839 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 block-water-extractor-full rotate: false - xy: 2461, 2264 + xy: 3890, 2717 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-wave-full rotate: false - xy: 2395, 2236 + xy: 3808, 2660 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 bryde-outline rotate: false - xy: 3121, 3217 + xy: 1663, 1124 size: 140, 140 orig: 140, 140 offset: 0, 0 index: -1 bryde-wreck0 rotate: false - xy: 3263, 3217 + xy: 1757, 982 size: 140, 140 orig: 140, 140 offset: 0, 0 index: -1 bryde-wreck1 rotate: false - xy: 3405, 3217 + xy: 1757, 840 size: 140, 140 orig: 140, 140 offset: 0, 0 index: -1 bryde-wreck2 rotate: false - xy: 3547, 3197 + xy: 2979, 3217 size: 140, 140 orig: 140, 140 offset: 0, 0 index: -1 command-center-team-crux rotate: false - xy: 2447, 2132 + xy: 3940, 2643 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 command-center-team-sharded rotate: false - xy: 2447, 2066 + xy: 4027, 2775 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 container-team-crux rotate: false - xy: 2348, 1906 + xy: 2185, 2301 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 container-team-sharded rotate: false - xy: 2348, 1840 + xy: 2251, 2301 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 core-foundation-team-crux rotate: false - xy: 1817, 1196 + xy: 2017, 368 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 core-foundation-team-sharded rotate: false - xy: 1883, 286 + xy: 2013, 238 size: 128, 128 orig: 128, 128 offset: 0, 0 @@ -3842,14 +3856,14 @@ core-nucleus-team-sharded index: -1 core-shard-team-crux rotate: false - xy: 2193, 2937 + xy: 1938, 2839 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 core-shard-team-sharded rotate: false - xy: 2291, 2937 + xy: 1840, 2741 size: 96, 96 orig: 96, 96 offset: 0, 0 @@ -3863,21 +3877,21 @@ corvus-foot index: -1 corvus-joint rotate: false - xy: 1507, 3121 + xy: 2147, 368 size: 60, 60 orig: 60, 60 offset: 0, 0 index: -1 corvus-joint-base rotate: false - xy: 1947, 1199 + xy: 3745, 2533 size: 70, 70 orig: 70, 70 offset: 0, 0 index: -1 toxopid-joint-base rotate: false - xy: 1947, 1199 + xy: 3745, 2533 size: 70, 70 orig: 70, 70 offset: 0, 0 @@ -3926,280 +3940,280 @@ corvus-wreck2 index: -1 cracks-1-0 rotate: false - xy: 2293, 1620 + xy: 2381, 540 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cracks-1-1 rotate: false - xy: 2259, 1552 + xy: 2381, 506 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cracks-1-2 rotate: false - xy: 2293, 1586 + xy: 2381, 472 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cracks-1-3 rotate: false - xy: 2259, 1518 + xy: 2381, 438 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cracks-1-4 rotate: false - xy: 2293, 1552 + xy: 2385, 404 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cracks-1-5 rotate: false - xy: 2259, 1484 + xy: 3587, 2421 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cracks-1-6 rotate: false - xy: 2293, 1518 + xy: 3587, 2387 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cracks-1-7 rotate: false - xy: 2293, 1484 + xy: 3085, 2261 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cracks-2-0 rotate: false - xy: 2414, 1906 + xy: 2383, 2301 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cracks-2-1 rotate: false - xy: 2414, 1840 + xy: 2449, 2301 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cracks-2-2 rotate: false - xy: 2527, 2330 + xy: 2515, 2301 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cracks-2-3 rotate: false - xy: 2527, 2264 + xy: 2581, 2301 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cracks-2-4 rotate: false - xy: 2527, 2198 + xy: 2647, 2311 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cracks-2-5 rotate: false - xy: 2513, 2132 + xy: 3521, 2389 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cracks-2-6 rotate: false - xy: 2513, 2066 + xy: 2713, 2315 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cracks-2-7 rotate: false - xy: 2480, 2000 + xy: 2779, 2315 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cracks-3-0 rotate: false - xy: 2389, 2937 + xy: 2036, 2839 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 cracks-3-1 rotate: false - xy: 2487, 2937 + xy: 1938, 2741 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 cracks-3-2 rotate: false - xy: 2585, 2937 + xy: 2134, 2839 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 cracks-3-3 rotate: false - xy: 1640, 2729 + xy: 2036, 2741 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 cracks-3-4 rotate: false - xy: 1825, 2839 + xy: 2232, 2839 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 cracks-3-5 rotate: false - xy: 1923, 2839 + xy: 2134, 2741 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 cracks-3-6 rotate: false - xy: 2021, 2839 + xy: 2330, 2839 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 cracks-3-7 rotate: false - xy: 2119, 2839 + xy: 2232, 2741 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 cracks-4-0 rotate: false - xy: 1883, 156 + xy: 2013, 108 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 cracks-4-1 rotate: false - xy: 1883, 26 + xy: 2973, 3087 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 cracks-4-2 rotate: false - xy: 1703, 3035 + xy: 3103, 3087 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 cracks-4-3 rotate: false - xy: 1833, 3035 + xy: 3523, 3209 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 cracks-4-4 rotate: false - xy: 1963, 3035 + xy: 3653, 3209 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 cracks-4-5 rotate: false - xy: 2093, 3035 + xy: 3783, 3209 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 cracks-4-6 rotate: false - xy: 2223, 3035 + xy: 3913, 3209 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 cracks-4-7 rotate: false - xy: 2353, 3035 + xy: 3523, 3079 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 cracks-5-0 rotate: false - xy: 1501, 1742 + xy: 1501, 1904 size: 160, 160 orig: 160, 160 offset: 0, 0 index: -1 cracks-5-1 rotate: false - xy: 1501, 1580 + xy: 1501, 1742 size: 160, 160 orig: 160, 160 offset: 0, 0 index: -1 cracks-5-2 rotate: false - xy: 1501, 1418 + xy: 1501, 1580 size: 160, 160 orig: 160, 160 offset: 0, 0 index: -1 cracks-5-3 rotate: false - xy: 1501, 1256 + xy: 1501, 1418 size: 160, 160 orig: 160, 160 offset: 0, 0 index: -1 cracks-5-4 rotate: false - xy: 1501, 1094 + xy: 1501, 1256 size: 160, 160 orig: 160, 160 offset: 0, 0 index: -1 cracks-5-5 rotate: false - xy: 1595, 932 + xy: 1501, 1094 size: 160, 160 orig: 160, 160 offset: 0, 0 index: -1 cracks-5-6 rotate: false - xy: 1585, 770 + xy: 1595, 932 size: 160, 160 orig: 160, 160 offset: 0, 0 index: -1 cracks-5-7 rotate: false - xy: 1563, 608 + xy: 1585, 770 size: 160, 160 orig: 160, 160 offset: 0, 0 @@ -4430,84 +4444,84 @@ cracks-9-7 index: -1 crawler-leg rotate: false - xy: 1604, 3007 + xy: 2165, 1346 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 crawler-outline rotate: false - xy: 1554, 2907 + xy: 2165, 1296 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 crawler-wreck0 rotate: false - xy: 1604, 2957 + xy: 2165, 1246 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 crawler-wreck1 rotate: false - xy: 1554, 2857 + xy: 2235, 2186 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 crawler-wreck2 rotate: false - xy: 1604, 2907 + xy: 2225, 2136 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 cyclone rotate: false - xy: 2217, 2839 + xy: 2428, 2839 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 dagger-leg rotate: false - xy: 2893, 2113 + xy: 2211, 1886 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 dagger-outline rotate: false - xy: 3941, 2523 + xy: 2211, 1836 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 dagger-wreck0 rotate: false - xy: 3991, 2523 + xy: 2211, 1786 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 dagger-wreck1 rotate: false - xy: 3941, 2473 + xy: 2211, 1736 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 dagger-wreck2 rotate: false - xy: 3991, 2473 + xy: 2211, 1686 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 duo rotate: false - xy: 2395, 1740 + xy: 3211, 2385 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -4542,182 +4556,189 @@ eclipse-wreck2 index: -1 eruption-outline rotate: false - xy: 3401, 2421 + xy: 2267, 372 size: 48, 56 orig: 48, 56 offset: 0, 0 index: -1 flamethrower-outline rotate: false - xy: 3469, 2364 + xy: 2273, 206 size: 48, 56 orig: 48, 56 offset: 0, 0 index: -1 flare-outline rotate: false - xy: 3551, 2437 + xy: 2211, 1528 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 flare-wreck0 rotate: false - xy: 3601, 2437 + xy: 2207, 1478 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 flare-wreck1 rotate: false - xy: 3651, 2439 + xy: 2285, 2186 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 flare-wreck2 rotate: false - xy: 3701, 2439 + xy: 2275, 2136 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 +foreshadow + rotate: false + xy: 3653, 3079 + size: 128, 128 + orig: 128, 128 + offset: 0, 0 + index: -1 fortress-leg rotate: false - xy: 91, 11 + xy: 3829, 2940 size: 80, 60 orig: 80, 60 offset: 0, 0 index: -1 fortress-outline rotate: false - xy: 1777, 1114 + xy: 2649, 3225 size: 100, 80 orig: 100, 80 offset: 0, 0 index: -1 fortress-wreck0 rotate: false - xy: 1879, 1114 + xy: 1440, 2672 size: 100, 80 orig: 100, 80 offset: 0, 0 index: -1 fortress-wreck1 rotate: false - xy: 3783, 2997 + xy: 1985, 26 size: 100, 80 orig: 100, 80 offset: 0, 0 index: -1 fortress-wreck2 rotate: false - xy: 3783, 2915 + xy: 2087, 26 size: 100, 80 orig: 100, 80 offset: 0, 0 index: -1 fuse rotate: false - xy: 3295, 2729 + xy: 1657, 2545 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 gamma-outline rotate: false - xy: 1981, 1129 + xy: 1817, 770 size: 68, 68 orig: 68, 68 offset: 0, 0 index: -1 gamma-wreck0 rotate: false - xy: 2208, 1994 + xy: 2617, 2377 size: 68, 68 orig: 68, 68 offset: 0, 0 index: -1 gamma-wreck1 rotate: false - xy: 2208, 1924 + xy: 1897, 2278 size: 68, 68 orig: 68, 68 offset: 0, 0 index: -1 gamma-wreck2 rotate: false - xy: 2208, 1854 + xy: 1967, 2278 size: 68, 68 orig: 68, 68 offset: 0, 0 index: -1 hail rotate: false - xy: 2327, 1638 + xy: 3245, 2391 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 heal-shotgun-weapon-outline rotate: false - xy: 2907, 2267 + xy: 2820, 2889 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 heal-weapon-mount-outline rotate: false - xy: 3569, 2387 + xy: 2261, 1986 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 heal-weapon-outline rotate: false - xy: 3619, 2387 + xy: 2261, 1936 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 horizon-outline rotate: false - xy: 1641, 48 + xy: 323, 2341 size: 72, 72 orig: 72, 72 offset: 0, 0 index: -1 horizon-wreck0 rotate: false - xy: 3753, 3123 + xy: 3993, 2841 size: 72, 72 orig: 72, 72 offset: 0, 0 index: -1 horizon-wreck1 rotate: false - xy: 323, 2341 + xy: 3734, 2682 size: 72, 72 orig: 72, 72 offset: 0, 0 index: -1 horizon-wreck2 rotate: false - xy: 1947, 1783 + xy: 3225, 2425 size: 72, 72 orig: 72, 72 offset: 0, 0 index: -1 item-blast-compound-large rotate: false - xy: 3753, 3081 + xy: 2273, 1236 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-blast-compound-medium rotate: false - xy: 2395, 1672 + xy: 3313, 2357 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -4731,28 +4752,28 @@ item-blast-compound-small index: -1 item-blast-compound-tiny rotate: false - xy: 2245, 2450 + xy: 3187, 2283 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-blast-compound-xlarge rotate: false - xy: 3669, 2389 + xy: 2261, 1886 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-coal-large rotate: false - xy: 245, 31 + xy: 758, 3251 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-coal-medium rotate: false - xy: 2327, 1570 + xy: 2325, 88 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -4766,567 +4787,567 @@ item-coal-small index: -1 item-coal-tiny rotate: false - xy: 1685, 3147 + xy: 1569, 3307 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-coal-xlarge rotate: false - xy: 3719, 2389 + xy: 2261, 1836 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-copper-large rotate: false - xy: 1992, 1863 + xy: 1016, 3073 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-copper-medium rotate: false - xy: 2395, 1638 + xy: 2325, 20 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-copper-small rotate: false - xy: 2289, 2273 + xy: 691, 1 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-copper-tiny rotate: false - xy: 2019, 1199 + xy: 1151, 2625 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-copper-xlarge rotate: false - xy: 3769, 2389 + xy: 2261, 1786 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-graphite-large rotate: false - xy: 2703, 2539 + xy: 983, 2601 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-graphite-medium rotate: false - xy: 2327, 1536 + xy: 2413, 1050 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-graphite-small rotate: false - xy: 719, 2331 + xy: 3347, 2399 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-graphite-tiny rotate: false - xy: 1569, 3307 + xy: 1169, 2625 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-graphite-xlarge rotate: false - xy: 3801, 2439 + xy: 2261, 1736 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-lead-large rotate: false - xy: 3026, 1739 + xy: 1440, 2630 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-lead-medium rotate: false - xy: 2395, 1604 + xy: 2413, 982 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-lead-small rotate: false - xy: 1601, 3415 + xy: 719, 2331 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-lead-tiny rotate: false - xy: 1685, 3129 + xy: 4079, 3061 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-lead-xlarge rotate: false - xy: 3819, 2389 + xy: 2261, 1686 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-metaglass-large rotate: false - xy: 758, 3209 + xy: 1063, 3215 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-metaglass-medium rotate: false - xy: 2327, 1502 + xy: 2413, 914 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-metaglass-small rotate: false - xy: 745, 2331 + xy: 1601, 3415 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-metaglass-tiny rotate: false - xy: 1685, 3111 + xy: 4079, 3043 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-metaglass-xlarge rotate: false - xy: 3519, 2337 + xy: 2261, 1636 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-phase-fabric-large rotate: false - xy: 758, 3167 + xy: 1554, 2957 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-phase-fabric-medium rotate: false - xy: 2395, 1570 + xy: 2413, 846 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-phase-fabric-small rotate: false - xy: 1601, 3389 + xy: 717, 1 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-phase-fabric-tiny rotate: false - xy: 1151, 2625 + xy: 4079, 3025 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-phase-fabric-xlarge rotate: false - xy: 3569, 2337 + xy: 2261, 1586 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-plastanium-large rotate: false - xy: 758, 3125 + xy: 2273, 114 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-plastanium-medium rotate: false - xy: 2361, 1502 + xy: 2405, 778 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-plastanium-small rotate: false - xy: 771, 2331 + xy: 3347, 2373 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-plastanium-tiny rotate: false - xy: 1169, 2625 + xy: 4079, 3007 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-plastanium-xlarge rotate: false - xy: 3619, 2337 + xy: 2261, 1536 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-pyratite-large rotate: false - xy: 1641, 6 + xy: 2273, 1194 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-pyratite-medium rotate: false - xy: 2429, 1570 + xy: 2415, 710 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-pyratite-small rotate: false - xy: 1601, 3363 + xy: 745, 2331 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-pyratite-tiny rotate: false - xy: 2037, 1199 + xy: 1187, 2625 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-pyratite-xlarge rotate: false - xy: 3669, 2339 + xy: 2335, 2193 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-sand-large rotate: false - xy: 1033, 2601 + xy: 2227, 850 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-sand-medium rotate: false - xy: 2429, 1536 + xy: 2415, 642 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-sand-small rotate: false - xy: 797, 2331 + xy: 1601, 3389 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-sand-tiny rotate: false - xy: 1187, 2625 + xy: 4079, 2989 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-sand-xlarge rotate: false - xy: 3719, 2339 + xy: 2385, 2193 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-scrap-large rotate: false - xy: 1075, 2601 + xy: 758, 3209 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-scrap-medium rotate: false - xy: 2327, 1468 + xy: 2415, 574 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-scrap-small rotate: false - xy: 1601, 3337 + xy: 743, 1 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-scrap-tiny rotate: false - xy: 4079, 2653 + xy: 2279, 752 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-scrap-xlarge rotate: false - xy: 3769, 2339 + xy: 2435, 2193 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-silicon-large rotate: false - xy: 1659, 3065 + xy: 1025, 2601 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-silicon-medium rotate: false - xy: 2395, 1468 + xy: 2415, 506 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-silicon-small rotate: false - xy: 823, 2331 + xy: 771, 2331 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-silicon-tiny rotate: false - xy: 4079, 2635 + xy: 3151, 2351 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-silicon-xlarge rotate: false - xy: 3819, 2339 + xy: 2485, 2193 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-spore-pod-large rotate: false - xy: 3026, 1697 + xy: 1482, 2630 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-spore-pod-medium rotate: false - xy: 2497, 1702 + xy: 2419, 404 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-spore-pod-small rotate: false - xy: 849, 2331 + xy: 1601, 3363 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-spore-pod-tiny rotate: false - xy: 4079, 2617 + xy: 693, 2603 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-spore-pod-xlarge rotate: false - xy: 2965, 2279 + xy: 2535, 2193 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-surge-alloy-large rotate: false - xy: 3068, 1739 + xy: 1596, 2957 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-surge-alloy-medium rotate: false - xy: 2531, 1702 + xy: 3177, 2335 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-surge-alloy-small rotate: false - xy: 3851, 2473 + xy: 797, 2331 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-surge-alloy-tiny rotate: false - xy: 4079, 2599 + xy: 2595, 3547 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-surge-alloy-xlarge rotate: false - xy: 2943, 2167 + xy: 3161, 2369 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-thorium-large rotate: false - xy: 3068, 1697 + xy: 2315, 1194 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-thorium-medium rotate: false - xy: 2497, 1668 + xy: 3211, 2317 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-thorium-small rotate: false - xy: 1601, 3311 + xy: 1601, 3337 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-thorium-tiny rotate: false - xy: 4079, 2581 + xy: 983, 2839 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-thorium-xlarge rotate: false - xy: 2943, 2117 + xy: 2215, 1428 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-titanium-large rotate: false - xy: 1659, 3023 + xy: 2227, 808 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-titanium-medium rotate: false - xy: 2463, 1600 + xy: 3279, 2323 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-titanium-small rotate: false - xy: 725, 2917 + xy: 823, 2331 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-titanium-tiny rotate: false - xy: 693, 2603 + xy: 1353, 3419 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-titanium-xlarge rotate: false - xy: 2957, 2217 + xy: 2215, 1378 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 lancer rotate: false - xy: 2612, 2000 + xy: 2013, 1750 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 large-artillery-outline rotate: false - xy: 2993, 2081 + xy: 2215, 1242 size: 48, 66 orig: 48, 66 offset: 0, 0 index: -1 large-bullet-mount-outline rotate: false - xy: 2243, 2064 + xy: 1969, 2348 size: 70, 97 orig: 70, 97 offset: 0, 0 index: -1 large-laser-mount-outline rotate: false - xy: 1657, 2535 + xy: 1853, 2449 size: 96, 192 orig: 96, 192 offset: 0, 0 index: -1 large-purple-mount-outline rotate: false - xy: 1992, 1905 + xy: 2113, 2348 size: 70, 97 orig: 70, 97 offset: 0, 0 index: -1 large-weapon-outline rotate: false - xy: 2993, 2031 + xy: 2257, 1478 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 liquid-cryofluid-large rotate: false - xy: 1654, 2981 + xy: 758, 3167 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 liquid-cryofluid-medium rotate: false - xy: 2463, 1566 + xy: 3279, 2289 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-cryofluid-small rotate: false - xy: 2495, 3781 + xy: 849, 2331 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -5340,28 +5361,28 @@ liquid-cryofluid-tiny index: -1 liquid-cryofluid-xlarge rotate: false - xy: 3219, 2333 + xy: 2265, 1428 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 liquid-oil-large rotate: false - xy: 1654, 2939 + xy: 1067, 2601 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 liquid-oil-medium rotate: false - xy: 2565, 1668 + xy: 3153, 2233 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-oil-small rotate: false - xy: 2595, 3539 + xy: 1601, 3311 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -5375,63 +5396,63 @@ liquid-oil-tiny index: -1 liquid-oil-xlarge rotate: false - xy: 3269, 2333 + xy: 2265, 1378 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 liquid-slag-large rotate: false - xy: 1654, 2897 + xy: 2227, 766 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 liquid-slag-medium rotate: false - xy: 2667, 1702 + xy: 3255, 2221 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-slag-small rotate: false - xy: 983, 2831 + xy: 725, 2917 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 liquid-slag-tiny rotate: false - xy: 3547, 3341 + xy: 1663, 1106 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 liquid-slag-xlarge rotate: false - xy: 3319, 2321 + xy: 2265, 1328 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 liquid-water-large rotate: false - xy: 1654, 2855 + xy: 758, 3125 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 liquid-water-medium rotate: false - xy: 2565, 1600 + xy: 3323, 2221 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-water-small rotate: false - xy: 1353, 3411 + xy: 2495, 3781 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -5445,196 +5466,196 @@ liquid-water-tiny index: -1 liquid-water-xlarge rotate: false - xy: 3369, 2321 + xy: 2265, 1278 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 mace-leg rotate: false - xy: 2546, 1736 + xy: 2033, 1354 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 mace-outline rotate: false - xy: 2612, 1736 + xy: 2033, 1288 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 mace-wreck0 rotate: false - xy: 2617, 2466 + xy: 2033, 1222 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 mace-wreck1 rotate: false - xy: 2617, 2400 + xy: 2025, 1156 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 mace-wreck2 rotate: false - xy: 2637, 2532 + xy: 2029, 1090 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 mass-driver rotate: false - xy: 2119, 2741 + xy: 2441, 2643 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 mega-outline rotate: false - xy: 3987, 2875 + xy: 3179, 2871 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 mega-wreck0 rotate: false - xy: 3885, 2773 + xy: 3077, 2769 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 mega-wreck1 rotate: false - xy: 3987, 2773 + xy: 3179, 2769 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 mega-wreck2 rotate: false - xy: 3783, 2711 + xy: 1542, 2853 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 meltdown rotate: false - xy: 2873, 2827 + xy: 1833, 3035 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 minke-outline rotate: false - xy: 2173, 2344 + xy: 3477, 2796 size: 88, 101 orig: 88, 101 offset: 0, 0 index: -1 minke-wreck0 rotate: false - xy: 2263, 2365 + xy: 3567, 2899 size: 88, 101 orig: 88, 101 offset: 0, 0 index: -1 minke-wreck1 rotate: false - xy: 2083, 2278 + xy: 3477, 2693 size: 88, 101 orig: 88, 101 offset: 0, 0 index: -1 minke-wreck2 rotate: false - xy: 1993, 2278 + xy: 3567, 2796 size: 88, 101 orig: 88, 101 offset: 0, 0 index: -1 missiles-mount-outline rotate: false - xy: 3519, 2287 + xy: 2311, 2036 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 mono-outline rotate: false - xy: 3669, 2289 + xy: 2311, 1886 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 mono-wreck0 rotate: false - xy: 3719, 2289 + xy: 2311, 1836 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 mono-wreck1 rotate: false - xy: 3769, 2289 + xy: 2311, 1786 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 mono-wreck2 rotate: false - xy: 3819, 2289 + xy: 2311, 1736 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 mount-purple-weapon-outline rotate: false - xy: 2876, 2013 + xy: 2311, 1636 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 mount-weapon-outline rotate: false - xy: 2876, 1913 + xy: 2311, 1536 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 nova-leg rotate: false - xy: 2876, 1813 + xy: 2425, 2143 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 nova-outline rotate: false - xy: 1627, 3107 + xy: 1063, 3257 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 nova-wreck0 rotate: false - xy: 3590, 2487 + xy: 2358, 2243 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 nova-wreck1 rotate: false - xy: 3648, 2489 + xy: 2416, 2243 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 nova-wreck2 rotate: false - xy: 3706, 2489 + xy: 2474, 2243 size: 56, 56 orig: 56, 56 offset: 0, 0 @@ -5704,70 +5725,70 @@ omura-wreck2 index: -1 parallax rotate: false - xy: 2645, 2132 + xy: 2095, 958 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 poly-outline rotate: false - xy: 3825, 2499 + xy: 1623, 3107 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 poly-wreck0 rotate: false - xy: 3883, 2477 + xy: 2149, 1504 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 poly-wreck1 rotate: false - xy: 2791, 2375 + xy: 2149, 1446 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 poly-wreck2 rotate: false - xy: 2791, 2317 + xy: 1565, 3049 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 pulsar-leg rotate: false - xy: 2744, 1806 + xy: 2845, 2199 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 pulsar-outline rotate: false - xy: 2278, 2004 + xy: 2037, 2288 size: 68, 58 orig: 68, 58 offset: 0, 0 index: -1 pulsar-wreck0 rotate: false - xy: 2278, 1944 + xy: 2107, 2288 size: 68, 58 orig: 68, 58 offset: 0, 0 index: -1 pulsar-wreck1 rotate: false - xy: 2278, 1884 + xy: 1801, 2235 size: 68, 58 orig: 68, 58 offset: 0, 0 index: -1 pulsar-wreck2 rotate: false - xy: 2278, 1824 + xy: 2687, 2387 size: 68, 58 orig: 68, 58 offset: 0, 0 @@ -5802,42 +5823,42 @@ quad-wreck2 index: -1 quasar-leg rotate: false - xy: 2161, 2180 + xy: 1307, 12 size: 80, 80 orig: 80, 80 offset: 0, 0 index: -1 quasar-outline rotate: false - xy: 1915, 2103 + xy: 3519, 2529 size: 80, 80 orig: 80, 80 offset: 0, 0 index: -1 quasar-wreck0 rotate: false - xy: 1997, 2114 + xy: 3997, 2997 size: 80, 80 orig: 80, 80 offset: 0, 0 index: -1 quasar-wreck1 rotate: false - xy: 2079, 2114 + xy: 3993, 2915 size: 80, 80 orig: 80, 80 offset: 0, 0 index: -1 quasar-wreck2 rotate: false - xy: 1910, 2021 + xy: 3829, 2858 size: 80, 80 orig: 80, 80 offset: 0, 0 index: -1 reign-leg rotate: false - xy: 1663, 1342 + xy: 1663, 1534 size: 152, 124 orig: 152, 124 offset: 0, 0 @@ -5851,7 +5872,7 @@ reign-outline index: -1 reign-weapon-outline rotate: false - xy: 1825, 1855 + xy: 3657, 2759 size: 83, 138 orig: 83, 138 offset: 0, 0 @@ -5879,70 +5900,70 @@ reign-wreck2 index: -1 repair-point rotate: false - xy: 2021, 1455 + xy: 3493, 2269 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ripple rotate: false - xy: 1755, 2545 + xy: 2735, 2451 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 risso-outline rotate: false - xy: 2064, 1954 + xy: 2257, 2367 size: 70, 78 orig: 70, 78 offset: 0, 0 index: -1 risso-wreck0 rotate: false - xy: 2136, 2018 + xy: 2329, 2367 size: 70, 78 orig: 70, 78 offset: 0, 0 index: -1 risso-wreck1 rotate: false - xy: 2136, 1938 + xy: 2401, 2367 size: 70, 78 orig: 70, 78 offset: 0, 0 index: -1 risso-wreck2 rotate: false - xy: 2064, 1874 + xy: 2473, 2367 size: 70, 78 orig: 70, 78 offset: 0, 0 index: -1 salvo rotate: false - xy: 2810, 1872 + xy: 2079, 1750 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 scatter rotate: false - xy: 2769, 2565 + xy: 2079, 1618 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 scepter-leg rotate: false - xy: 3523, 2937 + xy: 2483, 3035 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 vela-leg rotate: false - xy: 3523, 2937 + xy: 2483, 3035 size: 128, 128 orig: 128, 128 offset: 0, 0 @@ -5956,7 +5977,7 @@ scepter-outline index: -1 scepter-weapon-outline rotate: false - xy: 2849, 2271 + xy: 2977, 2199 size: 56, 102 orig: 56, 102 offset: 0, 0 @@ -5984,21 +6005,21 @@ scepter-wreck2 index: -1 scorch rotate: false - xy: 2019, 1251 + xy: 3459, 2167 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 segment rotate: false - xy: 3099, 2565 + xy: 2099, 1288 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 sei-launcher-outline rotate: false - xy: 1910, 1857 + xy: 3747, 2838 size: 80, 80 orig: 80, 80 offset: 0, 0 @@ -6033,175 +6054,175 @@ sei-wreck2 index: -1 small-basic-weapon-outline rotate: false - xy: 2926, 1967 + xy: 2307, 1486 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 small-mount-weapon-outline rotate: false - xy: 2926, 1867 + xy: 2315, 1386 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 spectre rotate: false - xy: 3523, 2807 + xy: 2743, 3071 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 spiroct-foot rotate: false - xy: 2805, 2827 + xy: 1609, 2425 size: 46, 46 orig: 46, 46 offset: 0, 0 index: -1 spiroct-joint rotate: false - xy: 2395, 1434 + xy: 3527, 2219 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 spiroct-leg rotate: false - xy: 983, 2607 + xy: 3323, 2609 size: 48, 34 orig: 48, 34 offset: 0, 0 index: -1 spiroct-leg-base rotate: false - xy: 3967, 3585 + xy: 4043, 3079 size: 48, 34 orig: 48, 34 offset: 0, 0 index: -1 spiroct-outline rotate: false - xy: 2343, 2566 + xy: 1801, 2295 size: 94, 75 orig: 94, 75 offset: 0, 0 index: -1 spiroct-weapon-outline rotate: false - xy: 2976, 1865 + xy: 2365, 1370 size: 48, 56 orig: 48, 56 offset: 0, 0 index: -1 spiroct-wreck0 rotate: false - xy: 2245, 2468 + xy: 3523, 3002 size: 94, 75 orig: 94, 75 offset: 0, 0 index: -1 spiroct-wreck1 rotate: false - xy: 2537, 2664 + xy: 3619, 3002 size: 94, 75 orig: 94, 75 offset: 0, 0 index: -1 spiroct-wreck2 rotate: false - xy: 1801, 2370 + xy: 3715, 3002 size: 94, 75 orig: 94, 75 offset: 0, 0 index: -1 splash-0 rotate: false - xy: 2429, 1434 + xy: 3527, 2185 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-1 rotate: false - xy: 2463, 1430 + xy: 3527, 2151 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-10 rotate: false - xy: 2089, 1432 + xy: 3595, 2183 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-11 rotate: false - xy: 2053, 1398 + xy: 3595, 2149 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-2 rotate: false - xy: 2497, 1430 + xy: 3561, 2285 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-3 rotate: false - xy: 2531, 1430 + xy: 3561, 2251 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-4 rotate: false - xy: 2565, 1430 + xy: 3561, 2217 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-5 rotate: false - xy: 2599, 1430 + xy: 3561, 2183 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-6 rotate: false - xy: 2633, 1430 + xy: 3561, 2149 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-7 rotate: false - xy: 2667, 1430 + xy: 3595, 2285 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-8 rotate: false - xy: 2701, 1430 + xy: 3595, 2251 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-9 rotate: false - xy: 2055, 1432 + xy: 3595, 2217 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 swarmer rotate: false - xy: 3013, 2499 + xy: 2089, 2090 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -6236,35 +6257,42 @@ toxopid-leg-base index: -1 toxopid-outline rotate: false - xy: 1721, 224 + xy: 1725, 386 size: 160, 190 orig: 160, 190 offset: 0, 0 index: -1 toxopid-wreck0 rotate: false - xy: 1721, 32 + xy: 1721, 194 size: 160, 190 orig: 160, 190 offset: 0, 0 index: -1 toxopid-wreck1 rotate: false - xy: 1541, 2230 + xy: 1721, 2 size: 160, 190 orig: 160, 190 offset: 0, 0 index: -1 toxopid-wreck2 rotate: false - xy: 1663, 2038 + xy: 1541, 2230 size: 160, 190 orig: 160, 190 offset: 0, 0 index: -1 +tsunami + rotate: false + xy: 3127, 2475 + size: 96, 96 + orig: 96, 96 + offset: 0, 0 + index: -1 unit-alpha-full rotate: false - xy: 2976, 1815 + xy: 2365, 1320 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -6278,28 +6306,28 @@ unit-antumbra-full index: -1 unit-arkyid-full rotate: false - xy: 3653, 2807 + xy: 2873, 2957 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 unit-atrax-full rotate: false - xy: 1801, 2238 + xy: 181, 7 size: 88, 64 orig: 88, 64 offset: 0, 0 index: -1 unit-beta-full rotate: false - xy: 2907, 2377 + xy: 3035, 2353 size: 56, 54 orig: 56, 54 offset: 0, 0 index: -1 unit-bryde-full rotate: false - xy: 3689, 3197 + xy: 3121, 3217 size: 140, 140 orig: 140, 140 offset: 0, 0 @@ -6313,14 +6341,14 @@ unit-corvus-full index: -1 unit-crawler-full rotate: false - xy: 2976, 1765 + xy: 2365, 1270 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 unit-dagger-full rotate: false - xy: 2876, 1713 + xy: 2315, 1236 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -6334,63 +6362,63 @@ unit-eclipse-full index: -1 unit-flare-full rotate: false - xy: 2926, 1717 + xy: 2365, 1220 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 unit-fortress-full rotate: false - xy: 3885, 2691 + xy: 1542, 2771 size: 100, 80 orig: 100, 80 offset: 0, 0 index: -1 unit-gamma-full rotate: false - xy: 2441, 2594 + xy: 2757, 2381 size: 68, 68 orig: 68, 68 offset: 0, 0 index: -1 unit-horizon-full rotate: false - xy: 1947, 1487 + xy: 3521, 2455 size: 72, 72 orig: 72, 72 offset: 0, 0 index: -1 unit-mace-full rotate: false - xy: 3145, 2499 + xy: 2145, 2024 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 unit-mega-full rotate: false - xy: 3987, 2671 + xy: 1542, 2669 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 unit-minke-full rotate: false - xy: 1825, 2135 + xy: 3657, 2899 size: 88, 101 orig: 88, 101 offset: 0, 0 index: -1 unit-mono-full rotate: false - xy: 2976, 1715 + xy: 2227, 1142 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 unit-nova-full rotate: false - xy: 2849, 2213 + xy: 3035, 2295 size: 56, 56 orig: 56, 56 offset: 0, 0 @@ -6411,14 +6439,14 @@ unit-omura-full index: -1 unit-poly-full rotate: false - xy: 2907, 2319 + xy: 3093, 2351 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 unit-pulsar-full rotate: false - xy: 2511, 2604 + xy: 1825, 2175 size: 68, 58 orig: 68, 58 offset: 0, 0 @@ -6432,7 +6460,7 @@ unit-quad-full index: -1 unit-quasar-full rotate: false - xy: 2161, 2098 + xy: 3742, 2756 size: 80, 80 orig: 80, 80 offset: 0, 0 @@ -6446,7 +6474,7 @@ unit-reign-full index: -1 unit-risso-full rotate: false - xy: 2136, 1858 + xy: 2545, 2367 size: 70, 78 orig: 70, 78 offset: 0, 0 @@ -6467,14 +6495,14 @@ unit-sei-full index: -1 unit-spiroct-full rotate: false - xy: 1897, 2370 + xy: 3811, 3002 size: 94, 75 orig: 94, 75 offset: 0, 0 index: -1 unit-toxopid-full rotate: false - xy: 1663, 1846 + xy: 1663, 2038 size: 160, 190 orig: 160, 190 offset: 0, 0 @@ -6495,14 +6523,14 @@ unit-zenith-full index: -1 vault-team-crux rotate: false - xy: 2245, 2545 + xy: 1703, 2349 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 vault-team-sharded rotate: false - xy: 2147, 2447 + xy: 1703, 2251 size: 96, 96 orig: 96, 96 offset: 0, 0 @@ -6537,189 +6565,189 @@ vela-wreck2 index: -1 wave rotate: false - xy: 3211, 2433 + xy: 2145, 1694 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 zenith-missiles-outline rotate: false - xy: 3026, 1781 + xy: 2227, 892 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 zenith-outline rotate: false - xy: 1663, 1102 + xy: 3003, 2973 size: 112, 112 orig: 112, 112 offset: 0, 0 index: -1 zenith-wreck0 rotate: false - xy: 1527, 8 + xy: 3117, 2973 size: 112, 112 orig: 112, 112 offset: 0, 0 index: -1 zenith-wreck1 rotate: false - xy: 1440, 2955 + xy: 1527, 8 size: 112, 112 orig: 112, 112 offset: 0, 0 index: -1 zenith-wreck2 rotate: false - xy: 1440, 2841 + xy: 1440, 2955 size: 112, 112 orig: 112, 112 offset: 0, 0 index: -1 item-blast-compound rotate: false - xy: 2361, 1638 + xy: 3279, 2357 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-coal rotate: false - xy: 2429, 1706 + xy: 2315, 122 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-copper rotate: false - xy: 2361, 1604 + xy: 2325, 54 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-graphite rotate: false - xy: 2429, 1672 + xy: 2590, 2217 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-lead rotate: false - xy: 2361, 1570 + xy: 2413, 1016 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-metaglass rotate: false - xy: 2429, 1638 + xy: 2413, 948 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-phase-fabric rotate: false - xy: 2361, 1536 + xy: 2413, 880 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-plastanium rotate: false - xy: 2429, 1604 + xy: 2405, 812 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-pyratite rotate: false - xy: 2395, 1536 + xy: 2405, 744 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-sand rotate: false - xy: 2395, 1502 + xy: 2415, 676 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-scrap rotate: false - xy: 2429, 1502 + xy: 2415, 608 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-silicon rotate: false - xy: 2361, 1468 + xy: 2415, 540 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-spore-pod rotate: false - xy: 2463, 1702 + xy: 2415, 438 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-surge-alloy rotate: false - xy: 2463, 1668 + xy: 3143, 2317 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-thorium rotate: false - xy: 2463, 1634 + xy: 3177, 2301 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-titanium rotate: false - xy: 2565, 1702 + xy: 3245, 2323 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-cryofluid rotate: false - xy: 2599, 1702 + xy: 3245, 2289 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-oil rotate: false - xy: 2531, 1634 + xy: 3153, 2267 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-slag rotate: false - xy: 2599, 1668 + xy: 3255, 2255 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-water rotate: false - xy: 2531, 1566 + xy: 3323, 2255 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 blank rotate: false - xy: 1947, 1196 + xy: 3734, 2756 size: 1, 1 orig: 1, 1 offset: 0, 0 @@ -6733,21 +6761,21 @@ circle index: -1 shape-3 rotate: false - xy: 3409, 2480 + xy: 2235, 2236 size: 63, 63 orig: 63, 63 offset: 0, 0 index: -1 alpha rotate: false - xy: 1063, 3211 + xy: 781, 43 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 alpha-cell rotate: false - xy: 2965, 2329 + xy: 1559, 2423 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -6789,7 +6817,7 @@ atrax index: -1 atrax-base rotate: false - xy: 2805, 2875 + xy: 1825, 2109 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -6803,28 +6831,28 @@ atrax-cell index: -1 beta rotate: false - xy: 3825, 2557 + xy: 1507, 3127 size: 56, 54 orig: 56, 54 offset: 0, 0 index: -1 beta-cell rotate: false - xy: 3219, 2383 + xy: 3093, 2301 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 bryde rotate: false - xy: 3945, 3881 + xy: 1663, 1266 size: 140, 140 orig: 140, 140 offset: 0, 0 index: -1 bryde-cell rotate: false - xy: 2979, 3217 + xy: 3945, 3881 size: 140, 140 orig: 140, 140 offset: 0, 0 @@ -6838,7 +6866,7 @@ corvus index: -1 corvus-base rotate: false - xy: 1663, 1720 + xy: 1663, 1912 size: 152, 124 orig: 152, 124 offset: 0, 0 @@ -6859,35 +6887,35 @@ corvus-weapon-heat index: -1 crawler rotate: false - xy: 1609, 3057 + xy: 3817, 2560 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 crawler-base rotate: false - xy: 1554, 3007 + xy: 3817, 2510 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 crawler-cell rotate: false - xy: 1554, 2957 + xy: 2165, 1396 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 dagger rotate: false - xy: 3369, 2371 + xy: 2211, 1986 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 dagger-base rotate: false - xy: 2893, 2163 + xy: 2211, 1936 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -6908,140 +6936,140 @@ eclipse-cell index: -1 flare rotate: false - xy: 3501, 2437 + xy: 2273, 156 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 fortress rotate: false - xy: 2649, 3225 + xy: 1883, 26 size: 100, 80 orig: 100, 80 offset: 0, 0 index: -1 fortress-base rotate: false - xy: 2593, 2264 + xy: 2013, 2014 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 fortress-cell rotate: false - xy: 1225, 12 + xy: 1817, 1436 size: 100, 80 orig: 100, 80 offset: 0, 0 index: -1 gamma rotate: false - xy: 1327, 24 + xy: 1747, 770 size: 68, 68 orig: 68, 68 offset: 0, 0 index: -1 gamma-cell rotate: false - xy: 3532, 2487 + xy: 1507, 3069 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 horizon rotate: false - xy: 2633, 2667 + xy: 323, 2415 size: 72, 72 orig: 72, 72 offset: 0, 0 index: -1 horizon-cell rotate: false - xy: 323, 2415 + xy: 1641, 48 size: 72, 72 orig: 72, 72 offset: 0, 0 index: -1 mace rotate: false - xy: 2348, 1774 + xy: 2023, 2080 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 mace-base rotate: false - xy: 2414, 1774 + xy: 2017, 1486 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 mace-cell rotate: false - xy: 2480, 1736 + xy: 2017, 1420 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 mega rotate: false - xy: 3885, 2875 + xy: 2975, 2855 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 mega-cell rotate: false - xy: 3987, 2977 + xy: 3077, 2871 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 minke rotate: false - xy: 1891, 2267 + xy: 3477, 2899 size: 88, 101 orig: 88, 101 offset: 0, 0 index: -1 minke-cell rotate: false - xy: 3133, 2827 + xy: 2093, 3035 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 mono rotate: false - xy: 3569, 2287 + xy: 2311, 1986 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 mono-cell rotate: false - xy: 3619, 2287 + xy: 2311, 1936 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 nova rotate: false - xy: 3343, 2421 + xy: 2300, 2243 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 nova-base rotate: false - xy: 2876, 1863 + xy: 2375, 2143 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 nova-cell rotate: false - xy: 1569, 3107 + xy: 2209, 372 size: 56, 56 orig: 56, 56 offset: 0, 0 @@ -7083,21 +7111,21 @@ omura-cell index: -1 poly rotate: false - xy: 3764, 2489 + xy: 2532, 2243 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 poly-cell rotate: false - xy: 3883, 2535 + xy: 1565, 3107 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 power-cell rotate: false - xy: 2849, 2375 + xy: 1623, 3049 size: 56, 56 orig: 56, 56 offset: 0, 0 @@ -7111,7 +7139,7 @@ pulsar index: -1 pulsar-base rotate: false - xy: 2876, 1763 + xy: 2475, 2143 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -7139,21 +7167,21 @@ quad-cell index: -1 quasar rotate: false - xy: 1915, 2185 + xy: 3652, 2677 size: 80, 80 orig: 80, 80 offset: 0, 0 index: -1 quasar-base rotate: false - xy: 1997, 2196 + xy: 3911, 2931 size: 80, 80 orig: 80, 80 offset: 0, 0 index: -1 quasar-cell rotate: false - xy: 2079, 2196 + xy: 1225, 12 size: 80, 80 orig: 80, 80 offset: 0, 0 @@ -7167,28 +7195,28 @@ reign index: -1 reign-base rotate: false - xy: 1663, 1594 + xy: 1663, 1786 size: 152, 124 orig: 152, 124 offset: 0, 0 index: -1 reign-cell rotate: false - xy: 1663, 1468 + xy: 1663, 1660 size: 152, 124 orig: 152, 124 offset: 0, 0 index: -1 risso rotate: false - xy: 2064, 2034 + xy: 2185, 2367 size: 70, 78 orig: 70, 78 offset: 0, 0 index: -1 risso-cell rotate: false - xy: 1755, 2447 + xy: 2833, 2561 size: 96, 96 orig: 96, 96 offset: 0, 0 @@ -7202,21 +7230,21 @@ scepter index: -1 scepter-base rotate: false - xy: 3263, 2827 + xy: 2223, 3035 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 vela-base rotate: false - xy: 3263, 2827 + xy: 2223, 3035 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 scepter-cell rotate: false - xy: 3393, 2937 + xy: 2353, 3035 size: 128, 128 orig: 128, 128 offset: 0, 0 @@ -7237,21 +7265,21 @@ sei-cell index: -1 spiroct rotate: false - xy: 3687, 2730 + xy: 3427, 3022 size: 94, 75 orig: 94, 75 offset: 0, 0 index: -1 spiroct-cell rotate: false - xy: 2441, 2664 + xy: 1801, 2372 size: 94, 75 orig: 94, 75 offset: 0, 0 index: -1 toxopid rotate: false - xy: 1725, 416 + xy: 1725, 578 size: 160, 190 orig: 160, 190 offset: 0, 0 @@ -7265,21 +7293,21 @@ toxopid-cannon index: -1 toxopid-cell rotate: false - xy: 1663, 1216 + xy: 1663, 1408 size: 152, 124 orig: 152, 124 offset: 0, 0 index: -1 vanguard rotate: false - xy: 3026, 1981 + xy: 2227, 1092 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 vanguard-cell rotate: false - xy: 3026, 1931 + xy: 2227, 1042 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -7307,126 +7335,126 @@ vela-weapon-heat index: -1 artillery rotate: false - xy: 2647, 2609 + xy: 4043, 3173 size: 48, 56 orig: 48, 56 offset: 0, 0 index: -1 artillery-mount rotate: false - xy: 1947, 1343 + xy: 3673, 2533 size: 70, 70 orig: 70, 70 offset: 0, 0 index: -1 beam-weapon rotate: false - xy: 691, 11 + xy: 3747, 2920 size: 80, 80 orig: 80, 80 offset: 0, 0 index: -1 eruption rotate: false - xy: 4041, 2465 + xy: 2211, 1578 size: 48, 56 orig: 48, 56 offset: 0, 0 index: -1 flakgun rotate: false - xy: 3419, 2371 + xy: 2273, 322 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 flamethrower rotate: false - xy: 3451, 2422 + xy: 2273, 264 size: 48, 56 orig: 48, 56 offset: 0, 0 index: -1 heal-shotgun-weapon rotate: false - xy: 1507, 3069 + xy: 1251, 1121 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 heal-weapon rotate: false - xy: 3751, 2439 + xy: 2271, 2086 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 heal-weapon-mount rotate: false - xy: 3519, 2387 + xy: 2261, 2036 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 large-artillery rotate: false - xy: 2993, 2149 + xy: 2215, 1310 size: 48, 66 orig: 48, 66 offset: 0, 0 index: -1 large-bullet-mount rotate: false - xy: 2243, 2163 + xy: 1897, 2348 size: 70, 97 orig: 70, 97 offset: 0, 0 index: -1 large-laser-mount rotate: false - xy: 3589, 2613 + xy: 1755, 2449 size: 96, 192 orig: 96, 192 offset: 0, 0 index: -1 large-purple-mount rotate: false - xy: 1992, 2004 + xy: 2041, 2348 size: 70, 97 orig: 70, 97 offset: 0, 0 index: -1 large-weapon rotate: false - xy: 2943, 2067 + xy: 2223, 1192 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 missiles rotate: false - xy: 3419, 2321 + xy: 2325, 2136 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 missiles-mount rotate: false - xy: 3469, 2314 + xy: 2321, 2086 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 mount-purple-weapon rotate: false - xy: 2876, 2063 + xy: 2311, 1686 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 mount-weapon rotate: false - xy: 2876, 1963 + xy: 2311, 1586 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -7447,63 +7475,63 @@ omura-cannon-heat index: -1 reign-weapon rotate: false - xy: 1825, 1995 + xy: 3567, 2656 size: 83, 138 orig: 83, 138 offset: 0, 0 index: -1 scepter-weapon rotate: false - xy: 2791, 2213 + xy: 2977, 2303 size: 56, 102 orig: 56, 102 offset: 0, 0 index: -1 sei-launcher rotate: false - xy: 1910, 1939 + xy: 3911, 2849 size: 80, 80 orig: 80, 80 offset: 0, 0 index: -1 small-basic-weapon rotate: false - xy: 2926, 2017 + xy: 2525, 2143 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 small-mount-weapon rotate: false - xy: 2926, 1917 + xy: 2315, 1436 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 small-weapon rotate: false - xy: 2926, 1817 + xy: 2315, 1336 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 spiroct-weapon rotate: false - xy: 2976, 1923 + xy: 2365, 1428 size: 48, 56 orig: 48, 56 offset: 0, 0 index: -1 weapon rotate: false - xy: 3026, 1881 + xy: 2227, 992 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 zenith-missiles rotate: false - xy: 3026, 1831 + xy: 2227, 942 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -9278,2233 +9306,2247 @@ filter: nearest,nearest repeat: none additive-reconstructor-icon-editor rotate: false - xy: 2167, 405 + xy: 2297, 397 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 air-factory-icon-editor rotate: false - xy: 2265, 405 + xy: 2395, 397 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 alloy-smelter-icon-editor rotate: false - xy: 2363, 405 + xy: 2493, 397 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 arc-icon-editor rotate: false - xy: 305, 17 + xy: 4061, 461 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-icon-editor rotate: false - xy: 339, 17 + xy: 205, 9 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 basalt-icon-editor rotate: false - xy: 373, 17 + xy: 4061, 427 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-basalt1 rotate: false - xy: 373, 17 + xy: 4061, 427 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 battery-icon-editor rotate: false - xy: 407, 17 + xy: 239, 9 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 battery-large-icon-editor rotate: false - xy: 2461, 405 + xy: 2591, 397 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 blast-drill-icon-editor rotate: false - xy: 163, 51 + xy: 163, 43 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 blast-mixer-icon-editor rotate: false - xy: 4029, 437 + xy: 1749, 299 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-border-editor rotate: false - xy: 441, 17 + xy: 273, 9 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-forge-icon-editor rotate: false - xy: 2559, 405 + xy: 2689, 397 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 block-loader-icon-editor rotate: false - xy: 2657, 405 + xy: 2787, 397 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 block-unloader-icon-editor rotate: false - xy: 2755, 405 + xy: 2885, 397 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 boulder-icon-editor rotate: false - xy: 3817, 355 + xy: 1423, 185 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 bridge-conduit-icon-editor rotate: false - xy: 475, 17 + xy: 307, 9 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conveyor-icon-editor rotate: false - xy: 509, 17 + xy: 341, 9 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 char-icon-editor rotate: false - xy: 553, 49 + xy: 375, 9 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-char1 rotate: false - xy: 553, 49 + xy: 375, 9 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 clear-editor rotate: false - xy: 645, 210 + xy: 645, 202 size: 1, 1 orig: 1, 1 offset: 0, 0 index: -1 cliff-icon-editor rotate: false - xy: 587, 49 + xy: 409, 9 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 coal-centrifuge-icon-editor rotate: false - xy: 1553, 307 + xy: 1815, 299 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 combustion-generator-icon-editor rotate: false - xy: 651, 81 + xy: 443, 9 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 command-center-icon-editor rotate: false - xy: 1619, 307 + xy: 1881, 299 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 conduit-icon-editor rotate: false - xy: 685, 81 + xy: 477, 9 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 container-icon-editor rotate: false - xy: 1685, 307 + xy: 1947, 299 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 conveyor-icon-editor rotate: false - xy: 719, 81 + xy: 511, 9 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 copper-wall-icon-editor rotate: false - xy: 753, 81 + xy: 1423, 151 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 copper-wall-large-icon-editor rotate: false - xy: 1751, 307 + xy: 2013, 299 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 core-foundation-icon-editor rotate: false - xy: 1517, 373 + xy: 1517, 365 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 core-nucleus-icon-editor rotate: false - xy: 1, 19 + xy: 1, 11 size: 160, 160 orig: 160, 160 offset: 0, 0 index: -1 core-shard-icon-editor rotate: false - xy: 2853, 405 + xy: 2983, 397 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 craters-icon-editor rotate: false - xy: 787, 81 + xy: 1457, 151 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-craters1 rotate: false - xy: 787, 81 + xy: 1457, 151 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -cryofluidmixer-icon-editor +cryofluid-mixer-icon-editor rotate: false - xy: 1817, 307 + xy: 2079, 299 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cultivator-icon-editor rotate: false - xy: 1883, 307 + xy: 2145, 299 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cyclone-icon-editor rotate: false - xy: 2951, 405 + xy: 3081, 397 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 dacite-boulder-icon-editor rotate: false - xy: 3867, 355 + xy: 1473, 185 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 dacite-icon-editor rotate: false - xy: 821, 81 + xy: 1491, 151 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-dacite1 rotate: false - xy: 821, 81 + xy: 1491, 151 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 dacite-wall-icon-editor rotate: false - xy: 855, 81 + xy: 1337, 135 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 dark-metal-icon-editor rotate: false - xy: 889, 81 + xy: 1371, 135 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 dark-panel-1-icon-editor rotate: false - xy: 1141, 79 + xy: 2277, 297 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-dark-panel-1 rotate: false - xy: 1141, 79 + xy: 2277, 297 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 dark-panel-2-icon-editor rotate: false - xy: 1175, 79 + xy: 2311, 297 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-dark-panel-2 rotate: false - xy: 1175, 79 + xy: 2311, 297 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 dark-panel-3-icon-editor rotate: false - xy: 1209, 79 + xy: 2345, 297 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-dark-panel-3 rotate: false - xy: 1209, 79 + xy: 2345, 297 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 dark-panel-4-icon-editor rotate: false - xy: 1243, 79 + xy: 2379, 297 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-dark-panel-4 rotate: false - xy: 1243, 79 + xy: 2379, 297 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 dark-panel-5-icon-editor rotate: false - xy: 1277, 79 + xy: 2413, 297 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-dark-panel-5 rotate: false - xy: 1277, 79 + xy: 2413, 297 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 dark-panel-6-icon-editor rotate: false - xy: 4029, 403 + xy: 2447, 297 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-dark-panel-6 rotate: false - xy: 4029, 403 + xy: 2447, 297 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 darksand-icon-editor rotate: false - xy: 4063, 403 + xy: 2481, 297 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-darksand1 rotate: false - xy: 4063, 403 + xy: 2481, 297 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 darksand-tainted-water-icon-editor rotate: false - xy: 1357, 209 + xy: 2515, 297 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 darksand-water-icon-editor rotate: false - xy: 1391, 209 + xy: 2549, 297 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 deepwater-icon-editor rotate: false - xy: 1425, 209 + xy: 2583, 297 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-deepwater rotate: false - xy: 1425, 209 + xy: 2583, 297 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 differential-generator-icon-editor rotate: false - xy: 3049, 405 + xy: 3179, 397 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 diode-icon-editor rotate: false - xy: 1459, 209 + xy: 2617, 297 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 dirt-icon-editor rotate: false - xy: 1493, 209 + xy: 2651, 297 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-dirt1 rotate: false - xy: 1493, 209 + xy: 2651, 297 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 dirt-wall-icon-editor rotate: false - xy: 1311, 79 + xy: 2685, 297 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 disassembler-icon-editor rotate: false - xy: 3147, 405 + xy: 3277, 397 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 distributor-icon-editor rotate: false - xy: 1949, 307 + xy: 2211, 299 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 door-icon-editor rotate: false - xy: 543, 15 + xy: 2719, 297 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 door-large-icon-editor rotate: false - xy: 2015, 307 + xy: 2297, 331 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 dune-wall-icon-editor rotate: false - xy: 577, 15 + xy: 2753, 297 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 duo-icon-editor rotate: false - xy: 4017, 369 + xy: 2787, 297 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-basalt2 rotate: false - xy: 4051, 369 + xy: 2821, 297 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-basalt3 rotate: false - xy: 3817, 321 + xy: 2855, 297 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-char2 rotate: false - xy: 3851, 321 + xy: 2889, 297 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-char3 rotate: false - xy: 3885, 321 + xy: 2923, 297 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-craters2 rotate: false - xy: 3919, 321 + xy: 2957, 297 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-craters3 rotate: false - xy: 3953, 321 + xy: 2991, 297 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-dacite2 rotate: false - xy: 3987, 321 + xy: 3025, 297 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-dacite3 rotate: false - xy: 4021, 335 + xy: 3059, 297 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-darksand-tainted-water1 rotate: false - xy: 1337, 141 + xy: 3161, 297 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-darksand-tainted-water2 rotate: false - xy: 1371, 175 + xy: 3195, 297 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-darksand-tainted-water3 rotate: false - xy: 1371, 141 + xy: 3229, 297 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-darksand-water1 rotate: false - xy: 1405, 175 + xy: 3263, 297 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-darksand-water2 rotate: false - xy: 1405, 141 + xy: 3297, 297 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-darksand-water3 rotate: false - xy: 1439, 175 + xy: 3331, 297 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-darksand2 rotate: false - xy: 4055, 335 + xy: 3093, 297 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-darksand3 rotate: false - xy: 1337, 175 + xy: 3127, 297 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-dirt2 rotate: false - xy: 1439, 141 + xy: 3365, 297 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-dirt3 rotate: false - xy: 1473, 175 + xy: 3399, 297 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-grass1 rotate: false - xy: 1473, 141 + xy: 3433, 297 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 grass-icon-editor rotate: false - xy: 1473, 141 + xy: 3433, 297 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-grass2 rotate: false - xy: 1507, 175 + xy: 3467, 297 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-grass3 rotate: false - xy: 1507, 141 + xy: 3501, 297 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-hotrock1 rotate: false - xy: 2147, 305 + xy: 3535, 297 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 hotrock-icon-editor rotate: false - xy: 2147, 305 + xy: 3535, 297 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-hotrock2 rotate: false - xy: 2147, 271 + xy: 3569, 297 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-hotrock3 rotate: false - xy: 2181, 305 + xy: 3603, 297 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-ice-snow1 rotate: false - xy: 2249, 305 + xy: 3739, 297 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ice-snow-icon-editor rotate: false - xy: 2249, 305 + xy: 3739, 297 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-ice-snow2 rotate: false - xy: 2249, 271 + xy: 3773, 297 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-ice-snow3 rotate: false - xy: 2283, 305 + xy: 3807, 297 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-ice1 rotate: false - xy: 2181, 271 + xy: 3637, 297 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ice-icon-editor rotate: false - xy: 2181, 271 + xy: 3637, 297 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-ice2 rotate: false - xy: 2215, 305 + xy: 3671, 297 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-ice3 rotate: false - xy: 2215, 271 + xy: 3705, 297 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-magmarock1 rotate: false - xy: 2283, 271 + xy: 3841, 297 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 magmarock-icon-editor rotate: false - xy: 2283, 271 + xy: 3841, 297 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-magmarock2 rotate: false - xy: 2317, 305 + xy: 3875, 297 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-magmarock3 rotate: false - xy: 2317, 271 + xy: 3909, 297 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-metal-floor rotate: false - xy: 2351, 305 + xy: 3943, 297 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 metal-floor-icon-editor rotate: false - xy: 2351, 305 + xy: 3943, 297 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-metal-floor-2 rotate: false - xy: 2351, 271 + xy: 3977, 297 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 metal-floor-2-icon-editor rotate: false - xy: 2351, 271 + xy: 3977, 297 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-metal-floor-3 rotate: false - xy: 2385, 305 + xy: 4011, 297 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 metal-floor-3-icon-editor rotate: false - xy: 2385, 305 + xy: 4011, 297 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-metal-floor-5 rotate: false - xy: 2385, 271 + xy: 4045, 297 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 metal-floor-5-icon-editor rotate: false - xy: 2385, 271 + xy: 4045, 297 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-metal-floor-damaged1 rotate: false - xy: 2419, 305 + xy: 1339, 101 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 metal-floor-damaged-icon-editor rotate: false - xy: 2419, 305 + xy: 1339, 101 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-metal-floor-damaged2 rotate: false - xy: 2419, 271 + xy: 1339, 67 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-metal-floor-damaged3 rotate: false - xy: 2453, 305 + xy: 1373, 101 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-moss1 rotate: false - xy: 2453, 271 + xy: 1373, 67 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 moss-icon-editor rotate: false - xy: 2453, 271 + xy: 1373, 67 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-moss2 rotate: false - xy: 2487, 305 + xy: 1339, 33 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-moss3 rotate: false - xy: 2487, 271 + xy: 1373, 33 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-mud1 rotate: false - xy: 2521, 305 + xy: 915, 39 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 mud-icon-editor rotate: false - xy: 2521, 305 + xy: 915, 39 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-mud2 rotate: false - xy: 2521, 271 + xy: 949, 39 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-mud3 rotate: false - xy: 2555, 305 + xy: 983, 39 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-ore-coal1 rotate: false - xy: 2555, 271 + xy: 1017, 39 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-ore-coal2 rotate: false - xy: 2589, 305 + xy: 1051, 39 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-ore-coal3 rotate: false - xy: 2589, 271 + xy: 1085, 39 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-ore-copper1 rotate: false - xy: 2623, 305 + xy: 1753, 265 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-ore-copper2 rotate: false - xy: 2623, 271 + xy: 1753, 231 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-ore-copper3 rotate: false - xy: 2657, 305 + xy: 1787, 265 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-ore-lead1 rotate: false - xy: 2657, 271 + xy: 1787, 231 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-ore-lead2 rotate: false - xy: 2691, 305 + xy: 1821, 265 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-ore-lead3 rotate: false - xy: 2691, 271 + xy: 1821, 231 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-ore-scrap1 rotate: false - xy: 2725, 305 + xy: 1855, 265 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-ore-scrap2 rotate: false - xy: 2725, 271 + xy: 1855, 231 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-ore-scrap3 rotate: false - xy: 2759, 305 + xy: 1889, 265 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-ore-thorium1 rotate: false - xy: 2759, 271 + xy: 1889, 231 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-ore-thorium2 rotate: false - xy: 2793, 305 + xy: 1923, 265 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-ore-thorium3 rotate: false - xy: 2793, 271 + xy: 1923, 231 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-ore-titanium1 rotate: false - xy: 2827, 305 + xy: 1957, 265 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-ore-titanium2 rotate: false - xy: 2827, 271 + xy: 1957, 231 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-ore-titanium3 rotate: false - xy: 2861, 305 + xy: 1991, 265 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-pebbles1 rotate: false - xy: 2861, 271 + xy: 1991, 231 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-pebbles2 rotate: false - xy: 2895, 305 + xy: 2025, 265 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-pebbles3 rotate: false - xy: 2895, 271 + xy: 2025, 231 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-salt rotate: false - xy: 2929, 305 + xy: 2059, 265 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 salt-icon-editor rotate: false - xy: 2929, 305 + xy: 2059, 265 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-sand-water1 rotate: false - xy: 2997, 305 + xy: 2127, 265 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-sand-water2 rotate: false - xy: 2997, 271 + xy: 2127, 231 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-sand-water3 rotate: false - xy: 3031, 305 + xy: 2161, 265 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-sand1 rotate: false - xy: 2929, 271 + xy: 2059, 231 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sand-icon-editor rotate: false - xy: 2929, 271 + xy: 2059, 231 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-sand2 rotate: false - xy: 2963, 305 + xy: 2093, 265 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-sand3 rotate: false - xy: 2963, 271 + xy: 2093, 231 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-shale1 rotate: false - xy: 3031, 271 + xy: 2161, 231 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 shale-icon-editor rotate: false - xy: 3031, 271 + xy: 2161, 231 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-shale2 rotate: false - xy: 3065, 305 + xy: 2195, 265 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-shale3 rotate: false - xy: 3065, 271 + xy: 2195, 231 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-slag rotate: false - xy: 3099, 305 + xy: 2229, 265 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 slag-icon-editor rotate: false - xy: 3099, 305 + xy: 2229, 265 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-snow1 rotate: false - xy: 3099, 271 + xy: 2229, 231 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-snow2 rotate: false - xy: 3133, 305 + xy: 2263, 263 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-snow3 rotate: false - xy: 3133, 271 + xy: 2297, 263 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-spawn rotate: false - xy: 3167, 305 + xy: 2331, 263 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-spore-moss1 rotate: false - xy: 3167, 271 + xy: 2365, 263 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 spore-moss-icon-editor rotate: false - xy: 3167, 271 + xy: 2365, 263 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-spore-moss2 rotate: false - xy: 3201, 305 + xy: 2399, 263 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-spore-moss3 rotate: false - xy: 3201, 271 + xy: 2433, 263 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-stone1 rotate: false - xy: 3235, 305 + xy: 2467, 263 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 stone-icon-editor rotate: false - xy: 3235, 305 + xy: 2467, 263 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-stone2 rotate: false - xy: 3235, 271 + xy: 2501, 263 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-stone3 rotate: false - xy: 3269, 305 + xy: 2535, 263 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-tainted-water rotate: false - xy: 3269, 271 + xy: 2569, 263 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 tainted-water-icon-editor rotate: false - xy: 3269, 271 + xy: 2569, 263 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-tar rotate: false - xy: 3303, 305 + xy: 2603, 263 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 tar-icon-editor rotate: false - xy: 3303, 305 + xy: 2603, 263 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-tendrils1 rotate: false - xy: 3303, 271 + xy: 2637, 263 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-tendrils2 rotate: false - xy: 3337, 305 + xy: 2671, 263 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-tendrils3 rotate: false - xy: 3337, 271 + xy: 2705, 263 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 editor-water rotate: false - xy: 3371, 305 + xy: 2739, 263 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 water-icon-editor rotate: false - xy: 3371, 305 + xy: 2739, 263 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 exponential-reconstructor-icon-editor rotate: false - xy: 935, 277 + xy: 935, 269 size: 224, 224 orig: 224, 224 offset: 0, 0 index: -1 force-projector-icon-editor rotate: false - xy: 3245, 405 + xy: 3375, 397 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 +foreshadow-icon-editor + rotate: false + xy: 293, 43 + size: 128, 128 + orig: 128, 128 + offset: 0, 0 + index: -1 fuse-icon-editor rotate: false - xy: 3343, 405 + xy: 3473, 397 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 graphite-press-icon-editor rotate: false - xy: 2081, 307 + xy: 2363, 331 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 ground-factory-icon-editor rotate: false - xy: 3441, 405 + xy: 3571, 397 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 hail-icon-editor rotate: false - xy: 3371, 271 + xy: 2773, 263 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 hyper-processor-icon-editor rotate: false - xy: 3539, 405 + xy: 3669, 397 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 ice-wall-icon-editor rotate: false - xy: 3405, 305 + xy: 2807, 263 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 illuminator-icon-editor rotate: false - xy: 3405, 271 + xy: 2841, 263 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 impact-reactor-icon-editor rotate: false - xy: 293, 51 + xy: 1647, 365 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 incinerator-icon-editor rotate: false - xy: 3439, 305 + xy: 2875, 263 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 inverted-sorter-icon-editor rotate: false - xy: 3439, 271 + xy: 2909, 263 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-source-icon-editor rotate: false - xy: 3473, 305 + xy: 2943, 263 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-void-icon-editor rotate: false - xy: 3473, 271 + xy: 2977, 263 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 junction-icon-editor rotate: false - xy: 3507, 305 + xy: 3011, 263 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 kiln-icon-editor rotate: false - xy: 1553, 241 + xy: 2429, 331 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 lancer-icon-editor rotate: false - xy: 1619, 241 + xy: 2495, 331 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 large-logic-display-icon-editor rotate: false - xy: 1161, 309 + xy: 1161, 301 size: 192, 192 orig: 192, 192 offset: 0, 0 index: -1 laser-drill-icon-editor rotate: false - xy: 3637, 405 + xy: 3767, 397 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 launch-pad-icon-editor rotate: false - xy: 3735, 405 + xy: 3865, 397 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 launch-pad-large-icon-editor rotate: false - xy: 1647, 373 + xy: 423, 43 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 liquid-junction-icon-editor rotate: false - xy: 3507, 271 + xy: 3045, 263 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-router-icon-editor rotate: false - xy: 3541, 305 + xy: 3079, 263 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-source-icon-editor rotate: false - xy: 3541, 271 + xy: 3113, 263 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-tank-icon-editor rotate: false - xy: 3833, 405 + xy: 3963, 397 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 liquid-void-icon-editor rotate: false - xy: 3575, 305 + xy: 3147, 263 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 logic-display-icon-editor rotate: false - xy: 3931, 405 + xy: 553, 75 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 logic-processor-icon-editor rotate: false - xy: 1685, 241 + xy: 2561, 331 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 mass-driver-icon-editor rotate: false - xy: 553, 83 + xy: 651, 107 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 mechanical-drill-icon-editor rotate: false - xy: 1751, 241 + xy: 2627, 331 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 mechanical-pump-icon-editor rotate: false - xy: 3575, 271 + xy: 3181, 263 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 meltdown-icon-editor rotate: false - xy: 423, 51 + xy: 1777, 365 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 melter-icon-editor rotate: false - xy: 3609, 305 + xy: 3215, 263 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 memory-bank-icon-editor rotate: false - xy: 1817, 241 + xy: 2693, 331 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 memory-cell-icon-editor rotate: false - xy: 3609, 271 + xy: 3249, 263 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 mend-projector-icon-editor rotate: false - xy: 1883, 241 + xy: 2759, 331 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 mender-icon-editor rotate: false - xy: 3643, 305 + xy: 3283, 263 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 message-icon-editor rotate: false - xy: 3643, 271 + xy: 3317, 263 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 micro-processor-icon-editor rotate: false - xy: 3677, 305 + xy: 3351, 263 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 multi-press-icon-editor rotate: false - xy: 651, 115 + xy: 749, 107 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 multiplicative-reconstructor-icon-editor rotate: false - xy: 1355, 341 + xy: 1355, 333 size: 160, 160 orig: 160, 160 offset: 0, 0 index: -1 naval-factory-icon-editor rotate: false - xy: 749, 115 + xy: 847, 107 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 oil-extractor-icon-editor rotate: false - xy: 847, 115 + xy: 945, 171 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 overdrive-dome-icon-editor rotate: false - xy: 945, 179 + xy: 1043, 171 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 overdrive-projector-icon-editor rotate: false - xy: 1949, 241 + xy: 2825, 331 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 overflow-gate-icon-editor rotate: false - xy: 3677, 271 + xy: 3385, 263 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 parallax-icon-editor rotate: false - xy: 2015, 241 + xy: 2891, 331 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 payload-conveyor-icon-editor rotate: false - xy: 1043, 179 + xy: 945, 73 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 payload-router-icon-editor rotate: false - xy: 945, 81 + xy: 1043, 73 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 pebbles-icon-editor rotate: false - xy: 3711, 305 + xy: 3419, 263 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conduit-icon-editor rotate: false - xy: 3711, 271 + xy: 3453, 263 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conveyor-icon-editor rotate: false - xy: 3745, 305 + xy: 3487, 263 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-wall-icon-editor rotate: false - xy: 3745, 271 + xy: 3521, 263 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-wall-large-icon-editor rotate: false - xy: 2081, 241 + xy: 2957, 331 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 phase-weaver-icon-editor rotate: false - xy: 2167, 339 + xy: 3023, 331 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 pine-icon-editor rotate: false - xy: 3917, 355 + xy: 1553, 217 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 plastanium-compressor-icon-editor rotate: false - xy: 2233, 339 + xy: 3089, 331 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 plastanium-conveyor-icon-editor rotate: false - xy: 3779, 305 + xy: 3555, 263 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plastanium-wall-icon-editor rotate: false - xy: 3779, 271 + xy: 3589, 263 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plastanium-wall-large-icon-editor rotate: false - xy: 2299, 339 + xy: 3155, 331 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 plated-conduit-icon-editor rotate: false - xy: 2147, 237 + xy: 3623, 263 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pneumatic-drill-icon-editor rotate: false - xy: 2365, 339 + xy: 3221, 331 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 power-node-icon-editor rotate: false - xy: 2181, 237 + xy: 3657, 263 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 power-node-large-icon-editor rotate: false - xy: 2431, 339 + xy: 3287, 331 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 power-source-icon-editor rotate: false - xy: 2215, 237 + xy: 3691, 263 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 power-void-icon-editor rotate: false - xy: 2249, 237 + xy: 3725, 263 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-icon-editor rotate: false - xy: 2283, 237 + xy: 3759, 263 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulverizer-icon-editor rotate: false - xy: 2317, 237 + xy: 3793, 263 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pyratite-mixer-icon-editor rotate: false - xy: 2497, 339 + xy: 3353, 331 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 repair-point-icon-editor rotate: false - xy: 2351, 237 + xy: 3827, 263 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 resupply-point-icon-editor rotate: false - xy: 2563, 339 + xy: 3419, 331 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 ripple-icon-editor rotate: false - xy: 1043, 81 + xy: 1161, 203 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 rotary-pump-icon-editor rotate: false - xy: 2629, 339 + xy: 3485, 331 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 router-icon-editor rotate: false - xy: 2385, 237 + xy: 3861, 263 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 rtg-generator-icon-editor rotate: false - xy: 2695, 339 + xy: 3551, 331 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 salt-wall-icon-editor rotate: false - xy: 2419, 237 + xy: 3895, 263 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 salvo-icon-editor rotate: false - xy: 2761, 339 + xy: 3617, 331 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 sand-boulder-icon-editor rotate: false - xy: 2453, 237 + xy: 3929, 263 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sand-wall-icon-editor rotate: false - xy: 2487, 237 + xy: 3963, 263 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sand-water-icon-editor rotate: false - xy: 2521, 237 + xy: 3997, 263 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scatter-icon-editor rotate: false - xy: 2827, 339 + xy: 3683, 331 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 scorch-icon-editor rotate: false - xy: 2555, 237 + xy: 4031, 263 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap-wall-gigantic-icon-editor rotate: false - xy: 1777, 373 + xy: 1907, 365 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 scrap-wall-huge-icon-editor rotate: false - xy: 1161, 211 + xy: 1259, 203 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 scrap-wall-icon-editor rotate: false - xy: 2589, 237 + xy: 2263, 229 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap-wall-large-icon-editor rotate: false - xy: 2893, 339 + xy: 3749, 331 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 segment-icon-editor rotate: false - xy: 2959, 339 + xy: 3815, 331 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 separator-icon-editor rotate: false - xy: 3025, 339 + xy: 3881, 331 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 shale-boulder-icon-editor rotate: false - xy: 2623, 237 + xy: 2297, 229 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 shale-wall-icon-editor rotate: false - xy: 2657, 237 + xy: 2331, 229 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 shock-mine-icon-editor rotate: false - xy: 2691, 237 + xy: 2365, 229 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 shrubs-icon-editor rotate: false - xy: 2725, 237 + xy: 2399, 229 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 silicon-crucible-icon-editor rotate: false - xy: 1259, 211 + xy: 1141, 105 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 silicon-smelter-icon-editor rotate: false - xy: 3091, 339 + xy: 3947, 331 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 snow-boulder-icon-editor rotate: false - xy: 3967, 355 + xy: 1603, 217 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 snow-icon-editor rotate: false - xy: 2759, 237 + xy: 2433, 229 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 snow-pine-icon-editor rotate: false - xy: 163, 1 + xy: 1653, 217 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 snow-wall-icon-editor rotate: false - xy: 2793, 237 + xy: 2467, 229 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 solar-panel-icon-editor rotate: false - xy: 2827, 237 + xy: 2501, 229 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 solar-panel-large-icon-editor rotate: false - xy: 1141, 113 + xy: 1239, 105 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 sorter-icon-editor rotate: false - xy: 2861, 237 + xy: 2535, 229 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 spawn-icon-editor rotate: false - xy: 2895, 237 + xy: 2569, 229 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 spectre-icon-editor rotate: false - xy: 1907, 373 + xy: 2037, 365 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 spore-cluster-icon-editor rotate: false - xy: 263, 9 + xy: 163, 1 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 spore-pine-icon-editor rotate: false - xy: 213, 1 + xy: 1703, 217 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 spore-press-icon-editor rotate: false - xy: 3157, 339 + xy: 4013, 331 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 spore-wall-icon-editor rotate: false - xy: 2929, 237 + xy: 2603, 229 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 steam-generator-icon-editor rotate: false - xy: 3223, 339 + xy: 553, 9 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 stone-wall-icon-editor rotate: false - xy: 2963, 237 + xy: 2637, 229 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 surge-tower-icon-editor rotate: false - xy: 3289, 339 + xy: 651, 41 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 surge-wall-icon-editor rotate: false - xy: 2997, 237 + xy: 2671, 229 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 surge-wall-large-icon-editor rotate: false - xy: 3355, 339 + xy: 717, 41 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 swarmer-icon-editor rotate: false - xy: 3421, 339 + xy: 783, 41 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 switch-icon-editor rotate: false - xy: 3031, 237 + xy: 2705, 229 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 tendrils-icon-editor rotate: false - xy: 3065, 237 + xy: 2739, 229 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 tetrative-reconstructor-icon-editor rotate: false - xy: 645, 213 + xy: 645, 205 size: 288, 288 orig: 288, 288 offset: 0, 0 index: -1 thermal-generator-icon-editor rotate: false - xy: 3487, 339 + xy: 849, 41 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 thermal-pump-icon-editor rotate: false - xy: 1239, 113 + xy: 1357, 235 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 thorium-reactor-icon-editor rotate: false - xy: 1357, 243 + xy: 1455, 235 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 thorium-wall-icon-editor rotate: false - xy: 3099, 237 + xy: 2773, 229 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 thorium-wall-large-icon-editor rotate: false - xy: 3553, 339 + xy: 1141, 39 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 thruster-icon-editor rotate: false - xy: 2037, 373 + xy: 2167, 365 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 titanium-conveyor-icon-editor rotate: false - xy: 3133, 237 + xy: 2807, 229 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-wall-icon-editor rotate: false - xy: 3167, 237 + xy: 2841, 229 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-wall-large-icon-editor rotate: false - xy: 3619, 339 + xy: 1207, 39 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 +tsunami-icon-editor + rotate: false + xy: 1553, 267 + size: 96, 96 + orig: 96, 96 + offset: 0, 0 + index: -1 underflow-gate-icon-editor rotate: false - xy: 3201, 237 + xy: 2875, 229 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 unloader-icon-editor rotate: false - xy: 3235, 237 + xy: 2909, 229 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 vault-icon-editor rotate: false - xy: 1455, 243 + xy: 1651, 267 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 water-extractor-icon-editor rotate: false - xy: 3685, 339 + xy: 1273, 39 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 wave-icon-editor rotate: false - xy: 3751, 339 + xy: 1357, 169 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 white-tree-dead-icon-editor rotate: false - xy: 1, 181 + xy: 1, 173 size: 320, 320 orig: 320, 320 offset: 0, 0 index: -1 white-tree-icon-editor rotate: false - xy: 323, 181 + xy: 323, 173 size: 320, 320 orig: 320, 320 offset: 0, 0 @@ -11524,7 +11566,7 @@ alpha-bg index: -1 bar rotate: false - xy: 2264, 97 + xy: 1869, 1 size: 27, 36 split: 9, 9, 9, 9 orig: 27, 36 @@ -11532,7 +11574,7 @@ bar index: -1 bar-top rotate: false - xy: 2235, 97 + xy: 1801, 1 size: 27, 36 split: 9, 10, 9, 10 orig: 27, 36 @@ -11540,28 +11582,28 @@ bar-top index: -1 block-additive-reconstructor-large rotate: false - xy: 3842, 321 + xy: 1078, 371 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-additive-reconstructor-medium rotate: false - xy: 1195, 169 + xy: 881, 1 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-additive-reconstructor-small rotate: false - xy: 3533, 387 + xy: 3682, 351 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-additive-reconstructor-tiny rotate: false - xy: 3595, 243 + xy: 3640, 395 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -11575,28 +11617,28 @@ block-additive-reconstructor-xlarge index: -1 block-air-factory-large rotate: false - xy: 3884, 321 + xy: 1120, 371 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-air-factory-medium rotate: false - xy: 1229, 169 + xy: 915, 1 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-air-factory-small rotate: false - xy: 2322, 109 + xy: 1186, 7 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-air-factory-tiny rotate: false - xy: 4007, 186 + xy: 3640, 377 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -11610,28 +11652,28 @@ block-air-factory-xlarge index: -1 block-alloy-smelter-large rotate: false - xy: 845, 371 + xy: 1162, 371 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-alloy-smelter-medium rotate: false - xy: 1263, 169 + xy: 3464, 295 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-alloy-smelter-small rotate: false - xy: 2348, 109 + xy: 1898, 1 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-alloy-smelter-tiny rotate: false - xy: 309, 160 + xy: 1060, 7 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -11645,28 +11687,28 @@ block-alloy-smelter-xlarge index: -1 block-arc-large rotate: false - xy: 887, 371 + xy: 1204, 371 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-arc-medium rotate: false - xy: 1297, 169 + xy: 3498, 295 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-arc-small rotate: false - xy: 2374, 109 + xy: 1212, 7 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-arc-tiny rotate: false - xy: 881, 159 + xy: 2287, 193 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -11680,28 +11722,28 @@ block-arc-xlarge index: -1 block-armored-conveyor-large rotate: false - xy: 929, 371 + xy: 1246, 371 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-armored-conveyor-medium rotate: false - xy: 1331, 169 + xy: 3532, 295 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-armored-conveyor-small rotate: false - xy: 2400, 109 + xy: 1924, 1 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-armored-conveyor-tiny rotate: false - xy: 881, 141 + xy: 309, 160 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -11715,28 +11757,28 @@ block-armored-conveyor-xlarge index: -1 block-basalt-large rotate: false - xy: 971, 371 + xy: 1288, 371 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-basalt-medium rotate: false - xy: 1365, 169 + xy: 3566, 295 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-basalt-small rotate: false - xy: 2426, 109 + xy: 1950, 1 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-basalt-tiny rotate: false - xy: 881, 123 + xy: 2305, 193 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -11750,35 +11792,35 @@ block-basalt-xlarge index: -1 block-battery-large rotate: false - xy: 1013, 371 + xy: 1330, 371 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-battery-large-large rotate: false - xy: 1055, 371 + xy: 1372, 371 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-battery-large-medium rotate: false - xy: 1399, 169 + xy: 3600, 295 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-battery-large-small rotate: false - xy: 2452, 100 + xy: 1976, 1 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-battery-large-tiny rotate: false - xy: 881, 105 + xy: 2323, 193 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -11792,21 +11834,21 @@ block-battery-large-xlarge index: -1 block-battery-medium rotate: false - xy: 1433, 169 + xy: 2287, 211 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-battery-small rotate: false - xy: 1398, 84 + xy: 2002, 1 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-battery-tiny rotate: false - xy: 881, 87 + xy: 2341, 193 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -11820,28 +11862,28 @@ block-battery-xlarge index: -1 block-blast-drill-large rotate: false - xy: 1097, 371 + xy: 1414, 371 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-blast-drill-medium rotate: false - xy: 1467, 169 + xy: 2321, 211 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-blast-drill-small rotate: false - xy: 1424, 77 + xy: 2028, 1 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-blast-drill-tiny rotate: false - xy: 881, 69 + xy: 2359, 193 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -11855,28 +11897,28 @@ block-blast-drill-xlarge index: -1 block-blast-mixer-large rotate: false - xy: 1139, 371 + xy: 1456, 371 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-blast-mixer-medium rotate: false - xy: 1501, 169 + xy: 938, 161 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-blast-mixer-small rotate: false - xy: 2322, 83 + xy: 2054, 1 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-blast-mixer-tiny rotate: false - xy: 881, 51 + xy: 2594, 71 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -11890,28 +11932,28 @@ block-blast-mixer-xlarge index: -1 block-block-forge-large rotate: false - xy: 1181, 371 + xy: 1498, 371 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-block-forge-medium rotate: false - xy: 1535, 169 + xy: 972, 161 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-block-forge-small rotate: false - xy: 2348, 83 + xy: 1830, 7 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-block-forge-tiny rotate: false - xy: 881, 33 + xy: 2594, 53 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -11925,28 +11967,28 @@ block-block-forge-xlarge index: -1 block-block-loader-large rotate: false - xy: 1223, 371 + xy: 1540, 371 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-block-loader-medium rotate: false - xy: 1569, 169 + xy: 1006, 161 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-block-loader-small rotate: false - xy: 2374, 83 + xy: 3711, 192 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-block-loader-tiny rotate: false - xy: 881, 15 + xy: 2594, 35 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -11960,28 +12002,28 @@ block-block-loader-xlarge index: -1 block-block-unloader-large rotate: false - xy: 1265, 371 + xy: 1582, 371 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-block-unloader-medium rotate: false - xy: 1603, 169 + xy: 1040, 161 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-block-unloader-small rotate: false - xy: 2400, 83 + xy: 1238, 7 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-block-unloader-tiny rotate: false - xy: 899, 156 + xy: 2491, 184 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -11995,28 +12037,28 @@ block-block-unloader-xlarge index: -1 block-boulder-large rotate: false - xy: 1307, 371 + xy: 1624, 371 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-boulder-medium rotate: false - xy: 1637, 169 + xy: 1074, 169 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-boulder-small rotate: false - xy: 2426, 83 + xy: 1264, 16 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-boulder-tiny rotate: false - xy: 899, 138 + xy: 3757, 345 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -12030,28 +12072,28 @@ block-boulder-xlarge index: -1 block-bridge-conduit-large rotate: false - xy: 1349, 371 + xy: 1666, 371 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-bridge-conduit-medium rotate: false - xy: 1671, 169 + xy: 1108, 169 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-bridge-conduit-small rotate: false - xy: 2452, 74 + xy: 1290, 7 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-bridge-conduit-tiny rotate: false - xy: 917, 156 + xy: 3775, 345 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -12065,28 +12107,28 @@ block-bridge-conduit-xlarge index: -1 block-bridge-conveyor-large rotate: false - xy: 1391, 371 + xy: 1708, 371 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-bridge-conveyor-medium rotate: false - xy: 1705, 169 + xy: 1142, 169 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-bridge-conveyor-small rotate: false - xy: 2478, 85 + xy: 1316, 7 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-bridge-conveyor-tiny rotate: false - xy: 899, 120 + xy: 2594, 17 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -12100,28 +12142,28 @@ block-bridge-conveyor-xlarge index: -1 block-char-large rotate: false - xy: 1433, 371 + xy: 1750, 371 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-char-medium rotate: false - xy: 1739, 169 + xy: 1176, 169 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-char-small rotate: false - xy: 2504, 85 + xy: 1342, 7 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-char-tiny rotate: false - xy: 917, 138 + xy: 2568, 7 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -12135,28 +12177,28 @@ block-char-xlarge index: -1 block-cliff-large rotate: false - xy: 1475, 371 + xy: 1792, 371 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-cliff-medium rotate: false - xy: 1773, 169 + xy: 1210, 169 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-cliff-small rotate: false - xy: 2530, 85 + xy: 1368, 7 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-cliff-tiny rotate: false - xy: 935, 156 + xy: 3781, 174 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -12170,28 +12212,28 @@ block-cliff-xlarge index: -1 block-coal-centrifuge-large rotate: false - xy: 1517, 371 + xy: 1834, 371 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-coal-centrifuge-medium rotate: false - xy: 1807, 169 + xy: 1244, 169 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-coal-centrifuge-small rotate: false - xy: 2556, 85 + xy: 1394, 7 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-coal-centrifuge-tiny rotate: false - xy: 899, 102 + xy: 2330, 175 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -12205,28 +12247,28 @@ block-coal-centrifuge-xlarge index: -1 block-combustion-generator-large rotate: false - xy: 1559, 371 + xy: 1876, 371 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-combustion-generator-medium rotate: false - xy: 1841, 169 + xy: 1278, 169 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-combustion-generator-small rotate: false - xy: 2478, 59 + xy: 1420, 7 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-combustion-generator-tiny rotate: false - xy: 917, 120 + xy: 2330, 157 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -12240,28 +12282,28 @@ block-combustion-generator-xlarge index: -1 block-command-center-large rotate: false - xy: 1601, 371 + xy: 1918, 371 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-command-center-medium rotate: false - xy: 1875, 169 + xy: 1312, 169 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-command-center-small rotate: false - xy: 2504, 59 + xy: 1446, 7 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-command-center-tiny rotate: false - xy: 935, 138 + xy: 2348, 175 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -12275,28 +12317,28 @@ block-command-center-xlarge index: -1 block-conduit-large rotate: false - xy: 1643, 371 + xy: 1960, 371 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-conduit-medium rotate: false - xy: 1909, 169 + xy: 1346, 169 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-conduit-small rotate: false - xy: 2530, 59 + xy: 1472, 7 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-conduit-tiny rotate: false - xy: 953, 156 + xy: 2348, 157 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -12310,28 +12352,28 @@ block-conduit-xlarge index: -1 block-container-large rotate: false - xy: 1685, 371 + xy: 2002, 371 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-container-medium rotate: false - xy: 1943, 169 + xy: 1380, 169 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-container-small rotate: false - xy: 2556, 59 + xy: 1498, 7 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-container-tiny rotate: false - xy: 899, 84 + xy: 2366, 175 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -12345,28 +12387,28 @@ block-container-xlarge index: -1 block-conveyor-large rotate: false - xy: 1727, 371 + xy: 2044, 371 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-conveyor-medium rotate: false - xy: 1977, 169 + xy: 1414, 169 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-conveyor-small rotate: false - xy: 1450, 75 + xy: 1524, 7 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-conveyor-tiny rotate: false - xy: 899, 66 + xy: 2366, 157 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -12380,35 +12422,35 @@ block-conveyor-xlarge index: -1 block-copper-wall-large rotate: false - xy: 1769, 371 + xy: 2086, 371 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-copper-wall-large-large rotate: false - xy: 1811, 371 + xy: 2128, 371 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-copper-wall-large-medium rotate: false - xy: 2011, 169 + xy: 1448, 169 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-copper-wall-large-small rotate: false - xy: 1476, 75 + xy: 1550, 7 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-copper-wall-large-tiny rotate: false - xy: 917, 102 + xy: 2384, 173 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -12422,21 +12464,21 @@ block-copper-wall-large-xlarge index: -1 block-copper-wall-medium rotate: false - xy: 2045, 169 + xy: 1482, 169 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-copper-wall-small rotate: false - xy: 1502, 75 + xy: 1576, 7 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-copper-wall-tiny rotate: false - xy: 935, 120 + xy: 2402, 173 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -12450,28 +12492,28 @@ block-copper-wall-xlarge index: -1 block-core-foundation-large rotate: false - xy: 1853, 371 + xy: 2170, 371 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-core-foundation-medium rotate: false - xy: 2079, 169 + xy: 1516, 169 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-core-foundation-small rotate: false - xy: 1528, 75 + xy: 1602, 7 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-core-foundation-tiny rotate: false - xy: 953, 138 + xy: 2420, 173 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -12485,28 +12527,28 @@ block-core-foundation-xlarge index: -1 block-core-nucleus-large rotate: false - xy: 1895, 371 + xy: 2212, 371 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-core-nucleus-medium rotate: false - xy: 2113, 169 + xy: 1550, 169 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-core-nucleus-small rotate: false - xy: 1554, 75 + xy: 1628, 7 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-core-nucleus-tiny rotate: false - xy: 971, 156 + xy: 2384, 155 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -12520,28 +12562,28 @@ block-core-nucleus-xlarge index: -1 block-core-shard-large rotate: false - xy: 1937, 371 + xy: 2254, 371 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-core-shard-medium rotate: false - xy: 2147, 169 + xy: 1584, 169 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-core-shard-small rotate: false - xy: 1580, 75 + xy: 1654, 7 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-core-shard-tiny rotate: false - xy: 899, 48 + xy: 2402, 155 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -12555,28 +12597,28 @@ block-core-shard-xlarge index: -1 block-craters-large rotate: false - xy: 1979, 371 + xy: 2296, 371 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-craters-medium rotate: false - xy: 2181, 169 + xy: 1618, 169 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-craters-small rotate: false - xy: 1606, 75 + xy: 1680, 7 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-craters-tiny rotate: false - xy: 917, 84 + xy: 2420, 155 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -12588,35 +12630,35 @@ block-craters-xlarge orig: 48, 48 offset: 0, 0 index: -1 -block-cryofluidmixer-large +block-cryofluid-mixer-large rotate: false - xy: 2021, 371 + xy: 2338, 371 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-cryofluidmixer-medium +block-cryofluid-mixer-medium rotate: false - xy: 2215, 169 + xy: 1652, 169 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-cryofluidmixer-small +block-cryofluid-mixer-small rotate: false - xy: 1636, 82 + xy: 1706, 7 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-cryofluidmixer-tiny +block-cryofluid-mixer-tiny rotate: false - xy: 917, 66 + xy: 2509, 184 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-cryofluidmixer-xlarge +block-cryofluid-mixer-xlarge rotate: false xy: 1907, 463 size: 48, 48 @@ -12625,28 +12667,28 @@ block-cryofluidmixer-xlarge index: -1 block-cultivator-large rotate: false - xy: 2063, 371 + xy: 2380, 371 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-cultivator-medium rotate: false - xy: 2249, 169 + xy: 1686, 169 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-cultivator-small rotate: false - xy: 1662, 75 + xy: 3708, 339 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-cultivator-tiny rotate: false - xy: 935, 102 + xy: 2527, 188 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -12660,28 +12702,28 @@ block-cultivator-xlarge index: -1 block-cyclone-large rotate: false - xy: 2105, 371 + xy: 2422, 371 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-cyclone-medium rotate: false - xy: 2283, 169 + xy: 1720, 169 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-cyclone-small rotate: false - xy: 1688, 75 + xy: 3702, 313 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-cyclone-tiny rotate: false - xy: 953, 120 + xy: 2545, 188 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -12695,28 +12737,28 @@ block-cyclone-xlarge index: -1 block-dacite-boulder-large rotate: false - xy: 2147, 371 + xy: 2464, 371 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-dacite-boulder-medium rotate: false - xy: 2317, 169 + xy: 1754, 169 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-dacite-boulder-small rotate: false - xy: 1714, 75 + xy: 2123, 7 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-dacite-boulder-tiny rotate: false - xy: 971, 138 + xy: 3781, 156 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -12730,56 +12772,56 @@ block-dacite-boulder-xlarge index: -1 block-dacite-large rotate: false - xy: 2189, 371 + xy: 2506, 371 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-dacite-medium rotate: false - xy: 2351, 169 + xy: 1788, 169 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-dacite-small rotate: false - xy: 1740, 75 + xy: 2491, 228 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-dacite-tiny rotate: false - xy: 989, 156 + xy: 3757, 327 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-dacite-wall-large rotate: false - xy: 2231, 371 + xy: 2548, 371 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-dacite-wall-medium rotate: false - xy: 2385, 169 + xy: 1822, 169 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-dacite-wall-small rotate: false - xy: 1766, 75 + xy: 2517, 232 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-dacite-wall-tiny rotate: false - xy: 899, 30 + xy: 3775, 327 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -12800,28 +12842,28 @@ block-dacite-xlarge index: -1 block-dark-metal-large rotate: false - xy: 2273, 371 + xy: 2590, 371 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-dark-metal-medium rotate: false - xy: 2419, 169 + xy: 1856, 169 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-dark-metal-small rotate: false - xy: 1792, 75 + xy: 2543, 232 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-dark-metal-tiny rotate: false - xy: 917, 48 + xy: 2080, 7 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -12835,28 +12877,28 @@ block-dark-metal-xlarge index: -1 block-dark-panel-1-large rotate: false - xy: 2315, 371 + xy: 2632, 371 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-dark-panel-1-medium rotate: false - xy: 2455, 194 + xy: 1890, 169 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-dark-panel-1-small rotate: false - xy: 1818, 75 + xy: 2569, 219 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-dark-panel-1-tiny rotate: false - xy: 935, 84 + xy: 2098, 7 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -12870,28 +12912,28 @@ block-dark-panel-1-xlarge index: -1 block-dark-panel-2-large rotate: false - xy: 2357, 371 + xy: 2674, 371 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-dark-panel-2-medium rotate: false - xy: 2707, 245 + xy: 1924, 169 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-dark-panel-2-small rotate: false - xy: 1844, 75 + xy: 2595, 219 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-dark-panel-2-tiny rotate: false - xy: 935, 66 + xy: 2527, 170 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -12905,28 +12947,28 @@ block-dark-panel-2-xlarge index: -1 block-dark-panel-3-large rotate: false - xy: 2399, 371 + xy: 2716, 371 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-dark-panel-3-medium rotate: false - xy: 2453, 160 + xy: 1958, 169 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-dark-panel-3-small rotate: false - xy: 1870, 75 + xy: 2491, 202 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-dark-panel-3-tiny rotate: false - xy: 953, 102 + xy: 2545, 170 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -12940,28 +12982,28 @@ block-dark-panel-3-xlarge index: -1 block-dark-panel-4-large rotate: false - xy: 2441, 371 + xy: 2758, 371 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-dark-panel-4-medium rotate: false - xy: 2497, 213 + xy: 1992, 169 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-dark-panel-4-small rotate: false - xy: 1896, 75 + xy: 2517, 206 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-dark-panel-4-tiny rotate: false - xy: 971, 120 + xy: 2563, 175 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -12975,28 +13017,28 @@ block-dark-panel-4-xlarge index: -1 block-dark-panel-5-large rotate: false - xy: 2483, 371 + xy: 2800, 371 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-dark-panel-5-medium rotate: false - xy: 2749, 261 + xy: 2026, 169 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-dark-panel-5-small rotate: false - xy: 1922, 75 + xy: 2543, 206 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-dark-panel-5-tiny rotate: false - xy: 989, 138 + xy: 2581, 175 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -13010,28 +13052,28 @@ block-dark-panel-5-xlarge index: -1 block-dark-panel-6-large rotate: false - xy: 2525, 371 + xy: 2842, 371 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-dark-panel-6-medium rotate: false - xy: 2783, 253 + xy: 2060, 169 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-dark-panel-6-small rotate: false - xy: 1948, 75 + xy: 2569, 193 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-dark-panel-6-tiny rotate: false - xy: 917, 30 + xy: 2599, 175 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -13045,49 +13087,49 @@ block-dark-panel-6-xlarge index: -1 block-darksand-large rotate: false - xy: 2567, 371 + xy: 2884, 371 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-darksand-medium rotate: false - xy: 2817, 253 + xy: 2094, 171 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-darksand-small rotate: false - xy: 4040, 284 + xy: 2595, 193 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-darksand-tainted-water-large rotate: false - xy: 2609, 371 + xy: 2926, 371 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-darksand-tainted-water-medium rotate: false - xy: 2875, 309 + xy: 2128, 177 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-darksand-tainted-water-small rotate: false - xy: 4066, 284 + xy: 2621, 235 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-darksand-tainted-water-tiny rotate: false - xy: 935, 48 + xy: 2563, 157 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -13101,35 +13143,35 @@ block-darksand-tainted-water-xlarge index: -1 block-darksand-tiny rotate: false - xy: 953, 84 + xy: 2581, 157 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-darksand-water-large rotate: false - xy: 2651, 371 + xy: 2968, 371 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-darksand-water-medium rotate: false - xy: 2909, 308 + xy: 2162, 180 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-darksand-water-small rotate: false - xy: 2582, 85 + xy: 2621, 209 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-darksand-water-tiny rotate: false - xy: 953, 66 + xy: 2599, 157 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -13150,28 +13192,28 @@ block-darksand-xlarge index: -1 block-deepwater-large rotate: false - xy: 2693, 371 + xy: 3010, 371 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-deepwater-medium rotate: false - xy: 2943, 308 + xy: 2623, 261 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-deepwater-small rotate: false - xy: 2582, 59 + xy: 2647, 227 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-deepwater-tiny rotate: false - xy: 971, 102 + xy: 2617, 165 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -13185,28 +13227,28 @@ block-deepwater-xlarge index: -1 block-differential-generator-large rotate: false - xy: 2735, 371 + xy: 3052, 371 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-differential-generator-medium rotate: false - xy: 2977, 308 + xy: 2657, 253 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-differential-generator-small rotate: false - xy: 1976, 81 + xy: 2673, 227 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-differential-generator-tiny rotate: false - xy: 989, 120 + xy: 2617, 147 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -13220,28 +13262,28 @@ block-differential-generator-xlarge index: -1 block-diode-large rotate: false - xy: 2777, 371 + xy: 3094, 371 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-diode-medium rotate: false - xy: 3011, 308 + xy: 2355, 211 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-diode-small rotate: false - xy: 2002, 81 + xy: 2699, 227 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-diode-tiny rotate: false - xy: 935, 30 + xy: 2612, 129 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -13255,56 +13297,56 @@ block-diode-xlarge index: -1 block-dirt-large rotate: false - xy: 2819, 371 + xy: 3136, 371 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-dirt-medium rotate: false - xy: 3045, 308 + xy: 2389, 217 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-dirt-small rotate: false - xy: 2111, 82 + xy: 2647, 201 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-dirt-tiny rotate: false - xy: 953, 48 + xy: 2612, 111 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-dirt-wall-large rotate: false - xy: 2861, 371 + xy: 3178, 371 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-dirt-wall-medium rotate: false - xy: 3079, 308 + xy: 2423, 219 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-dirt-wall-small rotate: false - xy: 3593, 339 + xy: 2673, 201 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-dirt-wall-tiny rotate: false - xy: 971, 84 + xy: 2610, 93 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -13325,28 +13367,28 @@ block-dirt-xlarge index: -1 block-disassembler-large rotate: false - xy: 2903, 371 + xy: 3220, 371 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-disassembler-medium rotate: false - xy: 3113, 308 + xy: 2457, 220 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-disassembler-small rotate: false - xy: 3619, 339 + xy: 2699, 201 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-disassembler-tiny rotate: false - xy: 971, 66 + xy: 2612, 75 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -13360,28 +13402,28 @@ block-disassembler-xlarge index: -1 block-distributor-large rotate: false - xy: 2945, 371 + xy: 3262, 371 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-distributor-medium rotate: false - xy: 3147, 308 + xy: 2691, 253 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-distributor-small rotate: false - xy: 2175, 75 + xy: 2725, 206 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-distributor-tiny rotate: false - xy: 989, 102 + xy: 2612, 57 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -13395,35 +13437,35 @@ block-distributor-xlarge index: -1 block-door-large rotate: false - xy: 2987, 371 + xy: 3304, 371 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-door-large-large rotate: false - xy: 3029, 371 + xy: 3346, 371 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-door-large-medium rotate: false - xy: 3181, 308 + xy: 2725, 266 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-door-large-small rotate: false - xy: 2201, 75 + xy: 2751, 206 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-door-large-tiny rotate: false - xy: 953, 30 + xy: 2612, 39 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -13437,21 +13479,21 @@ block-door-large-xlarge index: -1 block-door-medium rotate: false - xy: 3215, 308 + xy: 2759, 266 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-door-small rotate: false - xy: 2227, 71 + xy: 2777, 206 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-door-tiny rotate: false - xy: 971, 48 + xy: 2612, 21 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -13465,28 +13507,28 @@ block-door-xlarge index: -1 block-dune-wall-large rotate: false - xy: 3071, 371 + xy: 3388, 371 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-dune-wall-medium rotate: false - xy: 3249, 308 + xy: 2793, 266 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-dune-wall-small rotate: false - xy: 2253, 71 + xy: 2803, 206 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-dune-wall-tiny rotate: false - xy: 989, 84 + xy: 2635, 157 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -13500,28 +13542,28 @@ block-dune-wall-xlarge index: -1 block-duo-large rotate: false - xy: 3113, 371 + xy: 3430, 371 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-duo-medium rotate: false - xy: 3283, 308 + xy: 2827, 266 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-duo-small rotate: false - xy: 2279, 71 + xy: 2829, 206 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-duo-tiny rotate: false - xy: 989, 66 + xy: 2653, 157 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -13535,28 +13577,28 @@ block-duo-xlarge index: -1 block-exponential-reconstructor-large rotate: false - xy: 3155, 371 + xy: 3472, 371 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-exponential-reconstructor-medium rotate: false - xy: 3317, 308 + xy: 2861, 266 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-exponential-reconstructor-small rotate: false - xy: 2137, 69 + xy: 2855, 206 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-exponential-reconstructor-tiny rotate: false - xy: 971, 30 + xy: 2671, 157 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -13570,28 +13612,28 @@ block-exponential-reconstructor-xlarge index: -1 block-force-projector-large rotate: false - xy: 3197, 371 + xy: 3514, 371 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-force-projector-medium rotate: false - xy: 3351, 308 + xy: 2895, 266 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-force-projector-small rotate: false - xy: 3585, 117 + xy: 2881, 206 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-force-projector-tiny rotate: false - xy: 989, 48 + xy: 2689, 157 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -13603,5504 +13645,5574 @@ block-force-projector-xlarge orig: 48, 48 offset: 0, 0 index: -1 -block-fuse-large +block-foreshadow-large rotate: false - xy: 3239, 371 + xy: 3556, 371 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-fuse-medium +block-foreshadow-medium rotate: false - xy: 3385, 308 + xy: 2929, 266 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-fuse-small +block-foreshadow-small rotate: false - xy: 3591, 214 + xy: 2907, 206 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-fuse-tiny +block-foreshadow-tiny rotate: false - xy: 989, 30 + xy: 2707, 157 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-fuse-xlarge +block-foreshadow-xlarge rotate: false xy: 3357, 463 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-graphite-press-large +block-fuse-large rotate: false - xy: 3281, 371 + xy: 3598, 371 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-graphite-press-medium +block-fuse-medium rotate: false - xy: 3419, 308 + xy: 2963, 266 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-graphite-press-small +block-fuse-small rotate: false - xy: 2591, 191 + xy: 2933, 206 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-graphite-press-tiny +block-fuse-tiny rotate: false - xy: 899, 12 + xy: 2635, 139 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-graphite-press-xlarge +block-fuse-xlarge rotate: false xy: 3407, 463 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-grass-large +block-graphite-press-large rotate: false - xy: 3323, 371 + xy: 4009, 281 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-grass-medium +block-graphite-press-medium rotate: false - xy: 3453, 308 + xy: 2997, 266 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-grass-small +block-graphite-press-small rotate: false - xy: 2617, 193 + xy: 2959, 206 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-grass-tiny +block-graphite-press-tiny rotate: false - xy: 917, 12 + xy: 2653, 139 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-grass-xlarge +block-graphite-press-xlarge rotate: false xy: 3457, 463 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-ground-factory-large +block-grass-large rotate: false - xy: 3365, 371 + xy: 1078, 329 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-ground-factory-medium +block-grass-medium rotate: false - xy: 3487, 308 + xy: 3031, 266 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-ground-factory-small +block-grass-small rotate: false - xy: 2591, 165 + xy: 2985, 206 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-ground-factory-tiny +block-grass-tiny rotate: false - xy: 935, 12 + xy: 2671, 139 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-ground-factory-xlarge +block-grass-xlarge rotate: false xy: 3507, 463 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-hail-large +block-ground-factory-large rotate: false - xy: 3407, 371 + xy: 1120, 329 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-hail-medium +block-ground-factory-medium rotate: false - xy: 2489, 179 + xy: 3065, 266 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-hail-small +block-ground-factory-small rotate: false - xy: 2617, 167 + xy: 3011, 206 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-hail-tiny +block-ground-factory-tiny rotate: false - xy: 953, 12 + xy: 2689, 139 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-hail-xlarge +block-ground-factory-xlarge rotate: false xy: 3557, 463 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-hotrock-large +block-hail-large rotate: false - xy: 3449, 371 + xy: 1162, 329 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-hotrock-medium +block-hail-medium rotate: false - xy: 2487, 145 + xy: 3099, 266 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-hotrock-small +block-hail-small rotate: false - xy: 2589, 139 + xy: 3037, 206 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-hotrock-tiny +block-hail-tiny rotate: false - xy: 971, 12 + xy: 2707, 139 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-hotrock-xlarge +block-hail-xlarge rotate: false xy: 3607, 463 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-hyper-processor-large +block-hotrock-large rotate: false - xy: 3491, 371 + xy: 1204, 329 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-hyper-processor-medium +block-hotrock-medium rotate: false - xy: 3842, 287 + xy: 3133, 266 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-hyper-processor-small +block-hotrock-small rotate: false - xy: 2589, 113 + xy: 3063, 206 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-hyper-processor-tiny +block-hotrock-tiny rotate: false - xy: 989, 12 + xy: 2725, 136 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-hyper-processor-xlarge +block-hotrock-xlarge rotate: false xy: 3657, 463 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-ice-large +block-hyper-processor-large rotate: false - xy: 859, 329 + xy: 1246, 329 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-ice-medium +block-hyper-processor-medium rotate: false - xy: 3876, 287 + xy: 3167, 266 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-ice-small +block-hyper-processor-small rotate: false - xy: 2608, 87 + xy: 3089, 206 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-ice-snow-large +block-hyper-processor-tiny rotate: false - xy: 859, 287 - size: 40, 40 - orig: 40, 40 - offset: 0, 0 - index: -1 -block-ice-snow-medium - rotate: false - xy: 3910, 287 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -block-ice-snow-small - rotate: false - xy: 2608, 61 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -block-ice-snow-tiny - rotate: false - xy: 1007, 133 + xy: 2743, 136 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-ice-snow-xlarge +block-hyper-processor-xlarge rotate: false xy: 3707, 463 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-ice-tiny +block-ice-large rotate: false - xy: 1007, 115 - size: 16, 16 - orig: 16, 16 - offset: 0, 0 - index: -1 -block-ice-wall-large - rotate: false - xy: 901, 329 + xy: 1288, 329 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-ice-wall-medium +block-ice-medium rotate: false - xy: 3944, 289 + xy: 3201, 266 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-ice-wall-small +block-ice-small rotate: false - xy: 2028, 75 + xy: 3115, 206 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-ice-wall-tiny +block-ice-snow-large rotate: false - xy: 1007, 97 + xy: 1330, 329 + size: 40, 40 + orig: 40, 40 + offset: 0, 0 + index: -1 +block-ice-snow-medium + rotate: false + xy: 3235, 266 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +block-ice-snow-small + rotate: false + xy: 3141, 206 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +block-ice-snow-tiny + rotate: false + xy: 2761, 136 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-ice-wall-xlarge +block-ice-snow-xlarge rotate: false xy: 3757, 463 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-ice-xlarge +block-ice-tiny + rotate: false + xy: 2779, 136 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +block-ice-wall-large + rotate: false + xy: 1372, 329 + size: 40, 40 + orig: 40, 40 + offset: 0, 0 + index: -1 +block-ice-wall-medium + rotate: false + xy: 3269, 266 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +block-ice-wall-small + rotate: false + xy: 3167, 206 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +block-ice-wall-tiny + rotate: false + xy: 2797, 136 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +block-ice-wall-xlarge rotate: false xy: 3807, 463 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-illuminator-large - rotate: false - xy: 859, 245 - size: 40, 40 - orig: 40, 40 - offset: 0, 0 - index: -1 -block-illuminator-medium - rotate: false - xy: 1160, 127 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -block-illuminator-small - rotate: false - xy: 2054, 75 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -block-illuminator-tiny - rotate: false - xy: 1007, 79 - size: 16, 16 - orig: 16, 16 - offset: 0, 0 - index: -1 -block-illuminator-xlarge +block-ice-xlarge rotate: false xy: 3857, 463 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-impact-reactor-large +block-illuminator-large rotate: false - xy: 901, 287 + xy: 1414, 329 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-impact-reactor-medium +block-illuminator-medium rotate: false - xy: 1195, 135 + xy: 3303, 266 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-impact-reactor-small +block-illuminator-small rotate: false - xy: 2080, 76 + xy: 3193, 206 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-impact-reactor-tiny +block-illuminator-tiny rotate: false - xy: 1007, 61 + xy: 2815, 136 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-impact-reactor-xlarge +block-illuminator-xlarge rotate: false xy: 3907, 463 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-incinerator-large +block-impact-reactor-large rotate: false - xy: 943, 329 + xy: 1456, 329 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-incinerator-medium +block-impact-reactor-medium rotate: false - xy: 1229, 135 + xy: 3337, 266 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-incinerator-small +block-impact-reactor-small rotate: false - xy: 3555, 316 + xy: 3219, 206 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-incinerator-tiny +block-impact-reactor-tiny rotate: false - xy: 1007, 43 + xy: 2833, 136 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-incinerator-xlarge +block-impact-reactor-xlarge rotate: false xy: 3957, 463 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-inverted-sorter-large +block-incinerator-large rotate: false - xy: 859, 203 + xy: 1498, 329 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-inverted-sorter-medium +block-incinerator-medium rotate: false - xy: 1263, 135 + xy: 3371, 266 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-inverted-sorter-small +block-incinerator-small rotate: false - xy: 3581, 313 + xy: 3245, 206 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-inverted-sorter-tiny +block-incinerator-tiny rotate: false - xy: 1007, 25 + xy: 2851, 136 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-inverted-sorter-xlarge +block-incinerator-xlarge rotate: false xy: 4007, 463 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-item-source-large +block-inverted-sorter-large rotate: false - xy: 901, 245 + xy: 1540, 329 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-item-source-medium +block-inverted-sorter-medium rotate: false - xy: 1297, 135 + xy: 918, 127 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-item-source-small +block-inverted-sorter-small rotate: false - xy: 3607, 313 + xy: 3271, 206 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-item-source-tiny +block-inverted-sorter-tiny rotate: false - xy: 1025, 133 + xy: 2869, 136 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-item-source-xlarge +block-inverted-sorter-xlarge rotate: false xy: 345, 354 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-item-void-large +block-item-source-large rotate: false - xy: 943, 287 + xy: 1582, 329 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-item-void-medium +block-item-source-medium rotate: false - xy: 1331, 135 + xy: 917, 93 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-item-void-small +block-item-source-small rotate: false - xy: 3633, 313 + xy: 3297, 206 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-item-void-tiny +block-item-source-tiny rotate: false - xy: 1025, 115 + xy: 2887, 136 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-item-void-xlarge +block-item-source-xlarge rotate: false xy: 395, 354 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-junction-large +block-item-void-large rotate: false - xy: 985, 329 + xy: 1624, 329 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-junction-medium +block-item-void-medium rotate: false - xy: 1365, 135 + xy: 952, 127 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-junction-small +block-item-void-small rotate: false - xy: 3659, 304 + xy: 3323, 206 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-junction-tiny +block-item-void-tiny rotate: false - xy: 1025, 97 + xy: 2905, 136 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-junction-xlarge +block-item-void-xlarge rotate: false xy: 445, 354 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-kiln-large +block-junction-large rotate: false - xy: 901, 203 + xy: 1666, 329 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-kiln-medium +block-junction-medium rotate: false - xy: 1399, 135 + xy: 951, 93 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-kiln-small +block-junction-small rotate: false - xy: 3685, 304 + xy: 3349, 206 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-kiln-tiny +block-junction-tiny rotate: false - xy: 1025, 79 + xy: 2923, 136 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-kiln-xlarge +block-junction-xlarge rotate: false xy: 495, 354 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-lancer-large +block-kiln-large rotate: false - xy: 943, 245 + xy: 1708, 329 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-lancer-medium +block-kiln-medium rotate: false - xy: 1433, 135 + xy: 986, 127 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-lancer-small +block-kiln-small rotate: false - xy: 3711, 304 + xy: 3375, 206 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-lancer-tiny +block-kiln-tiny rotate: false - xy: 1025, 61 + xy: 2941, 136 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-lancer-xlarge +block-kiln-xlarge rotate: false xy: 545, 354 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-large-logic-display-large +block-lancer-large rotate: false - xy: 985, 287 + xy: 1750, 329 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-large-logic-display-medium +block-lancer-medium rotate: false - xy: 1467, 135 + xy: 985, 93 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-large-logic-display-small +block-lancer-small rotate: false - xy: 3565, 287 + xy: 2621, 183 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-large-logic-display-tiny +block-lancer-tiny rotate: false - xy: 1025, 43 + xy: 2959, 136 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-large-logic-display-xlarge +block-lancer-xlarge rotate: false xy: 595, 354 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-laser-drill-large +block-large-logic-display-large rotate: false - xy: 1027, 329 + xy: 1792, 329 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-laser-drill-medium +block-large-logic-display-medium rotate: false - xy: 1501, 135 + xy: 1020, 127 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-laser-drill-small +block-large-logic-display-small rotate: false - xy: 3591, 287 + xy: 2647, 175 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-laser-drill-tiny +block-large-logic-display-tiny rotate: false - xy: 1025, 25 + xy: 2977, 136 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-laser-drill-xlarge +block-large-logic-display-xlarge rotate: false xy: 645, 354 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-launch-pad-large +block-laser-drill-large rotate: false - xy: 943, 203 + xy: 1834, 329 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-launch-pad-large-large +block-laser-drill-medium rotate: false - xy: 985, 245 - size: 40, 40 - orig: 40, 40 - offset: 0, 0 - index: -1 -block-launch-pad-large-medium - rotate: false - xy: 1535, 135 + xy: 1019, 93 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-launch-pad-large-small +block-laser-drill-small rotate: false - xy: 3617, 287 + xy: 2673, 175 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-launch-pad-large-tiny +block-laser-drill-tiny rotate: false - xy: 1007, 7 + xy: 2995, 136 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-launch-pad-large-xlarge +block-laser-drill-xlarge rotate: false xy: 695, 354 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-launch-pad-medium +block-launch-pad-large rotate: false - xy: 1569, 135 + xy: 1876, 329 + size: 40, 40 + orig: 40, 40 + offset: 0, 0 + index: -1 +block-launch-pad-large-large + rotate: false + xy: 1918, 329 + size: 40, 40 + orig: 40, 40 + offset: 0, 0 + index: -1 +block-launch-pad-large-medium + rotate: false + xy: 1054, 127 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-launch-pad-small +block-launch-pad-large-small rotate: false - xy: 3595, 261 + xy: 2699, 175 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-launch-pad-tiny +block-launch-pad-large-tiny rotate: false - xy: 1025, 7 + xy: 3013, 136 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-launch-pad-xlarge +block-launch-pad-large-xlarge rotate: false xy: 231, 96 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-liquid-junction-large +block-launch-pad-medium rotate: false - xy: 1027, 287 - size: 40, 40 - orig: 40, 40 - offset: 0, 0 - index: -1 -block-liquid-junction-medium - rotate: false - xy: 1603, 135 + xy: 1053, 93 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-liquid-junction-small +block-launch-pad-small rotate: false - xy: 3621, 261 + xy: 2725, 180 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-liquid-junction-tiny +block-launch-pad-tiny rotate: false - xy: 4030, 212 + xy: 3031, 136 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-liquid-junction-xlarge +block-launch-pad-xlarge rotate: false xy: 231, 46 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-liquid-router-large +block-liquid-junction-large rotate: false - xy: 1069, 329 + xy: 1960, 329 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-liquid-router-medium +block-liquid-junction-medium rotate: false - xy: 1637, 135 + xy: 1088, 135 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-liquid-router-small +block-liquid-junction-small rotate: false - xy: 3617, 235 + xy: 2751, 180 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-liquid-router-tiny +block-liquid-junction-tiny rotate: false - xy: 4030, 194 + xy: 3049, 136 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-liquid-router-xlarge +block-liquid-junction-xlarge rotate: false xy: 745, 354 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-liquid-source-large +block-liquid-router-large rotate: false - xy: 985, 203 + xy: 2002, 329 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-liquid-source-medium +block-liquid-router-medium rotate: false - xy: 1671, 135 + xy: 1122, 135 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-liquid-source-small +block-liquid-router-small rotate: false - xy: 3617, 209 + xy: 2777, 180 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-liquid-source-tiny +block-liquid-router-tiny rotate: false - xy: 2663, 141 + xy: 3067, 136 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-liquid-source-xlarge +block-liquid-router-xlarge rotate: false xy: 281, 107 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-liquid-tank-large +block-liquid-source-large rotate: false - xy: 1027, 245 + xy: 2044, 329 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-liquid-tank-medium +block-liquid-source-medium rotate: false - xy: 1705, 135 + xy: 1156, 135 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-liquid-tank-small +block-liquid-source-small rotate: false - xy: 3614, 183 + xy: 2803, 180 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-liquid-tank-tiny +block-liquid-source-tiny rotate: false - xy: 2666, 159 + xy: 3085, 136 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-liquid-tank-xlarge +block-liquid-source-xlarge rotate: false xy: 281, 57 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-liquid-void-large +block-liquid-tank-large rotate: false - xy: 1069, 287 + xy: 2086, 329 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-liquid-void-medium +block-liquid-tank-medium rotate: false - xy: 1739, 135 + xy: 1190, 135 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-liquid-void-small +block-liquid-tank-small rotate: false - xy: 3614, 157 + xy: 2829, 180 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-liquid-void-tiny +block-liquid-tank-tiny rotate: false - xy: 2663, 123 + xy: 3103, 136 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-liquid-void-xlarge +block-liquid-tank-xlarge rotate: false xy: 795, 366 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-logic-display-large +block-liquid-void-large rotate: false - xy: 1111, 329 + xy: 2128, 329 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-logic-display-medium +block-liquid-void-medium rotate: false - xy: 1773, 135 + xy: 1224, 135 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-logic-display-small +block-liquid-void-small rotate: false - xy: 3614, 131 + xy: 2855, 180 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-logic-display-tiny +block-liquid-void-tiny rotate: false - xy: 2661, 105 + xy: 3121, 136 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-logic-display-xlarge +block-liquid-void-xlarge rotate: false xy: 309, 304 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-logic-processor-large +block-logic-display-large rotate: false - xy: 1027, 203 + xy: 2170, 329 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-logic-processor-medium +block-logic-display-medium rotate: false - xy: 1807, 135 + xy: 1258, 135 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-logic-processor-small +block-logic-display-small rotate: false - xy: 3611, 105 + xy: 2881, 180 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-logic-processor-tiny +block-logic-display-tiny rotate: false - xy: 2660, 87 + xy: 3139, 136 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-logic-processor-xlarge +block-logic-display-xlarge rotate: false xy: 309, 254 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-magmarock-large +block-logic-processor-large rotate: false - xy: 1069, 245 + xy: 2212, 329 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-magmarock-medium +block-logic-processor-medium rotate: false - xy: 1841, 135 + xy: 1292, 135 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-magmarock-small +block-logic-processor-small rotate: false - xy: 1974, 55 + xy: 2907, 180 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-magmarock-tiny +block-logic-processor-tiny rotate: false - xy: 2660, 69 + xy: 3157, 136 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-magmarock-xlarge +block-logic-processor-xlarge rotate: false xy: 359, 304 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-mass-driver-large +block-magmarock-large rotate: false - xy: 1111, 287 + xy: 2254, 329 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-mass-driver-medium +block-magmarock-medium rotate: false - xy: 1875, 135 + xy: 1326, 135 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-mass-driver-small +block-magmarock-small rotate: false - xy: 2000, 55 + xy: 2933, 180 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-mass-driver-tiny +block-magmarock-tiny rotate: false - xy: 2660, 51 + xy: 3175, 136 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-mass-driver-xlarge +block-magmarock-xlarge rotate: false xy: 309, 204 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-mechanical-drill-large +block-mass-driver-large rotate: false - xy: 1153, 329 + xy: 2296, 329 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-mechanical-drill-medium +block-mass-driver-medium rotate: false - xy: 1909, 135 + xy: 1360, 135 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-mechanical-drill-small +block-mass-driver-small rotate: false - xy: 2026, 49 + xy: 2959, 180 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-mechanical-drill-tiny +block-mass-driver-tiny rotate: false - xy: 2660, 33 + xy: 3193, 136 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-mechanical-drill-xlarge +block-mass-driver-xlarge rotate: false xy: 359, 254 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-mechanical-pump-large +block-mechanical-drill-large rotate: false - xy: 1069, 203 + xy: 2338, 329 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-mechanical-pump-medium +block-mechanical-drill-medium rotate: false - xy: 1943, 135 + xy: 1394, 135 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-mechanical-pump-small +block-mechanical-drill-small rotate: false - xy: 2052, 49 + xy: 2985, 180 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-mechanical-pump-tiny +block-mechanical-drill-tiny rotate: false - xy: 4037, 264 + xy: 3211, 136 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-mechanical-pump-xlarge +block-mechanical-drill-xlarge rotate: false xy: 409, 304 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-meltdown-large +block-mechanical-pump-large rotate: false - xy: 1111, 245 + xy: 2380, 329 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-meltdown-medium +block-mechanical-pump-medium rotate: false - xy: 1977, 135 + xy: 1428, 135 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-meltdown-small +block-mechanical-pump-small rotate: false - xy: 3643, 235 + xy: 3011, 180 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-meltdown-tiny +block-mechanical-pump-tiny rotate: false - xy: 4037, 246 + xy: 3229, 136 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-meltdown-xlarge +block-mechanical-pump-xlarge rotate: false xy: 359, 204 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-melter-large +block-meltdown-large rotate: false - xy: 1153, 287 + xy: 2422, 329 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-melter-medium +block-meltdown-medium rotate: false - xy: 2011, 135 + xy: 1462, 135 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-melter-small +block-meltdown-small rotate: false - xy: 3643, 209 + xy: 3037, 180 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-melter-tiny +block-meltdown-tiny rotate: false - xy: 4055, 266 + xy: 3247, 136 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-melter-xlarge +block-meltdown-xlarge rotate: false xy: 409, 254 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-memory-bank-large +block-melter-large rotate: false - xy: 1195, 329 + xy: 2464, 329 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-memory-bank-medium +block-melter-medium rotate: false - xy: 2045, 135 + xy: 1496, 135 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-memory-bank-small +block-melter-small rotate: false - xy: 3640, 183 + xy: 3063, 180 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-memory-bank-tiny +block-melter-tiny rotate: false - xy: 4055, 248 + xy: 3265, 136 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-memory-bank-xlarge +block-melter-xlarge rotate: false xy: 459, 304 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-memory-cell-large +block-memory-bank-large rotate: false - xy: 1111, 203 + xy: 2506, 329 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-memory-cell-medium +block-memory-bank-medium rotate: false - xy: 2079, 135 + xy: 1530, 135 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-memory-cell-small +block-memory-bank-small rotate: false - xy: 3640, 157 + xy: 3089, 180 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-memory-cell-tiny +block-memory-bank-tiny rotate: false - xy: 4073, 266 + xy: 3283, 136 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-memory-cell-xlarge +block-memory-bank-xlarge rotate: false xy: 409, 204 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-mend-projector-large +block-memory-cell-large rotate: false - xy: 1153, 245 + xy: 2548, 329 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-mend-projector-medium +block-memory-cell-medium rotate: false - xy: 2113, 135 + xy: 1564, 135 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-mend-projector-small +block-memory-cell-small rotate: false - xy: 3640, 131 + xy: 3115, 180 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-mend-projector-tiny +block-memory-cell-tiny rotate: false - xy: 4073, 248 + xy: 3301, 136 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-mend-projector-xlarge +block-memory-cell-xlarge rotate: false xy: 459, 254 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-mender-large +block-mend-projector-large rotate: false - xy: 1195, 287 + xy: 2590, 329 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-mender-medium +block-mend-projector-medium rotate: false - xy: 2147, 135 + xy: 1598, 135 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-mender-small +block-mend-projector-small rotate: false - xy: 3637, 105 + xy: 3141, 180 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-mender-tiny +block-mend-projector-tiny rotate: false - xy: 4030, 176 + xy: 3319, 136 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-mender-xlarge +block-mend-projector-xlarge rotate: false xy: 509, 304 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-message-large +block-mender-large rotate: false - xy: 1237, 329 + xy: 2632, 329 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-message-medium +block-mender-medium rotate: false - xy: 2181, 135 + xy: 1632, 135 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-message-small +block-mender-small rotate: false - xy: 3647, 261 + xy: 3167, 180 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-message-tiny +block-mender-tiny rotate: false - xy: 4030, 158 + xy: 3337, 136 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-message-xlarge +block-mender-xlarge rotate: false xy: 459, 204 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-metal-floor-2-large +block-message-large rotate: false - xy: 1153, 203 + xy: 2674, 329 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-metal-floor-2-medium +block-message-medium rotate: false - xy: 2215, 135 + xy: 1666, 135 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-metal-floor-2-small +block-message-small rotate: false - xy: 3673, 278 + xy: 3193, 180 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-metal-floor-2-tiny +block-message-tiny rotate: false - xy: 4030, 140 + xy: 3355, 136 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-metal-floor-2-xlarge +block-message-xlarge rotate: false xy: 509, 254 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-metal-floor-3-large +block-metal-floor-2-large rotate: false - xy: 1195, 245 + xy: 2716, 329 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-metal-floor-3-medium +block-metal-floor-2-medium rotate: false - xy: 2249, 135 + xy: 1700, 135 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-metal-floor-3-small +block-metal-floor-2-small rotate: false - xy: 3699, 278 + xy: 3219, 180 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-metal-floor-3-tiny +block-metal-floor-2-tiny rotate: false - xy: 4030, 122 + xy: 3373, 136 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-metal-floor-3-xlarge +block-metal-floor-2-xlarge rotate: false xy: 559, 304 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-metal-floor-5-large +block-metal-floor-3-large rotate: false - xy: 1237, 287 + xy: 2758, 329 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-metal-floor-5-medium +block-metal-floor-3-medium rotate: false - xy: 2283, 135 + xy: 1734, 135 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-metal-floor-5-small +block-metal-floor-3-small rotate: false - xy: 3673, 252 + xy: 3245, 180 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-metal-floor-5-tiny +block-metal-floor-3-tiny rotate: false - xy: 4030, 104 + xy: 2630, 121 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-metal-floor-5-xlarge +block-metal-floor-3-xlarge rotate: false xy: 509, 204 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-metal-floor-damaged-large +block-metal-floor-5-large rotate: false - xy: 1279, 329 + xy: 2800, 329 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-metal-floor-damaged-medium +block-metal-floor-5-medium rotate: false - xy: 2317, 135 + xy: 1768, 135 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-metal-floor-damaged-small +block-metal-floor-5-small rotate: false - xy: 3699, 252 + xy: 3271, 180 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-metal-floor-damaged-tiny +block-metal-floor-5-tiny rotate: false - xy: 2681, 141 + xy: 2648, 121 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-metal-floor-damaged-xlarge +block-metal-floor-5-xlarge rotate: false xy: 559, 254 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-metal-floor-large +block-metal-floor-damaged-large rotate: false - xy: 1195, 203 + xy: 2842, 329 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-metal-floor-medium +block-metal-floor-damaged-medium rotate: false - xy: 2351, 135 + xy: 1802, 135 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-metal-floor-small +block-metal-floor-damaged-small rotate: false - xy: 3669, 226 + xy: 3297, 180 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-metal-floor-tiny +block-metal-floor-damaged-tiny rotate: false - xy: 2681, 123 + xy: 2666, 121 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-metal-floor-xlarge +block-metal-floor-damaged-xlarge rotate: false xy: 609, 304 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-micro-processor-large +block-metal-floor-large rotate: false - xy: 1237, 245 + xy: 2884, 329 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-micro-processor-medium +block-metal-floor-medium rotate: false - xy: 2385, 135 + xy: 1836, 135 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-micro-processor-small +block-metal-floor-small rotate: false - xy: 3695, 226 + xy: 3323, 180 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-micro-processor-tiny +block-metal-floor-tiny rotate: false - xy: 2679, 105 + xy: 2684, 121 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-micro-processor-xlarge +block-metal-floor-xlarge rotate: false xy: 559, 204 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-moss-large +block-micro-processor-large rotate: false - xy: 1279, 287 + xy: 2926, 329 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-moss-medium +block-micro-processor-medium rotate: false - xy: 2419, 135 + xy: 1870, 135 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-moss-small +block-micro-processor-small rotate: false - xy: 3669, 200 + xy: 3349, 180 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-moss-tiny +block-micro-processor-tiny rotate: false - xy: 2678, 87 + xy: 2702, 121 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-moss-xlarge +block-micro-processor-xlarge rotate: false xy: 609, 254 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-mud-large +block-moss-large rotate: false - xy: 1321, 329 + xy: 2968, 329 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-mud-medium +block-moss-medium rotate: false - xy: 2453, 126 + xy: 1904, 135 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-mud-small +block-moss-small rotate: false - xy: 3695, 200 + xy: 3375, 180 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-mud-tiny +block-moss-tiny rotate: false - xy: 2678, 69 + xy: 2630, 103 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-mud-xlarge +block-moss-xlarge rotate: false xy: 659, 304 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-multi-press-large +block-mud-large rotate: false - xy: 1237, 203 + xy: 3010, 329 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-multi-press-medium +block-mud-medium rotate: false - xy: 2487, 111 + xy: 1938, 135 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-multi-press-small +block-mud-small rotate: false - xy: 3666, 174 + xy: 3401, 193 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-multi-press-tiny +block-mud-tiny rotate: false - xy: 2678, 51 + xy: 2648, 103 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-multi-press-xlarge +block-mud-xlarge rotate: false xy: 609, 204 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-multiplicative-reconstructor-large +block-multi-press-large rotate: false - xy: 1279, 245 + xy: 3052, 329 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-multiplicative-reconstructor-medium +block-multi-press-medium rotate: false - xy: 2531, 213 + xy: 1972, 135 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-multiplicative-reconstructor-small +block-multi-press-small rotate: false - xy: 3666, 148 + xy: 3427, 193 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-multiplicative-reconstructor-tiny +block-multi-press-tiny rotate: false - xy: 2678, 33 + xy: 2666, 103 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-multiplicative-reconstructor-xlarge +block-multi-press-xlarge rotate: false xy: 659, 254 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-naval-factory-large +block-multiplicative-reconstructor-large rotate: false - xy: 1321, 287 + xy: 3094, 329 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-naval-factory-medium +block-multiplicative-reconstructor-medium rotate: false - xy: 2523, 179 + xy: 2006, 135 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-naval-factory-small +block-multiplicative-reconstructor-small rotate: false - xy: 3692, 174 + xy: 3401, 167 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-naval-factory-tiny +block-multiplicative-reconstructor-tiny rotate: false - xy: 2684, 159 + xy: 2684, 103 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-naval-factory-xlarge +block-multiplicative-reconstructor-xlarge rotate: false xy: 709, 304 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-oil-extractor-large +block-naval-factory-large rotate: false - xy: 1363, 329 + xy: 3136, 329 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-oil-extractor-medium +block-naval-factory-medium rotate: false - xy: 2521, 145 + xy: 2040, 135 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-oil-extractor-small +block-naval-factory-small rotate: false - xy: 3692, 148 + xy: 3427, 167 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-oil-extractor-tiny +block-naval-factory-tiny rotate: false - xy: 2702, 159 + xy: 2702, 103 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-oil-extractor-xlarge +block-naval-factory-xlarge rotate: false xy: 659, 204 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-ore-coal-large +block-oil-extractor-large rotate: false - xy: 1279, 203 + xy: 3178, 329 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-ore-coal-medium +block-oil-extractor-medium rotate: false - xy: 2521, 111 + xy: 2074, 135 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-ore-coal-small +block-oil-extractor-small rotate: false - xy: 3666, 122 + xy: 2142, 83 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-ore-coal-tiny +block-oil-extractor-tiny rotate: false - xy: 2699, 141 + xy: 2720, 118 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-ore-coal-xlarge +block-oil-extractor-xlarge rotate: false xy: 709, 254 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-ore-copper-large +block-ore-coal-large rotate: false - xy: 1321, 245 + xy: 3220, 329 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-ore-copper-medium +block-ore-coal-medium rotate: false - xy: 2565, 217 + xy: 2108, 137 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-ore-copper-small +block-ore-coal-small rotate: false - xy: 3692, 122 + xy: 2168, 83 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-ore-copper-tiny +block-ore-coal-tiny rotate: false - xy: 2699, 123 + xy: 2738, 118 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-ore-copper-xlarge +block-ore-coal-xlarge rotate: false xy: 709, 204 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-ore-lead-large +block-ore-copper-large rotate: false - xy: 1363, 287 + xy: 3262, 329 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-ore-lead-medium +block-ore-copper-medium rotate: false - xy: 2599, 219 + xy: 2142, 143 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-ore-lead-small +block-ore-copper-small rotate: false - xy: 3663, 96 + xy: 2194, 86 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-ore-lead-tiny +block-ore-copper-tiny rotate: false - xy: 2697, 105 + xy: 2756, 118 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-ore-lead-xlarge +block-ore-copper-xlarge rotate: false xy: 759, 304 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-ore-scrap-large +block-ore-lead-large rotate: false - xy: 1405, 329 + xy: 3304, 329 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-ore-scrap-medium +block-ore-lead-medium rotate: false - xy: 2633, 219 + xy: 2176, 146 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-ore-scrap-small +block-ore-lead-small rotate: false - xy: 3689, 96 + xy: 2220, 86 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-ore-scrap-tiny +block-ore-lead-tiny rotate: false - xy: 2696, 87 + xy: 2774, 118 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-ore-scrap-xlarge +block-ore-lead-xlarge rotate: false xy: 759, 254 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-ore-thorium-large +block-ore-scrap-large rotate: false - xy: 1321, 203 + xy: 3346, 329 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-ore-thorium-medium +block-ore-scrap-medium rotate: false - xy: 2667, 220 + xy: 2196, 180 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-ore-thorium-small +block-ore-scrap-small rotate: false - xy: 3725, 278 + xy: 2246, 89 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-ore-thorium-tiny +block-ore-scrap-tiny rotate: false - xy: 2696, 69 + xy: 2792, 118 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-ore-thorium-xlarge +block-ore-scrap-xlarge rotate: false xy: 759, 204 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-ore-titanium-large +block-ore-thorium-large rotate: false - xy: 1363, 245 + xy: 3388, 329 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-ore-titanium-medium +block-ore-thorium-medium rotate: false - xy: 2701, 211 + xy: 2230, 183 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-ore-titanium-small +block-ore-thorium-small rotate: false - xy: 3725, 252 + xy: 2152, 57 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-ore-titanium-tiny +block-ore-thorium-tiny rotate: false - xy: 2696, 51 + xy: 2810, 118 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-ore-titanium-xlarge +block-ore-thorium-xlarge rotate: false xy: 809, 316 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-overdrive-dome-large +block-ore-titanium-large rotate: false - xy: 1405, 287 + xy: 3430, 329 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-overdrive-dome-medium +block-ore-titanium-medium rotate: false - xy: 2667, 186 + xy: 2210, 146 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-overdrive-dome-small +block-ore-titanium-small rotate: false - xy: 3721, 226 + xy: 2152, 31 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-overdrive-dome-tiny +block-ore-titanium-tiny rotate: false - xy: 2696, 33 + xy: 2828, 118 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-overdrive-dome-xlarge +block-ore-titanium-xlarge rotate: false xy: 809, 266 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-overdrive-projector-large +block-overdrive-dome-large rotate: false - xy: 1447, 329 + xy: 3472, 329 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-overdrive-projector-medium +block-overdrive-dome-medium rotate: false - xy: 2701, 177 + xy: 2244, 149 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-overdrive-projector-small +block-overdrive-dome-small rotate: false - xy: 3721, 200 + xy: 2149, 5 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-overdrive-projector-tiny +block-overdrive-dome-tiny rotate: false - xy: 2717, 141 + xy: 2846, 118 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-overdrive-projector-xlarge +block-overdrive-dome-xlarge rotate: false xy: 809, 216 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-overflow-gate-large +block-overdrive-projector-large rotate: false - xy: 1363, 203 + xy: 3514, 329 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-overflow-gate-medium +block-overdrive-projector-medium rotate: false - xy: 2741, 227 + xy: 2573, 245 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-overflow-gate-small +block-overdrive-projector-small rotate: false - xy: 3718, 174 + xy: 2178, 57 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-overflow-gate-tiny +block-overdrive-projector-tiny rotate: false - xy: 2735, 141 + xy: 2864, 118 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-overflow-gate-xlarge +block-overdrive-projector-xlarge rotate: false xy: 809, 166 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-parallax-large +block-overflow-gate-large rotate: false - xy: 1405, 245 + xy: 3556, 329 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-parallax-medium +block-overflow-gate-medium rotate: false - xy: 2735, 193 + xy: 2725, 232 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-parallax-small +block-overflow-gate-small rotate: false - xy: 3718, 148 + xy: 2178, 31 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-parallax-tiny +block-overflow-gate-tiny rotate: false - xy: 2717, 123 + xy: 2882, 118 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-parallax-xlarge +block-overflow-gate-xlarge rotate: false xy: 281, 7 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-payload-conveyor-large +block-parallax-large rotate: false - xy: 1447, 287 + xy: 3598, 329 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-payload-conveyor-medium +block-parallax-medium rotate: false - xy: 2775, 219 + xy: 2759, 232 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-payload-conveyor-small +block-parallax-small rotate: false - xy: 3718, 122 + xy: 2175, 5 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-payload-conveyor-tiny +block-parallax-tiny rotate: false - xy: 2715, 105 + xy: 2900, 118 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-payload-conveyor-xlarge +block-parallax-xlarge rotate: false xy: 331, 154 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-payload-router-large +block-payload-conveyor-large rotate: false - xy: 1489, 329 + xy: 3640, 335 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-payload-router-medium +block-payload-conveyor-medium rotate: false - xy: 2809, 219 + xy: 2793, 232 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-payload-router-small +block-payload-conveyor-small rotate: false - xy: 3715, 96 + xy: 2204, 60 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-payload-router-tiny +block-payload-conveyor-tiny rotate: false - xy: 2714, 87 + xy: 2918, 118 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-payload-router-xlarge +block-payload-conveyor-xlarge rotate: false xy: 331, 104 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-pebbles-large +block-payload-router-large rotate: false - xy: 1405, 203 + xy: 4051, 281 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-pebbles-medium +block-payload-router-medium rotate: false - xy: 2769, 185 + xy: 2827, 232 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-pebbles-small +block-payload-router-small rotate: false - xy: 3751, 287 + xy: 2204, 34 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-pebbles-tiny +block-payload-router-tiny rotate: false - xy: 2735, 123 + xy: 2936, 118 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-pebbles-xlarge +block-payload-router-xlarge rotate: false xy: 381, 154 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-phase-conduit-large +block-pebbles-large rotate: false - xy: 1447, 245 + xy: 859, 321 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-phase-conduit-medium +block-pebbles-medium rotate: false - xy: 2803, 185 + xy: 2861, 232 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-phase-conduit-small +block-pebbles-small rotate: false - xy: 3751, 261 + xy: 2230, 60 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-phase-conduit-tiny +block-pebbles-tiny rotate: false - xy: 2733, 105 + xy: 2954, 118 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-phase-conduit-xlarge +block-pebbles-xlarge rotate: false xy: 331, 54 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-phase-conveyor-large +block-phase-conduit-large rotate: false - xy: 1489, 287 + xy: 901, 321 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-phase-conveyor-medium +block-phase-conduit-medium rotate: false - xy: 2735, 159 + xy: 2895, 232 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-phase-conveyor-small +block-phase-conduit-small rotate: false - xy: 3777, 287 + xy: 2230, 34 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-phase-conveyor-tiny +block-phase-conduit-tiny rotate: false - xy: 2732, 87 + xy: 2972, 118 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-phase-conveyor-xlarge +block-phase-conduit-xlarge rotate: false xy: 381, 104 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-phase-wall-large +block-phase-conveyor-large rotate: false - xy: 1531, 329 + xy: 859, 279 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-phase-wall-large-large +block-phase-conveyor-medium rotate: false - xy: 1447, 203 - size: 40, 40 - orig: 40, 40 - offset: 0, 0 - index: -1 -block-phase-wall-large-medium - rotate: false - xy: 2769, 151 + xy: 2929, 232 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-phase-wall-large-small +block-phase-conveyor-small rotate: false - xy: 3777, 261 + xy: 2256, 63 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-phase-wall-large-tiny +block-phase-conveyor-tiny rotate: false - xy: 2714, 69 + xy: 2990, 118 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-phase-wall-large-xlarge +block-phase-conveyor-xlarge rotate: false xy: 431, 154 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-phase-wall-medium +block-phase-wall-large rotate: false - xy: 2803, 151 + xy: 943, 321 + size: 40, 40 + orig: 40, 40 + offset: 0, 0 + index: -1 +block-phase-wall-large-large + rotate: false + xy: 859, 237 + size: 40, 40 + orig: 40, 40 + offset: 0, 0 + index: -1 +block-phase-wall-large-medium + rotate: false + xy: 2963, 232 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-phase-wall-small +block-phase-wall-large-small rotate: false - xy: 3803, 287 + xy: 2256, 37 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-phase-wall-tiny +block-phase-wall-large-tiny rotate: false - xy: 2714, 51 + xy: 3008, 118 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-phase-wall-xlarge +block-phase-wall-large-xlarge rotate: false xy: 381, 54 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-phase-weaver-large +block-phase-wall-medium rotate: false - xy: 1489, 245 - size: 40, 40 - orig: 40, 40 - offset: 0, 0 - index: -1 -block-phase-weaver-medium - rotate: false - xy: 2557, 179 + xy: 2997, 232 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-phase-weaver-small +block-phase-wall-small rotate: false - xy: 3803, 261 + xy: 2272, 89 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-phase-weaver-tiny +block-phase-wall-tiny rotate: false - xy: 2732, 69 + xy: 3026, 118 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-phase-weaver-xlarge +block-phase-wall-xlarge rotate: false xy: 431, 104 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-pine-large +block-phase-weaver-large rotate: false - xy: 1531, 287 + xy: 901, 279 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-pine-medium +block-phase-weaver-medium rotate: false - xy: 2555, 145 + xy: 3031, 232 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-pine-small +block-phase-weaver-small rotate: false - xy: 3829, 261 + xy: 2282, 63 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-pine-tiny +block-phase-weaver-tiny rotate: false - xy: 2714, 33 + xy: 3044, 118 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-pine-xlarge +block-phase-weaver-xlarge rotate: false xy: 481, 154 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-plastanium-compressor-large +block-pine-large rotate: false - xy: 1573, 329 + xy: 985, 321 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-plastanium-compressor-medium +block-pine-medium rotate: false - xy: 2555, 111 + xy: 3065, 232 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-plastanium-compressor-small +block-pine-small rotate: false - xy: 3855, 261 + xy: 2282, 37 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-plastanium-compressor-tiny +block-pine-tiny rotate: false - xy: 2732, 51 + xy: 3062, 118 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-plastanium-compressor-xlarge +block-pine-xlarge rotate: false xy: 431, 54 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-plastanium-conveyor-large +block-plastanium-compressor-large rotate: false - xy: 1489, 203 + xy: 859, 195 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-plastanium-conveyor-medium +block-plastanium-compressor-medium rotate: false - xy: 2843, 219 + xy: 3099, 232 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-plastanium-conveyor-small +block-plastanium-compressor-small rotate: false - xy: 3881, 261 + xy: 3677, 173 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-plastanium-conveyor-tiny +block-plastanium-compressor-tiny rotate: false - xy: 2732, 33 + xy: 3080, 118 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-plastanium-conveyor-xlarge +block-plastanium-compressor-xlarge rotate: false xy: 481, 104 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-plastanium-wall-large +block-plastanium-conveyor-large rotate: false - xy: 1531, 245 + xy: 901, 237 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-plastanium-wall-large-large +block-plastanium-conveyor-medium rotate: false - xy: 1573, 287 - size: 40, 40 - orig: 40, 40 - offset: 0, 0 - index: -1 -block-plastanium-wall-large-medium - rotate: false - xy: 2837, 185 + xy: 3133, 232 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-plastanium-wall-large-small +block-plastanium-conveyor-small rotate: false - xy: 3907, 261 + xy: 3703, 166 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-plastanium-wall-large-tiny +block-plastanium-conveyor-tiny rotate: false - xy: 4055, 230 + xy: 3098, 118 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-plastanium-wall-large-xlarge +block-plastanium-conveyor-xlarge rotate: false xy: 531, 154 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-plastanium-wall-medium +block-plastanium-wall-large rotate: false - xy: 2837, 151 + xy: 943, 279 + size: 40, 40 + orig: 40, 40 + offset: 0, 0 + index: -1 +block-plastanium-wall-large-large + rotate: false + xy: 1027, 321 + size: 40, 40 + orig: 40, 40 + offset: 0, 0 + index: -1 +block-plastanium-wall-large-medium + rotate: false + xy: 3167, 232 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-plastanium-wall-small +block-plastanium-wall-large-small rotate: false - xy: 3933, 261 + xy: 3729, 166 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-plastanium-wall-tiny +block-plastanium-wall-large-tiny rotate: false - xy: 4073, 230 + xy: 3116, 118 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-plastanium-wall-xlarge +block-plastanium-wall-large-xlarge rotate: false xy: 481, 54 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-plated-conduit-large +block-plastanium-wall-medium rotate: false - xy: 1615, 329 - size: 40, 40 - orig: 40, 40 - offset: 0, 0 - index: -1 -block-plated-conduit-medium - rotate: false - xy: 2851, 253 + xy: 3201, 232 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-plated-conduit-small +block-plastanium-wall-small rotate: false - xy: 3751, 235 + xy: 3737, 192 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-plated-conduit-tiny +block-plastanium-wall-tiny rotate: false - xy: 4048, 212 + xy: 3134, 118 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-plated-conduit-xlarge +block-plastanium-wall-xlarge rotate: false xy: 531, 104 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-pneumatic-drill-large +block-plated-conduit-large rotate: false - xy: 1531, 203 + xy: 901, 195 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-pneumatic-drill-medium +block-plated-conduit-medium rotate: false - xy: 2877, 219 + xy: 3235, 232 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-pneumatic-drill-small +block-plated-conduit-small rotate: false - xy: 3777, 235 + xy: 3755, 166 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-pneumatic-drill-tiny +block-plated-conduit-tiny rotate: false - xy: 4066, 212 + xy: 3152, 118 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-pneumatic-drill-xlarge +block-plated-conduit-xlarge rotate: false xy: 581, 154 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-power-node-large +block-pneumatic-drill-large rotate: false - xy: 1573, 245 + xy: 943, 237 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-power-node-large-large +block-pneumatic-drill-medium rotate: false - xy: 1615, 287 - size: 40, 40 - orig: 40, 40 - offset: 0, 0 - index: -1 -block-power-node-large-medium - rotate: false - xy: 2871, 185 + xy: 3269, 232 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-power-node-large-small +block-pneumatic-drill-small rotate: false - xy: 3803, 235 + xy: 3728, 313 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-power-node-large-tiny +block-pneumatic-drill-tiny rotate: false - xy: 4048, 194 + xy: 3170, 118 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-power-node-large-xlarge +block-pneumatic-drill-xlarge rotate: false xy: 531, 54 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-power-node-medium +block-power-node-large rotate: false - xy: 2871, 151 + xy: 985, 279 + size: 40, 40 + orig: 40, 40 + offset: 0, 0 + index: -1 +block-power-node-large-large + rotate: false + xy: 943, 195 + size: 40, 40 + orig: 40, 40 + offset: 0, 0 + index: -1 +block-power-node-large-medium + rotate: false + xy: 3303, 232 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-power-node-small +block-power-node-large-small rotate: false - xy: 3829, 235 + xy: 3711, 287 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-power-node-tiny +block-power-node-large-tiny rotate: false - xy: 4066, 194 + xy: 3188, 118 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-power-node-xlarge +block-power-node-large-xlarge rotate: false xy: 581, 104 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-power-source-large +block-power-node-medium rotate: false - xy: 1657, 329 - size: 40, 40 - orig: 40, 40 - offset: 0, 0 - index: -1 -block-power-source-medium - rotate: false - xy: 2885, 253 + xy: 3337, 232 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-power-source-small +block-power-node-small rotate: false - xy: 3855, 235 + xy: 3737, 287 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-power-source-tiny +block-power-node-tiny rotate: false - xy: 4048, 176 + xy: 3206, 118 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-power-source-xlarge +block-power-node-xlarge rotate: false xy: 631, 154 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-power-void-large +block-power-source-large rotate: false - xy: 1573, 203 + xy: 985, 237 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-power-void-medium +block-power-source-medium rotate: false - xy: 2919, 274 + xy: 3371, 232 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-power-void-small +block-power-source-small rotate: false - xy: 3881, 235 + xy: 3740, 261 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-power-void-tiny +block-power-source-tiny rotate: false - xy: 4066, 176 + xy: 3224, 118 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-power-void-xlarge +block-power-source-xlarge rotate: false xy: 581, 54 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-pulse-conduit-large +block-power-void-large rotate: false - xy: 1615, 245 + xy: 1027, 279 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-pulse-conduit-medium +block-power-void-medium rotate: false - xy: 2953, 274 + xy: 3405, 253 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-pulse-conduit-small +block-power-void-small rotate: false - xy: 3907, 235 + xy: 3740, 235 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-pulse-conduit-tiny +block-power-void-tiny rotate: false - xy: 4048, 158 + xy: 3242, 118 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-pulse-conduit-xlarge +block-power-void-xlarge rotate: false xy: 631, 104 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-pulverizer-large +block-pulse-conduit-large rotate: false - xy: 1657, 287 + xy: 985, 195 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-pulverizer-medium +block-pulse-conduit-medium rotate: false - xy: 2987, 274 + xy: 3439, 253 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-pulverizer-small +block-pulse-conduit-small rotate: false - xy: 3933, 235 + xy: 2389, 191 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-pulverizer-tiny +block-pulse-conduit-tiny rotate: false - xy: 4066, 158 + xy: 3260, 118 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-pulverizer-xlarge +block-pulse-conduit-xlarge rotate: false xy: 681, 154 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-pyratite-mixer-large +block-pulverizer-large rotate: false - xy: 1699, 329 + xy: 1027, 237 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-pyratite-mixer-medium +block-pulverizer-medium rotate: false - xy: 3021, 274 + xy: 3473, 261 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-pyratite-mixer-small +block-pulverizer-small rotate: false - xy: 3747, 209 + xy: 2415, 191 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-pyratite-mixer-tiny +block-pulverizer-tiny rotate: false - xy: 4048, 140 + xy: 3278, 118 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-pyratite-mixer-xlarge +block-pulverizer-xlarge rotate: false xy: 631, 54 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-repair-point-large +block-pyratite-mixer-large rotate: false - xy: 1615, 203 + xy: 1027, 195 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-repair-point-medium +block-pyratite-mixer-medium rotate: false - xy: 3055, 274 + xy: 3507, 261 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-repair-point-small +block-pyratite-mixer-small rotate: false - xy: 3773, 209 + xy: 2441, 193 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-repair-point-tiny +block-pyratite-mixer-tiny rotate: false - xy: 4066, 140 + xy: 3296, 118 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-repair-point-xlarge +block-pyratite-mixer-xlarge rotate: false xy: 681, 104 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-resupply-point-large +block-repair-point-large rotate: false - xy: 1657, 245 + xy: 1069, 287 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-resupply-point-medium +block-repair-point-medium rotate: false - xy: 3089, 274 + xy: 3541, 261 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-resupply-point-small +block-repair-point-small rotate: false - xy: 3799, 209 + xy: 3453, 167 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-resupply-point-tiny +block-repair-point-tiny rotate: false - xy: 4048, 122 + xy: 3314, 118 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-resupply-point-xlarge +block-repair-point-xlarge rotate: false xy: 731, 154 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-ripple-large +block-resupply-point-large rotate: false - xy: 1699, 287 + xy: 1111, 287 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-ripple-medium +block-resupply-point-medium rotate: false - xy: 3123, 274 + xy: 3575, 261 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-ripple-small +block-resupply-point-small rotate: false - xy: 3825, 209 + xy: 3479, 167 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-ripple-tiny +block-resupply-point-tiny rotate: false - xy: 4066, 122 + xy: 3332, 118 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-ripple-xlarge +block-resupply-point-xlarge rotate: false xy: 681, 54 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-rotary-pump-large +block-ripple-large rotate: false - xy: 1741, 329 + xy: 1069, 245 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-rotary-pump-medium +block-ripple-medium rotate: false - xy: 3157, 274 + xy: 3609, 261 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-rotary-pump-small +block-ripple-small rotate: false - xy: 3851, 209 + xy: 3505, 167 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-rotary-pump-tiny +block-ripple-tiny rotate: false - xy: 4048, 104 + xy: 3350, 118 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-rotary-pump-xlarge +block-ripple-xlarge rotate: false xy: 731, 104 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-router-large +block-rotary-pump-large rotate: false - xy: 1657, 203 + xy: 1153, 287 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-router-medium +block-rotary-pump-medium rotate: false - xy: 3191, 274 + xy: 3405, 219 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-router-small +block-rotary-pump-small rotate: false - xy: 3877, 209 + xy: 3531, 167 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-router-tiny +block-rotary-pump-tiny rotate: false - xy: 4066, 104 + xy: 3368, 118 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-router-xlarge +block-rotary-pump-xlarge rotate: false xy: 731, 54 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-rtg-generator-large +block-router-large rotate: false - xy: 1699, 245 + xy: 1069, 203 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-rtg-generator-medium +block-router-medium rotate: false - xy: 3225, 274 + xy: 3439, 219 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-rtg-generator-small +block-router-small rotate: false - xy: 3903, 209 + xy: 3557, 167 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-rtg-generator-tiny +block-router-tiny rotate: false - xy: 4053, 86 + xy: 2720, 100 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-rtg-generator-xlarge +block-router-xlarge rotate: false xy: 331, 4 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-salt-large +block-rtg-generator-large rotate: false - xy: 1741, 287 + xy: 1111, 245 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-salt-medium +block-rtg-generator-medium rotate: false - xy: 3259, 274 + xy: 3473, 227 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-salt-small +block-rtg-generator-small rotate: false - xy: 3929, 209 + xy: 3583, 167 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-salt-tiny +block-rtg-generator-tiny rotate: false - xy: 4071, 86 + xy: 2738, 100 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-salt-wall-large - rotate: false - xy: 1783, 329 - size: 40, 40 - orig: 40, 40 - offset: 0, 0 - index: -1 -block-salt-wall-medium - rotate: false - xy: 3293, 274 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -block-salt-wall-small - rotate: false - xy: 3747, 183 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -block-salt-wall-tiny - rotate: false - xy: 4053, 68 - size: 16, 16 - orig: 16, 16 - offset: 0, 0 - index: -1 -block-salt-wall-xlarge +block-rtg-generator-xlarge rotate: false xy: 381, 4 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-salt-xlarge +block-salt-large + rotate: false + xy: 1195, 287 + size: 40, 40 + orig: 40, 40 + offset: 0, 0 + index: -1 +block-salt-medium + rotate: false + xy: 3507, 227 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +block-salt-small + rotate: false + xy: 3609, 167 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +block-salt-tiny + rotate: false + xy: 2756, 100 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +block-salt-wall-large + rotate: false + xy: 1111, 203 + size: 40, 40 + orig: 40, 40 + offset: 0, 0 + index: -1 +block-salt-wall-medium + rotate: false + xy: 3541, 227 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +block-salt-wall-small + rotate: false + xy: 3635, 167 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +block-salt-wall-tiny + rotate: false + xy: 2774, 100 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +block-salt-wall-xlarge rotate: false xy: 431, 4 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-salvo-large - rotate: false - xy: 1699, 203 - size: 40, 40 - orig: 40, 40 - offset: 0, 0 - index: -1 -block-salvo-medium - rotate: false - xy: 3327, 274 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -block-salvo-small - rotate: false - xy: 3773, 183 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -block-salvo-tiny - rotate: false - xy: 4071, 68 - size: 16, 16 - orig: 16, 16 - offset: 0, 0 - index: -1 -block-salvo-xlarge +block-salt-xlarge rotate: false xy: 481, 4 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-sand-boulder-large +block-salvo-large rotate: false - xy: 1741, 245 + xy: 1153, 245 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-sand-boulder-medium +block-salvo-medium rotate: false - xy: 3361, 274 + xy: 3575, 227 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-sand-boulder-small +block-salvo-small rotate: false - xy: 3799, 183 + xy: 1733, 12 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-sand-boulder-tiny +block-salvo-tiny rotate: false - xy: 2753, 133 + xy: 2792, 100 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-sand-boulder-xlarge +block-salvo-xlarge rotate: false xy: 531, 4 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-sand-large +block-sand-boulder-large rotate: false - xy: 1783, 287 + xy: 1237, 287 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-sand-medium +block-sand-boulder-medium rotate: false - xy: 3395, 274 + xy: 3609, 227 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-sand-small +block-sand-boulder-small rotate: false - xy: 3825, 183 + xy: 1759, 7 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-sand-tiny +block-sand-boulder-tiny rotate: false - xy: 2771, 133 + xy: 2810, 100 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-sand-wall-large - rotate: false - xy: 1825, 329 - size: 40, 40 - orig: 40, 40 - offset: 0, 0 - index: -1 -block-sand-wall-medium - rotate: false - xy: 3429, 274 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -block-sand-wall-small - rotate: false - xy: 3851, 183 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -block-sand-wall-tiny - rotate: false - xy: 2789, 133 - size: 16, 16 - orig: 16, 16 - offset: 0, 0 - index: -1 -block-sand-wall-xlarge +block-sand-boulder-xlarge rotate: false xy: 581, 4 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-sand-water-large +block-sand-large rotate: false - xy: 1741, 203 + xy: 1153, 203 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-sand-water-medium +block-sand-medium rotate: false - xy: 3463, 274 + xy: 3634, 295 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-sand-water-small +block-sand-small rotate: false - xy: 3877, 183 + xy: 2725, 154 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-sand-water-tiny +block-sand-tiny rotate: false - xy: 2807, 133 + xy: 2828, 100 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-sand-water-xlarge +block-sand-wall-large + rotate: false + xy: 1195, 245 + size: 40, 40 + orig: 40, 40 + offset: 0, 0 + index: -1 +block-sand-wall-medium + rotate: false + xy: 3643, 261 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +block-sand-wall-small + rotate: false + xy: 2751, 154 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +block-sand-wall-tiny + rotate: false + xy: 2846, 100 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +block-sand-wall-xlarge rotate: false xy: 631, 4 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-sand-xlarge +block-sand-water-large + rotate: false + xy: 1279, 287 + size: 40, 40 + orig: 40, 40 + offset: 0, 0 + index: -1 +block-sand-water-medium + rotate: false + xy: 3643, 227 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +block-sand-water-small + rotate: false + xy: 2777, 154 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +block-sand-water-tiny + rotate: false + xy: 2864, 100 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +block-sand-water-xlarge rotate: false xy: 681, 4 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-scatter-large - rotate: false - xy: 1783, 245 - size: 40, 40 - orig: 40, 40 - offset: 0, 0 - index: -1 -block-scatter-medium - rotate: false - xy: 3497, 274 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -block-scatter-small - rotate: false - xy: 3903, 183 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -block-scatter-tiny - rotate: false - xy: 2825, 133 - size: 16, 16 - orig: 16, 16 - offset: 0, 0 - index: -1 -block-scatter-xlarge +block-sand-xlarge rotate: false xy: 731, 4 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-scorch-large +block-scatter-large rotate: false - xy: 1825, 287 + xy: 1195, 203 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-scorch-medium +block-scatter-medium rotate: false - xy: 2919, 240 + xy: 917, 59 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-scorch-small +block-scatter-small rotate: false - xy: 3929, 183 + xy: 2803, 154 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-scorch-tiny +block-scatter-tiny rotate: false - xy: 2843, 133 + xy: 2882, 100 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-scorch-xlarge +block-scatter-xlarge rotate: false xy: 781, 116 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-scrap-wall-gigantic-large +block-scorch-large rotate: false - xy: 1867, 329 + xy: 1237, 245 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-scrap-wall-gigantic-medium +block-scorch-medium rotate: false - xy: 2953, 240 + xy: 951, 59 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-scrap-wall-gigantic-small +block-scorch-small rotate: false - xy: 3744, 157 + xy: 2829, 154 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-scrap-wall-gigantic-tiny +block-scorch-tiny rotate: false - xy: 2861, 133 + xy: 2900, 100 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-scrap-wall-gigantic-xlarge +block-scorch-xlarge rotate: false xy: 781, 66 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-scrap-wall-huge-large +block-scrap-wall-gigantic-large rotate: false - xy: 1783, 203 + xy: 1321, 287 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-scrap-wall-huge-medium +block-scrap-wall-gigantic-medium rotate: false - xy: 2987, 240 + xy: 985, 59 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-scrap-wall-huge-small +block-scrap-wall-gigantic-small rotate: false - xy: 3744, 131 + xy: 2855, 154 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-scrap-wall-huge-tiny +block-scrap-wall-gigantic-tiny rotate: false - xy: 2879, 133 + xy: 2918, 100 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-scrap-wall-huge-xlarge +block-scrap-wall-gigantic-xlarge rotate: false xy: 781, 16 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-scrap-wall-large +block-scrap-wall-huge-large rotate: false - xy: 1825, 245 + xy: 1237, 203 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-scrap-wall-large-large +block-scrap-wall-huge-medium rotate: false - xy: 1867, 287 - size: 40, 40 - orig: 40, 40 - offset: 0, 0 - index: -1 -block-scrap-wall-large-medium - rotate: false - xy: 3021, 240 + xy: 1019, 59 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-scrap-wall-large-small +block-scrap-wall-huge-small rotate: false - xy: 3770, 157 + xy: 2881, 154 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-scrap-wall-large-tiny +block-scrap-wall-huge-tiny rotate: false - xy: 2753, 115 + xy: 2936, 100 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-scrap-wall-large-xlarge +block-scrap-wall-huge-xlarge rotate: false xy: 831, 116 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-scrap-wall-medium +block-scrap-wall-large rotate: false - xy: 3055, 240 + xy: 1279, 245 + size: 40, 40 + orig: 40, 40 + offset: 0, 0 + index: -1 +block-scrap-wall-large-large + rotate: false + xy: 1363, 287 + size: 40, 40 + orig: 40, 40 + offset: 0, 0 + index: -1 +block-scrap-wall-large-medium + rotate: false + xy: 1053, 59 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-scrap-wall-small +block-scrap-wall-large-small rotate: false - xy: 3770, 131 + xy: 2907, 154 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-scrap-wall-tiny +block-scrap-wall-large-tiny rotate: false - xy: 2771, 115 + xy: 2954, 100 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-scrap-wall-xlarge +block-scrap-wall-large-xlarge rotate: false xy: 831, 66 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-segment-large +block-scrap-wall-medium rotate: false - xy: 1909, 329 - size: 40, 40 - orig: 40, 40 - offset: 0, 0 - index: -1 -block-segment-medium - rotate: false - xy: 3089, 240 + xy: 949, 25 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-segment-small +block-scrap-wall-small rotate: false - xy: 3796, 157 + xy: 2933, 154 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-segment-tiny +block-scrap-wall-tiny rotate: false - xy: 2789, 115 + xy: 2972, 100 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-segment-xlarge +block-scrap-wall-xlarge rotate: false xy: 831, 16 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-separator-large +block-segment-large rotate: false - xy: 1825, 203 + xy: 1279, 203 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-separator-medium +block-segment-medium rotate: false - xy: 3123, 240 + xy: 983, 25 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-separator-small +block-segment-small rotate: false - xy: 3796, 131 + xy: 2959, 154 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-separator-tiny +block-segment-tiny rotate: false - xy: 2807, 115 + xy: 2990, 100 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-separator-xlarge +block-segment-xlarge rotate: false xy: 859, 413 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-shale-boulder-large +block-separator-large rotate: false - xy: 1867, 245 + xy: 1321, 245 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-shale-boulder-medium +block-separator-medium rotate: false - xy: 3157, 240 + xy: 1017, 25 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-shale-boulder-small +block-separator-small rotate: false - xy: 3822, 157 + xy: 2985, 154 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-shale-boulder-tiny +block-separator-tiny rotate: false - xy: 2825, 115 + xy: 3008, 100 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-shale-boulder-xlarge +block-separator-xlarge rotate: false xy: 909, 413 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-shale-large +block-shale-boulder-large rotate: false - xy: 1909, 287 + xy: 1405, 287 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-shale-medium +block-shale-boulder-medium rotate: false - xy: 3191, 240 + xy: 1051, 25 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-shale-small +block-shale-boulder-small rotate: false - xy: 3822, 131 + xy: 3011, 154 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-shale-tiny +block-shale-boulder-tiny rotate: false - xy: 2843, 115 + xy: 3026, 100 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-shale-wall-large - rotate: false - xy: 1951, 329 - size: 40, 40 - orig: 40, 40 - offset: 0, 0 - index: -1 -block-shale-wall-medium - rotate: false - xy: 3225, 240 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -block-shale-wall-small - rotate: false - xy: 3848, 157 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -block-shale-wall-tiny - rotate: false - xy: 2861, 115 - size: 16, 16 - orig: 16, 16 - offset: 0, 0 - index: -1 -block-shale-wall-xlarge +block-shale-boulder-xlarge rotate: false xy: 959, 413 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-shale-xlarge +block-shale-large + rotate: false + xy: 1321, 203 + size: 40, 40 + orig: 40, 40 + offset: 0, 0 + index: -1 +block-shale-medium + rotate: false + xy: 1088, 101 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +block-shale-small + rotate: false + xy: 3037, 154 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +block-shale-tiny + rotate: false + xy: 3044, 100 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +block-shale-wall-large + rotate: false + xy: 1363, 245 + size: 40, 40 + orig: 40, 40 + offset: 0, 0 + index: -1 +block-shale-wall-medium + rotate: false + xy: 1122, 101 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +block-shale-wall-small + rotate: false + xy: 3063, 154 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +block-shale-wall-tiny + rotate: false + xy: 3062, 100 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +block-shale-wall-xlarge rotate: false xy: 1009, 413 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-shock-mine-large - rotate: false - xy: 1867, 203 - size: 40, 40 - orig: 40, 40 - offset: 0, 0 - index: -1 -block-shock-mine-medium - rotate: false - xy: 3259, 240 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -block-shock-mine-small - rotate: false - xy: 3848, 131 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -block-shock-mine-tiny - rotate: false - xy: 2879, 115 - size: 16, 16 - orig: 16, 16 - offset: 0, 0 - index: -1 -block-shock-mine-xlarge +block-shale-xlarge rotate: false xy: 1059, 413 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-shrubs-large +block-shock-mine-large rotate: false - xy: 1909, 245 + xy: 1447, 287 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-shrubs-medium +block-shock-mine-medium rotate: false - xy: 3293, 240 + xy: 1156, 101 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-shrubs-small +block-shock-mine-small rotate: false - xy: 3874, 157 + xy: 3089, 154 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-shrubs-tiny +block-shock-mine-tiny rotate: false - xy: 2897, 120 + xy: 3080, 100 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-shrubs-xlarge +block-shock-mine-xlarge rotate: false xy: 1109, 413 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-silicon-crucible-large +block-shrubs-large rotate: false - xy: 1951, 287 + xy: 1363, 203 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-silicon-crucible-medium +block-shrubs-medium rotate: false - xy: 3327, 240 + xy: 1190, 101 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-silicon-crucible-small +block-shrubs-small rotate: false - xy: 3874, 131 + xy: 3115, 154 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-silicon-crucible-tiny +block-shrubs-tiny rotate: false - xy: 2915, 120 + xy: 3098, 100 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-silicon-crucible-xlarge +block-shrubs-xlarge rotate: false xy: 1159, 413 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-silicon-smelter-large +block-silicon-crucible-large rotate: false - xy: 1993, 329 + xy: 1405, 245 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-silicon-smelter-medium +block-silicon-crucible-medium rotate: false - xy: 3361, 240 + xy: 1224, 101 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-silicon-smelter-small +block-silicon-crucible-small rotate: false - xy: 3900, 157 + xy: 3141, 154 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-silicon-smelter-tiny +block-silicon-crucible-tiny rotate: false - xy: 2933, 120 + xy: 3116, 100 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-silicon-smelter-xlarge +block-silicon-crucible-xlarge rotate: false xy: 1209, 413 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-slag-large +block-silicon-smelter-large rotate: false - xy: 1909, 203 + xy: 1489, 287 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-slag-medium +block-silicon-smelter-medium rotate: false - xy: 3395, 240 + xy: 1258, 101 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-slag-small +block-silicon-smelter-small rotate: false - xy: 3900, 131 + xy: 3167, 154 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-slag-tiny +block-silicon-smelter-tiny rotate: false - xy: 2951, 120 + xy: 3134, 100 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-slag-xlarge +block-silicon-smelter-xlarge rotate: false xy: 1259, 413 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-snow-boulder-large +block-slag-large rotate: false - xy: 1951, 245 + xy: 1405, 203 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-snow-boulder-medium +block-slag-medium rotate: false - xy: 3429, 240 + xy: 1292, 101 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-snow-boulder-small +block-slag-small rotate: false - xy: 3926, 157 + xy: 3193, 154 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-snow-boulder-tiny +block-slag-tiny rotate: false - xy: 2969, 120 + xy: 3152, 100 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-snow-boulder-xlarge +block-slag-xlarge rotate: false xy: 1309, 413 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-snow-large +block-snow-boulder-large rotate: false - xy: 1993, 287 + xy: 1447, 245 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-snow-medium +block-snow-boulder-medium rotate: false - xy: 3463, 240 + xy: 1326, 101 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-snow-pine-large +block-snow-boulder-small rotate: false - xy: 2035, 329 - size: 40, 40 - orig: 40, 40 - offset: 0, 0 - index: -1 -block-snow-pine-medium - rotate: false - xy: 3497, 240 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -block-snow-pine-small - rotate: false - xy: 3926, 131 + xy: 3219, 154 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-snow-pine-tiny +block-snow-boulder-tiny rotate: false - xy: 2987, 120 + xy: 3170, 100 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-snow-pine-xlarge +block-snow-boulder-xlarge rotate: false xy: 1359, 413 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-snow-small +block-snow-large rotate: false - xy: 3744, 105 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -block-snow-tiny - rotate: false - xy: 3005, 120 - size: 16, 16 - orig: 16, 16 - offset: 0, 0 - index: -1 -block-snow-wall-large - rotate: false - xy: 1951, 203 + xy: 1531, 287 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-snow-wall-medium +block-snow-medium rotate: false - xy: 3521, 308 + xy: 1360, 101 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-snow-wall-small +block-snow-pine-large rotate: false - xy: 3770, 105 + xy: 1447, 203 + size: 40, 40 + orig: 40, 40 + offset: 0, 0 + index: -1 +block-snow-pine-medium + rotate: false + xy: 1394, 101 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +block-snow-pine-small + rotate: false + xy: 3245, 154 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-snow-wall-tiny +block-snow-pine-tiny rotate: false - xy: 3023, 120 + xy: 3188, 100 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-snow-wall-xlarge +block-snow-pine-xlarge rotate: false xy: 1409, 413 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-snow-xlarge +block-snow-small + rotate: false + xy: 3271, 154 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +block-snow-tiny + rotate: false + xy: 3206, 100 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +block-snow-wall-large + rotate: false + xy: 1489, 245 + size: 40, 40 + orig: 40, 40 + offset: 0, 0 + index: -1 +block-snow-wall-medium + rotate: false + xy: 1428, 101 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +block-snow-wall-small + rotate: false + xy: 3297, 154 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +block-snow-wall-tiny + rotate: false + xy: 3224, 100 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +block-snow-wall-xlarge rotate: false xy: 1459, 413 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-solar-panel-large - rotate: false - xy: 1993, 245 - size: 40, 40 - orig: 40, 40 - offset: 0, 0 - index: -1 -block-solar-panel-large-large - rotate: false - xy: 2035, 287 - size: 40, 40 - orig: 40, 40 - offset: 0, 0 - index: -1 -block-solar-panel-large-medium - rotate: false - xy: 3531, 274 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -block-solar-panel-large-small - rotate: false - xy: 3796, 105 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -block-solar-panel-large-tiny - rotate: false - xy: 3041, 120 - size: 16, 16 - orig: 16, 16 - offset: 0, 0 - index: -1 -block-solar-panel-large-xlarge +block-snow-xlarge rotate: false xy: 1509, 413 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-solar-panel-medium +block-solar-panel-large rotate: false - xy: 3531, 240 + xy: 1573, 287 + size: 40, 40 + orig: 40, 40 + offset: 0, 0 + index: -1 +block-solar-panel-large-large + rotate: false + xy: 1489, 203 + size: 40, 40 + orig: 40, 40 + offset: 0, 0 + index: -1 +block-solar-panel-large-medium + rotate: false + xy: 1462, 101 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-solar-panel-small +block-solar-panel-large-small rotate: false - xy: 3822, 105 + xy: 3323, 154 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-solar-panel-tiny +block-solar-panel-large-tiny rotate: false - xy: 3059, 120 + xy: 3242, 100 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-solar-panel-xlarge +block-solar-panel-large-xlarge rotate: false xy: 1559, 413 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-sorter-large +block-solar-panel-medium rotate: false - xy: 2077, 329 - size: 40, 40 - orig: 40, 40 - offset: 0, 0 - index: -1 -block-sorter-medium - rotate: false - xy: 2911, 206 + xy: 1496, 101 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-sorter-small +block-solar-panel-small rotate: false - xy: 3848, 105 + xy: 3349, 154 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-sorter-tiny +block-solar-panel-tiny rotate: false - xy: 3077, 120 + xy: 3260, 100 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-sorter-xlarge +block-solar-panel-xlarge rotate: false xy: 1609, 413 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-spawn-large +block-sorter-large rotate: false - xy: 1993, 203 + xy: 1531, 245 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-spawn-medium +block-sorter-medium rotate: false - xy: 2945, 206 + xy: 1530, 101 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-spawn-small +block-sorter-small rotate: false - xy: 3874, 105 + xy: 3375, 154 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-spawn-tiny +block-sorter-tiny rotate: false - xy: 3095, 120 + xy: 3278, 100 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-spawn-xlarge +block-sorter-xlarge rotate: false xy: 1659, 413 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-spectre-large +block-spawn-large rotate: false - xy: 2035, 245 + xy: 1615, 287 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-spectre-medium +block-spawn-medium rotate: false - xy: 2979, 206 + xy: 1564, 101 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-spectre-small +block-spawn-small rotate: false - xy: 3900, 105 + xy: 3401, 141 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-spectre-tiny +block-spawn-tiny rotate: false - xy: 3113, 120 + xy: 3296, 100 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-spectre-xlarge +block-spawn-xlarge rotate: false xy: 1709, 413 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-spore-cluster-large +block-spectre-large rotate: false - xy: 2077, 287 + xy: 1531, 203 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-spore-cluster-medium +block-spectre-medium rotate: false - xy: 3013, 206 + xy: 1598, 101 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-spore-cluster-small +block-spectre-small rotate: false - xy: 3926, 105 + xy: 3427, 141 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-spore-cluster-tiny +block-spectre-tiny rotate: false - xy: 3131, 120 + xy: 3314, 100 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-spore-cluster-xlarge +block-spectre-xlarge rotate: false xy: 1759, 413 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-spore-moss-large +block-spore-cluster-large rotate: false - xy: 2119, 329 + xy: 1573, 245 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-spore-moss-medium +block-spore-cluster-medium rotate: false - xy: 3047, 206 + xy: 1632, 101 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-spore-moss-small +block-spore-cluster-small rotate: false - xy: 3959, 257 + xy: 3453, 141 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-spore-moss-tiny +block-spore-cluster-tiny rotate: false - xy: 3149, 120 + xy: 3332, 100 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-spore-moss-xlarge +block-spore-cluster-xlarge rotate: false xy: 1809, 413 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-spore-pine-large +block-spore-moss-large rotate: false - xy: 2035, 203 + xy: 1657, 287 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-spore-pine-medium +block-spore-moss-medium rotate: false - xy: 3081, 206 + xy: 1666, 101 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-spore-pine-small +block-spore-moss-small rotate: false - xy: 3959, 231 + xy: 3479, 141 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-spore-pine-tiny +block-spore-moss-tiny rotate: false - xy: 3167, 120 + xy: 3350, 100 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-spore-pine-xlarge +block-spore-moss-xlarge rotate: false xy: 1859, 413 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-spore-press-large +block-spore-pine-large rotate: false - xy: 2077, 245 + xy: 1573, 203 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-spore-press-medium +block-spore-pine-medium rotate: false - xy: 3115, 206 + xy: 1700, 101 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-spore-press-small +block-spore-pine-small rotate: false - xy: 3955, 205 + xy: 3505, 141 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-spore-press-tiny +block-spore-pine-tiny rotate: false - xy: 3185, 120 + xy: 3368, 100 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-spore-press-xlarge +block-spore-pine-xlarge rotate: false xy: 1909, 413 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-spore-wall-large +block-spore-press-large rotate: false - xy: 2119, 287 + xy: 1615, 245 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-spore-wall-medium +block-spore-press-medium rotate: false - xy: 3149, 206 + xy: 1734, 101 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-spore-wall-small +block-spore-press-small rotate: false - xy: 3955, 179 + xy: 3531, 141 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-spore-wall-tiny +block-spore-press-tiny rotate: false - xy: 3203, 120 + xy: 2630, 85 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-spore-wall-xlarge +block-spore-press-xlarge rotate: false xy: 1959, 413 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-steam-generator-large +block-spore-wall-large rotate: false - xy: 2161, 329 + xy: 1699, 287 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-steam-generator-medium +block-spore-wall-medium rotate: false - xy: 3183, 206 + xy: 1768, 101 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-steam-generator-small +block-spore-wall-small rotate: false - xy: 3952, 153 + xy: 3557, 141 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-steam-generator-tiny +block-spore-wall-tiny rotate: false - xy: 3221, 120 + xy: 2630, 67 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-steam-generator-xlarge +block-spore-wall-xlarge rotate: false xy: 2009, 413 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-stone-large +block-steam-generator-large rotate: false - xy: 2077, 203 + xy: 1615, 203 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-stone-medium +block-steam-generator-medium rotate: false - xy: 3217, 206 + xy: 1802, 101 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-stone-small +block-steam-generator-small rotate: false - xy: 3952, 127 + xy: 3583, 141 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-stone-tiny +block-steam-generator-tiny rotate: false - xy: 3239, 120 + xy: 2648, 85 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-stone-wall-large - rotate: false - xy: 2119, 245 - size: 40, 40 - orig: 40, 40 - offset: 0, 0 - index: -1 -block-stone-wall-medium - rotate: false - xy: 3251, 206 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -block-stone-wall-small - rotate: false - xy: 3952, 101 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -block-stone-wall-tiny - rotate: false - xy: 3257, 120 - size: 16, 16 - orig: 16, 16 - offset: 0, 0 - index: -1 -block-stone-wall-xlarge +block-steam-generator-xlarge rotate: false xy: 2059, 413 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-stone-xlarge +block-stone-large + rotate: false + xy: 1657, 245 + size: 40, 40 + orig: 40, 40 + offset: 0, 0 + index: -1 +block-stone-medium + rotate: false + xy: 1836, 101 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +block-stone-small + rotate: false + xy: 3609, 141 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +block-stone-tiny + rotate: false + xy: 2630, 49 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +block-stone-wall-large + rotate: false + xy: 1741, 287 + size: 40, 40 + orig: 40, 40 + offset: 0, 0 + index: -1 +block-stone-wall-medium + rotate: false + xy: 1870, 101 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +block-stone-wall-small + rotate: false + xy: 3635, 141 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +block-stone-wall-tiny + rotate: false + xy: 2648, 67 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +block-stone-wall-xlarge rotate: false xy: 2109, 413 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-surge-tower-large - rotate: false - xy: 2161, 287 - size: 40, 40 - orig: 40, 40 - offset: 0, 0 - index: -1 -block-surge-tower-medium - rotate: false - xy: 3285, 206 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -block-surge-tower-small - rotate: false - xy: 3741, 79 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -block-surge-tower-tiny - rotate: false - xy: 3275, 120 - size: 16, 16 - orig: 16, 16 - offset: 0, 0 - index: -1 -block-surge-tower-xlarge +block-stone-xlarge rotate: false xy: 2159, 413 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-surge-wall-large +block-surge-tower-large rotate: false - xy: 2203, 329 + xy: 1657, 203 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-surge-wall-large-large +block-surge-tower-medium rotate: false - xy: 2119, 203 - size: 40, 40 - orig: 40, 40 - offset: 0, 0 - index: -1 -block-surge-wall-large-medium - rotate: false - xy: 3319, 206 + xy: 1904, 101 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-surge-wall-large-small +block-surge-tower-small rotate: false - xy: 3767, 79 + xy: 2278, 115 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-surge-wall-large-tiny +block-surge-tower-tiny rotate: false - xy: 3293, 120 + xy: 2666, 85 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-surge-wall-large-xlarge +block-surge-tower-xlarge rotate: false xy: 2209, 413 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-surge-wall-medium +block-surge-wall-large rotate: false - xy: 3353, 206 + xy: 1699, 245 + size: 40, 40 + orig: 40, 40 + offset: 0, 0 + index: -1 +block-surge-wall-large-large + rotate: false + xy: 1783, 287 + size: 40, 40 + orig: 40, 40 + offset: 0, 0 + index: -1 +block-surge-wall-large-medium + rotate: false + xy: 1938, 101 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-surge-wall-small +block-surge-wall-large-small rotate: false - xy: 3793, 79 + xy: 2298, 89 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-surge-wall-tiny +block-surge-wall-large-tiny rotate: false - xy: 3311, 120 + xy: 2630, 31 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-surge-wall-xlarge +block-surge-wall-large-xlarge rotate: false xy: 2259, 413 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-swarmer-large +block-surge-wall-medium rotate: false - xy: 2161, 245 - size: 40, 40 - orig: 40, 40 - offset: 0, 0 - index: -1 -block-swarmer-medium - rotate: false - xy: 3387, 206 + xy: 1972, 101 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-swarmer-small +block-surge-wall-small rotate: false - xy: 3819, 79 + xy: 2304, 115 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-swarmer-tiny +block-surge-wall-tiny rotate: false - xy: 3329, 120 + xy: 2648, 49 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-swarmer-xlarge +block-surge-wall-xlarge rotate: false xy: 2309, 413 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-switch-large +block-swarmer-large rotate: false - xy: 2203, 287 + xy: 1699, 203 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-switch-medium +block-swarmer-medium rotate: false - xy: 3421, 206 + xy: 2006, 101 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-switch-small +block-swarmer-small rotate: false - xy: 3845, 79 + xy: 2308, 63 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-switch-tiny +block-swarmer-tiny rotate: false - xy: 3347, 120 + xy: 2666, 67 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-switch-xlarge +block-swarmer-xlarge rotate: false xy: 2359, 413 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-tainted-water-large +block-switch-large rotate: false - xy: 2245, 329 + xy: 1741, 245 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-tainted-water-medium +block-switch-medium rotate: false - xy: 3455, 206 + xy: 2040, 101 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-tainted-water-small +block-switch-small rotate: false - xy: 3871, 79 + xy: 2308, 37 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-tainted-water-tiny +block-switch-tiny rotate: false - xy: 3365, 120 + xy: 2684, 85 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-tainted-water-xlarge +block-switch-xlarge rotate: false xy: 2409, 413 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-tar-large +block-tainted-water-large rotate: false - xy: 2161, 203 + xy: 1825, 287 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-tar-medium +block-tainted-water-medium rotate: false - xy: 3489, 206 + xy: 2074, 101 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-tar-small +block-tainted-water-small rotate: false - xy: 3897, 79 + xy: 2324, 89 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-tar-tiny +block-tainted-water-tiny rotate: false - xy: 3383, 120 + xy: 2702, 85 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-tar-xlarge +block-tainted-water-xlarge rotate: false xy: 2459, 413 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-tendrils-large +block-tar-large rotate: false - xy: 2203, 245 + xy: 1741, 203 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-tendrils-medium +block-tar-medium rotate: false - xy: 3523, 206 + xy: 2108, 103 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-tendrils-small +block-tar-small rotate: false - xy: 3923, 79 + xy: 2330, 115 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-tendrils-tiny +block-tar-tiny rotate: false - xy: 3401, 120 + xy: 2648, 31 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-tendrils-xlarge +block-tar-xlarge rotate: false xy: 2509, 413 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-tetrative-reconstructor-large +block-tendrils-large rotate: false - xy: 2245, 287 + xy: 1783, 245 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-tetrative-reconstructor-medium +block-tendrils-medium rotate: false - xy: 2905, 172 + xy: 2142, 109 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-tetrative-reconstructor-small +block-tendrils-small rotate: false - xy: 3949, 75 + xy: 2334, 63 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-tetrative-reconstructor-tiny +block-tendrils-tiny rotate: false - xy: 3419, 120 + xy: 2666, 49 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-tetrative-reconstructor-xlarge +block-tendrils-xlarge rotate: false xy: 2559, 413 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-thermal-generator-large +block-tetrative-reconstructor-large rotate: false - xy: 2287, 329 + xy: 1867, 287 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-thermal-generator-medium +block-tetrative-reconstructor-medium rotate: false - xy: 2939, 172 + xy: 2176, 112 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-thermal-generator-small +block-tetrative-reconstructor-small rotate: false - xy: 3981, 205 + xy: 2334, 37 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-thermal-generator-tiny +block-tetrative-reconstructor-tiny rotate: false - xy: 3437, 120 + xy: 2684, 67 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-thermal-generator-xlarge +block-tetrative-reconstructor-xlarge rotate: false xy: 2609, 413 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-thermal-pump-large +block-thermal-generator-large rotate: false - xy: 2203, 203 + xy: 1783, 203 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-thermal-pump-medium +block-thermal-generator-medium rotate: false - xy: 2973, 172 + xy: 2210, 112 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-thermal-pump-small +block-thermal-generator-small rotate: false - xy: 3981, 179 + xy: 2350, 89 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-thermal-pump-tiny +block-thermal-generator-tiny rotate: false - xy: 3455, 120 + xy: 2666, 31 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-thermal-pump-xlarge +block-thermal-generator-xlarge rotate: false xy: 2659, 413 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-thorium-reactor-large +block-thermal-pump-large rotate: false - xy: 2245, 245 + xy: 1825, 245 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-thorium-reactor-medium +block-thermal-pump-medium rotate: false - xy: 3007, 172 + xy: 2244, 115 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-thorium-reactor-small +block-thermal-pump-small rotate: false - xy: 3978, 153 + xy: 2356, 115 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-thorium-reactor-tiny +block-thermal-pump-tiny rotate: false - xy: 3473, 120 + xy: 2684, 49 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-thorium-reactor-xlarge +block-thermal-pump-xlarge rotate: false xy: 2709, 413 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-thorium-wall-large +block-thorium-reactor-large rotate: false - xy: 2287, 287 + xy: 1909, 287 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-thorium-wall-large-large +block-thorium-reactor-medium rotate: false - xy: 2329, 329 - size: 40, 40 - orig: 40, 40 - offset: 0, 0 - index: -1 -block-thorium-wall-large-medium - rotate: false - xy: 3041, 172 + xy: 1087, 67 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-thorium-wall-large-small +block-thorium-reactor-small rotate: false - xy: 3978, 127 + xy: 2360, 63 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-thorium-wall-large-tiny +block-thorium-reactor-tiny rotate: false - xy: 3491, 120 + xy: 2702, 67 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-thorium-wall-large-xlarge +block-thorium-reactor-xlarge rotate: false xy: 2759, 413 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-thorium-wall-medium +block-thorium-wall-large rotate: false - xy: 3075, 172 + xy: 1825, 203 + size: 40, 40 + orig: 40, 40 + offset: 0, 0 + index: -1 +block-thorium-wall-large-large + rotate: false + xy: 1867, 245 + size: 40, 40 + orig: 40, 40 + offset: 0, 0 + index: -1 +block-thorium-wall-large-medium + rotate: false + xy: 1121, 67 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-thorium-wall-small +block-thorium-wall-large-small rotate: false - xy: 3978, 101 + xy: 2360, 37 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-thorium-wall-tiny +block-thorium-wall-large-tiny rotate: false - xy: 3509, 120 + xy: 2720, 82 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-thorium-wall-xlarge +block-thorium-wall-large-xlarge rotate: false xy: 2809, 413 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-thruster-large +block-thorium-wall-medium rotate: false - xy: 2245, 203 - size: 40, 40 - orig: 40, 40 - offset: 0, 0 - index: -1 -block-thruster-medium - rotate: false - xy: 3109, 172 + xy: 1155, 67 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-thruster-small +block-thorium-wall-small rotate: false - xy: 3975, 75 + xy: 2376, 89 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-thruster-tiny +block-thorium-wall-tiny rotate: false - xy: 3527, 120 + xy: 2684, 31 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-thruster-xlarge +block-thorium-wall-xlarge rotate: false xy: 2859, 413 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-titanium-conveyor-large +block-thruster-large rotate: false - xy: 2287, 245 + xy: 1951, 287 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-titanium-conveyor-medium +block-thruster-medium rotate: false - xy: 3143, 172 + xy: 1189, 67 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-titanium-conveyor-small +block-thruster-small rotate: false - xy: 1015, 151 + xy: 2382, 115 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-titanium-conveyor-tiny +block-thruster-tiny rotate: false - xy: 3545, 120 + xy: 2702, 49 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-titanium-conveyor-xlarge +block-thruster-xlarge rotate: false xy: 2909, 413 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-titanium-wall-large +block-titanium-conveyor-large rotate: false - xy: 2329, 287 + xy: 1867, 203 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-titanium-wall-large-large +block-titanium-conveyor-medium rotate: false - xy: 2371, 329 - size: 40, 40 - orig: 40, 40 - offset: 0, 0 - index: -1 -block-titanium-wall-large-medium - rotate: false - xy: 3177, 172 + xy: 1223, 67 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-titanium-wall-large-small +block-titanium-conveyor-small rotate: false - xy: 1632, 56 + xy: 2386, 63 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-titanium-wall-large-tiny +block-titanium-conveyor-tiny rotate: false - xy: 3563, 120 + xy: 2720, 64 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-titanium-wall-large-xlarge +block-titanium-conveyor-xlarge rotate: false xy: 2959, 413 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-titanium-wall-medium +block-titanium-wall-large rotate: false - xy: 3211, 172 + xy: 1909, 245 + size: 40, 40 + orig: 40, 40 + offset: 0, 0 + index: -1 +block-titanium-wall-large-large + rotate: false + xy: 1993, 287 + size: 40, 40 + orig: 40, 40 + offset: 0, 0 + index: -1 +block-titanium-wall-large-medium + rotate: false + xy: 1257, 67 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-titanium-wall-small +block-titanium-wall-large-small rotate: false - xy: 1658, 49 + xy: 2386, 37 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-titanium-wall-tiny +block-titanium-wall-large-tiny rotate: false - xy: 2751, 97 + xy: 2738, 82 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-titanium-wall-xlarge +block-titanium-wall-large-xlarge rotate: false xy: 3009, 413 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-underflow-gate-large +block-titanium-wall-medium rotate: false - xy: 2287, 203 - size: 40, 40 - orig: 40, 40 - offset: 0, 0 - index: -1 -block-underflow-gate-medium - rotate: false - xy: 3245, 172 + xy: 1291, 67 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-underflow-gate-small +block-titanium-wall-small rotate: false - xy: 1684, 49 + xy: 2402, 89 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-underflow-gate-tiny +block-titanium-wall-tiny rotate: false - xy: 2769, 97 + xy: 2702, 31 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-underflow-gate-xlarge +block-titanium-wall-xlarge rotate: false xy: 3059, 413 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-unloader-large +block-tsunami-large rotate: false - xy: 2329, 245 + xy: 1909, 203 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-unloader-medium +block-tsunami-medium rotate: false - xy: 3279, 172 + xy: 1325, 67 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-unloader-small +block-tsunami-small rotate: false - xy: 1710, 49 + xy: 2408, 115 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-unloader-tiny +block-tsunami-tiny rotate: false - xy: 2787, 97 + xy: 2720, 46 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-unloader-xlarge +block-tsunami-xlarge rotate: false xy: 3109, 413 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-vault-large +block-underflow-gate-large rotate: false - xy: 2371, 287 + xy: 1951, 245 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-vault-medium +block-underflow-gate-medium rotate: false - xy: 3313, 172 + xy: 1359, 67 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-vault-small +block-underflow-gate-small rotate: false - xy: 1736, 49 + xy: 2412, 63 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-vault-tiny +block-underflow-gate-tiny rotate: false - xy: 2805, 97 + xy: 2738, 64 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-vault-xlarge +block-underflow-gate-xlarge rotate: false xy: 3159, 413 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-water-extractor-large +block-unloader-large rotate: false - xy: 2413, 329 + xy: 2035, 287 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-water-extractor-medium +block-unloader-medium rotate: false - xy: 3347, 172 + xy: 1393, 67 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-water-extractor-small +block-unloader-small rotate: false - xy: 1762, 49 + xy: 2412, 37 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-water-extractor-tiny +block-unloader-tiny rotate: false - xy: 2823, 97 + xy: 2756, 82 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-water-extractor-xlarge +block-unloader-xlarge rotate: false xy: 3209, 413 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-water-large +block-vault-large rotate: false - xy: 2329, 203 + xy: 1951, 203 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-water-medium +block-vault-medium rotate: false - xy: 3381, 172 + xy: 1427, 67 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-water-small +block-vault-small rotate: false - xy: 1788, 49 + xy: 2428, 89 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-water-tiny +block-vault-tiny rotate: false - xy: 2841, 97 + xy: 2738, 46 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-water-xlarge +block-vault-xlarge rotate: false xy: 3259, 413 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-wave-large +block-water-extractor-large rotate: false - xy: 2371, 245 + xy: 1993, 245 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-wave-medium +block-water-extractor-medium rotate: false - xy: 3415, 172 + xy: 1461, 67 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-wave-small +block-water-extractor-small rotate: false - xy: 1814, 49 + xy: 2434, 115 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-wave-tiny +block-water-extractor-tiny rotate: false - xy: 2859, 97 + xy: 2756, 64 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-wave-xlarge +block-water-extractor-xlarge rotate: false xy: 3309, 413 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-white-tree-dead-large +block-water-large rotate: false - xy: 2413, 287 + xy: 2077, 287 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-white-tree-dead-medium +block-water-medium rotate: false - xy: 3449, 172 + xy: 1495, 67 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-white-tree-dead-small +block-water-small rotate: false - xy: 1840, 49 + xy: 2438, 63 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-white-tree-dead-tiny +block-water-tiny rotate: false - xy: 2877, 97 + xy: 2774, 82 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-white-tree-dead-xlarge +block-water-xlarge rotate: false xy: 3359, 413 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-white-tree-large +block-wave-large rotate: false - xy: 2455, 329 + xy: 1993, 203 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-white-tree-medium +block-wave-medium rotate: false - xy: 3483, 172 + xy: 1529, 67 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-white-tree-small +block-wave-small rotate: false - xy: 1866, 49 + xy: 2438, 37 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-white-tree-tiny +block-wave-tiny rotate: false - xy: 2750, 79 + xy: 2756, 46 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-white-tree-xlarge +block-wave-xlarge rotate: false xy: 3409, 413 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 +block-white-tree-dead-large + rotate: false + xy: 2035, 245 + size: 40, 40 + orig: 40, 40 + offset: 0, 0 + index: -1 +block-white-tree-dead-medium + rotate: false + xy: 1563, 67 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +block-white-tree-dead-small + rotate: false + xy: 2454, 89 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +block-white-tree-dead-tiny + rotate: false + xy: 2774, 64 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +block-white-tree-dead-xlarge + rotate: false + xy: 3459, 413 + size: 48, 48 + orig: 48, 48 + offset: 0, 0 + index: -1 +block-white-tree-large + rotate: false + xy: 2119, 287 + size: 40, 40 + orig: 40, 40 + offset: 0, 0 + index: -1 +block-white-tree-medium + rotate: false + xy: 1597, 67 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +block-white-tree-small + rotate: false + xy: 2460, 115 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +block-white-tree-tiny + rotate: false + xy: 2792, 82 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +block-white-tree-xlarge + rotate: false + xy: 3509, 413 + size: 48, 48 + orig: 48, 48 + offset: 0, 0 + index: -1 button rotate: false - xy: 3221, 342 + xy: 3011, 300 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -19164,7 +19276,7 @@ button-right-disabled index: -1 button-edge-over-4 rotate: false - xy: 4059, 310 + xy: 2497, 258 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -19172,7 +19284,7 @@ button-edge-over-4 index: -1 button-over rotate: false - xy: 2833, 300 + xy: 2707, 300 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -19180,7 +19292,7 @@ button-over index: -1 button-red rotate: false - xy: 2917, 342 + xy: 2535, 258 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -19188,7 +19300,7 @@ button-red index: -1 button-right rotate: false - xy: 3031, 342 + xy: 2821, 300 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -19196,7 +19308,7 @@ button-right index: -1 button-right-down rotate: false - xy: 2955, 342 + xy: 2745, 300 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -19204,7 +19316,7 @@ button-right-down index: -1 button-right-over rotate: false - xy: 2993, 342 + xy: 2783, 300 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -19212,7 +19324,7 @@ button-right-over index: -1 button-select rotate: false - xy: 1892, 49 + xy: 2464, 63 size: 24, 24 split: 4, 4, 4, 4 orig: 24, 24 @@ -19220,7 +19332,7 @@ button-select index: -1 button-square rotate: false - xy: 3145, 342 + xy: 2935, 300 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -19228,7 +19340,7 @@ button-square index: -1 button-square-down rotate: false - xy: 3069, 342 + xy: 2859, 300 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -19236,7 +19348,7 @@ button-square-down index: -1 button-square-over rotate: false - xy: 3107, 342 + xy: 2897, 300 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -19244,7 +19356,7 @@ button-square-over index: -1 button-trans rotate: false - xy: 3183, 342 + xy: 2973, 300 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -19252,42 +19364,42 @@ button-trans index: -1 check-disabled rotate: false - xy: 3517, 172 + xy: 1631, 67 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 check-off rotate: false - xy: 2905, 138 + xy: 1665, 67 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 check-on rotate: false - xy: 2939, 138 + xy: 1699, 67 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 check-on-disabled rotate: false - xy: 2973, 138 + xy: 1733, 67 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 check-on-over rotate: false - xy: 3007, 138 + xy: 1767, 67 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 check-over rotate: false - xy: 3041, 138 + xy: 1801, 67 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -19301,14 +19413,14 @@ clear index: -1 crater rotate: false - xy: 2641, 113 + xy: 3453, 199 size: 18, 18 orig: 18, 18 offset: 0, 0 index: -1 cursor rotate: false - xy: 2701, 248 + xy: 845, 366 size: 4, 4 orig: 4, 4 offset: 0, 0 @@ -19322,7 +19434,7 @@ discord-banner index: -1 flat-down-base rotate: false - xy: 3259, 342 + xy: 3049, 300 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -19337,7 +19449,7 @@ info-banner index: -1 inventory rotate: false - xy: 1918, 33 + xy: 2278, 141 size: 24, 40 split: 10, 10, 10, 14 orig: 24, 40 @@ -19345,147 +19457,147 @@ inventory index: -1 item-blast-compound-icon rotate: false - xy: 3075, 138 + xy: 1835, 67 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-coal-icon rotate: false - xy: 3109, 138 + xy: 1869, 67 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-copper-icon rotate: false - xy: 3143, 138 + xy: 1903, 67 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-graphite-icon rotate: false - xy: 3177, 138 + xy: 1937, 67 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-lead-icon rotate: false - xy: 3211, 138 + xy: 1971, 67 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-metaglass-icon rotate: false - xy: 3245, 138 + xy: 2005, 67 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-phase-fabric-icon rotate: false - xy: 3279, 138 + xy: 2039, 67 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-plastanium-icon rotate: false - xy: 3313, 138 + xy: 2073, 67 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-pyratite-icon rotate: false - xy: 3347, 138 + xy: 3473, 193 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-sand-icon rotate: false - xy: 3381, 138 + xy: 3507, 193 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-scrap-icon rotate: false - xy: 3415, 138 + xy: 3541, 193 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-silicon-icon rotate: false - xy: 3449, 138 + xy: 3575, 193 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-spore-pod-icon rotate: false - xy: 3483, 138 + xy: 3609, 193 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-surge-alloy-icon rotate: false - xy: 3517, 138 + xy: 3643, 193 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-thorium-icon rotate: false - xy: 3557, 206 + xy: 3668, 301 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-titanium-icon rotate: false - xy: 3551, 172 + xy: 3677, 267 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-cryofluid-icon rotate: false - xy: 3551, 138 + xy: 3677, 233 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-oil-icon rotate: false - xy: 1194, 101 + xy: 3677, 199 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-slag-icon rotate: false - xy: 1228, 101 + xy: 1087, 33 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-water-icon rotate: false - xy: 1262, 101 + xy: 1121, 33 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 logic-node rotate: false - xy: 1296, 101 + xy: 1155, 33 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -19506,7 +19618,7 @@ nomap index: -1 pane rotate: false - xy: 3335, 342 + xy: 3125, 300 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -19514,7 +19626,7 @@ pane index: -1 pane-2 rotate: false - xy: 3297, 342 + xy: 3087, 300 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -19522,7 +19634,7 @@ pane-2 index: -1 scroll rotate: false - xy: 1970, 18 + xy: 2464, 26 size: 24, 35 split: 10, 10, 6, 5 orig: 24, 35 @@ -19530,7 +19642,7 @@ scroll index: -1 scroll-horizontal rotate: false - xy: 1015, 177 + xy: 901, 169 size: 35, 24 split: 6, 5, 10, 10 orig: 35, 24 @@ -19538,70 +19650,70 @@ scroll-horizontal index: -1 scroll-knob-horizontal-black rotate: false - xy: 859, 177 + xy: 859, 169 size: 40, 24 orig: 40, 24 offset: 0, 0 index: -1 scroll-knob-vertical-black rotate: false - xy: 1944, 33 + xy: 2304, 141 size: 24, 40 orig: 24, 40 offset: 0, 0 index: -1 scroll-knob-vertical-thin rotate: false - xy: 1043, 85 + xy: 3766, 245 size: 12, 40 orig: 12, 40 offset: 0, 0 index: -1 selection rotate: false - xy: 821, 463 + xy: 309, 354 size: 1, 1 orig: 1, 1 offset: 0, 0 index: -1 slider rotate: false - xy: 3611, 133 + xy: 3754, 329 size: 1, 8 orig: 1, 8 offset: 0, 0 index: -1 slider-knob rotate: false - xy: 3978, 283 + xy: 1970, 27 size: 29, 38 orig: 29, 38 offset: 0, 0 index: -1 slider-knob-down rotate: false - xy: 4009, 282 + xy: 2001, 27 size: 29, 38 orig: 29, 38 offset: 0, 0 index: -1 slider-knob-over rotate: false - xy: 2144, 95 + xy: 2032, 27 size: 29, 38 orig: 29, 38 offset: 0, 0 index: -1 slider-vertical rotate: false - xy: 309, 354 + xy: 2194, 83 size: 8, 1 orig: 8, 1 offset: 0, 0 index: -1 underline rotate: false - xy: 901, 174 + xy: 3315, 300 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -19609,7 +19721,7 @@ underline index: -1 underline-2 rotate: false - xy: 3373, 342 + xy: 3163, 300 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -19617,7 +19729,7 @@ underline-2 index: -1 underline-disabled rotate: false - xy: 3411, 342 + xy: 3201, 300 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -19625,7 +19737,7 @@ underline-disabled index: -1 underline-red rotate: false - xy: 3449, 342 + xy: 3239, 300 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -19633,7 +19745,7 @@ underline-red index: -1 underline-white rotate: false - xy: 3487, 342 + xy: 3277, 300 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -19641,35 +19753,35 @@ underline-white index: -1 unit-alpha-large rotate: false - xy: 2371, 203 + xy: 2035, 203 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 unit-alpha-medium rotate: false - xy: 1330, 101 + xy: 1189, 33 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 unit-alpha-small rotate: false - xy: 1996, 29 + xy: 2480, 89 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 unit-alpha-tiny rotate: false - xy: 2750, 61 + xy: 2774, 46 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 unit-alpha-xlarge rotate: false - xy: 3459, 413 + xy: 3559, 413 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -19683,189 +19795,189 @@ unit-antumbra-large index: -1 unit-antumbra-medium rotate: false - xy: 2175, 101 + xy: 2063, 33 size: 28, 32 orig: 28, 32 offset: 0, 0 index: -1 unit-antumbra-small rotate: false - xy: 4007, 204 + xy: 3734, 339 size: 21, 24 orig: 21, 24 offset: 0, 0 index: -1 unit-antumbra-tiny rotate: false - xy: 2858, 43 + xy: 2607, 261 size: 14, 16 orig: 14, 16 offset: 0, 0 index: -1 unit-antumbra-xlarge rotate: false - xy: 3709, 330 + xy: 945, 363 size: 43, 48 orig: 43, 48 offset: 0, 0 index: -1 unit-arkyid-large rotate: false - xy: 2413, 245 + xy: 2077, 245 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 unit-arkyid-medium rotate: false - xy: 1364, 101 + xy: 1223, 33 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 unit-arkyid-small rotate: false - xy: 2022, 23 + xy: 2486, 115 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 unit-arkyid-tiny rotate: false - xy: 2768, 79 + xy: 2792, 64 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 unit-arkyid-xlarge rotate: false - xy: 3509, 413 + xy: 3609, 413 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 unit-atrax-large rotate: false - xy: 2455, 298 + xy: 2161, 298 size: 40, 29 orig: 40, 29 offset: 0, 0 index: -1 unit-atrax-medium rotate: false - xy: 1398, 110 + xy: 1257, 42 size: 32, 23 orig: 32, 23 offset: 0, 0 index: -1 unit-atrax-small rotate: false - xy: 2048, 30 + xy: 982, 6 size: 24, 17 orig: 24, 17 offset: 0, 0 index: -1 unit-atrax-tiny rotate: false - xy: 2833, 287 + xy: 2707, 287 size: 16, 11 orig: 16, 11 offset: 0, 0 index: -1 unit-atrax-xlarge rotate: false - xy: 3559, 427 + xy: 3659, 427 size: 48, 34 orig: 48, 34 offset: 0, 0 index: -1 unit-beta-large rotate: false - xy: 2497, 331 + xy: 2077, 205 size: 40, 38 orig: 40, 38 offset: 0, 0 index: -1 unit-beta-medium rotate: false - xy: 1432, 103 + xy: 1085, 1 size: 32, 30 orig: 32, 30 offset: 0, 0 index: -1 unit-beta-small rotate: false - xy: 2615, 113 + xy: 2201, 1 size: 24, 23 orig: 24, 23 offset: 0, 0 index: -1 unit-beta-tiny rotate: false - xy: 2768, 62 + xy: 2810, 83 size: 16, 15 orig: 16, 15 offset: 0, 0 index: -1 unit-beta-xlarge rotate: false - xy: 3609, 415 + xy: 3709, 415 size: 48, 46 orig: 48, 46 offset: 0, 0 index: -1 unit-bryde-large rotate: false - xy: 2413, 203 + xy: 2119, 245 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 unit-bryde-medium rotate: false - xy: 1466, 101 + xy: 1291, 33 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 unit-bryde-small rotate: false - xy: 1996, 3 + xy: 2227, 8 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 unit-bryde-tiny rotate: false - xy: 2750, 43 + xy: 2792, 46 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 unit-bryde-xlarge rotate: false - xy: 3659, 413 + xy: 3759, 413 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 unit-corvus-large rotate: false - xy: 2455, 270 + xy: 2203, 301 size: 40, 26 orig: 40, 26 offset: 0, 0 index: -1 unit-corvus-medium rotate: false - xy: 3926, 341 + xy: 916, 37 size: 31, 20 orig: 31, 20 offset: 0, 0 index: -1 unit-corvus-small rotate: false - xy: 3643, 287 + xy: 3740, 218 size: 24, 15 orig: 24, 15 offset: 0, 0 @@ -19879,280 +19991,280 @@ unit-corvus-tiny index: -1 unit-corvus-xlarge rotate: false - xy: 3709, 430 + xy: 3809, 430 size: 48, 31 orig: 48, 31 offset: 0, 0 index: -1 unit-crawler-large rotate: false - xy: 2497, 289 + xy: 2161, 256 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 unit-crawler-medium rotate: false - xy: 1500, 101 + xy: 1325, 33 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 unit-crawler-small rotate: false - xy: 2048, 4 + xy: 3763, 192 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 unit-crawler-tiny rotate: false - xy: 2786, 79 + xy: 2810, 65 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 unit-crawler-xlarge rotate: false - xy: 3759, 413 + xy: 3859, 413 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 unit-dagger-large rotate: false - xy: 2539, 329 + xy: 2203, 259 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 unit-dagger-medium rotate: false - xy: 1534, 101 + xy: 1359, 33 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 unit-dagger-small rotate: false - xy: 2634, 87 + xy: 2490, 63 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 unit-dagger-tiny rotate: false - xy: 2768, 44 + xy: 2828, 82 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 unit-dagger-xlarge rotate: false - xy: 3809, 413 + xy: 3909, 413 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 unit-eclipse-large rotate: false - xy: 2455, 228 + xy: 2245, 287 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 unit-eclipse-medium rotate: false - xy: 1568, 101 + xy: 1393, 33 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 unit-eclipse-small rotate: false - xy: 2634, 61 + xy: 2490, 37 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 unit-eclipse-tiny rotate: false - xy: 2786, 61 + xy: 2810, 47 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 unit-eclipse-xlarge rotate: false - xy: 3859, 413 + xy: 3959, 413 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 unit-flare-large rotate: false - xy: 2497, 247 + xy: 2287, 287 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 unit-flare-medium rotate: false - xy: 1602, 101 + xy: 1427, 33 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 unit-flare-small rotate: false - xy: 2074, 23 + xy: 2506, 89 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 unit-flare-tiny rotate: false - xy: 2804, 79 + xy: 2828, 64 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 unit-flare-xlarge rotate: false - xy: 3909, 413 + xy: 4009, 413 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 unit-fortress-large rotate: false - xy: 2581, 337 + xy: 2119, 211 size: 40, 32 orig: 40, 32 offset: 0, 0 index: -1 unit-fortress-medium rotate: false - xy: 1636, 108 + xy: 1119, 6 size: 32, 25 orig: 32, 25 offset: 0, 0 index: -1 unit-fortress-small rotate: false - xy: 2022, 2 + xy: 1008, 4 size: 24, 19 orig: 24, 19 offset: 0, 0 index: -1 unit-fortress-tiny rotate: false - xy: 4037, 232 + xy: 3754, 313 size: 16, 12 orig: 16, 12 offset: 0, 0 index: -1 unit-fortress-xlarge rotate: false - xy: 3959, 423 + xy: 3809, 390 size: 48, 38 orig: 48, 38 offset: 0, 0 index: -1 unit-gamma-large rotate: false - xy: 2539, 287 + xy: 2161, 214 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 unit-gamma-medium rotate: false - xy: 1670, 101 + xy: 1461, 33 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 unit-gamma-small rotate: false - xy: 2078, 49 + xy: 2512, 115 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 unit-gamma-tiny rotate: false - xy: 2804, 61 + xy: 2846, 82 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 unit-gamma-xlarge rotate: false - xy: 4009, 413 + xy: 3659, 377 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 unit-horizon-large rotate: false - xy: 2581, 295 + xy: 2203, 217 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 unit-horizon-medium rotate: false - xy: 1704, 101 + xy: 1495, 33 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 unit-horizon-small rotate: false - xy: 2100, 23 + xy: 2516, 63 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 unit-horizon-tiny rotate: false - xy: 2822, 79 + xy: 2846, 64 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 unit-horizon-xlarge rotate: false - xy: 3709, 380 + xy: 3709, 365 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 unit-mace-large rotate: false - xy: 2623, 329 + xy: 2245, 245 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 unit-mace-medium rotate: false - xy: 1738, 101 + xy: 1529, 33 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 unit-mace-small rotate: false - xy: 4004, 153 + xy: 2516, 37 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 unit-mace-tiny rotate: false - xy: 2822, 61 + xy: 2864, 82 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -20166,49 +20278,49 @@ unit-mace-xlarge index: -1 unit-mega-large rotate: false - xy: 2665, 329 + xy: 2329, 287 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 unit-mega-medium rotate: false - xy: 1772, 101 + xy: 1563, 33 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 unit-mega-small rotate: false - xy: 4004, 127 + xy: 2532, 89 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 unit-mega-tiny rotate: false - xy: 2840, 79 + xy: 2864, 64 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 unit-mega-xlarge rotate: false - xy: 3809, 363 + xy: 3809, 340 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 unit-minke-large rotate: false - xy: 1089, 161 + xy: 881, 85 size: 34, 40 orig: 34, 40 offset: 0, 0 index: -1 unit-minke-medium rotate: false - xy: 2293, 101 + xy: 2123, 33 size: 27, 32 orig: 27, 32 offset: 0, 0 @@ -20222,42 +20334,42 @@ unit-minke-small index: -1 unit-minke-tiny rotate: false - xy: 2720, 159 + xy: 1785, 15 size: 13, 16 orig: 13, 16 offset: 0, 0 index: -1 unit-minke-xlarge rotate: false - xy: 3799, 313 + xy: 1035, 363 size: 41, 48 orig: 41, 48 offset: 0, 0 index: -1 unit-mono-large rotate: false - xy: 2707, 329 + xy: 2287, 245 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 unit-mono-medium rotate: false - xy: 1806, 101 + xy: 1597, 33 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 unit-mono-small rotate: false - xy: 4004, 101 + xy: 2538, 115 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 unit-mono-tiny rotate: false - xy: 2840, 61 + xy: 2882, 82 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -20271,28 +20383,28 @@ unit-mono-xlarge index: -1 unit-nova-large rotate: false - xy: 2749, 329 + xy: 2371, 287 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 unit-nova-medium rotate: false - xy: 1840, 101 + xy: 1631, 33 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 unit-nova-small rotate: false - xy: 4001, 75 + xy: 2542, 63 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 unit-nova-tiny rotate: false - xy: 2858, 79 + xy: 2882, 64 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -20306,98 +20418,98 @@ unit-nova-xlarge index: -1 unit-oct-large rotate: false - xy: 2791, 329 + xy: 2329, 245 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 unit-oct-medium rotate: false - xy: 1874, 101 + xy: 1665, 33 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 unit-oct-small rotate: false - xy: 4027, 75 + xy: 2542, 37 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 unit-oct-tiny rotate: false - xy: 2858, 61 + xy: 2900, 82 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 unit-oct-xlarge rotate: false - xy: 3959, 373 + xy: 3959, 363 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 unit-omura-large rotate: false - xy: 3565, 240 + xy: 2093, 25 size: 28, 40 orig: 28, 40 offset: 0, 0 index: -1 unit-omura-medium rotate: false - xy: 2643, 185 + xy: 2467, 186 size: 22, 32 orig: 22, 32 offset: 0, 0 index: -1 unit-omura-small rotate: false - xy: 2876, 71 + xy: 3763, 287 size: 16, 24 orig: 16, 24 offset: 0, 0 index: -1 unit-omura-tiny rotate: false - xy: 3829, 295 + xy: 1856, 15 size: 11, 16 orig: 11, 16 offset: 0, 0 index: -1 unit-omura-xlarge rotate: false - xy: 1125, 153 + xy: 881, 35 size: 33, 48 orig: 33, 48 offset: 0, 0 index: -1 unit-poly-large rotate: false - xy: 2833, 329 + xy: 2413, 287 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 unit-poly-medium rotate: false - xy: 1908, 101 + xy: 1699, 33 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 unit-poly-small rotate: false - xy: 2608, 35 + xy: 2558, 89 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 unit-poly-tiny rotate: false - xy: 2786, 43 + xy: 2900, 64 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -20411,21 +20523,21 @@ unit-poly-xlarge index: -1 unit-pulsar-large rotate: false - xy: 2539, 251 + xy: 2371, 251 size: 40, 34 orig: 40, 34 offset: 0, 0 index: -1 unit-pulsar-medium rotate: false - xy: 3525, 342 + xy: 1733, 38 size: 32, 27 orig: 32, 27 offset: 0, 0 index: -1 unit-pulsar-small rotate: false - xy: 2074, 1 + xy: 1034, 3 size: 24, 20 orig: 24, 20 offset: 0, 0 @@ -20446,161 +20558,161 @@ unit-pulsar-xlarge index: -1 unit-quad-large rotate: false - xy: 2581, 253 + xy: 2455, 287 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 unit-quad-medium rotate: false - xy: 2078, 102 + xy: 1937, 34 size: 31, 31 orig: 31, 31 offset: 0, 0 index: -1 unit-quad-small rotate: false - xy: 2634, 35 + xy: 2564, 115 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 unit-quad-tiny rotate: false - xy: 3737, 313 + xy: 2828, 47 size: 15, 15 orig: 15, 15 offset: 0, 0 index: -1 unit-quad-xlarge rotate: false - xy: 3559, 377 + xy: 3859, 313 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 unit-quasar-large rotate: false - xy: 2623, 287 + xy: 2497, 287 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 unit-quasar-medium rotate: false - xy: 1942, 101 + xy: 1767, 33 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 unit-quasar-small rotate: false - xy: 3985, 256 + xy: 2568, 63 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 unit-quasar-tiny rotate: false - xy: 2804, 43 + xy: 2918, 82 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 unit-quasar-xlarge rotate: false - xy: 3609, 365 + xy: 3909, 313 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 unit-reign-large rotate: false - xy: 2875, 343 + xy: 2245, 217 size: 40, 26 orig: 40, 26 offset: 0, 0 index: -1 unit-reign-medium rotate: false - xy: 2871, 287 + xy: 949, 3 size: 31, 20 orig: 31, 20 offset: 0, 0 index: -1 unit-reign-small rotate: false - xy: 3926, 324 + xy: 2568, 46 size: 24, 15 orig: 24, 15 offset: 0, 0 index: -1 unit-reign-tiny rotate: false - xy: 4040, 310 + xy: 181, 1 size: 15, 10 orig: 15, 10 offset: 0, 0 index: -1 unit-reign-xlarge rotate: false - xy: 3659, 380 + xy: 181, 13 size: 48, 31 orig: 48, 31 offset: 0, 0 index: -1 unit-risso-large rotate: false - xy: 1052, 161 + xy: 881, 127 size: 35, 40 orig: 35, 40 offset: 0, 0 index: -1 unit-risso-medium rotate: false - xy: 2205, 101 + xy: 2107, 67 size: 28, 32 orig: 28, 32 offset: 0, 0 index: -1 unit-risso-small rotate: false - xy: 2643, 159 + xy: 2264, 191 size: 21, 24 orig: 21, 24 offset: 0, 0 index: -1 unit-risso-tiny rotate: false - xy: 2305, 69 + xy: 3661, 175 size: 14, 16 orig: 14, 16 offset: 0, 0 index: -1 unit-risso-xlarge rotate: false - xy: 3754, 313 + xy: 990, 363 size: 43, 48 orig: 43, 48 offset: 0, 0 index: -1 unit-scepter-large rotate: false - xy: 2623, 253 + xy: 2413, 253 size: 40, 32 orig: 40, 32 offset: 0, 0 index: -1 unit-scepter-medium rotate: false - xy: 1976, 107 + xy: 1801, 39 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 unit-scepter-small rotate: false - xy: 2615, 138 + xy: 2490, 16 size: 24, 19 orig: 24, 19 offset: 0, 0 @@ -20614,84 +20726,84 @@ unit-scepter-tiny index: -1 unit-scepter-xlarge rotate: false - xy: 181, 5 + xy: 231, 5 size: 48, 39 orig: 48, 39 offset: 0, 0 index: -1 unit-sei-large rotate: false - xy: 2665, 287 + xy: 2539, 287 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 unit-sei-medium rotate: false - xy: 3559, 343 + xy: 1835, 33 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 unit-sei-small rotate: false - xy: 4011, 256 + xy: 2516, 11 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 unit-sei-tiny rotate: false - xy: 2822, 43 + xy: 2918, 64 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 unit-sei-xlarge rotate: false - xy: 3959, 323 + xy: 3959, 313 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 unit-spiroct-large rotate: false - xy: 2665, 254 + xy: 2455, 254 size: 40, 31 orig: 40, 31 offset: 0, 0 index: -1 unit-spiroct-medium rotate: false - xy: 2111, 108 + xy: 1153, 6 size: 31, 25 orig: 31, 25 offset: 0, 0 index: -1 unit-spiroct-small rotate: false - xy: 2100, 2 + xy: 2542, 16 size: 24, 19 orig: 24, 19 offset: 0, 0 index: -1 unit-spiroct-tiny rotate: false - xy: 2305, 87 + xy: 3772, 313 size: 15, 12 orig: 15, 12 offset: 0, 0 index: -1 unit-spiroct-xlarge rotate: false - xy: 231, 6 + xy: 4009, 323 size: 48, 38 orig: 48, 38 offset: 0, 0 index: -1 unit-toxopid-large rotate: false - xy: 1160, 161 + xy: 3429, 287 size: 33, 40 orig: 33, 40 offset: 0, 0 @@ -20705,42 +20817,42 @@ unit-toxopid-medium index: -1 unit-toxopid-small rotate: false - xy: 2641, 133 + xy: 2590, 115 size: 20, 24 orig: 20, 24 offset: 0, 0 index: -1 unit-toxopid-tiny rotate: false - xy: 2904, 290 + xy: 3793, 345 size: 13, 16 orig: 13, 16 offset: 0, 0 index: -1 unit-toxopid-xlarge rotate: false - xy: 2707, 279 + xy: 2581, 279 size: 40, 48 orig: 40, 48 offset: 0, 0 index: -1 unit-vela-large rotate: false - xy: 2749, 295 + xy: 2623, 295 size: 40, 32 orig: 40, 32 offset: 0, 0 index: -1 unit-vela-medium rotate: false - xy: 2010, 107 + xy: 1869, 39 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 unit-vela-small rotate: false - xy: 3985, 235 + xy: 2568, 25 size: 24, 19 orig: 24, 19 offset: 0, 0 @@ -20754,49 +20866,49 @@ unit-vela-tiny index: -1 unit-vela-xlarge rotate: false - xy: 4009, 322 + xy: 845, 372 size: 48, 39 orig: 48, 39 offset: 0, 0 index: -1 unit-zenith-large rotate: false - xy: 2791, 287 + xy: 2665, 287 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 unit-zenith-medium rotate: false - xy: 2044, 101 + xy: 1903, 33 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 unit-zenith-small rotate: false - xy: 4011, 230 + xy: 2584, 89 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 unit-zenith-tiny rotate: false - xy: 2840, 43 + xy: 2936, 82 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 unit-zenith-xlarge rotate: false - xy: 3659, 330 + xy: 895, 363 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 wavepane rotate: false - xy: 939, 174 + xy: 3353, 300 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -20804,7 +20916,7 @@ wavepane index: -1 white-pane rotate: false - xy: 977, 174 + xy: 3391, 300 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -20812,14 +20924,14 @@ white-pane index: -1 whiteui rotate: false - xy: 3754, 375 + xy: 821, 416 size: 3, 3 orig: 3, 3 offset: 0, 0 index: -1 window-empty rotate: false - xy: 3585, 143 + xy: 3711, 218 size: 27, 61 split: 4, 4, 2, 2 orig: 27, 61 diff --git a/core/assets/sprites/sprites.png b/core/assets/sprites/sprites.png index 9554a5639d..6a698b472a 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 d6e59f26a8..efc457f2e4 100644 Binary files a/core/assets/sprites/sprites2.png and b/core/assets/sprites/sprites2.png differ diff --git a/core/assets/sprites/sprites4.png b/core/assets/sprites/sprites4.png index 55262ad933..1a7eeb2a5c 100644 Binary files a/core/assets/sprites/sprites4.png and b/core/assets/sprites/sprites4.png differ diff --git a/core/assets/sprites/sprites5.png b/core/assets/sprites/sprites5.png index 5150c19461..9fb3b87450 100644 Binary files a/core/assets/sprites/sprites5.png and b/core/assets/sprites/sprites5.png differ diff --git a/core/src/mindustry/ai/Astar.java b/core/src/mindustry/ai/Astar.java index c6f33e70f6..df50547d22 100644 --- a/core/src/mindustry/ai/Astar.java +++ b/core/src/mindustry/ai/Astar.java @@ -6,7 +6,7 @@ import arc.struct.*; import arc.util.*; import mindustry.world.*; -import static mindustry.Vars.world; +import static mindustry.Vars.*; public class Astar{ public static final DistanceHeuristic manhattan = (x1, y1, x2, y2) -> Math.abs(x1 - x2) + Math.abs(y1 - y2); diff --git a/core/src/mindustry/ai/BaseRegistry.java b/core/src/mindustry/ai/BaseRegistry.java index cb34095a3c..d5922ac822 100644 --- a/core/src/mindustry/ai/BaseRegistry.java +++ b/core/src/mindustry/ai/BaseRegistry.java @@ -3,7 +3,6 @@ package mindustry.ai; import arc.*; import arc.math.*; import arc.struct.*; -import arc.util.ArcAnnotate.*; import arc.util.*; import mindustry.ctype.*; import mindustry.game.*; @@ -17,7 +16,7 @@ import mindustry.world.meta.*; import java.io.*; -import static mindustry.Vars.tilesize; +import static mindustry.Vars.*; public class BaseRegistry{ public Seq cores = new Seq<>(); diff --git a/core/src/mindustry/ai/BlockIndexer.java b/core/src/mindustry/ai/BlockIndexer.java index 25aec37c97..3f2c4981e1 100644 --- a/core/src/mindustry/ai/BlockIndexer.java +++ b/core/src/mindustry/ai/BlockIndexer.java @@ -6,7 +6,7 @@ import arc.math.*; import arc.math.geom.*; import arc.struct.EnumSet; import arc.struct.*; -import arc.util.ArcAnnotate.*; +import arc.util.*; import mindustry.content.*; import mindustry.game.EventType.*; import mindustry.game.*; @@ -220,7 +220,7 @@ public class BlockIndexer{ public void notifyTileDamaged(Building entity){ if(damagedTiles[entity.team.id] == null){ - damagedTiles[entity.team.id] = new ObjectSet(); + damagedTiles[entity.team.id] = new ObjectSet<>(); } damagedTiles[entity.team.id].add(entity); diff --git a/core/src/mindustry/ai/Pathfinder.java b/core/src/mindustry/ai/Pathfinder.java index a1aa2cb3af..c24cecd49c 100644 --- a/core/src/mindustry/ai/Pathfinder.java +++ b/core/src/mindustry/ai/Pathfinder.java @@ -4,7 +4,6 @@ import arc.*; import arc.func.*; import arc.math.geom.*; import arc.struct.*; -import arc.util.ArcAnnotate.*; import arc.util.*; import arc.util.async.*; import mindustry.annotations.Annotations.*; @@ -51,7 +50,7 @@ public class Pathfinder implements Runnable{ (PathTile.solid(tile) ? 5 : 0), //water - (team, tile) -> PathTile.solid(tile) || !PathTile.liquid(tile) ? 200 : 2 + //TODO cannot go through blocks - pathfinding isn't great + (team, tile) -> PathTile.solid(tile) || !PathTile.liquid(tile) ? 200 : 2 + (PathTile.nearGround(tile) || PathTile.nearSolid(tile) ? 14 : 0) + (PathTile.deep(tile) ? -1 : 0) + (PathTile.damages(tile) ? 35 : 0) @@ -103,7 +102,6 @@ public class Pathfinder implements Runnable{ /** Packs a tile into its internal representation. */ private int packTile(Tile tile){ - //TODO nearGround is just the inverse of nearLiquid? boolean nearLiquid = false, nearSolid = false, nearGround = false; for(int i = 0; i < 4; i++){ @@ -188,6 +186,8 @@ public class Pathfinder implements Runnable{ for(Flowfield data : threadList){ updateFrontier(data, maxUpdate / threadList.size); + //TODO implement timeouts... or don't + /* //remove flowfields that have 'timed out' so they can be garbage collected and no longer waste space if(data.refreshRate > 0 && Time.timeSinceMillis(data.lastUpdateTime) > fieldTimeout){ //make sure it doesn't get removed twice @@ -196,12 +196,11 @@ public class Pathfinder implements Runnable{ Team team = data.team; Core.app.post(() -> { - //TODO ????? //remove its used state - //if(fieldMap[team.id] != null){ - // fieldMap[team.id].remove(data.target); - // fieldMapUsed[team.id].remove(data.target); - //} + if(fieldMap[team.id] != null){ + fieldMap[team.id].remove(data.target); + fieldMapUsed[team.id].remove(data.target); + } //remove from main thread list mainList.remove(data); }); @@ -210,7 +209,7 @@ public class Pathfinder implements Runnable{ //remove from this thread list with a delay threadList.remove(data); }); - } + }*/ } } @@ -469,7 +468,7 @@ public class Pathfinder implements Runnable{ /** search frontier, these are Pos objects */ IntQueue frontier = new IntQueue(); /** all target positions; these positions have a cost of 0, and must be synchronized on! */ - IntSeq targets = new IntSeq(); + final IntSeq targets = new IntSeq(); /** current search ID */ int search = 1; /** last updated time */ diff --git a/core/src/mindustry/ai/formations/patterns/ArrowFormation.java b/core/src/mindustry/ai/formations/patterns/ArrowFormation.java deleted file mode 100644 index e3db12d2fe..0000000000 --- a/core/src/mindustry/ai/formations/patterns/ArrowFormation.java +++ /dev/null @@ -1,26 +0,0 @@ -package mindustry.ai.formations.patterns; - -import arc.math.geom.*; -import mindustry.ai.formations.*; - -public class ArrowFormation extends FormationPattern{ - //total triangular numbers - private static final int totalTris = 30; - //triangular number table - private static final int[] triTable = new int[totalTris]; - - //calculat triangular numbers - static{ - int sum = 0; - for(int i = 0; i < totalTris; i++){ - triTable[i] = sum; - sum += (i + 1); - } - } - - @Override - public Vec3 calculateSlotLocation(Vec3 out, int slot){ - //TODO - return out; - } -} diff --git a/core/src/mindustry/ai/types/BuilderAI.java b/core/src/mindustry/ai/types/BuilderAI.java index 6b89adcce3..90f0548c02 100644 --- a/core/src/mindustry/ai/types/BuilderAI.java +++ b/core/src/mindustry/ai/types/BuilderAI.java @@ -1,7 +1,7 @@ package mindustry.ai.types; import arc.struct.*; -import arc.util.ArcAnnotate.*; +import arc.util.*; import mindustry.entities.*; import mindustry.entities.units.*; import mindustry.game.Teams.*; @@ -87,8 +87,8 @@ public class BuilderAI extends AIController{ } //find new request - if(!unit.team().data().blocks.isEmpty() && following == null && timer.get(timerTarget3, 60 * 2f)){ - Queue blocks = unit.team().data().blocks; + if(!unit.team.data().blocks.isEmpty() && following == null && timer.get(timerTarget3, 60 * 2f)){ + Queue blocks = unit.team.data().blocks; BlockPlan block = blocks.first(); //check if it's already been placed diff --git a/core/src/mindustry/ai/types/FormationAI.java b/core/src/mindustry/ai/types/FormationAI.java index e2680b4f2b..e988294e1d 100644 --- a/core/src/mindustry/ai/types/FormationAI.java +++ b/core/src/mindustry/ai/types/FormationAI.java @@ -2,7 +2,7 @@ package mindustry.ai.types; import arc.math.*; import arc.math.geom.*; -import arc.util.ArcAnnotate.*; +import arc.util.*; import mindustry.ai.formations.*; import mindustry.entities.units.*; import mindustry.gen.*; diff --git a/core/src/mindustry/async/AsyncCore.java b/core/src/mindustry/async/AsyncCore.java index a023afafcc..764cd3dc4b 100644 --- a/core/src/mindustry/async/AsyncCore.java +++ b/core/src/mindustry/async/AsyncCore.java @@ -7,7 +7,7 @@ import mindustry.game.EventType.*; import java.util.concurrent.*; -import static mindustry.Vars.state; +import static mindustry.Vars.*; public class AsyncCore{ //all processes to be executed each frame diff --git a/core/src/mindustry/async/PhysicsProcess.java b/core/src/mindustry/async/PhysicsProcess.java index 9a075f8f40..07d44d4717 100644 --- a/core/src/mindustry/async/PhysicsProcess.java +++ b/core/src/mindustry/async/PhysicsProcess.java @@ -5,8 +5,8 @@ import arc.math.geom.*; import arc.math.geom.QuadTree.*; import arc.struct.*; import mindustry.*; -import mindustry.entities.*; import mindustry.async.PhysicsProcess.PhysicsWorld.*; +import mindustry.entities.*; import mindustry.gen.*; public class PhysicsProcess implements AsyncProcess{ diff --git a/core/src/mindustry/async/TeamIndexProcess.java b/core/src/mindustry/async/TeamIndexProcess.java index 13a234bbbc..86b5e16902 100644 --- a/core/src/mindustry/async/TeamIndexProcess.java +++ b/core/src/mindustry/async/TeamIndexProcess.java @@ -30,11 +30,11 @@ public class TeamIndexProcess implements AsyncProcess{ } public void updateCount(Team team, UnitType type, int amount){ - counts[team.id] += amount; + counts[team.id] = Math.max(amount + counts[team.id], 0); if(typeCounts[team.id].length <= type.id){ typeCounts[team.id] = new int[Vars.content.units().size]; } - typeCounts[team.id][type.id] += amount; + typeCounts[team.id][type.id] = Math.max(amount + typeCounts[team.id][type.id], 0); } private void count(Unit unit){ diff --git a/core/src/mindustry/audio/LoopControl.java b/core/src/mindustry/audio/LoopControl.java index 1b102ab0a4..65e3789463 100644 --- a/core/src/mindustry/audio/LoopControl.java +++ b/core/src/mindustry/audio/LoopControl.java @@ -2,9 +2,9 @@ package mindustry.audio; import arc.*; import arc.audio.*; -import arc.struct.*; import arc.math.*; import arc.math.geom.*; +import arc.struct.*; import mindustry.*; public class LoopControl{ diff --git a/core/src/mindustry/audio/MusicControl.java b/core/src/mindustry/audio/MusicControl.java index 1b642bc7cd..52358af758 100644 --- a/core/src/mindustry/audio/MusicControl.java +++ b/core/src/mindustry/audio/MusicControl.java @@ -4,7 +4,6 @@ import arc.*; import arc.audio.*; import arc.math.*; import arc.struct.*; -import arc.util.ArcAnnotate.*; import arc.util.*; import mindustry.game.EventType.*; import mindustry.gen.*; diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index bedf96addd..b4b9cd038e 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -74,7 +74,7 @@ public class Blocks implements ContentList{ coreShard, coreFoundation, coreNucleus, vault, container, unloader, //turrets - duo, scatter, scorch, hail, arc, wave, lancer, swarmer, salvo, fuse, ripple, cyclone, spectre, meltdown, segment, parallax, + duo, scatter, scorch, hail, arc, wave, lancer, swarmer, salvo, fuse, ripple, cyclone, foreshadow, spectre, meltdown, segment, parallax, tsunami, //units commandCenter, @@ -594,7 +594,7 @@ public class Blocks implements ContentList{ consumes.items(new ItemStack(Items.copper, 3), new ItemStack(Items.lead, 4), new ItemStack(Items.titanium, 2), new ItemStack(Items.silicon, 3)); }}; - cryofluidMixer = new LiquidConverter("cryofluidmixer"){{ + cryofluidMixer = new LiquidConverter("cryofluid-mixer"){{ requirements(Category.crafting, with(Items.lead, 65, Items.silicon, 40, Items.titanium, 60)); outputLiquid = new LiquidStack(Liquids.cryofluid, 0.2f); craftTime = 120f; @@ -757,14 +757,14 @@ public class Blocks implements ContentList{ plastaniumWall = new Wall("plastanium-wall"){{ requirements(Category.defense, with(Items.plastanium, 5, Items.metaglass, 2)); - health = 190 * wallHealthMultiplier; + health = 130 * wallHealthMultiplier; insulated = true; absorbLasers = true; }}; plastaniumWallLarge = new Wall("plastanium-wall-large"){{ requirements(Category.defense, ItemStack.mult(plastaniumWall.requirements, 4)); - health = 190 * wallHealthMultiplier * 4; + health = 130 * wallHealthMultiplier * 4; size = 2; insulated = true; absorbLasers = true; @@ -947,7 +947,7 @@ public class Blocks implements ContentList{ requirements(Category.distribution, with(Items.plastanium, 1, Items.thorium, 1, Items.metaglass, 1)); health = 180; speed = 0.08f; - displayedSpeed = 10f; + displayedSpeed = 11f; }}; junction = new Junction("junction"){{ @@ -1350,17 +1350,20 @@ public class Blocks implements ContentList{ requirements(Category.effect, with(Items.titanium, 250, Items.thorium, 125)); size = 3; itemCapacity = 1000; + group = BlockGroup.storage; }}; container = new StorageBlock("container"){{ requirements(Category.effect, with(Items.titanium, 100)); size = 2; itemCapacity = 300; + group = BlockGroup.storage; }}; unloader = new Unloader("unloader"){{ requirements(Category.effect, with(Items.titanium, 25, Items.silicon, 30)); speed = 6f; + group = BlockGroup.transportation; }}; //endregion @@ -1526,7 +1529,7 @@ public class Blocks implements ContentList{ force = 4.5f; scaledForce = 5.5f; range = 110f; - damage = 0.1f; + damage = 0.4f; health = 160 * size * size; rotateSpeed = 10; @@ -1580,13 +1583,37 @@ public class Blocks implements ContentList{ requirements(Category.turret, with(Items.silicon, 130, Items.thorium, 80, Items.phasefabric, 40)); health = 250 * size * size; - range = 140f; + range = 160f; hasPower = true; - consumes.power(8f); + consumes.powerCond(8f, (PointDefenseBuild b) -> b.target != null); size = 2; shootLength = 5f; bulletDamage = 25f; - reloadTime = 10f; + reloadTime = 9f; + }}; + + tsunami = new LiquidTurret("tsunami"){{ + requirements(Category.turret, with(Items.metaglass, 100, Items.lead, 400, Items.titanium, 250, Items.thorium, 100)); + ammo( + Liquids.water, Bullets.heavyWaterShot, + Liquids.slag, Bullets.heavySlagShot, + Liquids.cryofluid, Bullets.heavyCryoShot, + Liquids.oil, Bullets.heavyOilShot + ); + size = 3; + recoilAmount = 0f; + reloadTime = 2f; + shots = 2; + velocityInaccuracy = 0.1f; + inaccuracy = 4f; + recoilAmount = 1f; + restitution = 0.04f; + shootCone = 45f; + liquidCapacity = 40f; + shootEffect = Fx.shootLiquid; + range = 190f; + health = 250 * size * size; + shootSound = Sounds.splash; }}; fuse = new ItemTurret("fuse"){{ @@ -1665,6 +1692,48 @@ public class Blocks implements ContentList{ health = 145 * size * size; }}; + foreshadow = new ItemTurret("foreshadow"){{ + float brange = range = 500f; + + requirements(Category.turret, with(Items.copper, 1000, Items.metaglass, 600, Items.surgealloy, 300, Items.plastanium, 200, Items.silicon, 600)); + ammo( + Items.surgealloy, new PointBulletType(){{ + shootEffect = Fx.instShoot; + hitEffect = Fx.instHit; + smokeEffect = Fx.smokeCloud; + trailEffect = Fx.instTrail; + despawnEffect = Fx.instBomb; + trailSpacing = 20f; + damage = 1350; + tileDamageMultiplier = 0.5f; + speed = brange; + hitShake = 6f; + ammoMultiplier = 1f; + }} + ); + + rotateSpeed = 2.5f; + reloadTime = 200f; + restitution = 0.2f; + ammoUseEffect = Fx.shellEjectBig; + recoilAmount = 5f; + restitution = 0.009f; + cooldown = 0.009f; + shootShake = 4f; + shots = 1; + size = 4; + shootCone = 2f; + shootSound = Sounds.shootBig; + unitSort = (u, x, y) -> -u.maxHealth; + + coolantMultiplier = 0.09f; + + health = 150 * size * size; + consumes.add(new ConsumeLiquidFilter(liquid -> liquid.temperature <= 0.5f && liquid.flammability < 0.1f, 2f)).update(false).optional(true, true); + + consumes.powerCond(10f, TurretBuild::isActive); + }}; + spectre = new ItemTurret("spectre"){{ requirements(Category.turret, with(Items.copper, 900, Items.graphite, 300, Items.surgealloy, 250, Items.plastanium, 175, Items.thorium, 250)); ammo( @@ -1687,7 +1756,7 @@ public class Blocks implements ContentList{ shootCone = 24f; shootSound = Sounds.shootBig; - health = 155 * size * size; + health = 160 * size * size; consumes.add(new ConsumeLiquidFilter(liquid -> liquid.temperature <= 0.5f && liquid.flammability < 0.1f, 2f)).update(false).optional(true, true); }}; diff --git a/core/src/mindustry/content/Bullets.java b/core/src/mindustry/content/Bullets.java index bf3a575433..9b7e5f8805 100644 --- a/core/src/mindustry/content/Bullets.java +++ b/core/src/mindustry/content/Bullets.java @@ -34,7 +34,7 @@ public class Bullets implements ContentList{ standardGlaive, standardDenseBig, standardThoriumBig, standardIncendiaryBig, //liquid - waterShot, cryoShot, slagShot, oilShot, + waterShot, cryoShot, slagShot, oilShot, heavyWaterShot, heavyCryoShot, heavySlagShot, heavyOilShot, //environment, misc. damageLightning, damageLightningGround, fireball, basicFlame, pyraFlame, driverBolt, healBullet, healBulletBig, frag; @@ -375,10 +375,9 @@ public class Bullets implements ContentList{ }}; //this is just a copy of the damage lightning bullet that doesn't damage air units - damageLightningGround = new BulletType(0.0001f, 0f){{ - collidesAir = false; - }}; + damageLightningGround = new BulletType(0.0001f, 0f){}; JsonIO.copy(damageLightning, damageLightningGround); + damageLightningGround.collidesAir = false; healBullet = new HealBulletType(5.2f, 13){{ healPercent = 3f; @@ -474,6 +473,50 @@ public class Bullets implements ContentList{ drag = 0.03f; }}; + heavyWaterShot = new LiquidBulletType(Liquids.water){{ + lifetime = 49f; + speed = 4f; + knockback = 1.7f; + puddleSize = 8f; + drag = 0.001f; + ammoMultiplier = 2f; + statusDuration = 60f * 4f; + damage = 0.1f; + }}; + + heavyCryoShot = new LiquidBulletType(Liquids.cryofluid){{ + lifetime = 49f; + speed = 4f; + knockback = 1.3f; + puddleSize = 8f; + drag = 0.001f; + ammoMultiplier = 2f; + statusDuration = 60f * 4f; + damage = 0.1f; + }}; + + heavySlagShot = new LiquidBulletType(Liquids.slag){{ + lifetime = 49f; + speed = 4f; + knockback = 1.3f; + puddleSize = 8f; + damage = 6f; + drag = 0.001f; + ammoMultiplier = 2f; + statusDuration = 60f * 4f; + }}; + + heavyOilShot = new LiquidBulletType(Liquids.oil){{ + lifetime = 49f; + speed = 4f; + knockback = 1.3f; + puddleSize = 8f; + drag = 0.001f; + ammoMultiplier = 2f; + statusDuration = 60f * 4f; + damage = 0.1f; + }}; + driverBolt = new MassDriverBolt(); frag = new BasicBulletType(5f, 8, "bullet"){{ diff --git a/core/src/mindustry/content/Fx.java b/core/src/mindustry/content/Fx.java index c11c32fbcb..6ca6ccb24d 100644 --- a/core/src/mindustry/content/Fx.java +++ b/core/src/mindustry/content/Fx.java @@ -18,7 +18,7 @@ import static arc.graphics.g2d.Draw.rect; import static arc.graphics.g2d.Draw.*; import static arc.graphics.g2d.Lines.*; import static arc.math.Angles.*; -import static mindustry.Vars.tilesize; +import static mindustry.Vars.*; public class Fx{ public static final Effect @@ -138,12 +138,13 @@ public class Fx{ stroke(3f * e.fout()); color(e.color, Color.white, e.fin()); - beginLine(); - lines.each(Lines::linePoint); - linePoint(e.x, e.y); - endLine(); + for(int i = 0; i < lines.size - 1; i++){ + Vec2 cur = lines.get(i); + Vec2 next = lines.get(i + 1); + + Lines.line(cur.x, cur.y, next.x, next.y, false); + } - int i = 0; for(Vec2 p : lines){ Fill.circle(p.x, p.y, Lines.getStroke() / 2f); } @@ -455,6 +456,79 @@ public class Fx{ }), + instBomb = new Effect(15f, 100f, e -> { + color(Pal.bulletYellowBack); + stroke(e.fout() * 4f); + Lines.circle(e.x, e.y, 4f + e.finpow() * 20f); + + for(int i = 0; i < 4; i++){ + Drawf.tri(e.x, e.y, 6f, 80f * e.fout(), i*90 + 45); + } + + color(); + for(int i = 0; i < 4; i++){ + Drawf.tri(e.x, e.y, 3f, 30f * e.fout(), i*90 + 45); + } + }), + + instTrail = new Effect(30, e -> { + for(int i = 0; i < 2; i++){ + color(i == 0 ? Pal.bulletYellowBack : Pal.bulletYellow); + + float m = i == 0 ? 1f : 0.5f; + + float rot = e.rotation + 180f; + float w = 15f * e.fout() * m; + Drawf.tri(e.x, e.y, w, (30f + Mathf.randomSeedRange(e.id, 15f)) * m, rot); + Drawf.tri(e.x, e.y, w, 10f * m, rot + 180f); + } + }), + + instShoot = new Effect(24f, e -> { + e.scaled(10f, b -> { + color(Color.white, Pal.bulletYellowBack, b.fin()); + stroke(b.fout() * 3f + 0.2f); + Lines.circle(b.x, b.y, b.fin() * 50f); + }); + + color(Pal.bulletYellowBack); + + for(int i : Mathf.signs){ + Drawf.tri(e.x, e.y, 13f * e.fout(), 85f, e.rotation + 90f * i); + Drawf.tri(e.x, e.y, 13f * e.fout(), 50f, e.rotation + 20f * i); + } + }), + + instHit = new Effect(20f, 200f, e -> { + color(Pal.bulletYellowBack); + + for(int i = 0; i < 2; i++){ + color(i == 0 ? Pal.bulletYellowBack : Pal.bulletYellow); + + float m = i == 0 ? 1f : 0.5f; + + for(int j = 0; j < 5; j++){ + float rot = e.rotation + Mathf.randomSeedRange(e.id + j, 50f); + float w = 23f * e.fout() * m; + Drawf.tri(e.x, e.y, w, (80f + Mathf.randomSeedRange(e.id + j, 40f)) * m, rot); + Drawf.tri(e.x, e.y, w, 20f * m, rot + 180f); + } + } + + e.scaled(10f, c -> { + color(Pal.bulletYellow); + stroke(c.fout() * 2f + 0.2f); + Lines.circle(e.x, e.y, c.fin() * 30f); + }); + + e.scaled(12f, c -> { + color(Pal.bulletYellowBack); + randLenVectors(e.id, 25, 5f + e.fin() * 80f, e.rotation, 60f, (x, y) -> { + Fill.square(e.x + x, e.y + y, c.fout() * 3f, 45f); + }); + }); + }), + hitLaser = new Effect(8, e -> { color(Color.white, Pal.heal, e.fin()); stroke(0.5f + e.fout()); @@ -1074,28 +1148,11 @@ public class Fx{ }), railHit = new Effect(18f, 200f, e -> { - if(true){ - color(Pal.orangeSpark); + color(Pal.orangeSpark); - for(int i : Mathf.signs){ - Drawf.tri(e.x, e.y, 10f * e.fout(), 60f, e.rotation + 140f * i); - } - }else{ - e.scaled(7f, b -> { - color(Color.white, Color.lightGray, b.fin()); - stroke(b.fout() * 2f + 0.2f); - Lines.circle(b.x, b.y, b.fin() * 28f); - }); - - color(Pal.orangeSpark); - float rot = e.rotation + Mathf.randomSeedRange(e.id, 20f); - float w = 9f * e.fout(); - - Drawf.tri(e.x, e.y, w, 100f, rot); - Drawf.tri(e.x, e.y, w, 10f, rot + 180f); + for(int i : Mathf.signs){ + Drawf.tri(e.x, e.y, 10f * e.fout(), 60f, e.rotation + 140f * i); } - - }), lancerLaserShoot = new Effect(21f, e -> { @@ -1109,7 +1166,7 @@ public class Fx{ lancerLaserShootSmoke = new Effect(26f, e -> { color(Color.white); - float length = e.data == null || !(e.data instanceof Float) ? 70f : (Float)e.data; + float length = !(e.data instanceof Float) ? 70f : (Float)e.data; randLenVectors(e.id, 7, length, e.rotation, 0f, (x, y) -> { lineAngle(e.x + x, e.y + y, Mathf.angle(x, y), e.fout() * 9f); diff --git a/core/src/mindustry/content/Liquids.java b/core/src/mindustry/content/Liquids.java index aaced53394..91b7186f6b 100644 --- a/core/src/mindustry/content/Liquids.java +++ b/core/src/mindustry/content/Liquids.java @@ -1,8 +1,8 @@ package mindustry.content; -import arc.graphics.Color; -import mindustry.ctype.ContentList; -import mindustry.type.Liquid; +import arc.graphics.*; +import mindustry.ctype.*; +import mindustry.type.*; public class Liquids implements ContentList{ public static Liquid water, slag, oil, cryofluid; diff --git a/core/src/mindustry/content/StatusEffects.java b/core/src/mindustry/content/StatusEffects.java index 7dc957a344..6752cf68e6 100644 --- a/core/src/mindustry/content/StatusEffects.java +++ b/core/src/mindustry/content/StatusEffects.java @@ -2,10 +2,11 @@ package mindustry.content; import arc.*; import arc.graphics.*; -import arc.math.Mathf; -import mindustry.ctype.ContentList; +import arc.math.*; +import mindustry.ctype.*; import mindustry.game.EventType.*; -import mindustry.type.StatusEffect; +import mindustry.type.*; + import static mindustry.Vars.*; public class StatusEffects implements ContentList{ diff --git a/core/src/mindustry/content/TechTree.java b/core/src/mindustry/content/TechTree.java index b1a17c7ef9..fd025b2169 100644 --- a/core/src/mindustry/content/TechTree.java +++ b/core/src/mindustry/content/TechTree.java @@ -2,7 +2,7 @@ package mindustry.content; import arc.*; import arc.struct.*; -import arc.util.ArcAnnotate.*; +import arc.util.*; import mindustry.ctype.*; import mindustry.game.Objectives.*; import mindustry.type.*; @@ -109,6 +109,9 @@ public class TechTree implements ContentList{ node(Items.coal, with(Items.lead, 3000), () -> { node(Items.graphite, with(Items.coal, 1000), () -> { + node(illuminator, () -> { + }); + node(graphitePress, () -> { node(Items.titanium, with(Items.graphite, 6000, Items.copper, 10000, Items.lead, 10000), () -> { node(pneumaticDrill, () -> { @@ -344,11 +347,17 @@ public class TechTree implements ContentList{ }); }); + + node(tsunami, () -> { + + }); }); node(lancer, () -> { - node(meltdown, () -> { + node(foreshadow, () -> { + node(meltdown, () -> { + }); }); node(shockMine, () -> { @@ -562,7 +571,8 @@ public class TechTree implements ContentList{ return node(block, () -> {}); } - public static @Nullable TechNode get(UnlockableContent content){ + public static @Nullable + TechNode get(UnlockableContent content){ return map.get(content); } diff --git a/core/src/mindustry/content/UnitTypes.java b/core/src/mindustry/content/UnitTypes.java index ac1027e72d..5cae2c66bb 100644 --- a/core/src/mindustry/content/UnitTypes.java +++ b/core/src/mindustry/content/UnitTypes.java @@ -50,7 +50,7 @@ public class UnitTypes implements ContentList{ public static @EntityDef({Unitc.class, Builderc.class, Payloadc.class}) UnitType quad; //air + building + payload + command - public static @EntityDef({Unitc.class, Builderc.class, Payloadc.class, Commanderc.class}) UnitType oct; + public static @EntityDef({Unitc.class, Builderc.class, Payloadc.class, Commanderc.class, AmmoDistributec.class}) UnitType oct; //air + building + mining public static @EntityDef({Unitc.class, Builderc.class, Minerc.class}) UnitType alpha, beta, gamma; @@ -446,7 +446,7 @@ public class UnitTypes implements ContentList{ mineTier = 1; hitSize = 29f; itemCapacity = 80; - health = 19000f; + health = 18000f; buildSpeed = 1.7f; armor = 9f; landShake = 1.5f; @@ -488,7 +488,7 @@ public class UnitTypes implements ContentList{ firstShotDelay = Fx.greenLaserCharge.lifetime; bullet = new LaserBulletType(){{ - length = 500f; + length = 460f; damage = 550f; width = 75f; @@ -519,7 +519,7 @@ public class UnitTypes implements ContentList{ crawler = new UnitType("crawler"){{ defaultController = SuicideAI::new; - speed = 0.85f; + speed = 0.9f; hitSize = 8f; health = 180; mechSideSway = 0.25f; @@ -536,7 +536,7 @@ public class UnitTypes implements ContentList{ speed = 1f; splashDamageRadius = 55f; instantDisappear = true; - splashDamage = 55f; + splashDamage = 60f; killShooter = true; hittable = false; collidesAir = true; @@ -1314,6 +1314,10 @@ public class UnitTypes implements ContentList{ buildSpeed = 4f; drawShields = false; commandLimit = 6; + lowAltitude = true; + + ammoCapacity = 1300; + ammoResupplyAmount = 20; abilities.add(new ForceFieldAbility(140f, 4f, 7000f, 60f * 8), new HealFieldAbility(130f, 60f * 2, 140f)); }}; diff --git a/core/src/mindustry/core/ContentLoader.java b/core/src/mindustry/core/ContentLoader.java index 56e46d8be2..975bc4d1f8 100644 --- a/core/src/mindustry/core/ContentLoader.java +++ b/core/src/mindustry/core/ContentLoader.java @@ -1,10 +1,9 @@ package mindustry.core; import arc.files.*; -import arc.struct.*; import arc.func.*; import arc.graphics.*; -import arc.util.ArcAnnotate.*; +import arc.struct.*; import arc.util.*; import mindustry.content.*; import mindustry.ctype.*; @@ -13,8 +12,8 @@ import mindustry.mod.Mods.*; import mindustry.type.*; import mindustry.world.*; -import static arc.Core.files; -import static mindustry.Vars.mods; +import static arc.Core.*; +import static mindustry.Vars.*; /** * Loads all game content. diff --git a/core/src/mindustry/core/Control.java b/core/src/mindustry/core/Control.java index 4bb22b7839..86cf82c797 100644 --- a/core/src/mindustry/core/Control.java +++ b/core/src/mindustry/core/Control.java @@ -9,7 +9,6 @@ import arc.math.*; import arc.scene.ui.*; import arc.struct.*; import arc.util.*; -import arc.util.ArcAnnotate.*; import mindustry.*; import mindustry.audio.*; import mindustry.content.*; @@ -191,10 +190,6 @@ public class Control implements ApplicationListener, Loadable{ } - void resetCamera(){ - - } - @Override public void loadAsync(){ Draw.scl = 1f / Core.atlas.find("scale_marker").width; @@ -485,7 +480,7 @@ public class Control implements ApplicationListener, Loadable{ @Override public void update(){ - //TODO find out why this happens on Android + //this happens on Android and nobody knows why if(assets == null) return; saves.update(); @@ -523,7 +518,7 @@ public class Control implements ApplicationListener, Loadable{ platform.updateRPC(); } - if(Core.input.keyTap(Binding.pause) && !state.isOutOfTime() && !scene.hasDialog() && !scene.hasKeyboard() && !ui.restart.isShown() && (state.is(State.paused) || state.is(State.playing))){ + if(Core.input.keyTap(Binding.pause) && !scene.hasDialog() && !scene.hasKeyboard() && !ui.restart.isShown() && (state.is(State.paused) || state.is(State.playing))){ state.set(state.is(State.playing) ? State.paused : State.playing); } diff --git a/core/src/mindustry/core/FileTree.java b/core/src/mindustry/core/FileTree.java index f94c75eeb7..d9ca5694c1 100644 --- a/core/src/mindustry/core/FileTree.java +++ b/core/src/mindustry/core/FileTree.java @@ -2,8 +2,8 @@ package mindustry.core; import arc.*; import arc.assets.loaders.*; -import arc.struct.*; import arc.files.*; +import arc.struct.*; /** Handles files in a modded context. */ public class FileTree implements FileHandleResolver{ diff --git a/core/src/mindustry/core/GameState.java b/core/src/mindustry/core/GameState.java index 84b408b135..949e40d02d 100644 --- a/core/src/mindustry/core/GameState.java +++ b/core/src/mindustry/core/GameState.java @@ -1,7 +1,7 @@ package mindustry.core; import arc.*; -import arc.util.ArcAnnotate.*; +import arc.util.*; import mindustry.game.EventType.*; import mindustry.game.*; import mindustry.gen.*; @@ -19,7 +19,7 @@ public class GameState{ /** Whether the game is in game over state. */ public boolean gameOver = false, serverPaused = false, wasTimeout; /** Map that is currently being played on. */ - public @NonNull Map map = emptyMap; + public Map map = emptyMap; /** The current game rules. */ public Rules rules = new Rules(); /** Statistics for this save/game. Displayed after game over. */ @@ -50,11 +50,6 @@ public class GameState{ return rules.sector != null; } - /** @return whether the player is in a campaign and they are out of sector time */ - public boolean isOutOfTime(){ - return isCampaign() && isGame() && getSector().getTimeSpent() >= turnDuration && !net.active(); - } - public boolean hasSector(){ return rules.sector != null; } diff --git a/core/src/mindustry/core/Logic.java b/core/src/mindustry/core/Logic.java index 2d9bf18c49..e03771843a 100644 --- a/core/src/mindustry/core/Logic.java +++ b/core/src/mindustry/core/Logic.java @@ -282,18 +282,6 @@ public class Logic implements ApplicationListener{ state.enemies = Groups.unit.count(u -> u.team() == state.rules.waveTeam && u.type().isCounted); } - //force pausing when the player is out of sector time - if(state.isOutOfTime()){ - if(!state.wasTimeout){ - universe.displayTimeEnd(); - state.wasTimeout = true; - } - //if no turn was run. - if(state.isOutOfTime()){ - state.set(State.paused); - } - } - if(!state.isPaused()){ if(state.isCampaign()){ state.secinfo.update(); diff --git a/core/src/mindustry/core/NetClient.java b/core/src/mindustry/core/NetClient.java index c4e519a4a5..ae8c7d9a7c 100644 --- a/core/src/mindustry/core/NetClient.java +++ b/core/src/mindustry/core/NetClient.java @@ -105,12 +105,10 @@ public class NetClient implements ApplicationListener{ Time.runTask(3f, ui.loadfrag::hide); if(packet.reason != null){ - if(packet.reason.equals("closed")){ - ui.showSmall("@disconnect", "@disconnect.closed"); - }else if(packet.reason.equals("timeout")){ - ui.showSmall("@disconnect", "@disconnect.timeout"); - }else if(packet.reason.equals("error")){ - ui.showSmall("@disconnect", "@disconnect.error"); + switch(packet.reason){ + case "closed" -> ui.showSmall("@disconnect", "@disconnect.closed"); + case "timeout" -> ui.showSmall("@disconnect", "@disconnect.timeout"); + case "error" -> ui.showSmall("@disconnect", "@disconnect.error"); } }else{ ui.showErrorMessage("@disconnect"); diff --git a/core/src/mindustry/core/NetServer.java b/core/src/mindustry/core/NetServer.java index 9b298f9924..f5a625fc32 100644 --- a/core/src/mindustry/core/NetServer.java +++ b/core/src/mindustry/core/NetServer.java @@ -7,7 +7,6 @@ import arc.math.*; import arc.math.geom.*; import arc.struct.*; import arc.util.*; -import arc.util.ArcAnnotate.*; import arc.util.CommandHandler.*; import arc.util.io.*; import arc.util.serialization.*; diff --git a/core/src/mindustry/core/Renderer.java b/core/src/mindustry/core/Renderer.java index ad7806267c..0e51d7f0f9 100644 --- a/core/src/mindustry/core/Renderer.java +++ b/core/src/mindustry/core/Renderer.java @@ -217,8 +217,6 @@ public class Renderer implements ApplicationListener{ pixelator.register(); } - //TODO fx - Draw.draw(Layer.background, this::drawBackground); Draw.draw(Layer.floor, blocks.floor::drawFloor); Draw.draw(Layer.block - 1, blocks::drawShadows); diff --git a/core/src/mindustry/core/UI.java b/core/src/mindustry/core/UI.java index 536e89a9b2..f0a4757966 100644 --- a/core/src/mindustry/core/UI.java +++ b/core/src/mindustry/core/UI.java @@ -24,7 +24,7 @@ import mindustry.editor.*; import mindustry.game.EventType.*; import mindustry.gen.*; import mindustry.graphics.*; -import mindustry.logic.LogicDialog; +import mindustry.logic.*; import mindustry.ui.*; import mindustry.ui.dialogs.*; import mindustry.ui.fragments.*; diff --git a/core/src/mindustry/core/Version.java b/core/src/mindustry/core/Version.java index bef40c5e87..c2744700a4 100644 --- a/core/src/mindustry/core/Version.java +++ b/core/src/mindustry/core/Version.java @@ -2,8 +2,8 @@ package mindustry.core; import arc.*; import arc.Files.*; -import arc.struct.*; import arc.files.*; +import arc.struct.*; import arc.util.*; import arc.util.io.*; diff --git a/core/src/mindustry/core/World.java b/core/src/mindustry/core/World.java index 867ba38f1a..709b0bfb23 100644 --- a/core/src/mindustry/core/World.java +++ b/core/src/mindustry/core/World.java @@ -6,7 +6,6 @@ import arc.math.*; import arc.math.geom.*; import arc.struct.*; import arc.struct.ObjectIntMap.*; -import arc.util.ArcAnnotate.*; import arc.util.*; import arc.util.noise.*; import mindustry.content.*; @@ -31,7 +30,7 @@ import static mindustry.Vars.*; public class World{ public final Context context = new Context(); - public @NonNull Tiles tiles = new Tiles(0, 0); + public Tiles tiles = new Tiles(0, 0); private boolean generating, invalidMap; private ObjectMap customMapLoaders = new ObjectMap<>(); @@ -86,13 +85,11 @@ public class World{ return height()*tilesize; } - @NonNull public Floor floor(int x, int y){ Tile tile = tile(x, y); return tile == null ? Blocks.air.asFloor() : tile.floor(); } - @NonNull public Floor floorWorld(float x, float y){ Tile tile = tileWorld(x, y); return tile == null ? Blocks.air.asFloor() : tile.floor(); @@ -132,7 +129,6 @@ public class World{ return tile.build; } - @NonNull public Tile rawTile(int x, int y){ return tiles.getn(x, y); } diff --git a/core/src/mindustry/ctype/Content.java b/core/src/mindustry/ctype/Content.java index 7565dc88b0..c56f465824 100644 --- a/core/src/mindustry/ctype/Content.java +++ b/core/src/mindustry/ctype/Content.java @@ -2,7 +2,6 @@ package mindustry.ctype; import arc.files.*; import arc.util.*; -import arc.util.ArcAnnotate.*; import mindustry.*; import mindustry.mod.Mods.*; @@ -10,8 +9,7 @@ import mindustry.mod.Mods.*; public abstract class Content implements Comparable, Disposable{ public final short id; /** Info on which mod this content was loaded from. */ - public @NonNull ModContentInfo minfo = new ModContentInfo(); - + public ModContentInfo minfo = new ModContentInfo(); public Content(){ this.id = (short)Vars.content.getBy(getContentType()).size; diff --git a/core/src/mindustry/ctype/UnlockableContent.java b/core/src/mindustry/ctype/UnlockableContent.java index 9c4b147214..56e9c31146 100644 --- a/core/src/mindustry/ctype/UnlockableContent.java +++ b/core/src/mindustry/ctype/UnlockableContent.java @@ -4,7 +4,7 @@ import arc.*; import arc.func.*; import arc.graphics.g2d.*; import arc.scene.ui.layout.*; -import arc.util.ArcAnnotate.*; +import arc.util.*; import mindustry.annotations.Annotations.*; import mindustry.game.EventType.*; import mindustry.graphics.*; diff --git a/core/src/mindustry/editor/DrawOperation.java b/core/src/mindustry/editor/DrawOperation.java index e63c2f3a6b..7910de4892 100755 --- a/core/src/mindustry/editor/DrawOperation.java +++ b/core/src/mindustry/editor/DrawOperation.java @@ -1,14 +1,13 @@ package mindustry.editor; +import arc.struct.*; import mindustry.annotations.Annotations.*; -import arc.struct.LongSeq; -import mindustry.game.Team; -import mindustry.gen.TileOp; -import mindustry.world.Block; -import mindustry.world.Tile; -import mindustry.world.blocks.environment.Floor; +import mindustry.game.*; +import mindustry.gen.*; +import mindustry.world.*; +import mindustry.world.blocks.environment.*; -import static mindustry.Vars.content; +import static mindustry.Vars.*; public class DrawOperation{ private MapEditor editor; diff --git a/core/src/mindustry/editor/EditorTile.java b/core/src/mindustry/editor/EditorTile.java index 9b0b199e76..3731cf3d99 100644 --- a/core/src/mindustry/editor/EditorTile.java +++ b/core/src/mindustry/editor/EditorTile.java @@ -1,7 +1,6 @@ package mindustry.editor; import arc.func.*; -import arc.util.ArcAnnotate.*; import mindustry.content.*; import mindustry.editor.DrawOperation.*; import mindustry.game.*; @@ -19,7 +18,7 @@ public class EditorTile extends Tile{ } @Override - public void setFloor(@NonNull Floor type){ + public void setFloor(Floor type){ if(skip()){ super.setFloor(type); return; diff --git a/core/src/mindustry/editor/MapEditorDialog.java b/core/src/mindustry/editor/MapEditorDialog.java index 25733da92e..6ff8546b19 100644 --- a/core/src/mindustry/editor/MapEditorDialog.java +++ b/core/src/mindustry/editor/MapEditorDialog.java @@ -1,7 +1,6 @@ package mindustry.editor; import arc.*; -import arc.struct.*; import arc.files.*; import arc.func.*; import arc.graphics.*; @@ -14,8 +13,8 @@ import arc.scene.event.*; import arc.scene.style.*; import arc.scene.ui.*; import arc.scene.ui.layout.*; +import arc.struct.*; import arc.util.*; -import arc.util.ArcAnnotate.*; import mindustry.*; import mindustry.content.*; import mindustry.core.GameState.*; diff --git a/core/src/mindustry/editor/MapGenerateDialog.java b/core/src/mindustry/editor/MapGenerateDialog.java index 472a20dee0..a4a4c0c181 100644 --- a/core/src/mindustry/editor/MapGenerateDialog.java +++ b/core/src/mindustry/editor/MapGenerateDialog.java @@ -417,7 +417,7 @@ public class MapGenerateDialog extends BaseDialog{ public void set(Block floor, Block wall, Block ore, Team team){ this.floor = floor.id; this.block = wall.id; - this.ore = ore.id; + this.ore = floor.asFloor().isLiquid ? 0 : ore.id; this.team = (byte)team.id; } diff --git a/core/src/mindustry/editor/MapInfoDialog.java b/core/src/mindustry/editor/MapInfoDialog.java index c46e06f36d..dd9959b199 100644 --- a/core/src/mindustry/editor/MapInfoDialog.java +++ b/core/src/mindustry/editor/MapInfoDialog.java @@ -1,8 +1,8 @@ package mindustry.editor; import arc.*; -import arc.struct.*; import arc.scene.ui.*; +import arc.struct.*; import mindustry.*; import mindustry.game.*; import mindustry.io.*; diff --git a/core/src/mindustry/editor/MapLoadDialog.java b/core/src/mindustry/editor/MapLoadDialog.java index 53673ae9d2..4ed63a1a7f 100644 --- a/core/src/mindustry/editor/MapLoadDialog.java +++ b/core/src/mindustry/editor/MapLoadDialog.java @@ -8,7 +8,7 @@ import mindustry.maps.*; import mindustry.ui.*; import mindustry.ui.dialogs.*; -import static mindustry.Vars.maps; +import static mindustry.Vars.*; public class MapLoadDialog extends BaseDialog{ private Map selected = null; diff --git a/core/src/mindustry/editor/MapView.java b/core/src/mindustry/editor/MapView.java index 21e659ae1b..7ee088eec5 100644 --- a/core/src/mindustry/editor/MapView.java +++ b/core/src/mindustry/editor/MapView.java @@ -1,24 +1,22 @@ package mindustry.editor; -import arc.Core; -import arc.graphics.Color; +import arc.*; +import arc.graphics.*; import arc.graphics.g2d.*; -import arc.input.GestureDetector; -import arc.input.GestureDetector.GestureListener; -import arc.input.KeyCode; -import arc.math.Mathf; +import arc.input.*; +import arc.input.GestureDetector.*; +import arc.math.*; import arc.math.geom.*; -import arc.scene.Element; +import arc.scene.*; import arc.scene.event.*; -import arc.scene.ui.TextField; -import arc.scene.ui.layout.Scl; +import arc.scene.ui.*; +import arc.scene.ui.layout.*; import arc.util.*; -import mindustry.graphics.Pal; -import mindustry.input.Binding; -import mindustry.ui.GridImage; +import mindustry.graphics.*; +import mindustry.input.*; +import mindustry.ui.*; -import static mindustry.Vars.mobile; -import static mindustry.Vars.ui; +import static mindustry.Vars.*; public class MapView extends Element implements GestureListener{ private MapEditor editor; diff --git a/core/src/mindustry/editor/OperationStack.java b/core/src/mindustry/editor/OperationStack.java index 0558de14bc..91bb183457 100755 --- a/core/src/mindustry/editor/OperationStack.java +++ b/core/src/mindustry/editor/OperationStack.java @@ -1,6 +1,6 @@ package mindustry.editor; -import arc.struct.Seq; +import arc.struct.*; public class OperationStack{ private static final int maxSize = 10; diff --git a/core/src/mindustry/entities/Damage.java b/core/src/mindustry/entities/Damage.java index 152982a986..e22891eba5 100644 --- a/core/src/mindustry/entities/Damage.java +++ b/core/src/mindustry/entities/Damage.java @@ -184,7 +184,6 @@ public class Damage{ Building tile = world.build(cx, cy); if(tile != null && tile.team != hitter.team){ tmpBuilding = tile; - //TODO return tile return true; } return false; diff --git a/core/src/mindustry/entities/Effect.java b/core/src/mindustry/entities/Effect.java index fd82f109e9..9d17cfcfc5 100644 --- a/core/src/mindustry/entities/Effect.java +++ b/core/src/mindustry/entities/Effect.java @@ -8,7 +8,6 @@ import arc.math.*; import arc.math.geom.*; import arc.struct.*; import arc.util.*; -import arc.util.ArcAnnotate.*; import mindustry.*; import mindustry.content.*; import mindustry.gen.*; diff --git a/core/src/mindustry/entities/EntityGroup.java b/core/src/mindustry/entities/EntityGroup.java index 1157b83ff9..bec27847c4 100644 --- a/core/src/mindustry/entities/EntityGroup.java +++ b/core/src/mindustry/entities/EntityGroup.java @@ -8,7 +8,7 @@ import mindustry.gen.*; import java.util.*; -import static mindustry.Vars.collisions; +import static mindustry.Vars.*; /** Represents a group of a certain type of entity.*/ @SuppressWarnings("unchecked") diff --git a/core/src/mindustry/entities/Lightning.java b/core/src/mindustry/entities/Lightning.java index b693239061..738bfa1f1e 100644 --- a/core/src/mindustry/entities/Lightning.java +++ b/core/src/mindustry/entities/Lightning.java @@ -32,8 +32,6 @@ public class Lightning{ createLightningInternal(bullet, lastSeed++, bullet.team, color, damage, x, y, targetAngle, length); } - //TODO remote method - //@Remote(called = Loc.server, unreliable = true) private static void createLightningInternal(Bullet hitter, int seed, Team team, Color color, float damage, float x, float y, float rotation, int length){ random.setSeed(seed); hit.clear(); diff --git a/core/src/mindustry/entities/Units.java b/core/src/mindustry/entities/Units.java index 82827c6530..85761795e5 100644 --- a/core/src/mindustry/entities/Units.java +++ b/core/src/mindustry/entities/Units.java @@ -175,6 +175,18 @@ public class Units{ } } + /** Returns the closest target enemy. First, units are checked, then tile entities. */ + public static Teamc bestTarget(Team team, float x, float y, float range, Boolf unitPred, Boolf tilePred, Sortf sort){ + if(team == Team.derelict) return null; + + Unit unit = bestEnemy(team, x, y, range, unitPred, sort); + if(unit != null){ + return unit; + }else{ + return findEnemyTile(team, x, y, range, tilePred); + } + } + /** Returns the closest enemy of this team. Filter by predicate. */ public static Unit closestEnemy(Team team, float x, float y, float range, Boolf predicate){ if(team == Team.derelict) return null; @@ -195,6 +207,26 @@ public class Units{ return result; } + /** Returns the closest enemy of this team using a custom comparison function. Filter by predicate. */ + public static Unit bestEnemy(Team team, float x, float y, float range, Boolf predicate, Sortf sort){ + if(team == Team.derelict) return null; + + result = null; + cdist = 0f; + + nearbyEnemies(team, x - range, y - range, range*2f, range*2f, e -> { + if(e.dead() || !predicate.get(e) || !e.within(x, y, range)) return; + + float cost = sort.cost(e, x, y); + if(result == null || cost < cdist){ + result = e; + cdist = cost; + } + }); + + return result; + } + /** Returns the closest ally of this team. Filter by predicate. No range. */ public static Unit closest(Team team, float x, float y, Boolf predicate){ result = null; @@ -297,4 +329,7 @@ public class Units{ nearbyEnemies(team, rect.x, rect.y, rect.width, rect.height, cons); } + public interface Sortf{ + float cost(Unit unit, float x, float y); + } } diff --git a/core/src/mindustry/entities/abilities/ForceFieldAbility.java b/core/src/mindustry/entities/abilities/ForceFieldAbility.java index 7d36f97e04..fa9fa5e2c8 100644 --- a/core/src/mindustry/entities/abilities/ForceFieldAbility.java +++ b/core/src/mindustry/entities/abilities/ForceFieldAbility.java @@ -27,8 +27,8 @@ public class ForceFieldAbility extends Ability{ private static float realRad; private static Unit paramUnit; private static ForceFieldAbility paramField; - private static final Cons shieldConsumer = trait -> { - if(trait.team() != paramUnit.team && Intersector.isInsideHexagon(paramUnit.x, paramUnit.y, realRad * 2f, trait.x(), trait.y()) && paramUnit.shield > 0){ + private static final Cons shieldConsumer = trait -> { + if(trait.team != paramUnit.team && trait.type.absorbable && Intersector.isInsideHexagon(paramUnit.x, paramUnit.y, realRad * 2f, trait.x(), trait.y()) && paramUnit.shield > 0){ trait.absorb(); Fx.absorb.at(trait); diff --git a/core/src/mindustry/entities/abilities/StatusFieldAbility.java b/core/src/mindustry/entities/abilities/StatusFieldAbility.java index a1c9a53418..857cfde5cf 100644 --- a/core/src/mindustry/entities/abilities/StatusFieldAbility.java +++ b/core/src/mindustry/entities/abilities/StatusFieldAbility.java @@ -1,6 +1,5 @@ package mindustry.entities.abilities; -import arc.util.ArcAnnotate.*; import arc.util.*; import mindustry.content.*; import mindustry.entities.*; @@ -8,7 +7,7 @@ import mindustry.gen.*; import mindustry.type.*; public class StatusFieldAbility extends Ability{ - public @NonNull StatusEffect effect; + public StatusEffect effect; public float duration = 60, reload = 100, range = 20; public Effect applyEffect = Fx.heal; public Effect activeEffect = Fx.overdriveWave; @@ -17,7 +16,7 @@ public class StatusFieldAbility extends Ability{ StatusFieldAbility(){} - public StatusFieldAbility(@NonNull StatusEffect effect, float duration, float reload, float range){ + public StatusFieldAbility(StatusEffect effect, float duration, float reload, float range){ this.duration = duration; this.reload = reload; this.range = range; diff --git a/core/src/mindustry/entities/abilities/UnitSpawnAbility.java b/core/src/mindustry/entities/abilities/UnitSpawnAbility.java index 1af235140b..74140114d9 100644 --- a/core/src/mindustry/entities/abilities/UnitSpawnAbility.java +++ b/core/src/mindustry/entities/abilities/UnitSpawnAbility.java @@ -2,7 +2,6 @@ package mindustry.entities.abilities; import arc.graphics.g2d.*; import arc.math.*; -import arc.util.ArcAnnotate.*; import arc.util.*; import mindustry.*; import mindustry.content.*; @@ -13,13 +12,13 @@ import mindustry.type.*; import mindustry.ui.*; public class UnitSpawnAbility extends Ability{ - public @NonNull UnitType type; + public UnitType type; public float spawnTime = 60f, spawnX, spawnY; public Effect spawnEffect = Fx.spawn; protected float timer; - public UnitSpawnAbility(@NonNull UnitType type, float spawnTime, float spawnX, float spawnY){ + public UnitSpawnAbility(UnitType type, float spawnTime, float spawnX, float spawnY){ this.type = type; this.spawnTime = spawnTime; this.spawnX = spawnX; diff --git a/core/src/mindustry/entities/bullet/BulletType.java b/core/src/mindustry/entities/bullet/BulletType.java index b2d2f479ff..238a09f75c 100644 --- a/core/src/mindustry/entities/bullet/BulletType.java +++ b/core/src/mindustry/entities/bullet/BulletType.java @@ -3,7 +3,6 @@ package mindustry.entities.bullet; import arc.audio.*; import arc.graphics.*; import arc.math.*; -import arc.util.ArcAnnotate.*; import arc.util.*; import mindustry.annotations.Annotations.*; import mindustry.content.*; @@ -71,6 +70,11 @@ public abstract class BulletType extends Content{ public boolean hittable = true; /** Whether this bullet can be reflected. */ public boolean reflectable = true; + /** Whether this projectile can be absorbed by shields. */ + public boolean absorbable = true; + /** Whether to move the bullet back depending on delta to fix some delta-time realted issues. + * Do not change unless you know what you're doing. */ + public boolean backMove = true; /** Bullet range override. */ public float range = -1f; @@ -80,7 +84,7 @@ public abstract class BulletType extends Content{ public float fragAngle = 0f; public int fragBullets = 9; public float fragVelocityMin = 0.2f, fragVelocityMax = 1f, fragLifeMin = 1f, fragLifeMax = 1f; - public BulletType fragBullet = null; + public @Nullable BulletType fragBullet = null; public Color hitColor = Color.white; public Color trailColor = Pal.missileYellowBack; @@ -212,7 +216,7 @@ public abstract class BulletType extends Content{ } if(instantDisappear){ - b.time(lifetime); + b.time = lifetime; } } @@ -274,7 +278,11 @@ public abstract class BulletType extends Content{ bullet.owner = owner; bullet.team = team; bullet.vel.trns(angle, speed * velocityScl); - bullet.set(x - bullet.vel.x * Time.delta, y - bullet.vel.y * Time.delta); + if(backMove){ + bullet.set(x - bullet.vel.x * Time.delta, y - bullet.vel.y * Time.delta); + }else{ + bullet.set(x, y); + } bullet.lifetime = lifetime * lifetimeScl; bullet.data = data; bullet.drag = drag; diff --git a/core/src/mindustry/entities/bullet/ContinuousLaserBulletType.java b/core/src/mindustry/entities/bullet/ContinuousLaserBulletType.java index 0f1894271f..a862671040 100644 --- a/core/src/mindustry/entities/bullet/ContinuousLaserBulletType.java +++ b/core/src/mindustry/entities/bullet/ContinuousLaserBulletType.java @@ -37,6 +37,7 @@ public class ContinuousLaserBulletType extends BulletType{ incendSpread = 5; incendChance = 0.4f; lightColor = Color.orange; + absorbable = false; } protected ContinuousLaserBulletType(){ @@ -57,7 +58,6 @@ public class ContinuousLaserBulletType extends BulletType{ @Override public void update(Bullet b){ - //TODO possible laser absorption from blocks //damage every 5 ticks if(b.timer(1, 5f)){ diff --git a/core/src/mindustry/entities/bullet/LiquidBulletType.java b/core/src/mindustry/entities/bullet/LiquidBulletType.java index 22d5c22d42..2d3de79977 100644 --- a/core/src/mindustry/entities/bullet/LiquidBulletType.java +++ b/core/src/mindustry/entities/bullet/LiquidBulletType.java @@ -3,7 +3,7 @@ package mindustry.entities.bullet; import arc.graphics.*; import arc.graphics.g2d.*; import arc.math.geom.*; -import arc.util.ArcAnnotate.*; +import arc.util.*; import mindustry.content.*; import mindustry.entities.*; import mindustry.gen.*; @@ -13,7 +13,7 @@ import mindustry.world.*; import static mindustry.Vars.*; public class LiquidBulletType extends BulletType{ - public @NonNull Liquid liquid; + public Liquid liquid; public float puddleSize = 6f; public LiquidBulletType(@Nullable Liquid liquid){ @@ -25,7 +25,7 @@ public class LiquidBulletType extends BulletType{ } ammoMultiplier = 1f; - lifetime = 74f; + lifetime = 34f; statusDuration = 60f * 2f; despawnEffect = Fx.none; hitEffect = Fx.hitLiquid; @@ -62,7 +62,7 @@ public class LiquidBulletType extends BulletType{ public void draw(Bullet b){ Draw.color(liquid.color, Color.white, b.fout() / 100f); - Fill.circle(b.x, b.y, 3f); + Fill.circle(b.x, b.y, puddleSize / 2); } @Override @@ -79,7 +79,7 @@ public class LiquidBulletType extends BulletType{ Puddles.deposit(world.tileWorld(hitx, hity), liquid, puddleSize); if(liquid.temperature <= 0.5f && liquid.flammability < 0.3f){ - float intensity = 400f; + float intensity = 400f * puddleSize/6f; Fires.extinguish(world.tileWorld(hitx, hity), intensity); for(Point2 p : Geometry.d4){ Fires.extinguish(world.tileWorld(hitx + p.x * tilesize, hity + p.y * tilesize), intensity); diff --git a/core/src/mindustry/entities/bullet/MassDriverBolt.java b/core/src/mindustry/entities/bullet/MassDriverBolt.java index 70d3c6de9b..42135a2db4 100644 --- a/core/src/mindustry/entities/bullet/MassDriverBolt.java +++ b/core/src/mindustry/entities/bullet/MassDriverBolt.java @@ -1,15 +1,14 @@ package mindustry.entities.bullet; -import arc.graphics.Color; -import arc.graphics.g2d.Draw; -import arc.math.Angles; -import arc.math.Mathf; -import mindustry.content.Fx; +import arc.graphics.*; +import arc.graphics.g2d.*; +import arc.math.*; +import mindustry.content.*; import mindustry.gen.*; -import mindustry.graphics.Pal; -import mindustry.world.blocks.distribution.MassDriver.DriverBulletData; +import mindustry.graphics.*; +import mindustry.world.blocks.distribution.MassDriver.*; -import static mindustry.Vars.content; +import static mindustry.Vars.*; public class MassDriverBolt extends BulletType{ diff --git a/core/src/mindustry/entities/bullet/PointBulletType.java b/core/src/mindustry/entities/bullet/PointBulletType.java new file mode 100644 index 0000000000..920e6e5b51 --- /dev/null +++ b/core/src/mindustry/entities/bullet/PointBulletType.java @@ -0,0 +1,70 @@ +package mindustry.entities.bullet; + +import arc.math.geom.*; +import arc.util.*; +import mindustry.*; +import mindustry.entities.*; +import mindustry.gen.*; + +public class PointBulletType extends BulletType{ + private static float cdist = 0f; + private static Unit result; + + public float trailSpacing = 10f; + + public PointBulletType(){ + scaleVelocity = true; + lifetime = 100f; + collides = false; + keepVelocity = false; + backMove = false; + } + + @Override + public void init(Bullet b){ + super.init(b); + + float px = b.x + b.lifetime * b.vel.x, + py = b.y + b.lifetime * b.vel.y, + rot = b.rotation(); + + Geometry.iterateLine(0f, b.x, b.y, px, py, trailSpacing, (x, y) -> { + trailEffect.at(x, y, rot); + }); + + b.time = b.lifetime; + b.set(px, py); + + //calculate hit entity + + cdist = 0f; + result = null; + float range = 1f; + + Units.nearbyEnemies(b.team, px - range, py - range, range*2f, range*2f, e -> { + if(e.dead()) return; + + e.hitbox(Tmp.r1); + if(!Tmp.r1.contains(px, py)) return; + + float dst = e.dst(px, py) - e.hitSize; + if((result == null || dst < cdist)){ + result = e; + cdist = dst; + } + }); + + if(result != null){ + b.collision(result, px, py); + }else{ + Building build = Vars.world.buildWorld(px, py); + if(build != null && build.team != b.team){ + build.collision(b); + } + } + + b.remove(); + + b.vel.setZero(); + } +} diff --git a/core/src/mindustry/entities/comp/AmmoDistributeComp.java b/core/src/mindustry/entities/comp/AmmoDistributeComp.java new file mode 100644 index 0000000000..96e10a9ce0 --- /dev/null +++ b/core/src/mindustry/entities/comp/AmmoDistributeComp.java @@ -0,0 +1,28 @@ +package mindustry.entities.comp; + +import arc.util.*; +import mindustry.annotations.Annotations.*; +import mindustry.game.*; +import mindustry.gen.*; +import mindustry.type.*; +import mindustry.world.blocks.units.*; + +@Component +abstract class AmmoDistributeComp implements Unitc{ + @Import float x, y; + @Import UnitType type; + @Import Team team; + @Import float ammo; + + private transient float ammoCooldown; + + @Override + public void update(){ + if(ammoCooldown > 0f) ammoCooldown -= Time.delta; + + if(ammo > 0 && ammoCooldown <= 0f && ResupplyPoint.resupply(team, x, y, type.ammoResupplyRange, Math.min(type.ammoResupplyAmount, ammo), type.ammoType.color, u -> u != self())){ + ammo -= Math.min(type.ammoResupplyAmount, ammo); + ammoCooldown = 5f; + } + } +} diff --git a/core/src/mindustry/entities/comp/BuilderComp.java b/core/src/mindustry/entities/comp/BuilderComp.java index 36f9661931..ccc83e87d8 100644 --- a/core/src/mindustry/entities/comp/BuilderComp.java +++ b/core/src/mindustry/entities/comp/BuilderComp.java @@ -5,7 +5,6 @@ import arc.graphics.g2d.*; import arc.math.*; import arc.math.geom.*; import arc.struct.Queue; -import arc.util.ArcAnnotate.*; import arc.util.*; import mindustry.*; import mindustry.annotations.Annotations.*; diff --git a/core/src/mindustry/entities/comp/BuildingComp.java b/core/src/mindustry/entities/comp/BuildingComp.java index 32b23f2b6b..41fa7ea9b5 100644 --- a/core/src/mindustry/entities/comp/BuildingComp.java +++ b/core/src/mindustry/entities/comp/BuildingComp.java @@ -13,7 +13,6 @@ import arc.scene.ui.*; import arc.scene.ui.layout.*; import arc.struct.*; import arc.util.*; -import arc.util.ArcAnnotate.*; import arc.util.io.*; import mindustry.annotations.Annotations.*; import mindustry.audio.*; @@ -421,7 +420,7 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc, * @param todump payload to dump. * @return whether the payload was moved successfully */ - public boolean movePayload(@NonNull Payload todump){ + public boolean movePayload(Payload todump){ int trns = block.size/2 + 1; Tile next = tile.getNearby(Geometry.d4(rotation).x * trns, Geometry.d4(rotation).y * trns); @@ -438,7 +437,7 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc, * @param todump payload to dump. * @return whether the payload was moved successfully */ - public boolean dumpPayload(@NonNull Payload todump){ + public boolean dumpPayload(Payload todump){ if(proximity.size == 0) return false; int dump = this.dump; @@ -466,8 +465,8 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc, return block.consumes.itemFilters.get(item.id) && items.get(item) < getMaximumAccepted(item); } - public boolean acceptLiquid(Building source, Liquid liquid, float amount){ - return block.hasLiquids && liquids.get(liquid) + amount < block.liquidCapacity && block.consumes.liquidfilters.get(liquid.id); + public boolean acceptLiquid(Building source, Liquid liquid){ + return block.hasLiquids && block.consumes.liquidfilters.get(liquid.id); } public void handleLiquid(Building source, Liquid liquid, float amount){ @@ -497,9 +496,9 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc, } public void transferLiquid(Building next, float amount, Liquid liquid){ - float flow = Math.min(next.block.liquidCapacity - next.liquids.get(liquid) - 0.001f, amount); + float flow = Math.min(next.block.liquidCapacity - next.liquids.get(liquid), amount); - if(next.acceptLiquid(self(), liquid, flow)){ + if(next.acceptLiquid(self(), liquid)){ next.handleLiquid(self(), liquid, flow); liquids.remove(liquid, flow); } @@ -529,9 +528,9 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc, float ofract = next.liquids.get(liquid) / next.block.liquidCapacity; float fract = liquids.get(liquid) / block.liquidCapacity * block.liquidPressure; float flow = Math.min(Mathf.clamp((fract - ofract) * (1f)) * (block.liquidCapacity), liquids.get(liquid)); - flow = Math.min(flow, next.block.liquidCapacity - next.liquids.get(liquid) - 0.001f); + flow = Math.min(flow, next.block.liquidCapacity - next.liquids.get(liquid)); - if(flow > 0f && ofract <= fract && next.acceptLiquid(self(), liquid, flow)){ + if(flow > 0f && ofract <= fract && next.acceptLiquid(self(), liquid)){ next.handleLiquid(self(), liquid, flow); liquids.remove(liquid, flow); return flow; @@ -849,6 +848,13 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc, } } + /** + * Called when a block is placed over some other blocks. This seq will always have at least one item. + * Should load some previous state, if necessary. */ + public void overwrote(Seq previous){ + + } + public void onRemoved(){ } @@ -1213,31 +1219,36 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc, @Override public double sense(LAccess sensor){ - if(sensor == LAccess.x) return x; - if(sensor == LAccess.y) return y; - if(sensor == LAccess.team) return team.id; - if(sensor == LAccess.health) return health; - if(sensor == LAccess.maxHealth) return maxHealth(); - if(sensor == LAccess.efficiency) return efficiency(); - if(sensor == LAccess.rotation) return rotation; - if(sensor == LAccess.totalItems && items != null) return items.total(); - if(sensor == LAccess.totalLiquids && liquids != null) return liquids.total(); - if(sensor == LAccess.totalPower && power != null && block.consumes.hasPower()) return power.status * (block.consumes.getPower().buffered ? block.consumes.getPower().capacity : 1f); - if(sensor == LAccess.itemCapacity) return block.itemCapacity; - if(sensor == LAccess.liquidCapacity) return block.liquidCapacity; - if(sensor == LAccess.powerCapacity) return block.consumes.hasPower() ? block.consumes.getPower().capacity : 0f; - if(sensor == LAccess.powerNetIn && power != null) return power.graph.getLastScaledPowerIn() * 60; - if(sensor == LAccess.powerNetOut && power != null) return power.graph.getLastScaledPowerOut() * 60; - if(sensor == LAccess.powerNetStored && power != null) return power.graph.getLastPowerStored(); - if(sensor == LAccess.powerNetCapacity && power != null) return power.graph.getLastCapacity(); - return 0; + return switch(sensor){ + case x -> x; + case y -> y; + case team -> team.id; + case health -> health; + case maxHealth -> maxHealth(); + case efficiency -> efficiency(); + case rotation -> rotation; + case totalItems -> items == null ? 0 : items.total(); + case totalLiquids -> liquids == null ? 0 : liquids.total(); + case totalPower -> power == null || !block.consumes.hasPower() ? 0 : power.status * (block.consumes.getPower().buffered ? block.consumes.getPower().capacity : 1f); + case itemCapacity -> block.itemCapacity; + case liquidCapacity -> block.liquidCapacity; + case powerCapacity -> block.consumes.hasPower() ? block.consumes.getPower().capacity : 0f; + case powerNetIn -> power == null ? 0 : power.graph.getLastScaledPowerIn() * 60; + case powerNetOut -> power == null ? 0 : power.graph.getLastScaledPowerOut() * 60; + case powerNetStored -> power == null ? 0 : power.graph.getLastPowerStored(); + case powerNetCapacity -> power == null ? 0 : power.graph.getLastCapacity(); + case enabled -> enabled ? 1 : 0; + default -> 0; + }; } @Override public Object senseObject(LAccess sensor){ - if(sensor == LAccess.type) return block; + return switch(sensor){ + case type -> block; + default -> noSensed; + }; - return noSensed; } @Override @@ -1255,6 +1266,11 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc, } } + @Override + public void control(LAccess type, Object p1, double p2, double p3, double p4){ + + } + @Override public void remove(){ if(sound != null){ diff --git a/core/src/mindustry/entities/comp/ChildComp.java b/core/src/mindustry/entities/comp/ChildComp.java index be8fafb0aa..dae0c98814 100644 --- a/core/src/mindustry/entities/comp/ChildComp.java +++ b/core/src/mindustry/entities/comp/ChildComp.java @@ -1,6 +1,6 @@ package mindustry.entities.comp; -import arc.util.ArcAnnotate.*; +import arc.util.*; import mindustry.annotations.Annotations.*; import mindustry.gen.*; diff --git a/core/src/mindustry/entities/comp/CommanderComp.java b/core/src/mindustry/entities/comp/CommanderComp.java index 99bca89cf9..a74c8aaf51 100644 --- a/core/src/mindustry/entities/comp/CommanderComp.java +++ b/core/src/mindustry/entities/comp/CommanderComp.java @@ -3,7 +3,7 @@ package mindustry.entities.comp; import arc.func.*; import arc.math.geom.*; import arc.struct.*; -import arc.util.ArcAnnotate.*; +import arc.util.*; import mindustry.ai.formations.*; import mindustry.ai.types.*; import mindustry.annotations.Annotations.*; diff --git a/core/src/mindustry/entities/comp/EntityComp.java b/core/src/mindustry/entities/comp/EntityComp.java index 2b20e908b2..a97a2e0cc3 100644 --- a/core/src/mindustry/entities/comp/EntityComp.java +++ b/core/src/mindustry/entities/comp/EntityComp.java @@ -6,7 +6,7 @@ import mindustry.annotations.Annotations.*; import mindustry.entities.*; import mindustry.gen.*; -import static mindustry.Vars.player; +import static mindustry.Vars.*; @Component @BaseComponent diff --git a/core/src/mindustry/entities/comp/FlyingComp.java b/core/src/mindustry/entities/comp/FlyingComp.java index 83c16d3525..0c8c2f0277 100644 --- a/core/src/mindustry/entities/comp/FlyingComp.java +++ b/core/src/mindustry/entities/comp/FlyingComp.java @@ -10,7 +10,7 @@ import mindustry.game.EventType.*; import mindustry.gen.*; import mindustry.world.blocks.environment.*; -import static mindustry.Vars.net; +import static mindustry.Vars.*; @Component abstract class FlyingComp implements Posc, Velc, Healthc, Hitboxc{ diff --git a/core/src/mindustry/entities/comp/HitboxComp.java b/core/src/mindustry/entities/comp/HitboxComp.java index 9473dfbca3..f44270ebed 100644 --- a/core/src/mindustry/entities/comp/HitboxComp.java +++ b/core/src/mindustry/entities/comp/HitboxComp.java @@ -2,8 +2,8 @@ package mindustry.entities.comp; import arc.func.*; import arc.math.*; -import arc.math.geom.QuadTree.*; import arc.math.geom.*; +import arc.math.geom.QuadTree.*; import mindustry.annotations.Annotations.*; import mindustry.gen.*; diff --git a/core/src/mindustry/entities/comp/MinerComp.java b/core/src/mindustry/entities/comp/MinerComp.java index 7049617b73..6e11178252 100644 --- a/core/src/mindustry/entities/comp/MinerComp.java +++ b/core/src/mindustry/entities/comp/MinerComp.java @@ -5,7 +5,6 @@ import arc.graphics.*; import arc.graphics.g2d.*; import arc.math.*; import arc.util.*; -import arc.util.ArcAnnotate.*; import mindustry.annotations.Annotations.*; import mindustry.content.*; import mindustry.gen.*; @@ -105,7 +104,6 @@ abstract class MinerComp implements Itemsc, Posc, Teamc, Rotc, Drawc, Unitc{ Drawf.laser(team(), Core.atlas.find("minelaser"), Core.atlas.find("minelaser-end"), px, py, ex, ey, 0.75f); - //TODO hack? if(isLocal()){ Lines.stroke(1f, Pal.accent); Lines.poly(mineTile.worldx(), mineTile.worldy(), 4, tilesize / 2f * Mathf.sqrt2, Time.time()); diff --git a/core/src/mindustry/entities/comp/PlayerComp.java b/core/src/mindustry/entities/comp/PlayerComp.java index ca52705964..1e4a88a640 100644 --- a/core/src/mindustry/entities/comp/PlayerComp.java +++ b/core/src/mindustry/entities/comp/PlayerComp.java @@ -6,7 +6,6 @@ import arc.graphics.g2d.*; import arc.math.*; import arc.scene.ui.layout.*; import arc.util.*; -import arc.util.ArcAnnotate.*; import arc.util.pooling.*; import mindustry.annotations.Annotations.*; import mindustry.content.*; @@ -33,7 +32,7 @@ abstract class PlayerComp implements UnitController, Entityc, Syncc, Timerc, Dra @Import float x, y; - @NonNull @ReadOnly Unit unit = Nulls.unit; + @ReadOnly Unit unit = Nulls.unit; transient private Unit lastReadUnit = Nulls.unit; transient @Nullable NetConnection con; diff --git a/core/src/mindustry/entities/comp/PosComp.java b/core/src/mindustry/entities/comp/PosComp.java index d43d097bac..1c0540eb01 100644 --- a/core/src/mindustry/entities/comp/PosComp.java +++ b/core/src/mindustry/entities/comp/PosComp.java @@ -1,14 +1,14 @@ package mindustry.entities.comp; import arc.math.geom.*; -import arc.util.ArcAnnotate.*; +import arc.util.*; import mindustry.*; import mindustry.annotations.Annotations.*; import mindustry.content.*; import mindustry.world.*; import mindustry.world.blocks.environment.*; -import static mindustry.Vars.world; +import static mindustry.Vars.*; @Component abstract class PosComp implements Position{ @@ -55,7 +55,8 @@ abstract class PosComp implements Position{ return tile != null && tile.solid(); } - @Nullable Tile tileOn(){ + @Nullable + Tile tileOn(){ return world.tileWorld(x, y); } diff --git a/core/src/mindustry/entities/comp/ShieldComp.java b/core/src/mindustry/entities/comp/ShieldComp.java index 5125faa96e..359637414e 100644 --- a/core/src/mindustry/entities/comp/ShieldComp.java +++ b/core/src/mindustry/entities/comp/ShieldComp.java @@ -5,7 +5,7 @@ import mindustry.annotations.Annotations.*; import mindustry.content.*; import mindustry.gen.*; -import static mindustry.Vars.minArmorDamage; +import static mindustry.Vars.*; @Component abstract class ShieldComp implements Healthc, Posc{ @@ -23,7 +23,6 @@ abstract class ShieldComp implements Healthc, Posc{ @Override public void damage(float amount){ //apply armor - //TODO balancing of armor stats & minArmorDamage amount = Math.max(amount - armor, minArmorDamage * amount); hitTime = 1f; diff --git a/core/src/mindustry/entities/comp/TeamComp.java b/core/src/mindustry/entities/comp/TeamComp.java index ed03caca5c..c58e97b7fd 100644 --- a/core/src/mindustry/entities/comp/TeamComp.java +++ b/core/src/mindustry/entities/comp/TeamComp.java @@ -1,11 +1,11 @@ package mindustry.entities.comp; -import arc.util.ArcAnnotate.*; +import arc.util.*; import mindustry.annotations.Annotations.*; import mindustry.game.*; import mindustry.gen.*; -import static mindustry.Vars.state; +import static mindustry.Vars.*; @Component abstract class TeamComp implements Posc{ @@ -17,15 +17,18 @@ abstract class TeamComp implements Posc{ return team.rules().cheat; } - public @Nullable Building core(){ + @Nullable + public Building core(){ return team.core(); } - public @Nullable Building closestCore(){ + @Nullable + public Building closestCore(){ return state.teams.closestCore(x, y, team); } - public @Nullable Building closestEnemyCore(){ + @Nullable + public Building closestEnemyCore(){ return state.teams.closestEnemyCore(x, y, team); } } diff --git a/core/src/mindustry/entities/comp/UnitComp.java b/core/src/mindustry/entities/comp/UnitComp.java index d2618e7e83..64cc23be20 100644 --- a/core/src/mindustry/entities/comp/UnitComp.java +++ b/core/src/mindustry/entities/comp/UnitComp.java @@ -6,7 +6,6 @@ import arc.math.*; import arc.math.geom.*; import arc.scene.ui.layout.*; import arc.struct.*; -import arc.util.ArcAnnotate.*; import arc.util.*; import mindustry.ai.*; import mindustry.annotations.Annotations.*; @@ -75,24 +74,28 @@ abstract class UnitComp implements Healthc, Physicsc, Hitboxc, Statusc, Teamc, I @Override public double sense(LAccess sensor){ - if(sensor == LAccess.totalItems) return stack().amount; - if(sensor == LAccess.rotation) return rotation; - if(sensor == LAccess.health) return health; - if(sensor == LAccess.maxHealth) return maxHealth; - if(sensor == LAccess.x) return x; - if(sensor == LAccess.y) return y; - if(sensor == LAccess.team) return team.id; - if(sensor == LAccess.shooting) return isShooting() ? 1 : 0; - if(sensor == LAccess.shootX) return aimX(); - if(sensor == LAccess.shootY) return aimY(); - return 0; + return switch(sensor){ + case totalItems -> stack().amount; + case rotation -> rotation; + case health -> health; + case maxHealth -> maxHealth; + case x -> x; + case y -> y; + case team -> team.id; + case shooting -> isShooting() ? 1 : 0; + case shootX -> aimX(); + case shootY -> aimY(); + default -> 0; + }; } @Override public Object senseObject(LAccess sensor){ - if(sensor == LAccess.type) return type; + return switch(sensor){ + case type -> type; + default -> noSensed; + }; - return noSensed; } @Override diff --git a/core/src/mindustry/entities/comp/VelComp.java b/core/src/mindustry/entities/comp/VelComp.java index deec6756d1..ca04d6a40c 100644 --- a/core/src/mindustry/entities/comp/VelComp.java +++ b/core/src/mindustry/entities/comp/VelComp.java @@ -3,7 +3,6 @@ package mindustry.entities.comp; import arc.math.*; import arc.math.geom.*; import arc.util.*; -import arc.util.ArcAnnotate.*; import mindustry.annotations.Annotations.*; import mindustry.entities.EntityCollisions.*; import mindustry.gen.*; diff --git a/core/src/mindustry/entities/comp/WeaponsComp.java b/core/src/mindustry/entities/comp/WeaponsComp.java index d826ba555f..08d87081f6 100644 --- a/core/src/mindustry/entities/comp/WeaponsComp.java +++ b/core/src/mindustry/entities/comp/WeaponsComp.java @@ -166,14 +166,15 @@ abstract class WeaponsComp implements Teamc, Posc, Rotc, Velc, Statusc{ Weapon weapon = mount.weapon; float baseX = this.x, baseY = this.y; + boolean delay = weapon.firstShotDelay > 0f; - weapon.shootSound.at(x, y, Mathf.random(0.8f, 1.0f)); + (delay ? weapon.chargeSound : weapon.shootSound).at(x, y, Mathf.random(0.8f, 1.0f)); BulletType ammo = weapon.bullet; float lifeScl = ammo.scaleVelocity ? Mathf.clamp(Mathf.dst(x, y, aimX, aimY) / ammo.range()) : 1f; sequenceNum = 0; - if(weapon.shotDelay + weapon.firstShotDelay > 0.01f){ + if(delay){ Angles.shotgun(weapon.shots, weapon.spacing, rotation, f -> { Time.run(sequenceNum * weapon.shotDelay + weapon.firstShotDelay, () -> { if(!isAdded()) return; @@ -187,13 +188,14 @@ abstract class WeaponsComp implements Teamc, Posc, Rotc, Velc, Statusc{ boolean parentize = ammo.keepVelocity; - if(weapon.firstShotDelay > 0){ + if(delay){ Time.run(weapon.firstShotDelay, () -> { if(!isAdded()) return; vel.add(Tmp.v1.trns(rotation + 180f, ammo.recoil)); Effect.shake(weapon.shake, weapon.shake, x, y); mount.heat = 1f; + weapon.shootSound.at(x, y, Mathf.random(0.8f, 1.0f)); }); }else{ vel.add(Tmp.v1.trns(rotation + 180f, ammo.recoil)); diff --git a/core/src/mindustry/entities/units/AIController.java b/core/src/mindustry/entities/units/AIController.java index 03d9daf8b4..d61da2a1ba 100644 --- a/core/src/mindustry/entities/units/AIController.java +++ b/core/src/mindustry/entities/units/AIController.java @@ -2,7 +2,6 @@ package mindustry.entities.units; import arc.math.*; import arc.math.geom.*; -import arc.util.ArcAnnotate.*; import arc.util.*; import mindustry.*; import mindustry.entities.*; diff --git a/core/src/mindustry/entities/units/BuildPlan.java b/core/src/mindustry/entities/units/BuildPlan.java index fb4a7a2816..9d8e98a05f 100644 --- a/core/src/mindustry/entities/units/BuildPlan.java +++ b/core/src/mindustry/entities/units/BuildPlan.java @@ -2,7 +2,7 @@ package mindustry.entities.units; import arc.func.*; import arc.math.geom.*; -import arc.util.ArcAnnotate.*; +import arc.util.*; import mindustry.gen.*; import mindustry.world.*; diff --git a/core/src/mindustry/entities/units/WeaponMount.java b/core/src/mindustry/entities/units/WeaponMount.java index f5aa45c4ea..80bf713f20 100644 --- a/core/src/mindustry/entities/units/WeaponMount.java +++ b/core/src/mindustry/entities/units/WeaponMount.java @@ -1,6 +1,6 @@ package mindustry.entities.units; -import arc.util.ArcAnnotate.*; +import arc.util.*; import mindustry.gen.*; import mindustry.type.*; diff --git a/core/src/mindustry/game/DefaultWaves.java b/core/src/mindustry/game/DefaultWaves.java index a889f9d4ba..5f980fcfde 100644 --- a/core/src/mindustry/game/DefaultWaves.java +++ b/core/src/mindustry/game/DefaultWaves.java @@ -261,12 +261,35 @@ public class DefaultWaves{ curTier = Math.min(curTier, 3); //small chance to switch species - if(Mathf.chance(0.2)){ + if(Mathf.chance(0.3)){ curSpecies = Structs.random(species); } } + int bossWave = Mathf.random(30, 60); + int bossSpacing = Mathf.random(30, 50); + //main boss progression + out.add(new SpawnGroup(Structs.random(species)[4]){{ + unitAmount = 1; + begin = bossWave; + spacing = bossSpacing; + end = never; + max = 16; + unitScaling = bossSpacing; + shieldScaling = shieldsPerWave; + }}); + + //alt boss progression + out.add(new SpawnGroup(Structs.random(species)[4]){{ + unitAmount = 1; + begin = bossWave + Mathf.random(4, 6) * bossSpacing; + spacing = bossSpacing; + end = never; + max = 16; + unitScaling = bossSpacing; + shieldScaling = shieldsPerWave; + }}); return out; } diff --git a/core/src/mindustry/game/EventType.java b/core/src/mindustry/game/EventType.java index 1739bb1fd1..272c26363f 100644 --- a/core/src/mindustry/game/EventType.java +++ b/core/src/mindustry/game/EventType.java @@ -1,6 +1,6 @@ package mindustry.game; -import arc.util.ArcAnnotate.*; +import arc.util.*; import mindustry.core.GameState.*; import mindustry.ctype.*; import mindustry.entities.units.*; @@ -148,7 +148,7 @@ public class EventType{ } } - /** Called when the configures sets a specific block. */ + /** Called when the player configures a specific building. */ public static class ConfigEvent{ public final Building tile; public final Player player; @@ -161,6 +161,17 @@ public class EventType{ } } + /** Called when a player taps any tile. */ + public static class TapEvent{ + public final Player player; + public final Tile tile; + + public TapEvent(Player player, Tile tile){ + this.tile = tile; + this.player = player; + } + } + public static class GameOverEvent{ public final Team winner; diff --git a/core/src/mindustry/game/Objectives.java b/core/src/mindustry/game/Objectives.java index ad66fb9219..535f1d3e13 100644 --- a/core/src/mindustry/game/Objectives.java +++ b/core/src/mindustry/game/Objectives.java @@ -2,7 +2,6 @@ package mindustry.game; import arc.*; import arc.scene.ui.layout.*; -import arc.util.ArcAnnotate.*; import mindustry.ctype.*; import mindustry.type.*; @@ -10,7 +9,7 @@ import mindustry.type.*; public class Objectives{ public static class Research implements Objective{ - public @NonNull UnlockableContent content; + public UnlockableContent content; public Research(UnlockableContent content){ this.content = content; @@ -50,7 +49,7 @@ public class Objectives{ //TODO merge public abstract static class SectorObjective implements Objective{ - public @NonNull SectorPreset preset; + public SectorPreset preset; } /** Defines a specific objective for a game. */ diff --git a/core/src/mindustry/game/Rules.java b/core/src/mindustry/game/Rules.java index ac302a9754..a101fe8592 100644 --- a/core/src/mindustry/game/Rules.java +++ b/core/src/mindustry/game/Rules.java @@ -2,7 +2,7 @@ package mindustry.game; import arc.graphics.*; import arc.struct.*; -import arc.util.ArcAnnotate.*; +import arc.util.*; import arc.util.serialization.*; import arc.util.serialization.Json.*; import mindustry.content.*; diff --git a/core/src/mindustry/game/Saves.java b/core/src/mindustry/game/Saves.java index 0f7908aa63..fcebb28a8f 100644 --- a/core/src/mindustry/game/Saves.java +++ b/core/src/mindustry/game/Saves.java @@ -2,11 +2,10 @@ package mindustry.game; import arc.*; import arc.assets.*; -import arc.struct.*; import arc.files.*; import arc.graphics.*; +import arc.struct.*; import arc.util.*; -import arc.util.ArcAnnotate.*; import arc.util.async.*; import mindustry.*; import mindustry.core.GameState.*; diff --git a/core/src/mindustry/game/Schematic.java b/core/src/mindustry/game/Schematic.java index 5ad51382f2..3aeb222d29 100644 --- a/core/src/mindustry/game/Schematic.java +++ b/core/src/mindustry/game/Schematic.java @@ -2,7 +2,7 @@ package mindustry.game; import arc.files.*; import arc.struct.*; -import arc.util.ArcAnnotate.*; +import arc.util.*; import mindustry.content.*; import mindustry.mod.Mods.*; import mindustry.type.*; @@ -21,7 +21,7 @@ public class Schematic implements Publishable, Comparable{ /** Associated mod. If null, no mod is associated with this schematic. */ public @Nullable LoadedMod mod; - public Schematic(Seq tiles, @NonNull StringMap tags, int width, int height){ + public Schematic(Seq tiles, StringMap tags, int width, int height){ this.tiles = tiles; this.tags = tags; this.width = width; @@ -52,7 +52,7 @@ public class Schematic implements Publishable, Comparable{ return tiles.contains(s -> s.block instanceof CoreBlock); } - public @NonNull CoreBlock findCore(){ + public CoreBlock findCore(){ Stile tile = tiles.find(s -> s.block instanceof CoreBlock); if(tile == null) throw new IllegalArgumentException("Schematic is missing a core!"); return (CoreBlock)tile.block; @@ -118,7 +118,7 @@ public class Schematic implements Publishable, Comparable{ } public static class Stile{ - public @NonNull Block block; + public Block block; public short x, y; public Object config; public byte rotation; diff --git a/core/src/mindustry/game/Schematics.java b/core/src/mindustry/game/Schematics.java index 672f0a23b5..596a571d3a 100644 --- a/core/src/mindustry/game/Schematics.java +++ b/core/src/mindustry/game/Schematics.java @@ -9,7 +9,6 @@ import arc.graphics.gl.*; import arc.math.*; import arc.math.geom.*; import arc.struct.*; -import arc.util.ArcAnnotate.*; import arc.util.*; import arc.util.io.*; import arc.util.io.Streams.*; diff --git a/core/src/mindustry/game/SectorInfo.java b/core/src/mindustry/game/SectorInfo.java index 29e75b3e57..dc56902c60 100644 --- a/core/src/mindustry/game/SectorInfo.java +++ b/core/src/mindustry/game/SectorInfo.java @@ -2,7 +2,6 @@ package mindustry.game; import arc.math.*; import arc.struct.*; -import arc.util.ArcAnnotate.*; import arc.util.*; import mindustry.content.*; import mindustry.ctype.*; @@ -24,7 +23,7 @@ public class SectorInfo{ /** Export statistics. */ public ObjectMap export = new ObjectMap<>(); /** Items stored in all cores. */ - public ObjectIntMap coreItems = new ObjectIntMap<>(); + public ItemSeq coreItems = new ItemSeq(); /** The best available core type. */ public Block bestCoreType = Blocks.air; /** Max storage capacity. */ @@ -80,7 +79,7 @@ public class SectorInfo{ if(entity != null){ ItemModule items = entity.items; for(int i = 0; i < items.length(); i++){ - coreItems.put(content.item(i), items.get(i)); + coreItems.set(content.item(i), items.get(i)); } } @@ -88,7 +87,7 @@ public class SectorInfo{ bestCoreType = !hasCore ? Blocks.air : state.rules.defaultTeam.cores().max(e -> e.block.size).block; storageCapacity = entity != null ? entity.storageCapacity : 0; - //update sector's internal time spent counter1 + //update sector's internal time spent counter state.rules.sector.setTimeSpent(internalTimeSpent); } @@ -100,6 +99,12 @@ public class SectorInfo{ internalTimeSpent += Time.delta; + //autorun turns + if(internalTimeSpent >= turnDuration){ + internalTimeSpent = 0; + universe.runTurn(); + } + //create last stored core items if(lastCoreItems == null){ lastCoreItems = new int[content.items().size]; diff --git a/core/src/mindustry/game/SpawnGroup.java b/core/src/mindustry/game/SpawnGroup.java index 15f7c98fff..fda8514d48 100644 --- a/core/src/mindustry/game/SpawnGroup.java +++ b/core/src/mindustry/game/SpawnGroup.java @@ -8,7 +8,7 @@ import mindustry.gen.*; import mindustry.io.legacy.*; import mindustry.type.*; -import static mindustry.Vars.content; +import static mindustry.Vars.*; /** * A spawn group defines spawn information for a specific type of unit, with optional extra information like diff --git a/core/src/mindustry/game/Team.java b/core/src/mindustry/game/Team.java index 3028edf3f4..1ab345dc10 100644 --- a/core/src/mindustry/game/Team.java +++ b/core/src/mindustry/game/Team.java @@ -4,7 +4,7 @@ import arc.*; import arc.graphics.*; import arc.math.*; import arc.struct.*; -import arc.util.ArcAnnotate.*; +import arc.util.*; import mindustry.game.Rules.*; import mindustry.game.Teams.*; import mindustry.graphics.*; @@ -74,7 +74,7 @@ public class Team implements Comparable{ /** @return the core items for this team, or an empty item module. * Never add to the resulting item module, as it is mutable. */ - public @NonNull ItemModule items(){ + public ItemModule items(){ return core() == null ? ItemModule.empty : core().items; } @@ -91,7 +91,8 @@ public class Team implements Comparable{ return state.teams.get(this); } - public @Nullable CoreBuild core(){ + @Nullable + public CoreBuild core(){ return data().core(); } diff --git a/core/src/mindustry/game/Teams.java b/core/src/mindustry/game/Teams.java index e513c31fc6..60d36ee74e 100644 --- a/core/src/mindustry/game/Teams.java +++ b/core/src/mindustry/game/Teams.java @@ -3,7 +3,7 @@ package mindustry.game; import arc.func.*; import arc.math.geom.*; import arc.struct.*; -import arc.util.ArcAnnotate.*; +import arc.util.*; import mindustry.ai.*; import mindustry.content.*; import mindustry.entities.units.*; @@ -24,7 +24,8 @@ public class Teams{ active.add(get(Team.crux)); } - public @Nullable CoreBuild closestEnemyCore(float x, float y, Team team){ + @Nullable + public CoreBuild closestEnemyCore(float x, float y, Team team){ for(Team enemy : team.enemies()){ CoreBuild tile = Geometry.findClosest(x, y, enemy.cores()); if(tile != null) return tile; @@ -32,7 +33,8 @@ public class Teams{ return null; } - public @Nullable CoreBuild closestCore(float x, float y, Team team){ + @Nullable + public CoreBuild closestCore(float x, float y, Team team){ return Geometry.findClosest(x, y, get(team).cores); } @@ -175,7 +177,8 @@ public class Teams{ return cores.isEmpty(); } - public @Nullable CoreBuild core(){ + @Nullable + public CoreBuild core(){ return cores.isEmpty() ? null : cores.first(); } diff --git a/core/src/mindustry/game/Tutorial.java b/core/src/mindustry/game/Tutorial.java index e0f73248ed..d3e5bae56c 100644 --- a/core/src/mindustry/game/Tutorial.java +++ b/core/src/mindustry/game/Tutorial.java @@ -1,17 +1,17 @@ package mindustry.game; import arc.*; -import arc.struct.*; import arc.func.*; import arc.graphics.g2d.*; import arc.math.*; import arc.scene.*; import arc.scene.ui.*; import arc.scene.ui.layout.*; +import arc.struct.*; import arc.util.*; import mindustry.content.*; -import mindustry.gen.*; import mindustry.game.EventType.*; +import mindustry.gen.*; import mindustry.graphics.*; import mindustry.type.*; import mindustry.world.*; diff --git a/core/src/mindustry/game/Universe.java b/core/src/mindustry/game/Universe.java index b148657275..b2c9c7d039 100644 --- a/core/src/mindustry/game/Universe.java +++ b/core/src/mindustry/game/Universe.java @@ -5,7 +5,6 @@ import arc.math.*; import arc.struct.*; import arc.util.*; import mindustry.content.*; -import mindustry.core.GameState.*; import mindustry.game.EventType.*; import mindustry.type.*; import mindustry.world.blocks.storage.*; @@ -54,25 +53,9 @@ public class Universe{ } } - public void displayTimeEnd(){ - if(!headless){ - //check if any sectors are under attack to display this - Seq attacked = state.getSector().planet.sectors.select(s -> s.hasWaves() && s.hasBase() && !s.isBeingPlayed() && s.getSecondsPassed() > 1); - - if(attacked.any()){ - state.set(State.paused); - - //TODO localize - String text = attacked.size > 1 ? attacked.size + " sectors attacked." : "Sector " + attacked.first().id + " under attack."; - - ui.hudfrag.sectorText = text; - ui.hudfrag.attackedSectors = attacked; - ui.announce(text); - }else{ - //autorun next turn - universe.runTurn(); - } - } + /** @return sectors attacked on the current planet, minus the ones that are being played on right now. */ + public Seq getAttacked(Planet planet){ + return planet.sectors.select(s -> s.hasWaves() && s.hasBase() && !s.isBeingPlayed() && s.getSecondsPassed() > 1); } /** Update planet rotations, global time and relevant state. */ @@ -187,7 +170,6 @@ public class Universe{ } } } - //TODO events Events.fire(new TurnEvent()); diff --git a/core/src/mindustry/graphics/BlockRenderer.java b/core/src/mindustry/graphics/BlockRenderer.java index c65b3cae7c..a36230f0aa 100644 --- a/core/src/mindustry/graphics/BlockRenderer.java +++ b/core/src/mindustry/graphics/BlockRenderer.java @@ -16,7 +16,7 @@ import mindustry.ui.*; import mindustry.world.*; import mindustry.world.blocks.power.*; -import static arc.Core.camera; +import static arc.Core.*; import static mindustry.Vars.*; public class BlockRenderer implements Disposable{ diff --git a/core/src/mindustry/graphics/CacheLayer.java b/core/src/mindustry/graphics/CacheLayer.java index c3eed64feb..3174c5d2a4 100644 --- a/core/src/mindustry/graphics/CacheLayer.java +++ b/core/src/mindustry/graphics/CacheLayer.java @@ -4,7 +4,7 @@ import arc.*; import arc.graphics.*; import arc.graphics.gl.*; -import static mindustry.Vars.renderer; +import static mindustry.Vars.*; public enum CacheLayer{ water{ diff --git a/core/src/mindustry/graphics/Drawf.java b/core/src/mindustry/graphics/Drawf.java index 685110047a..f1d45bebc3 100644 --- a/core/src/mindustry/graphics/Drawf.java +++ b/core/src/mindustry/graphics/Drawf.java @@ -96,6 +96,18 @@ public class Drawf{ Draw.color(); } + public static void liquid(TextureRegion region, float x, float y, float alpha, Color color, float rotation){ + Draw.color(color, alpha); + Draw.rect(region, x, y, rotation); + Draw.color(); + } + + public static void liquid(TextureRegion region, float x, float y, float alpha, Color color){ + Draw.color(color, alpha); + Draw.rect(region, x, y); + Draw.color(); + } + public static void dashCircle(float x, float y, float rad, Color color){ Lines.stroke(3f, Pal.gray); Lines.dashCircle(x, y, rad); diff --git a/core/src/mindustry/graphics/FloorRenderer.java b/core/src/mindustry/graphics/FloorRenderer.java index 4030125ebb..a3b7ff21c8 100644 --- a/core/src/mindustry/graphics/FloorRenderer.java +++ b/core/src/mindustry/graphics/FloorRenderer.java @@ -17,7 +17,6 @@ import java.util.*; import static mindustry.Vars.*; public class FloorRenderer implements Disposable{ - //TODO find out number with best performance private static final int chunksize = mobile ? 16 : 32; private int[][][] cache; diff --git a/core/src/mindustry/graphics/IndexedRenderer.java b/core/src/mindustry/graphics/IndexedRenderer.java index 154147da14..46b9093a14 100644 --- a/core/src/mindustry/graphics/IndexedRenderer.java +++ b/core/src/mindustry/graphics/IndexedRenderer.java @@ -7,7 +7,6 @@ import arc.graphics.gl.*; import arc.math.*; import arc.util.*; -//TODO this class is a trainwreck, remove it public class IndexedRenderer implements Disposable{ private static final int vsize = 5; diff --git a/core/src/mindustry/graphics/LightRenderer.java b/core/src/mindustry/graphics/LightRenderer.java index fbe154a6b9..10ffa727b6 100644 --- a/core/src/mindustry/graphics/LightRenderer.java +++ b/core/src/mindustry/graphics/LightRenderer.java @@ -10,7 +10,7 @@ import arc.struct.*; import arc.util.*; import mindustry.*; -import static mindustry.Vars.state; +import static mindustry.Vars.*; /** Renders overlay lights. Client only. */ public class LightRenderer{ diff --git a/core/src/mindustry/graphics/MenuRenderer.java b/core/src/mindustry/graphics/MenuRenderer.java index 5d036ce4e5..2899efcdba 100644 --- a/core/src/mindustry/graphics/MenuRenderer.java +++ b/core/src/mindustry/graphics/MenuRenderer.java @@ -237,8 +237,6 @@ public class MenuRenderer implements Disposable{ } private void drawFlyers(){ - //TODO fix - if(true) return; Draw.color(0f, 0f, 0f, 0.4f); TextureRegion icon = flyerType.icon(Cicon.full); diff --git a/core/src/mindustry/graphics/MinimapRenderer.java b/core/src/mindustry/graphics/MinimapRenderer.java index f9803b9db8..cdb84e9044 100644 --- a/core/src/mindustry/graphics/MinimapRenderer.java +++ b/core/src/mindustry/graphics/MinimapRenderer.java @@ -9,7 +9,6 @@ import arc.math.geom.*; import arc.scene.ui.layout.*; import arc.struct.*; import arc.util.*; -import arc.util.ArcAnnotate.*; import arc.util.pooling.*; import mindustry.entities.*; import mindustry.game.EventType.*; diff --git a/core/src/mindustry/graphics/Pal.java b/core/src/mindustry/graphics/Pal.java index a61b363557..753bbbbbed 100644 --- a/core/src/mindustry/graphics/Pal.java +++ b/core/src/mindustry/graphics/Pal.java @@ -1,6 +1,6 @@ package mindustry.graphics; -import arc.graphics.Color; +import arc.graphics.*; public class Pal{ public static Color diff --git a/core/src/mindustry/graphics/Pixelator.java b/core/src/mindustry/graphics/Pixelator.java index 4d77af56a7..5bce6721e3 100644 --- a/core/src/mindustry/graphics/Pixelator.java +++ b/core/src/mindustry/graphics/Pixelator.java @@ -8,7 +8,7 @@ import arc.graphics.gl.*; import arc.util.*; import static arc.Core.*; -import static mindustry.Vars.renderer; +import static mindustry.Vars.*; public class Pixelator implements Disposable{ private FrameBuffer buffer = new FrameBuffer(); diff --git a/core/src/mindustry/graphics/Shaders.java b/core/src/mindustry/graphics/Shaders.java index 5fed02b762..f1390b5884 100644 --- a/core/src/mindustry/graphics/Shaders.java +++ b/core/src/mindustry/graphics/Shaders.java @@ -8,7 +8,6 @@ import arc.graphics.g3d.*; import arc.graphics.gl.*; import arc.math.geom.*; import arc.scene.ui.layout.*; -import arc.util.ArcAnnotate.*; import arc.util.*; import mindustry.type.*; diff --git a/core/src/mindustry/input/DesktopInput.java b/core/src/mindustry/input/DesktopInput.java index 88c317d29b..576e644ce6 100644 --- a/core/src/mindustry/input/DesktopInput.java +++ b/core/src/mindustry/input/DesktopInput.java @@ -10,7 +10,6 @@ import arc.scene.*; import arc.scene.event.*; import arc.scene.ui.*; import arc.scene.ui.layout.*; -import arc.util.ArcAnnotate.*; import arc.util.*; import mindustry.*; import mindustry.entities.units.*; @@ -459,6 +458,10 @@ public class DesktopInput extends InputHandler{ } if(Core.input.keyTap(Binding.select) && !Core.scene.hasMouse()){ + if(selected != null){ + Call.tileTap(player, selected); + } + BuildPlan req = getRequest(cursorX, cursorY); if(Core.input.keyDown(Binding.break_block)){ diff --git a/core/src/mindustry/input/InputHandler.java b/core/src/mindustry/input/InputHandler.java index bbca06d7e0..d6e15127fc 100644 --- a/core/src/mindustry/input/InputHandler.java +++ b/core/src/mindustry/input/InputHandler.java @@ -12,7 +12,6 @@ import arc.scene.*; import arc.scene.event.*; import arc.scene.ui.layout.*; import arc.struct.*; -import arc.util.ArcAnnotate.*; import arc.util.*; import mindustry.ai.formations.patterns.*; import mindustry.annotations.Annotations.*; @@ -274,6 +273,15 @@ public abstract class InputHandler implements InputProcessor, GestureListener{ Core.app.post(() -> Events.fire(new ConfigEvent(tile, player, value))); } + //only useful for servers or local mods, and is not replicated across clients + //uses unreliable packets due to high frequency + @Remote(targets = Loc.both, called = Loc.both, unreliable = true) + public static void tileTap(@Nullable Player player, Tile tile){ + if(tile == null) return; + + Events.fire(new TapEvent(player, tile)); + } + @Remote(targets = Loc.both, called = Loc.both, forward = true) public static void unitControl(Player player, @Nullable Unit unit){ if(player == null) return; diff --git a/core/src/mindustry/input/MobileInput.java b/core/src/mindustry/input/MobileInput.java index 03d90e18be..07b543c704 100644 --- a/core/src/mindustry/input/MobileInput.java +++ b/core/src/mindustry/input/MobileInput.java @@ -558,6 +558,9 @@ public class MobileInput extends InputHandler implements GestureListener{ //ignore off-screen taps if(cursor == null || Core.scene.hasMouse(x, y)) return false; + + Call.tileTap(player, cursor); + Tile linked = cursor.build == null ? cursor : cursor.build.tile; if(!player.dead()){ @@ -877,16 +880,10 @@ public class MobileInput extends InputHandler implements GestureListener{ }else{ unit.moveAt(Tmp.v2.trns(unit.rotation, movement.len())); if(!movement.isZero() && legs){ - unit.vel.rotateTo(movement.angle(), type.rotateSpeed * Time.delta); + unit.vel.rotateTo(movement.angle(), type.rotateSpeed); } } - if(flying){ - //hovering effect - unit.x += Mathf.sin(Time.time(), 25f, 0.08f); - unit.y += Mathf.cos(Time.time(), 25f, 0.08f); - } - //update shooting if not building + not mining if(!player.builder().isBuilding() && player.miner().mineTile() == null){ diff --git a/core/src/mindustry/io/JsonIO.java b/core/src/mindustry/io/JsonIO.java index e6ea20cf9e..39c3a1a821 100644 --- a/core/src/mindustry/io/JsonIO.java +++ b/core/src/mindustry/io/JsonIO.java @@ -75,7 +75,7 @@ public class JsonIO{ //TODO this is terrible - json.setSerializer(Sector.class, new Serializer(){ + json.setSerializer(Sector.class, new Serializer<>(){ @Override public void write(Json json, Sector object, Class knownType){ json.writeValue(object.planet.name + "-" + object.id); @@ -88,7 +88,7 @@ public class JsonIO{ } }); - json.setSerializer(SectorPreset.class, new Serializer(){ + json.setSerializer(SectorPreset.class, new Serializer<>(){ @Override public void write(Json json, SectorPreset object, Class knownType){ json.writeValue(object.name); @@ -100,7 +100,7 @@ public class JsonIO{ } }); - json.setSerializer(Liquid.class, new Serializer(){ + json.setSerializer(Liquid.class, new Serializer<>(){ @Override public void write(Json json, Liquid object, Class knownType){ json.writeValue(object.name); @@ -109,12 +109,12 @@ public class JsonIO{ @Override public Liquid read(Json json, JsonValue jsonData, Class type){ if(jsonData.asString() == null) return Liquids.water; - Liquid i = Vars.content.getByName(ContentType.liquid, jsonData.asString()); + Liquid i = Vars.content.getByName(ContentType.liquid, jsonData.asString()); return i == null ? Liquids.water : i; } }); - json.setSerializer(Item.class, new Serializer(){ + json.setSerializer(Item.class, new Serializer<>(){ @Override public void write(Json json, Item object, Class knownType){ json.writeValue(object.name); @@ -123,12 +123,12 @@ public class JsonIO{ @Override public Item read(Json json, JsonValue jsonData, Class type){ if(jsonData.asString() == null) return Items.copper; - Item i = Vars.content.getByName(ContentType.item, jsonData.asString()); + Item i = Vars.content.getByName(ContentType.item, jsonData.asString()); return i == null ? Items.copper : i; } }); - json.setSerializer(Team.class, new Serializer(){ + json.setSerializer(Team.class, new Serializer<>(){ @Override public void write(Json json, Team object, Class knownType){ json.writeValue(object.id); @@ -140,7 +140,7 @@ public class JsonIO{ } }); - json.setSerializer(Block.class, new Serializer(){ + json.setSerializer(Block.class, new Serializer<>(){ @Override public void write(Json json, Block object, Class knownType){ json.writeValue(object.name); @@ -153,7 +153,7 @@ public class JsonIO{ } }); - json.setSerializer(Weather.class, new Serializer(){ + json.setSerializer(Weather.class, new Serializer<>(){ @Override public void write(Json json, Weather object, Class knownType){ json.writeValue(object.name); @@ -165,7 +165,7 @@ public class JsonIO{ } }); - json.setSerializer(ItemStack.class, new Serializer(){ + json.setSerializer(ItemStack.class, new Serializer<>(){ @Override public void write(Json json, ItemStack object, Class knownType){ json.writeObjectStart(); @@ -180,7 +180,7 @@ public class JsonIO{ } }); - json.setSerializer(UnlockableContent.class, new Serializer(){ + json.setSerializer(UnlockableContent.class, new Serializer<>(){ @Override public void write(Json json, UnlockableContent object, Class knownType){ json.writeValue(object.name); diff --git a/core/src/mindustry/io/SaveFileReader.java b/core/src/mindustry/io/SaveFileReader.java index c925dc48a4..0aef1a19df 100644 --- a/core/src/mindustry/io/SaveFileReader.java +++ b/core/src/mindustry/io/SaveFileReader.java @@ -49,7 +49,9 @@ public abstract class SaveFileReader{ "holostone-wall", "dacite-wall", "rock", "boulder", "snowrock", "snow-boulder", - "cliffs", "stone-wall" + "cliffs", "stone-wall", + + "cryofluidmixer", "cryofluid-mixer" ); protected final ReusableByteOutStream byteOutput = new ReusableByteOutStream(); diff --git a/core/src/mindustry/io/SaveMeta.java b/core/src/mindustry/io/SaveMeta.java index 4aeb7d2f99..f2e039f634 100644 --- a/core/src/mindustry/io/SaveMeta.java +++ b/core/src/mindustry/io/SaveMeta.java @@ -4,7 +4,7 @@ import arc.struct.*; import mindustry.game.*; import mindustry.maps.*; -import static mindustry.Vars.maps; +import static mindustry.Vars.*; public class SaveMeta{ public int version; diff --git a/core/src/mindustry/io/TypeIO.java b/core/src/mindustry/io/TypeIO.java index 733bb27c28..1fcf1a232f 100644 --- a/core/src/mindustry/io/TypeIO.java +++ b/core/src/mindustry/io/TypeIO.java @@ -3,7 +3,7 @@ package mindustry.io; import arc.graphics.*; import arc.math.geom.*; import arc.struct.*; -import arc.util.ArcAnnotate.*; +import arc.util.*; import arc.util.io.*; import arc.util.pooling.*; import mindustry.ai.types.*; diff --git a/core/src/mindustry/io/legacy/LegacySaveVersion.java b/core/src/mindustry/io/legacy/LegacySaveVersion.java index 7e84526bec..a511868356 100644 --- a/core/src/mindustry/io/legacy/LegacySaveVersion.java +++ b/core/src/mindustry/io/legacy/LegacySaveVersion.java @@ -9,7 +9,7 @@ import mindustry.world.*; import java.io.*; -import static mindustry.Vars.content; +import static mindustry.Vars.*; public abstract class LegacySaveVersion extends SaveVersion{ diff --git a/core/src/mindustry/io/legacy/Save3.java b/core/src/mindustry/io/legacy/Save3.java index 64e7683ff2..7306b2bf29 100644 --- a/core/src/mindustry/io/legacy/Save3.java +++ b/core/src/mindustry/io/legacy/Save3.java @@ -5,7 +5,7 @@ import mindustry.game.Teams.*; import java.io.*; -import static mindustry.Vars.content; +import static mindustry.Vars.*; public class Save3 extends LegacySaveVersion{ diff --git a/core/src/mindustry/logic/Controllable.java b/core/src/mindustry/logic/Controllable.java index 31baf31a1e..3785eae4b6 100644 --- a/core/src/mindustry/logic/Controllable.java +++ b/core/src/mindustry/logic/Controllable.java @@ -3,4 +3,5 @@ package mindustry.logic; /** An object that can be controlled with logic. */ public interface Controllable{ void control(LAccess type, double p1, double p2, double p3, double p4); + void control(LAccess type, Object p1, double p2, double p3, double p4); } diff --git a/core/src/mindustry/logic/LAccess.java b/core/src/mindustry/logic/LAccess.java index 30eacf2402..f38745447c 100644 --- a/core/src/mindustry/logic/LAccess.java +++ b/core/src/mindustry/logic/LAccess.java @@ -29,15 +29,26 @@ public enum LAccess{ //values with parameters are considered controllable enabled("to"), //"to" is standard for single parameter access - shoot("x", "y", "shoot"),; + shoot("x", "y", "shoot"), + shootp(true, "unit", "shoot") + + ; public final String[] parameters; + public final boolean isObj; - public static final LAccess[] all = values(); - public static final LAccess[] senseable = Seq.select(all, t -> t.parameters.length <= 1).toArray(LAccess.class); - public static final LAccess[] controls = Seq.select(all, t -> t.parameters.length > 0).toArray(LAccess.class); + public static final LAccess[] + all = values(), + senseable = Seq.select(all, t -> t.parameters.length <= 1).toArray(LAccess.class), + controls = Seq.select(all, t -> t.parameters.length > 0).toArray(LAccess.class); LAccess(String... parameters){ this.parameters = parameters; + isObj = false; + } + + LAccess(boolean obj, String... parameters){ + this.parameters = parameters; + isObj = obj; } } diff --git a/core/src/mindustry/logic/LAssembler.java b/core/src/mindustry/logic/LAssembler.java index 7ca74ca83c..10ccbfe1b9 100644 --- a/core/src/mindustry/logic/LAssembler.java +++ b/core/src/mindustry/logic/LAssembler.java @@ -2,7 +2,7 @@ package mindustry.logic; import arc.func.*; import arc.struct.*; -import arc.util.ArcAnnotate.*; +import arc.util.*; import mindustry.*; import mindustry.gen.*; import mindustry.logic.LExecutor.*; @@ -202,7 +202,8 @@ public class LAssembler{ } } - public @Nullable BVar getVar(String name){ + @Nullable + public BVar getVar(String name){ return vars.get(name); } diff --git a/core/src/mindustry/logic/LCanvas.java b/core/src/mindustry/logic/LCanvas.java index d626f95388..ed98bee8ff 100644 --- a/core/src/mindustry/logic/LCanvas.java +++ b/core/src/mindustry/logic/LCanvas.java @@ -13,7 +13,6 @@ import arc.scene.ui.*; import arc.scene.ui.layout.*; import arc.struct.*; import arc.util.*; -import arc.util.ArcAnnotate.*; import mindustry.gen.*; import mindustry.graphics.*; import mindustry.ui.*; @@ -348,7 +347,7 @@ public class LCanvas extends Table{ public static class JumpButton extends ImageButton{ Color hoverColor = Pal.place; Color defaultColor = Color.white; - @NonNull Prov to; + Prov to; boolean selecting; float mx, my; ClickListener listener; @@ -356,7 +355,7 @@ public class LCanvas extends Table{ JumpCurve curve; - public JumpButton(@NonNull Prov getter, Cons setter){ + public JumpButton(Prov getter, Cons setter){ super(Tex.logicNode, Styles.colori); to = getter; diff --git a/core/src/mindustry/logic/LExecutor.java b/core/src/mindustry/logic/LExecutor.java index b532151f1c..053d1e9c1a 100644 --- a/core/src/mindustry/logic/LExecutor.java +++ b/core/src/mindustry/logic/LExecutor.java @@ -1,7 +1,6 @@ package mindustry.logic; import arc.struct.*; -import arc.util.ArcAnnotate.*; import arc.util.*; import arc.util.noise.*; import mindustry.*; @@ -165,7 +164,11 @@ public class LExecutor{ Object obj = exec.obj(target); if(obj instanceof Controllable){ Controllable cont = (Controllable)obj; - cont.control(type, exec.num(p1), exec.num(p2), exec.num(p3), exec.num(p4)); + if(type.isObj){ + cont.control(type, exec.obj(p1), exec.num(p2), exec.num(p3), exec.num(p4)); + }else{ + cont.control(type, exec.num(p1), exec.num(p2), exec.num(p3), exec.num(p4)); + } } } } @@ -577,7 +580,7 @@ public class LExecutor{ if(address != -1){ Var va = exec.vars[value]; Var vb = exec.vars[compare]; - boolean cmp = false; + boolean cmp; if(op.objFunction != null && (va.isobj || vb.isobj)){ //use object function if provided, and one of the variables is an object diff --git a/core/src/mindustry/logic/LStatement.java b/core/src/mindustry/logic/LStatement.java index cbe5029d94..3f2f6fd413 100644 --- a/core/src/mindustry/logic/LStatement.java +++ b/core/src/mindustry/logic/LStatement.java @@ -9,7 +9,6 @@ import arc.scene.ui.*; import arc.scene.ui.layout.*; import arc.struct.*; import arc.util.*; -import arc.util.ArcAnnotate.*; import mindustry.gen.*; import mindustry.logic.LCanvas.*; import mindustry.logic.LExecutor.*; diff --git a/core/src/mindustry/logic/LStatements.java b/core/src/mindustry/logic/LStatements.java index 6d57f2c079..2ce318f4a7 100644 --- a/core/src/mindustry/logic/LStatements.java +++ b/core/src/mindustry/logic/LStatements.java @@ -155,39 +155,37 @@ public class LStatements{ s.setColor(table.color); switch(type){ - case clear: + case clear -> { fields(s, "r", x, v -> x = v); fields(s, "g", y, v -> y = v); fields(s, "b", p1, v -> p1 = v); - break; - case color: + } + case color -> { fields(s, "r", x, v -> x = v); fields(s, "g", y, v -> y = v); fields(s, "b", p1, v -> p1 = v); row(s); fields(s, "a", p2, v -> p2 = v); - break; - case stroke: + } + case stroke -> { s.add().width(4); fields(s, x, v -> x = v); - break; - case line: + } + case line -> { fields(s, "x", x, v -> x = v); fields(s, "y", y, v -> y = v); row(s); fields(s, "x2", p1, v -> p1 = v); fields(s, "y2", p2, v -> p2 = v); - break; - case rect: - case lineRect: + } + case rect, lineRect -> { fields(s, "x", x, v -> x = v); fields(s, "y", y, v -> y = v); row(s); fields(s, "width", p1, v -> p1 = v); fields(s, "height", p2, v -> p2 = v); - break; - case poly: - case linePoly: + } + case poly, linePoly -> { fields(s, "x", x, v -> x = v); fields(s, "y", y, v -> y = v); row(s); @@ -195,8 +193,8 @@ public class LStatements{ fields(s, "radius", p2, v -> p2 = v); row(s); fields(s, "rotation", p3, v -> p3 = v); - break; - case triangle: + } + case triangle -> { fields(s, "x", x, v -> x = v); fields(s, "y", y, v -> y = v); row(s); @@ -205,7 +203,7 @@ public class LStatements{ row(s); fields(s, "x3", p3, v -> p3 = v); fields(s, "y3", p4, v -> p4 = v); - break; + } } }).expand().left(); } diff --git a/core/src/mindustry/maps/Map.java b/core/src/mindustry/maps/Map.java index ebf2896e0e..edef90cea7 100644 --- a/core/src/mindustry/maps/Map.java +++ b/core/src/mindustry/maps/Map.java @@ -1,11 +1,10 @@ package mindustry.maps; import arc.*; -import arc.struct.*; import arc.files.*; import arc.graphics.*; +import arc.struct.*; import arc.util.*; -import arc.util.ArcAnnotate.*; import mindustry.*; import mindustry.game.EventType.*; import mindustry.game.*; diff --git a/core/src/mindustry/maps/MapPreviewLoader.java b/core/src/mindustry/maps/MapPreviewLoader.java index ebc69eeae4..6453c6f0b1 100644 --- a/core/src/mindustry/maps/MapPreviewLoader.java +++ b/core/src/mindustry/maps/MapPreviewLoader.java @@ -3,12 +3,12 @@ package mindustry.maps; import arc.assets.*; import arc.assets.loaders.*; import arc.assets.loaders.resolvers.*; -import arc.struct.*; import arc.files.*; import arc.graphics.*; +import arc.struct.*; import arc.util.*; import mindustry.*; -import mindustry.ctype.Content; +import mindustry.ctype.*; public class MapPreviewLoader extends TextureLoader{ diff --git a/core/src/mindustry/maps/Maps.java b/core/src/mindustry/maps/Maps.java index 54c3856d7d..7741f0942f 100644 --- a/core/src/mindustry/maps/Maps.java +++ b/core/src/mindustry/maps/Maps.java @@ -8,7 +8,6 @@ import arc.func.*; import arc.graphics.*; import arc.struct.IntSet.*; import arc.struct.*; -import arc.util.ArcAnnotate.*; import arc.util.*; import arc.util.async.*; import arc.util.io.*; diff --git a/core/src/mindustry/maps/filters/CoreSpawnFilter.java b/core/src/mindustry/maps/filters/CoreSpawnFilter.java index fa3b270d4d..6aa2db744b 100644 --- a/core/src/mindustry/maps/filters/CoreSpawnFilter.java +++ b/core/src/mindustry/maps/filters/CoreSpawnFilter.java @@ -5,7 +5,7 @@ import arc.util.*; import mindustry.world.*; import mindustry.world.blocks.storage.*; -import static mindustry.Vars.state; +import static mindustry.Vars.*; /** Selects X spawns from the core spawn pool.*/ public class CoreSpawnFilter extends GenerateFilter{ diff --git a/core/src/mindustry/maps/filters/MedianFilter.java b/core/src/mindustry/maps/filters/MedianFilter.java index c70bf6d71b..78a4df65d4 100644 --- a/core/src/mindustry/maps/filters/MedianFilter.java +++ b/core/src/mindustry/maps/filters/MedianFilter.java @@ -1,12 +1,12 @@ package mindustry.maps.filters; -import arc.struct.*; import arc.math.*; +import arc.struct.*; import arc.util.*; import mindustry.maps.filters.FilterOption.*; import mindustry.world.*; -import static mindustry.Vars.content; +import static mindustry.Vars.*; public class MedianFilter extends GenerateFilter{ float radius = 2; diff --git a/core/src/mindustry/maps/filters/NoiseFilter.java b/core/src/mindustry/maps/filters/NoiseFilter.java index 1feba11ad1..857be64369 100644 --- a/core/src/mindustry/maps/filters/NoiseFilter.java +++ b/core/src/mindustry/maps/filters/NoiseFilter.java @@ -1,13 +1,11 @@ package mindustry.maps.filters; import arc.util.*; -import mindustry.content.Blocks; -import mindustry.maps.filters.FilterOption.BlockOption; -import mindustry.maps.filters.FilterOption.SliderOption; -import mindustry.world.Block; +import mindustry.content.*; +import mindustry.maps.filters.FilterOption.*; +import mindustry.world.*; -import static mindustry.maps.filters.FilterOption.floorsOnly; -import static mindustry.maps.filters.FilterOption.wallsOnly; +import static mindustry.maps.filters.FilterOption.*; public class NoiseFilter extends GenerateFilter{ float scl = 40, threshold = 0.5f, octaves = 3f, falloff = 0.5f; diff --git a/core/src/mindustry/maps/filters/OreFilter.java b/core/src/mindustry/maps/filters/OreFilter.java index 91c989e151..491bbf0123 100644 --- a/core/src/mindustry/maps/filters/OreFilter.java +++ b/core/src/mindustry/maps/filters/OreFilter.java @@ -1,12 +1,11 @@ package mindustry.maps.filters; import arc.util.*; -import mindustry.content.Blocks; -import mindustry.maps.filters.FilterOption.SliderOption; -import mindustry.world.Block; +import mindustry.content.*; +import mindustry.maps.filters.FilterOption.*; +import mindustry.world.*; -import static mindustry.maps.filters.FilterOption.BlockOption; -import static mindustry.maps.filters.FilterOption.oresOnly; +import static mindustry.maps.filters.FilterOption.*; public class OreFilter extends GenerateFilter{ public float scl = 23, threshold = 0.81f, octaves = 2f, falloff = 0.3f; diff --git a/core/src/mindustry/maps/filters/OreMedianFilter.java b/core/src/mindustry/maps/filters/OreMedianFilter.java index 43c589d586..c9fd8d91c6 100644 --- a/core/src/mindustry/maps/filters/OreMedianFilter.java +++ b/core/src/mindustry/maps/filters/OreMedianFilter.java @@ -1,7 +1,7 @@ package mindustry.maps.filters; -import arc.struct.*; import arc.math.*; +import arc.struct.*; import arc.util.*; import mindustry.*; import mindustry.content.*; diff --git a/core/src/mindustry/maps/filters/RiverNoiseFilter.java b/core/src/mindustry/maps/filters/RiverNoiseFilter.java index 0a462548cc..28ffd1a714 100644 --- a/core/src/mindustry/maps/filters/RiverNoiseFilter.java +++ b/core/src/mindustry/maps/filters/RiverNoiseFilter.java @@ -1,13 +1,11 @@ package mindustry.maps.filters; import arc.util.*; -import mindustry.content.Blocks; -import mindustry.maps.filters.FilterOption.BlockOption; -import mindustry.maps.filters.FilterOption.SliderOption; -import mindustry.world.Block; +import mindustry.content.*; +import mindustry.maps.filters.FilterOption.*; +import mindustry.world.*; -import static mindustry.maps.filters.FilterOption.floorsOnly; -import static mindustry.maps.filters.FilterOption.wallsOnly; +import static mindustry.maps.filters.FilterOption.*; public class RiverNoiseFilter extends GenerateFilter{ float scl = 40, threshold = 0f, threshold2 = 0.1f; diff --git a/core/src/mindustry/maps/filters/ScatterFilter.java b/core/src/mindustry/maps/filters/ScatterFilter.java index 8866130baa..4b90275b1f 100644 --- a/core/src/mindustry/maps/filters/ScatterFilter.java +++ b/core/src/mindustry/maps/filters/ScatterFilter.java @@ -1,8 +1,8 @@ package mindustry.maps.filters; import arc.util.*; -import mindustry.content.Blocks; -import mindustry.world.Block; +import mindustry.content.*; +import mindustry.world.*; import static mindustry.maps.filters.FilterOption.*; diff --git a/core/src/mindustry/maps/filters/TerrainFilter.java b/core/src/mindustry/maps/filters/TerrainFilter.java index f6dcaeaf27..cc0ba82b54 100644 --- a/core/src/mindustry/maps/filters/TerrainFilter.java +++ b/core/src/mindustry/maps/filters/TerrainFilter.java @@ -1,14 +1,12 @@ package mindustry.maps.filters; -import arc.math.Mathf; +import arc.math.*; import arc.util.*; -import mindustry.content.Blocks; -import mindustry.maps.filters.FilterOption.BlockOption; -import mindustry.maps.filters.FilterOption.SliderOption; -import mindustry.world.Block; +import mindustry.content.*; +import mindustry.maps.filters.FilterOption.*; +import mindustry.world.*; -import static mindustry.maps.filters.FilterOption.floorsOnly; -import static mindustry.maps.filters.FilterOption.wallsOnly; +import static mindustry.maps.filters.FilterOption.*; public class TerrainFilter extends GenerateFilter{ float scl = 40, threshold = 0.9f, octaves = 3f, falloff = 0.5f, magnitude = 1f, circleScl = 2.1f; diff --git a/core/src/mindustry/mod/ContentParser.java b/core/src/mindustry/mod/ContentParser.java index b63a0b17dc..9dc8b5d2d7 100644 --- a/core/src/mindustry/mod/ContentParser.java +++ b/core/src/mindustry/mod/ContentParser.java @@ -6,9 +6,9 @@ import arc.audio.*; import arc.files.*; import arc.func.*; import arc.graphics.*; +import arc.graphics.g2d.*; import arc.mock.*; import arc.struct.*; -import arc.util.ArcAnnotate.*; import arc.util.*; import arc.util.serialization.*; import arc.util.serialization.Json.*; @@ -36,8 +36,9 @@ import java.lang.reflect.*; public class ContentParser{ private static final boolean ignoreUnknownFields = true; ObjectMap, ContentType> contentTypes = new ObjectMap<>(); + ObjectSet> implicitNullable = ObjectSet.with(TextureRegion.class, TextureRegion[].class, TextureRegion[][].class); - ObjectMap, FieldParser> classParsers = new ObjectMap, FieldParser>(){{ + ObjectMap, FieldParser> classParsers = new ObjectMap<>(){{ put(Effect.class, (type, data) -> field(Fx.class, data)); put(Schematic.class, (type, data) -> { Object result = fieldOpt(Loadouts.class, data); @@ -440,6 +441,8 @@ public class ContentParser{ } public void markError(Content content, LoadedMod mod, Fi file, Throwable error){ + Log.err("Error for @ / @:\n@\n", content, file, Strings.getStackTrace(error)); + content.minfo.mod = mod; content.minfo.sourceFile = file; content.minfo.error = makeError(error, file); @@ -539,13 +542,13 @@ public class ContentParser{ } void checkNullFields(Object object){ - if(object instanceof Number || object instanceof String || toBeParsed.contains(object)) return; + if(object == null || object instanceof Number || object instanceof String || toBeParsed.contains(object) || object.getClass().getName().startsWith("arc.")) return; parser.getFields(object.getClass()).values().toSeq().each(field -> { try{ if(field.field.getType().isPrimitive()) return; - if(field.field.isAnnotationPresent(NonNull.class) && field.field.get(object) == null){ + if(!field.field.isAnnotationPresent(Nullable.class) && field.field.get(object) == null && !implicitNullable.contains(field.field.getType())){ throw new RuntimeException("'" + field.field.getName() + "' in " + object.getClass().getSimpleName() + " is missing!"); } }catch(Exception e){ diff --git a/core/src/mindustry/mod/ModLoadingMusic.java b/core/src/mindustry/mod/ModLoadingMusic.java index 8797456a18..9b51031783 100644 --- a/core/src/mindustry/mod/ModLoadingMusic.java +++ b/core/src/mindustry/mod/ModLoadingMusic.java @@ -2,10 +2,9 @@ package mindustry.mod; import arc.audio.*; import arc.mock.*; -import arc.util.ArcAnnotate.*; public class ModLoadingMusic implements Music{ - public @NonNull Music music = new MockMusic(); + public Music music = new MockMusic(); @Override public void play(){ diff --git a/core/src/mindustry/mod/ModLoadingSound.java b/core/src/mindustry/mod/ModLoadingSound.java index 7bae2f5a6b..543b75c154 100644 --- a/core/src/mindustry/mod/ModLoadingSound.java +++ b/core/src/mindustry/mod/ModLoadingSound.java @@ -3,10 +3,9 @@ package mindustry.mod; import arc.audio.*; import arc.math.geom.*; import arc.mock.*; -import arc.util.ArcAnnotate.*; public class ModLoadingSound implements Sound{ - public @NonNull Sound sound = new MockSound(); + public Sound sound = new MockSound(); @Override public float calcPan(float x, float y){ diff --git a/core/src/mindustry/mod/Mods.java b/core/src/mindustry/mod/Mods.java index 89f378f406..068a73062d 100644 --- a/core/src/mindustry/mod/Mods.java +++ b/core/src/mindustry/mod/Mods.java @@ -11,7 +11,6 @@ import arc.graphics.g2d.TextureAtlas.*; import arc.scene.ui.*; import arc.struct.*; import arc.util.*; -import arc.util.ArcAnnotate.*; import arc.util.io.*; import arc.util.serialization.*; import arc.util.serialization.Jval.*; @@ -399,7 +398,7 @@ public class Mods implements Loadable{ d.button("@details", Icon.downOpen, Styles.transt, () -> { new Dialog(""){{ setFillParent(true); - cont.pane(e -> e.add(c.minfo.error).wrap().grow()).grow(); + cont.pane(e -> e.add(c.minfo.error).wrap().grow().labelAlign(Align.center, Align.left)).grow(); cont.row(); cont.button("@ok", Icon.left, this::hide).size(240f, 60f); }}.show(); diff --git a/core/src/mindustry/net/Administration.java b/core/src/mindustry/net/Administration.java index 7e5eb65339..f185744c28 100644 --- a/core/src/mindustry/net/Administration.java +++ b/core/src/mindustry/net/Administration.java @@ -3,7 +3,6 @@ package mindustry.net; import arc.*; import arc.func.*; import arc.struct.*; -import arc.util.ArcAnnotate.*; import arc.util.*; import arc.util.Log.*; import arc.util.pooling.Pool.*; @@ -695,9 +694,9 @@ public class Administration{ /** Defines a (potentially dangerous) action that a player has done in the world. * These objects are pooled; do not cache them! */ public static class PlayerAction implements Poolable{ - public @NonNull Player player; - public @NonNull ActionType type; - public @NonNull Tile tile; + public Player player; + public ActionType type; + public Tile tile; /** valid for block placement events only */ public @Nullable Block block; diff --git a/core/src/mindustry/net/CrashSender.java b/core/src/mindustry/net/CrashSender.java index 9a98d87555..0d2204890c 100644 --- a/core/src/mindustry/net/CrashSender.java +++ b/core/src/mindustry/net/CrashSender.java @@ -2,9 +2,9 @@ package mindustry.net; import arc.*; import arc.Net.*; -import arc.struct.*; import arc.files.*; import arc.func.*; +import arc.struct.*; import arc.util.*; import arc.util.io.*; import arc.util.serialization.*; @@ -19,13 +19,13 @@ import java.text.*; import java.util.*; import static arc.Core.*; -import static mindustry.Vars.mods; import static mindustry.Vars.net; +import static mindustry.Vars.*; public class CrashSender{ public static String createReport(String error){ - String report = "Mindustry has crashed. How unforunate.\n"; + String report = "Mindustry has crashed. How unfortunate.\n"; if(mods.list().size == 0 && Version.build != -1){ report += "Report this at " + Vars.reportIssueURL + "\n\n"; } diff --git a/core/src/mindustry/net/Host.java b/core/src/mindustry/net/Host.java index 123fdad341..f6124be052 100644 --- a/core/src/mindustry/net/Host.java +++ b/core/src/mindustry/net/Host.java @@ -1,6 +1,6 @@ package mindustry.net; -import arc.util.ArcAnnotate.*; +import arc.util.*; import mindustry.*; import mindustry.game.*; diff --git a/core/src/mindustry/net/Net.java b/core/src/mindustry/net/Net.java index af8d2ff739..89272f3470 100644 --- a/core/src/mindustry/net/Net.java +++ b/core/src/mindustry/net/Net.java @@ -4,7 +4,6 @@ import arc.*; import arc.func.*; import arc.net.*; import arc.struct.*; -import arc.util.ArcAnnotate.*; import arc.util.*; import arc.util.pooling.*; import mindustry.gen.*; diff --git a/core/src/mindustry/net/NetConnection.java b/core/src/mindustry/net/NetConnection.java index 976bea5a74..cf1e47bbbd 100644 --- a/core/src/mindustry/net/NetConnection.java +++ b/core/src/mindustry/net/NetConnection.java @@ -1,7 +1,6 @@ package mindustry.net; import arc.struct.*; -import arc.util.ArcAnnotate.*; import arc.util.*; import mindustry.entities.units.*; import mindustry.gen.*; diff --git a/core/src/mindustry/net/NetworkIO.java b/core/src/mindustry/net/NetworkIO.java index 05bd69fe32..3a32d5cb6b 100644 --- a/core/src/mindustry/net/NetworkIO.java +++ b/core/src/mindustry/net/NetworkIO.java @@ -1,6 +1,6 @@ package mindustry.net; -import arc.Core; +import arc.*; import arc.util.*; import arc.util.io.*; import mindustry.core.*; diff --git a/core/src/mindustry/net/Packet.java b/core/src/mindustry/net/Packet.java index 9058637a66..2aaa2a05c0 100644 --- a/core/src/mindustry/net/Packet.java +++ b/core/src/mindustry/net/Packet.java @@ -1,8 +1,8 @@ package mindustry.net; -import arc.util.pooling.Pool.Poolable; +import arc.util.pooling.Pool.*; -import java.nio.ByteBuffer; +import java.nio.*; public interface Packet extends Poolable{ default void read(ByteBuffer buffer){} diff --git a/core/src/mindustry/net/Registrator.java b/core/src/mindustry/net/Registrator.java index c0368497f5..2280d016e0 100644 --- a/core/src/mindustry/net/Registrator.java +++ b/core/src/mindustry/net/Registrator.java @@ -1,7 +1,7 @@ package mindustry.net; -import arc.struct.ObjectIntMap; -import arc.func.Prov; +import arc.func.*; +import arc.struct.*; import mindustry.net.Packets.*; public class Registrator{ diff --git a/core/src/mindustry/net/Streamable.java b/core/src/mindustry/net/Streamable.java index 18171b6cbf..52ce5d36d8 100644 --- a/core/src/mindustry/net/Streamable.java +++ b/core/src/mindustry/net/Streamable.java @@ -1,6 +1,6 @@ package mindustry.net; -import mindustry.net.Packets.StreamBegin; +import mindustry.net.Packets.*; import java.io.*; diff --git a/core/src/mindustry/type/AmmoTypes.java b/core/src/mindustry/type/AmmoTypes.java index 0dafe2ba8b..6b3769b361 100644 --- a/core/src/mindustry/type/AmmoTypes.java +++ b/core/src/mindustry/type/AmmoTypes.java @@ -1,6 +1,5 @@ package mindustry.type; -import arc.util.ArcAnnotate.*; import mindustry.*; import mindustry.content.*; import mindustry.ctype.*; @@ -45,7 +44,7 @@ public class AmmoTypes implements ContentList{ Tile closest = Vars.indexer.findClosestFlag(unit.x, unit.y, unit.team, BlockFlag.powerResupply); if(closest != null && closest.build != null && unit.within(closest.build, range) && closest.build.power != null){ - Building build = closest.build; + var build = closest.build; if(build.block.consumes.hasPower() && build.block.consumes.getPower().buffered){ float amount = closest.build.power.status * build.block.consumes.getPower().capacity; @@ -66,7 +65,7 @@ public class AmmoTypes implements ContentList{ } public static class ItemAmmoType extends AmmoType{ - public @NonNull Item item; + public Item item; public ItemAmmoType(Item item){ this.item = item; diff --git a/core/src/mindustry/type/Item.java b/core/src/mindustry/type/Item.java index 6558636343..9329efb47e 100644 --- a/core/src/mindustry/type/Item.java +++ b/core/src/mindustry/type/Item.java @@ -1,13 +1,13 @@ package mindustry.type; -import arc.struct.*; import arc.graphics.*; import arc.scene.ui.layout.*; +import arc.struct.*; import mindustry.ctype.*; import mindustry.ui.*; import mindustry.world.blocks.environment.*; -import static mindustry.Vars.content; +import static mindustry.Vars.*; public class Item extends UnlockableContent{ public final Color color; diff --git a/core/src/mindustry/type/ItemSeq.java b/core/src/mindustry/type/ItemSeq.java index 9926e1d3b9..0407f6a3f8 100644 --- a/core/src/mindustry/type/ItemSeq.java +++ b/core/src/mindustry/type/ItemSeq.java @@ -98,8 +98,10 @@ public class ItemSeq implements Iterable, Serializable{ @Override public void read(Json json, JsonValue jsonData){ + total = 0; for(Item item : Vars.content.items()){ values[item.id] = jsonData.getInt(item.name, 0); + total += values[item.id]; } } diff --git a/core/src/mindustry/type/ItemStack.java b/core/src/mindustry/type/ItemStack.java index a8a765c4df..d5f4097b58 100644 --- a/core/src/mindustry/type/ItemStack.java +++ b/core/src/mindustry/type/ItemStack.java @@ -1,7 +1,7 @@ package mindustry.type; -import arc.struct.Seq; -import mindustry.content.Items; +import arc.struct.*; +import mindustry.content.*; public class ItemStack implements Comparable{ public static final ItemStack[] empty = {}; diff --git a/core/src/mindustry/type/Liquid.java b/core/src/mindustry/type/Liquid.java index f968a0f68a..19e77a9987 100644 --- a/core/src/mindustry/type/Liquid.java +++ b/core/src/mindustry/type/Liquid.java @@ -2,14 +2,14 @@ package mindustry.type; import arc.graphics.*; import arc.scene.ui.layout.*; -import arc.util.ArcAnnotate.*; +import arc.util.*; import mindustry.content.*; import mindustry.ctype.*; import mindustry.ui.*; public class Liquid extends UnlockableContent{ /** Color used in pipes and on the ground. */ - public final @NonNull Color color; + public final Color color; /** Color used in bars. */ public @Nullable Color barColor; /** Color used to draw lights. Note that the alpha channel is used to dictate brightness. */ diff --git a/core/src/mindustry/type/Planet.java b/core/src/mindustry/type/Planet.java index 651c5c7923..8c4b40b4c2 100644 --- a/core/src/mindustry/type/Planet.java +++ b/core/src/mindustry/type/Planet.java @@ -7,7 +7,6 @@ import arc.math.*; import arc.math.geom.*; import arc.scene.ui.layout.*; import arc.struct.*; -import arc.util.ArcAnnotate.*; import arc.util.*; import arc.util.noise.*; import mindustry.ctype.*; @@ -24,7 +23,7 @@ public class Planet extends UnlockableContent{ /** intersect() temp var. */ private static final Vec3 intersectResult = new Vec3(); /** Mesh used for rendering. Created on load() - will be null on the server! */ - public PlanetMesh mesh; + public @Nullable PlanetMesh mesh; /** Position in global coordinates. Will be 0,0,0 until the Universe updates it. */ public Vec3 position = new Vec3(); /** Grid used for the sectors on the planet. Null if this planet can't be landed on. */ @@ -32,7 +31,7 @@ public class Planet extends UnlockableContent{ /** Generator that will make the planet. Can be null for planets that don't need to be landed on. */ public @Nullable PlanetGenerator generator; /** Array of sectors; directly maps to tiles in the grid. */ - public @NonNull Seq sectors; + public Seq sectors; /** Radius of this planet's sphere. Does not take into account sattelites. */ public float radius; /** Orbital radius around the sun. Do not change unless you know exactly what you are doing.*/ @@ -60,7 +59,7 @@ public class Planet extends UnlockableContent{ /** Parent body that this planet orbits around. If null, this planet is considered to be in the middle of the solar system.*/ public @Nullable Planet parent; /** The root parent of the whole solar system this planet is in. */ - public @NonNull Planet solarSystem; + public Planet solarSystem; /** All planets orbiting this one, in ascending order of radius. */ public Seq children = new Seq<>(); /** Sattelites orbiting this planet. */ diff --git a/core/src/mindustry/type/Publishable.java b/core/src/mindustry/type/Publishable.java index 8c8b32edde..274b5f3f7c 100644 --- a/core/src/mindustry/type/Publishable.java +++ b/core/src/mindustry/type/Publishable.java @@ -1,14 +1,15 @@ package mindustry.type; -import arc.struct.*; import arc.files.*; -import arc.util.ArcAnnotate.*; +import arc.struct.*; +import arc.util.*; import mindustry.*; /** Defines a piece of content that can be published on the Workshop. */ public interface Publishable{ /** @return workshop item ID, or null if this isn't on the workshop. */ - @Nullable String getSteamID(); + @Nullable + String getSteamID(); /** adds a steam ID to this item once it's published. should save the item to make sure this change is persisted. */ void addSteamID(String id); /** removes the item ID; called when the item isn't found. */ @@ -16,7 +17,8 @@ public interface Publishable{ /** @return default title of the listing. */ String steamTitle(); /** @return standard steam listing description, may be null. this is editable by users after release.*/ - @Nullable String steamDescription(); + @Nullable + String steamDescription(); /** @return the tag that this content has. e.g. 'schematic' or 'map'. */ String steamTag(); /** @return a folder with everything needed for this piece of content in it; does not need to be a copy. */ diff --git a/core/src/mindustry/type/Satellite.java b/core/src/mindustry/type/Satellite.java index 4b2546c651..a30a44c136 100644 --- a/core/src/mindustry/type/Satellite.java +++ b/core/src/mindustry/type/Satellite.java @@ -1,12 +1,10 @@ package mindustry.type; -import arc.util.ArcAnnotate.*; - /** Any object that is orbiting a planet. */ public class Satellite{ - public @NonNull Planet planet; + public Planet planet; - public Satellite(@NonNull Planet orbiting){ + public Satellite(Planet orbiting){ this.planet = orbiting; } } diff --git a/core/src/mindustry/type/Sector.java b/core/src/mindustry/type/Sector.java index 5fb65ce091..6d042296d1 100644 --- a/core/src/mindustry/type/Sector.java +++ b/core/src/mindustry/type/Sector.java @@ -3,9 +3,7 @@ package mindustry.type; import arc.*; import arc.func.*; import arc.math.geom.*; -import arc.struct.ObjectIntMap.*; import arc.struct.*; -import arc.util.ArcAnnotate.*; import arc.util.*; import mindustry.*; import mindustry.game.Saves.*; @@ -152,6 +150,26 @@ public class Sector{ }else{ ItemSeq recv = getExtraItems(); + if(save != null){ + //"shave off" extra items + + ItemSeq count = new ItemSeq(); + + //add items already present + count.add(save.meta.secinfo.coreItems); + + count.add(calculateReceivedItems()); + + int capacity = save.meta.secinfo.storageCapacity; + + //when over capacity, add that to the extra items + count.each((i, a) -> { + if(a > capacity){ + recv.remove(i, (a - capacity)); + } + }); + } + recv.remove(item, amount); setExtraItems(recv); @@ -166,21 +184,19 @@ public class Sector{ count.add(state.rules.defaultTeam.items()); }else if(save != null){ //add items already present - for(Entry ent : save.meta.secinfo.coreItems){ - count.add(ent.key, ent.value); - } + count.add(save.meta.secinfo.coreItems); count.add(calculateReceivedItems()); int capacity = save.meta.secinfo.storageCapacity; //validation - for(Item item : content.items()){ + count.each((item, amount) -> { //ensure positive items - if(count.get(item) < 0) count.set(item, 0); + if(amount < 0) count.set(item, 0); //cap the items - if(count.get(item) > capacity) count.set(item, capacity); - } + if(amount > capacity) count.set(item, capacity); + }); } return count; @@ -196,7 +212,7 @@ public class Sector{ save.meta.secinfo.production.each((item, stat) -> count.add(item, (int)(stat.mean * seconds))); //add received items - getExtraItems().each(count::add); + count.add(getExtraItems()); } return count; @@ -244,14 +260,14 @@ public class Sector{ return Core.settings.getFloat(key("time-spent")); } - public void setSecondsPassed(long number){ - put("seconds-passed", number); + public void setSecondsPassed(int number){ + put("secondsi-passed", number); } /** @return how much time has passed in this sector without the player resuming here. * Used for resource production calculations. */ - public long getSecondsPassed(){ - return Core.settings.getLong(key("seconds-passed")); + public int getSecondsPassed(){ + return Core.settings.getInt(key("secondsi-passed")); } private String key(String key){ diff --git a/core/src/mindustry/type/SectorPreset.java b/core/src/mindustry/type/SectorPreset.java index e67492dafa..c38ea7ad9f 100644 --- a/core/src/mindustry/type/SectorPreset.java +++ b/core/src/mindustry/type/SectorPreset.java @@ -3,7 +3,6 @@ package mindustry.type; import arc.func.*; import arc.graphics.g2d.*; import arc.scene.ui.layout.*; -import arc.util.ArcAnnotate.*; import mindustry.ctype.*; import mindustry.game.*; import mindustry.gen.*; @@ -11,9 +10,9 @@ import mindustry.maps.generators.*; import mindustry.ui.*; public class SectorPreset extends UnlockableContent{ - public @NonNull FileMapGenerator generator; - public @NonNull Planet planet; - public @NonNull Sector sector; + public FileMapGenerator generator; + public Planet planet; + public Sector sector; public int captureWave = 0; public Cons rules = rules -> rules.winWave = captureWave; diff --git a/core/src/mindustry/type/UnitType.java b/core/src/mindustry/type/UnitType.java index 7b17ca53e4..f927bc83d5 100644 --- a/core/src/mindustry/type/UnitType.java +++ b/core/src/mindustry/type/UnitType.java @@ -11,7 +11,6 @@ import arc.scene.ui.*; import arc.scene.ui.layout.*; import arc.struct.*; import arc.util.*; -import arc.util.ArcAnnotate.*; import mindustry.ai.types.*; import mindustry.annotations.Annotations.*; import mindustry.content.*; @@ -39,8 +38,8 @@ public class UnitType extends UnlockableContent{ /** If true, the unit is always at elevation 1. */ public boolean flying; - public @NonNull Prov constructor; - public @NonNull Prov defaultController = () -> !flying ? new GroundAI() : new FlyingAI(); + public Prov constructor; + public Prov defaultController = () -> !flying ? new GroundAI() : new FlyingAI(); public float speed = 1.1f, boostMultiplier = 1f, rotateSpeed = 5f, baseRotateSpeed = 5f; public float drag = 0.3f, accel = 0.5f, landShake = 0f, rippleScale = 1f, fallSpeed = 0.018f; public float health = 200f, range = -1, armor = 0f; @@ -66,6 +65,9 @@ public class UnitType extends UnlockableContent{ public float legSplashDamage = 0f, legSplashRange = 5; public boolean flipBackLegs = true; + public int ammoResupplyAmount = 10; + public float ammoResupplyRange = 100f; + public float mechSideSway = 0.54f, mechFrontSway = 0.1f; public float mechStride = -1f; public float mechStepShake = -1f; @@ -357,7 +359,6 @@ public class UnitType extends UnlockableContent{ drawPayload((Unit & Payloadc)unit); } - //TODO drawOcclusion(unit); Draw.z(z - outlineSpace); @@ -621,7 +622,6 @@ public class UnitType extends UnlockableContent{ } } - //TODO should be below/above legs if(baseRegion.found()){ Draw.rect(baseRegion, unit.x, unit.y, rotation - 90); } diff --git a/core/src/mindustry/type/Weapon.java b/core/src/mindustry/type/Weapon.java index 2734dc3fca..2038374ad5 100644 --- a/core/src/mindustry/type/Weapon.java +++ b/core/src/mindustry/type/Weapon.java @@ -4,7 +4,6 @@ import arc.*; import arc.audio.*; import arc.graphics.*; import arc.graphics.g2d.*; -import arc.util.ArcAnnotate.*; import mindustry.content.*; import mindustry.entities.*; import mindustry.entities.bullet.*; @@ -16,7 +15,7 @@ public class Weapon{ /** displayed weapon region */ public String name; /** bullet shot */ - public @NonNull BulletType bullet; + public BulletType bullet; /** shell ejection effect */ public Effect ejectEffect = Fx.none; /** whether to create a flipped copy of this weapon upon initialization. default: true */ @@ -71,6 +70,8 @@ public class Weapon{ public int otherSide = -1; /** sound used for shooting */ public Sound shootSound = Sounds.pew; + /** sound used for weapons that have a delay */ + public Sound chargeSound = Sounds.none; /** sound played when there is nothing to shoot */ public Sound noAmmoSound = Sounds.click; /** displayed region (autoloaded) */ diff --git a/core/src/mindustry/type/Weather.java b/core/src/mindustry/type/Weather.java index 98d0a9f7e2..8fb30aecb6 100644 --- a/core/src/mindustry/type/Weather.java +++ b/core/src/mindustry/type/Weather.java @@ -17,7 +17,7 @@ import static mindustry.Vars.*; public abstract class Weather extends UnlockableContent{ /** Default duration of this weather event in ticks. */ - public float duration = 8f * Time.toMinutes; + public float duration = 9f * Time.toMinutes; public float opacityMultiplier = 1f; public Attributes attrs = new Attributes(); diff --git a/core/src/mindustry/ui/BorderImage.java b/core/src/mindustry/ui/BorderImage.java index fc1c94f044..262a02a197 100644 --- a/core/src/mindustry/ui/BorderImage.java +++ b/core/src/mindustry/ui/BorderImage.java @@ -2,9 +2,9 @@ package mindustry.ui; import arc.graphics.*; import arc.graphics.g2d.*; -import arc.scene.ui.Image; -import arc.scene.ui.layout.Scl; -import mindustry.graphics.Pal; +import arc.scene.ui.*; +import arc.scene.ui.layout.*; +import mindustry.graphics.*; public class BorderImage extends Image{ public float thickness = 4f; diff --git a/core/src/mindustry/ui/ContentDisplay.java b/core/src/mindustry/ui/ContentDisplay.java index 3e82412f0e..6eefedcd53 100644 --- a/core/src/mindustry/ui/ContentDisplay.java +++ b/core/src/mindustry/ui/ContentDisplay.java @@ -1,9 +1,9 @@ package mindustry.ui; import arc.*; -import arc.struct.*; import arc.graphics.*; import arc.scene.ui.layout.*; +import arc.struct.*; import arc.util.*; import mindustry.gen.*; import mindustry.graphics.*; diff --git a/core/src/mindustry/ui/GridImage.java b/core/src/mindustry/ui/GridImage.java index 13d786a5be..f80262d5ac 100644 --- a/core/src/mindustry/ui/GridImage.java +++ b/core/src/mindustry/ui/GridImage.java @@ -1,7 +1,7 @@ package mindustry.ui; -import arc.graphics.g2d.Fill; -import arc.scene.Element; +import arc.graphics.g2d.*; +import arc.scene.*; public class GridImage extends Element{ private int imageWidth, imageHeight; diff --git a/core/src/mindustry/ui/IntFormat.java b/core/src/mindustry/ui/IntFormat.java index 187e21993f..2ca0e9de1f 100644 --- a/core/src/mindustry/ui/IntFormat.java +++ b/core/src/mindustry/ui/IntFormat.java @@ -1,8 +1,8 @@ package mindustry.ui; -import arc.Core; -import arc.func.Func; +import arc.*; +import arc.func.*; /** * A low-garbage way to format bundle strings. diff --git a/core/src/mindustry/ui/ItemDisplay.java b/core/src/mindustry/ui/ItemDisplay.java index 721fbc8b33..d0cedc5ba1 100644 --- a/core/src/mindustry/ui/ItemDisplay.java +++ b/core/src/mindustry/ui/ItemDisplay.java @@ -1,8 +1,7 @@ package mindustry.ui; -import arc.scene.ui.layout.Table; -import mindustry.type.Item; -import mindustry.type.ItemStack; +import arc.scene.ui.layout.*; +import mindustry.type.*; /** An item image with text. */ public class ItemDisplay extends Table{ diff --git a/core/src/mindustry/ui/ItemsDisplay.java b/core/src/mindustry/ui/ItemsDisplay.java index a1dc45d7a0..a6dec71bc7 100644 --- a/core/src/mindustry/ui/ItemsDisplay.java +++ b/core/src/mindustry/ui/ItemsDisplay.java @@ -5,7 +5,7 @@ import arc.math.*; import arc.scene.actions.*; import arc.scene.ui.*; import arc.scene.ui.layout.*; -import arc.util.ArcAnnotate.*; +import arc.util.*; import mindustry.core.*; import mindustry.gen.*; import mindustry.graphics.*; diff --git a/core/src/mindustry/ui/Links.java b/core/src/mindustry/ui/Links.java index 4f14c746d5..dd12c675d5 100644 --- a/core/src/mindustry/ui/Links.java +++ b/core/src/mindustry/ui/Links.java @@ -1,11 +1,11 @@ package mindustry.ui; -import arc.Core; +import arc.*; +import arc.graphics.*; import arc.scene.style.*; -import arc.util.Strings; -import arc.graphics.Color; +import arc.util.*; import mindustry.gen.*; -import mindustry.graphics.Pal; +import mindustry.graphics.*; public class Links{ private static LinkEntry[] links; diff --git a/core/src/mindustry/ui/LiquidDisplay.java b/core/src/mindustry/ui/LiquidDisplay.java index 6c645e6218..c2d71fee25 100644 --- a/core/src/mindustry/ui/LiquidDisplay.java +++ b/core/src/mindustry/ui/LiquidDisplay.java @@ -1,12 +1,11 @@ package mindustry.ui; -import arc.graphics.Color; -import arc.scene.ui.Image; -import arc.scene.ui.layout.Stack; -import arc.scene.ui.layout.Table; -import arc.util.Strings; -import mindustry.type.Liquid; -import mindustry.world.meta.StatUnit; +import arc.graphics.*; +import arc.scene.ui.*; +import arc.scene.ui.layout.*; +import arc.util.*; +import mindustry.type.*; +import mindustry.world.meta.*; /** An ItemDisplay, but for liquids. */ public class LiquidDisplay extends Table{ diff --git a/core/src/mindustry/ui/Minimap.java b/core/src/mindustry/ui/Minimap.java index dfec82c9fd..53736910f1 100644 --- a/core/src/mindustry/ui/Minimap.java +++ b/core/src/mindustry/ui/Minimap.java @@ -1,9 +1,9 @@ package mindustry.ui; -import arc.Core; -import arc.graphics.g2d.Draw; -import arc.input.KeyCode; -import arc.scene.Element; +import arc.*; +import arc.graphics.g2d.*; +import arc.input.*; +import arc.scene.*; import arc.scene.event.*; import arc.scene.ui.layout.*; import mindustry.gen.*; diff --git a/core/src/mindustry/ui/MobileButton.java b/core/src/mindustry/ui/MobileButton.java index 736247d45b..5174613b88 100644 --- a/core/src/mindustry/ui/MobileButton.java +++ b/core/src/mindustry/ui/MobileButton.java @@ -1,8 +1,8 @@ package mindustry.ui; import arc.scene.style.*; -import arc.scene.ui.ImageButton; -import arc.util.Align; +import arc.scene.ui.*; +import arc.util.*; public class MobileButton extends ImageButton{ diff --git a/core/src/mindustry/ui/MultiReqImage.java b/core/src/mindustry/ui/MultiReqImage.java index ebbb4fc359..a887a85299 100644 --- a/core/src/mindustry/ui/MultiReqImage.java +++ b/core/src/mindustry/ui/MultiReqImage.java @@ -1,8 +1,8 @@ package mindustry.ui; -import arc.struct.Seq; -import arc.scene.ui.layout.Stack; -import arc.util.Time; +import arc.scene.ui.layout.*; +import arc.struct.*; +import arc.util.*; public class MultiReqImage extends Stack{ private Seq displays = new Seq<>(); diff --git a/core/src/mindustry/ui/ReqImage.java b/core/src/mindustry/ui/ReqImage.java index eef8591f63..a02ad7e5d0 100644 --- a/core/src/mindustry/ui/ReqImage.java +++ b/core/src/mindustry/ui/ReqImage.java @@ -1,12 +1,11 @@ package mindustry.ui; -import arc.func.Boolp; +import arc.func.*; import arc.graphics.g2d.*; -import arc.scene.Element; -import arc.scene.ui.Image; -import arc.scene.ui.layout.Stack; -import arc.scene.ui.layout.Scl; -import mindustry.graphics.Pal; +import arc.scene.*; +import arc.scene.ui.*; +import arc.scene.ui.layout.*; +import mindustry.graphics.*; public class ReqImage extends Stack{ private final Boolp valid; diff --git a/core/src/mindustry/ui/Styles.java b/core/src/mindustry/ui/Styles.java index ea7babb459..13e97202e5 100644 --- a/core/src/mindustry/ui/Styles.java +++ b/core/src/mindustry/ui/Styles.java @@ -1,7 +1,6 @@ package mindustry.ui; import arc.*; -import mindustry.annotations.Annotations.*; import arc.graphics.*; import arc.graphics.g2d.*; import arc.graphics.g2d.TextureAtlas.*; @@ -16,6 +15,7 @@ import arc.scene.ui.ScrollPane.*; import arc.scene.ui.Slider.*; import arc.scene.ui.TextButton.*; import arc.scene.ui.TextField.*; +import mindustry.annotations.Annotations.*; import mindustry.gen.*; import mindustry.graphics.*; diff --git a/core/src/mindustry/ui/dialogs/AboutDialog.java b/core/src/mindustry/ui/dialogs/AboutDialog.java index 3ba3b5d7e2..0e86d0ee64 100644 --- a/core/src/mindustry/ui/dialogs/AboutDialog.java +++ b/core/src/mindustry/ui/dialogs/AboutDialog.java @@ -1,10 +1,10 @@ package mindustry.ui.dialogs; import arc.*; -import arc.struct.*; import arc.graphics.*; import arc.scene.ui.*; import arc.scene.ui.layout.*; +import arc.struct.*; import arc.util.*; import mindustry.game.EventType.*; import mindustry.gen.*; diff --git a/core/src/mindustry/ui/dialogs/ContentInfoDialog.java b/core/src/mindustry/ui/dialogs/ContentInfoDialog.java index 947afa0141..0ee1960f9f 100644 --- a/core/src/mindustry/ui/dialogs/ContentInfoDialog.java +++ b/core/src/mindustry/ui/dialogs/ContentInfoDialog.java @@ -1,8 +1,8 @@ package mindustry.ui.dialogs; -import arc.scene.ui.ScrollPane; -import arc.scene.ui.layout.Table; -import mindustry.ctype.UnlockableContent; +import arc.scene.ui.*; +import arc.scene.ui.layout.*; +import mindustry.ctype.*; public class ContentInfoDialog extends BaseDialog{ diff --git a/core/src/mindustry/ui/dialogs/CustomRulesDialog.java b/core/src/mindustry/ui/dialogs/CustomRulesDialog.java index 68f61f1df2..e14629b594 100644 --- a/core/src/mindustry/ui/dialogs/CustomRulesDialog.java +++ b/core/src/mindustry/ui/dialogs/CustomRulesDialog.java @@ -173,6 +173,7 @@ public class CustomRulesDialog extends BaseDialog{ check("@rules.explosions", b -> rules.damageExplosions = b, () -> rules.damageExplosions); check("@rules.fire", b -> rules.fire = b, () -> rules.fire); check("@rules.lighting", b -> rules.lighting = b, () -> rules.lighting); + check("@rules.enemyLights", b -> rules.enemyLights = b, () -> rules.enemyLights); main.button(b -> { b.left(); @@ -185,8 +186,6 @@ public class CustomRulesDialog extends BaseDialog{ }, () -> ui.picker.show(rules.ambientLight, rules.ambientLight::set)).left().width(250f).row(); main.button("@rules.weather", this::weatherDialog).width(250f).left().row(); - - //TODO add weather patterns } void number(String text, Floatc cons, Floatp prov){ diff --git a/core/src/mindustry/ui/dialogs/DiscordDialog.java b/core/src/mindustry/ui/dialogs/DiscordDialog.java index 3413a4a67b..600fe39e16 100644 --- a/core/src/mindustry/ui/dialogs/DiscordDialog.java +++ b/core/src/mindustry/ui/dialogs/DiscordDialog.java @@ -1,10 +1,10 @@ package mindustry.ui.dialogs; -import arc.Core; -import arc.graphics.Color; -import arc.scene.ui.Dialog; +import arc.*; +import arc.graphics.*; +import arc.scene.ui.*; import mindustry.gen.*; -import mindustry.graphics.Pal; +import mindustry.graphics.*; import static mindustry.Vars.*; diff --git a/core/src/mindustry/ui/dialogs/FileChooser.java b/core/src/mindustry/ui/dialogs/FileChooser.java index 78a3c1a459..2c8f2954b9 100644 --- a/core/src/mindustry/ui/dialogs/FileChooser.java +++ b/core/src/mindustry/ui/dialogs/FileChooser.java @@ -17,7 +17,7 @@ import java.util.*; public class FileChooser extends BaseDialog{ private static final Fi homeDirectory = Core.files.absolute(Core.files.getExternalStoragePath()); - static Fi lastDirectory = homeDirectory; + static Fi lastDirectory = Core.files.absolute(Core.settings.getString("lastDirectory", homeDirectory.absolutePath())); private Table files; Fi directory = lastDirectory; @@ -108,7 +108,7 @@ public class FileChooser extends BaseDialog{ ImageButton home = new ImageButton(Icon.home); home.clicked(() -> { directory = homeDirectory; - lastDirectory = directory; + setLastDirectory(directory); updateFiles(true); }); @@ -187,7 +187,7 @@ public class FileChooser extends BaseDialog{ TextButton upbutton = new TextButton(".." + directory.toString(), Styles.clearTogglet); upbutton.clicked(() -> { directory = directory.parent(); - lastDirectory = directory; + setLastDirectory(directory); updateFiles(true); }); @@ -217,7 +217,7 @@ public class FileChooser extends BaseDialog{ updateFileFieldStatus(); }else{ directory = directory.child(filename); - lastDirectory = directory; + setLastDirectory(directory); updateFiles(true); } }); @@ -242,6 +242,11 @@ public class FileChooser extends BaseDialog{ if(open) filefield.clearText(); } + public static void setLastDirectory(Fi directory){ + lastDirectory = directory; + Core.settings.put("lastDirectory", directory.absolutePath()); + } + private String shorten(String string){ int max = 30; if(string.length() <= max){ @@ -269,14 +274,14 @@ public class FileChooser extends BaseDialog{ if(!canBack()) return; index--; directory = history.get(index - 1); - lastDirectory = directory; + setLastDirectory(directory); updateFiles(false); } public void forward(){ if(!canForward()) return; directory = history.get(index); - lastDirectory = directory; + setLastDirectory(directory); index++; updateFiles(false); } diff --git a/core/src/mindustry/ui/dialogs/LanguageDialog.java b/core/src/mindustry/ui/dialogs/LanguageDialog.java index 979f35a7a9..41519c32fd 100644 --- a/core/src/mindustry/ui/dialogs/LanguageDialog.java +++ b/core/src/mindustry/ui/dialogs/LanguageDialog.java @@ -1,17 +1,15 @@ package mindustry.ui.dialogs; -import arc.Core; -import arc.struct.*; +import arc.*; import arc.scene.ui.*; -import arc.scene.ui.layout.Table; -import arc.util.Log; -import arc.util.Strings; +import arc.scene.ui.layout.*; +import arc.struct.*; +import arc.util.*; import mindustry.ui.*; -import java.util.Locale; +import java.util.*; -import static mindustry.Vars.locales; -import static mindustry.Vars.ui; +import static mindustry.Vars.*; public class LanguageDialog extends BaseDialog{ private Locale lastLocale; diff --git a/core/src/mindustry/ui/dialogs/MapPlayDialog.java b/core/src/mindustry/ui/dialogs/MapPlayDialog.java index 509b4ba1ea..8655e07208 100644 --- a/core/src/mindustry/ui/dialogs/MapPlayDialog.java +++ b/core/src/mindustry/ui/dialogs/MapPlayDialog.java @@ -4,7 +4,6 @@ import arc.*; import arc.scene.ui.*; import arc.scene.ui.layout.*; import arc.util.*; -import arc.util.ArcAnnotate.*; import mindustry.game.*; import mindustry.gen.*; import mindustry.maps.*; @@ -15,7 +14,7 @@ import static mindustry.Vars.*; public class MapPlayDialog extends BaseDialog{ CustomRulesDialog dialog = new CustomRulesDialog(); Rules rules; - @NonNull Gamemode selectedGamemode = Gamemode.survival; + Gamemode selectedGamemode = Gamemode.survival; Map lastMap; public MapPlayDialog(){ diff --git a/core/src/mindustry/ui/dialogs/MinimapDialog.java b/core/src/mindustry/ui/dialogs/MinimapDialog.java index d19dd5a1dd..703d896bfa 100644 --- a/core/src/mindustry/ui/dialogs/MinimapDialog.java +++ b/core/src/mindustry/ui/dialogs/MinimapDialog.java @@ -8,7 +8,7 @@ import arc.scene.event.*; import arc.scene.ui.layout.*; import mindustry.gen.*; -import static mindustry.Vars.renderer; +import static mindustry.Vars.*; public class MinimapDialog extends BaseDialog{ diff --git a/core/src/mindustry/ui/dialogs/PlanetDialog.java b/core/src/mindustry/ui/dialogs/PlanetDialog.java index 11b12cf0a5..b230f08a4f 100644 --- a/core/src/mindustry/ui/dialogs/PlanetDialog.java +++ b/core/src/mindustry/ui/dialogs/PlanetDialog.java @@ -13,7 +13,6 @@ import arc.scene.event.*; import arc.scene.ui.*; import arc.scene.ui.layout.*; import arc.util.*; -import arc.util.ArcAnnotate.*; import mindustry.core.*; import mindustry.ctype.*; import mindustry.game.*; @@ -381,7 +380,7 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{ } //stored resources - if(sector.hasBase() && sector.save.meta.secinfo.coreItems.size > 0){ + if(sector.hasBase() && sector.save.meta.secinfo.coreItems.total > 0){ stable.add("@sectors.stored").row(); stable.table(t -> { t.left(); diff --git a/core/src/mindustry/ui/dialogs/ResearchDialog.java b/core/src/mindustry/ui/dialogs/ResearchDialog.java index 155b6db9c4..a87aa2d55c 100644 --- a/core/src/mindustry/ui/dialogs/ResearchDialog.java +++ b/core/src/mindustry/ui/dialogs/ResearchDialog.java @@ -14,7 +14,6 @@ import arc.scene.ui.*; import arc.scene.ui.layout.*; import arc.struct.*; import arc.util.*; -import arc.util.ArcAnnotate.*; import mindustry.content.*; import mindustry.content.TechTree.*; import mindustry.core.*; diff --git a/core/src/mindustry/ui/dialogs/SaveDialog.java b/core/src/mindustry/ui/dialogs/SaveDialog.java index 909dd113d1..a29a2069f7 100644 --- a/core/src/mindustry/ui/dialogs/SaveDialog.java +++ b/core/src/mindustry/ui/dialogs/SaveDialog.java @@ -1,9 +1,9 @@ package mindustry.ui.dialogs; -import arc.Core; -import arc.scene.ui.TextButton; -import arc.util.Time; -import mindustry.game.Saves.SaveSlot; +import arc.*; +import arc.scene.ui.*; +import arc.util.*; +import mindustry.game.Saves.*; import mindustry.gen.*; import static mindustry.Vars.*; diff --git a/core/src/mindustry/ui/dialogs/SchematicsDialog.java b/core/src/mindustry/ui/dialogs/SchematicsDialog.java index 7a2afbbd1e..99a087d39f 100644 --- a/core/src/mindustry/ui/dialogs/SchematicsDialog.java +++ b/core/src/mindustry/ui/dialogs/SchematicsDialog.java @@ -11,7 +11,7 @@ import arc.scene.ui.ImageButton.*; import arc.scene.ui.TextButton.*; import arc.scene.ui.layout.*; import arc.util.*; -import mindustry.Vars; +import mindustry.*; import mindustry.game.*; import mindustry.gen.*; import mindustry.graphics.*; diff --git a/core/src/mindustry/ui/dialogs/TraceDialog.java b/core/src/mindustry/ui/dialogs/TraceDialog.java index 4bc0945020..c6582aa005 100644 --- a/core/src/mindustry/ui/dialogs/TraceDialog.java +++ b/core/src/mindustry/ui/dialogs/TraceDialog.java @@ -1,9 +1,9 @@ package mindustry.ui.dialogs; -import arc.Core; -import arc.scene.ui.layout.Table; +import arc.*; +import arc.scene.ui.layout.*; import mindustry.gen.*; -import mindustry.net.Administration.TraceInfo; +import mindustry.net.Administration.*; public class TraceDialog extends BaseDialog{ diff --git a/core/src/mindustry/ui/fragments/BlockConfigFragment.java b/core/src/mindustry/ui/fragments/BlockConfigFragment.java index 853c10025e..1523508aa4 100644 --- a/core/src/mindustry/ui/fragments/BlockConfigFragment.java +++ b/core/src/mindustry/ui/fragments/BlockConfigFragment.java @@ -7,6 +7,7 @@ import arc.scene.actions.*; import arc.scene.ui.layout.*; import arc.util.*; import mindustry.content.*; +import mindustry.game.EventType.*; import mindustry.gen.*; import static mindustry.Vars.*; @@ -32,6 +33,11 @@ public class BlockConfigFragment extends Fragment{ } } }); + + Events.on(ResetEvent.class, e -> { + table.visible = false; + configTile = null; + }); } public boolean isShown(){ diff --git a/core/src/mindustry/ui/fragments/BlockInventoryFragment.java b/core/src/mindustry/ui/fragments/BlockInventoryFragment.java index 515a7ef05c..3b60918356 100644 --- a/core/src/mindustry/ui/fragments/BlockInventoryFragment.java +++ b/core/src/mindustry/ui/fragments/BlockInventoryFragment.java @@ -10,8 +10,8 @@ import arc.scene.*; import arc.scene.actions.*; import arc.scene.event.*; import arc.scene.ui.*; -import arc.scene.ui.layout.*; import arc.scene.ui.layout.Stack; +import arc.scene.ui.layout.*; import arc.struct.*; import arc.util.*; import mindustry.annotations.Annotations.*; diff --git a/core/src/mindustry/ui/fragments/ChatFragment.java b/core/src/mindustry/ui/fragments/ChatFragment.java index f0f83b8be2..93654f048c 100644 --- a/core/src/mindustry/ui/fragments/ChatFragment.java +++ b/core/src/mindustry/ui/fragments/ChatFragment.java @@ -2,7 +2,6 @@ package mindustry.ui.fragments; import arc.*; import arc.Input.*; -import arc.struct.*; import arc.graphics.*; import arc.graphics.g2d.*; import arc.math.*; @@ -10,6 +9,7 @@ import arc.scene.*; import arc.scene.ui.*; import arc.scene.ui.Label.*; import arc.scene.ui.layout.*; +import arc.struct.*; import arc.util.*; import mindustry.*; import mindustry.gen.*; diff --git a/core/src/mindustry/ui/fragments/Fragment.java b/core/src/mindustry/ui/fragments/Fragment.java index 2e66da0652..367b6f0cfa 100644 --- a/core/src/mindustry/ui/fragments/Fragment.java +++ b/core/src/mindustry/ui/fragments/Fragment.java @@ -1,6 +1,6 @@ package mindustry.ui.fragments; -import arc.scene.Group; +import arc.scene.*; public abstract class Fragment{ public abstract void build(Group parent); diff --git a/core/src/mindustry/ui/fragments/HudFragment.java b/core/src/mindustry/ui/fragments/HudFragment.java index a1cd52354d..c16d2f23ec 100644 --- a/core/src/mindustry/ui/fragments/HudFragment.java +++ b/core/src/mindustry/ui/fragments/HudFragment.java @@ -33,10 +33,6 @@ public class HudFragment extends Fragment{ public final PlacementFragment blockfrag = new PlacementFragment(); - //TODO localize - public String sectorText = "Out of sector time."; - public Seq attackedSectors = new Seq<>(); - private ImageButton flip; private Table lastUnlockTable; private Table lastUnlockLayout; @@ -62,15 +58,28 @@ public class HudFragment extends Fragment{ showToast(Icon.warning, "Sector " + e.sector.id + " [scarlet]lost!"); }); - //TODO full implementation Events.on(ResetEvent.class, e -> { coreItems.resetUsed(); coreItems.clear(); }); + Events.on(TurnEvent.class, e -> { + Seq attacked = universe.getAttacked(state.getSector().planet); + + if(attacked.any()){ + + //TODO localize + String text = attacked.size > 1 ? attacked.size + " sectors attacked." : "Sector " + attacked.first().id + " under attack."; + + showToast(Icon.warning, text); + } + + //ui.announce("[accent][[ Turn " + universe.turn() + " ]\n[scarlet]" + attackedSectors.size + "[lightgray] sector(s) attacked."); + }); + //paused table parent.fill(t -> { - t.top().visible(() -> state.isPaused() && !state.isOutOfTime()).touchable = Touchable.disabled; + t.top().visible(() -> state.isPaused()).touchable = Touchable.disabled; t.table(Styles.black5, top -> top.add("@paused").style(Styles.outlineLabel).pad(8f)).growX(); }); @@ -273,37 +282,6 @@ public class HudFragment extends Fragment{ .update(label -> label.color.set(Color.orange).lerp(Color.scarlet, Mathf.absin(Time.time(), 2f, 1f)))).touchable(Touchable.disabled); }); - //paused table for when the player is out of time - parent.fill(t -> { - t.top().visible(() -> state.isOutOfTime()); - t.table(Styles.black5, top -> { - //TODO localize - top.add(sectorText).style(Styles.outlineLabel).color(Pal.accent).update(l -> { - l.color.a = Mathf.absin(Time.globalTime(), 7f, 1f); - l.setText(sectorText); - }).colspan(2); - top.row(); - - top.defaults().pad(2).size(150f, 54f); - //TODO localize - top.button("Skip", () -> { - universe.runTurn(); - state.set(State.playing); - - //announce turn info only when something is skipped. - ui.announce("[accent][[ Turn " + universe.turn() + " ]\n[scarlet]" + attackedSectors.size + "[lightgray] sector(s) attacked."); - }); - - //TODO localize - top.button("Switch Sectors", () -> { - ui.paused.runExitSave(); - - //switch to first attacked sector - control.playSector(attackedSectors.first()); - }).disabled(b -> attackedSectors.isEmpty()); - }).margin(8).growX(); - }); - //tutorial text parent.fill(t -> { Runnable resize = () -> { @@ -703,7 +681,7 @@ public class HudFragment extends Fragment{ t.add(new SideBar(() -> player.unit().healthf(), () -> true, true)).width(bw).growY().padRight(pad); t.image(() -> player.icon()).scaling(Scaling.bounded).grow().maxWidth(54f); t.add(new SideBar(() -> player.dead() ? 0f : player.displayAmmo() ? player.unit().ammof() : player.unit().healthf(), () -> !player.displayAmmo(), false)).width(bw).growY().padLeft(pad).update(b -> { - b.color.set(player.displayAmmo() ? player.dead() ? Pal.ammo : player.unit().type().ammoType.color : Pal.health); + b.color.set(player.displayAmmo() ? player.dead() || player.unit() instanceof BlockUnitc ? Pal.ammo : player.unit().type().ammoType.color : Pal.health); }); t.getChildren().get(1).toFront(); diff --git a/core/src/mindustry/ui/fragments/PlacementFragment.java b/core/src/mindustry/ui/fragments/PlacementFragment.java index c705b34f6b..cd5279d0d8 100644 --- a/core/src/mindustry/ui/fragments/PlacementFragment.java +++ b/core/src/mindustry/ui/fragments/PlacementFragment.java @@ -10,7 +10,6 @@ import arc.scene.style.*; import arc.scene.ui.*; import arc.scene.ui.layout.*; import arc.struct.*; -import arc.util.ArcAnnotate.*; import arc.util.*; import mindustry.core.*; import mindustry.entities.*; @@ -124,18 +123,17 @@ public class PlacementFragment extends Fragment{ for(int j = 0; j < blocks.size; j++){ if(blocks.get(j) == currentBlock){ switch(i){ - case 10: //left - j = (j - 1 + blocks.size) % blocks.size; - break; - case 11: //right - j = (j + 1) % blocks.size; - break; - case 12: //up + //left + case 10 -> j = (j - 1 + blocks.size) % blocks.size; + //right + case 11 -> j = (j + 1) % blocks.size; + //up + case 12 -> { j = (j > 3 ? j - 4 : blocks.size - blocks.size % 4 + j); j -= (j < blocks.size ? 0 : 4); - break; - case 13: //down - j = (j < blocks.size - 4 ? j + 4 : j % 4); + } + //down + case 13 -> j = (j < blocks.size - 4 ? j + 4 : j % 4); } input.block = blocks.get(j); selectedBlocks.put(currentCategory, input.block); diff --git a/core/src/mindustry/ui/fragments/PlayerListFragment.java b/core/src/mindustry/ui/fragments/PlayerListFragment.java index 87ac5d068d..eae9407131 100644 --- a/core/src/mindustry/ui/fragments/PlayerListFragment.java +++ b/core/src/mindustry/ui/fragments/PlayerListFragment.java @@ -36,7 +36,7 @@ public class PlayerListFragment extends Fragment{ rebuild(); content.pack(); content.act(Core.graphics.getDeltaTime()); - //TODO hack + //hacky Core.scene.act(0f); } }); @@ -115,13 +115,9 @@ public class PlayerListFragment extends Fragment{ t.defaults().size(bs); t.button(Icon.hammer, Styles.clearPartiali, - () -> { - ui.showConfirm("@confirm", Core.bundle.format("confirmban", user.name()), () -> Call.adminRequest(user, AdminAction.ban)); - }); + () -> ui.showConfirm("@confirm", Core.bundle.format("confirmban", user.name()), () -> Call.adminRequest(user, AdminAction.ban))); t.button(Icon.cancel, Styles.clearPartiali, - () -> { - ui.showConfirm("@confirm", Core.bundle.format("confirmkick", user.name()), () -> Call.adminRequest(user, AdminAction.kick)); - }); + () -> ui.showConfirm("@confirm", Core.bundle.format("confirmkick", user.name()), () -> Call.adminRequest(user, AdminAction.kick))); t.row(); diff --git a/core/src/mindustry/ui/layout/BranchTreeLayout.java b/core/src/mindustry/ui/layout/BranchTreeLayout.java index c2739fbada..9c598086cd 100644 --- a/core/src/mindustry/ui/layout/BranchTreeLayout.java +++ b/core/src/mindustry/ui/layout/BranchTreeLayout.java @@ -1,7 +1,7 @@ package mindustry.ui.layout; -import arc.struct.*; import arc.math.geom.*; +import arc.struct.*; /** * Algorithm taken from TreeLayout. diff --git a/core/src/mindustry/ui/layout/RadialTreeLayout.java b/core/src/mindustry/ui/layout/RadialTreeLayout.java index 88b13a5efa..2b1360ff53 100644 --- a/core/src/mindustry/ui/layout/RadialTreeLayout.java +++ b/core/src/mindustry/ui/layout/RadialTreeLayout.java @@ -1,7 +1,7 @@ package mindustry.ui.layout; -import arc.struct.*; import arc.math.*; +import arc.struct.*; public class RadialTreeLayout implements TreeLayout{ private static ObjectSet visited = new ObjectSet<>(); diff --git a/core/src/mindustry/world/Block.java b/core/src/mindustry/world/Block.java index c7b07fe401..189a9c21c1 100644 --- a/core/src/mindustry/world/Block.java +++ b/core/src/mindustry/world/Block.java @@ -12,7 +12,6 @@ import arc.scene.ui.layout.*; import arc.struct.EnumSet; import arc.struct.*; import arc.util.*; -import arc.util.ArcAnnotate.*; import arc.util.pooling.*; import mindustry.annotations.Annotations.*; import mindustry.core.*; @@ -198,6 +197,8 @@ public class Block extends UnlockableContent{ public boolean instantTransfer = false; /** Whether you can rotate this block with Keybind rotateplaced + Scroll Wheel. */ public boolean quickRotate = true; + /** Main subclass. Non-anonymous. */ + public @Nullable Class subclass; public Prov buildType = null; //initialized later public ObjectMap, Cons2> configurations = new ObjectMap<>(); @@ -371,7 +372,7 @@ public class Block extends UnlockableContent{ public boolean canReplace(Block other){ if(other.alwaysReplace) return true; - return (other != this || rotate) && this.group != BlockGroup.none && other.group == this.group && size == other.size; + return (other != this || rotate) && this.group != BlockGroup.none && other.group == this.group && (size == other.size || (size >= other.size && subclass != null && subclass == other.subclass)); } /** @return a possible replacement for this block when placed in a line by the player. */ @@ -465,8 +466,7 @@ public class Block extends UnlockableContent{ /** Never use outside of the editor! */ public TextureRegion editorIcon(){ - if(editorIcon == null) editorIcon = Core.atlas.find(name + "-icon-editor"); - return editorIcon; + return editorIcon == null ? (editorIcon = Core.atlas.find(name + "-icon-editor")) : editorIcon; } /** Never use outside of the editor! */ @@ -483,21 +483,16 @@ public class Block extends UnlockableContent{ } protected TextureRegion[] icons(){ - return new TextureRegion[]{region}; + //use team region in vanilla team blocks + return teamRegion.found() && minfo.mod == null ? new TextureRegion[]{region, teamRegions[Team.sharded.id]} : new TextureRegion[]{region}; } public TextureRegion[] getGeneratedIcons(){ - if(generatedIcons == null){ - generatedIcons = icons(); - } - return generatedIcons; + return generatedIcons == null ? (generatedIcons = icons()) : generatedIcons; } public TextureRegion[] variantRegions(){ - if(variantRegions == null){ - variantRegions = new TextureRegion[]{icon(Cicon.full)}; - } - return variantRegions; + return variantRegions == null ? (variantRegions = new TextureRegion[]{icon(Cicon.full)}) : variantRegions; } public boolean hasBuilding(){ @@ -590,6 +585,8 @@ public class Block extends UnlockableContent{ current = current.getSuperclass(); } + subclass = current; + while(buildType == null && Block.class.isAssignableFrom(current)){ //first class that is subclass of Building Class type = Structs.find(current.getDeclaredClasses(), t -> Building.class.isAssignableFrom(t) && !t.isInterface()); diff --git a/core/src/mindustry/world/Build.java b/core/src/mindustry/world/Build.java index 15c7decbcf..070ddab553 100644 --- a/core/src/mindustry/world/Build.java +++ b/core/src/mindustry/world/Build.java @@ -3,18 +3,21 @@ package mindustry.world; import arc.*; import arc.math.*; import arc.math.geom.*; +import arc.struct.*; import arc.util.*; import mindustry.annotations.Annotations.*; import mindustry.content.*; import mindustry.entities.*; import mindustry.game.EventType.*; import mindustry.game.*; +import mindustry.gen.*; import mindustry.world.blocks.*; import mindustry.world.blocks.ConstructBlock.*; import static mindustry.Vars.*; public class Build{ + private static final IntSet tmp = new IntSet(); @Remote(called = Loc.server) public static void beginBreak(Team team, int x, int y){ @@ -36,7 +39,8 @@ public class Build{ tile.setBlock(sub, team, rotation); tile.bc().setDeconstruct(previous); - tile.build.health(tile.build.maxHealth() * prevPercent); + tile.build.health = tile.build.maxHealth * prevPercent; + Core.app.post(() -> Events.fire(new BlockBuildBeginEvent(tile, team, true))); } @@ -55,11 +59,23 @@ public class Build{ Block previous = tile.block(); Block sub = ConstructBlock.get(result.size); + Seq prevBuild = new Seq<>(9); result.beforePlaceBegan(tile, previous); + tmp.clear(); + + tile.getLinkedTilesAs(result, t -> { + if(t.build != null && t.build.team == team && tmp.add(t.build.id)){ + prevBuild.add(t.build); + } + }); tile.setBlock(sub, team, rotation); - tile.bc().setConstruct(previous.size == sub.size ? previous : Blocks.air, result); + + ConstructBuild build = tile.bc(); + + build.setConstruct(previous.size == sub.size ? previous : Blocks.air, result); + build.prevBuild = prevBuild; result.placeBegan(tile, previous); @@ -110,7 +126,9 @@ public class Build{ for(int dy = 0; dy < type.size; dy++){ int wx = dx + offsetx + tile.x, wy = dy + offsety + tile.y; + Tile check = world.tile(wx, wy); + if( check == null || //nothing there (check.floor().isDeep() && !type.floating && !type.requiresWater && !type.placeableLiquid) || //deep water diff --git a/core/src/mindustry/world/DirectionalItemBuffer.java b/core/src/mindustry/world/DirectionalItemBuffer.java index 433a016ec7..4b7a7bca2f 100644 --- a/core/src/mindustry/world/DirectionalItemBuffer.java +++ b/core/src/mindustry/world/DirectionalItemBuffer.java @@ -6,7 +6,7 @@ import mindustry.annotations.Annotations.*; import mindustry.gen.*; import mindustry.type.*; -import static mindustry.Vars.content; +import static mindustry.Vars.*; public class DirectionalItemBuffer{ public final long[][] buffers; diff --git a/core/src/mindustry/world/Edges.java b/core/src/mindustry/world/Edges.java index 097c016541..c08b71cdce 100644 --- a/core/src/mindustry/world/Edges.java +++ b/core/src/mindustry/world/Edges.java @@ -6,7 +6,7 @@ import mindustry.gen.*; import java.util.*; -import static mindustry.Vars.world; +import static mindustry.Vars.*; public class Edges{ private static final int maxSize = 14; diff --git a/core/src/mindustry/world/ItemBuffer.java b/core/src/mindustry/world/ItemBuffer.java index a52495a1b7..6ab014bd2f 100644 --- a/core/src/mindustry/world/ItemBuffer.java +++ b/core/src/mindustry/world/ItemBuffer.java @@ -4,7 +4,7 @@ import arc.util.*; import arc.util.io.*; import mindustry.type.*; -import static mindustry.Vars.content; +import static mindustry.Vars.*; public class ItemBuffer{ private long[] buffer; diff --git a/core/src/mindustry/world/Tile.java b/core/src/mindustry/world/Tile.java index 63f08d6de4..0f761ad745 100644 --- a/core/src/mindustry/world/Tile.java +++ b/core/src/mindustry/world/Tile.java @@ -7,7 +7,7 @@ import arc.math.geom.QuadTree.*; import arc.scene.ui.*; import arc.scene.ui.layout.*; import arc.struct.*; -import arc.util.ArcAnnotate.*; +import arc.util.*; import mindustry.annotations.Annotations.*; import mindustry.content.*; import mindustry.game.*; @@ -26,9 +26,9 @@ public class Tile implements Position, QuadTreeObject, Displayable{ /** Tile entity, usually null. */ public @Nullable Building build; public short x, y; - protected @NonNull Block block; - protected @NonNull Floor floor; - protected @NonNull Floor overlay; + protected Block block; + protected Floor floor; + protected Floor overlay; protected boolean changing = false; public Tile(int x, int y){ @@ -130,15 +130,15 @@ public class Tile implements Position, QuadTreeObject, Displayable{ return block.solid && !block.synthetic() && block.fillsTile; } - public @NonNull Floor floor(){ + public Floor floor(){ return floor; } - public @NonNull Block block(){ + public Block block(){ return block; } - public @NonNull Floor overlay(){ + public Floor overlay(){ return overlay; } @@ -173,11 +173,11 @@ public class Tile implements Position, QuadTreeObject, Displayable{ return team().id; } - public void setBlock(@NonNull Block type, Team team, int rotation){ + public void setBlock(Block type, Team team, int rotation){ setBlock(type, team, rotation, type::newBuilding); } - public void setBlock(@NonNull Block type, Team team, int rotation, Prov entityprov){ + public void setBlock(Block type, Team team, int rotation, Prov entityprov){ changing = true; if(type.isStatic() || this.block.isStatic()){ @@ -232,16 +232,16 @@ public class Tile implements Position, QuadTreeObject, Displayable{ changing = false; } - public void setBlock(@NonNull Block type, Team team){ + public void setBlock(Block type, Team team){ setBlock(type, team, 0); } - public void setBlock(@NonNull Block type){ + public void setBlock(Block type){ setBlock(type, Team.derelict, 0); } /** This resets the overlay! */ - public void setFloor(@NonNull Floor type){ + public void setFloor(Floor type){ this.floor = type; this.overlay = (Floor)Blocks.air; @@ -252,7 +252,7 @@ public class Tile implements Position, QuadTreeObject, Displayable{ } /** Sets the floor, preserving overlay.*/ - public void setFloorUnder(@NonNull Floor floor){ + public void setFloorUnder(Floor floor){ Block overlay = this.overlay; setFloor(floor); setOverlay(overlay); @@ -326,7 +326,7 @@ public class Tile implements Position, QuadTreeObject, Displayable{ setOverlay(content.block(ore)); } - public void setOverlay(@NonNull Block block){ + public void setOverlay(Block block){ this.overlay = (Floor)block; recache(); @@ -389,19 +389,27 @@ public class Tile implements Position, QuadTreeObject, Displayable{ */ public Seq getLinkedTilesAs(Block block, Seq tmpArray){ tmpArray.clear(); + getLinkedTilesAs(block, tmpArray::add); + return tmpArray; + } + + /** + * Returns the list of all tiles linked to this multiblock if it were this block. + * The result contains all linked tiles, including this tile itself. + */ + public void getLinkedTilesAs(Block block, Cons tmpArray){ if(block.isMultiblock()){ int offsetx = -(block.size - 1) / 2; int offsety = -(block.size - 1) / 2; for(int dx = 0; dx < block.size; dx++){ for(int dy = 0; dy < block.size; dy++){ Tile other = world.tile(x + dx + offsetx, y + dy + offsety); - if(other != null) tmpArray.add(other); + if(other != null) tmpArray.get(other); } } }else{ - tmpArray.add(this); + tmpArray.get(this); } - return tmpArray; } public Rect getHitbox(Rect rect){ diff --git a/core/src/mindustry/world/Tiles.java b/core/src/mindustry/world/Tiles.java index e525350c0c..a996757256 100644 --- a/core/src/mindustry/world/Tiles.java +++ b/core/src/mindustry/world/Tiles.java @@ -3,7 +3,7 @@ package mindustry.world; import arc.func.*; import arc.math.*; import arc.math.geom.*; -import arc.util.ArcAnnotate.*; +import arc.util.*; import java.util.*; @@ -45,25 +45,26 @@ public class Tiles implements Iterable{ } /** @return a tile at coordinates, or null if out of bounds */ - public @Nullable Tile get(int x, int y){ + @Nullable + public Tile get(int x, int y){ return (x < 0 || x >= width || y < 0 || y >= height) ? null : array[y*width + x]; } /** @return a tile at coordinates; throws an exception if out of bounds */ - public @NonNull Tile getn(int x, int y){ + public Tile getn(int x, int y){ if(x < 0 || x >= width || y < 0 || y >= height) throw new IllegalArgumentException(x + ", " + y + " out of bounds: width=" + width + ", height=" + height); return array[y*width + x]; } /** @return a tile at coordinates, clamped. */ - public @NonNull Tile getc(int x, int y){ + public Tile getc(int x, int y){ x = Mathf.clamp(x, 0, width - 1); y = Mathf.clamp(y, 0, height - 1); return array[y*width + x]; } /** @return a tile at an iteration index [0, width * height] */ - public @NonNull Tile geti(int idx){ + public Tile geti(int idx){ return array[idx]; } diff --git a/core/src/mindustry/world/blocks/Attributes.java b/core/src/mindustry/world/blocks/Attributes.java index 50c907e218..ff96a2bb63 100644 --- a/core/src/mindustry/world/blocks/Attributes.java +++ b/core/src/mindustry/world/blocks/Attributes.java @@ -2,7 +2,7 @@ package mindustry.world.blocks; import arc.util.serialization.*; import arc.util.serialization.Json.*; -import mindustry.world.meta.Attribute; +import mindustry.world.meta.*; import java.util.*; diff --git a/core/src/mindustry/world/blocks/Autotiler.java b/core/src/mindustry/world/blocks/Autotiler.java index b9cff3840e..2989436fac 100644 --- a/core/src/mindustry/world/blocks/Autotiler.java +++ b/core/src/mindustry/world/blocks/Autotiler.java @@ -3,7 +3,6 @@ package mindustry.world.blocks; import arc.graphics.g2d.*; import arc.math.*; import arc.math.geom.*; -import arc.util.ArcAnnotate.*; import arc.util.*; import mindustry.entities.units.*; import mindustry.gen.*; @@ -11,23 +10,42 @@ import mindustry.world.*; import java.util.*; -//TODO documentation public interface Autotiler{ - //holds some static temporary variables, required due to some RoboVM bugs + /** + * Holds some static temporary variables, required due to some RoboVM bugs + */ class AutotilerHolder{ static final int[] blendresult = new int[5]; static final BuildPlan[] directionals = new BuildPlan[4]; } - /** slices a texture region: - * mode == 0 -> no slice - * mode == 1 -> bottom - * mode == 2 -> top */ - default TextureRegion sliced(TextureRegion input, int mode){ - return mode == 0 ? input : mode == 1 ? botHalf(input) : topHalf(input); + /** + * The mode to slice a texture at. + */ + enum SliceMode{ + none, + bottom, + top } + /** + * Slices a texture region depending on the SliceMode paramater + * + * @param input The TextureRegion to be sliced + * @param mode The SliceMode to be applied + * @return The sliced texture + */ + default TextureRegion sliced(TextureRegion input, SliceMode mode){ + return mode == SliceMode.none ? input : mode == SliceMode.bottom ? botHalf(input) : topHalf(input); + } + + /** + * Get the top half of a texture + * + * @param input The TextureRegion to slice + * @return The top half of the texture + */ default TextureRegion topHalf(TextureRegion input){ TextureRegion region = Tmp.tr1; region.set(input); @@ -35,6 +53,12 @@ public interface Autotiler{ return region; } + /** + * Get the buttom half of a texture + * + * @param input The TextureRegion to slice + * @return The buttom half of the texture + */ default TextureRegion botHalf(TextureRegion input){ TextureRegion region = Tmp.tr1; region.set(input); @@ -82,6 +106,7 @@ public interface Autotiler{ int[] blendresult = AutotilerHolder.blendresult; blendresult[0] = 0; blendresult[1] = blendresult[2] = 1; + int num = (blends(tile, rotation, directional, 2, world) && blends(tile, rotation, directional, 1, world) && blends(tile, rotation, directional, 3, world)) ? 0 : (blends(tile, rotation, directional, 1, world) && blends(tile, rotation, directional, 3, world)) ? 1 : @@ -92,6 +117,8 @@ public interface Autotiler{ -1; transformCase(num, blendresult); + // Calculate bitmask for direction. + blendresult[3] = 0; for(int i = 0; i < 4; i++){ @@ -100,6 +127,8 @@ public interface Autotiler{ } } + // Calculate direction for non-square sprites. + blendresult[4] = 0; for(int i = 0; i < 4; i++){ @@ -112,24 +141,41 @@ public interface Autotiler{ return blendresult; } + /** + * Transforms the autotiler setting the connection and the y-scale + * + * @param num The number to use to transform the array + * @param bits The blending value array + */ default void transformCase(int num, int[] bits){ - if(num == 0){ - bits[0] = 3; - }else if(num == 1){ - bits[0] = 4; - }else if(num == 2){ - bits[0] = 2; - }else if(num == 3){ - bits[0] = 2; - bits[2] = -1; - }else if(num == 4){ - bits[0] = 1; - bits[2] = -1; - }else if(num == 5){ - bits[0] = 1; + switch(num){ + case 0 -> bits[0] = 3; + case 1 -> bits[0] = 4; + case 2 -> bits[0] = 2; + case 3 -> { + bits[0] = 2; + bits[2] = -1; + } + case 4 -> { + bits[0] = 1; + bits[2] = -1; + } + case 5 -> bits[0] = 1; } } + /** + * Check if a position is facing the secondary position at a rotation + * + * @param x The x coordinate of position 1 + * @param y The y coordinate of position 1 + * @param rotation The rotation of the tile on (x, y) + * + * @param x2 The x coordinate of position 2 + * @param y2 The y coordinate of position 2 + * + * @return If position 1 is facing position 2 at a certain angle + */ default boolean facing(int x, int y, int rotation, int x2, int y2){ return Point2.equals(x + Geometry.d4(rotation).x,y + Geometry.d4(rotation).y, x2, y2); } @@ -145,6 +191,8 @@ public interface Autotiler{ return checkWorld && blends(tile, rotation, direction); } + + // TODO docs -- use for direction? default boolean blends(Tile tile, int rotation, int direction){ Building other = tile.getNearbyEntity(Mathf.mod(rotation - direction, 4)); return other != null && other.team == tile.team() && blends(tile, rotation, other.tileX(), other.tileY(), other.rotation, other.block); @@ -168,7 +216,16 @@ public interface Autotiler{ || (!otherblock.rotatedOutput(otherx, othery) || Point2.equals(otherx + Geometry.d4(otherrot).x, othery + Geometry.d4(otherrot).y, tile.x, tile.y))); } - /** @return whether this tile is looking at the other tile. */ + /** + * Check if a position is facing the secondary position at a rotation + * + * @param tile The origin tile that is or is not facing the destinated `otherblock` + * @param rotation The rotation of the tile on (x, y) + * + * @param otherx The x coordinate of position 2 + * @param othery The y coordinate of position 2 + * @return whether this tile is looking at the other tile. + */ default boolean lookingAt(Tile tile, int rotation, int otherx, int othery, Block otherblock){ Tile facing = Edges.getFacingEdge(otherblock, otherx, othery, tile); return facing != null && diff --git a/core/src/mindustry/world/blocks/ConstructBlock.java b/core/src/mindustry/world/blocks/ConstructBlock.java index d6bb877be8..7f50b81c01 100644 --- a/core/src/mindustry/world/blocks/ConstructBlock.java +++ b/core/src/mindustry/world/blocks/ConstructBlock.java @@ -5,7 +5,7 @@ import arc.Graphics.*; import arc.Graphics.Cursor.*; import arc.graphics.g2d.*; import arc.math.*; -import arc.util.ArcAnnotate.*; +import arc.struct.*; import arc.util.*; import arc.util.io.*; import mindustry.annotations.Annotations.*; @@ -62,6 +62,7 @@ public class ConstructBlock extends Block{ if(tile == null) return; float healthf = tile.build == null ? 1f : tile.build.healthf(); + Seq prev = tile.build instanceof ConstructBuild ? ((ConstructBuild)tile.build).prevBuild : null; tile.setBlock(block, team, rotation); @@ -71,6 +72,10 @@ public class ConstructBlock extends Block{ if(config != null){ tile.build.configured(builder, config); } + + if(prev != null && prev.size > 0){ + tile.build.overwrote(prev); + } } //last builder was this local client player, call placed() @@ -126,6 +131,7 @@ public class ConstructBlock extends Block{ * If there is no recipe for this block, as is the case with rocks, 'previous' is used. */ public @Nullable Block cblock; + public @Nullable Seq prevBuild; public float progress = 0; public float buildCost; diff --git a/core/src/mindustry/world/blocks/defense/Door.java b/core/src/mindustry/world/blocks/defense/Door.java index c745f3a63f..3546831ac8 100644 --- a/core/src/mindustry/world/blocks/defense/Door.java +++ b/core/src/mindustry/world/blocks/defense/Door.java @@ -1,8 +1,8 @@ package mindustry.world.blocks.defense; -import arc.audio.*; import arc.Graphics.*; import arc.Graphics.Cursor.*; +import arc.audio.*; import arc.graphics.g2d.*; import arc.math.*; import arc.math.geom.*; diff --git a/core/src/mindustry/world/blocks/defense/ForceProjector.java b/core/src/mindustry/world/blocks/defense/ForceProjector.java index 5a2fd461af..b508e90965 100644 --- a/core/src/mindustry/world/blocks/defense/ForceProjector.java +++ b/core/src/mindustry/world/blocks/defense/ForceProjector.java @@ -33,8 +33,8 @@ public class ForceProjector extends Block{ public @Load("@-top") TextureRegion topRegion; static ForceBuild paramEntity; - static final Cons shieldConsumer = trait -> { - if(trait.team() != paramEntity.team && Intersector.isInsideHexagon(paramEntity.x, paramEntity.y, paramEntity.realRadius() * 2f, trait.x(), trait.y())){ + static final Cons shieldConsumer = trait -> { + if(trait.team != paramEntity.team && trait.type.absorbable && Intersector.isInsideHexagon(paramEntity.x, paramEntity.y, paramEntity.realRadius() * 2f, trait.x(), trait.y())){ trait.absorb(); Fx.absorb.at(trait); paramEntity.hit = 1f; diff --git a/core/src/mindustry/world/blocks/defense/PointDefenseTurret.java b/core/src/mindustry/world/blocks/defense/PointDefenseTurret.java index 5602ab3052..06746bcfaa 100644 --- a/core/src/mindustry/world/blocks/defense/PointDefenseTurret.java +++ b/core/src/mindustry/world/blocks/defense/PointDefenseTurret.java @@ -4,10 +4,8 @@ import arc.graphics.*; import arc.graphics.g2d.*; import arc.math.*; import arc.math.geom.*; -import arc.util.ArcAnnotate.*; import arc.util.*; import arc.util.io.*; -import mindustry.*; import mindustry.annotations.Annotations.*; import mindustry.content.*; import mindustry.entities.*; diff --git a/core/src/mindustry/world/blocks/defense/TractorBeamTurret.java b/core/src/mindustry/world/blocks/defense/TractorBeamTurret.java index 4c500774a4..1f74360ed5 100644 --- a/core/src/mindustry/world/blocks/defense/TractorBeamTurret.java +++ b/core/src/mindustry/world/blocks/defense/TractorBeamTurret.java @@ -3,10 +3,8 @@ package mindustry.world.blocks.defense; import arc.graphics.*; import arc.graphics.g2d.*; import arc.math.*; -import arc.util.ArcAnnotate.*; import arc.util.*; import arc.util.io.*; -import mindustry.*; import mindustry.annotations.Annotations.*; import mindustry.entities.*; import mindustry.gen.*; diff --git a/core/src/mindustry/world/blocks/defense/turrets/ChargeTurret.java b/core/src/mindustry/world/blocks/defense/turrets/ChargeTurret.java index a63cd15ac1..3680cce446 100644 --- a/core/src/mindustry/world/blocks/defense/turrets/ChargeTurret.java +++ b/core/src/mindustry/world/blocks/defense/turrets/ChargeTurret.java @@ -6,7 +6,7 @@ import mindustry.content.*; import mindustry.entities.*; import mindustry.entities.bullet.*; -import static mindustry.Vars.tilesize; +import static mindustry.Vars.*; public class ChargeTurret extends PowerTurret{ public float chargeTime = 30f; diff --git a/core/src/mindustry/world/blocks/defense/turrets/LaserTurret.java b/core/src/mindustry/world/blocks/defense/turrets/LaserTurret.java index 7ac517c51a..c47a279414 100644 --- a/core/src/mindustry/world/blocks/defense/turrets/LaserTurret.java +++ b/core/src/mindustry/world/blocks/defense/turrets/LaserTurret.java @@ -9,7 +9,7 @@ import mindustry.world.consumers.*; import mindustry.world.meta.*; import mindustry.world.meta.values.*; -import static mindustry.Vars.tilesize; +import static mindustry.Vars.*; public class LaserTurret extends PowerTurret{ public float firingMoveFract = 0.25f; diff --git a/core/src/mindustry/world/blocks/defense/turrets/LiquidTurret.java b/core/src/mindustry/world/blocks/defense/turrets/LiquidTurret.java index 146dfc856c..e34d221d53 100644 --- a/core/src/mindustry/world/blocks/defense/turrets/LiquidTurret.java +++ b/core/src/mindustry/world/blocks/defense/turrets/LiquidTurret.java @@ -6,6 +6,7 @@ import mindustry.annotations.Annotations.*; import mindustry.entities.*; import mindustry.entities.bullet.*; import mindustry.gen.*; +import mindustry.graphics.*; import mindustry.type.*; import mindustry.world.consumers.*; import mindustry.world.meta.*; @@ -59,10 +60,7 @@ public class LiquidTurret extends Turret{ super.draw(); if(liquidRegion.found()){ - Draw.color(liquids.current().color); - Draw.alpha(liquids.total() / liquidCapacity); - Draw.rect(liquidRegion, x + tr2.x, y + tr2.y, rotation - 90); - Draw.reset(); + Drawf.liquid(liquidRegion, x + tr2.x, y + tr2.y, liquids.total() / liquidCapacity, liquids.current().color, rotation - 90); } if(topRegion.found()) Draw.rect(topRegion, x + tr2.x, y + tr2.y, rotation - 90); } @@ -135,7 +133,7 @@ public class LiquidTurret extends Turret{ } @Override - public boolean acceptLiquid(Building source, Liquid liquid, float amount){ + public boolean acceptLiquid(Building source, Liquid liquid){ return ammoTypes.get(liquid) != null && (liquids.current() == liquid || (ammoTypes.containsKey(liquids.current()) && liquids.get(liquids.current()) <= 1f / ammoTypes.get(liquids.current()).ammoMultiplier + 0.001f)); diff --git a/core/src/mindustry/world/blocks/defense/turrets/PowerTurret.java b/core/src/mindustry/world/blocks/defense/turrets/PowerTurret.java index 847f624247..f8b49195da 100644 --- a/core/src/mindustry/world/blocks/defense/turrets/PowerTurret.java +++ b/core/src/mindustry/world/blocks/defense/turrets/PowerTurret.java @@ -1,11 +1,10 @@ package mindustry.world.blocks.defense.turrets; -import arc.util.ArcAnnotate.*; import mindustry.entities.bullet.*; import mindustry.world.meta.*; public class PowerTurret extends Turret{ - public @NonNull BulletType shootType; + public BulletType shootType; public float powerUse = 1f; public PowerTurret(String name){ @@ -16,13 +15,12 @@ public class PowerTurret extends Turret{ @Override public void setStats(){ super.setStats(); - stats.add(BlockStat.damage, shootType.damage, StatUnit.none); } @Override public void init(){ - consumes.powerCond(powerUse, (TurretBuild entity) -> entity.target != null || (entity.logicControlled() && entity.logicShooting)); + consumes.powerCond(powerUse, TurretBuild::isActive); super.init(); } diff --git a/core/src/mindustry/world/blocks/defense/turrets/Turret.java b/core/src/mindustry/world/blocks/defense/turrets/Turret.java index 21033668a1..9d925af2f3 100644 --- a/core/src/mindustry/world/blocks/defense/turrets/Turret.java +++ b/core/src/mindustry/world/blocks/defense/turrets/Turret.java @@ -8,12 +8,12 @@ import arc.graphics.g2d.*; import arc.math.*; import arc.math.geom.*; import arc.struct.*; -import arc.util.ArcAnnotate.*; import arc.util.*; import arc.util.io.*; import mindustry.annotations.Annotations.*; import mindustry.content.*; import mindustry.entities.*; +import mindustry.entities.Units.*; import mindustry.entities.bullet.*; import mindustry.game.EventType.*; import mindustry.gen.*; @@ -67,6 +67,7 @@ public abstract class Turret extends Block{ public float coolantMultiplier = 5f; /** Effect displayed when coolant is used. */ public Effect coolEffect = Fx.fuelburn; + public Sortf unitSort = Unit::dst2; protected Vec2 tr = new Vec2(); protected Vec2 tr2 = new Vec2(); @@ -150,7 +151,7 @@ public abstract class Turret extends Block{ public boolean logicShooting = false; public @Nullable Posc target; public Vec2 targetPos = new Vec2(); - public @NonNull BlockUnitc unit = Nulls.blockUnit; + public BlockUnitc unit = Nulls.blockUnit; @Override public float range(){ @@ -175,13 +176,28 @@ public abstract class Turret extends Block{ } @Override - public double sense(LAccess sensor){ - if(sensor == LAccess.rotation) return rotation; - if(sensor == LAccess.shootX) return targetPos.x; - if(sensor == LAccess.shootY) return targetPos.y; - if(sensor == LAccess.shooting) return (isControlled() ? unit.isShooting() : logicControlled() ? logicShooting : validateTarget()) ? 1 : 0; + public void control(LAccess type, Object p1, double p2, double p3, double p4){ + if(type == LAccess.shootp && !unit.isPlayer()){ + logicControlTime = logicControlCooldown; + logicShooting = !Mathf.zero(p2); - return super.sense(sensor); + if(p1 instanceof Posc){ + targetPosition((Posc)p1); + } + } + + super.control(type, p1, p2, p3, p4); + } + + @Override + public double sense(LAccess sensor){ + return switch(sensor){ + case rotation -> rotation; + case shootX -> targetPos.x; + case shootY -> targetPos.y; + case shooting -> (isControlled() ? unit.isShooting() : logicControlled() ? logicShooting : validateTarget()) ? 1 : 0; + default -> super.sense(sensor); + }; } @Override @@ -193,6 +209,22 @@ public abstract class Turret extends Block{ return logicControlTime > 0; } + public boolean isActive(){ + return target != null || (logicControlled() && logicShooting) || (isControlled() && unit.isShooting()); + } + + public void targetPosition(Posc pos){ + BulletType bullet = peekAmmo(); + float speed = bullet.speed; + //slow bullets never intersect + if(speed < 0.1f) speed = 9999999f; + + targetPos.set(Predict.intercept(this, pos, speed)); + if(targetPos.isZero()){ + targetPos.set(target); + } + } + @Override public void draw(){ Draw.rect(baseRegion, x, y); @@ -240,15 +272,7 @@ public abstract class Turret extends Block{ }else if(logicControlled()){ //logic behavior canShoot = logicShooting; }else{ //default AI behavior - BulletType type = peekAmmo(); - float speed = type.speed; - //slow bullets never intersect - if(speed < 0.1f) speed = 9999999f; - - targetPos.set(Predict.intercept(this, target, speed)); - if(targetPos.isZero()){ - targetPos.set(target); - } + targetPosition(target); if(Float.isNaN(rotation)){ rotation = 0; @@ -306,9 +330,9 @@ public abstract class Turret extends Block{ protected void findTarget(){ if(targetAir && !targetGround){ - target = Units.closestEnemy(team, x, y, range, e -> !e.dead() && !e.isGrounded()); + target = Units.bestEnemy(team, x, y, range, e -> !e.dead() && !e.isGrounded(), unitSort); }else{ - target = Units.closestTarget(team, x, y, range, e -> !e.dead() && (e.isGrounded() || targetAir) && (!e.isGrounded() || targetGround)); + target = Units.bestTarget(team, x, y, range, e -> !e.dead() && (e.isGrounded() || targetAir) && (!e.isGrounded() || targetGround), b -> true, unitSort); } } @@ -397,7 +421,7 @@ public abstract class Turret extends Block{ } protected void bullet(BulletType type, float angle){ - float lifeScl = type.scaleVelocity ? Mathf.clamp(Mathf.dst(x, y, targetPos.x, targetPos.y) / type.range(), minRange / type.range(), range / type.range()) : 1f; + float lifeScl = type.scaleVelocity ? Mathf.clamp(Mathf.dst(x + tr.x, y + tr.y, targetPos.x, targetPos.y) / type.range(), minRange / type.range(), range / type.range()) : 1f; type.create(this, team, x + tr.x, y + tr.y, angle, 1f + Mathf.range(velocityInaccuracy), lifeScl); } diff --git a/core/src/mindustry/world/blocks/distribution/Conveyor.java b/core/src/mindustry/world/blocks/distribution/Conveyor.java index 19d769f85f..033f1eb8d5 100644 --- a/core/src/mindustry/world/blocks/distribution/Conveyor.java +++ b/core/src/mindustry/world/blocks/distribution/Conveyor.java @@ -5,7 +5,6 @@ import arc.graphics.g2d.*; import arc.math.*; import arc.math.geom.*; import arc.struct.*; -import arc.util.ArcAnnotate.*; import arc.util.*; import arc.util.io.*; import mindustry.annotations.Annotations.*; @@ -124,7 +123,7 @@ public class Conveyor extends Block implements Autotiler{ int dir = rotation - i; float rot = i == 0 ? rotation * 90 : (dir)*90; - Draw.rect(sliced(regions[0][frame], i != 0 ? 1 : 2), x + Geometry.d4x(dir) * tilesize*0.75f, y + Geometry.d4y(dir) * tilesize*0.75f, rot); + Draw.rect(sliced(regions[0][frame], i != 0 ? SliceMode.bottom : SliceMode.top), x + Geometry.d4x(dir) * tilesize*0.75f, y + Geometry.d4y(dir) * tilesize*0.75f, rot); } } @@ -146,9 +145,23 @@ public class Conveyor extends Block implements Autotiler{ } } + @Override + public void overwrote(Seq builds){ + if(builds.first() instanceof ConveyorBuild build){ + ids = build.ids.clone(); + xs = build.xs.clone(); + ys = build.ys.clone(); + len = build.len; + clogHeat = build.clogHeat; + lastInserted = build.lastInserted; + mid = build.mid; + minitem = build.minitem; + } + } + @Override public boolean shouldIdleSound(){ - return clogHeat <= 0.5f ; + return clogHeat <= 0.5f; } @Override @@ -161,11 +174,9 @@ public class Conveyor extends Block implements Autotiler{ blendscly = bits[2]; blending = bits[4]; - if(front() != null && front() != null){ - next = front(); - nextc = next instanceof ConveyorBuild && next.team == team ? (ConveyorBuild)next : null; - aligned = nextc != null && rotation == next.rotation; - } + next = front(); + nextc = next instanceof ConveyorBuild && next.team == team ? (ConveyorBuild)next : null; + aligned = nextc != null && rotation == next.rotation; } @Override @@ -220,7 +231,7 @@ public class Conveyor extends Block implements Autotiler{ if(ys[i] > 0.5 && i > 0) mid = i - 1; xs[i] = Mathf.approachDelta(xs[i], 0, speed*2); - if(ys[i] >= 1f && moveForward(ids[i])){ + if(ys[i] >= 1f && pass(ids[i])){ //align X position if passing forwards if(aligned){ nextc.xs[nextc.lastInserted] = xs[i]; @@ -242,6 +253,14 @@ public class Conveyor extends Block implements Autotiler{ noSleep(); } + public boolean pass(Item item) { + if(next != null && next.team == team && next.acceptItem(this, item)){ + next.handleItem(this, item); + return true; + } + return false; + } + @Override public int removeStack(Item item, int amount){ noSleep(); @@ -346,6 +365,9 @@ public class Conveyor extends Block implements Autotiler{ ys[i] = y; } } + + //this updates some state + updateTile(); } diff --git a/core/src/mindustry/world/blocks/distribution/ItemBridge.java b/core/src/mindustry/world/blocks/distribution/ItemBridge.java index da162d9398..2d09c69eba 100644 --- a/core/src/mindustry/world/blocks/distribution/ItemBridge.java +++ b/core/src/mindustry/world/blocks/distribution/ItemBridge.java @@ -354,7 +354,7 @@ public class ItemBridge extends Block{ } @Override - public boolean acceptLiquid(Building source, Liquid liquid, float amount){ + public boolean acceptLiquid(Building source, Liquid liquid){ if(team != source.team || !hasLiquids) return false; Tile other = world.tile(link); @@ -368,7 +368,7 @@ public class ItemBridge extends Block{ return false; } - return liquids.get(liquid) + amount < liquidCapacity && (liquids.current() == liquid || liquids.get(liquids.current()) < 0.2f); + return (liquids.current() == liquid || liquids.get(liquids.current()) < 0.2f); } protected boolean linked(Building source){ diff --git a/core/src/mindustry/world/blocks/distribution/Junction.java b/core/src/mindustry/world/blocks/distribution/Junction.java index 26801e86c2..8f6fe81b10 100644 --- a/core/src/mindustry/world/blocks/distribution/Junction.java +++ b/core/src/mindustry/world/blocks/distribution/Junction.java @@ -7,7 +7,7 @@ import mindustry.type.*; import mindustry.world.*; import mindustry.world.meta.*; -import static mindustry.Vars.content; +import static mindustry.Vars.*; public class Junction extends Block{ public float speed = 26; //frames taken to go through this junction diff --git a/core/src/mindustry/world/blocks/distribution/MassDriver.java b/core/src/mindustry/world/blocks/distribution/MassDriver.java index fa6529fd72..1776ed7522 100644 --- a/core/src/mindustry/world/blocks/distribution/MassDriver.java +++ b/core/src/mindustry/world/blocks/distribution/MassDriver.java @@ -210,9 +210,9 @@ public class MassDriver extends Block{ } if(linkValid()){ - Tile target = world.tile(link); - Drawf.circles(target.drawx(), target.drawy(), (target.block().size / 2f + 1) * tilesize + sin - 2f, Pal.place); - Drawf.arrow(x, y, target.drawx(), target.drawy(), size * tilesize + sin, 4f + sin); + Building target = world.build(link); + Drawf.circles(target.x, target.y, (target.block().size / 2f + 1) * tilesize + sin - 2f, Pal.place); + Drawf.arrow(x, y, target.x, target.y, size * tilesize + sin, 4f + sin); } Drawf.dashCircle(x, y, range, Pal.accent); @@ -251,7 +251,7 @@ public class MassDriver extends Block{ data.to = target; int totalUsed = 0; for(int i = 0; i < content.items().size; i++){ - int maxTransfer = Math.min(items.get(content.item(i)), ((MassDriver)tile.block()).itemCapacity - totalUsed); + int maxTransfer = Math.min(items.get(content.item(i)), tile.block().itemCapacity - totalUsed); data.items[i] = maxTransfer; totalUsed += maxTransfer; items.remove(content.item(i), maxTransfer); @@ -305,8 +305,8 @@ public class MassDriver extends Block{ protected boolean linkValid(){ if(link == -1) return false; - Tile link = world.tile(this.link); - return link != null && link.block() instanceof MassDriver && link.team() == tile.team() && tile.dst(link) <= range; + Building link = world.build(this.link); + return link instanceof MassDriverBuild && link.team == team && within(link, range); } @Override diff --git a/core/src/mindustry/world/blocks/distribution/OverflowGate.java b/core/src/mindustry/world/blocks/distribution/OverflowGate.java index 981080a95d..1b38cff775 100644 --- a/core/src/mindustry/world/blocks/distribution/OverflowGate.java +++ b/core/src/mindustry/world/blocks/distribution/OverflowGate.java @@ -2,14 +2,13 @@ package mindustry.world.blocks.distribution; import arc.math.*; import arc.util.*; -import arc.util.ArcAnnotate.*; import arc.util.io.*; import mindustry.gen.*; import mindustry.type.*; import mindustry.world.*; import mindustry.world.meta.*; -import static mindustry.Vars.world; +import static mindustry.Vars.*; public class OverflowGate extends Block{ public float speed = 1f; @@ -24,6 +23,7 @@ public class OverflowGate extends Block{ instantTransfer = true; unloadable = false; canOverdrive = false; + itemCapacity = 1; } @Override diff --git a/core/src/mindustry/world/blocks/distribution/PayloadConveyor.java b/core/src/mindustry/world/blocks/distribution/PayloadConveyor.java index 656315446f..7c0bbb7821 100644 --- a/core/src/mindustry/world/blocks/distribution/PayloadConveyor.java +++ b/core/src/mindustry/world/blocks/distribution/PayloadConveyor.java @@ -4,7 +4,6 @@ import arc.*; import arc.graphics.g2d.*; import arc.math.*; import arc.math.geom.*; -import arc.util.ArcAnnotate.*; import arc.util.*; import arc.util.io.*; import mindustry.annotations.Annotations.*; @@ -21,6 +20,7 @@ public class PayloadConveyor extends Block{ public @Load("@-top") TextureRegion topRegion; public @Load("@-edge") TextureRegion edgeRegion; public Interp interp = Interp.pow5; + public float payloadLimit = 2.5f; public PayloadConveyor(String name){ super(name); @@ -217,10 +217,10 @@ public class PayloadConveyor extends Block{ @Override public boolean acceptPayload(Building source, Payload payload){ if(source == this){ - return this.item == null && payload.fits(); + return this.item == null && payload.fits(payloadLimit); } //accepting payloads from units isn't supported - return this.item == null && progress <= 5f && payload.fits(); + return this.item == null && progress <= 5f && payload.fits(payloadLimit); } @Override diff --git a/core/src/mindustry/world/blocks/distribution/Sorter.java b/core/src/mindustry/world/blocks/distribution/Sorter.java index 6deed76005..137a54aefa 100644 --- a/core/src/mindustry/world/blocks/distribution/Sorter.java +++ b/core/src/mindustry/world/blocks/distribution/Sorter.java @@ -3,7 +3,6 @@ package mindustry.world.blocks.distribution; import arc.graphics.g2d.*; import arc.math.*; import arc.scene.ui.layout.*; -import arc.util.ArcAnnotate.*; import arc.util.*; import arc.util.io.*; import mindustry.entities.units.*; diff --git a/core/src/mindustry/world/blocks/distribution/StackConveyor.java b/core/src/mindustry/world/blocks/distribution/StackConveyor.java index d70c518bc0..e7095a686c 100644 --- a/core/src/mindustry/world/blocks/distribution/StackConveyor.java +++ b/core/src/mindustry/world/blocks/distribution/StackConveyor.java @@ -2,6 +2,7 @@ package mindustry.world.blocks.distribution; import arc.graphics.g2d.*; import arc.math.*; +import arc.struct.*; import arc.util.*; import arc.util.io.*; import mindustry.annotations.Annotations.*; @@ -14,6 +15,7 @@ import mindustry.type.*; import mindustry.ui.*; import mindustry.world.*; import mindustry.world.blocks.*; +import mindustry.world.blocks.distribution.Conveyor.*; import mindustry.world.meta.*; import static mindustry.Vars.*; @@ -27,6 +29,7 @@ public class StackConveyor extends Block implements Autotiler{ public float speed = 0f; public boolean splitOut = true; + /** (minimum) amount of loading docks needed to fill a line */ public float recharge = 2f; public Effect loadEffect = Fx.plasticburn; public Effect unloadEffect = Fx.plasticburn; @@ -197,11 +200,7 @@ public class StackConveyor extends Block implements Autotiler{ } }else{ //transfer if(state != stateLoad || (items.total() >= getMaximumAccepted(lastItem))){ - if(front() != null - && front().team == team - && front().block instanceof StackConveyor){ - StackConveyorBuild e = (StackConveyorBuild)front(); - + if(front() instanceof StackConveyorBuild e && e.team == team){ // sleep if its occupied if(e.link == -1){ e.items.addAll(items); @@ -219,6 +218,16 @@ public class StackConveyor extends Block implements Autotiler{ } } + @Override + public void overwrote(Seq builds){ + if(builds.first() instanceof ConveyorBuild build){ + Item item = build.items.first(); + if(item != null){ + handleStack(item, build.items.get(item), null); + } + } + } + @Override public boolean shouldIdleSound(){ return false; // has no moving parts; diff --git a/core/src/mindustry/world/blocks/environment/Boulder.java b/core/src/mindustry/world/blocks/environment/Boulder.java index 4c90d8204f..28893d22d4 100644 --- a/core/src/mindustry/world/blocks/environment/Boulder.java +++ b/core/src/mindustry/world/blocks/environment/Boulder.java @@ -1,11 +1,9 @@ package mindustry.world.blocks.environment; -import arc.Core; -import arc.graphics.g2d.Draw; -import arc.graphics.g2d.TextureRegion; -import arc.math.Mathf; -import mindustry.world.Block; -import mindustry.world.Tile; +import arc.*; +import arc.graphics.g2d.*; +import arc.math.*; +import mindustry.world.*; public class Boulder extends Block{ protected int variants; diff --git a/core/src/mindustry/world/blocks/environment/Floor.java b/core/src/mindustry/world/blocks/environment/Floor.java index 2ac5e933cf..a62542f5da 100644 --- a/core/src/mindustry/world/blocks/environment/Floor.java +++ b/core/src/mindustry/world/blocks/environment/Floor.java @@ -7,7 +7,7 @@ import arc.graphics.g2d.TextureAtlas.*; import arc.math.*; import arc.math.geom.*; import arc.struct.*; -import arc.util.ArcAnnotate.*; +import arc.util.*; import mindustry.content.*; import mindustry.entities.*; import mindustry.graphics.*; @@ -37,7 +37,7 @@ public class Floor extends Block{ /** Effect displayed when drowning on this floor. */ public Effect drownUpdateEffect = Fx.bubble; /** Status effect applied when walking on. */ - public @NonNull StatusEffect status = StatusEffects.none; + public StatusEffect status = StatusEffects.none; /** Intensity of applied status effect. */ public float statusDuration = 60f; /** liquids that drop from this block, used for pumps */ diff --git a/core/src/mindustry/world/blocks/environment/OreBlock.java b/core/src/mindustry/world/blocks/environment/OreBlock.java index a5514e06ea..943d91076d 100644 --- a/core/src/mindustry/world/blocks/environment/OreBlock.java +++ b/core/src/mindustry/world/blocks/environment/OreBlock.java @@ -1,15 +1,15 @@ package mindustry.world.blocks.environment; import arc.*; -import mindustry.annotations.Annotations.*; import arc.graphics.*; import arc.graphics.g2d.*; +import mindustry.annotations.Annotations.*; import mindustry.graphics.*; import mindustry.graphics.MultiPacker.*; import mindustry.type.*; import mindustry.world.*; -import static mindustry.Vars.tilesize; +import static mindustry.Vars.*; /**An overlay ore for a specific item type.*/ public class OreBlock extends OverlayFloor{ diff --git a/core/src/mindustry/world/blocks/environment/OverlayFloor.java b/core/src/mindustry/world/blocks/environment/OverlayFloor.java index 4f2d6acfd9..f7a92ceeb3 100644 --- a/core/src/mindustry/world/blocks/environment/OverlayFloor.java +++ b/core/src/mindustry/world/blocks/environment/OverlayFloor.java @@ -1,8 +1,8 @@ package mindustry.world.blocks.environment; -import arc.graphics.g2d.Draw; -import arc.math.Mathf; -import mindustry.world.Tile; +import arc.graphics.g2d.*; +import arc.math.*; +import mindustry.world.*; /**A type of floor that is overlaid on top of over floors.*/ public class OverlayFloor extends Floor{ diff --git a/core/src/mindustry/world/blocks/environment/StaticTree.java b/core/src/mindustry/world/blocks/environment/StaticTree.java index 5e923f6f5f..78c6133d2f 100644 --- a/core/src/mindustry/world/blocks/environment/StaticTree.java +++ b/core/src/mindustry/world/blocks/environment/StaticTree.java @@ -4,7 +4,7 @@ import arc.graphics.g2d.*; import arc.util.*; import mindustry.world.*; -import static mindustry.Vars.tilesize; +import static mindustry.Vars.*; public class StaticTree extends StaticWall{ diff --git a/core/src/mindustry/world/blocks/environment/StaticWall.java b/core/src/mindustry/world/blocks/environment/StaticWall.java index 2b9e41a41e..a364db4ab2 100644 --- a/core/src/mindustry/world/blocks/environment/StaticWall.java +++ b/core/src/mindustry/world/blocks/environment/StaticWall.java @@ -8,7 +8,7 @@ import mindustry.annotations.Annotations.*; import mindustry.graphics.*; import mindustry.world.*; -import static mindustry.Vars.world; +import static mindustry.Vars.*; public class StaticWall extends Boulder{ public @Load("@-large") TextureRegion large; diff --git a/core/src/mindustry/world/blocks/environment/TreeBlock.java b/core/src/mindustry/world/blocks/environment/TreeBlock.java index b6170b8b85..cd199d8d25 100644 --- a/core/src/mindustry/world/blocks/environment/TreeBlock.java +++ b/core/src/mindustry/world/blocks/environment/TreeBlock.java @@ -1,13 +1,12 @@ package mindustry.world.blocks.environment; import arc.graphics.g2d.*; -import arc.math.Mathf; +import arc.math.*; import arc.math.geom.*; import arc.util.*; import mindustry.annotations.Annotations.*; -import mindustry.graphics.Layer; -import mindustry.world.Block; -import mindustry.world.Tile; +import mindustry.graphics.*; +import mindustry.world.*; public class TreeBlock extends Block{ public @Load("@-shadow") TextureRegion shadow; diff --git a/core/src/mindustry/world/blocks/experimental/BlockForge.java b/core/src/mindustry/world/blocks/experimental/BlockForge.java index 03052caac3..065cd66e05 100644 --- a/core/src/mindustry/world/blocks/experimental/BlockForge.java +++ b/core/src/mindustry/world/blocks/experimental/BlockForge.java @@ -4,7 +4,6 @@ import arc.graphics.g2d.*; import arc.math.*; import arc.scene.ui.layout.*; import arc.struct.*; -import arc.util.ArcAnnotate.*; import arc.util.*; import arc.util.io.*; import mindustry.*; diff --git a/core/src/mindustry/world/blocks/experimental/BlockLoader.java b/core/src/mindustry/world/blocks/experimental/BlockLoader.java index 0afbeafb78..886ca54421 100644 --- a/core/src/mindustry/world/blocks/experimental/BlockLoader.java +++ b/core/src/mindustry/world/blocks/experimental/BlockLoader.java @@ -10,7 +10,7 @@ import mindustry.ui.*; import mindustry.world.blocks.payloads.*; import mindustry.world.blocks.production.*; -import static mindustry.Vars.content; +import static mindustry.Vars.*; public class BlockLoader extends PayloadAcceptor{ public final int timerLoad = timers++; diff --git a/core/src/mindustry/world/blocks/experimental/BlockUnloader.java b/core/src/mindustry/world/blocks/experimental/BlockUnloader.java index 072d64ecea..a3ce1a60f5 100644 --- a/core/src/mindustry/world/blocks/experimental/BlockUnloader.java +++ b/core/src/mindustry/world/blocks/experimental/BlockUnloader.java @@ -3,7 +3,7 @@ package mindustry.world.blocks.experimental; import mindustry.gen.*; import mindustry.type.*; -import static mindustry.Vars.content; +import static mindustry.Vars.*; public class BlockUnloader extends BlockLoader{ diff --git a/core/src/mindustry/world/blocks/liquid/ArmoredConduit.java b/core/src/mindustry/world/blocks/liquid/ArmoredConduit.java index 6b8739b93a..a84148af09 100644 --- a/core/src/mindustry/world/blocks/liquid/ArmoredConduit.java +++ b/core/src/mindustry/world/blocks/liquid/ArmoredConduit.java @@ -32,8 +32,8 @@ public class ArmoredConduit extends Conduit{ } @Override - public boolean acceptLiquid(Building source, Liquid liquid, float amount){ - return super.acceptLiquid(source, liquid, amount) && (source.block instanceof Conduit || + public boolean acceptLiquid(Building source, Liquid liquid){ + return super.acceptLiquid(source, liquid) && (source.block instanceof Conduit || source.tile.absoluteRelativeTo(tile.x, tile.y) == rotation); } } diff --git a/core/src/mindustry/world/blocks/liquid/Conduit.java b/core/src/mindustry/world/blocks/liquid/Conduit.java index 0db85e80c0..b2fa75b045 100644 --- a/core/src/mindustry/world/blocks/liquid/Conduit.java +++ b/core/src/mindustry/world/blocks/liquid/Conduit.java @@ -88,25 +88,22 @@ public class Conduit extends LiquidBlock implements Autotiler{ if((blending & (1 << i)) != 0){ int dir = r - i; float rot = i == 0 ? rotation : (dir)*90; - drawAt(x + Geometry.d4x(dir) * tilesize*0.75f, y + Geometry.d4y(dir) * tilesize*0.75f, 0, rot, i != 0 ? 1 : 2); + drawAt(x + Geometry.d4x(dir) * tilesize*0.75f, y + Geometry.d4y(dir) * tilesize*0.75f, 0, rot, i != 0 ? SliceMode.bottom : SliceMode.top); } } Draw.z(Layer.block); Draw.scl(xscl, yscl); - drawAt(x, y, blendbits, rotation, 0); + drawAt(x, y, blendbits, rotation, SliceMode.none); Draw.reset(); } - protected void drawAt(float x, float y, int bits, float rotation, int slice){ + protected void drawAt(float x, float y, int bits, float rotation, SliceMode slice){ Draw.color(botColor); Draw.rect(sliced(botRegions[bits], slice), x, y, rotation); - Draw.color(liquids.current().color); - Draw.alpha(smoothLiquid); - Draw.rect(sliced(botRegions[bits], slice), x, y, rotation); - Draw.color(); + Drawf.liquid(sliced(botRegions[bits], slice), x, y, smoothLiquid, liquids.current().color, rotation); Draw.rect(sliced(topRegions[bits], slice), x, y, rotation); } @@ -123,9 +120,9 @@ public class Conduit extends LiquidBlock implements Autotiler{ } @Override - public boolean acceptLiquid(Building source, Liquid liquid, float amount){ + public boolean acceptLiquid(Building source, Liquid liquid){ noSleep(); - return liquids.get(liquid) + amount < liquidCapacity && (liquids.current() == liquid || liquids.currentAmount() < 0.2f) + return (liquids.current() == liquid || liquids.currentAmount() < 0.2f) && ((source.relativeTo(tile.x, tile.y) + 2) % 4 != rotation); } diff --git a/core/src/mindustry/world/blocks/liquid/LiquidBlock.java b/core/src/mindustry/world/blocks/liquid/LiquidBlock.java index 99ce2bda64..eb9a3f16d3 100644 --- a/core/src/mindustry/world/blocks/liquid/LiquidBlock.java +++ b/core/src/mindustry/world/blocks/liquid/LiquidBlock.java @@ -3,6 +3,7 @@ package mindustry.world.blocks.liquid; import arc.graphics.g2d.*; import mindustry.annotations.Annotations.*; import mindustry.gen.*; +import mindustry.graphics.*; import mindustry.world.*; import mindustry.world.meta.*; @@ -32,10 +33,7 @@ public class LiquidBlock extends Block{ Draw.rect(bottomRegion, x, y, rotation); if(liquids.total() > 0.001f){ - Draw.color(liquids.current().color); - Draw.alpha(liquids.total() / liquidCapacity); - Draw.rect(liquidRegion, x, y, rotation); - Draw.color(); + Drawf.liquid(liquidRegion, x, y, liquids.total() / liquidCapacity, liquids.current().color); } Draw.rect(topRegion, x, y, rotation); diff --git a/core/src/mindustry/world/blocks/liquid/LiquidBridge.java b/core/src/mindustry/world/blocks/liquid/LiquidBridge.java index c658cde66c..59205c3c92 100644 --- a/core/src/mindustry/world/blocks/liquid/LiquidBridge.java +++ b/core/src/mindustry/world/blocks/liquid/LiquidBridge.java @@ -6,7 +6,7 @@ import mindustry.type.*; import mindustry.world.blocks.distribution.*; import mindustry.world.meta.*; -import static mindustry.Vars.world; +import static mindustry.Vars.*; public class LiquidBridge extends ItemBridge{ diff --git a/core/src/mindustry/world/blocks/liquid/LiquidJunction.java b/core/src/mindustry/world/blocks/liquid/LiquidJunction.java index 2845281d96..09e5b70bb0 100644 --- a/core/src/mindustry/world/blocks/liquid/LiquidJunction.java +++ b/core/src/mindustry/world/blocks/liquid/LiquidJunction.java @@ -41,7 +41,7 @@ public class LiquidJunction extends LiquidBlock{ int dir = source.relativeTo(tile.x, tile.y); dir = (dir + 4) % 4; Building next = nearby(dir); - if(next == null || (!next.acceptLiquid(this, liquid, 0f) && !(next.block instanceof LiquidJunction))){ + if(next == null || (!next.acceptLiquid(this, liquid) && !(next.block instanceof LiquidJunction))){ return this; } return next.getLiquidDestination(this, liquid); diff --git a/core/src/mindustry/world/blocks/liquid/LiquidRouter.java b/core/src/mindustry/world/blocks/liquid/LiquidRouter.java index 60fab24df1..d3befe8233 100644 --- a/core/src/mindustry/world/blocks/liquid/LiquidRouter.java +++ b/core/src/mindustry/world/blocks/liquid/LiquidRouter.java @@ -20,8 +20,8 @@ public class LiquidRouter extends LiquidBlock{ } @Override - public boolean acceptLiquid(Building source, Liquid liquid, float amount){ - return liquids.get(liquid) + amount < liquidCapacity && (liquids.current() == liquid || liquids.currentAmount() < 0.2f); + public boolean acceptLiquid(Building source, Liquid liquid){ + return (liquids.current() == liquid || liquids.currentAmount() < 0.2f); } } } diff --git a/core/src/mindustry/world/blocks/logic/SwitchBlock.java b/core/src/mindustry/world/blocks/logic/SwitchBlock.java index 5bb9dbf621..bca47a306a 100644 --- a/core/src/mindustry/world/blocks/logic/SwitchBlock.java +++ b/core/src/mindustry/world/blocks/logic/SwitchBlock.java @@ -4,7 +4,6 @@ import arc.graphics.g2d.*; import arc.util.io.*; import mindustry.annotations.Annotations.*; import mindustry.gen.*; -import mindustry.logic.*; import mindustry.world.*; public class SwitchBlock extends Block{ @@ -22,12 +21,6 @@ public class SwitchBlock extends Block{ public class SwitchBuild extends Building{ - @Override - public double sense(LAccess sensor){ - if(sensor == LAccess.enabled) return enabled ? 1 : 0; - return super.sense(sensor); - } - @Override public boolean configTapped(){ configure(!enabled); diff --git a/core/src/mindustry/world/blocks/payloads/BlockPayload.java b/core/src/mindustry/world/blocks/payloads/BlockPayload.java index 3fc87dbe6b..cf22587d98 100644 --- a/core/src/mindustry/world/blocks/payloads/BlockPayload.java +++ b/core/src/mindustry/world/blocks/payloads/BlockPayload.java @@ -8,7 +8,7 @@ import mindustry.graphics.*; import mindustry.ui.*; import mindustry.world.*; -import static mindustry.Vars.tilesize; +import static mindustry.Vars.*; public class BlockPayload implements Payload{ public Building entity; diff --git a/core/src/mindustry/world/blocks/payloads/Payload.java b/core/src/mindustry/world/blocks/payloads/Payload.java index d19d0cda68..21b073d56e 100644 --- a/core/src/mindustry/world/blocks/payloads/Payload.java +++ b/core/src/mindustry/world/blocks/payloads/Payload.java @@ -1,6 +1,6 @@ package mindustry.world.blocks.payloads; -import arc.util.ArcAnnotate.*; +import arc.util.*; import arc.util.io.*; import mindustry.game.*; import mindustry.gen.*; @@ -25,9 +25,9 @@ public interface Payload{ return false; } - /** @return whether this payload fits on a standard 3x3 conveyor. */ - default boolean fits(){ - return size() / tilesize <= 2.5f; + /** @return whether this payload fits in a given size. 2.5 is the max for a standard 3x3 conveyor. */ + default boolean fits(float s){ + return size() / tilesize <= s; } /** writes the payload for saving. */ diff --git a/core/src/mindustry/world/blocks/payloads/UnitPayload.java b/core/src/mindustry/world/blocks/payloads/UnitPayload.java index 751152fb1f..724df792fa 100644 --- a/core/src/mindustry/world/blocks/payloads/UnitPayload.java +++ b/core/src/mindustry/world/blocks/payloads/UnitPayload.java @@ -7,8 +7,8 @@ import arc.math.geom.*; import arc.util.*; import arc.util.io.*; import mindustry.*; -import mindustry.entities.*; import mindustry.entities.EntityCollisions.*; +import mindustry.entities.*; import mindustry.gen.*; import mindustry.graphics.*; import mindustry.ui.*; diff --git a/core/src/mindustry/world/blocks/power/Battery.java b/core/src/mindustry/world/blocks/power/Battery.java index d556f584f5..03e7d66193 100644 --- a/core/src/mindustry/world/blocks/power/Battery.java +++ b/core/src/mindustry/world/blocks/power/Battery.java @@ -2,12 +2,13 @@ package mindustry.world.blocks.power; import arc.graphics.*; import arc.graphics.g2d.*; +import arc.math.*; import arc.struct.*; import mindustry.annotations.Annotations.*; import mindustry.gen.*; import mindustry.world.meta.*; -import static mindustry.Vars.tilesize; +import static mindustry.Vars.*; public class Battery extends PowerDistributor{ public @Load("@-top") TextureRegion topRegion; @@ -31,5 +32,15 @@ public class Battery extends PowerDistributor{ Draw.rect(topRegion, x, y); } + + @Override + public void overwrote(Seq previous){ + for(Building other : previous){ + if(other.power != null && other.block.consumes.hasPower() && other.block.consumes.getPower().buffered){ + float amount = other.block.consumes.getPower().capacity * other.power.status; + power.status = Mathf.clamp(power.status + amount / block.consumes.getPower().capacity); + } + } + } } } diff --git a/core/src/mindustry/world/blocks/power/BurnerGenerator.java b/core/src/mindustry/world/blocks/power/BurnerGenerator.java index d1743d8481..9e70f9b86f 100644 --- a/core/src/mindustry/world/blocks/power/BurnerGenerator.java +++ b/core/src/mindustry/world/blocks/power/BurnerGenerator.java @@ -2,6 +2,7 @@ package mindustry.world.blocks.power; import arc.graphics.g2d.*; import mindustry.annotations.Annotations.*; +import mindustry.graphics.*; import mindustry.type.*; public class BurnerGenerator extends ItemLiquidGenerator{ @@ -41,10 +42,7 @@ public class BurnerGenerator extends ItemLiquidGenerator{ Draw.rect(capRegion, x, y); if(hasLiquids){ - Draw.color(liquids.current().color); - Draw.alpha(liquids.currentAmount() / liquidCapacity); - Draw.rect(liquidRegion, x, y); - Draw.color(); + Drawf.liquid(liquidRegion, x, y, liquids.total() / liquidCapacity, liquids.current().color); } } } diff --git a/core/src/mindustry/world/blocks/power/ConditionalConsumePower.java b/core/src/mindustry/world/blocks/power/ConditionalConsumePower.java index 780474e3b5..61e1b4b059 100644 --- a/core/src/mindustry/world/blocks/power/ConditionalConsumePower.java +++ b/core/src/mindustry/world/blocks/power/ConditionalConsumePower.java @@ -1,8 +1,8 @@ package mindustry.world.blocks.power; -import arc.func.Boolf; +import arc.func.*; import mindustry.gen.*; -import mindustry.world.consumers.ConsumePower; +import mindustry.world.consumers.*; /** A power consumer that only activates sometimes. */ public class ConditionalConsumePower extends ConsumePower{ diff --git a/core/src/mindustry/world/blocks/power/DecayGenerator.java b/core/src/mindustry/world/blocks/power/DecayGenerator.java index e9fee90eee..becce39642 100644 --- a/core/src/mindustry/world/blocks/power/DecayGenerator.java +++ b/core/src/mindustry/world/blocks/power/DecayGenerator.java @@ -1,6 +1,6 @@ package mindustry.world.blocks.power; -import mindustry.type.Item; +import mindustry.type.*; public class DecayGenerator extends ItemLiquidGenerator{ diff --git a/core/src/mindustry/world/blocks/power/ItemLiquidGenerator.java b/core/src/mindustry/world/blocks/power/ItemLiquidGenerator.java index 2419c9a039..2d82bfa4c7 100644 --- a/core/src/mindustry/world/blocks/power/ItemLiquidGenerator.java +++ b/core/src/mindustry/world/blocks/power/ItemLiquidGenerator.java @@ -165,10 +165,7 @@ public class ItemLiquidGenerator extends PowerGenerator{ } if(hasLiquids){ - Draw.color(liquids.current().color); - Draw.alpha(liquids.currentAmount() / liquidCapacity); - Draw.rect(liquidRegion, x, y); - Draw.color(); + Drawf.liquid(liquidRegion, x, y, liquids.total() / liquidCapacity, liquids.current().color); } } diff --git a/core/src/mindustry/world/blocks/power/PowerBlock.java b/core/src/mindustry/world/blocks/power/PowerBlock.java index 5e29e99b75..e71c17aba7 100644 --- a/core/src/mindustry/world/blocks/power/PowerBlock.java +++ b/core/src/mindustry/world/blocks/power/PowerBlock.java @@ -1,7 +1,7 @@ package mindustry.world.blocks.power; -import mindustry.world.Block; -import mindustry.world.meta.BlockGroup; +import mindustry.world.*; +import mindustry.world.meta.*; public abstract class PowerBlock extends Block{ diff --git a/core/src/mindustry/world/blocks/power/PowerGraph.java b/core/src/mindustry/world/blocks/power/PowerGraph.java index 2d5a4d2918..fdb19dc05c 100644 --- a/core/src/mindustry/world/blocks/power/PowerGraph.java +++ b/core/src/mindustry/world/blocks/power/PowerGraph.java @@ -19,7 +19,7 @@ public class PowerGraph{ private final ObjectSet all = new ObjectSet<>(); private final WindowedMean powerBalance = new WindowedMean(60); - private float lastPowerProduced, lastPowerNeeded, lastUsageFraction, lastPowerStored; + private float lastPowerProduced, lastPowerNeeded, lastPowerStored; private float lastScaledPowerIn, lastScaledPowerOut, lastCapacity; private long lastFrameUpdated = -1; @@ -201,7 +201,7 @@ public class PowerGraph{ tile.power.status = 1f; } - lastPowerNeeded = lastPowerProduced = lastUsageFraction = 1f; + lastPowerNeeded = lastPowerProduced = 1f; return; } @@ -236,12 +236,6 @@ public class PowerGraph{ distributePower(powerNeeded, powerProduced); } - - //overproducing: 10 / 20 = 0.5 - //underproducing: 20 / 10 = 2 -> clamp -> 1.0 - //nothing being produced: 20 / 0 -> 1.0 - //nothing being consumed: 0 / 20 -> 0.0 - lastUsageFraction = Mathf.zero(rawProduced) ? 1f : Mathf.clamp(powerNeeded / rawProduced); } public void addGraph(PowerGraph graph){ diff --git a/core/src/mindustry/world/blocks/power/PowerNode.java b/core/src/mindustry/world/blocks/power/PowerNode.java index 5d4431afef..245c3d4f7e 100644 --- a/core/src/mindustry/world/blocks/power/PowerNode.java +++ b/core/src/mindustry/world/blocks/power/PowerNode.java @@ -7,7 +7,6 @@ import arc.graphics.g2d.*; import arc.math.*; import arc.math.geom.*; import arc.struct.*; -import arc.util.ArcAnnotate.*; import arc.util.*; import mindustry.annotations.Annotations.*; import mindustry.core.*; diff --git a/core/src/mindustry/world/blocks/power/SingleTypeGenerator.java b/core/src/mindustry/world/blocks/power/SingleTypeGenerator.java index 22a668160e..ff5da52aaa 100644 --- a/core/src/mindustry/world/blocks/power/SingleTypeGenerator.java +++ b/core/src/mindustry/world/blocks/power/SingleTypeGenerator.java @@ -1,7 +1,6 @@ package mindustry.world.blocks.power; -import mindustry.type.Item; -import mindustry.type.Liquid; +import mindustry.type.*; public class SingleTypeGenerator extends ItemLiquidGenerator{ diff --git a/core/src/mindustry/world/blocks/production/Cultivator.java b/core/src/mindustry/world/blocks/production/Cultivator.java index f9341f3c35..2dc97d82f6 100644 --- a/core/src/mindustry/world/blocks/production/Cultivator.java +++ b/core/src/mindustry/world/blocks/production/Cultivator.java @@ -70,9 +70,7 @@ public class Cultivator extends GenericCrafter{ public void draw(){ Draw.rect(region, x, y); - Draw.color(plantColor); - Draw.alpha(warmup); - Draw.rect(middleRegion, x, y); + Drawf.liquid(middleRegion, x, y, warmup, plantColor); Draw.color(bottomColor, plantColorLight, warmup); diff --git a/core/src/mindustry/world/blocks/production/Fracker.java b/core/src/mindustry/world/blocks/production/Fracker.java index 0c6591c3d0..d894cf05b5 100644 --- a/core/src/mindustry/world/blocks/production/Fracker.java +++ b/core/src/mindustry/world/blocks/production/Fracker.java @@ -2,6 +2,7 @@ package mindustry.world.blocks.production; import arc.graphics.g2d.*; import mindustry.annotations.Annotations.*; +import mindustry.graphics.*; import mindustry.world.meta.*; public class Fracker extends SolidPump{ @@ -44,10 +45,7 @@ public class Fracker extends SolidPump{ Draw.rect(region, x, y); super.drawCracks(); - Draw.color(result.color); - Draw.alpha(liquids.get(result) / liquidCapacity); - Draw.rect(liquidRegion, x, y); - Draw.color(); + Drawf.liquid(liquidRegion, x, y, liquids.total() / liquidCapacity, result.color); Draw.rect(rotatorRegion, x, y, pumpTime); Draw.rect(topRegion, x, y); diff --git a/core/src/mindustry/world/blocks/production/Incinerator.java b/core/src/mindustry/world/blocks/production/Incinerator.java index 1e16aa4faa..d51caf06c2 100644 --- a/core/src/mindustry/world/blocks/production/Incinerator.java +++ b/core/src/mindustry/world/blocks/production/Incinerator.java @@ -73,7 +73,7 @@ public class Incinerator extends Block{ } @Override - public boolean acceptLiquid(Building source, Liquid liquid, float amount){ + public boolean acceptLiquid(Building source, Liquid liquid){ return heat > 0.5f; } } diff --git a/core/src/mindustry/world/blocks/production/PayloadAcceptor.java b/core/src/mindustry/world/blocks/production/PayloadAcceptor.java index e7456f0287..75cfde865f 100644 --- a/core/src/mindustry/world/blocks/production/PayloadAcceptor.java +++ b/core/src/mindustry/world/blocks/production/PayloadAcceptor.java @@ -3,7 +3,7 @@ package mindustry.world.blocks.production; import arc.graphics.g2d.*; import arc.math.*; import arc.math.geom.*; -import arc.util.ArcAnnotate.*; +import arc.util.*; import arc.util.io.*; import mindustry.annotations.Annotations.*; import mindustry.gen.*; @@ -11,7 +11,7 @@ import mindustry.graphics.*; import mindustry.world.*; import mindustry.world.blocks.payloads.*; -import static mindustry.Vars.tilesize; +import static mindustry.Vars.*; public class PayloadAcceptor extends Block{ public float payloadSpeed = 0.5f; diff --git a/core/src/mindustry/world/blocks/production/Pump.java b/core/src/mindustry/world/blocks/production/Pump.java index ac138fc620..fa2f67999f 100644 --- a/core/src/mindustry/world/blocks/production/Pump.java +++ b/core/src/mindustry/world/blocks/production/Pump.java @@ -4,6 +4,7 @@ import arc.*; import arc.graphics.*; import arc.graphics.g2d.*; import mindustry.game.*; +import mindustry.graphics.*; import mindustry.type.*; import mindustry.ui.*; import mindustry.world.*; @@ -85,10 +86,7 @@ public class Pump extends LiquidBlock{ public void draw(){ Draw.rect(name, x, y); - Draw.color(liquids.current().color); - Draw.alpha(liquids.total() / liquidCapacity); - Draw.rect(liquidRegion, x, y); - Draw.color(); + Drawf.liquid(liquidRegion, x, y, liquids.total() / liquidCapacity, liquids.current().color); } @Override diff --git a/core/src/mindustry/world/blocks/production/Separator.java b/core/src/mindustry/world/blocks/production/Separator.java index 394e0bae5b..bcf66984e3 100644 --- a/core/src/mindustry/world/blocks/production/Separator.java +++ b/core/src/mindustry/world/blocks/production/Separator.java @@ -3,10 +3,10 @@ package mindustry.world.blocks.production; import arc.*; import arc.graphics.g2d.*; import arc.math.*; -import arc.util.ArcAnnotate.*; import arc.util.io.*; import mindustry.annotations.Annotations.*; import mindustry.gen.*; +import mindustry.graphics.*; import mindustry.type.*; import mindustry.world.*; import mindustry.world.consumers.*; @@ -17,7 +17,7 @@ import mindustry.world.meta.values.*; * Extracts a random list of items from an input item and an input liquid. */ public class Separator extends Block{ - public @NonNull ItemStack[] results; + public ItemStack[] results; public float craftTime; public @Load("@-liquid") TextureRegion liquidRegion; @@ -78,11 +78,8 @@ public class Separator extends Block{ public void draw(){ super.draw(); - Draw.color(liquids.current().color); - Draw.alpha(liquids.total() / liquidCapacity); - Draw.rect(liquidRegion, x, y); + Drawf.liquid(liquidRegion, x, y, liquids.total() / liquidCapacity, liquids.current().color); - Draw.reset(); if(Core.atlas.isFound(spinnerRegion)){ Draw.rect(spinnerRegion, x, y, totalProgress * spinnerSpeed); } @@ -108,7 +105,7 @@ public class Separator extends Block{ int count = 0; Item item = null; - //TODO guaranteed desync since items are random + //guaranteed desync since items are random - won't be fixed and probably isn't too important for(ItemStack stack : results){ if(i >= count && i < count + stack.amount){ item = stack.item; diff --git a/core/src/mindustry/world/blocks/production/SolidPump.java b/core/src/mindustry/world/blocks/production/SolidPump.java index ebd0f2d20e..3b29665fde 100644 --- a/core/src/mindustry/world/blocks/production/SolidPump.java +++ b/core/src/mindustry/world/blocks/production/SolidPump.java @@ -3,7 +3,6 @@ package mindustry.world.blocks.production; import arc.*; import arc.graphics.g2d.*; import arc.math.*; -import arc.util.ArcAnnotate.*; import arc.util.*; import mindustry.annotations.Annotations.*; import mindustry.content.*; @@ -87,10 +86,7 @@ public class SolidPump extends Pump{ @Override public void draw(){ Draw.rect(region, x, y); - Draw.color(liquids.current().color); - Draw.alpha(liquids.total() / liquidCapacity); - Draw.rect(liquidRegion, x, y); - Draw.color(); + Drawf.liquid(liquidRegion, x, y, liquids.total() / liquidCapacity, liquids.current().color); Draw.rect(rotatorRegion, x, y, pumpTime * rotateSpeed); Draw.rect(topRegion, x, y); } diff --git a/core/src/mindustry/world/blocks/sandbox/LiquidSource.java b/core/src/mindustry/world/blocks/sandbox/LiquidSource.java index f2e57156f6..d3a89433aa 100644 --- a/core/src/mindustry/world/blocks/sandbox/LiquidSource.java +++ b/core/src/mindustry/world/blocks/sandbox/LiquidSource.java @@ -2,7 +2,6 @@ package mindustry.world.blocks.sandbox; import arc.graphics.g2d.*; import arc.scene.ui.layout.*; -import arc.util.ArcAnnotate.*; import arc.util.*; import arc.util.io.*; import mindustry.entities.units.*; @@ -11,7 +10,7 @@ import mindustry.type.*; import mindustry.world.*; import mindustry.world.blocks.*; -import static mindustry.Vars.content; +import static mindustry.Vars.*; public class LiquidSource extends Block{ diff --git a/core/src/mindustry/world/blocks/sandbox/LiquidVoid.java b/core/src/mindustry/world/blocks/sandbox/LiquidVoid.java index 0f49ffd3a7..3eeb628db8 100644 --- a/core/src/mindustry/world/blocks/sandbox/LiquidVoid.java +++ b/core/src/mindustry/world/blocks/sandbox/LiquidVoid.java @@ -21,7 +21,7 @@ public class LiquidVoid extends Block{ public class LiquidVoidBuild extends Building{ @Override - public boolean acceptLiquid(Building source, Liquid liquid, float amount){ + public boolean acceptLiquid(Building source, Liquid liquid){ return enabled; } diff --git a/core/src/mindustry/world/blocks/sandbox/PowerVoid.java b/core/src/mindustry/world/blocks/sandbox/PowerVoid.java index 067f6335e5..c423ba6caf 100644 --- a/core/src/mindustry/world/blocks/sandbox/PowerVoid.java +++ b/core/src/mindustry/world/blocks/sandbox/PowerVoid.java @@ -1,7 +1,7 @@ package mindustry.world.blocks.sandbox; -import mindustry.world.blocks.power.PowerBlock; -import mindustry.world.meta.BlockStat; +import mindustry.world.blocks.power.*; +import mindustry.world.meta.*; public class PowerVoid extends PowerBlock{ diff --git a/core/src/mindustry/world/blocks/storage/CoreBlock.java b/core/src/mindustry/world/blocks/storage/CoreBlock.java index 720a32dc6f..372042b5bc 100644 --- a/core/src/mindustry/world/blocks/storage/CoreBlock.java +++ b/core/src/mindustry/world/blocks/storage/CoreBlock.java @@ -6,7 +6,6 @@ import arc.graphics.g2d.*; import arc.math.*; import arc.math.geom.*; import arc.struct.*; -import arc.util.ArcAnnotate.*; import mindustry.annotations.Annotations.*; import mindustry.content.*; import mindustry.core.*; @@ -76,6 +75,8 @@ public class CoreBlock extends StorageBlock{ public void setStats(){ super.setStats(); + stats.add(BlockStat.buildTime, 0, StatUnit.seconds); + bars.add("capacity", (CoreBuild e) -> new Bar( () -> Core.bundle.format("bar.capacity", UI.formatAmount(e.storageCapacity)), @@ -154,7 +155,7 @@ public class CoreBlock extends StorageBlock{ public class CoreBuild extends Building implements ControlBlock{ public int storageCapacity; //note that this unit is never actually used for control; the possession handler makes the player respawn when this unit is controlled - public @NonNull BlockUnitc unit = Nulls.blockUnit; + public BlockUnitc unit = Nulls.blockUnit; @Override public void created(){ diff --git a/core/src/mindustry/world/blocks/storage/StorageBlock.java b/core/src/mindustry/world/blocks/storage/StorageBlock.java index 0aca99a0b6..6b022bf2f6 100644 --- a/core/src/mindustry/world/blocks/storage/StorageBlock.java +++ b/core/src/mindustry/world/blocks/storage/StorageBlock.java @@ -1,6 +1,7 @@ package mindustry.world.blocks.storage; -import arc.util.ArcAnnotate.*; +import arc.struct.*; +import arc.util.*; import mindustry.gen.*; import mindustry.type.*; import mindustry.world.*; @@ -40,6 +41,18 @@ public abstract class StorageBlock extends Block{ } } + @Override + public void overwrote(Seq previous){ + for(Building other : previous){ + if(other.items != null){ + items.addAll(other.items); + } + } + + //ensure item counts are not too high + items.each((i, a) -> items.set(i, Math.min(a, itemCapacity))); + } + @Override public boolean canPickup(){ return linkedCore == null; diff --git a/core/src/mindustry/world/blocks/units/CommandCenter.java b/core/src/mindustry/world/blocks/units/CommandCenter.java index cbad080647..a8ffa3c3e9 100644 --- a/core/src/mindustry/world/blocks/units/CommandCenter.java +++ b/core/src/mindustry/world/blocks/units/CommandCenter.java @@ -13,7 +13,6 @@ import mindustry.content.*; import mindustry.entities.*; import mindustry.entities.units.*; import mindustry.gen.*; -import mindustry.graphics.*; import mindustry.ui.*; import mindustry.world.*; import mindustry.world.meta.*; diff --git a/core/src/mindustry/world/blocks/units/RepairPoint.java b/core/src/mindustry/world/blocks/units/RepairPoint.java index 6100e5c61f..abcc4bf738 100644 --- a/core/src/mindustry/world/blocks/units/RepairPoint.java +++ b/core/src/mindustry/world/blocks/units/RepairPoint.java @@ -6,7 +6,6 @@ import arc.math.*; import arc.math.geom.*; import arc.struct.*; import arc.util.*; -import mindustry.*; import mindustry.annotations.Annotations.*; import mindustry.entities.*; import mindustry.gen.*; @@ -71,7 +70,7 @@ public class RepairPoint extends Block{ Draw.rect(baseRegion, x, y); Draw.z(Layer.turret); - Drawf.shadow(region, x - (size / 2), y - (size / 2), rotation - 90); + Drawf.shadow(region, x - (size / 2f), y - (size / 2f), rotation - 90); Draw.rect(region, x, y, rotation - 90); if(target != null && Angles.angleDist(angleTo(target), rotation) < 30f){ diff --git a/core/src/mindustry/world/blocks/units/ResupplyPoint.java b/core/src/mindustry/world/blocks/units/ResupplyPoint.java index 2af0998421..c6d5e0aa18 100644 --- a/core/src/mindustry/world/blocks/units/ResupplyPoint.java +++ b/core/src/mindustry/world/blocks/units/ResupplyPoint.java @@ -1,8 +1,10 @@ package mindustry.world.blocks.units; +import arc.func.*; import arc.graphics.*; import mindustry.content.*; import mindustry.entities.*; +import mindustry.game.*; import mindustry.gen.*; import mindustry.graphics.*; import mindustry.type.AmmoTypes.*; @@ -51,12 +53,18 @@ public class ResupplyPoint extends Block{ /** Tries to resupply nearby units. * @return whether resupplying was successful. If unit ammo is disabled, always returns false. */ - public static boolean resupply(Building tile, float range, int ammoAmount, Color ammoColor){ + public static boolean resupply(Building tile, float range, float ammoAmount, Color ammoColor){ + return resupply(tile.team, tile.x, tile.y, range, ammoAmount, ammoColor, u -> true); + } + + /** Tries to resupply nearby units. + * @return whether resupplying was successful. If unit ammo is disabled, always returns false. */ + public static boolean resupply(Team team, float x, float y, float range, float ammoAmount, Color ammoColor, Boolf valid){ if(!state.rules.unitAmmo) return false; - Unit unit = Units.closest(tile.team, tile.x, tile.y, range, u -> u.type().ammoType instanceof ItemAmmoType && u.ammo <= u.type().ammoCapacity - ammoAmount); + Unit unit = Units.closest(team, x, y, range, u -> u.type().ammoType instanceof ItemAmmoType && u.ammo <= u.type().ammoCapacity - ammoAmount && valid.get(u)); if(unit != null){ - Fx.itemTransfer.at(tile.x, tile.y, ammoAmount / 2f, ammoColor, unit); + Fx.itemTransfer.at(x, y, ammoAmount / 2f, ammoColor, unit); unit.ammo = Math.min(unit.ammo + ammoAmount, unit.type().ammoCapacity); return true; } diff --git a/core/src/mindustry/world/blocks/units/UnitFactory.java b/core/src/mindustry/world/blocks/units/UnitFactory.java index 1e71caa8cb..9b96b6f084 100644 --- a/core/src/mindustry/world/blocks/units/UnitFactory.java +++ b/core/src/mindustry/world/blocks/units/UnitFactory.java @@ -8,7 +8,6 @@ import arc.scene.style.*; import arc.scene.ui.layout.*; import arc.struct.*; import arc.util.*; -import arc.util.ArcAnnotate.*; import arc.util.io.*; import mindustry.*; import mindustry.entities.*; diff --git a/core/src/mindustry/world/consumers/Consume.java b/core/src/mindustry/world/consumers/Consume.java index 7e0f686018..410d041a03 100644 --- a/core/src/mindustry/world/consumers/Consume.java +++ b/core/src/mindustry/world/consumers/Consume.java @@ -1,9 +1,9 @@ package mindustry.world.consumers; +import arc.scene.ui.layout.*; import arc.struct.*; -import arc.scene.ui.layout.Table; import mindustry.gen.*; -import mindustry.world.meta.BlockStats; +import mindustry.world.meta.*; /** An abstract class that defines a type of resource that a block can consume. */ public abstract class Consume{ diff --git a/core/src/mindustry/world/consumers/ConsumeItemDynamic.java b/core/src/mindustry/world/consumers/ConsumeItemDynamic.java index 5f3a13609a..a2dd079c20 100644 --- a/core/src/mindustry/world/consumers/ConsumeItemDynamic.java +++ b/core/src/mindustry/world/consumers/ConsumeItemDynamic.java @@ -3,14 +3,13 @@ package mindustry.world.consumers; import arc.func.*; import arc.scene.ui.layout.*; import arc.struct.*; -import arc.util.ArcAnnotate.*; import mindustry.gen.*; import mindustry.type.*; import mindustry.ui.*; import mindustry.world.meta.*; public class ConsumeItemDynamic extends Consume{ - public final @NonNull Func items; + public final Func items; public ConsumeItemDynamic(Func items){ this.items = (Func)items; diff --git a/core/src/mindustry/world/consumers/ConsumeItemFilter.java b/core/src/mindustry/world/consumers/ConsumeItemFilter.java index a8b3cf1292..e9e98041c4 100644 --- a/core/src/mindustry/world/consumers/ConsumeItemFilter.java +++ b/core/src/mindustry/world/consumers/ConsumeItemFilter.java @@ -1,9 +1,8 @@ package mindustry.world.consumers; -import arc.struct.*; import arc.func.*; import arc.scene.ui.layout.*; -import arc.util.ArcAnnotate.*; +import arc.struct.*; import mindustry.gen.*; import mindustry.type.*; import mindustry.ui.*; @@ -13,8 +12,7 @@ import mindustry.world.meta.values.*; import static mindustry.Vars.*; public class ConsumeItemFilter extends Consume{ - public final @NonNull - Boolf filter; + public final Boolf filter; public ConsumeItemFilter(Boolf item){ this.filter = item; diff --git a/core/src/mindustry/world/consumers/ConsumeItems.java b/core/src/mindustry/world/consumers/ConsumeItems.java index 0fd0cdf26c..01909e2a14 100644 --- a/core/src/mindustry/world/consumers/ConsumeItems.java +++ b/core/src/mindustry/world/consumers/ConsumeItems.java @@ -2,7 +2,6 @@ package mindustry.world.consumers; import arc.scene.ui.layout.*; import arc.struct.*; -import arc.util.ArcAnnotate.*; import mindustry.gen.*; import mindustry.type.*; import mindustry.ui.*; @@ -10,7 +9,7 @@ import mindustry.world.meta.*; import mindustry.world.meta.values.*; public class ConsumeItems extends Consume{ - public final @NonNull ItemStack[] items; + public final ItemStack[] items; public ConsumeItems(ItemStack[] items){ this.items = items; diff --git a/core/src/mindustry/world/consumers/ConsumeLiquid.java b/core/src/mindustry/world/consumers/ConsumeLiquid.java index ae9998db12..90f3bf0687 100644 --- a/core/src/mindustry/world/consumers/ConsumeLiquid.java +++ b/core/src/mindustry/world/consumers/ConsumeLiquid.java @@ -1,15 +1,14 @@ package mindustry.world.consumers; -import arc.struct.*; import arc.scene.ui.layout.*; -import arc.util.ArcAnnotate.*; +import arc.struct.*; import mindustry.gen.*; import mindustry.type.*; import mindustry.ui.*; import mindustry.world.meta.*; public class ConsumeLiquid extends ConsumeLiquidBase{ - public final @NonNull Liquid liquid; + public final Liquid liquid; public ConsumeLiquid(Liquid liquid, float amount){ super(amount); diff --git a/core/src/mindustry/world/consumers/ConsumeLiquidBase.java b/core/src/mindustry/world/consumers/ConsumeLiquidBase.java index f2cae7676e..47b1eb8834 100644 --- a/core/src/mindustry/world/consumers/ConsumeLiquidBase.java +++ b/core/src/mindustry/world/consumers/ConsumeLiquidBase.java @@ -23,6 +23,6 @@ public abstract class ConsumeLiquidBase extends Consume{ } protected float use(Building entity){ - return Math.min(amount * entity.delta(), entity.block.liquidCapacity); + return Math.min(amount * entity.edelta(), entity.block.liquidCapacity); } } diff --git a/core/src/mindustry/world/consumers/ConsumeLiquidFilter.java b/core/src/mindustry/world/consumers/ConsumeLiquidFilter.java index ca57bfa816..962023488b 100644 --- a/core/src/mindustry/world/consumers/ConsumeLiquidFilter.java +++ b/core/src/mindustry/world/consumers/ConsumeLiquidFilter.java @@ -1,18 +1,15 @@ package mindustry.world.consumers; +import arc.func.*; +import arc.scene.ui.layout.*; import arc.struct.*; -import arc.func.Boolf; -import arc.scene.ui.layout.Table; import mindustry.gen.*; -import mindustry.type.Liquid; -import mindustry.ui.Cicon; -import mindustry.ui.MultiReqImage; -import mindustry.ui.ReqImage; -import mindustry.world.meta.BlockStat; -import mindustry.world.meta.BlockStats; -import mindustry.world.meta.values.LiquidFilterValue; +import mindustry.type.*; +import mindustry.ui.*; +import mindustry.world.meta.*; +import mindustry.world.meta.values.*; -import static mindustry.Vars.content; +import static mindustry.Vars.*; public class ConsumeLiquidFilter extends ConsumeLiquidBase{ public final Boolf filter; diff --git a/core/src/mindustry/world/consumers/ConsumePower.java b/core/src/mindustry/world/consumers/ConsumePower.java index 557c88469c..2dc55dbb11 100644 --- a/core/src/mindustry/world/consumers/ConsumePower.java +++ b/core/src/mindustry/world/consumers/ConsumePower.java @@ -1,7 +1,7 @@ package mindustry.world.consumers; -import arc.math.Mathf; -import arc.scene.ui.layout.Table; +import arc.math.*; +import arc.scene.ui.layout.*; import mindustry.gen.*; import mindustry.world.meta.*; diff --git a/core/src/mindustry/world/consumers/Consumers.java b/core/src/mindustry/world/consumers/Consumers.java index 8683c6d158..4ce410aa04 100644 --- a/core/src/mindustry/world/consumers/Consumers.java +++ b/core/src/mindustry/world/consumers/Consumers.java @@ -1,13 +1,13 @@ package mindustry.world.consumers; +import arc.func.*; import arc.struct.*; -import arc.func.Boolf; -import arc.util.Structs; -import mindustry.Vars; +import arc.util.*; +import mindustry.*; import mindustry.gen.*; import mindustry.type.*; -import mindustry.world.blocks.power.ConditionalConsumePower; -import mindustry.world.meta.BlockStats; +import mindustry.world.blocks.power.*; +import mindustry.world.meta.*; public class Consumers{ private Consume[] map = new Consume[ConsumeType.values().length]; diff --git a/core/src/mindustry/world/meta/BlockBars.java b/core/src/mindustry/world/meta/BlockBars.java index d96202ad1d..acc6cbd100 100644 --- a/core/src/mindustry/world/meta/BlockBars.java +++ b/core/src/mindustry/world/meta/BlockBars.java @@ -1,9 +1,9 @@ package mindustry.world.meta; -import arc.struct.OrderedMap; -import arc.func.Func; +import arc.func.*; +import arc.struct.*; import mindustry.gen.*; -import mindustry.ui.Bar; +import mindustry.ui.*; public class BlockBars{ private OrderedMap> bars = new OrderedMap<>(); diff --git a/core/src/mindustry/world/meta/BlockGroup.java b/core/src/mindustry/world/meta/BlockGroup.java index 24e8166990..2b3434ccfb 100644 --- a/core/src/mindustry/world/meta/BlockGroup.java +++ b/core/src/mindustry/world/meta/BlockGroup.java @@ -1,5 +1,5 @@ package mindustry.world.meta; public enum BlockGroup{ - none, walls, turrets, transportation, power, liquids, drills + none, walls, turrets, transportation, power, liquids, drills, storage } diff --git a/core/src/mindustry/world/meta/BlockStat.java b/core/src/mindustry/world/meta/BlockStat.java index 720f4c3d8e..05e45acbfe 100644 --- a/core/src/mindustry/world/meta/BlockStat.java +++ b/core/src/mindustry/world/meta/BlockStat.java @@ -1,8 +1,8 @@ package mindustry.world.meta; -import arc.Core; +import arc.*; -import java.util.Locale; +import java.util.*; /** Describes one type of stat for a block. */ public enum BlockStat{ diff --git a/core/src/mindustry/world/meta/BlockStats.java b/core/src/mindustry/world/meta/BlockStats.java index e119ff8a74..ff93a217a9 100644 --- a/core/src/mindustry/world/meta/BlockStats.java +++ b/core/src/mindustry/world/meta/BlockStats.java @@ -1,7 +1,7 @@ package mindustry.world.meta; -import arc.struct.*; import arc.struct.ObjectMap.*; +import arc.struct.*; import mindustry.*; import mindustry.type.*; import mindustry.world.*; diff --git a/core/src/mindustry/world/meta/StatCategory.java b/core/src/mindustry/world/meta/StatCategory.java index 5f244674a4..e6c91b04bb 100644 --- a/core/src/mindustry/world/meta/StatCategory.java +++ b/core/src/mindustry/world/meta/StatCategory.java @@ -1,6 +1,6 @@ package mindustry.world.meta; -import arc.Core; +import arc.*; /** A specific category for a stat. */ public enum StatCategory{ diff --git a/core/src/mindustry/world/meta/StatUnit.java b/core/src/mindustry/world/meta/StatUnit.java index 0466b4f139..42825f0379 100644 --- a/core/src/mindustry/world/meta/StatUnit.java +++ b/core/src/mindustry/world/meta/StatUnit.java @@ -1,8 +1,8 @@ package mindustry.world.meta; -import arc.Core; +import arc.*; -import java.util.Locale; +import java.util.*; /** * Defines a unit of measurement for block stats. diff --git a/core/src/mindustry/world/meta/StatValue.java b/core/src/mindustry/world/meta/StatValue.java index 1a978b71e9..db8efaacb6 100644 --- a/core/src/mindustry/world/meta/StatValue.java +++ b/core/src/mindustry/world/meta/StatValue.java @@ -1,6 +1,6 @@ package mindustry.world.meta; -import arc.scene.ui.layout.Table; +import arc.scene.ui.layout.*; /** * A base interface for a value of a stat that is displayed. diff --git a/core/src/mindustry/world/meta/values/AmmoListValue.java b/core/src/mindustry/world/meta/values/AmmoListValue.java index 6b02493348..d0d8624ea9 100644 --- a/core/src/mindustry/world/meta/values/AmmoListValue.java +++ b/core/src/mindustry/world/meta/values/AmmoListValue.java @@ -1,19 +1,19 @@ package mindustry.world.meta.values; import arc.*; -import arc.struct.*; import arc.graphics.g2d.*; import arc.math.*; import arc.scene.ui.layout.*; +import arc.struct.*; import arc.util.*; import mindustry.content.*; -import mindustry.ctype.UnlockableContent; +import mindustry.ctype.*; import mindustry.entities.bullet.*; import mindustry.gen.*; -import mindustry.ui.Cicon; +import mindustry.ui.*; import mindustry.world.meta.*; -import static mindustry.Vars.tilesize; +import static mindustry.Vars.*; public class AmmoListValue implements StatValue{ private final ObjectMap map; @@ -33,7 +33,7 @@ public class AmmoListValue implements StatValue{ table.table(Tex.underline, bt -> { bt.left().defaults().padRight(3).left(); - if(type.damage > 0 && type.collides){ + if(type.damage > 0 && (type.collides || type.splashDamage <= 0)){ bt.add(Core.bundle.format("bullet.damage", type.damage)); } diff --git a/core/src/mindustry/world/meta/values/BooleanValue.java b/core/src/mindustry/world/meta/values/BooleanValue.java index d0fe3518ce..c1da598008 100644 --- a/core/src/mindustry/world/meta/values/BooleanValue.java +++ b/core/src/mindustry/world/meta/values/BooleanValue.java @@ -1,7 +1,7 @@ package mindustry.world.meta.values; -import arc.scene.ui.layout.Table; -import mindustry.world.meta.StatValue; +import arc.scene.ui.layout.*; +import mindustry.world.meta.*; public class BooleanValue implements StatValue{ private final boolean value; diff --git a/core/src/mindustry/world/meta/values/BoosterListValue.java b/core/src/mindustry/world/meta/values/BoosterListValue.java index 54fac60f03..8d3315adaa 100644 --- a/core/src/mindustry/world/meta/values/BoosterListValue.java +++ b/core/src/mindustry/world/meta/values/BoosterListValue.java @@ -6,10 +6,10 @@ import arc.scene.ui.layout.*; import arc.util.*; import mindustry.gen.*; import mindustry.type.*; -import mindustry.ui.Cicon; +import mindustry.ui.*; import mindustry.world.meta.*; -import static mindustry.Vars.content; +import static mindustry.Vars.*; public class BoosterListValue implements StatValue{ protected float reload, maxUsed, multiplier; diff --git a/core/src/mindustry/world/meta/values/ItemFilterValue.java b/core/src/mindustry/world/meta/values/ItemFilterValue.java index 8f9420ff95..78db854658 100644 --- a/core/src/mindustry/world/meta/values/ItemFilterValue.java +++ b/core/src/mindustry/world/meta/values/ItemFilterValue.java @@ -1,13 +1,13 @@ package mindustry.world.meta.values; -import arc.struct.Seq; -import arc.func.Boolf; -import arc.scene.ui.layout.Table; -import mindustry.type.Item; -import mindustry.ui.ItemDisplay; -import mindustry.world.meta.StatValue; +import arc.func.*; +import arc.scene.ui.layout.*; +import arc.struct.*; +import mindustry.type.*; +import mindustry.ui.*; +import mindustry.world.meta.*; -import static mindustry.Vars.content; +import static mindustry.Vars.*; public class ItemFilterValue implements StatValue{ private final Boolf filter; diff --git a/core/src/mindustry/world/meta/values/ItemListValue.java b/core/src/mindustry/world/meta/values/ItemListValue.java index f6e1acc654..164b6a2a3c 100644 --- a/core/src/mindustry/world/meta/values/ItemListValue.java +++ b/core/src/mindustry/world/meta/values/ItemListValue.java @@ -1,9 +1,9 @@ package mindustry.world.meta.values; -import arc.scene.ui.layout.Table; -import mindustry.type.ItemStack; -import mindustry.ui.ItemDisplay; -import mindustry.world.meta.StatValue; +import arc.scene.ui.layout.*; +import mindustry.type.*; +import mindustry.ui.*; +import mindustry.world.meta.*; public class ItemListValue implements StatValue{ private final ItemStack[] stacks; diff --git a/core/src/mindustry/world/meta/values/LiquidFilterValue.java b/core/src/mindustry/world/meta/values/LiquidFilterValue.java index a88a912981..d5aef23376 100644 --- a/core/src/mindustry/world/meta/values/LiquidFilterValue.java +++ b/core/src/mindustry/world/meta/values/LiquidFilterValue.java @@ -1,13 +1,13 @@ package mindustry.world.meta.values; -import arc.struct.Seq; -import arc.func.Boolf; -import arc.scene.ui.layout.Table; -import mindustry.type.Liquid; -import mindustry.ui.LiquidDisplay; -import mindustry.world.meta.StatValue; +import arc.func.*; +import arc.scene.ui.layout.*; +import arc.struct.*; +import mindustry.type.*; +import mindustry.ui.*; +import mindustry.world.meta.*; -import static mindustry.Vars.content; +import static mindustry.Vars.*; public class LiquidFilterValue implements StatValue{ private final Boolf filter; diff --git a/core/src/mindustry/world/meta/values/LiquidValue.java b/core/src/mindustry/world/meta/values/LiquidValue.java index f6782da6ae..6139aed5ce 100644 --- a/core/src/mindustry/world/meta/values/LiquidValue.java +++ b/core/src/mindustry/world/meta/values/LiquidValue.java @@ -1,9 +1,9 @@ package mindustry.world.meta.values; -import arc.scene.ui.layout.Table; -import mindustry.type.Liquid; -import mindustry.ui.LiquidDisplay; -import mindustry.world.meta.StatValue; +import arc.scene.ui.layout.*; +import mindustry.type.*; +import mindustry.ui.*; +import mindustry.world.meta.*; public class LiquidValue implements StatValue{ private final Liquid liquid; diff --git a/core/src/mindustry/world/meta/values/NumberValue.java b/core/src/mindustry/world/meta/values/NumberValue.java index fd10d28f1d..fa815f4d49 100644 --- a/core/src/mindustry/world/meta/values/NumberValue.java +++ b/core/src/mindustry/world/meta/values/NumberValue.java @@ -1,9 +1,8 @@ package mindustry.world.meta.values; -import arc.scene.ui.layout.Table; -import arc.util.Strings; -import mindustry.world.meta.StatUnit; -import mindustry.world.meta.StatValue; +import arc.scene.ui.layout.*; +import arc.util.*; +import mindustry.world.meta.*; /** * A stat that is a number with a unit attacked. diff --git a/core/src/mindustry/world/meta/values/StringValue.java b/core/src/mindustry/world/meta/values/StringValue.java index 4bc102a8d4..b36a9d47e4 100644 --- a/core/src/mindustry/world/meta/values/StringValue.java +++ b/core/src/mindustry/world/meta/values/StringValue.java @@ -1,8 +1,8 @@ package mindustry.world.meta.values; -import arc.scene.ui.layout.Table; -import arc.util.Strings; -import mindustry.world.meta.StatValue; +import arc.scene.ui.layout.*; +import arc.util.*; +import mindustry.world.meta.*; public class StringValue implements StatValue{ private final String value; diff --git a/core/src/mindustry/world/modules/ItemModule.java b/core/src/mindustry/world/modules/ItemModule.java index 7b3e4033ea..16d49484f0 100644 --- a/core/src/mindustry/world/modules/ItemModule.java +++ b/core/src/mindustry/world/modules/ItemModule.java @@ -2,14 +2,13 @@ package mindustry.world.modules; import arc.math.*; import arc.struct.*; -import arc.util.ArcAnnotate.*; import arc.util.*; import arc.util.io.*; import mindustry.type.*; import java.util.*; -import static mindustry.Vars.content; +import static mindustry.Vars.*; public class ItemModule extends BlockModule{ public static final ItemModule empty = new ItemModule(); @@ -180,6 +179,7 @@ public class ItemModule extends BlockModule{ return total > 0; } + @Nullable public Item first(){ for(int i = 0; i < items.length; i++){ if(items[i] > 0){ @@ -189,6 +189,7 @@ public class ItemModule extends BlockModule{ return null; } + @Nullable public Item take(){ for(int i = 0; i < items.length; i++){ int index = (i + takeRotation); @@ -204,6 +205,7 @@ public class ItemModule extends BlockModule{ } /** Begins a speculative take operation. This returns the item that would be returned by #take(), but does not change state. */ + @Nullable public Item beginTake(){ for(int i = 0; i < items.length; i++){ int index = (i + takeRotation); diff --git a/core/src/mindustry/world/modules/LiquidModule.java b/core/src/mindustry/world/modules/LiquidModule.java index 95dfc2f621..5713129506 100644 --- a/core/src/mindustry/world/modules/LiquidModule.java +++ b/core/src/mindustry/world/modules/LiquidModule.java @@ -2,13 +2,12 @@ package mindustry.world.modules; import arc.math.*; import arc.util.*; -import arc.util.ArcAnnotate.*; import arc.util.io.*; import mindustry.type.*; import java.util.*; -import static mindustry.Vars.content; +import static mindustry.Vars.*; public class LiquidModule extends BlockModule{ private static final int windowSize = 3, updateInterval = 60; diff --git a/core/src/mindustry/world/modules/PowerModule.java b/core/src/mindustry/world/modules/PowerModule.java index 6f05f94304..c93a7d845f 100644 --- a/core/src/mindustry/world/modules/PowerModule.java +++ b/core/src/mindustry/world/modules/PowerModule.java @@ -1,8 +1,8 @@ package mindustry.world.modules; -import arc.struct.IntSeq; +import arc.struct.*; import arc.util.io.*; -import mindustry.world.blocks.power.PowerGraph; +import mindustry.world.blocks.power.*; public class PowerModule extends BlockModule{ /** diff --git a/core/src/mindustry/world/producers/Produce.java b/core/src/mindustry/world/producers/Produce.java deleted file mode 100644 index 478e9f35d9..0000000000 --- a/core/src/mindustry/world/producers/Produce.java +++ /dev/null @@ -1,4 +0,0 @@ -package mindustry.world.producers; - -public class Produce{ -} diff --git a/core/src/mindustry/world/producers/ProduceItem.java b/core/src/mindustry/world/producers/ProduceItem.java deleted file mode 100644 index 8f0b5129fb..0000000000 --- a/core/src/mindustry/world/producers/ProduceItem.java +++ /dev/null @@ -1,4 +0,0 @@ -package mindustry.world.producers; - -public class ProduceItem{ -} diff --git a/desktop/build.gradle b/desktop/build.gradle index c29ee65eff..6b383b958d 100644 --- a/desktop/build.gradle +++ b/desktop/build.gradle @@ -45,6 +45,8 @@ task run(dependsOn: classes, type: JavaExec){ jvmArgs("-XstartOnFirstThread", "-Djava.awt.headless=true") } + jvmArgs += "-XX:+ShowCodeDetailsInExceptionMessages" + /*spriteHashFile.parentFile.mkdirs() String spriteHash = hashDirectory() if(spriteHashFile.exists() && spriteHashFile.text != spriteHash){ diff --git a/gradle.properties b/gradle.properties index e4c41600b8..b4210058e3 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,3 @@ org.gradle.daemon=true org.gradle.jvmargs=-Xms256m -Xmx1024m -archash=f4e823e80a634226c617e30f2d67d61562b8faaa +archash=6fca97cecdf28a696b2c19097f70960485a62743 diff --git a/server/src/mindustry/server/ServerControl.java b/server/src/mindustry/server/ServerControl.java index b123d7e694..1e0aa942ab 100644 --- a/server/src/mindustry/server/ServerControl.java +++ b/server/src/mindustry/server/ServerControl.java @@ -4,7 +4,6 @@ import arc.*; import arc.files.*; import arc.struct.*; import arc.struct.Seq.*; -import arc.util.ArcAnnotate.*; import arc.util.*; import arc.util.Timer; import arc.util.CommandHandler.*; diff --git a/servers.json b/servers.json index c0b3bae268..8bb2e2097c 100644 --- a/servers.json +++ b/servers.json @@ -67,5 +67,8 @@ }, { "address": "Chaotic-Neutral.ddns.net:3333" + }, + { + "address": "pandorum.su:9999" } ] diff --git a/settings.gradle b/settings.gradle index a8dfd17399..52b0980311 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,3 +1,7 @@ +if(JavaVersion.current().ordinal() < JavaVersion.VERSION_14.ordinal()){ + throw new GradleException("!!! YOU MUST USE JAVA 14 OR ABOVE TO COMPILE AND RUN MINDUSTRY !!! Read the README. Your version: ${System.properties["java.version"]}") +} + include 'desktop', 'core', 'server', 'ios', 'annotations', 'tools', 'tests' def use = { ... names -> diff --git a/tests/src/test/java/power/ItemLiquidGeneratorTests.java b/tests/src/test/java/power/ItemLiquidGeneratorTests.java index 08f636c566..1e2224753f 100644 --- a/tests/src/test/java/power/ItemLiquidGeneratorTests.java +++ b/tests/src/test/java/power/ItemLiquidGeneratorTests.java @@ -87,7 +87,7 @@ public class ItemLiquidGeneratorTests extends PowerTestFixture{ final float expectedRemainingLiquidAmount = Math.max(0.0f, availableLiquidAmount - expectedConsumptionPerTick * Time.delta); createGenerator(inputType); - assertTrue(entity.acceptLiquid(null, liquid, availableLiquidAmount), inputType + " | " + parameterDescription + ": Liquids which will be declined by the generator don't need to be tested - The code won't be called for those cases."); + assertTrue(entity.acceptLiquid(null, liquid), inputType + " | " + parameterDescription + ": Liquids which will be declined by the generator don't need to be tested - The code won't be called for those cases."); entity.liquids.add(liquid, availableLiquidAmount); entity.cons.update(); diff --git a/tools/src/mindustry/tools/Generators.java b/tools/src/mindustry/tools/Generators.java index 2bc7fd4eac..401feb9ec5 100644 --- a/tools/src/mindustry/tools/Generators.java +++ b/tools/src/mindustry/tools/Generators.java @@ -214,7 +214,7 @@ public class Generators{ } //draw shard (default team top) on top of first sprite - if(i == 1 && shardTeamTop != null){ + if(region == block.teamRegions[Team.sharded.id] && shardTeamTop != null){ image.draw(shardTeamTop); } }