# Conflicts:

#	core/src/mindustry/mod/ClassMap.java

.github/workflows/deployment.yml

@@ -6,15 +6,15 @@ on:
       - 'v*'
 
 jobs:
-  buildJava14:
+  deploy:
     runs-on: ubuntu-latest
 
     steps:
     - uses: actions/checkout@v2
-    - name: Set up JDK 14
+    - name: Set up JDK 16
       uses: actions/setup-java@v1
       with:
-        java-version: 14
+        java-version: 16
     - name: Set env
       run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
     - name: Add Arc release

.github/workflows/pr.yml

@@ -3,15 +3,15 @@ name: Pull Request Tests
 on: [pull_request, workflow_dispatch]
 
 jobs:
-  buildJava14:
+  testPR:
     runs-on: ubuntu-latest
 
     steps:
     - uses: actions/checkout@v2
-    - name: Set up JDK 14
+    - name: Set up JDK 16
       uses: actions/setup-java@v1
       with:
-        java-version: 14
+        java-version: 16
     - name: Run unit tests and build JAR
       run: ./gradlew test desktop:dist
     - name: Upload desktop JAR for testing

.github/workflows/push.yml

@@ -3,7 +3,7 @@ name: Tests
 on: [push, workflow_dispatch]
 
 jobs:
-  buildJava14:
+  runPush:
     runs-on: ubuntu-latest
 
     steps:
@@ -17,9 +17,9 @@ jobs:
         git tag ${BNUM}
         git config --global user.name "Build Uploader"
         git push https://Anuken:${{ secrets.API_TOKEN_GITHUB }}@github.com/Anuken/MindustryBuilds ${BNUM}
-    - name: Set up JDK 14
+    - name: Set up JDK 16
       uses: actions/setup-java@v1
       with:
-        java-version: 14
+        java-version: 16
     - name: Run unit tests
       run: ./gradlew clean cleanTest test