Skip to content

Commit

Permalink
Merge branch 'MCreator:master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
willpill authored Jan 28, 2024
2 parents aaed3eb + 2c3d57e commit 553fd89
Show file tree
Hide file tree
Showing 163 changed files with 2,362 additions and 2,298 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/crowdin-pull.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
crowdin-pull:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: crowdin/github-action@cb33a030bb1675169b76617d5805242aeea6eaec
name: Pull Crowdin translations
env:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/crowdin-push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
crowdin-push:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: crowdin/github-action@cb33a030bb1675169b76617d5805242aeea6eaec
name: Push sources to Crowdin
env:
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
mc_version: ${{ steps.determineExportVersion.outputs.mc_version }}
build_date: ${{ steps.determineExportVersion.outputs.build_date }}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Verify Repository
if: github.repository != 'MCreator/MCreator' && github.repository != 'KlemenDEV/MCreator'
run: |
Expand All @@ -29,9 +29,9 @@ jobs:
EOF
exit 1
- name: Set up JDK 17
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
java-version: '17.0.9+9'
java-version: '17.0.10+7'
distribution: 'temurin'
- name: Install Dependencies
run: |
Expand Down Expand Up @@ -82,11 +82,11 @@ jobs:
runs-on: macos-latest
environment: production
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Set up JDK 17
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
java-version: '17.0.9+9'
java-version: '17.0.10+7'
distribution: 'temurin'
- name: Install Dependencies
run: |
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/documentation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,17 @@ jobs:
publish:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
name: Checkout Repository
- name: Set up JDK 17
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
java-version: '17.0.9+9'
java-version: '17.0.10+7'
distribution: 'temurin'
- name: Generate Javadoc
run: ./gradlew javadoc
- name: Deploy Javadoc
uses: Pylo/github-pages-deploy-action@v4.4.1
uses: JamesIves/github-pages-deploy-action@65b5dfd4f5bcd3a7403bbc2959c144256167464e
with:
branch: javadoc
clean: true
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/stale.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
stale:
runs-on: ubuntu-latest
steps:
- uses: actions/stale@v8
- uses: actions/stale@v9
with:
stale-issue-message: >
This issue has been automatically marked as stale because it has not had
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/support.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
action:
runs-on: ubuntu-latest
steps:
- uses: Pylo/support-requests@v3.0.0
- uses: dessant/support-requests@47d5ea12f6c9e4a081637de9626b7319b415a3bf
with:
github-token: ${{ github.token }}
support-label: 'invalid: support request'
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,14 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout Repository
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Set up JDK 17
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
java-version: '17.0.9+9'
java-version: '17.0.10+7'
distribution: 'temurin'
- name: Cache Gradle Packages
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: |
~/.gradle/caches
Expand All @@ -40,7 +40,7 @@ jobs:
- name: Test Javadoc Generation
run: ./gradlew javadoc
- name: Publish Test Report
uses: Pylo/action-junit-report@v3
uses: mikepenz/action-junit-report@b1b7f659602565970688b2e2588738b9398e895d
if: always() # always run even if the previous step fails
with:
include_passed: true
Expand Down
24 changes: 12 additions & 12 deletions platform/setup.gradle
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import org.apache.tools.ant.taskdefs.condition.Os

