Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branches '6.0' and 'master' of https://github.com/Anuken/Mindustry into 6.0

Browse Source 
# Conflicts:
#	core/assets/sprites/block_colors.png
#	core/assets/sprites/sprites.atlas
#	core/assets/sprites/sprites.png
#	core/assets/sprites/sprites2.png
#	core/assets/sprites/sprites3.png
#	core/assets/sprites/sprites5.png
#	core/src/io/anuke/mindustry/ctype/ContentType.java
#	core/src/io/anuke/mindustry/ctype/UnlockableContent.java
#	core/src/io/anuke/mindustry/io/LegacyMapIO.java
#	core/src/io/anuke/mindustry/type/WeatherEvent.java
#	gradle.properties
This commit is contained in:
Anuken
2019-12-24 12:40:23 -05:00
parent 78f146fbcf f89af1b26a
commit 32d28a4070
269 changed files with 16452 additions and 13926 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/src/test/java/ApplicationTests.java
View File

@@ -16,7 +16,7 @@ import io.anuke.mindustry.game.Team;
import io.anuke.mindustry.io.SaveIO;
import io.anuke.mindustry.maps.Map;
import io.anuke.mindustry.net.*;
import io.anuke.mindustry.type.ContentType;
import io.anuke.mindustry.ctype.ContentType;
import io.anuke.mindustry.type.Item;
import io.anuke.mindustry.world.*;
import io.anuke.mindustry.world.blocks.BlockPart;
@@ -47,7 +47,7 @@ public class ApplicationTests{
net = new Net(null);
tree = new FileTree();
Vars.init();
content.createContent();
content.createBaseContent();
add(logic = new Logic());
add(netServer = new NetServer());