Merge pull request #3 from U5B/dev

fix comment in gradle.properties causing fabric to panic
U5B · May 12, 2023 · 7027cfb · 7027cfb
2 parents 88782d6 + c3c4ee2
commit 7027cfb
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 14 deletions.
diff --git a/.github/workflows/publish-dev.yml b/.github/workflows/publish-dev.yml
@@ -3,9 +3,12 @@ on:
   push:
     branches:
       - 'dev'
+    paths:
+      - 'src/main/**'
+  workflow_dispatch:
 jobs:
   publish:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     env:
       MODRINTH_TOKEN: ${{ secrets.MODRINTH_TOKEN }}
       CHANGELOG: ${{ github.event.head_commit.message }}
@@ -22,4 +25,4 @@ jobs:
     - name: make gradle wrapper executable
       run: chmod +x ./gradlew
     - name: publish to modrinth (dev)
-      run: ./gradlew modrinth
+      run: ./gradlew clean modrinth
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -1,11 +1,8 @@
 name: publish main
-on:
-  push:
-    branches:
-      - 'main'
+on: [ pull_request, workflow_dispatch ]
 jobs:
   publish:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     env:
       MODRINTH_TOKEN: ${{ secrets.MODRINTH_TOKEN }}
       PROD: TRUE
@@ -33,13 +30,13 @@ jobs:
             const commits = JSON.parse(process.env.COMMITS);
             var lines = "";
             for (const commit of commits) {
-              lines += "* " + commit.message + " (" + commit.id + ") @" + commit.author.username + "\n"
+              lines += "* " + commit.message + " (" + commit.id.substring(0,8) + ") @" + commit.author.username + "\n"
             }
             return lines
     - name: publish to modrinth
       env:
         CHANGELOG: ${{ steps.changelog.outputs.result }}
-      run: ./gradlew modrinth
+      run: ./gradlew clean modrinth
     # from https://github.com/JsMacros/JsMacros/blob/d0991a04159eb54b32b534e4bcac96b5ce613ccb/.github/workflows/betabuild.yml
     - name: get current mod version
       uses: actions/github-script@v2

diff --git a/gradle.properties b/gradle.properties
@@ -7,22 +7,24 @@ org.gradle.parallel.threads=1
 org.gradle.jvmargs=-Xmx2G
 # Fabric Properties
 # check these on https://fabricmc.net/develop
-minecraft_version=1.18.2 # base version
-fabric_loader_version=0.14.19 # base fabric loader version
+# base version
+minecraft_version=1.18.2
+# base fabric loader version
+fabric_loader_version=0.14.9
 
 # Dependencies
 fabric_api_version=0.76.0
 fabric_kotlin_version=1.7.4+kotlin.1.6.21
 mod_menu_version=3.2.5
 
 # Mod Properties
-mod_version=1.2.1
+mod_version=1.2.2
 maven_group=net.usbwire.usbplus
 mod_id=usbplus
 mod_name=USBPlus
 mod_description=Port of my jsmacro scripts!
 
 # essential settings
 essential.defaults.loom=1
-essential.defaults.loom.fabric-loader=net.fabricmc:fabric-loader:0.14.19
+essential.defaults.loom.fabric-loader=net.fabricmc:fabric-loader:0.14.9
 essential.defaults.loom.platform=fabric
diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
@@ -9,6 +9,7 @@
   ],
   "contact": {
     "homepage": "https://discord.usbwire.net",
+    "issues": "https://github.com/U5B/kotlin-test-mod/issues",
     "sources": "https://github.com/U5B/kotlin-test-mod"
   },
   "license": "GPL",

diff --git a/versions/1.18.2-fabric/gradle.properties b/versions/1.18.2-fabric/gradle.properties
@@ -1,3 +1,5 @@
 essential.defaults.loom.minecraft=com.mojang:minecraft:1.18.2
 essential.defaults.loom.mappings=net.fabricmc:yarn:1.18.2+build.4:v2
-fabric_api_version=0.76.0
+essential.defaults.loom.fabric-loader=net.fabricmc:fabric-loader:0.14.9
+fabric_loader_version=0.14.9
+fabric_api_version=0.76.0
diff --git a/versions/1.19.2-fabric/gradle.properties b/versions/1.19.2-fabric/gradle.properties
@@ -1,3 +1,5 @@
 essential.defaults.loom.minecraft=com.mojang:minecraft:1.19.2
 essential.defaults.loom.mappings=net.fabricmc:yarn:1.19.2+build.9:v2
+essential.defaults.loom.fabric-loader=net.fabricmc:fabric-loader:0.14.9
+fabric_loader_version=0.14.9
 fabric_api_version=0.76.0
diff --git a/versions/1.19.3-fabric/gradle.properties b/versions/1.19.3-fabric/gradle.properties
@@ -1,3 +1,5 @@
 essential.defaults.loom.minecraft=com.mojang:minecraft:1.19.3
 essential.defaults.loom.mappings=net.fabricmc:yarn:1.19.3+build.5:v2
+essential.defaults.loom.fabric-loader=net.fabricmc:fabric-loader:0.14.10
+fabric_loader_version=0.14.10
 fabric_api_version=0.76.1
diff --git a/versions/1.19.4-fabric/gradle.properties b/versions/1.19.4-fabric/gradle.properties
@@ -1,3 +1,5 @@
 essential.defaults.loom.minecraft=com.mojang:minecraft:1.19.4
 essential.defaults.loom.mappings=net.fabricmc:yarn:1.19.4+build.2:v2
+essential.defaults.loom.fabric-loader=net.fabricmc:fabric-loader:0.14.19
+fabric_loader_version=0.14.19
 fabric_api_version=0.80.0