ML 1.6.1

Lyoko-Jeremie · Oct 18, 2023 · 9029e76 · 9029e76
1 parent 5041af9
commit 9029e76
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/.github/workflows/Build-Html-Package.yml b/.github/workflows/Build-Html-Package.yml
@@ -118,6 +118,21 @@ jobs:
           destBase: ${{ github.workspace }}/ModLoader/out
           target: ${{ github.workspace }}/ModLoader/out
 
+      - name: Build Diff3WayMerge
+        working-directory: ${{ github.workspace }}/ModLoader/mod/Diff3WayMerge
+        run: |
+          yarn install
+          yarn run build:ts
+          yarn run build:webpack
+          node "${{ github.workspace }}/ModLoader/dist-insertTools/packModZip.js" "boot.json"
+      - name: Copy Diff3WayMerge
+        uses: Lyoko-Jeremie/js-copy-github-action@master
+        with:
+          srcBase: ${{ github.workspace }}/ModLoader/
+          source: ${{ github.workspace }}/ModLoader/mod/Diff3WayMerge/Diff3WayMerge.mod.zip
+          destBase: ${{ github.workspace }}/ModLoader/out
+          target: ${{ github.workspace }}/ModLoader/out
+
       - name: Build ReplacePatch
         working-directory: ${{ github.workspace }}/ModLoader/mod/ReplacePatch
         run: |

diff --git a/ModLoader b/ModLoader
+14 −0		.github/workflows/Build-ModLoader-Package.yml
+1 −0		.gitignore
+4 −0		.gitmodules
+27 −0		README.md
+1 −0		mod/Diff3WayMerge
+1 −1		mod/ImageLoaderHook
+1 −1		mod/ModLoaderGui
+2 −1		out/modList.json
+6 −2		src/BeforeSC2/SC2DataManager.ts
+1 −1		src/BeforeSC2/Utils.ts
+2 −1		src/insertTools/modList.json