Merge branch 'campaign'

# Conflicts:
#	core/src/mindustry/world/consumers/ConsumeItemFilter.java

core/src/mindustry/ui/dialogs/PlanetDialog.java

@@ -381,7 +381,7 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{
         }
 
         //stored resources
-        if(sector.hasBase() && sector.save.meta.secinfo.coreItems.size > 0){
+        if(sector.hasBase() && sector.save.meta.secinfo.coreItems.total > 0){
             stable.add("@sectors.stored").row();
             stable.table(t -> {
                 t.left();