Merge branch 'master' of https://github.com/Anuken/Mindustry into tsunami
Conflicts: core/assets/icons/icons.properties core/assets/sprites/block_colors.png core/assets/sprites/fallback/sprites.atlas core/assets/sprites/fallback/sprites3.png core/assets/sprites/fallback/sprites4.png core/assets/sprites/fallback/sprites5.png core/assets/sprites/fallback/sprites7.png core/assets/sprites/fallback/sprites8.png core/assets/sprites/sprites.atlas core/assets/sprites/sprites.png core/assets/sprites/sprites2.png core/assets/sprites/sprites4.png core/assets/sprites/sprites5.png core/src/mindustry/content/Blocks.java
slava0135
@@ -1119,6 +1119,7 @@ block.arc.name = Arc
|
||||
block.rtg-generator.name = RTG Generator
|
||||
block.spectre.name = Spectre
|
||||
block.meltdown.name = Meltdown
|
||||
block.foreshadow.name = Foreshadow
|
||||
block.container.name = Container
|
||||
block.launch-pad.name = Launch Pad
|
||||
block.launch-pad-large.name = Large Launch Pad
|
||||
|
||||
@@ -312,3 +312,4 @@
|
||||
63424=corvus|unit-corvus-medium
|
||||
63423=memory-bank|block-memory-bank-medium
|
||||
63422=tsunami|block-tsunami-medium
|
||||
63422=foreshadow|block-foreshadow-medium
|
||||
|
||||
|
Before Width: | Height: | Size: 815 B After Width: | Height: | Size: 815 B |
|
Before Width: | Height: | Size: 923 KiB After Width: | Height: | Size: 949 KiB |
|
Before Width: | Height: | Size: 472 KiB After Width: | Height: | Size: 522 KiB |
|
Before Width: | Height: | Size: 1.3 MiB After Width: | Height: | Size: 186 KiB |
|
Before Width: | Height: | Size: 407 KiB After Width: | Height: | Size: 425 KiB |
|
Before Width: | Height: | Size: 319 KiB After Width: | Height: | Size: 1.4 MiB |
|
Before Width: | Height: | Size: 2.7 MiB After Width: | Height: | Size: 2.9 MiB |
|
Before Width: | Height: | Size: 1.4 MiB After Width: | Height: | Size: 187 KiB |
|
Before Width: | Height: | Size: 403 KiB After Width: | Height: | Size: 421 KiB |
|
Before Width: | Height: | Size: 307 KiB After Width: | Height: | Size: 1.4 MiB |