diff --git a/core/assets-raw/sprites/blocks/distribution/mass-conveyor-edge.png b/core/assets-raw/sprites/blocks/distribution/payload-conveyor-edge.png similarity index 100% rename from core/assets-raw/sprites/blocks/distribution/mass-conveyor-edge.png rename to core/assets-raw/sprites/blocks/distribution/payload-conveyor-edge.png diff --git a/core/assets-raw/sprites/blocks/distribution/mass-conveyor-icon.png b/core/assets-raw/sprites/blocks/distribution/payload-conveyor-icon.png similarity index 100% rename from core/assets-raw/sprites/blocks/distribution/mass-conveyor-icon.png rename to core/assets-raw/sprites/blocks/distribution/payload-conveyor-icon.png diff --git a/core/assets-raw/sprites/blocks/distribution/mass-conveyor-top.png b/core/assets-raw/sprites/blocks/distribution/payload-conveyor-top.png similarity index 100% rename from core/assets-raw/sprites/blocks/distribution/mass-conveyor-top.png rename to core/assets-raw/sprites/blocks/distribution/payload-conveyor-top.png diff --git a/core/assets-raw/sprites/blocks/distribution/mass-conveyor.png b/core/assets-raw/sprites/blocks/distribution/payload-conveyor.png similarity index 100% rename from core/assets-raw/sprites/blocks/distribution/mass-conveyor.png rename to core/assets-raw/sprites/blocks/distribution/payload-conveyor.png diff --git a/core/assets/bundles/bundle_be.properties b/core/assets/bundles/bundle_be.properties index 7e64018c45..906aa492cd 100644 --- a/core/assets/bundles/bundle_be.properties +++ b/core/assets/bundles/bundle_be.properties @@ -1062,7 +1062,7 @@ block.additive-reconstructor.name = Additive Reconstructor block.multiplicative-reconstructor.name = Multiplicative Reconstructor block.exponential-reconstructor.name = Exponential Reconstructor block.tetrative-reconstructor.name = Tetrative Reconstructor -block.mass-conveyor.name = Mass Conveyor +block.payload-conveyor.name = Mass Conveyor block.payload-router.name = Payload Router block.disassembler.name = Disassembler block.silicon-crucible.name = Silicon Crucible diff --git a/core/assets/bundles/bundle_cs.properties b/core/assets/bundles/bundle_cs.properties index d2bcda5623..18d6b667e3 100644 --- a/core/assets/bundles/bundle_cs.properties +++ b/core/assets/bundles/bundle_cs.properties @@ -1062,7 +1062,7 @@ block.additive-reconstructor.name = Přídavný přestavbovač block.multiplicative-reconstructor.name = Násobný přestavbovač block.exponential-reconstructor.name = Exponenciální přestavbovač block.tetrative-reconstructor.name = Umocňující přestavbovač -block.mass-conveyor.name = Hromadný dopravník +block.payload-conveyor.name = Hromadný dopravník block.payload-router.name = Směřovač nákladu block.disassembler.name = Rozebírač block.silicon-crucible.name = Křemíková nádoba diff --git a/core/assets/bundles/bundle_da.properties b/core/assets/bundles/bundle_da.properties index cf07fd28fa..f448bcafaf 100644 --- a/core/assets/bundles/bundle_da.properties +++ b/core/assets/bundles/bundle_da.properties @@ -1062,7 +1062,7 @@ block.additive-reconstructor.name = Additive Reconstructor block.multiplicative-reconstructor.name = Multiplicative Reconstructor block.exponential-reconstructor.name = Exponential Reconstructor block.tetrative-reconstructor.name = Tetrative Reconstructor -block.mass-conveyor.name = Mass Conveyor +block.payload-conveyor.name = Mass Conveyor block.payload-router.name = Payload Router block.disassembler.name = Disassembler block.silicon-crucible.name = Silicon Crucible diff --git a/core/assets/bundles/bundle_de.properties b/core/assets/bundles/bundle_de.properties index 2e09d13cee..881ffe40be 100644 --- a/core/assets/bundles/bundle_de.properties +++ b/core/assets/bundles/bundle_de.properties @@ -1062,7 +1062,7 @@ block.additive-reconstructor.name = Additive Reconstructor block.multiplicative-reconstructor.name = Multiplicative Reconstructor block.exponential-reconstructor.name = Exponential Reconstructor block.tetrative-reconstructor.name = Tetrative Reconstructor -block.mass-conveyor.name = Mass Conveyor +block.payload-conveyor.name = Mass Conveyor block.payload-router.name = Payload Router block.disassembler.name = Disassembler block.silicon-crucible.name = Silicon Crucible diff --git a/core/assets/bundles/bundle_es.properties b/core/assets/bundles/bundle_es.properties index 7d20286d0f..9fad522899 100644 --- a/core/assets/bundles/bundle_es.properties +++ b/core/assets/bundles/bundle_es.properties @@ -1062,7 +1062,7 @@ block.additive-reconstructor.name = Additive Reconstructor block.multiplicative-reconstructor.name = Multiplicative Reconstructor block.exponential-reconstructor.name = Exponential Reconstructor block.tetrative-reconstructor.name = Tetrative Reconstructor -block.mass-conveyor.name = Mass Conveyor +block.payload-conveyor.name = Mass Conveyor block.payload-router.name = Payload Router block.disassembler.name = Disassembler block.silicon-crucible.name = Silicon Crucible diff --git a/core/assets/bundles/bundle_et.properties b/core/assets/bundles/bundle_et.properties index 8dc981c19c..ea08f62c6d 100644 --- a/core/assets/bundles/bundle_et.properties +++ b/core/assets/bundles/bundle_et.properties @@ -1062,7 +1062,7 @@ block.additive-reconstructor.name = Additive Reconstructor block.multiplicative-reconstructor.name = Multiplicative Reconstructor block.exponential-reconstructor.name = Exponential Reconstructor block.tetrative-reconstructor.name = Tetrative Reconstructor -block.mass-conveyor.name = Mass Conveyor +block.payload-conveyor.name = Mass Conveyor block.payload-router.name = Payload Router block.disassembler.name = Disassembler block.silicon-crucible.name = Silicon Crucible diff --git a/core/assets/bundles/bundle_eu.properties b/core/assets/bundles/bundle_eu.properties index 2c5d3b7c4b..1c115f90ad 100644 --- a/core/assets/bundles/bundle_eu.properties +++ b/core/assets/bundles/bundle_eu.properties @@ -1062,7 +1062,7 @@ block.additive-reconstructor.name = Additive Reconstructor block.multiplicative-reconstructor.name = Multiplicative Reconstructor block.exponential-reconstructor.name = Exponential Reconstructor block.tetrative-reconstructor.name = Tetrative Reconstructor -block.mass-conveyor.name = Mass Conveyor +block.payload-conveyor.name = Mass Conveyor block.payload-router.name = Payload Router block.disassembler.name = Disassembler block.silicon-crucible.name = Silicon Crucible diff --git a/core/assets/bundles/bundle_fi.properties b/core/assets/bundles/bundle_fi.properties index 985cea08a4..93cf3feaaf 100644 --- a/core/assets/bundles/bundle_fi.properties +++ b/core/assets/bundles/bundle_fi.properties @@ -1062,7 +1062,7 @@ block.additive-reconstructor.name = Additive Reconstructor block.multiplicative-reconstructor.name = Multiplicative Reconstructor block.exponential-reconstructor.name = Exponential Reconstructor block.tetrative-reconstructor.name = Tetrative Reconstructor -block.mass-conveyor.name = Mass Conveyor +block.payload-conveyor.name = Mass Conveyor block.payload-router.name = Payload Router block.disassembler.name = Disassembler block.silicon-crucible.name = Silicon Crucible diff --git a/core/assets/bundles/bundle_fil.properties b/core/assets/bundles/bundle_fil.properties index 4f6e36f3ae..a07e8ebf76 100644 --- a/core/assets/bundles/bundle_fil.properties +++ b/core/assets/bundles/bundle_fil.properties @@ -1076,7 +1076,7 @@ block.additive-reconstructor.name = Additive Reconstructor block.multiplicative-reconstructor.name = Multiplicative Reconstructor block.exponential-reconstructor.name = Exponential Reconstructor block.tetrative-reconstructor.name = Tetrative Reconstructor -block.mass-conveyor.name = Mass Conveyor +block.payload-conveyor.name = Mass Conveyor block.payload-router.name = Payload Router block.disassembler.name = Disassembler block.silicon-crucible.name = Silicon Crucible diff --git a/core/assets/bundles/bundle_fr.properties b/core/assets/bundles/bundle_fr.properties index fb20242768..cd79e0ab9c 100644 --- a/core/assets/bundles/bundle_fr.properties +++ b/core/assets/bundles/bundle_fr.properties @@ -1062,7 +1062,7 @@ block.additive-reconstructor.name = Reconstructeur Additif block.multiplicative-reconstructor.name = Reconstructeur Multiplicatif block.exponential-reconstructor.name = Reconstructeur Exponentiel block.tetrative-reconstructor.name = Reconstructeur Tétratif -block.mass-conveyor.name = Convoyeur de Masse +block.payload-conveyor.name = Convoyeur de Masse block.payload-router.name = Routeur de Charge Utile block.disassembler.name = Disassembler block.silicon-crucible.name = Creuset de Silicium diff --git a/core/assets/bundles/bundle_fr_BE.properties b/core/assets/bundles/bundle_fr_BE.properties index 15147ed9c4..aeff0d5cb8 100644 --- a/core/assets/bundles/bundle_fr_BE.properties +++ b/core/assets/bundles/bundle_fr_BE.properties @@ -1062,7 +1062,7 @@ block.additive-reconstructor.name = Additive Reconstructor block.multiplicative-reconstructor.name = Multiplicative Reconstructor block.exponential-reconstructor.name = Exponential Reconstructor block.tetrative-reconstructor.name = Tetrative Reconstructor -block.mass-conveyor.name = Mass Conveyor +block.payload-conveyor.name = Mass Conveyor block.payload-router.name = Payload Router block.disassembler.name = Disassembler block.silicon-crucible.name = Silicon Crucible diff --git a/core/assets/bundles/bundle_hu.properties b/core/assets/bundles/bundle_hu.properties index 9311c27ac7..6c8e0bd47d 100644 --- a/core/assets/bundles/bundle_hu.properties +++ b/core/assets/bundles/bundle_hu.properties @@ -1062,7 +1062,7 @@ block.additive-reconstructor.name = Additive Reconstructor block.multiplicative-reconstructor.name = Multiplicative Reconstructor block.exponential-reconstructor.name = Exponential Reconstructor block.tetrative-reconstructor.name = Tetrative Reconstructor -block.mass-conveyor.name = Mass Conveyor +block.payload-conveyor.name = Mass Conveyor block.payload-router.name = Payload Router block.disassembler.name = Disassembler block.silicon-crucible.name = Silicon Crucible diff --git a/core/assets/bundles/bundle_in_ID.properties b/core/assets/bundles/bundle_in_ID.properties index f0c67a2302..5868526b85 100644 --- a/core/assets/bundles/bundle_in_ID.properties +++ b/core/assets/bundles/bundle_in_ID.properties @@ -1062,7 +1062,7 @@ block.additive-reconstructor.name = Additive Reconstructor block.multiplicative-reconstructor.name = Multiplicative Reconstructor block.exponential-reconstructor.name = Exponential Reconstructor block.tetrative-reconstructor.name = Tetrative Reconstructor -block.mass-conveyor.name = Mass Conveyor +block.payload-conveyor.name = Mass Conveyor block.payload-router.name = Payload Router block.disassembler.name = Disassembler block.silicon-crucible.name = Silicon Crucible diff --git a/core/assets/bundles/bundle_it.properties b/core/assets/bundles/bundle_it.properties index 81781a53f3..93e2de29d2 100644 --- a/core/assets/bundles/bundle_it.properties +++ b/core/assets/bundles/bundle_it.properties @@ -1062,7 +1062,7 @@ block.additive-reconstructor.name = Additive Reconstructor block.multiplicative-reconstructor.name = Multiplicative Reconstructor block.exponential-reconstructor.name = Exponential Reconstructor block.tetrative-reconstructor.name = Tetrative Reconstructor -block.mass-conveyor.name = Mass Conveyor +block.payload-conveyor.name = Mass Conveyor block.payload-router.name = Payload Router block.disassembler.name = Disassembler block.silicon-crucible.name = Silicon Crucible diff --git a/core/assets/bundles/bundle_ja.properties b/core/assets/bundles/bundle_ja.properties index 65a34244fc..933ae1992a 100644 --- a/core/assets/bundles/bundle_ja.properties +++ b/core/assets/bundles/bundle_ja.properties @@ -1062,7 +1062,7 @@ block.additive-reconstructor.name = Additive Reconstructor block.multiplicative-reconstructor.name = Multiplicative Reconstructor block.exponential-reconstructor.name = Exponential Reconstructor block.tetrative-reconstructor.name = Tetrative Reconstructor -block.mass-conveyor.name = Mass Conveyor +block.payload-conveyor.name = Mass Conveyor block.payload-router.name = Payload Router block.disassembler.name = Disassembler block.silicon-crucible.name = Silicon Crucible diff --git a/core/assets/bundles/bundle_ko.properties b/core/assets/bundles/bundle_ko.properties index 70540d24ec..cedeaaf039 100644 --- a/core/assets/bundles/bundle_ko.properties +++ b/core/assets/bundles/bundle_ko.properties @@ -1062,7 +1062,7 @@ block.additive-reconstructor.name = 첨가물 재구성기 block.multiplicative-reconstructor.name = 다중 재구성기 block.exponential-reconstructor.name = 지수 재구성기 block.tetrative-reconstructor.name = 정서 재구성기 -block.mass-conveyor.name = 매스 컨베이어 +block.payload-conveyor.name = 매스 컨베이어 block.payload-router.name = 화물 분배기 block.disassembler.name = 분해기 block.silicon-crucible.name = 실리콘 도가니 diff --git a/core/assets/bundles/bundle_lt.properties b/core/assets/bundles/bundle_lt.properties index 338a12c5dd..8316b54c06 100644 --- a/core/assets/bundles/bundle_lt.properties +++ b/core/assets/bundles/bundle_lt.properties @@ -1062,7 +1062,7 @@ block.additive-reconstructor.name = Additive Reconstructor block.multiplicative-reconstructor.name = Multiplicative Reconstructor block.exponential-reconstructor.name = Exponential Reconstructor block.tetrative-reconstructor.name = Tetrative Reconstructor -block.mass-conveyor.name = Mass Conveyor +block.payload-conveyor.name = Mass Conveyor block.payload-router.name = Payload Router block.disassembler.name = Disassembler block.silicon-crucible.name = Silicon Crucible diff --git a/core/assets/bundles/bundle_nl.properties b/core/assets/bundles/bundle_nl.properties index a55f78e081..88fba3f8f5 100644 --- a/core/assets/bundles/bundle_nl.properties +++ b/core/assets/bundles/bundle_nl.properties @@ -1062,7 +1062,7 @@ block.additive-reconstructor.name = Additive Reconstructor block.multiplicative-reconstructor.name = Multiplicative Reconstructor block.exponential-reconstructor.name = Exponential Reconstructor block.tetrative-reconstructor.name = Tetrative Reconstructor -block.mass-conveyor.name = Mass Conveyor +block.payload-conveyor.name = Mass Conveyor block.payload-router.name = Payload Router block.disassembler.name = Disassembler block.silicon-crucible.name = Silicon Crucible diff --git a/core/assets/bundles/bundle_nl_BE.properties b/core/assets/bundles/bundle_nl_BE.properties index 4afde54148..e643b1d553 100644 --- a/core/assets/bundles/bundle_nl_BE.properties +++ b/core/assets/bundles/bundle_nl_BE.properties @@ -1062,7 +1062,7 @@ block.additive-reconstructor.name = Additive Reconstructor block.multiplicative-reconstructor.name = Multiplicative Reconstructor block.exponential-reconstructor.name = Exponential Reconstructor block.tetrative-reconstructor.name = Tetrative Reconstructor -block.mass-conveyor.name = Mass Conveyor +block.payload-conveyor.name = Mass Conveyor block.payload-router.name = Payload Router block.disassembler.name = Disassembler block.silicon-crucible.name = Silicon Crucible diff --git a/core/assets/bundles/bundle_pl.properties b/core/assets/bundles/bundle_pl.properties index d4c14e22f5..a8d15895b9 100644 --- a/core/assets/bundles/bundle_pl.properties +++ b/core/assets/bundles/bundle_pl.properties @@ -1063,7 +1063,7 @@ block.additive-reconstructor.name = Rekonstruktor Addytywny block.multiplicative-reconstructor.name = Rekonstruktor Multiplikatywny block.exponential-reconstructor.name = Rekonstruktor Wykładniczy block.tetrative-reconstructor.name = Tetrative Reconstructor -block.mass-conveyor.name = Przenośnik Masowy +block.payload-conveyor.name = Przenośnik Masowy block.payload-router.name = Rozdzielacz Ładunku block.disassembler.name = Dezasembler block.silicon-crucible.name = Silicon Crucible diff --git a/core/assets/bundles/bundle_pt_BR.properties b/core/assets/bundles/bundle_pt_BR.properties index 755622fa29..64d54a3d5d 100644 --- a/core/assets/bundles/bundle_pt_BR.properties +++ b/core/assets/bundles/bundle_pt_BR.properties @@ -1062,7 +1062,7 @@ block.additive-reconstructor.name = Additive Reconstructor block.multiplicative-reconstructor.name = Multiplicative Reconstructor block.exponential-reconstructor.name = Exponential Reconstructor block.tetrative-reconstructor.name = Tetrative Reconstructor -block.mass-conveyor.name = Mass Conveyor +block.payload-conveyor.name = Mass Conveyor block.payload-router.name = Payload Router block.disassembler.name = Disassembler block.silicon-crucible.name = Silicon Crucible diff --git a/core/assets/bundles/bundle_pt_PT.properties b/core/assets/bundles/bundle_pt_PT.properties index 6ddd177a4f..c665535ba8 100644 --- a/core/assets/bundles/bundle_pt_PT.properties +++ b/core/assets/bundles/bundle_pt_PT.properties @@ -1062,7 +1062,7 @@ block.additive-reconstructor.name = Additive Reconstructor block.multiplicative-reconstructor.name = Multiplicative Reconstructor block.exponential-reconstructor.name = Exponential Reconstructor block.tetrative-reconstructor.name = Tetrative Reconstructor -block.mass-conveyor.name = Mass Conveyor +block.payload-conveyor.name = Mass Conveyor block.payload-router.name = Payload Router block.disassembler.name = Disassembler block.silicon-crucible.name = Silicon Crucible diff --git a/core/assets/bundles/bundle_ru.properties b/core/assets/bundles/bundle_ru.properties index 5d679e6504..2fb9106b6d 100644 --- a/core/assets/bundles/bundle_ru.properties +++ b/core/assets/bundles/bundle_ru.properties @@ -1079,7 +1079,7 @@ block.additive-reconstructor.name = Добавляющий реконструк block.multiplicative-reconstructor.name = Умножающий реконструктор block.exponential-reconstructor.name = Экспоненциальный реконструктор block.tetrative-reconstructor.name = Тетративный реконструктор -block.mass-conveyor.name = Грузовой конвейер +block.payload-conveyor.name = Грузовой конвейер block.payload-router.name = Разгрузочный маршрутизатор block.disassembler.name = Разборщик block.silicon-crucible.name = Кремниевый тигель diff --git a/core/assets/bundles/bundle_sv.properties b/core/assets/bundles/bundle_sv.properties index 6a6ce9d221..bbe0f390c6 100644 --- a/core/assets/bundles/bundle_sv.properties +++ b/core/assets/bundles/bundle_sv.properties @@ -1062,7 +1062,7 @@ block.additive-reconstructor.name = Additive Reconstructor block.multiplicative-reconstructor.name = Multiplicative Reconstructor block.exponential-reconstructor.name = Exponential Reconstructor block.tetrative-reconstructor.name = Tetrative Reconstructor -block.mass-conveyor.name = Mass Conveyor +block.payload-conveyor.name = Mass Conveyor block.payload-router.name = Payload Router block.disassembler.name = Disassembler block.silicon-crucible.name = Silicon Crucible diff --git a/core/assets/bundles/bundle_th.properties b/core/assets/bundles/bundle_th.properties index 58b1a304c0..8fcf97cb03 100644 --- a/core/assets/bundles/bundle_th.properties +++ b/core/assets/bundles/bundle_th.properties @@ -1062,7 +1062,7 @@ block.additive-reconstructor.name = Additive Reconstructor block.multiplicative-reconstructor.name = Multiplicative Reconstructor block.exponential-reconstructor.name = Exponential Reconstructor block.tetrative-reconstructor.name = Tetrative Reconstructor -block.mass-conveyor.name = Mass Conveyor +block.payload-conveyor.name = Mass Conveyor block.payload-router.name = Payload Router block.disassembler.name = Disassembler block.silicon-crucible.name = Silicon Crucible diff --git a/core/assets/bundles/bundle_tk.properties b/core/assets/bundles/bundle_tk.properties index 03f22600bb..006ef4ae92 100644 --- a/core/assets/bundles/bundle_tk.properties +++ b/core/assets/bundles/bundle_tk.properties @@ -1062,7 +1062,7 @@ block.additive-reconstructor.name = Additive Reconstructor block.multiplicative-reconstructor.name = Multiplicative Reconstructor block.exponential-reconstructor.name = Exponential Reconstructor block.tetrative-reconstructor.name = Tetrative Reconstructor -block.mass-conveyor.name = Mass Conveyor +block.payload-conveyor.name = Mass Conveyor block.payload-router.name = Payload Router block.disassembler.name = Disassembler block.silicon-crucible.name = Silicon Crucible diff --git a/core/assets/bundles/bundle_tr.properties b/core/assets/bundles/bundle_tr.properties index 461f09b534..15788e2753 100644 --- a/core/assets/bundles/bundle_tr.properties +++ b/core/assets/bundles/bundle_tr.properties @@ -1062,7 +1062,7 @@ block.additive-reconstructor.name = Additive Reconstructor block.multiplicative-reconstructor.name = Multiplicative Reconstructor block.exponential-reconstructor.name = Exponential Reconstructor block.tetrative-reconstructor.name = Tetrative Reconstructor -block.mass-conveyor.name = Mass Conveyor +block.payload-conveyor.name = Mass Conveyor block.payload-router.name = Payload Router block.disassembler.name = Disassembler block.silicon-crucible.name = Silicon Crucible diff --git a/core/assets/bundles/bundle_uk_UA.properties b/core/assets/bundles/bundle_uk_UA.properties index e819ae10cd..9c02b7b8b4 100644 --- a/core/assets/bundles/bundle_uk_UA.properties +++ b/core/assets/bundles/bundle_uk_UA.properties @@ -1062,7 +1062,7 @@ block.additive-reconstructor.name = Додавальний реконструк block.multiplicative-reconstructor.name = Примножувальний реконструктор block.exponential-reconstructor.name = Експоненційний реконструктор block.tetrative-reconstructor.name = Тетративний реконструктор -block.mass-conveyor.name = Вантажний конвеєр +block.payload-conveyor.name = Вантажний конвеєр block.payload-router.name = Розвантажувальний маршрутизатор block.disassembler.name = Розбирач block.silicon-crucible.name = Кремнієвий тигель diff --git a/core/assets/bundles/bundle_zh_CN.properties b/core/assets/bundles/bundle_zh_CN.properties index 50d2e80615..13cf2709e2 100644 --- a/core/assets/bundles/bundle_zh_CN.properties +++ b/core/assets/bundles/bundle_zh_CN.properties @@ -1062,7 +1062,7 @@ block.additive-reconstructor.name = Additive Reconstructor block.multiplicative-reconstructor.name = Multiplicative Reconstructor block.exponential-reconstructor.name = Exponential Reconstructor block.tetrative-reconstructor.name = Tetrative Reconstructor -block.mass-conveyor.name = Mass Conveyor +block.payload-conveyor.name = Mass Conveyor block.payload-router.name = Payload Router block.disassembler.name = Disassembler block.silicon-crucible.name = Silicon Crucible diff --git a/core/assets/bundles/bundle_zh_TW.properties b/core/assets/bundles/bundle_zh_TW.properties index 23e2ab2467..ea90067971 100644 --- a/core/assets/bundles/bundle_zh_TW.properties +++ b/core/assets/bundles/bundle_zh_TW.properties @@ -1062,7 +1062,7 @@ block.additive-reconstructor.name = Additive Reconstructor block.multiplicative-reconstructor.name = Multiplicative Reconstructor block.exponential-reconstructor.name = Exponential Reconstructor block.tetrative-reconstructor.name = Tetrative Reconstructor -block.mass-conveyor.name = Mass Conveyor +block.payload-conveyor.name = Mass Conveyor block.payload-router.name = Payload Router block.disassembler.name = Disassembler block.silicon-crucible.name = Silicon Crucible diff --git a/core/assets/icons/icons.properties b/core/assets/icons/icons.properties index e50ea372cd..33acc0bd9c 100755 --- a/core/assets/icons/icons.properties +++ b/core/assets/icons/icons.properties @@ -285,3 +285,4 @@ 63459=logic-display|block-logic-display-medium 63458=switch|block-switch-medium 63457=memory-cell|block-memory-cell-medium +63456=payload-conveyor|block-payload-conveyor-medium diff --git a/core/assets/sprites/block_colors.png b/core/assets/sprites/block_colors.png index 95f6a24502..5d0c07f0b5 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 b5e6b174e4..a8a1c936ab 100644 --- a/core/assets/sprites/fallback/sprites.atlas +++ b/core/assets/sprites/fallback/sprites.atlas @@ -474,14 +474,14 @@ mend-projector-top index: -1 overdrive-dome rotate: false - xy: 619, 353 + xy: 1125, 615 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 overdrive-dome-top rotate: false - xy: 619, 255 + xy: 631, 549 size: 96, 96 orig: 96, 96 offset: 0, 0 @@ -780,37 +780,37 @@ distributor orig: 64, 64 offset: 0, 0 index: -1 -mass-conveyor - rotate: false - xy: 929, 713 - size: 96, 96 - orig: 96, 96 - offset: 0, 0 - index: -1 -mass-conveyor-edge +mass-driver-base rotate: false xy: 1027, 713 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 -mass-conveyor-top +payload-conveyor rotate: false - xy: 1125, 713 + xy: 619, 451 + size: 96, 96 + orig: 96, 96 + offset: 0, 0 + index: -1 +payload-conveyor-edge + rotate: false + xy: 619, 353 + size: 96, 96 + orig: 96, 96 + offset: 0, 0 + index: -1 +payload-conveyor-top + rotate: false + xy: 619, 255 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 payload-router-top rotate: false - xy: 1125, 713 - size: 96, 96 - orig: 96, 96 - offset: 0, 0 - index: -1 -mass-driver-base - rotate: false - xy: 733, 627 + xy: 619, 255 size: 96, 96 orig: 96, 96 offset: 0, 0 @@ -929,28 +929,28 @@ mechanical-drill-top index: -1 oil-extractor rotate: false - xy: 1027, 615 + xy: 733, 627 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 oil-extractor-liquid rotate: false - xy: 1125, 615 + xy: 831, 627 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 oil-extractor-rotator rotate: false - xy: 631, 549 + xy: 929, 615 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 oil-extractor-top rotate: false - xy: 619, 451 + xy: 1027, 615 size: 96, 96 orig: 96, 96 offset: 0, 0 @@ -1552,7 +1552,7 @@ silicon-smelter-top index: -1 multi-press rotate: false - xy: 831, 627 + xy: 1125, 713 size: 96, 96 orig: 96, 96 offset: 0, 0 @@ -1965,7 +1965,7 @@ multiplicative-reconstructor-top index: -1 naval-factory rotate: false - xy: 929, 615 + xy: 635, 647 size: 96, 96 orig: 96, 96 offset: 0, 0 @@ -2523,23 +2523,9 @@ block-magmarock-full orig: 32, 32 offset: 0, 0 index: -1 -block-mass-conveyor-full - rotate: false - xy: 1141, 1203 - size: 96, 96 - orig: 96, 96 - offset: 0, 0 - index: -1 -mass-conveyor-icon - rotate: false - xy: 1141, 1203 - size: 96, 96 - orig: 96, 96 - offset: 0, 0 - index: -1 block-mass-driver-full rotate: false - xy: 549, 1198 + xy: 1141, 1203 size: 96, 96 orig: 96, 96 offset: 0, 0 @@ -2581,14 +2567,14 @@ block-multiplicative-reconstructor-full index: -1 block-naval-factory-full rotate: false - xy: 537, 1100 + xy: 549, 1198 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 block-oil-extractor-full rotate: false - xy: 537, 1002 + xy: 537, 1100 size: 96, 96 orig: 96, 96 offset: 0, 0 @@ -2642,6 +2628,20 @@ block-parallax-full orig: 64, 64 offset: 0, 0 index: -1 +block-payload-conveyor-full + rotate: false + xy: 537, 1002 + size: 96, 96 + orig: 96, 96 + offset: 0, 0 + index: -1 +payload-conveyor-icon + rotate: false + xy: 537, 1002 + size: 96, 96 + orig: 96, 96 + offset: 0, 0 + index: -1 block-payload-router-full rotate: false xy: 537, 904 @@ -3715,7 +3715,7 @@ mace-wreck2 index: -1 mass-driver rotate: false - xy: 635, 647 + xy: 929, 713 size: 96, 96 orig: 96, 96 offset: 0, 0 @@ -9561,16 +9561,9 @@ logic-processor-icon-editor orig: 64, 64 offset: 0, 0 index: -1 -mass-conveyor-icon-editor - rotate: false - xy: 1299, 791 - size: 96, 96 - orig: 96, 96 - offset: 0, 0 - index: -1 mass-driver-icon-editor rotate: false - xy: 1397, 791 + xy: 1299, 791 size: 96, 96 orig: 96, 96 offset: 0, 0 @@ -9640,7 +9633,7 @@ micro-processor-icon-editor index: -1 multi-press-icon-editor rotate: false - xy: 453, 435 + xy: 1397, 791 size: 96, 96 orig: 96, 96 offset: 0, 0 @@ -9654,21 +9647,21 @@ multiplicative-reconstructor-icon-editor index: -1 naval-factory-icon-editor rotate: false - xy: 1495, 791 + xy: 453, 435 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 oil-extractor-icon-editor rotate: false - xy: 1593, 823 + xy: 1495, 791 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 overdrive-dome-icon-editor rotate: false - xy: 1691, 823 + xy: 1593, 823 size: 96, 96 orig: 96, 96 offset: 0, 0 @@ -9694,6 +9687,13 @@ parallax-icon-editor orig: 64, 64 offset: 0, 0 index: -1 +payload-conveyor-icon-editor + rotate: false + xy: 1691, 823 + size: 96, 96 + orig: 96, 96 + offset: 0, 0 + index: -1 payload-router-icon-editor rotate: false xy: 1789, 823 @@ -13223,1085 +13223,1085 @@ block-magmarock-xlarge orig: 48, 48 offset: 0, 0 index: -1 -block-mass-conveyor-large +block-mass-driver-large rotate: false xy: 1493, 933 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-mass-conveyor-medium +block-mass-driver-medium rotate: false xy: 945, 390 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-mass-conveyor-small +block-mass-driver-small rotate: false xy: 737, 342 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-mass-conveyor-tiny +block-mass-driver-tiny rotate: false xy: 1191, 305 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-mass-conveyor-xlarge +block-mass-driver-xlarge rotate: false xy: 201, 308 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-mass-driver-large +block-mechanical-drill-large rotate: false xy: 1535, 933 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-mass-driver-medium +block-mechanical-drill-medium rotate: false xy: 979, 424 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-mass-driver-small +block-mechanical-drill-small rotate: false xy: 763, 342 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-mass-driver-tiny +block-mechanical-drill-tiny rotate: false xy: 1209, 305 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-mass-driver-xlarge +block-mechanical-drill-xlarge rotate: false xy: 151, 208 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-mechanical-drill-large +block-mechanical-pump-large rotate: false xy: 1577, 933 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-mechanical-drill-medium +block-mechanical-pump-medium rotate: false xy: 979, 390 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-mechanical-drill-small +block-mechanical-pump-small rotate: false xy: 789, 342 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-mechanical-drill-tiny +block-mechanical-pump-tiny rotate: false xy: 1227, 305 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-mechanical-drill-xlarge +block-mechanical-pump-xlarge rotate: false xy: 201, 258 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-mechanical-pump-large +block-meltdown-large rotate: false xy: 1619, 933 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-mechanical-pump-medium +block-meltdown-medium rotate: false xy: 1013, 424 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-mechanical-pump-small +block-meltdown-small rotate: false xy: 815, 342 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-mechanical-pump-tiny +block-meltdown-tiny rotate: false xy: 1245, 305 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-mechanical-pump-xlarge +block-meltdown-xlarge rotate: false xy: 151, 158 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-meltdown-large +block-melter-large rotate: false xy: 1661, 933 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-meltdown-medium +block-melter-medium rotate: false xy: 1013, 390 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-meltdown-small +block-melter-small rotate: false xy: 841, 342 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-meltdown-tiny +block-melter-tiny rotate: false xy: 1263, 305 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-meltdown-xlarge +block-melter-xlarge rotate: false xy: 201, 208 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-melter-large +block-memory-cell-large rotate: false xy: 1703, 933 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-melter-medium +block-memory-cell-medium rotate: false xy: 911, 356 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-melter-small +block-memory-cell-small rotate: false xy: 867, 342 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-melter-tiny +block-memory-cell-tiny rotate: false xy: 1281, 305 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-melter-xlarge +block-memory-cell-xlarge rotate: false xy: 151, 108 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-memory-cell-large +block-mend-projector-large rotate: false xy: 1745, 933 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-memory-cell-medium +block-mend-projector-medium rotate: false xy: 945, 356 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-memory-cell-small +block-mend-projector-small rotate: false xy: 745, 316 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-memory-cell-tiny +block-mend-projector-tiny rotate: false xy: 1299, 305 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-memory-cell-xlarge +block-mend-projector-xlarge rotate: false xy: 201, 158 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-mend-projector-large +block-mender-large rotate: false xy: 1787, 933 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-mend-projector-medium +block-mender-medium rotate: false xy: 979, 356 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-mend-projector-small +block-mender-small rotate: false xy: 745, 290 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-mend-projector-tiny +block-mender-tiny rotate: false xy: 1317, 305 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-mend-projector-xlarge +block-mender-xlarge rotate: false xy: 151, 58 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-mender-large +block-message-large rotate: false xy: 1829, 933 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-mender-medium +block-message-medium rotate: false xy: 1013, 356 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-mender-small +block-message-small rotate: false xy: 771, 316 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-mender-tiny +block-message-tiny rotate: false xy: 1335, 305 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-mender-xlarge +block-message-xlarge rotate: false xy: 201, 108 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-message-large +block-metal-floor-2-large rotate: false xy: 1871, 933 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-message-medium +block-metal-floor-2-medium rotate: false xy: 1783, 744 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-message-small +block-metal-floor-2-small rotate: false xy: 745, 264 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-message-tiny +block-metal-floor-2-tiny rotate: false xy: 1353, 305 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-message-xlarge +block-metal-floor-2-xlarge rotate: false xy: 201, 58 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-metal-floor-2-large +block-metal-floor-3-large rotate: false xy: 1913, 933 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-metal-floor-2-medium +block-metal-floor-3-medium rotate: false xy: 1741, 702 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-metal-floor-2-small +block-metal-floor-3-small rotate: false xy: 797, 316 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-metal-floor-2-tiny +block-metal-floor-3-tiny rotate: false xy: 1371, 305 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-metal-floor-2-xlarge +block-metal-floor-3-xlarge rotate: false xy: 251, 508 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-metal-floor-3-large +block-metal-floor-5-large rotate: false xy: 1955, 933 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-metal-floor-3-medium +block-metal-floor-5-medium rotate: false xy: 1699, 660 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-metal-floor-3-small +block-metal-floor-5-small rotate: false xy: 771, 290 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-metal-floor-3-tiny +block-metal-floor-5-tiny rotate: false xy: 1389, 305 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-metal-floor-3-xlarge +block-metal-floor-5-xlarge rotate: false xy: 251, 458 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-metal-floor-5-large +block-metal-floor-damaged-large rotate: false xy: 845, 891 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-metal-floor-5-medium +block-metal-floor-damaged-medium rotate: false xy: 1867, 828 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-metal-floor-5-small +block-metal-floor-damaged-small rotate: false xy: 745, 238 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-metal-floor-5-tiny +block-metal-floor-damaged-tiny rotate: false xy: 1407, 305 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-metal-floor-5-xlarge +block-metal-floor-damaged-xlarge rotate: false xy: 251, 408 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-metal-floor-damaged-large +block-metal-floor-large rotate: false xy: 887, 891 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-metal-floor-damaged-medium +block-metal-floor-medium rotate: false xy: 1901, 828 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-metal-floor-damaged-small +block-metal-floor-small rotate: false xy: 823, 316 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-metal-floor-damaged-tiny +block-metal-floor-tiny rotate: false xy: 1425, 305 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-metal-floor-damaged-xlarge +block-metal-floor-xlarge rotate: false xy: 251, 358 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-metal-floor-large +block-micro-processor-large rotate: false xy: 929, 891 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-metal-floor-medium +block-micro-processor-medium rotate: false xy: 1935, 828 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-metal-floor-small +block-micro-processor-small rotate: false xy: 797, 290 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-metal-floor-tiny +block-micro-processor-tiny rotate: false xy: 1443, 305 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-metal-floor-xlarge +block-micro-processor-xlarge rotate: false xy: 251, 308 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-micro-processor-large +block-moss-large rotate: false xy: 971, 891 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-micro-processor-medium +block-moss-medium rotate: false xy: 1825, 786 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-micro-processor-small +block-moss-small rotate: false xy: 771, 264 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-micro-processor-tiny +block-moss-tiny rotate: false xy: 1461, 305 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-micro-processor-xlarge +block-moss-xlarge rotate: false xy: 251, 258 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-moss-large +block-multi-press-large rotate: false xy: 1013, 891 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-moss-medium +block-multi-press-medium rotate: false xy: 1683, 613 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-moss-small +block-multi-press-small rotate: false xy: 745, 212 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-moss-tiny +block-multi-press-tiny rotate: false xy: 1479, 305 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-moss-xlarge +block-multi-press-xlarge rotate: false xy: 251, 208 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-multi-press-large +block-multiplicative-reconstructor-large rotate: false xy: 1055, 891 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-multi-press-medium +block-multiplicative-reconstructor-medium rotate: false xy: 1683, 579 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-multi-press-small +block-multiplicative-reconstructor-small rotate: false xy: 849, 316 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-multi-press-tiny +block-multiplicative-reconstructor-tiny rotate: false xy: 1497, 305 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-multi-press-xlarge +block-multiplicative-reconstructor-xlarge rotate: false xy: 251, 158 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-multiplicative-reconstructor-large +block-naval-factory-large rotate: false xy: 1097, 891 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-multiplicative-reconstructor-medium +block-naval-factory-medium rotate: false xy: 1051, 550 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-multiplicative-reconstructor-small +block-naval-factory-small rotate: false xy: 823, 290 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-multiplicative-reconstructor-tiny +block-naval-factory-tiny rotate: false xy: 1515, 305 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-multiplicative-reconstructor-xlarge +block-naval-factory-xlarge rotate: false xy: 251, 108 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-naval-factory-large +block-oil-extractor-large rotate: false xy: 1139, 891 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-naval-factory-medium +block-oil-extractor-medium rotate: false xy: 1047, 516 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-naval-factory-small +block-oil-extractor-small rotate: false xy: 797, 264 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-naval-factory-tiny +block-oil-extractor-tiny rotate: false xy: 1533, 305 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-naval-factory-xlarge +block-oil-extractor-xlarge rotate: false xy: 251, 58 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-oil-extractor-large +block-ore-coal-large rotate: false xy: 1181, 891 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-oil-extractor-medium +block-ore-coal-medium rotate: false xy: 1047, 482 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-oil-extractor-small +block-ore-coal-small rotate: false xy: 771, 238 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-oil-extractor-tiny +block-ore-coal-tiny rotate: false xy: 1551, 305 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-oil-extractor-xlarge +block-ore-coal-xlarge rotate: false xy: 151, 8 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-ore-coal-large +block-ore-copper-large rotate: false xy: 1223, 891 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-ore-coal-medium +block-ore-copper-medium rotate: false xy: 1047, 448 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-ore-coal-small +block-ore-copper-small rotate: false xy: 745, 186 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-ore-coal-tiny +block-ore-copper-tiny rotate: false xy: 1569, 305 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-ore-coal-xlarge +block-ore-copper-xlarge rotate: false xy: 201, 8 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-ore-copper-large +block-ore-lead-large rotate: false xy: 1265, 891 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-ore-copper-medium +block-ore-lead-medium rotate: false xy: 1047, 414 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-ore-copper-small +block-ore-lead-small rotate: false xy: 849, 290 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-ore-copper-tiny +block-ore-lead-tiny rotate: false xy: 1587, 305 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-ore-copper-xlarge +block-ore-lead-xlarge rotate: false xy: 251, 8 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-ore-lead-large +block-ore-scrap-large rotate: false xy: 1307, 891 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-ore-lead-medium +block-ore-scrap-medium rotate: false xy: 1047, 380 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-ore-lead-small +block-ore-scrap-small rotate: false xy: 823, 264 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-ore-lead-tiny +block-ore-scrap-tiny rotate: false xy: 1605, 305 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-ore-lead-xlarge +block-ore-scrap-xlarge rotate: false xy: 281, 619 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-ore-scrap-large +block-ore-thorium-large rotate: false xy: 1349, 891 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-ore-scrap-medium +block-ore-thorium-medium rotate: false xy: 1047, 346 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-ore-scrap-small +block-ore-thorium-small rotate: false xy: 797, 238 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-ore-scrap-tiny +block-ore-thorium-tiny rotate: false xy: 1623, 305 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-ore-scrap-xlarge +block-ore-thorium-xlarge rotate: false xy: 281, 569 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-ore-thorium-large +block-ore-titanium-large rotate: false xy: 1391, 891 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-ore-thorium-medium +block-ore-titanium-medium rotate: false xy: 1085, 545 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-ore-thorium-small +block-ore-titanium-small rotate: false xy: 771, 212 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-ore-thorium-tiny +block-ore-titanium-tiny rotate: false xy: 1641, 305 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-ore-thorium-xlarge +block-ore-titanium-xlarge rotate: false xy: 301, 519 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-ore-titanium-large +block-overdrive-dome-large rotate: false xy: 1433, 891 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-ore-titanium-medium +block-overdrive-dome-medium rotate: false xy: 1119, 545 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-ore-titanium-small +block-overdrive-dome-small rotate: false xy: 849, 264 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-ore-titanium-tiny +block-overdrive-dome-tiny rotate: false xy: 1659, 305 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-ore-titanium-xlarge +block-overdrive-dome-xlarge rotate: false xy: 301, 469 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-overdrive-dome-large +block-overdrive-projector-large rotate: false xy: 1475, 891 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-overdrive-dome-medium +block-overdrive-projector-medium rotate: false xy: 1153, 545 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-overdrive-dome-small +block-overdrive-projector-small rotate: false xy: 823, 238 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-overdrive-dome-tiny +block-overdrive-projector-tiny rotate: false xy: 1677, 305 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-overdrive-dome-xlarge +block-overdrive-projector-xlarge rotate: false xy: 301, 419 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-overdrive-projector-large +block-overflow-gate-large rotate: false xy: 1517, 891 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-overdrive-projector-medium +block-overflow-gate-medium rotate: false xy: 1187, 545 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-overdrive-projector-small +block-overflow-gate-small rotate: false xy: 797, 212 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-overdrive-projector-tiny +block-overflow-gate-tiny rotate: false xy: 1695, 305 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-overdrive-projector-xlarge +block-overflow-gate-xlarge rotate: false xy: 301, 369 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-overflow-gate-large +block-parallax-large rotate: false xy: 1559, 891 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-overflow-gate-medium +block-parallax-medium rotate: false xy: 1221, 545 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-overflow-gate-small +block-parallax-small rotate: false xy: 771, 186 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-overflow-gate-tiny +block-parallax-tiny rotate: false xy: 1713, 305 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-overflow-gate-xlarge +block-parallax-xlarge rotate: false xy: 301, 319 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-parallax-large +block-payload-conveyor-large rotate: false xy: 1601, 891 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-parallax-medium +block-payload-conveyor-medium rotate: false xy: 1255, 545 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-parallax-small +block-payload-conveyor-small rotate: false xy: 849, 238 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-parallax-tiny +block-payload-conveyor-tiny rotate: false xy: 1731, 305 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-parallax-xlarge +block-payload-conveyor-xlarge rotate: false xy: 301, 269 size: 48, 48 diff --git a/core/assets/sprites/fallback/sprites.png b/core/assets/sprites/fallback/sprites.png index af3a0e5549..baba9e3f2e 100644 Binary files a/core/assets/sprites/fallback/sprites.png and b/core/assets/sprites/fallback/sprites.png differ diff --git a/core/assets/sprites/fallback/sprites2.png b/core/assets/sprites/fallback/sprites2.png index 86016d627c..86703232a8 100644 Binary files a/core/assets/sprites/fallback/sprites2.png and b/core/assets/sprites/fallback/sprites2.png differ diff --git a/core/assets/sprites/fallback/sprites4.png b/core/assets/sprites/fallback/sprites4.png index ec8b3e32f5..47b3a43b45 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/sprites6.png b/core/assets/sprites/fallback/sprites6.png index 9ba8ef5541..83f8d322f0 100644 Binary files a/core/assets/sprites/fallback/sprites6.png and b/core/assets/sprites/fallback/sprites6.png differ diff --git a/core/assets/sprites/fallback/sprites7.png b/core/assets/sprites/fallback/sprites7.png index b1aee5a8df..fdc7006712 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/sprites.atlas b/core/assets/sprites/sprites.atlas index 58dad4bb1c..56b31cceef 100644 --- a/core/assets/sprites/sprites.atlas +++ b/core/assets/sprites/sprites.atlas @@ -83,14 +83,14 @@ mender-top index: -1 overdrive-dome rotate: false - xy: 3101, 967 + xy: 2807, 967 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 overdrive-dome-top rotate: false - xy: 2579, 869 + xy: 2905, 967 size: 96, 96 orig: 96, 96 offset: 0, 0 @@ -648,37 +648,9 @@ junction orig: 32, 32 offset: 0, 0 index: -1 -mass-conveyor - rotate: false - xy: 3603, 1077 - size: 96, 96 - orig: 96, 96 - offset: 0, 0 - index: -1 -mass-conveyor-edge - rotate: false - xy: 3701, 1077 - size: 96, 96 - orig: 96, 96 - offset: 0, 0 - index: -1 -mass-conveyor-top - rotate: false - xy: 3799, 1077 - size: 96, 96 - orig: 96, 96 - offset: 0, 0 - index: -1 -payload-router-top - rotate: false - xy: 3799, 1077 - size: 96, 96 - orig: 96, 96 - offset: 0, 0 - index: -1 mass-driver-base rotate: false - xy: 3995, 1077 + xy: 3701, 1077 size: 96, 96 orig: 96, 96 offset: 0, 0 @@ -690,6 +662,34 @@ overflow-gate orig: 32, 32 offset: 0, 0 index: -1 +payload-conveyor + rotate: false + xy: 3003, 967 + size: 96, 96 + orig: 96, 96 + offset: 0, 0 + index: -1 +payload-conveyor-edge + rotate: false + xy: 3101, 967 + size: 96, 96 + orig: 96, 96 + offset: 0, 0 + index: -1 +payload-conveyor-top + rotate: false + xy: 2579, 869 + size: 96, 96 + orig: 96, 96 + offset: 0, 0 + index: -1 +payload-router-top + rotate: false + xy: 2579, 869 + size: 96, 96 + orig: 96, 96 + offset: 0, 0 + index: -1 payload-router rotate: false xy: 2579, 771 @@ -853,28 +853,28 @@ mechanical-drill-top index: -1 oil-extractor rotate: false - xy: 2709, 967 + xy: 3995, 1077 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 oil-extractor-liquid rotate: false - xy: 2807, 967 + xy: 2513, 967 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 oil-extractor-rotator rotate: false - xy: 2905, 967 + xy: 2611, 967 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 oil-extractor-top rotate: false - xy: 3003, 967 + xy: 2709, 967 size: 96, 96 orig: 96, 96 offset: 0, 0 @@ -1784,7 +1784,7 @@ melter index: -1 multi-press rotate: false - xy: 2513, 967 + xy: 3799, 1077 size: 96, 96 orig: 96, 96 offset: 0, 0 @@ -2330,7 +2330,7 @@ multiplicative-reconstructor-top index: -1 naval-factory rotate: false - xy: 2611, 967 + xy: 3897, 1077 size: 96, 96 orig: 96, 96 offset: 0, 0 @@ -3091,23 +3091,9 @@ block-magmarock-full orig: 32, 32 offset: 0, 0 index: -1 -block-mass-conveyor-full - rotate: false - xy: 1863, 613 - size: 96, 96 - orig: 96, 96 - offset: 0, 0 - index: -1 -mass-conveyor-icon - rotate: false - xy: 1863, 613 - size: 96, 96 - orig: 96, 96 - offset: 0, 0 - index: -1 block-mass-driver-full rotate: false - xy: 1863, 515 + xy: 1863, 613 size: 96, 96 orig: 96, 96 offset: 0, 0 @@ -3149,14 +3135,14 @@ block-multiplicative-reconstructor-full index: -1 block-naval-factory-full rotate: false - xy: 1961, 641 + xy: 1863, 515 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 block-oil-extractor-full rotate: false - xy: 1961, 543 + xy: 1961, 641 size: 96, 96 orig: 96, 96 offset: 0, 0 @@ -3210,6 +3196,20 @@ block-parallax-full orig: 64, 64 offset: 0, 0 index: -1 +block-payload-conveyor-full + rotate: false + xy: 1961, 543 + size: 96, 96 + orig: 96, 96 + offset: 0, 0 + index: -1 +payload-conveyor-icon + rotate: false + xy: 1961, 543 + size: 96, 96 + orig: 96, 96 + offset: 0, 0 + index: -1 block-payload-router-full rotate: false xy: 2059, 680 @@ -5004,7 +5004,7 @@ mace-wreck2 index: -1 mass-driver rotate: false - xy: 3897, 1077 + xy: 3603, 1077 size: 96, 96 orig: 96, 96 offset: 0, 0 @@ -9549,16 +9549,9 @@ logic-processor-icon-editor orig: 64, 64 offset: 0, 0 index: -1 -mass-conveyor-icon-editor - rotate: false - xy: 3737, 389 - size: 96, 96 - orig: 96, 96 - offset: 0, 0 - index: -1 mass-driver-icon-editor rotate: false - xy: 3835, 389 + xy: 3737, 389 size: 96, 96 orig: 96, 96 offset: 0, 0 @@ -9628,7 +9621,7 @@ micro-processor-icon-editor index: -1 multi-press-icon-editor rotate: false - xy: 3933, 389 + xy: 3835, 389 size: 96, 96 orig: 96, 96 offset: 0, 0 @@ -9642,21 +9635,21 @@ multiplicative-reconstructor-icon-editor index: -1 naval-factory-icon-editor rotate: false - xy: 553, 67 + xy: 3933, 389 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 oil-extractor-icon-editor rotate: false - xy: 651, 99 + xy: 553, 67 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 overdrive-dome-icon-editor rotate: false - xy: 749, 99 + xy: 651, 99 size: 96, 96 orig: 96, 96 offset: 0, 0 @@ -9682,6 +9675,13 @@ parallax-icon-editor orig: 64, 64 offset: 0, 0 index: -1 +payload-conveyor-icon-editor + rotate: false + xy: 749, 99 + size: 96, 96 + orig: 96, 96 + offset: 0, 0 + index: -1 payload-router-icon-editor rotate: false xy: 847, 99 @@ -13211,1085 +13211,1085 @@ block-magmarock-xlarge orig: 48, 48 offset: 0, 0 index: -1 -block-mass-conveyor-large +block-mass-driver-large rotate: false xy: 901, 153 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-mass-conveyor-medium +block-mass-driver-medium rotate: false xy: 3741, 269 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-mass-conveyor-small +block-mass-driver-small rotate: false xy: 2042, 151 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-mass-conveyor-tiny +block-mass-driver-tiny rotate: false xy: 1507, 55 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-mass-conveyor-xlarge +block-mass-driver-xlarge rotate: false xy: 745, 354 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-mass-driver-large +block-mechanical-drill-large rotate: false xy: 881, 111 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-mass-driver-medium +block-mechanical-drill-medium rotate: false xy: 3775, 269 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-mass-driver-small +block-mechanical-drill-small rotate: false xy: 2016, 125 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-mass-driver-tiny +block-mechanical-drill-tiny rotate: false xy: 1525, 55 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-mass-driver-xlarge +block-mechanical-drill-xlarge rotate: false xy: 281, 107 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-mechanical-drill-large +block-mechanical-pump-large rotate: false xy: 881, 69 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-mechanical-drill-medium +block-mechanical-pump-medium rotate: false xy: 3809, 269 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-mechanical-drill-small +block-mechanical-pump-small rotate: false xy: 2068, 151 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-mechanical-drill-tiny +block-mechanical-pump-tiny rotate: false xy: 1543, 55 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-mechanical-drill-xlarge +block-mechanical-pump-xlarge rotate: false xy: 281, 57 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-mechanical-pump-large +block-meltdown-large rotate: false xy: 881, 27 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-mechanical-pump-medium +block-meltdown-medium rotate: false xy: 3843, 269 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-mechanical-pump-small +block-meltdown-small rotate: false xy: 2042, 125 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-mechanical-pump-tiny +block-meltdown-tiny rotate: false xy: 1561, 55 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-mechanical-pump-xlarge +block-meltdown-xlarge rotate: false xy: 795, 366 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-meltdown-large +block-melter-large rotate: false xy: 923, 111 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-meltdown-medium +block-melter-medium rotate: false xy: 3877, 269 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-meltdown-small +block-melter-small rotate: false xy: 2094, 151 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-meltdown-tiny +block-melter-tiny rotate: false xy: 1579, 55 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-meltdown-xlarge +block-melter-xlarge rotate: false xy: 309, 304 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-melter-large +block-memory-cell-large rotate: false xy: 923, 69 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-melter-medium +block-memory-cell-medium rotate: false xy: 3911, 269 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-melter-small +block-memory-cell-small rotate: false xy: 2068, 125 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-melter-tiny +block-memory-cell-tiny rotate: false xy: 1597, 55 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-melter-xlarge +block-memory-cell-xlarge rotate: false xy: 309, 254 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-memory-cell-large +block-mend-projector-large rotate: false xy: 923, 27 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-memory-cell-medium +block-mend-projector-medium rotate: false xy: 3945, 269 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-memory-cell-small +block-mend-projector-small rotate: false xy: 2120, 151 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-memory-cell-tiny +block-mend-projector-tiny rotate: false xy: 1615, 55 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-memory-cell-xlarge +block-mend-projector-xlarge rotate: false xy: 359, 304 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-mend-projector-large +block-mender-large rotate: false xy: 951, 321 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-mend-projector-medium +block-mender-medium rotate: false xy: 3979, 269 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-mend-projector-small +block-mender-small rotate: false xy: 2094, 125 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-mend-projector-tiny +block-mender-tiny rotate: false xy: 1633, 55 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-mend-projector-xlarge +block-mender-xlarge rotate: false xy: 309, 204 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-mender-large +block-message-large rotate: false xy: 951, 279 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-mender-medium +block-message-medium rotate: false xy: 4013, 269 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-mender-small +block-message-small rotate: false xy: 2146, 151 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-mender-tiny +block-message-tiny rotate: false xy: 1651, 55 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-mender-xlarge +block-message-xlarge rotate: false xy: 359, 254 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-message-large +block-metal-floor-2-large rotate: false xy: 951, 237 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-message-medium +block-metal-floor-2-medium rotate: false xy: 3329, 235 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-message-small +block-metal-floor-2-small rotate: false xy: 2120, 125 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-message-tiny +block-metal-floor-2-tiny rotate: false xy: 1669, 55 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-message-xlarge +block-metal-floor-2-xlarge rotate: false xy: 409, 304 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-metal-floor-2-large +block-metal-floor-3-large rotate: false xy: 943, 195 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-metal-floor-2-medium +block-metal-floor-3-medium rotate: false xy: 3363, 235 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-metal-floor-2-small +block-metal-floor-3-small rotate: false xy: 2172, 151 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-metal-floor-2-tiny +block-metal-floor-3-tiny rotate: false xy: 1687, 55 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-metal-floor-2-xlarge +block-metal-floor-3-xlarge rotate: false xy: 359, 204 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-metal-floor-3-large +block-metal-floor-5-large rotate: false xy: 943, 153 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-metal-floor-3-medium +block-metal-floor-5-medium rotate: false xy: 3397, 235 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-metal-floor-3-small +block-metal-floor-5-small rotate: false xy: 2146, 125 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-metal-floor-3-tiny +block-metal-floor-5-tiny rotate: false xy: 1705, 55 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-metal-floor-3-xlarge +block-metal-floor-5-xlarge rotate: false xy: 409, 254 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-metal-floor-5-large +block-metal-floor-damaged-large rotate: false xy: 993, 329 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-metal-floor-5-medium +block-metal-floor-damaged-medium rotate: false xy: 3431, 235 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-metal-floor-5-small +block-metal-floor-damaged-small rotate: false xy: 2198, 151 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-metal-floor-5-tiny +block-metal-floor-damaged-tiny rotate: false xy: 1723, 55 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-metal-floor-5-xlarge +block-metal-floor-damaged-xlarge rotate: false xy: 459, 304 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-metal-floor-damaged-large +block-metal-floor-large rotate: false xy: 993, 287 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-metal-floor-damaged-medium +block-metal-floor-medium rotate: false xy: 3465, 235 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-metal-floor-damaged-small +block-metal-floor-small rotate: false xy: 2172, 125 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-metal-floor-damaged-tiny +block-metal-floor-tiny rotate: false xy: 1741, 55 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-metal-floor-damaged-xlarge +block-metal-floor-xlarge rotate: false xy: 409, 204 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-metal-floor-large +block-micro-processor-large rotate: false xy: 1035, 329 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-metal-floor-medium +block-micro-processor-medium rotate: false xy: 3499, 235 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-metal-floor-small +block-micro-processor-small rotate: false xy: 2224, 151 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-metal-floor-tiny +block-micro-processor-tiny rotate: false xy: 1051, 39 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-metal-floor-xlarge +block-micro-processor-xlarge rotate: false xy: 459, 254 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-micro-processor-large +block-moss-large rotate: false xy: 993, 245 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-micro-processor-medium +block-moss-medium rotate: false xy: 3533, 235 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-micro-processor-small +block-moss-small rotate: false xy: 2198, 125 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-micro-processor-tiny +block-moss-tiny rotate: false xy: 1069, 39 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-micro-processor-xlarge +block-moss-xlarge rotate: false xy: 509, 304 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-moss-large +block-multi-press-large rotate: false xy: 1035, 287 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-moss-medium +block-multi-press-medium rotate: false xy: 3567, 235 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-moss-small +block-multi-press-small rotate: false xy: 2250, 151 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-moss-tiny +block-multi-press-tiny rotate: false xy: 1087, 39 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-moss-xlarge +block-multi-press-xlarge rotate: false xy: 459, 204 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-multi-press-large +block-multiplicative-reconstructor-large rotate: false xy: 1077, 329 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-multi-press-medium +block-multiplicative-reconstructor-medium rotate: false xy: 3601, 235 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-multi-press-small +block-multiplicative-reconstructor-small rotate: false xy: 2224, 125 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-multi-press-tiny +block-multiplicative-reconstructor-tiny rotate: false xy: 1105, 44 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-multi-press-xlarge +block-multiplicative-reconstructor-xlarge rotate: false xy: 509, 254 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-multiplicative-reconstructor-large +block-naval-factory-large rotate: false xy: 1035, 245 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-multiplicative-reconstructor-medium +block-naval-factory-medium rotate: false xy: 3635, 235 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-multiplicative-reconstructor-small +block-naval-factory-small rotate: false xy: 2276, 151 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-multiplicative-reconstructor-tiny +block-naval-factory-tiny rotate: false xy: 1759, 63 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-multiplicative-reconstructor-xlarge +block-naval-factory-xlarge rotate: false xy: 559, 304 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-naval-factory-large +block-oil-extractor-large rotate: false xy: 1077, 287 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-naval-factory-medium +block-oil-extractor-medium rotate: false xy: 3669, 235 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-naval-factory-small +block-oil-extractor-small rotate: false xy: 2250, 125 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-naval-factory-tiny +block-oil-extractor-tiny rotate: false xy: 1777, 63 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-naval-factory-xlarge +block-oil-extractor-xlarge rotate: false xy: 509, 204 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-oil-extractor-large +block-ore-coal-large rotate: false xy: 1119, 329 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-oil-extractor-medium +block-ore-coal-medium rotate: false xy: 3703, 235 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-oil-extractor-small +block-ore-coal-small rotate: false xy: 2302, 151 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-oil-extractor-tiny +block-ore-coal-tiny rotate: false xy: 1795, 63 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-oil-extractor-xlarge +block-ore-coal-xlarge rotate: false xy: 559, 254 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-ore-coal-large +block-ore-copper-large rotate: false xy: 1077, 245 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-ore-coal-medium +block-ore-copper-medium rotate: false xy: 3737, 235 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-ore-coal-small +block-ore-copper-small rotate: false xy: 2276, 125 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-ore-coal-tiny +block-ore-copper-tiny rotate: false xy: 1813, 63 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-ore-coal-xlarge +block-ore-copper-xlarge rotate: false xy: 609, 304 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-ore-copper-large +block-ore-lead-large rotate: false xy: 1119, 287 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-ore-copper-medium +block-ore-lead-medium rotate: false xy: 3771, 235 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-ore-copper-small +block-ore-lead-small rotate: false xy: 2328, 151 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-ore-copper-tiny +block-ore-lead-tiny rotate: false xy: 1831, 63 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-ore-copper-xlarge +block-ore-lead-xlarge rotate: false xy: 559, 204 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-ore-lead-large +block-ore-scrap-large rotate: false xy: 1161, 329 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-ore-lead-medium +block-ore-scrap-medium rotate: false xy: 3805, 235 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-ore-lead-small +block-ore-scrap-small rotate: false xy: 2302, 125 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-ore-lead-tiny +block-ore-scrap-tiny rotate: false xy: 1849, 63 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-ore-lead-xlarge +block-ore-scrap-xlarge rotate: false xy: 609, 254 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-ore-scrap-large +block-ore-thorium-large rotate: false xy: 1119, 245 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-ore-scrap-medium +block-ore-thorium-medium rotate: false xy: 3839, 235 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-ore-scrap-small +block-ore-thorium-small rotate: false xy: 2354, 151 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-ore-scrap-tiny +block-ore-thorium-tiny rotate: false xy: 1867, 63 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-ore-scrap-xlarge +block-ore-thorium-xlarge rotate: false xy: 659, 304 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-ore-thorium-large +block-ore-titanium-large rotate: false xy: 1161, 287 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-ore-thorium-medium +block-ore-titanium-medium rotate: false xy: 3873, 235 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-ore-thorium-small +block-ore-titanium-small rotate: false xy: 2328, 125 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-ore-thorium-tiny +block-ore-titanium-tiny rotate: false xy: 1885, 63 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-ore-thorium-xlarge +block-ore-titanium-xlarge rotate: false xy: 609, 204 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-ore-titanium-large +block-overdrive-dome-large rotate: false xy: 1203, 329 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-ore-titanium-medium +block-overdrive-dome-medium rotate: false xy: 3907, 235 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-ore-titanium-small +block-overdrive-dome-small rotate: false xy: 2380, 151 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-ore-titanium-tiny +block-overdrive-dome-tiny rotate: false xy: 1903, 63 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-ore-titanium-xlarge +block-overdrive-dome-xlarge rotate: false xy: 659, 254 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-overdrive-dome-large +block-overdrive-projector-large rotate: false xy: 1161, 245 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-overdrive-dome-medium +block-overdrive-projector-medium rotate: false xy: 3941, 235 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-overdrive-dome-small +block-overdrive-projector-small rotate: false xy: 2354, 125 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-overdrive-dome-tiny +block-overdrive-projector-tiny rotate: false xy: 1921, 63 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-overdrive-dome-xlarge +block-overdrive-projector-xlarge rotate: false xy: 709, 304 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-overdrive-projector-large +block-overflow-gate-large rotate: false xy: 1203, 287 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-overdrive-projector-medium +block-overflow-gate-medium rotate: false xy: 3975, 235 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-overdrive-projector-small +block-overflow-gate-small rotate: false xy: 2406, 151 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-overdrive-projector-tiny +block-overflow-gate-tiny rotate: false xy: 1939, 63 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-overdrive-projector-xlarge +block-overflow-gate-xlarge rotate: false xy: 659, 204 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-overflow-gate-large +block-parallax-large rotate: false xy: 1245, 329 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-overflow-gate-medium +block-parallax-medium rotate: false xy: 4009, 235 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-overflow-gate-small +block-parallax-small rotate: false xy: 2380, 125 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-overflow-gate-tiny +block-parallax-tiny rotate: false xy: 1957, 63 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-overflow-gate-xlarge +block-parallax-xlarge rotate: false xy: 709, 254 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-parallax-large +block-payload-conveyor-large rotate: false xy: 1203, 245 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-parallax-medium +block-payload-conveyor-medium rotate: false xy: 2883, 224 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-parallax-small +block-payload-conveyor-small rotate: false xy: 2432, 151 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-parallax-tiny +block-payload-conveyor-tiny rotate: false xy: 1975, 63 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-parallax-xlarge +block-payload-conveyor-xlarge rotate: false xy: 709, 204 size: 48, 48 diff --git a/core/assets/sprites/sprites.png b/core/assets/sprites/sprites.png index 1f1fa5ce2d..36b45b272c 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 a9891ea662..f65ca46d0c 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 d39bf90014..27ed8e81f9 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 9822452c36..0d8af5f905 100644 Binary files a/core/assets/sprites/sprites5.png and b/core/assets/sprites/sprites5.png differ diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index 9f4a0d94c4..68d1e9f990 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -1701,8 +1701,8 @@ public class Blocks implements ContentList{ groundFactory = new UnitFactory("ground-factory"){{ requirements(Category.units, with(Items.copper, 50, Items.lead, 120, Items.silicon, 80)); plans = new UnitPlan[]{ - new UnitPlan(UnitTypes.dagger, 60f * 20, with(Items.silicon, 10, Items.lead, 10)), - new UnitPlan(UnitTypes.crawler, 60f * 15, with(Items.silicon, 10, Items.coal, 20)), + new UnitPlan(UnitTypes.dagger, 60f * 15, with(Items.silicon, 10, Items.lead, 10)), + new UnitPlan(UnitTypes.crawler, 60f * 12, with(Items.silicon, 10, Items.coal, 20)), new UnitPlan(UnitTypes.nova, 60f * 40, with(Items.silicon, 30, Items.lead, 20, Items.titanium, 20)), }; size = 3; @@ -1710,7 +1710,7 @@ public class Blocks implements ContentList{ }}; airFactory = new UnitFactory("air-factory"){{ - requirements(Category.units, with(Items.copper, 30, Items.lead, 70)); + requirements(Category.units, with(Items.copper, 60, Items.lead, 70)); plans = new UnitPlan[]{ new UnitPlan(UnitTypes.flare, 60f * 15, with(Items.silicon, 15)), new UnitPlan(UnitTypes.mono, 60f * 35, with(Items.silicon, 30, Items.lead, 15)), @@ -1720,7 +1720,7 @@ public class Blocks implements ContentList{ }}; navalFactory = new UnitFactory("naval-factory"){{ - requirements(Category.units, with(Items.copper, 30, Items.lead, 70)); + requirements(Category.units, with(Items.copper, 150, Items.lead, 130, Items.metaglass, 120)); plans = new UnitPlan[]{ new UnitPlan(UnitTypes.risso, 60f * 30f, with(Items.silicon, 20, Items.metaglass, 25)), };