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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Anuken
2021-07-29 09:16:58 -04:00
parent ccb973d1dd 132b1fe0c4
commit dbebe2ab29
2 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/deployment.yml vendored
View File

@@ -39,7 +39,7 @@ jobs:
cp -a Mindustry/core/build/javadoc/. docs/ cp -a Mindustry/core/build/javadoc/. docs/
cd docs cd docs
git add . git add .
git commit -m "Update ${RELEASE_VERSION:1}" git commit --allow-empty -m "Update ${RELEASE_VERSION:1}"
git push https://Anuken:${{ secrets.API_TOKEN_GITHUB }}@github.com/MindustryGame/docs git push https://Anuken:${{ secrets.API_TOKEN_GITHUB }}@github.com/MindustryGame/docs
cd ../Mindustry cd ../Mindustry
- name: Update F-Droid build string - name: Update F-Droid build string

2
gradle.properties
View File

@@ -1,7 +1,5 @@
org.gradle.daemon=true org.gradle.daemon=true
org.gradle.jvmargs=-Xms256m -Xmx1024m --illegal-access=permit org.gradle.jvmargs=-Xms256m -Xmx1024m --illegal-access=permit
# Don't recompute annotations if sources haven't been changed
kapt.incremental.apt = true
# Multithreaded # Multithreaded
kapt.use.worker.api=true kapt.use.worker.api=true
# Compilation avoidance (see https://kotlinlang.org/docs/kapt.html#compile-avoidance-for-kapt-since-1-3-20) # Compilation avoidance (see https://kotlinlang.org/docs/kapt.html#compile-avoidance-for-kapt-since-1-3-20)