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

Cleanup

Browse Source
This commit is contained in:
Anuken
2020-04-29 19:54:20 -04:00
parent 289e8bb394
commit 5887169f90
7 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
android/AndroidManifest.xml
View File

@@ -17,7 +17,7 @@
android:usesCleartextTraffic="true" android:usesCleartextTraffic="true"
android:appCategory="game" android:appCategory="game"
android:label="@string/app_name" android:label="@string/app_name"
android:theme="@style/GdxTheme" android:fullBackupContent="@xml/backup_rules"> android:theme="@style/ArcTheme" android:fullBackupContent="@xml/backup_rules">
<meta-data android:name="android.max_aspect" android:value="2.1"/> <meta-data android:name="android.max_aspect" android:value="2.1"/>
<activity <activity
android:name="mindustry.android.AndroidLauncher" android:name="mindustry.android.AndroidLauncher"

2
android/res/values-v21/styles.xml
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<style name="GdxTheme" parent="android:Theme.Material.NoActionBar"> <style name="ArcTheme" parent="android:Theme.Material.NoActionBar">
<item name="android:windowBackground">@android:color/transparent</item> <item name="android:windowBackground">@android:color/transparent</item>
<item name="android:colorBackgroundCacheHint">@null</item> <item name="android:colorBackgroundCacheHint">@null</item>
<item name="android:windowAnimationStyle">@android:style/Animation</item> <item name="android:windowAnimationStyle">@android:style/Animation</item>

2
android/res/values/styles.xml
View File

@@ -1,6 +1,6 @@
<resources> <resources>
<style name="GdxTheme" parent="android:Theme"> <style name="ArcTheme" parent="android:Theme">
<item name="android:windowBackground">@android:color/transparent</item> <item name="android:windowBackground">@android:color/transparent</item>
<item name="android:colorBackgroundCacheHint">@null</item> <item name="android:colorBackgroundCacheHint">@null</item>
<item name="android:windowAnimationStyle">@android:style/Animation</item> <item name="android:windowAnimationStyle">@android:style/Animation</item>

3
build.gradle
View File

@@ -25,8 +25,9 @@ buildscript{
} }
allprojects{ allprojects{
version = 'release'
apply plugin: 'maven' apply plugin: 'maven'
version = 'release'
group = 'com.github.Anuken' group = 'com.github.Anuken'
ext{ ext{

2
core/src/mindustry/net/Net.java
View File

@@ -168,7 +168,7 @@ public class Net{
/** /**
* Starts discovering servers on a different thread. * Starts discovering servers on a different thread.
* Callback is run on the main libGDX thread. * Callback is run on the main Arc thread.
*/ */
public void discoverServers(Cons<Host> cons, Runnable done){ public void discoverServers(Cons<Host> cons, Runnable done){
provider.discoverServers(cons, done); provider.discoverServers(cons, done);

2
gradle.properties
View File

@@ -1,3 +1,3 @@
org.gradle.daemon=true org.gradle.daemon=true
org.gradle.jvmargs=-Xms256m -Xmx1024m org.gradle.jvmargs=-Xms256m -Xmx1024m
archash=f8891ab73ee41db01efe354e96d6c5e91eb01358 archash=e8817285d699b8d4336229ded2b0079581c502bd

1
server/build.gradle
View File

@@ -43,7 +43,6 @@ task dist(type: Jar){
exclude("sounds/**") exclude("sounds/**")
exclude("fonts/**") exclude("fonts/**")
exclude("zones/**") exclude("zones/**")
exclude("com/badlogic/gdx/**")
exclude("icons/**") exclude("icons/**")
exclude("bundles/**") exclude("bundles/**")
if(!versionModifier.contains("steam")){ if(!versionModifier.contains("steam")){