Merge branch 'campaign'

# Conflicts: # core/src/mindustry/world/consumers/ConsumeItemFilter.java
2020-10-01 13:37:25 -04:00
parent 1170880127 085bc2ee9c
commit c1970b4da5
12 changed files with 67 additions and 97 deletions
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,3 +1,3 @@
 org.gradle.daemon=true
 org.gradle.jvmargs=-Xms256m -Xmx1024m
-archash=f4e823e80a634226c617e30f2d67d61562b8faaa
+archash=8278e148026dab6b5f74ded2ed2be76a22418c76