Merge remote-tracking branch 'origin/master'

This commit is contained in:
Anuken 2020-10-19 11:34:59 -04:00
commit cab08de1f7

View File

@ -190,6 +190,7 @@ public class ContentParser{
"mindustry.world.blocks.defense",
"mindustry.world.blocks.defense.turrets",
"mindustry.world.blocks.distribution",
"mindustry.world.blocks.environment",
"mindustry.world.blocks.liquid",
"mindustry.world.blocks.logic",
"mindustry.world.blocks.power",