From c1e732f1474f527ae59530e6c51939517e76423c Mon Sep 17 00:00:00 2001 From: Heistergand Date: Sat, 12 Aug 2023 19:49:58 +0200 Subject: [PATCH 1/4] Update iitc_plugin_fanfields2.user.js --- iitc_plugin_fanfields2.user.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/iitc_plugin_fanfields2.user.js b/iitc_plugin_fanfields2.user.js index 1b557a2..1193cd4 100644 --- a/iitc_plugin_fanfields2.user.js +++ b/iitc_plugin_fanfields2.user.js @@ -8,10 +8,10 @@ // @match https://intel.ingress.com/* // @include https://intel.ingress.com/* // @grant none -// @downloadURL https://github.com/Heistergand/fanfields2/raw/master/iitc_plugin_fanfields2.user.js -// @updateURL https://github.com/Heistergand/fanfields2/raw/master/iitc_plugin_fanfields2.meta.js -// @icon https://raw.githubusercontent.com/Heistergand/fanfields2/master/fanfields2-32.png -// @icon64 https://raw.githubusercontent.com/Heistergand/fanfields2/master/fanfields2-64.png +// @downloadURL https://github.com/Heistergand/fanfields2/raw/beta/iitc_plugin_fanfields2.user.js +// @updateURL https://github.com/Heistergand/fanfields2/raw/beta/iitc_plugin_fanfields2.meta.js +// @icon https://raw.githubusercontent.com/Heistergand/fanfields2/beta/fanfields2-32.png +// @icon64 https://raw.githubusercontent.com/Heistergand/fanfields2/beta/fanfields2-64.png // @supportURL https://github.com/Heistergand/fanfields2/issues // @namespace https://github.com/Heistergand/fanfields2 // ==/UserScript== From 72bc51494345643de026a96b1fff5f43ebc2be88 Mon Sep 17 00:00:00 2001 From: Heistergand Date: Sun, 13 Aug 2023 11:28:34 +0200 Subject: [PATCH 2/4] Update iitc_plugin_fanfields2.user.js hotfix --- iitc_plugin_fanfields2.user.js | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/iitc_plugin_fanfields2.user.js b/iitc_plugin_fanfields2.user.js index 1193cd4..885841b 100644 --- a/iitc_plugin_fanfields2.user.js +++ b/iitc_plugin_fanfields2.user.js @@ -3,7 +3,7 @@ // @id fanfields@heistergand // @author Heistergand // @category Layer -// @version 2.5.1.20230812 +// @version 2.5.2.20230813 // @description Calculate how to link the portals to create the largest tidy set of nested fields. Enable from the layer chooser. // @match https://intel.ingress.com/* // @include https://intel.ingress.com/* @@ -43,6 +43,12 @@ function wrapper(plugin_info) { /* exported setup, changelog --eslint */ let arcname = window.PLAYER.team === 'ENLIGHTENED' ? 'Arc' : '***'; var changelog = [ + { + version: '2.5.2', + changes: [ + 'FIX: Prefer LiveInventory Plugin over Keys Plugin (hotfix)', + ], + }, { version: '2.5.1', changes: [ @@ -543,7 +549,7 @@ function wrapper(plugin_info) { let availableKeysText = ''; let availableKeys = 0; if (window.plugin.keys || window.plugin.LiveInventory) { - if (window.plugin.keys) { + if (window.plugin.LiveInventory) { availableKeys = window.plugin.LiveInventory.keyGuidCount[portal.guid] || 0; } else { availableKeys = window.plugin.keys.keys[portal.guid] || 0; From 02de9e7cf910acc3fa87bbaac587d2f202474611 Mon Sep 17 00:00:00 2001 From: Heistergand Date: Sun, 13 Aug 2023 11:28:55 +0200 Subject: [PATCH 3/4] Update iitc_plugin_fanfields2.meta.js --- iitc_plugin_fanfields2.meta.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/iitc_plugin_fanfields2.meta.js b/iitc_plugin_fanfields2.meta.js index c37a187..4729a5b 100644 --- a/iitc_plugin_fanfields2.meta.js +++ b/iitc_plugin_fanfields2.meta.js @@ -3,7 +3,7 @@ // @id fanfields@heistergand // @author Heistergand // @category Layer -// @version 2.5.1.20230812 +// @version 2.5.2.20230813 // @description Calculate how to link the portals to create the largest tidy set of nested fields. Enable from the layer chooser. // @match https://intel.ingress.com/* // @include https://intel.ingress.com/* From d060da716f3ead515c7f07c2d8f438b6b54d3da2 Mon Sep 17 00:00:00 2001 From: Heistergand Date: Sun, 13 Aug 2023 12:38:18 +0200 Subject: [PATCH 4/4] Update deploy_script.yml --- .github/workflows/deploy_script.yml | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/.github/workflows/deploy_script.yml b/.github/workflows/deploy_script.yml index 53595de..dc0db3b 100644 --- a/.github/workflows/deploy_script.yml +++ b/.github/workflows/deploy_script.yml @@ -4,7 +4,6 @@ on: push: branches: - master - - beta jobs: deploy: @@ -12,7 +11,7 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Set URL for master branch if: github.ref == 'refs/heads/master' @@ -24,4 +23,11 @@ jobs: sed -i "s|IITC plugin: Fan Fields 2 (beta)|IITC plugin: Fan Fields 2|" iitc_plugin_fanfields2.user.js iitc_plugin_fanfields2.meta.js fi sed -E -i "s/^\/\/\s*@version\s+(\d+)\.(\d+)\.(\d+)\.(\d+)/\1.\2.\3/" iitc_plugin_fanfields2.user.js iitc_plugin_fanfields2.meta.js - + + - name: Commit and push changes + run: | + git config --local user.email "${{ github.actor }}@users.noreply.github.com" + git config --local user.name "${{ github.actor }}" + git add . + git commit -m "Update files from GitHub Action" + git push