Merge remote-tracking branch 'origin/master'

# Conflicts:
#	renaming.sh

.github/workflows/building.yml

@@ -0,0 +1,44 @@
+# This workflow will build a Java project with Gradle
+# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-gradle
+
+name: Gradle Build
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Fetching branches 
+      run: |
+        git fetch --no-tags --prune --depth=1 origin +refs/heads/*:refs/remotes/origin/*
+    - name: Set up JDK 1.8
+      uses: actions/setup-java@v1
+      with:
+        java-version: 1.8
+    - name: Grant execute permission for gradlew
+      run: chmod +x gradlew
+    - name: Build with Gradle
+      run: ./gradlew build
+    - name: Execute permission for renaming script
+      run: chmod +x renaming.sh
+    - name: Running renaming script
+      run: ./renaming.sh
+      
+      # Publishing to dev-builds branch
+    - name: GitHub Pages
+      if: success()
+      uses: crazy-max/ghaction-github-pages@v1.4.0
+      with:
+        build_dir: build/libs
+        target_branch: dev-builds
+        keep_history: false
+      env:
+        GITHUB_PAT: ${{ secrets.pat }}

.github/workflows/gradle.yml

@@ -1,26 +0,0 @@
-# This workflow will build a Java project with Gradle
-# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-gradle
-
-name: Java CI with Gradle
-
-on:
-  push:
-    branches: [ master ]
-  pull_request:
-    branches: [ master ]
-
-jobs:
-  build:
-
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up JDK 1.8
-      uses: actions/setup-java@v1
-      with:
-        java-version: 1.8
-    - name: Grant execute permission for gradlew
-      run: chmod +x gradlew
-    - name: Build with Gradle
-      run: ./gradlew build

gradle.properties

@@ -2,12 +2,12 @@
 org.gradle.jvmargs=-Xmx1G
 
 # Fabric properties
-minecraft_version=20w17a
+minecraft_version=20w18a
-yarn_mappings=20w17a+build.2
+yarn_mappings=20w18a+build.1
 loader_version=0.8.2+build.194
 
 #Fabric api
-fabric_version=0.6.2+build.327-1.16
+fabric_version=0.7.0+build.330-1.16
 
 # Mod Properties
 	mod_version = 1.4.1
@@ -15,4 +15,4 @@ fabric_version=0.6.2+build.327-1.16
 	archives_base_name = simpleauth
 
 # Carpet for debugging
-carpet_core_version = 1.3.20+v200422
+carpet_core_version = 1.3.21+v200429