Fix Workflow (#1459)

* attempt

* Update build_pr.yml

* Cleaned up

.github/workflows/build_pr.yml

@@ -11,12 +11,20 @@ on:
           - build-client
           - build-server
           - build-all
+      version:
+        description: "Version"
+        required: true
+        default: "Development Build"
+        type: string
   workflow_call:
     inputs:
       target:
         required: true
         default: "build-all"
         type: string
+      version:
+        required: true
+        type: string
     secrets:
       API_TOKEN:
         required: true
@@ -54,6 +62,10 @@ jobs:
           key: ${{ runner.os }}-modlist-${{ hashFiles('manifest.json') }}
           restore-keys: |
             ${{ runner.os }}-modlist-
+      - name: Replace manifest version
+        run: 
+          sed -i s/\"version\":\ \"development\"/\"version\":\ \"${{ inputs.version }}\"/ manifest.json
+        shell: bash
       - name: Pack Modpack
         env:
           CFCORE_API_TOKEN: ${{ secrets.API_TOKEN }}

.github/workflows/release.yml

@@ -53,14 +53,8 @@ jobs:
   pre-build:
     uses: ./.github/workflows/get_version_info.yml
 
-  replace_version:
-    needs: pre-build
-    uses: ./.github/workflows/replace_version.yml
-    with:
-      version: ${{ needs.pre-build.outputs.version }}
-
   build:
-    needs: [replace_version, pre-build]
+    needs: [pre-build]
     if: inputs.skip_build != true
     permissions:
       id-token: write
@@ -69,6 +63,7 @@ jobs:
     uses: ./.github/workflows/build_pr.yml
     with:
       target: build-all
+      version: ${{ needs.pre-build.outputs.version }}
     secrets: inherit
 
   release:
@@ -194,6 +189,6 @@ jobs:
           changelog: "For a detailed changelog, see the GitHub release: ${{ steps.release.outputs.html_url }}"
           changelog-format: "text"
           game-version: "1.20.1"
-          display-name: "Monifactory-${{steps.name.outputs.name}}"
-          server-display-name: "Monifactory-${{steps.name.outputs.name}} Server"
+          display-name: "Monifactory ${{steps.name.outputs.name}}"
+          server-display-name: "Monifactory ${{steps.name.outputs.name}} Server"
           release-type: ${{ github.event.inputs.cf_type }}