Full merge

This commit is contained in:
Anuken 2019-12-25 13:34:27 -05:00
parent c681cc5cf8
commit c307fc02cf
7 changed files with 9 additions and 3 deletions

View file

@ -1,15 +1,15 @@
package mindustry.content;
import mindustry.ctype.ContentList;
import mindustry.game.*;
import mindustry.ctype.*;
import mindustry.game.Objectives.*;
import mindustry.game.*;
import mindustry.maps.generators.*;
import mindustry.maps.generators.MapGenerator.*;
import mindustry.maps.zonegen.*;
import mindustry.type.*;
import static arc.struct.Array.with;
import static mindustry.content.Items.*;
import static mindustry.content.Planets.starter;
import static mindustry.type.ItemStack.list;
public class Zones implements ContentList{

View file

@ -1,5 +1,6 @@
package mindustry.maps.filters;
import arc.util.*;
import mindustry.content.Blocks;
import mindustry.maps.filters.FilterOption.BlockOption;
import mindustry.maps.filters.FilterOption.SliderOption;

View file

@ -1,5 +1,6 @@
package mindustry.maps.filters;
import arc.util.*;
import mindustry.content.Blocks;
import mindustry.maps.filters.FilterOption.SliderOption;
import mindustry.world.Block;

View file

@ -2,6 +2,7 @@ package mindustry.maps.filters;
import arc.struct.*;
import arc.math.*;
import arc.util.*;
import mindustry.*;
import mindustry.content.*;
import mindustry.maps.filters.FilterOption.*;

View file

@ -1,5 +1,6 @@
package mindustry.maps.filters;
import arc.util.*;
import mindustry.content.Blocks;
import mindustry.maps.filters.FilterOption.BlockOption;
import mindustry.maps.filters.FilterOption.SliderOption;

View file

@ -1,5 +1,6 @@
package mindustry.maps.filters;
import arc.util.*;
import mindustry.content.Blocks;
import mindustry.maps.filters.FilterOption.BlockOption;
import mindustry.maps.filters.FilterOption.SliderOption;

View file

@ -1,6 +1,7 @@
package mindustry.maps.filters;
import arc.math.Mathf;
import arc.util.*;
import mindustry.content.Blocks;
import mindustry.maps.filters.FilterOption.BlockOption;
import mindustry.maps.filters.FilterOption.SliderOption;