mindustry logic execution, map- and schematic- parsing and rendering
-rw-r--r--Cargo.toml2
-rw-r--r--assets/blocks/distribution/conveyors/armored-conveyor-0-0.png (renamed from assets/blocks/distribution/conveyors/armored-conveyor-0.png)bin272 -> 272 bytes
-rw-r--r--assets/blocks/distribution/conveyors/armored-conveyor-0-1.pngbin0 -> 361 bytes
-rw-r--r--assets/blocks/distribution/conveyors/armored-conveyor-0-2.pngbin0 -> 342 bytes
-rw-r--r--assets/blocks/distribution/conveyors/armored-conveyor-0-3.pngbin0 -> 362 bytes
-rw-r--r--assets/blocks/distribution/conveyors/armored-conveyor-1-0-h.pngbin0 -> 422 bytes
-rw-r--r--assets/blocks/distribution/conveyors/armored-conveyor-1-0.png (renamed from assets/blocks/distribution/conveyors/armored-conveyor-1.png)bin430 -> 430 bytes
-rw-r--r--assets/blocks/distribution/conveyors/armored-conveyor-1-1-h.pngbin0 -> 418 bytes
-rw-r--r--assets/blocks/distribution/conveyors/armored-conveyor-1-1-v.pngbin0 -> 423 bytes
-rw-r--r--assets/blocks/distribution/conveyors/armored-conveyor-1-1.pngbin0 -> 417 bytes
-rw-r--r--assets/blocks/distribution/conveyors/armored-conveyor-1-2.pngbin0 -> 418 bytes
-rw-r--r--assets/blocks/distribution/conveyors/armored-conveyor-1-3.pngbin0 -> 423 bytes
-rw-r--r--assets/blocks/distribution/conveyors/armored-conveyor-2-0-h.pngbin0 -> 366 bytes
-rw-r--r--assets/blocks/distribution/conveyors/armored-conveyor-2-0-v.pngbin0 -> 376 bytes
-rw-r--r--assets/blocks/distribution/conveyors/armored-conveyor-2-0.png (renamed from assets/blocks/distribution/conveyors/armored-conveyor-2.png)bin290 -> 290 bytes
-rw-r--r--assets/blocks/distribution/conveyors/armored-conveyor-2-1-h.pngbin0 -> 375 bytes
-rw-r--r--assets/blocks/distribution/conveyors/armored-conveyor-2-1.pngbin0 -> 371 bytes
-rw-r--r--assets/blocks/distribution/conveyors/armored-conveyor-2-2.pngbin0 -> 371 bytes
-rw-r--r--assets/blocks/distribution/conveyors/armored-conveyor-2-3-h.pngbin0 -> 369 bytes
-rw-r--r--assets/blocks/distribution/conveyors/armored-conveyor-2-3.pngbin0 -> 372 bytes
-rw-r--r--assets/blocks/distribution/conveyors/armored-conveyor-3-0-h.pngbin0 -> 318 bytes
-rw-r--r--assets/blocks/distribution/conveyors/armored-conveyor-3-0.png (renamed from assets/blocks/distribution/conveyors/armored-conveyor-3.png)bin187 -> 187 bytes
-rw-r--r--assets/blocks/distribution/conveyors/armored-conveyor-3-1.pngbin0 -> 324 bytes
-rw-r--r--assets/blocks/distribution/conveyors/armored-conveyor-3-3.pngbin0 -> 324 bytes
-rw-r--r--assets/blocks/distribution/conveyors/armored-conveyor-4-0.png (renamed from assets/blocks/distribution/conveyors/armored-conveyor-4.png)bin258 -> 258 bytes
-rw-r--r--assets/blocks/distribution/conveyors/armored-conveyor-4-1.pngbin0 -> 359 bytes
-rw-r--r--assets/blocks/distribution/conveyors/armored-conveyor-4-3.pngbin0 -> 361 bytes
-rw-r--r--assets/blocks/distribution/conveyors/conveyor-0-0.png (renamed from assets/blocks/distribution/conveyors/conveyor-0.png)bin145 -> 145 bytes
-rw-r--r--assets/blocks/distribution/conveyors/conveyor-0-1.pngbin0 -> 272 bytes
-rw-r--r--assets/blocks/distribution/conveyors/conveyor-0-2.pngbin0 -> 276 bytes
-rw-r--r--assets/blocks/distribution/conveyors/conveyor-0-3.pngbin0 -> 271 bytes
-rw-r--r--assets/blocks/distribution/conveyors/conveyor-1-0-h.pngbin0 -> 366 bytes
-rw-r--r--assets/blocks/distribution/conveyors/conveyor-1-0.png (renamed from assets/blocks/distribution/conveyors/conveyor-1.png)bin263 -> 263 bytes
-rw-r--r--assets/blocks/distribution/conveyors/conveyor-1-1-h.pngbin0 -> 362 bytes
-rw-r--r--assets/blocks/distribution/conveyors/conveyor-1-1-v.pngbin0 -> 365 bytes
-rw-r--r--assets/blocks/distribution/conveyors/conveyor-1-1.pngbin0 -> 361 bytes
-rw-r--r--assets/blocks/distribution/conveyors/conveyor-1-2.pngbin0 -> 362 bytes
-rw-r--r--assets/blocks/distribution/conveyors/conveyor-1-3.pngbin0 -> 362 bytes
-rw-r--r--assets/blocks/distribution/conveyors/conveyor-2-0-h.pngbin0 -> 313 bytes
-rw-r--r--assets/blocks/distribution/conveyors/conveyor-2-0-v.pngbin0 -> 315 bytes
-rw-r--r--assets/blocks/distribution/conveyors/conveyor-2-0.png (renamed from assets/blocks/distribution/conveyors/conveyor-2.png)bin182 -> 182 bytes
-rw-r--r--assets/blocks/distribution/conveyors/conveyor-2-1-h.pngbin0 -> 307 bytes
-rw-r--r--assets/blocks/distribution/conveyors/conveyor-2-1.pngbin0 -> 307 bytes
-rw-r--r--assets/blocks/distribution/conveyors/conveyor-2-2.pngbin0 -> 315 bytes
-rw-r--r--assets/blocks/distribution/conveyors/conveyor-2-3-h.pngbin0 -> 303 bytes
-rw-r--r--assets/blocks/distribution/conveyors/conveyor-2-3.pngbin0 -> 309 bytes
-rw-r--r--assets/blocks/distribution/conveyors/conveyor-3-0-h.pngbin0 -> 318 bytes
-rw-r--r--assets/blocks/distribution/conveyors/conveyor-3-0.png (renamed from assets/blocks/distribution/conveyors/conveyor-3.png)bin188 -> 188 bytes
-rw-r--r--assets/blocks/distribution/conveyors/conveyor-3-1.pngbin0 -> 327 bytes
-rw-r--r--assets/blocks/distribution/conveyors/conveyor-3-3.pngbin0 -> 326 bytes
-rw-r--r--assets/blocks/distribution/conveyors/conveyor-4-0.png (renamed from assets/blocks/distribution/conveyors/conveyor-4.png)bin172 -> 172 bytes
-rw-r--r--assets/blocks/distribution/conveyors/conveyor-4-1.pngbin0 -> 307 bytes
-rw-r--r--assets/blocks/distribution/conveyors/conveyor-4-3.pngbin0 -> 308 bytes
-rw-r--r--assets/blocks/distribution/conveyors/titanium-conveyor-0-0.png (renamed from assets/blocks/distribution/conveyors/titanium-conveyor-0.png)bin152 -> 152 bytes
-rw-r--r--assets/blocks/distribution/conveyors/titanium-conveyor-0-1.pngbin0 -> 278 bytes
-rw-r--r--assets/blocks/distribution/conveyors/titanium-conveyor-0-2.pngbin0 -> 285 bytes
-rw-r--r--assets/blocks/distribution/conveyors/titanium-conveyor-0-3.pngbin0 -> 278 bytes
-rw-r--r--assets/blocks/distribution/conveyors/titanium-conveyor-1-0-h.pngbin0 -> 375 bytes
-rw-r--r--assets/blocks/distribution/conveyors/titanium-conveyor-1-0.png (renamed from assets/blocks/distribution/conveyors/titanium-conveyor-1.png)bin275 -> 275 bytes
-rw-r--r--assets/blocks/distribution/conveyors/titanium-conveyor-1-1-h.pngbin0 -> 376 bytes
-rw-r--r--assets/blocks/distribution/conveyors/titanium-conveyor-1-1-v.pngbin0 -> 382 bytes
-rw-r--r--assets/blocks/distribution/conveyors/titanium-conveyor-1-1.pngbin0 -> 375 bytes
-rw-r--r--assets/blocks/distribution/conveyors/titanium-conveyor-1-2.pngbin0 -> 380 bytes
-rw-r--r--assets/blocks/distribution/conveyors/titanium-conveyor-1-3.pngbin0 -> 379 bytes
-rw-r--r--assets/blocks/distribution/conveyors/titanium-conveyor-2-0-h.pngbin0 -> 321 bytes
-rw-r--r--assets/blocks/distribution/conveyors/titanium-conveyor-2-0-v.pngbin0 -> 324 bytes
-rw-r--r--assets/blocks/distribution/conveyors/titanium-conveyor-2-0.png (renamed from assets/blocks/distribution/conveyors/titanium-conveyor-2.png)bin188 -> 188 bytes
-rw-r--r--assets/blocks/distribution/conveyors/titanium-conveyor-2-1-h.pngbin0 -> 312 bytes
-rw-r--r--assets/blocks/distribution/conveyors/titanium-conveyor-2-1.pngbin0 -> 311 bytes
-rw-r--r--assets/blocks/distribution/conveyors/titanium-conveyor-2-2.pngbin0 -> 323 bytes
-rw-r--r--assets/blocks/distribution/conveyors/titanium-conveyor-2-3-h.pngbin0 -> 310 bytes
-rw-r--r--assets/blocks/distribution/conveyors/titanium-conveyor-2-3.pngbin0 -> 315 bytes
-rw-r--r--assets/blocks/distribution/conveyors/titanium-conveyor-3-0-h.pngbin0 -> 318 bytes
-rw-r--r--assets/blocks/distribution/conveyors/titanium-conveyor-3-0.png (renamed from assets/blocks/distribution/conveyors/titanium-conveyor-3.png)bin188 -> 188 bytes
-rw-r--r--assets/blocks/distribution/conveyors/titanium-conveyor-3-1.pngbin0 -> 327 bytes
-rw-r--r--assets/blocks/distribution/conveyors/titanium-conveyor-3-3.pngbin0 -> 326 bytes
-rw-r--r--assets/blocks/distribution/conveyors/titanium-conveyor-4-0.png (renamed from assets/blocks/distribution/conveyors/titanium-conveyor-4.png)bin177 -> 177 bytes
-rw-r--r--assets/blocks/distribution/conveyors/titanium-conveyor-4-1.pngbin0 -> 315 bytes
-rw-r--r--assets/blocks/distribution/conveyors/titanium-conveyor-4-3.pngbin0 -> 315 bytes
-rw-r--r--assets/blocks/distribution/ducts/armored-duct-0-0.png (renamed from assets/blocks/distribution/ducts/armored-duct-0.png)bin298 -> 298 bytes
-rw-r--r--assets/blocks/distribution/ducts/armored-duct-0-1.pngbin0 -> 335 bytes
-rw-r--r--assets/blocks/distribution/ducts/armored-duct-0-2.pngbin0 -> 301 bytes
-rw-r--r--assets/blocks/distribution/ducts/armored-duct-0-3.pngbin0 -> 342 bytes
-rw-r--r--assets/blocks/distribution/ducts/armored-duct-1-0-h.pngbin0 -> 376 bytes
-rw-r--r--assets/blocks/distribution/ducts/armored-duct-1-0.png (renamed from assets/blocks/distribution/ducts/armored-duct-1.png)bin375 -> 375 bytes
-rw-r--r--assets/blocks/distribution/ducts/armored-duct-1-1-h.pngbin0 -> 372 bytes
-rw-r--r--assets/blocks/distribution/ducts/armored-duct-1-1-v.pngbin0 -> 375 bytes
-rw-r--r--assets/blocks/distribution/ducts/armored-duct-1-1.pngbin0 -> 369 bytes
-rw-r--r--assets/blocks/distribution/ducts/armored-duct-1-2.pngbin0 -> 374 bytes
-rw-r--r--assets/blocks/distribution/ducts/armored-duct-1-3.pngbin0 -> 377 bytes
-rw-r--r--assets/blocks/distribution/ducts/armored-duct-2-0-h.pngbin0 -> 312 bytes
-rw-r--r--assets/blocks/distribution/ducts/armored-duct-2-0-v.pngbin0 -> 316 bytes
-rw-r--r--assets/blocks/distribution/ducts/armored-duct-2-0.png (renamed from assets/blocks/distribution/ducts/armored-duct-2.png)bin312 -> 312 bytes
-rw-r--r--assets/blocks/distribution/ducts/armored-duct-2-1-h.pngbin0 -> 351 bytes
-rw-r--r--assets/blocks/distribution/ducts/armored-duct-2-1.pngbin0 -> 351 bytes
-rw-r--r--assets/blocks/distribution/ducts/armored-duct-2-2.pngbin0 -> 315 bytes
-rw-r--r--assets/blocks/distribution/ducts/armored-duct-2-3-h.pngbin0 -> 354 bytes
-rw-r--r--assets/blocks/distribution/ducts/armored-duct-2-3.pngbin0 -> 351 bytes
-rw-r--r--assets/blocks/distribution/ducts/armored-duct-3-0-h.pngbin0 -> 313 bytes
-rw-r--r--assets/blocks/distribution/ducts/armored-duct-3-0.png (renamed from assets/blocks/distribution/ducts/armored-duct-3.png)bin312 -> 312 bytes
-rw-r--r--assets/blocks/distribution/ducts/armored-duct-3-1.pngbin0 -> 340 bytes
-rw-r--r--assets/blocks/distribution/ducts/armored-duct-3-3.pngbin0 -> 345 bytes
-rw-r--r--assets/blocks/distribution/ducts/armored-duct-4-0.png (renamed from assets/blocks/distribution/ducts/armored-duct-4.png)bin331 -> 331 bytes
-rw-r--r--assets/blocks/distribution/ducts/armored-duct-4-1.pngbin0 -> 339 bytes
-rw-r--r--assets/blocks/distribution/ducts/armored-duct-4-3.pngbin0 -> 340 bytes
-rw-r--r--assets/blocks/distribution/ducts/duct-0-0.png (renamed from assets/blocks/distribution/ducts/duct-0.png)bin290 -> 290 bytes
-rw-r--r--assets/blocks/distribution/ducts/duct-0-1.pngbin0 -> 307 bytes
-rw-r--r--assets/blocks/distribution/ducts/duct-0-2.pngbin0 -> 292 bytes
-rw-r--r--assets/blocks/distribution/ducts/duct-0-3.pngbin0 -> 306 bytes
-rw-r--r--assets/blocks/distribution/ducts/duct-1-0-h.pngbin0 -> 340 bytes
-rw-r--r--assets/blocks/distribution/ducts/duct-1-0.png (renamed from assets/blocks/distribution/ducts/duct-1.png)bin345 -> 345 bytes
-rw-r--r--assets/blocks/distribution/ducts/duct-1-1-h.pngbin0 -> 337 bytes
-rw-r--r--assets/blocks/distribution/ducts/duct-1-1-v.pngbin0 -> 341 bytes
-rw-r--r--assets/blocks/distribution/ducts/duct-1-1.pngbin0 -> 344 bytes
-rw-r--r--assets/blocks/distribution/ducts/duct-1-2.pngbin0 -> 341 bytes
-rw-r--r--assets/blocks/distribution/ducts/duct-1-3.pngbin0 -> 338 bytes
-rw-r--r--assets/blocks/distribution/ducts/duct-2-0-h.pngbin0 -> 305 bytes
-rw-r--r--assets/blocks/distribution/ducts/duct-2-0-v.pngbin0 -> 308 bytes
-rw-r--r--assets/blocks/distribution/ducts/duct-2-0.png (renamed from assets/blocks/distribution/ducts/duct-2.png)bin305 -> 305 bytes
-rw-r--r--assets/blocks/distribution/ducts/duct-2-1-h.pngbin0 -> 318 bytes
-rw-r--r--assets/blocks/distribution/ducts/duct-2-1.pngbin0 -> 320 bytes
-rw-r--r--assets/blocks/distribution/ducts/duct-2-2.pngbin0 -> 305 bytes
-rw-r--r--assets/blocks/distribution/ducts/duct-2-3-h.pngbin0 -> 320 bytes
-rw-r--r--assets/blocks/distribution/ducts/duct-2-3.pngbin0 -> 322 bytes
-rw-r--r--assets/blocks/distribution/ducts/duct-3-0-h.pngbin0 -> 306 bytes
-rw-r--r--assets/blocks/distribution/ducts/duct-3-0.png (renamed from assets/blocks/distribution/ducts/duct-3.png)bin303 -> 303 bytes
-rw-r--r--assets/blocks/distribution/ducts/duct-3-1.pngbin0 -> 326 bytes
-rw-r--r--assets/blocks/distribution/ducts/duct-3-3.pngbin0 -> 325 bytes
-rw-r--r--assets/blocks/distribution/ducts/duct-4-0.png (renamed from assets/blocks/distribution/ducts/duct-4.png)bin312 -> 312 bytes
-rw-r--r--assets/blocks/distribution/ducts/duct-4-1.pngbin0 -> 323 bytes
-rw-r--r--assets/blocks/distribution/ducts/duct-4-3.pngbin0 -> 322 bytes
-rw-r--r--assets/blocks/liquid/conduits/conduit-0-0.png (renamed from assets/blocks/liquid/conduits/conduit-0.png)bin185 -> 185 bytes
-rw-r--r--assets/blocks/liquid/conduits/conduit-0-1.pngbin0 -> 303 bytes
-rw-r--r--assets/blocks/liquid/conduits/conduit-0-2.pngbin0 -> 300 bytes
-rw-r--r--assets/blocks/liquid/conduits/conduit-0-3.pngbin0 -> 305 bytes
-rw-r--r--assets/blocks/liquid/conduits/conduit-1-0-h.pngbin0 -> 356 bytes
-rw-r--r--assets/blocks/liquid/conduits/conduit-1-0.png (renamed from assets/blocks/liquid/conduits/conduit-1.png)bin243 -> 243 bytes
-rw-r--r--assets/blocks/liquid/conduits/conduit-1-1-h.pngbin0 -> 358 bytes
-rw-r--r--assets/blocks/liquid/conduits/conduit-1-1-v.pngbin0 -> 362 bytes
-rw-r--r--assets/blocks/liquid/conduits/conduit-1-1.pngbin0 -> 354 bytes
-rw-r--r--assets/blocks/liquid/conduits/conduit-1-2.pngbin0 -> 355 bytes
-rw-r--r--assets/blocks/liquid/conduits/conduit-1-3.pngbin0 -> 356 bytes
-rw-r--r--assets/blocks/liquid/conduits/conduit-2-0-h.pngbin0 -> 329 bytes
-rw-r--r--assets/blocks/liquid/conduits/conduit-2-0-v.pngbin0 -> 323 bytes
-rw-r--r--assets/blocks/liquid/conduits/conduit-2-0.png (renamed from assets/blocks/liquid/conduits/conduit-2.png)bin215 -> 215 bytes
-rw-r--r--assets/blocks/liquid/conduits/conduit-2-1-h.pngbin0 -> 329 bytes
-rw-r--r--assets/blocks/liquid/conduits/conduit-2-1.pngbin0 -> 327 bytes
-rw-r--r--assets/blocks/liquid/conduits/conduit-2-2.pngbin0 -> 327 bytes
-rw-r--r--assets/blocks/liquid/conduits/conduit-2-3-h.pngbin0 -> 330 bytes
-rw-r--r--assets/blocks/liquid/conduits/conduit-2-3.pngbin0 -> 331 bytes
-rw-r--r--assets/blocks/liquid/conduits/conduit-3-0-h.pngbin0 -> 328 bytes
-rw-r--r--assets/blocks/liquid/conduits/conduit-3-0.pngbin0 -> 212 bytes
-rw-r--r--assets/blocks/liquid/conduits/conduit-3-1.pngbin0 -> 343 bytes
-rw-r--r--assets/blocks/liquid/conduits/conduit-3-3.pngbin0 -> 343 bytes
-rw-r--r--assets/blocks/liquid/conduits/conduit-3.pngbin219 -> 0 bytes
-rw-r--r--assets/blocks/liquid/conduits/conduit-4-0.png (renamed from assets/blocks/liquid/conduits/conduit-4.png)bin202 -> 202 bytes
-rw-r--r--assets/blocks/liquid/conduits/conduit-4-1.pngbin0 -> 334 bytes
-rw-r--r--assets/blocks/liquid/conduits/conduit-4-3.pngbin0 -> 326 bytes
-rw-r--r--assets/blocks/liquid/conduits/plated-conduit-0-0.png (renamed from assets/blocks/liquid/conduits/plated-conduit-0.png)bin210 -> 210 bytes
-rw-r--r--assets/blocks/liquid/conduits/plated-conduit-0-1.pngbin0 -> 367 bytes
-rw-r--r--assets/blocks/liquid/conduits/plated-conduit-0-2.pngbin0 -> 333 bytes
-rw-r--r--assets/blocks/liquid/conduits/plated-conduit-0-3.pngbin0 -> 368 bytes
-rw-r--r--assets/blocks/liquid/conduits/plated-conduit-1-0-h.pngbin0 -> 409 bytes
-rw-r--r--assets/blocks/liquid/conduits/plated-conduit-1-0.png (renamed from assets/blocks/liquid/conduits/plated-conduit-1.png)bin272 -> 272 bytes
-rw-r--r--assets/blocks/liquid/conduits/plated-conduit-1-1-h.pngbin0 -> 402 bytes
-rw-r--r--assets/blocks/liquid/conduits/plated-conduit-1-1-v.pngbin0 -> 417 bytes
-rw-r--r--assets/blocks/liquid/conduits/plated-conduit-1-1.pngbin0 -> 394 bytes
-rw-r--r--assets/blocks/liquid/conduits/plated-conduit-1-2.pngbin0 -> 399 bytes
-rw-r--r--assets/blocks/liquid/conduits/plated-conduit-1-3.pngbin0 -> 409 bytes
-rw-r--r--assets/blocks/liquid/conduits/plated-conduit-2-0-h.pngbin0 -> 362 bytes
-rw-r--r--assets/blocks/liquid/conduits/plated-conduit-2-0-v.pngbin0 -> 364 bytes
-rw-r--r--assets/blocks/liquid/conduits/plated-conduit-2-0.png (renamed from assets/blocks/liquid/conduits/plated-conduit-2.png)bin227 -> 227 bytes
-rw-r--r--assets/blocks/liquid/conduits/plated-conduit-2-1-h.pngbin0 -> 373 bytes
-rw-r--r--assets/blocks/liquid/conduits/plated-conduit-2-1.pngbin0 -> 370 bytes
-rw-r--r--assets/blocks/liquid/conduits/plated-conduit-2-2.pngbin0 -> 363 bytes
-rw-r--r--assets/blocks/liquid/conduits/plated-conduit-2-3-h.pngbin0 -> 373 bytes
-rw-r--r--assets/blocks/liquid/conduits/plated-conduit-2-3.pngbin0 -> 371 bytes
-rw-r--r--assets/blocks/liquid/conduits/plated-conduit-3-0-h.pngbin0 -> 342 bytes
-rw-r--r--assets/blocks/liquid/conduits/plated-conduit-3-0.png (renamed from assets/blocks/liquid/conduits/plated-conduit-3.png)bin215 -> 215 bytes
-rw-r--r--assets/blocks/liquid/conduits/plated-conduit-3-1.pngbin0 -> 362 bytes
-rw-r--r--assets/blocks/liquid/conduits/plated-conduit-3-3.pngbin0 -> 360 bytes
-rw-r--r--assets/blocks/liquid/conduits/plated-conduit-4-0.png (renamed from assets/blocks/liquid/conduits/plated-conduit-4.png)bin228 -> 228 bytes
-rw-r--r--assets/blocks/liquid/conduits/plated-conduit-4-1.pngbin0 -> 359 bytes
-rw-r--r--assets/blocks/liquid/conduits/plated-conduit-4-3.pngbin0 -> 361 bytes
-rw-r--r--assets/blocks/liquid/conduits/pulse-conduit-0-0.png (renamed from assets/blocks/liquid/conduits/pulse-conduit-0.png)bin223 -> 223 bytes
-rw-r--r--assets/blocks/liquid/conduits/pulse-conduit-0-1.pngbin0 -> 360 bytes
-rw-r--r--assets/blocks/liquid/conduits/pulse-conduit-0-2.pngbin0 -> 333 bytes
-rw-r--r--assets/blocks/liquid/conduits/pulse-conduit-0-3.pngbin0 -> 363 bytes
-rw-r--r--assets/blocks/liquid/conduits/pulse-conduit-1-0-h.pngbin0 -> 409 bytes
-rw-r--r--assets/blocks/liquid/conduits/pulse-conduit-1-0.png (renamed from assets/blocks/liquid/conduits/pulse-conduit-1.png)bin297 -> 297 bytes
-rw-r--r--assets/blocks/liquid/conduits/pulse-conduit-1-1-h.pngbin0 -> 402 bytes
-rw-r--r--assets/blocks/liquid/conduits/pulse-conduit-1-1-v.pngbin0 -> 417 bytes
-rw-r--r--assets/blocks/liquid/conduits/pulse-conduit-1-1.pngbin0 -> 394 bytes
-rw-r--r--assets/blocks/liquid/conduits/pulse-conduit-1-2.pngbin0 -> 399 bytes
-rw-r--r--assets/blocks/liquid/conduits/pulse-conduit-1-3.pngbin0 -> 409 bytes
-rw-r--r--assets/blocks/liquid/conduits/pulse-conduit-2-0-h.pngbin0 -> 362 bytes
-rw-r--r--assets/blocks/liquid/conduits/pulse-conduit-2-0-v.pngbin0 -> 364 bytes
-rw-r--r--assets/blocks/liquid/conduits/pulse-conduit-2-0.png (renamed from assets/blocks/liquid/conduits/pulse-conduit-2.png)bin253 -> 253 bytes
-rw-r--r--assets/blocks/liquid/conduits/pulse-conduit-2-1-h.pngbin0 -> 373 bytes
-rw-r--r--assets/blocks/liquid/conduits/pulse-conduit-2-1.pngbin0 -> 370 bytes
-rw-r--r--assets/blocks/liquid/conduits/pulse-conduit-2-2.pngbin0 -> 363 bytes
-rw-r--r--assets/blocks/liquid/conduits/pulse-conduit-2-3-h.pngbin0 -> 373 bytes
-rw-r--r--assets/blocks/liquid/conduits/pulse-conduit-2-3.pngbin0 -> 371 bytes
-rw-r--r--assets/blocks/liquid/conduits/pulse-conduit-3-0-h.pngbin0 -> 342 bytes
-rw-r--r--assets/blocks/liquid/conduits/pulse-conduit-3-0.png (renamed from assets/blocks/liquid/conduits/pulse-conduit-3.png)bin263 -> 263 bytes
-rw-r--r--assets/blocks/liquid/conduits/pulse-conduit-3-1.pngbin0 -> 362 bytes
-rw-r--r--assets/blocks/liquid/conduits/pulse-conduit-3-3.pngbin0 -> 360 bytes
-rw-r--r--assets/blocks/liquid/conduits/pulse-conduit-4-0.png (renamed from assets/blocks/liquid/conduits/pulse-conduit-4.png)bin235 -> 235 bytes
-rw-r--r--assets/blocks/liquid/conduits/pulse-conduit-4-1.pngbin0 -> 359 bytes
-rw-r--r--assets/blocks/liquid/conduits/pulse-conduit-4-3.pngbin0 -> 357 bytes
-rw-r--r--assets/blocks/liquid/conduits/reinforced-conduit-0-0.pngbin0 -> 218 bytes
-rw-r--r--assets/blocks/liquid/conduits/reinforced-conduit-0-1.pngbin0 -> 364 bytes
-rw-r--r--assets/blocks/liquid/conduits/reinforced-conduit-0-2.pngbin0 -> 340 bytes
-rw-r--r--assets/blocks/liquid/conduits/reinforced-conduit-0-3.pngbin0 -> 363 bytes
-rw-r--r--assets/blocks/liquid/conduits/reinforced-conduit-0.pngbin219 -> 0 bytes
-rw-r--r--assets/blocks/liquid/conduits/reinforced-conduit-1-0-h.pngbin0 -> 395 bytes
-rw-r--r--assets/blocks/liquid/conduits/reinforced-conduit-1-0.png (renamed from assets/blocks/liquid/conduits/reinforced-conduit-1.png)bin257 -> 257 bytes
-rw-r--r--assets/blocks/liquid/conduits/reinforced-conduit-1-1-h.pngbin0 -> 400 bytes
-rw-r--r--assets/blocks/liquid/conduits/reinforced-conduit-1-1-v.pngbin0 -> 404 bytes
-rw-r--r--assets/blocks/liquid/conduits/reinforced-conduit-1-1.pngbin0 -> 385 bytes
-rw-r--r--assets/blocks/liquid/conduits/reinforced-conduit-1-2.pngbin0 -> 396 bytes
-rw-r--r--assets/blocks/liquid/conduits/reinforced-conduit-1-3.pngbin0 -> 394 bytes
-rw-r--r--assets/blocks/liquid/conduits/reinforced-conduit-2-0-h.pngbin0 -> 346 bytes
-rw-r--r--assets/blocks/liquid/conduits/reinforced-conduit-2-0-v.pngbin0 -> 340 bytes
-rw-r--r--assets/blocks/liquid/conduits/reinforced-conduit-2-0.png (renamed from assets/blocks/liquid/conduits/reinforced-conduit-2.png)bin219 -> 219 bytes
-rw-r--r--assets/blocks/liquid/conduits/reinforced-conduit-2-1-h.pngbin0 -> 354 bytes
-rw-r--r--assets/blocks/liquid/conduits/reinforced-conduit-2-1.pngbin0 -> 348 bytes
-rw-r--r--assets/blocks/liquid/conduits/reinforced-conduit-2-2.pngbin0 -> 339 bytes
-rw-r--r--assets/blocks/liquid/conduits/reinforced-conduit-2-3-h.pngbin0 -> 350 bytes
-rw-r--r--assets/blocks/liquid/conduits/reinforced-conduit-2-3.pngbin0 -> 348 bytes
-rw-r--r--assets/blocks/liquid/conduits/reinforced-conduit-3-0-h.pngbin0 -> 306 bytes
-rw-r--r--assets/blocks/liquid/conduits/reinforced-conduit-3-0.pngbin0 -> 195 bytes
-rw-r--r--assets/blocks/liquid/conduits/reinforced-conduit-3-1.pngbin0 -> 318 bytes
-rw-r--r--assets/blocks/liquid/conduits/reinforced-conduit-3-3.pngbin0 -> 316 bytes
-rw-r--r--assets/blocks/liquid/conduits/reinforced-conduit-3.pngbin198 -> 0 bytes
-rw-r--r--assets/blocks/liquid/conduits/reinforced-conduit-4-0.png (renamed from assets/blocks/liquid/conduits/reinforced-conduit-4.png)bin244 -> 244 bytes
-rw-r--r--assets/blocks/liquid/conduits/reinforced-conduit-4-1.pngbin0 -> 348 bytes
-rw-r--r--assets/blocks/liquid/conduits/reinforced-conduit-4-3.pngbin0 -> 346 bytes
-rw-r--r--src/block/distribution.rs2
-rw-r--r--src/block/drills.rs2
-rw-r--r--src/block/liquid.rs4
-rw-r--r--src/block/payload.rs6
-rw-r--r--src/block/production.rs8
-rw-r--r--src/block/units.rs8
-rw-r--r--src/data/autotile.rs134
-rw-r--r--src/data/renderer.rs2
246 files changed, 56 insertions, 112 deletions
diff --git a/Cargo.toml b/Cargo.toml
index 96847ea..9c42197 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "mindus"
-version = "4.0.0"
+version = "4.0.1"
edition = "2021"
description = "A library for working with mindustry data formats (eg schematics and maps) (fork of plandustry)"
authors = [
diff --git a/assets/blocks/distribution/conveyors/armored-conveyor-0.png b/assets/blocks/distribution/conveyors/armored-conveyor-0-0.png
index 9becfdf..9becfdf 100644
--- a/assets/blocks/distribution/conveyors/armored-conveyor-0.png
+++ b/assets/blocks/distribution/conveyors/armored-conveyor-0-0.png
Binary files differ
diff --git a/assets/blocks/distribution/conveyors/armored-conveyor-0-1.png b/assets/blocks/distribution/conveyors/armored-conveyor-0-1.png
new file mode 100644
index 0000000..4685ab6
--- /dev/null
+++ b/assets/blocks/distribution/conveyors/armored-conveyor-0-1.png
Binary files differ
diff --git a/assets/blocks/distribution/conveyors/armored-conveyor-0-2.png b/assets/blocks/distribution/conveyors/armored-conveyor-0-2.png
new file mode 100644
index 0000000..f10b176
--- /dev/null
+++ b/assets/blocks/distribution/conveyors/armored-conveyor-0-2.png
Binary files differ
diff --git a/assets/blocks/distribution/conveyors/armored-conveyor-0-3.png b/assets/blocks/distribution/conveyors/armored-conveyor-0-3.png
new file mode 100644
index 0000000..9c002ed
--- /dev/null
+++ b/assets/blocks/distribution/conveyors/armored-conveyor-0-3.png
Binary files differ
diff --git a/assets/blocks/distribution/conveyors/armored-conveyor-1-0-h.png b/assets/blocks/distribution/conveyors/armored-conveyor-1-0-h.png
new file mode 100644
index 0000000..25835e4
--- /dev/null
+++ b/assets/blocks/distribution/conveyors/armored-conveyor-1-0-h.png
Binary files differ
diff --git a/assets/blocks/distribution/conveyors/armored-conveyor-1.png b/assets/blocks/distribution/conveyors/armored-conveyor-1-0.png
index 21ed583..21ed583 100644
--- a/assets/blocks/distribution/conveyors/armored-conveyor-1.png
+++ b/assets/blocks/distribution/conveyors/armored-conveyor-1-0.png
Binary files differ
diff --git a/assets/blocks/distribution/conveyors/armored-conveyor-1-1-h.png b/assets/blocks/distribution/conveyors/armored-conveyor-1-1-h.png
new file mode 100644
index 0000000..f7c2705
--- /dev/null
+++ b/assets/blocks/distribution/conveyors/armored-conveyor-1-1-h.png
Binary files differ
diff --git a/assets/blocks/distribution/conveyors/armored-conveyor-1-1-v.png b/assets/blocks/distribution/conveyors/armored-conveyor-1-1-v.png
new file mode 100644
index 0000000..c31f105
--- /dev/null
+++ b/assets/blocks/distribution/conveyors/armored-conveyor-1-1-v.png
Binary files differ
diff --git a/assets/blocks/distribution/conveyors/armored-conveyor-1-1.png b/assets/blocks/distribution/conveyors/armored-conveyor-1-1.png
new file mode 100644
index 0000000..be087fa
--- /dev/null
+++ b/assets/blocks/distribution/conveyors/armored-conveyor-1-1.png
Binary files differ
diff --git a/assets/blocks/distribution/conveyors/armored-conveyor-1-2.png b/assets/blocks/distribution/conveyors/armored-conveyor-1-2.png
new file mode 100644
index 0000000..5c7a30a
--- /dev/null
+++ b/assets/blocks/distribution/conveyors/armored-conveyor-1-2.png
Binary files differ
diff --git a/assets/blocks/distribution/conveyors/armored-conveyor-1-3.png b/assets/blocks/distribution/conveyors/armored-conveyor-1-3.png
new file mode 100644
index 0000000..32bf421
--- /dev/null
+++ b/assets/blocks/distribution/conveyors/armored-conveyor-1-3.png
Binary files differ
diff --git a/assets/blocks/distribution/conveyors/armored-conveyor-2-0-h.png b/assets/blocks/distribution/conveyors/armored-conveyor-2-0-h.png
new file mode 100644
index 0000000..f2c6105
--- /dev/null
+++ b/assets/blocks/distribution/conveyors/armored-conveyor-2-0-h.png
Binary files differ
diff --git a/assets/blocks/distribution/conveyors/armored-conveyor-2-0-v.png b/assets/blocks/distribution/conveyors/armored-conveyor-2-0-v.png
new file mode 100644
index 0000000..04e8329
--- /dev/null
+++ b/assets/blocks/distribution/conveyors/armored-conveyor-2-0-v.png
Binary files differ
diff --git a/assets/blocks/distribution/conveyors/armored-conveyor-2.png b/assets/blocks/distribution/conveyors/armored-conveyor-2-0.png
index 72eba5c..72eba5c 100644
--- a/assets/blocks/distribution/conveyors/armored-conveyor-2.png
+++ b/assets/blocks/distribution/conveyors/armored-conveyor-2-0.png
Binary files differ
diff --git a/assets/blocks/distribution/conveyors/armored-conveyor-2-1-h.png b/assets/blocks/distribution/conveyors/armored-conveyor-2-1-h.png
new file mode 100644
index 0000000..def3ab3
--- /dev/null
+++ b/assets/blocks/distribution/conveyors/armored-conveyor-2-1-h.png
Binary files differ
diff --git a/assets/blocks/distribution/conveyors/armored-conveyor-2-1.png b/assets/blocks/distribution/conveyors/armored-conveyor-2-1.png
new file mode 100644
index 0000000..efc9937
--- /dev/null
+++ b/assets/blocks/distribution/conveyors/armored-conveyor-2-1.png
Binary files differ
diff --git a/assets/blocks/distribution/conveyors/armored-conveyor-2-2.png b/assets/blocks/distribution/conveyors/armored-conveyor-2-2.png
new file mode 100644
index 0000000..7a70978
--- /dev/null
+++ b/assets/blocks/distribution/conveyors/armored-conveyor-2-2.png
Binary files differ
diff --git a/assets/blocks/distribution/conveyors/armored-conveyor-2-3-h.png b/assets/blocks/distribution/conveyors/armored-conveyor-2-3-h.png
new file mode 100644
index 0000000..b491de9
--- /dev/null
+++ b/assets/blocks/distribution/conveyors/armored-conveyor-2-3-h.png
Binary files differ
diff --git a/assets/blocks/distribution/conveyors/armored-conveyor-2-3.png b/assets/blocks/distribution/conveyors/armored-conveyor-2-3.png
new file mode 100644
index 0000000..5e846e8
--- /dev/null
+++ b/assets/blocks/distribution/conveyors/armored-conveyor-2-3.png
Binary files differ
diff --git a/assets/blocks/distribution/conveyors/armored-conveyor-3-0-h.png b/assets/blocks/distribution/conveyors/armored-conveyor-3-0-h.png
new file mode 100644
index 0000000..a5692f9
--- /dev/null
+++ b/assets/blocks/distribution/conveyors/armored-conveyor-3-0-h.png
Binary files differ
diff --git a/assets/blocks/distribution/conveyors/armored-conveyor-3.png b/assets/blocks/distribution/conveyors/armored-conveyor-3-0.png
index 7754791..7754791 100644
--- a/assets/blocks/distribution/conveyors/armored-conveyor-3.png
+++ b/assets/blocks/distribution/conveyors/armored-conveyor-3-0.png
Binary files differ
diff --git a/assets/blocks/distribution/conveyors/armored-conveyor-3-1.png b/assets/blocks/distribution/conveyors/armored-conveyor-3-1.png
new file mode 100644
index 0000000..7b72bf6
--- /dev/null
+++ b/assets/blocks/distribution/conveyors/armored-conveyor-3-1.png
Binary files differ
diff --git a/assets/blocks/distribution/conveyors/armored-conveyor-3-3.png b/assets/blocks/distribution/conveyors/armored-conveyor-3-3.png
new file mode 100644
index 0000000..ce0d878
--- /dev/null
+++ b/assets/blocks/distribution/conveyors/armored-conveyor-3-3.png
Binary files differ
diff --git a/assets/blocks/distribution/conveyors/armored-conveyor-4.png b/assets/blocks/distribution/conveyors/armored-conveyor-4-0.png
index 741bfdb..741bfdb 100644
--- a/assets/blocks/distribution/conveyors/armored-conveyor-4.png
+++ b/assets/blocks/distribution/conveyors/armored-conveyor-4-0.png
Binary files differ
diff --git a/assets/blocks/distribution/conveyors/armored-conveyor-4-1.png b/assets/blocks/distribution/conveyors/armored-conveyor-4-1.png
new file mode 100644
index 0000000..d4893ef
--- /dev/null
+++ b/assets/blocks/distribution/conveyors/armored-conveyor-4-1.png
Binary files differ
diff --git a/assets/blocks/distribution/conveyors/armored-conveyor-4-3.png b/assets/blocks/distribution/conveyors/armored-conveyor-4-3.png
new file mode 100644
index 0000000..e0539ef
--- /dev/null
+++ b/assets/blocks/distribution/conveyors/armored-conveyor-4-3.png
Binary files differ
diff --git a/assets/blocks/distribution/conveyors/conveyor-0.png b/assets/blocks/distribution/conveyors/conveyor-0-0.png
index 4de81c8..4de81c8 100644
--- a/assets/blocks/distribution/conveyors/conveyor-0.png
+++ b/assets/blocks/distribution/conveyors/conveyor-0-0.png
Binary files differ
diff --git a/assets/blocks/distribution/conveyors/conveyor-0-1.png b/assets/blocks/distribution/conveyors/conveyor-0-1.png
new file mode 100644
index 0000000..e83ade5
--- /dev/null
+++ b/assets/blocks/distribution/conveyors/conveyor-0-1.png
Binary files differ
diff --git a/assets/blocks/distribution/conveyors/conveyor-0-2.png b/assets/blocks/distribution/conveyors/conveyor-0-2.png
new file mode 100644
index 0000000..3855016
--- /dev/null
+++ b/assets/blocks/distribution/conveyors/conveyor-0-2.png
Binary files differ
diff --git a/assets/blocks/distribution/conveyors/conveyor-0-3.png b/assets/blocks/distribution/conveyors/conveyor-0-3.png
new file mode 100644
index 0000000..5d0b247
--- /dev/null
+++ b/assets/blocks/distribution/conveyors/conveyor-0-3.png
Binary files differ
diff --git a/assets/blocks/distribution/conveyors/conveyor-1-0-h.png b/assets/blocks/distribution/conveyors/conveyor-1-0-h.png
new file mode 100644
index 0000000..75b477d
--- /dev/null
+++ b/assets/blocks/distribution/conveyors/conveyor-1-0-h.png
Binary files differ
diff --git a/assets/blocks/distribution/conveyors/conveyor-1.png b/assets/blocks/distribution/conveyors/conveyor-1-0.png
index a8cfa5d..a8cfa5d 100644
--- a/assets/blocks/distribution/conveyors/conveyor-1.png
+++ b/assets/blocks/distribution/conveyors/conveyor-1-0.png
Binary files differ
diff --git a/assets/blocks/distribution/conveyors/conveyor-1-1-h.png b/assets/blocks/distribution/conveyors/conveyor-1-1-h.png
new file mode 100644
index 0000000..8e6eb5f
--- /dev/null
+++ b/assets/blocks/distribution/conveyors/conveyor-1-1-h.png
Binary files differ
diff --git a/assets/blocks/distribution/conveyors/conveyor-1-1-v.png b/assets/blocks/distribution/conveyors/conveyor-1-1-v.png
new file mode 100644
index 0000000..d78d194
--- /dev/null
+++ b/assets/blocks/distribution/conveyors/conveyor-1-1-v.png
Binary files differ
diff --git a/assets/blocks/distribution/conveyors/conveyor-1-1.png b/assets/blocks/distribution/conveyors/conveyor-1-1.png
new file mode 100644
index 0000000..90220b5
--- /dev/null
+++ b/assets/blocks/distribution/conveyors/conveyor-1-1.png
Binary files differ
diff --git a/assets/blocks/distribution/conveyors/conveyor-1-2.png b/assets/blocks/distribution/conveyors/conveyor-1-2.png
new file mode 100644
index 0000000..923223b
--- /dev/null
+++ b/assets/blocks/distribution/conveyors/conveyor-1-2.png
Binary files differ
diff --git a/assets/blocks/distribution/conveyors/conveyor-1-3.png b/assets/blocks/distribution/conveyors/conveyor-1-3.png
new file mode 100644
index 0000000..2905d1a
--- /dev/null
+++ b/assets/blocks/distribution/conveyors/conveyor-1-3.png
Binary files differ
diff --git a/assets/blocks/distribution/conveyors/conveyor-2-0-h.png b/assets/blocks/distribution/conveyors/conveyor-2-0-h.png
new file mode 100644
index 0000000..6649a28
--- /dev/null
+++ b/assets/blocks/distribution/conveyors/conveyor-2-0-h.png
Binary files differ
diff --git a/assets/blocks/distribution/conveyors/conveyor-2-0-v.png b/assets/blocks/distribution/conveyors/conveyor-2-0-v.png
new file mode 100644
index 0000000..4a266b0
--- /dev/null
+++ b/assets/blocks/distribution/conveyors/conveyor-2-0-v.png
Binary files differ
diff --git a/assets/blocks/distribution/conveyors/conveyor-2.png b/assets/blocks/distribution/conveyors/conveyor-2-0.png
index 5d9eb5e..5d9eb5e 100644
--- a/assets/blocks/distribution/conveyors/conveyor-2.png
+++ b/assets/blocks/distribution/conveyors/conveyor-2-0.png
Binary files differ
diff --git a/assets/blocks/distribution/conveyors/conveyor-2-1-h.png b/assets/blocks/distribution/conveyors/conveyor-2-1-h.png
new file mode 100644
index 0000000..7e8d16f
--- /dev/null
+++ b/assets/blocks/distribution/conveyors/conveyor-2-1-h.png
Binary files differ
diff --git a/assets/blocks/distribution/conveyors/conveyor-2-1.png b/assets/blocks/distribution/conveyors/conveyor-2-1.png
new file mode 100644
index 0000000..798f6a6
--- /dev/null
+++ b/assets/blocks/distribution/conveyors/conveyor-2-1.png
Binary files differ
diff --git a/assets/blocks/distribution/conveyors/conveyor-2-2.png b/assets/blocks/distribution/conveyors/conveyor-2-2.png
new file mode 100644
index 0000000..14a9d78
--- /dev/null
+++ b/assets/blocks/distribution/conveyors/conveyor-2-2.png
Binary files differ
diff --git a/assets/blocks/distribution/conveyors/conveyor-2-3-h.png b/assets/blocks/distribution/conveyors/conveyor-2-3-h.png
new file mode 100644
index 0000000..07176a5
--- /dev/null
+++ b/assets/blocks/distribution/conveyors/conveyor-2-3-h.png
Binary files differ
diff --git a/assets/blocks/distribution/conveyors/conveyor-2-3.png b/assets/blocks/distribution/conveyors/conveyor-2-3.png
new file mode 100644
index 0000000..abcbebc
--- /dev/null
+++ b/assets/blocks/distribution/conveyors/conveyor-2-3.png
Binary files differ
diff --git a/assets/blocks/distribution/conveyors/conveyor-3-0-h.png b/assets/blocks/distribution/conveyors/conveyor-3-0-h.png
new file mode 100644
index 0000000..0ca52ba
--- /dev/null
+++ b/assets/blocks/distribution/conveyors/conveyor-3-0-h.png
Binary files differ
diff --git a/assets/blocks/distribution/conveyors/conveyor-3.png b/assets/blocks/distribution/conveyors/conveyor-3-0.png
index 6e38bc2..6e38bc2 100644
--- a/assets/blocks/distribution/conveyors/conveyor-3.png
+++ b/assets/blocks/distribution/conveyors/conveyor-3-0.png
Binary files differ
diff --git a/assets/blocks/distribution/conveyors/conveyor-3-1.png b/assets/blocks/distribution/conveyors/conveyor-3-1.png
new file mode 100644
index 0000000..ebfd3ee
--- /dev/null
+++ b/assets/blocks/distribution/conveyors/conveyor-3-1.png
Binary files differ
diff --git a/assets/blocks/distribution/conveyors/conveyor-3-3.png b/assets/blocks/distribution/conveyors/conveyor-3-3.png
new file mode 100644
index 0000000..4abdb24
--- /dev/null
+++ b/assets/blocks/distribution/conveyors/conveyor-3-3.png
Binary files differ
diff --git a/assets/blocks/distribution/conveyors/conveyor-4.png b/assets/blocks/distribution/conveyors/conveyor-4-0.png
index b788db9..b788db9 100644
--- a/assets/blocks/distribution/conveyors/conveyor-4.png
+++ b/assets/blocks/distribution/conveyors/conveyor-4-0.png
Binary files differ
diff --git a/assets/blocks/distribution/conveyors/conveyor-4-1.png b/assets/blocks/distribution/conveyors/conveyor-4-1.png
new file mode 100644
index 0000000..cf0ba78
--- /dev/null
+++ b/assets/blocks/distribution/conveyors/conveyor-4-1.png
Binary files differ
diff --git a/assets/blocks/distribution/conveyors/conveyor-4-3.png b/assets/blocks/distribution/conveyors/conveyor-4-3.png
new file mode 100644
index 0000000..84cbd2d
--- /dev/null
+++ b/assets/blocks/distribution/conveyors/conveyor-4-3.png
Binary files differ
diff --git a/assets/blocks/distribution/conveyors/titanium-conveyor-0.png b/assets/blocks/distribution/conveyors/titanium-conveyor-0-0.png
index bb2b4b2..bb2b4b2 100644
--- a/assets/blocks/distribution/conveyors/titanium-conveyor-0.png
+++ b/assets/blocks/distribution/conveyors/titanium-conveyor-0-0.png
Binary files differ
diff --git a/assets/blocks/distribution/conveyors/titanium-conveyor-0-1.png b/assets/blocks/distribution/conveyors/titanium-conveyor-0-1.png
new file mode 100644
index 0000000..bd17828
--- /dev/null
+++ b/assets/blocks/distribution/conveyors/titanium-conveyor-0-1.png
Binary files differ
diff --git a/assets/blocks/distribution/conveyors/titanium-conveyor-0-2.png b/assets/blocks/distribution/conveyors/titanium-conveyor-0-2.png
new file mode 100644
index 0000000..3de01c0
--- /dev/null
+++ b/assets/blocks/distribution/conveyors/titanium-conveyor-0-2.png
Binary files differ
diff --git a/assets/blocks/distribution/conveyors/titanium-conveyor-0-3.png b/assets/blocks/distribution/conveyors/titanium-conveyor-0-3.png
new file mode 100644
index 0000000..5073271
--- /dev/null
+++ b/assets/blocks/distribution/conveyors/titanium-conveyor-0-3.png
Binary files differ
diff --git a/assets/blocks/distribution/conveyors/titanium-conveyor-1-0-h.png b/assets/blocks/distribution/conveyors/titanium-conveyor-1-0-h.png
new file mode 100644
index 0000000..99602c3
--- /dev/null
+++ b/assets/blocks/distribution/conveyors/titanium-conveyor-1-0-h.png
Binary files differ
diff --git a/assets/blocks/distribution/conveyors/titanium-conveyor-1.png b/assets/blocks/distribution/conveyors/titanium-conveyor-1-0.png
index 749b079..749b079 100644
--- a/assets/blocks/distribution/conveyors/titanium-conveyor-1.png
+++ b/assets/blocks/distribution/conveyors/titanium-conveyor-1-0.png
Binary files differ
diff --git a/assets/blocks/distribution/conveyors/titanium-conveyor-1-1-h.png b/assets/blocks/distribution/conveyors/titanium-conveyor-1-1-h.png
new file mode 100644
index 0000000..e02adb4
--- /dev/null
+++ b/assets/blocks/distribution/conveyors/titanium-conveyor-1-1-h.png
Binary files differ
diff --git a/assets/blocks/distribution/conveyors/titanium-conveyor-1-1-v.png b/assets/blocks/distribution/conveyors/titanium-conveyor-1-1-v.png
new file mode 100644
index 0000000..bc8ed5e
--- /dev/null
+++ b/assets/blocks/distribution/conveyors/titanium-conveyor-1-1-v.png
Binary files differ
diff --git a/assets/blocks/distribution/conveyors/titanium-conveyor-1-1.png b/assets/blocks/distribution/conveyors/titanium-conveyor-1-1.png
new file mode 100644
index 0000000..b50f7cf
--- /dev/null
+++ b/assets/blocks/distribution/conveyors/titanium-conveyor-1-1.png
Binary files differ
diff --git a/assets/blocks/distribution/conveyors/titanium-conveyor-1-2.png b/assets/blocks/distribution/conveyors/titanium-conveyor-1-2.png
new file mode 100644
index 0000000..368e08f
--- /dev/null
+++ b/assets/blocks/distribution/conveyors/titanium-conveyor-1-2.png
Binary files differ
diff --git a/assets/blocks/distribution/conveyors/titanium-conveyor-1-3.png b/assets/blocks/distribution/conveyors/titanium-conveyor-1-3.png
new file mode 100644
index 0000000..d17a367
--- /dev/null
+++ b/assets/blocks/distribution/conveyors/titanium-conveyor-1-3.png
Binary files differ
diff --git a/assets/blocks/distribution/conveyors/titanium-conveyor-2-0-h.png b/assets/blocks/distribution/conveyors/titanium-conveyor-2-0-h.png
new file mode 100644
index 0000000..3775277
--- /dev/null
+++ b/assets/blocks/distribution/conveyors/titanium-conveyor-2-0-h.png
Binary files differ
diff --git a/assets/blocks/distribution/conveyors/titanium-conveyor-2-0-v.png b/assets/blocks/distribution/conveyors/titanium-conveyor-2-0-v.png
new file mode 100644
index 0000000..fd4c2fb
--- /dev/null
+++ b/assets/blocks/distribution/conveyors/titanium-conveyor-2-0-v.png
Binary files differ
diff --git a/assets/blocks/distribution/conveyors/titanium-conveyor-2.png b/assets/blocks/distribution/conveyors/titanium-conveyor-2-0.png
index f5ba433..f5ba433 100644
--- a/assets/blocks/distribution/conveyors/titanium-conveyor-2.png
+++ b/assets/blocks/distribution/conveyors/titanium-conveyor-2-0.png
Binary files differ
diff --git a/assets/blocks/distribution/conveyors/titanium-conveyor-2-1-h.png b/assets/blocks/distribution/conveyors/titanium-conveyor-2-1-h.png
new file mode 100644
index 0000000..0ba3653
--- /dev/null
+++ b/assets/blocks/distribution/conveyors/titanium-conveyor-2-1-h.png
Binary files differ
diff --git a/assets/blocks/distribution/conveyors/titanium-conveyor-2-1.png b/assets/blocks/distribution/conveyors/titanium-conveyor-2-1.png
new file mode 100644
index 0000000..4f5b154
--- /dev/null
+++ b/assets/blocks/distribution/conveyors/titanium-conveyor-2-1.png
Binary files differ
diff --git a/assets/blocks/distribution/conveyors/titanium-conveyor-2-2.png b/assets/blocks/distribution/conveyors/titanium-conveyor-2-2.png
new file mode 100644
index 0000000..39379a8
--- /dev/null
+++ b/assets/blocks/distribution/conveyors/titanium-conveyor-2-2.png
Binary files differ
diff --git a/assets/blocks/distribution/conveyors/titanium-conveyor-2-3-h.png b/assets/blocks/distribution/conveyors/titanium-conveyor-2-3-h.png
new file mode 100644
index 0000000..3bd7270
--- /dev/null
+++ b/assets/blocks/distribution/conveyors/titanium-conveyor-2-3-h.png
Binary files differ
diff --git a/assets/blocks/distribution/conveyors/titanium-conveyor-2-3.png b/assets/blocks/distribution/conveyors/titanium-conveyor-2-3.png
new file mode 100644
index 0000000..546bd31
--- /dev/null
+++ b/assets/blocks/distribution/conveyors/titanium-conveyor-2-3.png
Binary files differ
diff --git a/assets/blocks/distribution/conveyors/titanium-conveyor-3-0-h.png b/assets/blocks/distribution/conveyors/titanium-conveyor-3-0-h.png
new file mode 100644
index 0000000..09f7114
--- /dev/null
+++ b/assets/blocks/distribution/conveyors/titanium-conveyor-3-0-h.png
Binary files differ
diff --git a/assets/blocks/distribution/conveyors/titanium-conveyor-3.png b/assets/blocks/distribution/conveyors/titanium-conveyor-3-0.png
index 24525f2..24525f2 100644
--- a/assets/blocks/distribution/conveyors/titanium-conveyor-3.png
+++ b/assets/blocks/distribution/conveyors/titanium-conveyor-3-0.png
Binary files differ
diff --git a/assets/blocks/distribution/conveyors/titanium-conveyor-3-1.png b/assets/blocks/distribution/conveyors/titanium-conveyor-3-1.png
new file mode 100644
index 0000000..2ef4cdf
--- /dev/null
+++ b/assets/blocks/distribution/conveyors/titanium-conveyor-3-1.png
Binary files differ
diff --git a/assets/blocks/distribution/conveyors/titanium-conveyor-3-3.png b/assets/blocks/distribution/conveyors/titanium-conveyor-3-3.png
new file mode 100644
index 0000000..4877112
--- /dev/null
+++ b/assets/blocks/distribution/conveyors/titanium-conveyor-3-3.png
Binary files differ
diff --git a/assets/blocks/distribution/conveyors/titanium-conveyor-4.png b/assets/blocks/distribution/conveyors/titanium-conveyor-4-0.png
index 079d383..079d383 100644
--- a/assets/blocks/distribution/conveyors/titanium-conveyor-4.png
+++ b/assets/blocks/distribution/conveyors/titanium-conveyor-4-0.png
Binary files differ
diff --git a/assets/blocks/distribution/conveyors/titanium-conveyor-4-1.png b/assets/blocks/distribution/conveyors/titanium-conveyor-4-1.png
new file mode 100644
index 0000000..e2b9517
--- /dev/null
+++ b/assets/blocks/distribution/conveyors/titanium-conveyor-4-1.png
Binary files differ
diff --git a/assets/blocks/distribution/conveyors/titanium-conveyor-4-3.png b/assets/blocks/distribution/conveyors/titanium-conveyor-4-3.png
new file mode 100644
index 0000000..2a1ca44
--- /dev/null
+++ b/assets/blocks/distribution/conveyors/titanium-conveyor-4-3.png
Binary files differ
diff --git a/assets/blocks/distribution/ducts/armored-duct-0.png b/assets/blocks/distribution/ducts/armored-duct-0-0.png
index 7cdf0be..7cdf0be 100644
--- a/assets/blocks/distribution/ducts/armored-duct-0.png
+++ b/assets/blocks/distribution/ducts/armored-duct-0-0.png
Binary files differ
diff --git a/assets/blocks/distribution/ducts/armored-duct-0-1.png b/assets/blocks/distribution/ducts/armored-duct-0-1.png
new file mode 100644
index 0000000..9a5cd4d
--- /dev/null
+++ b/assets/blocks/distribution/ducts/armored-duct-0-1.png
Binary files differ
diff --git a/assets/blocks/distribution/ducts/armored-duct-0-2.png b/assets/blocks/distribution/ducts/armored-duct-0-2.png
new file mode 100644
index 0000000..793a84b
--- /dev/null
+++ b/assets/blocks/distribution/ducts/armored-duct-0-2.png
Binary files differ
diff --git a/assets/blocks/distribution/ducts/armored-duct-0-3.png b/assets/blocks/distribution/ducts/armored-duct-0-3.png
new file mode 100644
index 0000000..94aca00
--- /dev/null
+++ b/assets/blocks/distribution/ducts/armored-duct-0-3.png
Binary files differ
diff --git a/assets/blocks/distribution/ducts/armored-duct-1-0-h.png b/assets/blocks/distribution/ducts/armored-duct-1-0-h.png
new file mode 100644
index 0000000..d9a6ca8
--- /dev/null
+++ b/assets/blocks/distribution/ducts/armored-duct-1-0-h.png
Binary files differ
diff --git a/assets/blocks/distribution/ducts/armored-duct-1.png b/assets/blocks/distribution/ducts/armored-duct-1-0.png
index 4c02046..4c02046 100644
--- a/assets/blocks/distribution/ducts/armored-duct-1.png
+++ b/assets/blocks/distribution/ducts/armored-duct-1-0.png
Binary files differ
diff --git a/assets/blocks/distribution/ducts/armored-duct-1-1-h.png b/assets/blocks/distribution/ducts/armored-duct-1-1-h.png
new file mode 100644
index 0000000..220ea63
--- /dev/null
+++ b/assets/blocks/distribution/ducts/armored-duct-1-1-h.png
Binary files differ
diff --git a/assets/blocks/distribution/ducts/armored-duct-1-1-v.png b/assets/blocks/distribution/ducts/armored-duct-1-1-v.png
new file mode 100644
index 0000000..107e5e1
--- /dev/null
+++ b/assets/blocks/distribution/ducts/armored-duct-1-1-v.png
Binary files differ
diff --git a/assets/blocks/distribution/ducts/armored-duct-1-1.png b/assets/blocks/distribution/ducts/armored-duct-1-1.png
new file mode 100644
index 0000000..ba68180
--- /dev/null
+++ b/assets/blocks/distribution/ducts/armored-duct-1-1.png
Binary files differ
diff --git a/assets/blocks/distribution/ducts/armored-duct-1-2.png b/assets/blocks/distribution/ducts/armored-duct-1-2.png
new file mode 100644
index 0000000..102b6c4
--- /dev/null
+++ b/assets/blocks/distribution/ducts/armored-duct-1-2.png
Binary files differ
diff --git a/assets/blocks/distribution/ducts/armored-duct-1-3.png b/assets/blocks/distribution/ducts/armored-duct-1-3.png
new file mode 100644
index 0000000..d5c7688
--- /dev/null
+++ b/assets/blocks/distribution/ducts/armored-duct-1-3.png
Binary files differ
diff --git a/assets/blocks/distribution/ducts/armored-duct-2-0-h.png b/assets/blocks/distribution/ducts/armored-duct-2-0-h.png
new file mode 100644
index 0000000..e2b75b7
--- /dev/null
+++ b/assets/blocks/distribution/ducts/armored-duct-2-0-h.png
Binary files differ
diff --git a/assets/blocks/distribution/ducts/armored-duct-2-0-v.png b/assets/blocks/distribution/ducts/armored-duct-2-0-v.png
new file mode 100644
index 0000000..51690bf
--- /dev/null
+++ b/assets/blocks/distribution/ducts/armored-duct-2-0-v.png
Binary files differ
diff --git a/assets/blocks/distribution/ducts/armored-duct-2.png b/assets/blocks/distribution/ducts/armored-duct-2-0.png
index fd0c731..fd0c731 100644
--- a/assets/blocks/distribution/ducts/armored-duct-2.png
+++ b/assets/blocks/distribution/ducts/armored-duct-2-0.png
Binary files differ
diff --git a/assets/blocks/distribution/ducts/armored-duct-2-1-h.png b/assets/blocks/distribution/ducts/armored-duct-2-1-h.png
new file mode 100644
index 0000000..209c984
--- /dev/null
+++ b/assets/blocks/distribution/ducts/armored-duct-2-1-h.png
Binary files differ
diff --git a/assets/blocks/distribution/ducts/armored-duct-2-1.png b/assets/blocks/distribution/ducts/armored-duct-2-1.png
new file mode 100644
index 0000000..ab5b160
--- /dev/null
+++ b/assets/blocks/distribution/ducts/armored-duct-2-1.png
Binary files differ
diff --git a/assets/blocks/distribution/ducts/armored-duct-2-2.png b/assets/blocks/distribution/ducts/armored-duct-2-2.png
new file mode 100644
index 0000000..3a1d156
--- /dev/null
+++ b/assets/blocks/distribution/ducts/armored-duct-2-2.png
Binary files differ
diff --git a/assets/blocks/distribution/ducts/armored-duct-2-3-h.png b/assets/blocks/distribution/ducts/armored-duct-2-3-h.png
new file mode 100644
index 0000000..018ebc1
--- /dev/null
+++ b/assets/blocks/distribution/ducts/armored-duct-2-3-h.png
Binary files differ
diff --git a/assets/blocks/distribution/ducts/armored-duct-2-3.png b/assets/blocks/distribution/ducts/armored-duct-2-3.png
new file mode 100644
index 0000000..ee904a0
--- /dev/null
+++ b/assets/blocks/distribution/ducts/armored-duct-2-3.png
Binary files differ
diff --git a/assets/blocks/distribution/ducts/armored-duct-3-0-h.png b/assets/blocks/distribution/ducts/armored-duct-3-0-h.png
new file mode 100644
index 0000000..0a384b3
--- /dev/null
+++ b/assets/blocks/distribution/ducts/armored-duct-3-0-h.png
Binary files differ
diff --git a/assets/blocks/distribution/ducts/armored-duct-3.png b/assets/blocks/distribution/ducts/armored-duct-3-0.png
index 9371f1c..9371f1c 100644
--- a/assets/blocks/distribution/ducts/armored-duct-3.png
+++ b/assets/blocks/distribution/ducts/armored-duct-3-0.png
Binary files differ
diff --git a/assets/blocks/distribution/ducts/armored-duct-3-1.png b/assets/blocks/distribution/ducts/armored-duct-3-1.png
new file mode 100644
index 0000000..2a82680
--- /dev/null
+++ b/assets/blocks/distribution/ducts/armored-duct-3-1.png
Binary files differ
diff --git a/assets/blocks/distribution/ducts/armored-duct-3-3.png b/assets/blocks/distribution/ducts/armored-duct-3-3.png
new file mode 100644
index 0000000..d4ef678
--- /dev/null
+++ b/assets/blocks/distribution/ducts/armored-duct-3-3.png
Binary files differ
diff --git a/assets/blocks/distribution/ducts/armored-duct-4.png b/assets/blocks/distribution/ducts/armored-duct-4-0.png
index 985626c..985626c 100644
--- a/assets/blocks/distribution/ducts/armored-duct-4.png
+++ b/assets/blocks/distribution/ducts/armored-duct-4-0.png
Binary files differ
diff --git a/assets/blocks/distribution/ducts/armored-duct-4-1.png b/assets/blocks/distribution/ducts/armored-duct-4-1.png
new file mode 100644
index 0000000..44f767f
--- /dev/null
+++ b/assets/blocks/distribution/ducts/armored-duct-4-1.png
Binary files differ
diff --git a/assets/blocks/distribution/ducts/armored-duct-4-3.png b/assets/blocks/distribution/ducts/armored-duct-4-3.png
new file mode 100644
index 0000000..4024c61
--- /dev/null
+++ b/assets/blocks/distribution/ducts/armored-duct-4-3.png
Binary files differ
diff --git a/assets/blocks/distribution/ducts/duct-0.png b/assets/blocks/distribution/ducts/duct-0-0.png
index 3cec9b5..3cec9b5 100644
--- a/assets/blocks/distribution/ducts/duct-0.png
+++ b/assets/blocks/distribution/ducts/duct-0-0.png
Binary files differ
diff --git a/assets/blocks/distribution/ducts/duct-0-1.png b/assets/blocks/distribution/ducts/duct-0-1.png
new file mode 100644
index 0000000..2db5439
--- /dev/null
+++ b/assets/blocks/distribution/ducts/duct-0-1.png
Binary files differ
diff --git a/assets/blocks/distribution/ducts/duct-0-2.png b/assets/blocks/distribution/ducts/duct-0-2.png
new file mode 100644
index 0000000..6dac9e5
--- /dev/null
+++ b/assets/blocks/distribution/ducts/duct-0-2.png
Binary files differ
diff --git a/assets/blocks/distribution/ducts/duct-0-3.png b/assets/blocks/distribution/ducts/duct-0-3.png
new file mode 100644
index 0000000..e25d7bb
--- /dev/null
+++ b/assets/blocks/distribution/ducts/duct-0-3.png
Binary files differ
diff --git a/assets/blocks/distribution/ducts/duct-1-0-h.png b/assets/blocks/distribution/ducts/duct-1-0-h.png
new file mode 100644
index 0000000..11e4482
--- /dev/null
+++ b/assets/blocks/distribution/ducts/duct-1-0-h.png
Binary files differ
diff --git a/assets/blocks/distribution/ducts/duct-1.png b/assets/blocks/distribution/ducts/duct-1-0.png
index 6adcdeb..6adcdeb 100644
--- a/assets/blocks/distribution/ducts/duct-1.png
+++ b/assets/blocks/distribution/ducts/duct-1-0.png
Binary files differ
diff --git a/assets/blocks/distribution/ducts/duct-1-1-h.png b/assets/blocks/distribution/ducts/duct-1-1-h.png
new file mode 100644
index 0000000..1461ef0
--- /dev/null
+++ b/assets/blocks/distribution/ducts/duct-1-1-h.png
Binary files differ
diff --git a/assets/blocks/distribution/ducts/duct-1-1-v.png b/assets/blocks/distribution/ducts/duct-1-1-v.png
new file mode 100644
index 0000000..50bdb4f
--- /dev/null
+++ b/assets/blocks/distribution/ducts/duct-1-1-v.png
Binary files differ
diff --git a/assets/blocks/distribution/ducts/duct-1-1.png b/assets/blocks/distribution/ducts/duct-1-1.png
new file mode 100644
index 0000000..093189f
--- /dev/null
+++ b/assets/blocks/distribution/ducts/duct-1-1.png
Binary files differ
diff --git a/assets/blocks/distribution/ducts/duct-1-2.png b/assets/blocks/distribution/ducts/duct-1-2.png
new file mode 100644
index 0000000..5b7aae2
--- /dev/null
+++ b/assets/blocks/distribution/ducts/duct-1-2.png
Binary files differ
diff --git a/assets/blocks/distribution/ducts/duct-1-3.png b/assets/blocks/distribution/ducts/duct-1-3.png
new file mode 100644
index 0000000..cb72859
--- /dev/null
+++ b/assets/blocks/distribution/ducts/duct-1-3.png
Binary files differ
diff --git a/assets/blocks/distribution/ducts/duct-2-0-h.png b/assets/blocks/distribution/ducts/duct-2-0-h.png
new file mode 100644
index 0000000..4ddb3d1
--- /dev/null
+++ b/assets/blocks/distribution/ducts/duct-2-0-h.png
Binary files differ
diff --git a/assets/blocks/distribution/ducts/duct-2-0-v.png b/assets/blocks/distribution/ducts/duct-2-0-v.png
new file mode 100644
index 0000000..f841ec1
--- /dev/null
+++ b/assets/blocks/distribution/ducts/duct-2-0-v.png
Binary files differ
diff --git a/assets/blocks/distribution/ducts/duct-2.png b/assets/blocks/distribution/ducts/duct-2-0.png
index c0afcfb..c0afcfb 100644
--- a/assets/blocks/distribution/ducts/duct-2.png
+++ b/assets/blocks/distribution/ducts/duct-2-0.png
Binary files differ
diff --git a/assets/blocks/distribution/ducts/duct-2-1-h.png b/assets/blocks/distribution/ducts/duct-2-1-h.png
new file mode 100644
index 0000000..b40e77e
--- /dev/null
+++ b/assets/blocks/distribution/ducts/duct-2-1-h.png
Binary files differ
diff --git a/assets/blocks/distribution/ducts/duct-2-1.png b/assets/blocks/distribution/ducts/duct-2-1.png
new file mode 100644
index 0000000..09eb774
--- /dev/null
+++ b/assets/blocks/distribution/ducts/duct-2-1.png
Binary files differ
diff --git a/assets/blocks/distribution/ducts/duct-2-2.png b/assets/blocks/distribution/ducts/duct-2-2.png
new file mode 100644
index 0000000..4da21f8
--- /dev/null
+++ b/assets/blocks/distribution/ducts/duct-2-2.png
Binary files differ
diff --git a/assets/blocks/distribution/ducts/duct-2-3-h.png b/assets/blocks/distribution/ducts/duct-2-3-h.png
new file mode 100644
index 0000000..1506bac
--- /dev/null
+++ b/assets/blocks/distribution/ducts/duct-2-3-h.png
Binary files differ
diff --git a/assets/blocks/distribution/ducts/duct-2-3.png b/assets/blocks/distribution/ducts/duct-2-3.png
new file mode 100644
index 0000000..0dd6aa3
--- /dev/null
+++ b/assets/blocks/distribution/ducts/duct-2-3.png
Binary files differ
diff --git a/assets/blocks/distribution/ducts/duct-3-0-h.png b/assets/blocks/distribution/ducts/duct-3-0-h.png
new file mode 100644
index 0000000..4b51f6d
--- /dev/null
+++ b/assets/blocks/distribution/ducts/duct-3-0-h.png
Binary files differ
diff --git a/assets/blocks/distribution/ducts/duct-3.png b/assets/blocks/distribution/ducts/duct-3-0.png
index d1a331c..d1a331c 100644
--- a/assets/blocks/distribution/ducts/duct-3.png
+++ b/assets/blocks/distribution/ducts/duct-3-0.png
Binary files differ
diff --git a/assets/blocks/distribution/ducts/duct-3-1.png b/assets/blocks/distribution/ducts/duct-3-1.png
new file mode 100644
index 0000000..6b20424
--- /dev/null
+++ b/assets/blocks/distribution/ducts/duct-3-1.png
Binary files differ
diff --git a/assets/blocks/distribution/ducts/duct-3-3.png b/assets/blocks/distribution/ducts/duct-3-3.png
new file mode 100644
index 0000000..e457a4c
--- /dev/null
+++ b/assets/blocks/distribution/ducts/duct-3-3.png
Binary files differ
diff --git a/assets/blocks/distribution/ducts/duct-4.png b/assets/blocks/distribution/ducts/duct-4-0.png
index d490c36..d490c36 100644
--- a/assets/blocks/distribution/ducts/duct-4.png
+++ b/assets/blocks/distribution/ducts/duct-4-0.png
Binary files differ
diff --git a/assets/blocks/distribution/ducts/duct-4-1.png b/assets/blocks/distribution/ducts/duct-4-1.png
new file mode 100644
index 0000000..ea57f4a
--- /dev/null
+++ b/assets/blocks/distribution/ducts/duct-4-1.png
Binary files differ
diff --git a/assets/blocks/distribution/ducts/duct-4-3.png b/assets/blocks/distribution/ducts/duct-4-3.png
new file mode 100644
index 0000000..50eef92
--- /dev/null
+++ b/assets/blocks/distribution/ducts/duct-4-3.png
Binary files differ
diff --git a/assets/blocks/liquid/conduits/conduit-0.png b/assets/blocks/liquid/conduits/conduit-0-0.png
index 89e0a19..89e0a19 100644
--- a/assets/blocks/liquid/conduits/conduit-0.png
+++ b/assets/blocks/liquid/conduits/conduit-0-0.png
Binary files differ
diff --git a/assets/blocks/liquid/conduits/conduit-0-1.png b/assets/blocks/liquid/conduits/conduit-0-1.png
new file mode 100644
index 0000000..163d8c1
--- /dev/null
+++ b/assets/blocks/liquid/conduits/conduit-0-1.png
Binary files differ
diff --git a/assets/blocks/liquid/conduits/conduit-0-2.png b/assets/blocks/liquid/conduits/conduit-0-2.png
new file mode 100644
index 0000000..96b202c
--- /dev/null
+++ b/assets/blocks/liquid/conduits/conduit-0-2.png
Binary files differ
diff --git a/assets/blocks/liquid/conduits/conduit-0-3.png b/assets/blocks/liquid/conduits/conduit-0-3.png
new file mode 100644
index 0000000..02eaeb8
--- /dev/null
+++ b/assets/blocks/liquid/conduits/conduit-0-3.png
Binary files differ
diff --git a/assets/blocks/liquid/conduits/conduit-1-0-h.png b/assets/blocks/liquid/conduits/conduit-1-0-h.png
new file mode 100644
index 0000000..90ef53c
--- /dev/null
+++ b/assets/blocks/liquid/conduits/conduit-1-0-h.png
Binary files differ
diff --git a/assets/blocks/liquid/conduits/conduit-1.png b/assets/blocks/liquid/conduits/conduit-1-0.png
index dc86dd4..dc86dd4 100644
--- a/assets/blocks/liquid/conduits/conduit-1.png
+++ b/assets/blocks/liquid/conduits/conduit-1-0.png
Binary files differ
diff --git a/assets/blocks/liquid/conduits/conduit-1-1-h.png b/assets/blocks/liquid/conduits/conduit-1-1-h.png
new file mode 100644
index 0000000..3e2dec1
--- /dev/null
+++ b/assets/blocks/liquid/conduits/conduit-1-1-h.png
Binary files differ
diff --git a/assets/blocks/liquid/conduits/conduit-1-1-v.png b/assets/blocks/liquid/conduits/conduit-1-1-v.png
new file mode 100644
index 0000000..ed292b3
--- /dev/null
+++ b/assets/blocks/liquid/conduits/conduit-1-1-v.png
Binary files differ
diff --git a/assets/blocks/liquid/conduits/conduit-1-1.png b/assets/blocks/liquid/conduits/conduit-1-1.png
new file mode 100644
index 0000000..678f81a
--- /dev/null
+++ b/assets/blocks/liquid/conduits/conduit-1-1.png
Binary files differ
diff --git a/assets/blocks/liquid/conduits/conduit-1-2.png b/assets/blocks/liquid/conduits/conduit-1-2.png
new file mode 100644
index 0000000..69c4473
--- /dev/null
+++ b/assets/blocks/liquid/conduits/conduit-1-2.png
Binary files differ
diff --git a/assets/blocks/liquid/conduits/conduit-1-3.png b/assets/blocks/liquid/conduits/conduit-1-3.png
new file mode 100644
index 0000000..90ef53c
--- /dev/null
+++ b/assets/blocks/liquid/conduits/conduit-1-3.png
Binary files differ
diff --git a/assets/blocks/liquid/conduits/conduit-2-0-h.png b/assets/blocks/liquid/conduits/conduit-2-0-h.png
new file mode 100644
index 0000000..d30d5f4
--- /dev/null
+++ b/assets/blocks/liquid/conduits/conduit-2-0-h.png
Binary files differ
diff --git a/assets/blocks/liquid/conduits/conduit-2-0-v.png b/assets/blocks/liquid/conduits/conduit-2-0-v.png
new file mode 100644
index 0000000..67d0833
--- /dev/null
+++ b/assets/blocks/liquid/conduits/conduit-2-0-v.png
Binary files differ
diff --git a/assets/blocks/liquid/conduits/conduit-2.png b/assets/blocks/liquid/conduits/conduit-2-0.png
index e8a7bb0..e8a7bb0 100644
--- a/assets/blocks/liquid/conduits/conduit-2.png
+++ b/assets/blocks/liquid/conduits/conduit-2-0.png
Binary files differ
diff --git a/assets/blocks/liquid/conduits/conduit-2-1-h.png b/assets/blocks/liquid/conduits/conduit-2-1-h.png
new file mode 100644
index 0000000..8122549
--- /dev/null
+++ b/assets/blocks/liquid/conduits/conduit-2-1-h.png
Binary files differ
diff --git a/assets/blocks/liquid/conduits/conduit-2-1.png b/assets/blocks/liquid/conduits/conduit-2-1.png
new file mode 100644
index 0000000..92f8b2a
--- /dev/null
+++ b/assets/blocks/liquid/conduits/conduit-2-1.png
Binary files differ
diff --git a/assets/blocks/liquid/conduits/conduit-2-2.png b/assets/blocks/liquid/conduits/conduit-2-2.png
new file mode 100644
index 0000000..a3bbaab
--- /dev/null
+++ b/assets/blocks/liquid/conduits/conduit-2-2.png
Binary files differ
diff --git a/assets/blocks/liquid/conduits/conduit-2-3-h.png b/assets/blocks/liquid/conduits/conduit-2-3-h.png
new file mode 100644
index 0000000..6815dd9
--- /dev/null
+++ b/assets/blocks/liquid/conduits/conduit-2-3-h.png
Binary files differ
diff --git a/assets/blocks/liquid/conduits/conduit-2-3.png b/assets/blocks/liquid/conduits/conduit-2-3.png
new file mode 100644
index 0000000..9759bb9
--- /dev/null
+++ b/assets/blocks/liquid/conduits/conduit-2-3.png
Binary files differ
diff --git a/assets/blocks/liquid/conduits/conduit-3-0-h.png b/assets/blocks/liquid/conduits/conduit-3-0-h.png
new file mode 100644
index 0000000..31a4dec
--- /dev/null
+++ b/assets/blocks/liquid/conduits/conduit-3-0-h.png
Binary files differ
diff --git a/assets/blocks/liquid/conduits/conduit-3-0.png b/assets/blocks/liquid/conduits/conduit-3-0.png
new file mode 100644
index 0000000..d27ac67
--- /dev/null
+++ b/assets/blocks/liquid/conduits/conduit-3-0.png
Binary files differ
diff --git a/assets/blocks/liquid/conduits/conduit-3-1.png b/assets/blocks/liquid/conduits/conduit-3-1.png
new file mode 100644
index 0000000..0911857
--- /dev/null
+++ b/assets/blocks/liquid/conduits/conduit-3-1.png
Binary files differ
diff --git a/assets/blocks/liquid/conduits/conduit-3-3.png b/assets/blocks/liquid/conduits/conduit-3-3.png
new file mode 100644
index 0000000..0f57eef
--- /dev/null
+++ b/assets/blocks/liquid/conduits/conduit-3-3.png
Binary files differ
diff --git a/assets/blocks/liquid/conduits/conduit-3.png b/assets/blocks/liquid/conduits/conduit-3.png
deleted file mode 100644
index 15b8dc2..0000000
--- a/assets/blocks/liquid/conduits/conduit-3.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/liquid/conduits/conduit-4.png b/assets/blocks/liquid/conduits/conduit-4-0.png
index 3d0f869..3d0f869 100644
--- a/assets/blocks/liquid/conduits/conduit-4.png
+++ b/assets/blocks/liquid/conduits/conduit-4-0.png
Binary files differ
diff --git a/assets/blocks/liquid/conduits/conduit-4-1.png b/assets/blocks/liquid/conduits/conduit-4-1.png
new file mode 100644
index 0000000..37cd8a9
--- /dev/null
+++ b/assets/blocks/liquid/conduits/conduit-4-1.png
Binary files differ
diff --git a/assets/blocks/liquid/conduits/conduit-4-3.png b/assets/blocks/liquid/conduits/conduit-4-3.png
new file mode 100644
index 0000000..76501b4
--- /dev/null
+++ b/assets/blocks/liquid/conduits/conduit-4-3.png
Binary files differ
diff --git a/assets/blocks/liquid/conduits/plated-conduit-0.png b/assets/blocks/liquid/conduits/plated-conduit-0-0.png
index 9b1dcd0..9b1dcd0 100644
--- a/assets/blocks/liquid/conduits/plated-conduit-0.png
+++ b/assets/blocks/liquid/conduits/plated-conduit-0-0.png
Binary files differ
diff --git a/assets/blocks/liquid/conduits/plated-conduit-0-1.png b/assets/blocks/liquid/conduits/plated-conduit-0-1.png
new file mode 100644
index 0000000..6363f68
--- /dev/null
+++ b/assets/blocks/liquid/conduits/plated-conduit-0-1.png
Binary files differ
diff --git a/assets/blocks/liquid/conduits/plated-conduit-0-2.png b/assets/blocks/liquid/conduits/plated-conduit-0-2.png
new file mode 100644
index 0000000..2450421
--- /dev/null
+++ b/assets/blocks/liquid/conduits/plated-conduit-0-2.png
Binary files differ
diff --git a/assets/blocks/liquid/conduits/plated-conduit-0-3.png b/assets/blocks/liquid/conduits/plated-conduit-0-3.png
new file mode 100644
index 0000000..e3f2046
--- /dev/null
+++ b/assets/blocks/liquid/conduits/plated-conduit-0-3.png
Binary files differ
diff --git a/assets/blocks/liquid/conduits/plated-conduit-1-0-h.png b/assets/blocks/liquid/conduits/plated-conduit-1-0-h.png
new file mode 100644
index 0000000..deb7005
--- /dev/null
+++ b/assets/blocks/liquid/conduits/plated-conduit-1-0-h.png
Binary files differ
diff --git a/assets/blocks/liquid/conduits/plated-conduit-1.png b/assets/blocks/liquid/conduits/plated-conduit-1-0.png
index 201ffa2..201ffa2 100644
--- a/assets/blocks/liquid/conduits/plated-conduit-1.png
+++ b/assets/blocks/liquid/conduits/plated-conduit-1-0.png
Binary files differ
diff --git a/assets/blocks/liquid/conduits/plated-conduit-1-1-h.png b/assets/blocks/liquid/conduits/plated-conduit-1-1-h.png
new file mode 100644
index 0000000..4bef575
--- /dev/null
+++ b/assets/blocks/liquid/conduits/plated-conduit-1-1-h.png
Binary files differ
diff --git a/assets/blocks/liquid/conduits/plated-conduit-1-1-v.png b/assets/blocks/liquid/conduits/plated-conduit-1-1-v.png
new file mode 100644
index 0000000..ffb6987
--- /dev/null
+++ b/assets/blocks/liquid/conduits/plated-conduit-1-1-v.png
Binary files differ
diff --git a/assets/blocks/liquid/conduits/plated-conduit-1-1.png b/assets/blocks/liquid/conduits/plated-conduit-1-1.png
new file mode 100644
index 0000000..6d6733a
--- /dev/null
+++ b/assets/blocks/liquid/conduits/plated-conduit-1-1.png
Binary files differ
diff --git a/assets/blocks/liquid/conduits/plated-conduit-1-2.png b/assets/blocks/liquid/conduits/plated-conduit-1-2.png
new file mode 100644
index 0000000..8cff629
--- /dev/null
+++ b/assets/blocks/liquid/conduits/plated-conduit-1-2.png
Binary files differ
diff --git a/assets/blocks/liquid/conduits/plated-conduit-1-3.png b/assets/blocks/liquid/conduits/plated-conduit-1-3.png
new file mode 100644
index 0000000..deb7005
--- /dev/null
+++ b/assets/blocks/liquid/conduits/plated-conduit-1-3.png
Binary files differ
diff --git a/assets/blocks/liquid/conduits/plated-conduit-2-0-h.png b/assets/blocks/liquid/conduits/plated-conduit-2-0-h.png
new file mode 100644
index 0000000..8f2ce35
--- /dev/null
+++ b/assets/blocks/liquid/conduits/plated-conduit-2-0-h.png
Binary files differ
diff --git a/assets/blocks/liquid/conduits/plated-conduit-2-0-v.png b/assets/blocks/liquid/conduits/plated-conduit-2-0-v.png
new file mode 100644
index 0000000..222edf9
--- /dev/null
+++ b/assets/blocks/liquid/conduits/plated-conduit-2-0-v.png
Binary files differ
diff --git a/assets/blocks/liquid/conduits/plated-conduit-2.png b/assets/blocks/liquid/conduits/plated-conduit-2-0.png
index 4a32d66..4a32d66 100644
--- a/assets/blocks/liquid/conduits/plated-conduit-2.png
+++ b/assets/blocks/liquid/conduits/plated-conduit-2-0.png
Binary files differ
diff --git a/assets/blocks/liquid/conduits/plated-conduit-2-1-h.png b/assets/blocks/liquid/conduits/plated-conduit-2-1-h.png
new file mode 100644
index 0000000..67385d9
--- /dev/null
+++ b/assets/blocks/liquid/conduits/plated-conduit-2-1-h.png
Binary files differ
diff --git a/assets/blocks/liquid/conduits/plated-conduit-2-1.png b/assets/blocks/liquid/conduits/plated-conduit-2-1.png
new file mode 100644
index 0000000..8130059
--- /dev/null
+++ b/assets/blocks/liquid/conduits/plated-conduit-2-1.png
Binary files differ
diff --git a/assets/blocks/liquid/conduits/plated-conduit-2-2.png b/assets/blocks/liquid/conduits/plated-conduit-2-2.png
new file mode 100644
index 0000000..334adad
--- /dev/null
+++ b/assets/blocks/liquid/conduits/plated-conduit-2-2.png
Binary files differ
diff --git a/assets/blocks/liquid/conduits/plated-conduit-2-3-h.png b/assets/blocks/liquid/conduits/plated-conduit-2-3-h.png
new file mode 100644
index 0000000..416a574
--- /dev/null
+++ b/assets/blocks/liquid/conduits/plated-conduit-2-3-h.png
Binary files differ
diff --git a/assets/blocks/liquid/conduits/plated-conduit-2-3.png b/assets/blocks/liquid/conduits/plated-conduit-2-3.png
new file mode 100644
index 0000000..acd19b0
--- /dev/null
+++ b/assets/blocks/liquid/conduits/plated-conduit-2-3.png
Binary files differ
diff --git a/assets/blocks/liquid/conduits/plated-conduit-3-0-h.png b/assets/blocks/liquid/conduits/plated-conduit-3-0-h.png
new file mode 100644
index 0000000..cdff048
--- /dev/null
+++ b/assets/blocks/liquid/conduits/plated-conduit-3-0-h.png
Binary files differ
diff --git a/assets/blocks/liquid/conduits/plated-conduit-3.png b/assets/blocks/liquid/conduits/plated-conduit-3-0.png
index ea24f9a..ea24f9a 100644
--- a/assets/blocks/liquid/conduits/plated-conduit-3.png
+++ b/assets/blocks/liquid/conduits/plated-conduit-3-0.png
Binary files differ
diff --git a/assets/blocks/liquid/conduits/plated-conduit-3-1.png b/assets/blocks/liquid/conduits/plated-conduit-3-1.png
new file mode 100644
index 0000000..a13c498
--- /dev/null
+++ b/assets/blocks/liquid/conduits/plated-conduit-3-1.png
Binary files differ
diff --git a/assets/blocks/liquid/conduits/plated-conduit-3-3.png b/assets/blocks/liquid/conduits/plated-conduit-3-3.png
new file mode 100644
index 0000000..a78f468
--- /dev/null
+++ b/assets/blocks/liquid/conduits/plated-conduit-3-3.png
Binary files differ
diff --git a/assets/blocks/liquid/conduits/plated-conduit-4.png b/assets/blocks/liquid/conduits/plated-conduit-4-0.png
index 5fd7ae2..5fd7ae2 100644
--- a/assets/blocks/liquid/conduits/plated-conduit-4.png
+++ b/assets/blocks/liquid/conduits/plated-conduit-4-0.png
Binary files differ
diff --git a/assets/blocks/liquid/conduits/plated-conduit-4-1.png b/assets/blocks/liquid/conduits/plated-conduit-4-1.png
new file mode 100644
index 0000000..70e0859
--- /dev/null
+++ b/assets/blocks/liquid/conduits/plated-conduit-4-1.png
Binary files differ
diff --git a/assets/blocks/liquid/conduits/plated-conduit-4-3.png b/assets/blocks/liquid/conduits/plated-conduit-4-3.png
new file mode 100644
index 0000000..8c0c95f
--- /dev/null
+++ b/assets/blocks/liquid/conduits/plated-conduit-4-3.png
Binary files differ
diff --git a/assets/blocks/liquid/conduits/pulse-conduit-0.png b/assets/blocks/liquid/conduits/pulse-conduit-0-0.png
index 09ee3e3..09ee3e3 100644
--- a/assets/blocks/liquid/conduits/pulse-conduit-0.png
+++ b/assets/blocks/liquid/conduits/pulse-conduit-0-0.png
Binary files differ
diff --git a/assets/blocks/liquid/conduits/pulse-conduit-0-1.png b/assets/blocks/liquid/conduits/pulse-conduit-0-1.png
new file mode 100644
index 0000000..36053a8
--- /dev/null
+++ b/assets/blocks/liquid/conduits/pulse-conduit-0-1.png
Binary files differ
diff --git a/assets/blocks/liquid/conduits/pulse-conduit-0-2.png b/assets/blocks/liquid/conduits/pulse-conduit-0-2.png
new file mode 100644
index 0000000..875ebfa
--- /dev/null
+++ b/assets/blocks/liquid/conduits/pulse-conduit-0-2.png
Binary files differ
diff --git a/assets/blocks/liquid/conduits/pulse-conduit-0-3.png b/assets/blocks/liquid/conduits/pulse-conduit-0-3.png
new file mode 100644
index 0000000..b641d4d
--- /dev/null
+++ b/assets/blocks/liquid/conduits/pulse-conduit-0-3.png
Binary files differ
diff --git a/assets/blocks/liquid/conduits/pulse-conduit-1-0-h.png b/assets/blocks/liquid/conduits/pulse-conduit-1-0-h.png
new file mode 100644
index 0000000..2f57ce8
--- /dev/null
+++ b/assets/blocks/liquid/conduits/pulse-conduit-1-0-h.png
Binary files differ
diff --git a/assets/blocks/liquid/conduits/pulse-conduit-1.png b/assets/blocks/liquid/conduits/pulse-conduit-1-0.png
index 170ffc9..170ffc9 100644
--- a/assets/blocks/liquid/conduits/pulse-conduit-1.png
+++ b/assets/blocks/liquid/conduits/pulse-conduit-1-0.png
Binary files differ
diff --git a/assets/blocks/liquid/conduits/pulse-conduit-1-1-h.png b/assets/blocks/liquid/conduits/pulse-conduit-1-1-h.png
new file mode 100644
index 0000000..7d7acf2
--- /dev/null
+++ b/assets/blocks/liquid/conduits/pulse-conduit-1-1-h.png
Binary files differ
diff --git a/assets/blocks/liquid/conduits/pulse-conduit-1-1-v.png b/assets/blocks/liquid/conduits/pulse-conduit-1-1-v.png
new file mode 100644
index 0000000..ab23178
--- /dev/null
+++ b/assets/blocks/liquid/conduits/pulse-conduit-1-1-v.png
Binary files differ
diff --git a/assets/blocks/liquid/conduits/pulse-conduit-1-1.png b/assets/blocks/liquid/conduits/pulse-conduit-1-1.png
new file mode 100644
index 0000000..fbbbc9c
--- /dev/null
+++ b/assets/blocks/liquid/conduits/pulse-conduit-1-1.png
Binary files differ
diff --git a/assets/blocks/liquid/conduits/pulse-conduit-1-2.png b/assets/blocks/liquid/conduits/pulse-conduit-1-2.png
new file mode 100644
index 0000000..ff58bf2
--- /dev/null
+++ b/assets/blocks/liquid/conduits/pulse-conduit-1-2.png
Binary files differ
diff --git a/assets/blocks/liquid/conduits/pulse-conduit-1-3.png b/assets/blocks/liquid/conduits/pulse-conduit-1-3.png
new file mode 100644
index 0000000..2f57ce8
--- /dev/null
+++ b/assets/blocks/liquid/conduits/pulse-conduit-1-3.png
Binary files differ
diff --git a/assets/blocks/liquid/conduits/pulse-conduit-2-0-h.png b/assets/blocks/liquid/conduits/pulse-conduit-2-0-h.png
new file mode 100644
index 0000000..6e2f52b
--- /dev/null
+++ b/assets/blocks/liquid/conduits/pulse-conduit-2-0-h.png
Binary files differ
diff --git a/assets/blocks/liquid/conduits/pulse-conduit-2-0-v.png b/assets/blocks/liquid/conduits/pulse-conduit-2-0-v.png
new file mode 100644
index 0000000..7ee5d5d
--- /dev/null
+++ b/assets/blocks/liquid/conduits/pulse-conduit-2-0-v.png
Binary files differ
diff --git a/assets/blocks/liquid/conduits/pulse-conduit-2.png b/assets/blocks/liquid/conduits/pulse-conduit-2-0.png
index 35d1735..35d1735 100644
--- a/assets/blocks/liquid/conduits/pulse-conduit-2.png
+++ b/assets/blocks/liquid/conduits/pulse-conduit-2-0.png
Binary files differ
diff --git a/assets/blocks/liquid/conduits/pulse-conduit-2-1-h.png b/assets/blocks/liquid/conduits/pulse-conduit-2-1-h.png
new file mode 100644
index 0000000..b2978fb
--- /dev/null
+++ b/assets/blocks/liquid/conduits/pulse-conduit-2-1-h.png
Binary files differ
diff --git a/assets/blocks/liquid/conduits/pulse-conduit-2-1.png b/assets/blocks/liquid/conduits/pulse-conduit-2-1.png
new file mode 100644
index 0000000..31d5bed
--- /dev/null
+++ b/assets/blocks/liquid/conduits/pulse-conduit-2-1.png
Binary files differ
diff --git a/assets/blocks/liquid/conduits/pulse-conduit-2-2.png b/assets/blocks/liquid/conduits/pulse-conduit-2-2.png
new file mode 100644
index 0000000..831d55e
--- /dev/null
+++ b/assets/blocks/liquid/conduits/pulse-conduit-2-2.png
Binary files differ
diff --git a/assets/blocks/liquid/conduits/pulse-conduit-2-3-h.png b/assets/blocks/liquid/conduits/pulse-conduit-2-3-h.png
new file mode 100644
index 0000000..56a7446
--- /dev/null
+++ b/assets/blocks/liquid/conduits/pulse-conduit-2-3-h.png
Binary files differ
diff --git a/assets/blocks/liquid/conduits/pulse-conduit-2-3.png b/assets/blocks/liquid/conduits/pulse-conduit-2-3.png
new file mode 100644
index 0000000..82de4d3
--- /dev/null
+++ b/assets/blocks/liquid/conduits/pulse-conduit-2-3.png
Binary files differ
diff --git a/assets/blocks/liquid/conduits/pulse-conduit-3-0-h.png b/assets/blocks/liquid/conduits/pulse-conduit-3-0-h.png
new file mode 100644
index 0000000..6527245
--- /dev/null
+++ b/assets/blocks/liquid/conduits/pulse-conduit-3-0-h.png
Binary files differ
diff --git a/assets/blocks/liquid/conduits/pulse-conduit-3.png b/assets/blocks/liquid/conduits/pulse-conduit-3-0.png
index b7a411b..b7a411b 100644
--- a/assets/blocks/liquid/conduits/pulse-conduit-3.png
+++ b/assets/blocks/liquid/conduits/pulse-conduit-3-0.png
Binary files differ
diff --git a/assets/blocks/liquid/conduits/pulse-conduit-3-1.png b/assets/blocks/liquid/conduits/pulse-conduit-3-1.png
new file mode 100644
index 0000000..ffb0e87
--- /dev/null
+++ b/assets/blocks/liquid/conduits/pulse-conduit-3-1.png
Binary files differ
diff --git a/assets/blocks/liquid/conduits/pulse-conduit-3-3.png b/assets/blocks/liquid/conduits/pulse-conduit-3-3.png
new file mode 100644
index 0000000..cf614d2
--- /dev/null
+++ b/assets/blocks/liquid/conduits/pulse-conduit-3-3.png
Binary files differ
diff --git a/assets/blocks/liquid/conduits/pulse-conduit-4.png b/assets/blocks/liquid/conduits/pulse-conduit-4-0.png
index 7958647..7958647 100644
--- a/assets/blocks/liquid/conduits/pulse-conduit-4.png
+++ b/assets/blocks/liquid/conduits/pulse-conduit-4-0.png
Binary files differ
diff --git a/assets/blocks/liquid/conduits/pulse-conduit-4-1.png b/assets/blocks/liquid/conduits/pulse-conduit-4-1.png
new file mode 100644
index 0000000..d4a5e50
--- /dev/null
+++ b/assets/blocks/liquid/conduits/pulse-conduit-4-1.png
Binary files differ
diff --git a/assets/blocks/liquid/conduits/pulse-conduit-4-3.png b/assets/blocks/liquid/conduits/pulse-conduit-4-3.png
new file mode 100644
index 0000000..949c1e2
--- /dev/null
+++ b/assets/blocks/liquid/conduits/pulse-conduit-4-3.png
Binary files differ
diff --git a/assets/blocks/liquid/conduits/reinforced-conduit-0-0.png b/assets/blocks/liquid/conduits/reinforced-conduit-0-0.png
new file mode 100644
index 0000000..6280303
--- /dev/null
+++ b/assets/blocks/liquid/conduits/reinforced-conduit-0-0.png
Binary files differ
diff --git a/assets/blocks/liquid/conduits/reinforced-conduit-0-1.png b/assets/blocks/liquid/conduits/reinforced-conduit-0-1.png
new file mode 100644
index 0000000..033767c
--- /dev/null
+++ b/assets/blocks/liquid/conduits/reinforced-conduit-0-1.png
Binary files differ
diff --git a/assets/blocks/liquid/conduits/reinforced-conduit-0-2.png b/assets/blocks/liquid/conduits/reinforced-conduit-0-2.png
new file mode 100644
index 0000000..ec838d6
--- /dev/null
+++ b/assets/blocks/liquid/conduits/reinforced-conduit-0-2.png
Binary files differ
diff --git a/assets/blocks/liquid/conduits/reinforced-conduit-0-3.png b/assets/blocks/liquid/conduits/reinforced-conduit-0-3.png
new file mode 100644
index 0000000..f795439
--- /dev/null
+++ b/assets/blocks/liquid/conduits/reinforced-conduit-0-3.png
Binary files differ
diff --git a/assets/blocks/liquid/conduits/reinforced-conduit-0.png b/assets/blocks/liquid/conduits/reinforced-conduit-0.png
deleted file mode 100644
index 45bcdc2..0000000
--- a/assets/blocks/liquid/conduits/reinforced-conduit-0.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/liquid/conduits/reinforced-conduit-1-0-h.png b/assets/blocks/liquid/conduits/reinforced-conduit-1-0-h.png
new file mode 100644
index 0000000..5fb892c
--- /dev/null
+++ b/assets/blocks/liquid/conduits/reinforced-conduit-1-0-h.png
Binary files differ
diff --git a/assets/blocks/liquid/conduits/reinforced-conduit-1.png b/assets/blocks/liquid/conduits/reinforced-conduit-1-0.png
index e393c9c..e393c9c 100644
--- a/assets/blocks/liquid/conduits/reinforced-conduit-1.png
+++ b/assets/blocks/liquid/conduits/reinforced-conduit-1-0.png
Binary files differ
diff --git a/assets/blocks/liquid/conduits/reinforced-conduit-1-1-h.png b/assets/blocks/liquid/conduits/reinforced-conduit-1-1-h.png
new file mode 100644
index 0000000..2f4f9e9
--- /dev/null
+++ b/assets/blocks/liquid/conduits/reinforced-conduit-1-1-h.png
Binary files differ
diff --git a/assets/blocks/liquid/conduits/reinforced-conduit-1-1-v.png b/assets/blocks/liquid/conduits/reinforced-conduit-1-1-v.png
new file mode 100644
index 0000000..c303f7d
--- /dev/null
+++ b/assets/blocks/liquid/conduits/reinforced-conduit-1-1-v.png
Binary files differ
diff --git a/assets/blocks/liquid/conduits/reinforced-conduit-1-1.png b/assets/blocks/liquid/conduits/reinforced-conduit-1-1.png
new file mode 100644
index 0000000..2dce114
--- /dev/null
+++ b/assets/blocks/liquid/conduits/reinforced-conduit-1-1.png
Binary files differ
diff --git a/assets/blocks/liquid/conduits/reinforced-conduit-1-2.png b/assets/blocks/liquid/conduits/reinforced-conduit-1-2.png
new file mode 100644
index 0000000..115b526
--- /dev/null
+++ b/assets/blocks/liquid/conduits/reinforced-conduit-1-2.png
Binary files differ
diff --git a/assets/blocks/liquid/conduits/reinforced-conduit-1-3.png b/assets/blocks/liquid/conduits/reinforced-conduit-1-3.png
new file mode 100644
index 0000000..95c1d9f
--- /dev/null
+++ b/assets/blocks/liquid/conduits/reinforced-conduit-1-3.png
Binary files differ
diff --git a/assets/blocks/liquid/conduits/reinforced-conduit-2-0-h.png b/assets/blocks/liquid/conduits/reinforced-conduit-2-0-h.png
new file mode 100644
index 0000000..eb069a9
--- /dev/null
+++ b/assets/blocks/liquid/conduits/reinforced-conduit-2-0-h.png
Binary files differ
diff --git a/assets/blocks/liquid/conduits/reinforced-conduit-2-0-v.png b/assets/blocks/liquid/conduits/reinforced-conduit-2-0-v.png
new file mode 100644
index 0000000..c6b9470
--- /dev/null
+++ b/assets/blocks/liquid/conduits/reinforced-conduit-2-0-v.png
Binary files differ
diff --git a/assets/blocks/liquid/conduits/reinforced-conduit-2.png b/assets/blocks/liquid/conduits/reinforced-conduit-2-0.png
index 5099798..5099798 100644
--- a/assets/blocks/liquid/conduits/reinforced-conduit-2.png
+++ b/assets/blocks/liquid/conduits/reinforced-conduit-2-0.png
Binary files differ
diff --git a/assets/blocks/liquid/conduits/reinforced-conduit-2-1-h.png b/assets/blocks/liquid/conduits/reinforced-conduit-2-1-h.png
new file mode 100644
index 0000000..35606ba
--- /dev/null
+++ b/assets/blocks/liquid/conduits/reinforced-conduit-2-1-h.png
Binary files differ
diff --git a/assets/blocks/liquid/conduits/reinforced-conduit-2-1.png b/assets/blocks/liquid/conduits/reinforced-conduit-2-1.png
new file mode 100644
index 0000000..8037de2
--- /dev/null
+++ b/assets/blocks/liquid/conduits/reinforced-conduit-2-1.png
Binary files differ
diff --git a/assets/blocks/liquid/conduits/reinforced-conduit-2-2.png b/assets/blocks/liquid/conduits/reinforced-conduit-2-2.png
new file mode 100644
index 0000000..3402395
--- /dev/null
+++ b/assets/blocks/liquid/conduits/reinforced-conduit-2-2.png
Binary files differ
diff --git a/assets/blocks/liquid/conduits/reinforced-conduit-2-3-h.png b/assets/blocks/liquid/conduits/reinforced-conduit-2-3-h.png
new file mode 100644
index 0000000..32a2fd2
--- /dev/null
+++ b/assets/blocks/liquid/conduits/reinforced-conduit-2-3-h.png
Binary files differ
diff --git a/assets/blocks/liquid/conduits/reinforced-conduit-2-3.png b/assets/blocks/liquid/conduits/reinforced-conduit-2-3.png
new file mode 100644
index 0000000..80ce744
--- /dev/null
+++ b/assets/blocks/liquid/conduits/reinforced-conduit-2-3.png
Binary files differ
diff --git a/assets/blocks/liquid/conduits/reinforced-conduit-3-0-h.png b/assets/blocks/liquid/conduits/reinforced-conduit-3-0-h.png
new file mode 100644
index 0000000..f2ef533
--- /dev/null
+++ b/assets/blocks/liquid/conduits/reinforced-conduit-3-0-h.png
Binary files differ
diff --git a/assets/blocks/liquid/conduits/reinforced-conduit-3-0.png b/assets/blocks/liquid/conduits/reinforced-conduit-3-0.png
new file mode 100644
index 0000000..2ed95f1
--- /dev/null
+++ b/assets/blocks/liquid/conduits/reinforced-conduit-3-0.png
Binary files differ
diff --git a/assets/blocks/liquid/conduits/reinforced-conduit-3-1.png b/assets/blocks/liquid/conduits/reinforced-conduit-3-1.png
new file mode 100644
index 0000000..e52c759
--- /dev/null
+++ b/assets/blocks/liquid/conduits/reinforced-conduit-3-1.png
Binary files differ
diff --git a/assets/blocks/liquid/conduits/reinforced-conduit-3-3.png b/assets/blocks/liquid/conduits/reinforced-conduit-3-3.png
new file mode 100644
index 0000000..3e6195d
--- /dev/null
+++ b/assets/blocks/liquid/conduits/reinforced-conduit-3-3.png
Binary files differ
diff --git a/assets/blocks/liquid/conduits/reinforced-conduit-3.png b/assets/blocks/liquid/conduits/reinforced-conduit-3.png
deleted file mode 100644
index 297d720..0000000
--- a/assets/blocks/liquid/conduits/reinforced-conduit-3.png
+++ /dev/null
Binary files differ
diff --git a/assets/blocks/liquid/conduits/reinforced-conduit-4.png b/assets/blocks/liquid/conduits/reinforced-conduit-4-0.png
index 46deb70..46deb70 100644
--- a/assets/blocks/liquid/conduits/reinforced-conduit-4.png
+++ b/assets/blocks/liquid/conduits/reinforced-conduit-4-0.png
Binary files differ
diff --git a/assets/blocks/liquid/conduits/reinforced-conduit-4-1.png b/assets/blocks/liquid/conduits/reinforced-conduit-4-1.png
new file mode 100644
index 0000000..14845e4
--- /dev/null
+++ b/assets/blocks/liquid/conduits/reinforced-conduit-4-1.png
Binary files differ
diff --git a/assets/blocks/liquid/conduits/reinforced-conduit-4-3.png b/assets/blocks/liquid/conduits/reinforced-conduit-4-3.png
new file mode 100644
index 0000000..4901d38
--- /dev/null
+++ b/assets/blocks/liquid/conduits/reinforced-conduit-4-3.png
Binary files differ
diff --git a/src/block/distribution.rs b/src/block/distribution.rs
index 8000dec..e620d8a 100644
--- a/src/block/distribution.rs
+++ b/src/block/distribution.rs
@@ -57,7 +57,7 @@ fn draw_stack(
) -> ImageHolder<4> {
let ctx = ctx.unwrap();
let mask = mask(ctx, rot, name);
- let edge = load!(concat edge => name which is ["surge-conveyor" | "plastanium-conveyor"], s);
+ let edge = load!(concat "edge" => name which is ["surge-conveyor" | "plastanium-conveyor"], s);
let edgify = |skip, to: &mut Image<&mut [u8], 4>| {
for i in 0..4 {
if i == skip {
diff --git a/src/block/drills.rs b/src/block/drills.rs
index e19912e..4558666 100644
--- a/src/block/drills.rs
+++ b/src/block/drills.rs
@@ -9,7 +9,7 @@ make_simple!(
let mut base =
load!(from name which is ["large-plasma-bore" | "plasma-bore" | "cliff-crusher"], s);
unsafe {
- base.overlay(load!(concat top => name which is ["large-plasma-bore" | "plasma-bore" | "cliff-crusher"], s).rotate(rot.rotated(false).count()) )
+ base.overlay(load!(concat "top" => name which is ["large-plasma-bore" | "plasma-bore" | "cliff-crusher"], s).rotate(rot.rotated(false).count()) )
};
base
},
diff --git a/src/block/liquid.rs b/src/block/liquid.rs
index e090724..5ef4ea8 100644
--- a/src/block/liquid.rs
+++ b/src/block/liquid.rs
@@ -15,10 +15,8 @@ make_simple!(
|_, name, _, ctx: Option<&RenderingContext>, rot, s| {
let ctx = ctx.unwrap();
let mask = mask(ctx, rot, name);
- let (index, rot, flip) = mask2rotations(mask, rot);
-
// TODO caps. stopped trying bcz too complex
- rotations2tile((index, rot, flip), name, s)
+ mask2tile(mask, rot, name, s)
},
true
);
diff --git a/src/block/payload.rs b/src/block/payload.rs
index 93a8b7f..e8d8117 100644
--- a/src/block/payload.rs
+++ b/src/block/payload.rs
@@ -39,7 +39,7 @@ make_simple!(SimplePayloadBlock, |_, n, _, _, r: Rotation, scl| {
base.overlay(input.rotate(r.rotated(false).count()))
.overlay(output.rotate(r.rotated(false).count()))
.overlay(
- &load!(concat top => n which is ["payload-loader" | "payload-unloader"], scl),
+ &load!(concat "top" => n which is ["payload-loader" | "payload-unloader"], scl),
)
};
base
@@ -121,7 +121,7 @@ impl BlockLogic for PayloadBlock {
let mut base =
load!(from name which is ["payload-router" | "reinforced-payload-router"], s);
unsafe { base.rotate(r.rotated(false).count()) };
- let over = load!(concat over => name which is ["payload-router" | "reinforced-payload-router"], s);
+ let over = load!(concat "over" => name which is ["payload-router" | "reinforced-payload-router"], s);
base.overlay(&over);
base
}
@@ -134,7 +134,7 @@ impl BlockLogic for PayloadBlock {
});
unsafe { out.rotate(r.rotated(false).count()) };
base.overlay(&out);
- base.overlay(&load!(concat top => name which is ["constructor" | "large-constructor" | "payload-source"], s));
+ base.overlay(&load!(concat "top" => name which is ["constructor" | "large-constructor" | "payload-source"], s));
base
}
}
diff --git a/src/block/production.rs b/src/block/production.rs
index 333290a..9cb13ca 100644
--- a/src/block/production.rs
+++ b/src/block/production.rs
@@ -83,8 +83,8 @@ make_simple!(
|_, n, _, _, r: Rotation, s| {
let mut base = load!(from n which is ["phase-heater" | "electric-heater" | "oxidation-chamber" | "slag-heater" | "heat-source"], s);
base.overlay(unsafe { match r {
- Rotation::Up | Rotation::Right => load!(concat top1 => n which is ["phase-heater" | "electric-heater" | "oxidation-chamber" | "slag-heater" | "heat-source"], s),
- Rotation::Down | Rotation::Left => load!(concat top2 => n which is ["phase-heater" | "electric-heater" | "oxidation-chamber" | "slag-heater" | "heat-source"], s)
+ Rotation::Up | Rotation::Right => load!(concat "top1" => n which is ["phase-heater" | "electric-heater" | "oxidation-chamber" | "slag-heater" | "heat-source"], s),
+ Rotation::Down | Rotation::Left => load!(concat "top2" => n which is ["phase-heater" | "electric-heater" | "oxidation-chamber" | "slag-heater" | "heat-source"], s)
}.rotate(r.rotated(false).count())});
base
},
@@ -102,10 +102,10 @@ make_simple!(HeatConduit, |_, n, _, _, r: Rotation, s| {
base.overlay(unsafe {
match r {
Rotation::Up | Rotation::Right => {
- load!(concat top1 => n which is ["heat-router" | "heat-redirector"], s)
+ load!(concat "top1" => n which is ["heat-router" | "heat-redirector"], s)
}
Rotation::Down | Rotation::Left => {
- load!(concat top2 => n which is ["heat-router" | "heat-redirector"], s)
+ load!(concat "top2" => n which is ["heat-router" | "heat-redirector"], s)
}
}
.rotate(r.rotated(false).count())
diff --git a/src/block/units.rs b/src/block/units.rs
index 877e81b..9fc561d 100644
--- a/src/block/units.rs
+++ b/src/block/units.rs
@@ -41,12 +41,12 @@ make_simple!(
load!(from name which is ["tank-assembler" | "ship-assembler" | "mech-assembler"], s);
base.overlay(unsafe {
match rot {
- Rotation::Up | Rotation::Right => load!(concat side1 => name which is ["tank-assembler" | "ship-assembler" | "mech-assembler"], s),
- Rotation::Down | Rotation::Left => load!(concat side2 => name which is ["tank-assembler" | "ship-assembler" | "mech-assembler"], s)
+ Rotation::Up | Rotation::Right => load!(concat "side1" => name which is ["tank-assembler" | "ship-assembler" | "mech-assembler"], s),
+ Rotation::Down | Rotation::Left => load!(concat "side2" => name which is ["tank-assembler" | "ship-assembler" | "mech-assembler"], s)
}
.rotate(rot.rotated(false).count())
});
- base.overlay(&load!(concat top => name which is ["tank-assembler" | "ship-assembler" | "mech-assembler"], s));
+ base.overlay(&load!(concat "top" => name which is ["tank-assembler" | "ship-assembler" | "mech-assembler"], s));
base
},
|_, reg, map, buff| read_assembler(reg, map, buff)
@@ -219,7 +219,7 @@ impl BlockLogic for ConstructorBlock {
// }
// }
- base.overlay(&load!(concat top => name which is ["additive-reconstructor" | "multiplicative-reconstructor" | "exponential-reconstructor" | "tetrative-reconstructor" | "tank-refabricator" | "mech-refabricator" | "ship-refabricator" | "prime-refabricator"], s));
+ base.overlay(&load!(concat "top" => name which is ["additive-reconstructor" | "multiplicative-reconstructor" | "exponential-reconstructor" | "tetrative-reconstructor" | "tank-refabricator" | "mech-refabricator" | "ship-refabricator" | "prime-refabricator"], s));
base
}
diff --git a/src/data/autotile.rs b/src/data/autotile.rs
index b284b6c..ce8361c 100644
--- a/src/data/autotile.rs
+++ b/src/data/autotile.rs
@@ -93,165 +93,112 @@ fn print_crosses(v: Vec<Cross<'_>>, height: usize) -> String {
}
pub fn tile(ctx: &RenderingContext<'_>, name: &str, rot: Rotation, s: Scale) -> ImageHolder<4> {
- rotations2tile(mask2rotations(mask(ctx, rot, name), rot), name, s)
+ mask2tile(mask(ctx, rot, name), rot, name, s)
}
-pub fn mask2rotations(mask: U4, rot: Rotation) -> (u8, u8, u8) {
- use U4::{
- B0000, B0001, B0010, B0011, B0100, B0101, B0110, B0111, B1000, B1001, B1010, B1011, B1100,
- B1101, B1110, B1111,
- };
+pub fn mask2tile(mask: U4, rot: Rotation, name: &str, scale: Scale) -> ImageHolder<4> {
+ use U4::*;
macro_rules! p {
- ($image:literal, $rotation:literal) => {
- ($image, $rotation, 0)
- };
- ($image:literal, $rotation:literal, $flipping:expr) => {
- ($image, $rotation, $flipping)
+ ($image:literal) => {
+ load!(concat $image => name which is ["reinforced-conduit" | "armored-duct" | "pulse-conduit" | "plated-conduit" | "conduit" | "conveyor" | "titanium-conveyor" | "armored-conveyor" | "duct"], scale)
};
}
match mask {
// from left
B0001 => match rot {
- Rotation::Down => p!(1, 1, FLIP_Y), // ┐
- Rotation::Right => p!(0, 0), // ─
- Rotation::Up => p!(1, 3), // ┘
+ Rotation::Down => p!("1-1-h"), // ┐
+ Rotation::Right => p!("0-0"), // ─
+ Rotation::Up => p!("1-3"), // ┘
Rotation::Left => unreachable!(),
},
// from below
B0010 => match rot {
- Rotation::Left => p!(1, 2), // ┐
- Rotation::Right => p!(1, 1), // ┌
- Rotation::Up => p!(0, 3), // │
+ Rotation::Left => p!("1-2"), // ┐
+ Rotation::Right => p!("1-1"), // ┌
+ Rotation::Up => p!("0-3"), // │
Rotation::Down => unreachable!(),
},
// from bottom + left
B0011 => match rot {
- Rotation::Right => p!(2, 0), // ┬
- Rotation::Up => p!(2, 3, FLIP_Y | FLIP_X), // ┤
+ Rotation::Right => p!("2-0"), // ┬
+ Rotation::Up => p!("2-3-h"), // ┤
_ => unreachable!(),
},
// from right
B0100 => match rot {
- Rotation::Left => p!(0, 2), // ─
- Rotation::Down => p!(1, 1), // ┌
- Rotation::Up => p!(1, 1, FLIP_X), // └
+ Rotation::Left => p!("0-2"), // ─
+ Rotation::Down => p!("1-1"), // ┌
+ Rotation::Up => p!("1-1-v"), // └
Rotation::Right => unreachable!(),
},
// from sides
B0101 => match rot {
- Rotation::Up => p!(4, 3), // ┴
- Rotation::Down => p!(4, 1), // ┬
+ Rotation::Up => p!("4-3"), // ┴
+ Rotation::Down => p!("4-1"), // ┬
_ => unreachable!(),
},
// from right + down
B0110 => match rot {
- Rotation::Up => p!(2, 3), // ├,
- Rotation::Left => p!(2, 0, FLIP_X), // ┬
+ Rotation::Up => p!("2-3"), // ├,
+ Rotation::Left => p!("2-0-h"), // ┬
_ => unreachable!(),
},
// from right + down + left
B0111 => match rot {
- Rotation::Up => p!(3, 3), // ┼
+ Rotation::Up => p!("3-3"), // ┼
_ => unreachable!(),
},
// from above
B1000 => match rot {
- Rotation::Down => p!(0, 1), // │
- Rotation::Left => p!(1, 0, FLIP_X), // ┘
- Rotation::Right => p!(1, 0), // └
+ Rotation::Down => p!("0-1"), // │
+ Rotation::Left => p!("1-0-h"), // ┘
+ Rotation::Right => p!("1-0"), // └
Rotation::Up => unreachable!(),
},
// from top and left
B1001 => match rot {
- Rotation::Right => p!(2, 0, FLIP_Y), // ┴
- Rotation::Down => p!(2, 1), // ┤
+ Rotation::Right => p!("2-0-v"), // ┴
+ Rotation::Down => p!("2-1"), // ┤
_ => unreachable!(),
},
// from top sides
B1010 => match rot {
- Rotation::Right => p!(4, 0), // ├
- Rotation::Left => p!(4, 3), // ┤
+ Rotation::Right => p!("4-0"), // ├
+ Rotation::Left => p!("4-3"), // ┤
_ => unreachable!(),
},
// from top, left, bottom
B1011 => match rot {
- Rotation::Right => p!(3, 0), // ┼
+ Rotation::Right => p!("3-0"), // ┼
_ => unreachable!(),
},
// from top and right
B1100 => match rot {
- Rotation::Down => p!(2, 3, FLIP_X), // ├
- Rotation::Left => p!(2, 2), // ┴
+ Rotation::Down => p!("2-1-h"), // ├
+ Rotation::Left => p!("2-2"), // ┴
_ => unreachable!(),
},
// from top, left, right
B1101 => match rot {
- Rotation::Down => p!(3, 1), // ┼
+ Rotation::Down => p!("3-1"), // ┼
_ => unreachable!(),
},
// from top, right, bottom
B1110 => match rot {
- Rotation::Left => p!(3, 0, FLIP_X), // ┼
+ Rotation::Left => p!("3-0-h"), // ┼
_ => unreachable!(),
},
- B0000 => (
- 0,
- match rot {
- Rotation::Left => 2,
- Rotation::Right => 0,
- Rotation::Down => 1,
- Rotation::Up => 3,
- },
- 0,
- ),
+ B0000 => match rot {
+ Rotation::Left => p!("0-2"),
+ Rotation::Right => p!("0-0"),
+ Rotation::Down => p!("0-1"),
+ Rotation::Up => p!("0-3"),
+ },
B1111 => unreachable!(),
}
}
-pub const FLIP_X: u8 = 1;
-pub const FLIP_Y: u8 = 2;
-
-/// # Safety
-///
-/// `with` must be square
-pub unsafe fn flrot(flip: u8, rot: u8, with: &mut ImageHolder<4>) {
- if (flip & FLIP_X) != 0 {
- with.flip_h();
- }
- if (flip & FLIP_Y) != 0 {
- with.flip_v();
- }
- with.rotate(rot);
-}
-
-/// TODO figure out if a flip is cheaper than a `rotate_270`
-pub fn rotations2tile(
- (index, rot, flip): (u8, u8, u8),
- name: &str,
- scale: Scale,
-) -> ImageHolder<4> {
- let mut p = match index {
- 0 => {
- load!(concat 0 => name which is ["reinforced-conduit" | "armored-duct" | "pulse-conduit" | "plated-conduit" | "conduit" | "conveyor" | "titanium-conveyor" | "armored-conveyor" | "duct"], scale)
- }
- 1 => {
- load!(concat 1 => name which is ["reinforced-conduit" | "armored-duct" | "pulse-conduit" | "plated-conduit" | "conduit" | "conveyor" | "titanium-conveyor" | "armored-conveyor" | "duct"], scale)
- }
- 2 => {
- load!(concat 2 => name which is ["reinforced-conduit" | "armored-duct" | "pulse-conduit" | "plated-conduit" | "conduit" | "conveyor" | "titanium-conveyor" | "armored-conveyor" | "duct"], scale)
- }
- 3 => {
- load!(concat 3 => name which is ["reinforced-conduit" | "armored-duct" | "pulse-conduit" | "plated-conduit" | "conduit" | "conveyor" | "titanium-conveyor" | "armored-conveyor" | "duct"], scale)
- }
- _ => {
- load!(concat 4 => name which is ["reinforced-conduit" | "armored-duct" | "pulse-conduit" | "plated-conduit" | "conduit" | "conveyor" | "titanium-conveyor" | "armored-conveyor" | "duct"], scale)
- }
- };
- unsafe { flrot(flip, rot, &mut p) };
- p
-}
-
pub fn mask(ctx: &RenderingContext, rot: Rotation, n: &str) -> U4 {
macro_rules! c {
($in: expr, $srot: expr, $name: expr, $at: expr) => {{
@@ -296,8 +243,7 @@ fn test_cross() {
($schem: literal => $($a:tt,$b:tt,$c:tt,$d:tt)*) => {
let s = ss.deserialize_base64($schem).unwrap();
let mut c = vec![];
- println!("{:#?}", s.blocks);
-
+ println!("{:#?}", s.blocks);
for (position, _) in s.block_iter() {
let pctx = PositionContext {
position,
diff --git a/src/data/renderer.rs b/src/data/renderer.rs
index a455161..bee4ef6 100644
--- a/src/data/renderer.rs
+++ b/src/data/renderer.rs
@@ -68,7 +68,7 @@ macro_rules! load {
n => unreachable!("{n:?}"),
}
};
- (concat $x:expr => $v:ident which is [$($k:literal $(|)?)+], $scale: ident) => { paste::paste! {
+ (concat $x:literal => $v:ident which is [$($k:literal $(|)?)+], $scale: ident) => { paste::paste! {
match $v {
$($k =>
ImageHolder::from(match $scale {