Merge remote-tracking branch 'origin/1.20.1' into 1.20.1

.github/workflows/build.yml

@@ -18,7 +18,6 @@ jobs:
         run: |
           git clone https://github.com/North-Western-Development/oc2r.git
           cd oc2r
-          mkdir libs
           wget https://github.com/perkinslr/oc2r/releases/latest/download/sedna.jar -O libs/sedna.jar
           git checkout 1.20.1
           ./gradlew build

.github/workflows/publish.yml

@@ -7,6 +7,9 @@ on:
 
 jobs:
   build:
+    permissions:
+      contents: write
+      packages: write
     strategy:
       matrix:
         java: [ 17 ]
@@ -18,8 +21,7 @@ jobs:
         run: |
           git clone https://github.com/North-Western-Development/oc2r.git
           cd oc2r
-          mkdir libs
-          wget https://github.com/perkinslr/oc2r/releases/latest/download/sedna.jar -O libs/sedna.jar
+          wget https://github.com/North-Western-Development/sedna-mc/releases/download/1.18.2-forge%2F1.0.43/sedna-1.18.2-forge-1.0.43+0632079.jar -O libs/sedna.jar
           ./gradlew build
       
         
@@ -35,6 +37,6 @@ jobs:
           allowUpdates: false
           draft: false
           prerelease: false
-          token: ${{ secrets.GITHUB_TOKEN }}
+          token: ${{ github.token }}
           artifacts: "oc2r/build/libs/*.jar,sedna.jar"
           tag: ${{ env.semver }}

.gitignore

@@ -34,7 +34,7 @@ forge*changelog.txt
 #vscode
 .vscode
 
-libs/
+#libs/
 
 # Don't ignore bin from scripts
 !/src/main/scripts/bin/

build.gradle

@@ -96,8 +96,8 @@ dependencies {
 //    implementation "curse.maven:sedna-511276:3885542"
     minecraftLibrary "org.apache.commons:commons-collections4:4.4"
 
-    implementation fg.deobf("curse.maven:markdownmanual-502485:4873115")
     implementation fg.deobf("curse.maven:architectury-api-419699:5137938")
+//    implementation fg.deobf("curse.maven:markdownmanual-502485:4873115")
 
     compileOnly fg.deobf("mezz.jei:jei-1.20.1-common-api:15.3.0.4")
     compileOnly fg.deobf("mezz.jei:jei-1.20.1-forge-api:15.3.0.4")

gradle.properties

@@ -5,7 +5,7 @@ org.gradle.daemon=false
 
 forge_version=47.3.0
 
-semver=1.3.2
+semver=1.3.4
 
 curse_project_id=1037738
 
@@ -13,8 +13,8 @@ pr_version=4.19.0-beta+3
 ccl_version=4.4.0.+
 cbm_version=3.3.0.+
 
-debug_embeddium=true
+debug_embeddium=false
 
-debug_embeddium_plus_plus=true
+debug_embeddium_plus_plus=false
 
-debug_oculus=true
+debug_oculus=false