Mindustry/core/assets-raw/sprites/blocks/environment
Anuken 393d3a19a3 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features
 Conflicts:
	core/assets/icons/icons.properties
	core/src/mindustry/content/Blocks.java
	core/src/mindustry/world/meta/StatValues.java
2021-09-04 23:12:28 -04:00
..
basalt1.png Dacite decoration block / Environmental renaming 2020-09-10 15:17:10 -04:00
basalt2.png Dacite decoration block / Environmental renaming 2020-09-10 15:17:10 -04:00
basalt3.png Dacite decoration block / Environmental renaming 2020-09-10 15:17:10 -04:00
beryllic-stone1.png More stone blocks 2021-06-21 20:52:49 -04:00
beryllic-stone2.png More stone blocks 2021-06-21 20:52:49 -04:00
beryllic-stone3.png More stone blocks 2021-06-21 20:52:49 -04:00
beryllic-stone4.png when git add . is too hard 2021-06-21 20:53:08 -04:00
beryllic-stone-wall1.png when git add . is too hard 2021-06-21 20:53:08 -04:00
beryllic-stone-wall2.png when git add . is too hard 2021-06-21 20:53:08 -04:00
beryllic-stone-wall-large.png when git add . is too hard 2021-06-21 20:53:08 -04:00
bluemat1.png Unspoiled 2021-06-02 11:15:30 -04:00
bluemat2.png Unspoiled 2021-06-02 11:15:30 -04:00
bluemat3.png Unspoiled 2021-06-02 11:15:30 -04:00
carbon-stone1.png Name cleanup 2021-06-22 16:52:48 -04:00
carbon-stone2.png Name cleanup 2021-06-22 16:52:48 -04:00
carbon-stone3.png Name cleanup 2021-06-22 16:52:48 -04:00
carbon-stone4.png Name cleanup 2021-06-22 16:52:48 -04:00
carbon-wall1.png Unspoiled 2021-06-02 11:15:30 -04:00
carbon-wall2.png Unspoiled 2021-06-02 11:15:30 -04:00
carbon-wall-large.png Unspoiled 2021-06-02 11:15:30 -04:00
char1.png Partial 7.0 merge - API preview 2021-06-02 11:08:08 -04:00
char2.png Partial 7.0 merge - API preview 2021-06-02 11:08:08 -04:00
char3.png Partial 7.0 merge - API preview 2021-06-02 11:08:08 -04:00
cliff0.png Better cliff sprites 2020-10-10 11:37:58 -04:00
cliff1.png Better cliff sprites 2020-10-10 11:37:58 -04:00
cliff2.png Better cliff sprites 2020-10-10 11:37:58 -04:00
cliff3.png Wave balancing & other tweaks 2020-10-10 12:26:57 -04:00
cliff4.png Better cliff sprites 2020-10-10 11:37:58 -04:00
cliff5.png Better cliff sprites 2020-10-10 11:37:58 -04:00
cliff6.png Better cliff sprites 2020-10-10 11:37:58 -04:00
cliff7.png Wave balancing & other tweaks 2020-10-10 12:26:57 -04:00
cliff.png Added bool to enable editor cliff button 2020-10-17 11:02:48 -04:00
coal1.png Improved battery brightness display / Palette tweak / Diffgen buff 2020-02-11 17:27:33 -05:00
coal2.png Improved battery brightness display / Palette tweak / Diffgen buff 2020-02-11 17:27:33 -05:00
coal3.png Improved battery brightness display / Palette tweak / Diffgen buff 2020-02-11 17:27:33 -05:00
copper1.png Improved battery brightness display / Palette tweak / Diffgen buff 2020-02-11 17:27:33 -05:00
copper2.png Improved battery brightness display / Palette tweak / Diffgen buff 2020-02-11 17:27:33 -05:00
copper3.png Improved battery brightness display / Palette tweak / Diffgen buff 2020-02-11 17:27:33 -05:00
coralchunk1.png Unspoiled 2021-06-02 11:15:30 -04:00
coralchunk-cluster0.png Unspoiled 2021-06-02 11:15:30 -04:00
crater-stone1.png Improved environmental block internal names 2021-08-06 11:52:25 -04:00
crater-stone2.png Improved environmental block internal names 2021-08-06 11:52:25 -04:00
crater-stone3.png Improved environmental block internal names 2021-08-06 11:52:25 -04:00
crater-stone4.png Improved environmental block internal names 2021-08-06 11:52:25 -04:00
crater-stone5.png Improved environmental block internal names 2021-08-06 11:52:25 -04:00
crater-stone6.png Improved environmental block internal names 2021-08-06 11:52:25 -04:00
dacite1.png Dacite decoration block / Environmental renaming 2020-09-10 15:17:10 -04:00
dacite2.png Dacite decoration block / Environmental renaming 2020-09-10 15:17:10 -04:00
dacite3.png Dacite decoration block / Environmental renaming 2020-09-10 15:17:10 -04:00
dacite-wall1.png Dacite decoration block / Environmental renaming 2020-09-10 15:17:10 -04:00
dacite-wall2.png Dacite decoration block / Environmental renaming 2020-09-10 15:17:10 -04:00
dacite-wall-large.png Dacite decoration block / Environmental renaming 2020-09-10 15:17:10 -04:00
dark-metal1.png Improved battery brightness display / Palette tweak / Diffgen buff 2020-02-11 17:27:33 -05:00
dark-metal2.png Fix For Metal Environments (#5322) 2021-06-03 14:36:55 -04:00
dark-metal-large.png Fix For Metal Environments (#5322) 2021-06-03 14:36:55 -04:00
dark-panel-1.png Asteroid progress 2021-06-11 19:59:18 -04:00
dark-panel-2.png Fix For Metal Environments (#5322) 2021-06-03 14:36:55 -04:00
dark-panel-3.png Improved battery brightness display / Palette tweak / Diffgen buff 2020-02-11 17:27:33 -05:00
dark-panel-4.png Fix For Metal Environments (#5322) 2021-06-03 14:36:55 -04:00
dark-panel-5.png Minor bugfix 2021-06-03 16:01:51 -04:00
dark-panel-6.png Improved battery brightness display / Palette tweak / Diffgen buff 2020-02-11 17:27:33 -05:00
darksand1.png Improved battery brightness display / Palette tweak / Diffgen buff 2020-02-11 17:27:33 -05:00
darksand2.png Improved battery brightness display / Palette tweak / Diffgen buff 2020-02-11 17:27:33 -05:00
darksand3.png Improved battery brightness display / Palette tweak / Diffgen buff 2020-02-11 17:27:33 -05:00
darksand-tainted-water.png Improved battery brightness display / Palette tweak / Diffgen buff 2020-02-11 17:27:33 -05:00
darksand-water.png Improved battery brightness display / Palette tweak / Diffgen buff 2020-02-11 17:27:33 -05:00
deep-tainted-water.png Added rivers on Serpulo / Added deep tainted water 2021-09-04 15:23:47 -04:00
deep-water.png Improved environmental block internal names 2021-08-06 11:52:25 -04:00
dirt1.png Saner naming scheme of wall blocks 2020-09-10 12:09:25 -04:00
dirt2.png Saner naming scheme of wall blocks 2020-09-10 12:09:25 -04:00
dirt3.png Saner naming scheme of wall blocks 2020-09-10 12:09:25 -04:00
dirt-wall1.png files that intelliJ missed despite me hitting refresh 2020-09-10 12:14:12 -04:00
dirt-wall2.png files that intelliJ missed despite me hitting refresh 2020-09-10 12:14:12 -04:00
dirt-wall-large.png files that intelliJ missed despite me hitting refresh 2020-09-10 12:14:12 -04:00
dune-wall1.png Partial 7.0 merge - API preview 2021-06-02 11:08:08 -04:00
dune-wall2.png Better cliff sprites 2020-10-10 11:37:58 -04:00
dune-wall-large.png Partial 7.0 merge - API preview 2021-06-02 11:08:08 -04:00
edge-stencil.png Improved battery brightness display / Palette tweak / Diffgen buff 2020-02-11 17:27:33 -05:00
edge.png Improved battery brightness display / Palette tweak / Diffgen buff 2020-02-11 17:27:33 -05:00
env-error.png Partial 7.0 merge - API preview 2021-06-02 11:08:08 -04:00
ferric-craters1.png New ferric blocks, improved asteroid generation 2021-06-19 21:19:46 -04:00
ferric-craters2.png New ferric blocks, improved asteroid generation 2021-06-19 21:19:46 -04:00
ferric-craters3.png Cleanup 2021-06-20 08:47:30 -04:00
ferric-stone1.png New ferric blocks, improved asteroid generation 2021-06-19 21:19:46 -04:00
ferric-stone2.png New ferric blocks, improved asteroid generation 2021-06-19 21:19:46 -04:00
ferric-stone3.png New ferric blocks, improved asteroid generation 2021-06-19 21:19:46 -04:00
ferric-stone4.png New ferric blocks, improved asteroid generation 2021-06-19 21:19:46 -04:00
ferric-stone-wall1.png New ferric blocks, improved asteroid generation 2021-06-19 21:19:46 -04:00
ferric-stone-wall2.png New ferric blocks, improved asteroid generation 2021-06-19 21:19:46 -04:00
ferric-stone-wall-large.png New ferric blocks, improved asteroid generation 2021-06-19 21:19:46 -04:00
glowblob1.png Unspoiled 2021-06-02 11:15:30 -04:00
graphitic-wall1.png Unspoiled 2021-06-02 11:15:30 -04:00
graphitic-wall2.png Unspoiled 2021-06-02 11:15:30 -04:00
graphitic-wall3.png Unspoiled 2021-06-02 11:15:30 -04:00
graphitic-wall-large.png Unspoiled 2021-06-02 11:15:30 -04:00
grass1.png Improved battery brightness display / Palette tweak / Diffgen buff 2020-02-11 17:27:33 -05:00
grass2.png Improved battery brightness display / Palette tweak / Diffgen buff 2020-02-11 17:27:33 -05:00
grass3.png Improved battery brightness display / Palette tweak / Diffgen buff 2020-02-11 17:27:33 -05:00
hotrock1.png Improved battery brightness display / Palette tweak / Diffgen buff 2020-02-11 17:27:33 -05:00
hotrock2.png Improved battery brightness display / Palette tweak / Diffgen buff 2020-02-11 17:27:33 -05:00
hotrock3.png Improved battery brightness display / Palette tweak / Diffgen buff 2020-02-11 17:27:33 -05:00
ice1.png Improved battery brightness display / Palette tweak / Diffgen buff 2020-02-11 17:27:33 -05:00
ice2.png Improved battery brightness display / Palette tweak / Diffgen buff 2020-02-11 17:27:33 -05:00
ice3.png Improved battery brightness display / Palette tweak / Diffgen buff 2020-02-11 17:27:33 -05:00
ice-snow1.png Better DefenderAI / Vela building / Anuken/Mindustry-Suggestions/issues/2074 2021-03-05 11:10:12 -05:00
ice-snow2.png Better DefenderAI / Vela building / Anuken/Mindustry-Suggestions/issues/2074 2021-03-05 11:10:12 -05:00
ice-snow3.png Better DefenderAI / Vela building / Anuken/Mindustry-Suggestions/issues/2074 2021-03-05 11:10:12 -05:00
ice-wall1.png files that intelliJ missed despite me hitting refresh 2020-09-10 12:14:12 -04:00
ice-wall2.png files that intelliJ missed despite me hitting refresh 2020-09-10 12:14:12 -04:00
ice-wall-large.png files that intelliJ missed despite me hitting refresh 2020-09-10 12:14:12 -04:00
lead1.png Improved battery brightness display / Palette tweak / Diffgen buff 2020-02-11 17:27:33 -05:00
lead2.png Improved battery brightness display / Palette tweak / Diffgen buff 2020-02-11 17:27:33 -05:00
lead3.png Improved battery brightness display / Palette tweak / Diffgen buff 2020-02-11 17:27:33 -05:00
magmarock1.png Improved battery brightness display / Palette tweak / Diffgen buff 2020-02-11 17:27:33 -05:00
magmarock2.png Improved battery brightness display / Palette tweak / Diffgen buff 2020-02-11 17:27:33 -05:00
magmarock3.png Improved battery brightness display / Palette tweak / Diffgen buff 2020-02-11 17:27:33 -05:00
metal-floor-2.png Improved battery brightness display / Palette tweak / Diffgen buff 2020-02-11 17:27:33 -05:00
metal-floor-3.png Bugfixes 2020-09-19 11:40:11 -04:00
metal-floor-4.png New metal floor / Selective floor attribute stats 2021-06-09 13:26:01 -04:00
metal-floor-5.png Improved battery brightness display / Palette tweak / Diffgen buff 2020-02-11 17:27:33 -05:00
metal-floor-damaged1.png Fix For Metal Environments (#5322) 2021-06-03 14:36:55 -04:00
metal-floor-damaged2.png Fix For Metal Environments (#5322) 2021-06-03 14:36:55 -04:00
metal-floor-damaged3.png Fix For Metal Environments (#5322) 2021-06-03 14:36:55 -04:00
metal-floor.png Partial 7.0 merge - API preview 2021-06-02 11:08:08 -04:00
molten-slag.png Improved environmental block internal names 2021-08-06 11:52:25 -04:00
moss1.png Improved battery brightness display / Palette tweak / Diffgen buff 2020-02-11 17:27:33 -05:00
moss2.png Improved battery brightness display / Palette tweak / Diffgen buff 2020-02-11 17:27:33 -05:00
moss3.png Improved battery brightness display / Palette tweak / Diffgen buff 2020-02-11 17:27:33 -05:00
mud1.png Mud 2020-09-18 00:13:08 -04:00
mud2.png Mud 2020-09-18 00:13:08 -04:00
mud3.png Mud 2020-09-18 00:13:08 -04:00
pack.json Fallback atlas / Bugfixes / Cleanup 2020-06-11 15:25:46 -04:00
pebbles1.png Improved battery brightness display / Palette tweak / Diffgen buff 2020-02-11 17:27:33 -05:00
pebbles2.png Improved battery brightness display / Palette tweak / Diffgen buff 2020-02-11 17:27:33 -05:00
pebbles3.png Improved battery brightness display / Palette tweak / Diffgen buff 2020-02-11 17:27:33 -05:00
pine.png textures micro fixes and improvements 2020-07-22 03:40:58 +03:00
red-ice1.png stop 2021-06-12 10:55:18 -04:00
red-ice2.png stop 2021-06-12 10:55:18 -04:00
red-ice3.png stop 2021-06-12 10:55:18 -04:00
red-ice-wall1.png stop 2021-06-12 10:55:18 -04:00
red-ice-wall2.png stop 2021-06-12 10:55:18 -04:00
red-ice-wall-large.png stop 2021-06-12 10:55:18 -04:00
redice-wall-large.png stop 2021-06-12 10:55:18 -04:00
redmat1.png Unspoiled 2021-06-02 11:15:30 -04:00
redmat2.png Unspoiled 2021-06-02 11:15:30 -04:00
redmat3.png Unspoiled 2021-06-02 11:15:30 -04:00
regolith1.png Unspoiled 2021-06-02 11:15:30 -04:00
regolith2.png Unspoiled 2021-06-02 11:15:30 -04:00
regolith3.png Unspoiled 2021-06-02 11:15:30 -04:00
regolith-wall1.png Unspoiled 2021-06-02 11:15:30 -04:00
regolith-wall2.png Unspoiled 2021-06-02 11:15:30 -04:00
regolith-wall-large.png Unspoiled 2021-06-02 11:15:30 -04:00
rhyolite1.png Unspoiled 2021-06-02 11:15:30 -04:00
rhyolite2.png Unspoiled 2021-06-02 11:15:30 -04:00
rhyolite3.png Unspoiled 2021-06-02 11:15:30 -04:00
rhyolite-crater1.png Unspoiled 2021-06-02 11:15:30 -04:00
rhyolite-crater2.png Unspoiled 2021-06-02 11:15:30 -04:00
rhyolite-crater3.png Unspoiled 2021-06-02 11:15:30 -04:00
rhyolite-wall1.png Unspoiled 2021-06-02 11:15:30 -04:00
rhyolite-wall2.png Unspoiled 2021-06-02 11:15:30 -04:00
rhyolite-wall-large.png Unspoiled 2021-06-02 11:15:30 -04:00
salt-wall1.png files that intelliJ missed despite me hitting refresh 2020-09-10 12:14:12 -04:00
salt-wall2.png files that intelliJ missed despite me hitting refresh 2020-09-10 12:14:12 -04:00
salt-wall-large.png files that intelliJ missed despite me hitting refresh 2020-09-10 12:14:12 -04:00
salt.png Improved battery brightness display / Palette tweak / Diffgen buff 2020-02-11 17:27:33 -05:00
sand1.png Core launch cost 2020-06-22 21:02:53 -04:00
sand2.png Improved battery brightness display / Palette tweak / Diffgen buff 2020-02-11 17:27:33 -05:00
sand3.png Improved battery brightness display / Palette tweak / Diffgen buff 2020-02-11 17:27:33 -05:00
sand-wall1.png files that intelliJ missed despite me hitting refresh 2020-09-10 12:14:12 -04:00
sand-wall2.png files that intelliJ missed despite me hitting refresh 2020-09-10 12:14:12 -04:00
sand-wall-large.png files that intelliJ missed despite me hitting refresh 2020-09-10 12:14:12 -04:00
sand-water.png Improved battery brightness display / Palette tweak / Diffgen buff 2020-02-11 17:27:33 -05:00
scrap1.png Improved battery brightness display / Palette tweak / Diffgen buff 2020-02-11 17:27:33 -05:00
scrap2.png Improved battery brightness display / Palette tweak / Diffgen buff 2020-02-11 17:27:33 -05:00
scrap3.png Improved battery brightness display / Palette tweak / Diffgen buff 2020-02-11 17:27:33 -05:00
shale1.png Improved battery brightness display / Palette tweak / Diffgen buff 2020-02-11 17:27:33 -05:00
shale2.png Improved battery brightness display / Palette tweak / Diffgen buff 2020-02-11 17:27:33 -05:00
shale3.png Improved battery brightness display / Palette tweak / Diffgen buff 2020-02-11 17:27:33 -05:00
shale-wall1.png files that intelliJ missed despite me hitting refresh 2020-09-10 12:14:12 -04:00
shale-wall2.png files that intelliJ missed despite me hitting refresh 2020-09-10 12:14:12 -04:00
shale-wall-large.png files that intelliJ missed despite me hitting refresh 2020-09-10 12:14:12 -04:00
shallow-water.png Improved environmental block internal names 2021-08-06 11:52:25 -04:00
shrubs1.png Improved battery brightness display / Palette tweak / Diffgen buff 2020-02-11 17:27:33 -05:00
shrubs2.png Improved battery brightness display / Palette tweak / Diffgen buff 2020-02-11 17:27:33 -05:00
shrubs-large.png Improved battery brightness display / Palette tweak / Diffgen buff 2020-02-11 17:27:33 -05:00
snow1.png Improved battery brightness display / Palette tweak / Diffgen buff 2020-02-11 17:27:33 -05:00
snow2.png Improved battery brightness display / Palette tweak / Diffgen buff 2020-02-11 17:27:33 -05:00
snow3.png Improved battery brightness display / Palette tweak / Diffgen buff 2020-02-11 17:27:33 -05:00
snow-pine.png textures micro fixes and improvements 2020-07-22 03:40:58 +03:00
snow-wall1.png files that intelliJ missed despite me hitting refresh 2020-09-10 12:14:12 -04:00
snow-wall2.png files that intelliJ missed despite me hitting refresh 2020-09-10 12:14:12 -04:00
snow-wall-large.png files that intelliJ missed despite me hitting refresh 2020-09-10 12:14:12 -04:00
space.png space 2020-10-08 14:06:07 -04:00
spawn.png Partial 7.0 merge - API preview 2021-06-02 11:08:08 -04:00
spore-moss1.png Improved battery brightness display / Palette tweak / Diffgen buff 2020-02-11 17:27:33 -05:00
spore-moss2.png Improved battery brightness display / Palette tweak / Diffgen buff 2020-02-11 17:27:33 -05:00
spore-moss3.png Improved battery brightness display / Palette tweak / Diffgen buff 2020-02-11 17:27:33 -05:00
spore-pine.png textures micro fixes and improvements 2020-07-22 03:40:58 +03:00
spore-wall1.png files that intelliJ missed despite me hitting refresh 2020-09-10 12:14:12 -04:00
spore-wall2.png files that intelliJ missed despite me hitting refresh 2020-09-10 12:14:12 -04:00
spore-wall-large.png files that intelliJ missed despite me hitting refresh 2020-09-10 12:14:12 -04:00
stone1.png Improved battery brightness display / Palette tweak / Diffgen buff 2020-02-11 17:27:33 -05:00
stone2.png Improved battery brightness display / Palette tweak / Diffgen buff 2020-02-11 17:27:33 -05:00
stone3.png Improved battery brightness display / Palette tweak / Diffgen buff 2020-02-11 17:27:33 -05:00
stone-wall1.png files that intelliJ missed despite me hitting refresh 2020-09-10 12:14:12 -04:00
stone-wall2.png files that intelliJ missed despite me hitting refresh 2020-09-10 12:14:12 -04:00
stone-wall-large.png files that intelliJ missed despite me hitting refresh 2020-09-10 12:14:12 -04:00
tainted-water.png Added rivers on Serpulo / Added deep tainted water 2021-09-04 15:23:47 -04:00
tar.png Bugfixes 2020-09-19 11:40:11 -04:00
tendrils1.png Improved battery brightness display / Palette tweak / Diffgen buff 2020-02-11 17:27:33 -05:00
tendrils2.png Improved battery brightness display / Palette tweak / Diffgen buff 2020-02-11 17:27:33 -05:00
tendrils3.png Improved battery brightness display / Palette tweak / Diffgen buff 2020-02-11 17:27:33 -05:00
thorium1.png Improved battery brightness display / Palette tweak / Diffgen buff 2020-02-11 17:27:33 -05:00
thorium2.png Improved battery brightness display / Palette tweak / Diffgen buff 2020-02-11 17:27:33 -05:00
thorium3.png Improved battery brightness display / Palette tweak / Diffgen buff 2020-02-11 17:27:33 -05:00
titanium1.png Improved battery brightness display / Palette tweak / Diffgen buff 2020-02-11 17:27:33 -05:00
titanium2.png Improved battery brightness display / Palette tweak / Diffgen buff 2020-02-11 17:27:33 -05:00
titanium3.png Improved battery brightness display / Palette tweak / Diffgen buff 2020-02-11 17:27:33 -05:00
wall-beryllium1.png Unspoiled 2021-06-02 11:15:30 -04:00
wall-beryllium2.png Unspoiled 2021-06-02 11:15:30 -04:00
wall-beryllium3.png Unspoiled 2021-06-02 11:15:30 -04:00
yellow-stone1.png Unspoiled 2021-06-02 11:15:30 -04:00
yellow-stone2.png Unspoiled 2021-06-02 11:15:30 -04:00
yellow-stone3.png Unspoiled 2021-06-02 11:15:30 -04:00
yellow-stone-wall1.png Unspoiled 2021-06-02 11:15:30 -04:00
yellow-stone-wall2.png Unspoiled 2021-06-02 11:15:30 -04:00
yellow-stone-wall-large.png Unspoiled 2021-06-02 11:15:30 -04:00
yellowcoral-center.png Unspoiled 2021-06-02 11:15:30 -04:00
yellowcoral.png Unspoiled 2021-06-02 11:15:30 -04:00