Merge branch 'ver/1.16.5' of github.com:YatopiaMC/Yatopia into pr/lithium-ai

2021-04-27 12:24:26 -04:00 · 2021-04-27 12:24:26 -04:00 · d401a99ffe
parent 24ef5abec1 ef9ed2f890
commit d401a99ffe
2 changed files with 2 additions and 2 deletions
--- a/.gitattributes
+++ b/.gitattributes
@ -24,7 +24,7 @@ Jenkinsfile     text eol=lf
 *.md            text diff=markdown     

 # Windows Files
-*.bat      text eol=crlf
+# *.bat      text eol=crlf #causes issues on linux for some reason
 *.cmd      text eol=crlf

 # Binary files
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@ -27,7 +27,7 @@ jobs:
    runs-on: ubuntu-latest
    strategy:
      matrix:
-        java: [ '8', '11', '16' ]
+        java: [ '8', '11', '15', '16' ]
      fail-fast: false
    steps:
    - uses: actions/checkout@v2