def jdk17_win_64 = 'https://api.adoptium.net/v3/binary/version/jdk-17.0.9+9.1/windows/x64/jdk/hotspot/normal/eclipse?project=jdk'
def jdk17_linux_64 = 'https://api.adoptium.net/v3/binary/version/jdk-17.0.9+9/linux/x64/jdk/hotspot/normal/eclipse?project=jdk'
def jdk17_mac_x64 = 'https://api.adoptium.net/v3/binary/version/jdk-17.0.9+9/mac/x64/jdk/hotspot/normal/eclipse?project=jdk'
def jdk17_mac_aarch64 = 'https://api.adoptium.net/v3/binary/version/jdk-17.0.9+9/mac/aarch64/jdk/hotspot/normal/eclipse?project=jdk'
def jdk17_win_64 = 'https://api.adoptium.net/v3/binary/version/jdk-17.0.10+7/windows/x64/jdk/hotspot/normal/eclipse?project=jdk'
def jdk17_linux_64 = 'https://api.adoptium.net/v3/binary/version/jdk-17.0.10+7/linux/x64/jdk/hotspot/normal/eclipse?project=jdk'
def jdk17_mac_x64 = 'https://api.adoptium.net/v3/binary/version/jdk-17.0.10+7/mac/x64/jdk/hotspot/normal/eclipse?project=jdk'
def jdk17_mac_aarch64 = 'https://api.adoptium.net/v3/binary/version/jdk-17.0.10+7/mac/aarch64/jdk/hotspot/normal/eclipse?project=jdk'

// Binaries needed on Windows for export (install them using Gradle since Windows does not have a package manager)
def nsis_url = 'https://netcologne.dl.sourceforge.net/project/nsis/NSIS%203/3.09/nsis-3.09.zip'
Expand All @@ -24,8 +24,8 @@ tasks.register('downloadJDKWin64') {
copy { from zipTree('build/tmp/jdk17_win_64') into file('jdk/jdk17_win_64/') }
delete 'build/tmp/jdk17_win_64'

copy { from file('jdk/jdk17_win_64/jdk-17.0.9+9') into file('jdk/jdk17_win_64/') }
delete 'jdk/jdk17_win_64/jdk-17.0.9+9'
copy { from file('jdk/jdk17_win_64/jdk-17.0.10+7') into file('jdk/jdk17_win_64/') }
delete 'jdk/jdk17_win_64/jdk-17.0.10+7'
}
}
}
Expand All @@ -44,8 +44,8 @@ tasks.register('downloadJDKLinux64') {
copy { from tarTree(resources.gzip('build/tmp/jdk17_linux_64')) into file('jdk/jdk17_linux_64/') }
delete 'build/tmp/jdk17_linux_64'

copy { from file('jdk/jdk17_linux_64/jdk-17.0.9+9') into file('jdk/jdk17_linux_64/') }
delete 'jdk/jdk17_linux_64/jdk-17.0.9+9'
copy { from file('jdk/jdk17_linux_64/jdk-17.0.10+7') into file('jdk/jdk17_linux_64/') }
delete 'jdk/jdk17_linux_64/jdk-17.0.10+7'
}
}
}
Expand All @@ -64,8 +64,8 @@ tasks.register('downloadJDKMacX64') {
copy { from tarTree(resources.gzip('build/tmp/jdk17_mac_x64')) into file('jdk/jdk17_mac_x64/') }
delete 'build/tmp/jdk17_mac_x64'

copy { from file('jdk/jdk17_mac_x64/jdk-17.0.9+9') into file('jdk/jdk17_mac_x64/') }
delete 'jdk/jdk17_mac_x64/jdk-17.0.9+9/'
copy { from file('jdk/jdk17_mac_x64/jdk-17.0.10+7') into file('jdk/jdk17_mac_x64/') }
delete 'jdk/jdk17_mac_x64/jdk-17.0.10+7/'
}
}
}
Expand All @@ -84,8 +84,8 @@ tasks.register('downloadJDKMacAarch64') {
copy { from tarTree(resources.gzip('build/tmp/jdk17_mac_aarch64/')) into file('jdk/jdk17_mac_aarch64/') }
delete 'build/tmp/jdk17_mac_aarch64'

copy { from file('jdk/jdk17_mac_aarch64/jdk-17.0.9+9') into file('jdk/jdk17_mac_aarch64/') }
delete 'jdk/jdk17_mac_aarch64/jdk-17.0.9+9/'
copy { from file('jdk/jdk17_mac_aarch64/jdk-17.0.10+7') into file('jdk/jdk17_mac_aarch64/') }
delete 'jdk/jdk17_mac_aarch64/jdk-17.0.10+7/'
}
}
}
Expand Down
Loading

0 comments on commit 553fd89

Please sign in to comment.