diff --git a/constants/minions.json b/constants/minions.json
new file mode 100644
index 000000000..c5b32a1e6
--- /dev/null
+++ b/constants/minions.json
@@ -0,0 +1,527 @@
+[
+  {
+    "type_id": "LAPIS_GENERATOR",
+    "type": "MINING",
+    "required_actions": 2,
+    "//": "Wiki says 3-6",
+    "drops": {
+      "INK_SACK-4": 4.5
+    }
+  },
+  {
+    "type_id": "PIG_GENERATOR",
+    "type": "FARMING",
+    "required_actions": 2,
+    "drops": {
+      "PORK": 1.0
+    }
+  },
+  {
+    "type_id": "FLOWER_GENERATOR",
+    "type": "OTHER",
+    "required_actions": 2,
+    "drops": {
+      "RED_ROSE-2": 0.071428571,
+      "RED_ROSE-3": 0.071428571,
+      "RED_ROSE-1": 0.071428571,
+      "YELLOW_FLOWER": 0.071428571,
+      "DOUBLE_PLANT-1": 0.071428571,
+      "RED_ROSE-5": 0.071428571,
+      "RED_ROSE-8": 0.071428571,
+      "DOUBLE_PLANT-5": 0.071428571,
+      "RED_ROSE-7": 0.071428571,
+      "RED_ROSE": 0.071428571,
+      "RED_ROSE-4": 0.071428571,
+      "DOUBLE_PLANT-4": 0.071428571,
+      "DOUBLE_PLANT": 0.071428571,
+      "RED_ROSE-6": 0.071428571
+    }
+  },
+  {
+    "type_id": "COCOA_GENERATOR",
+    "type": "FARMING",
+    "required_actions": 2,
+    "drops": {
+      "INK_SACK-3": 3.0
+    }
+  },
+  {
+    "type_id": "COBBLESTONE_GENERATOR",
+    "type": "MINING",
+    "required_actions": 2,
+    "drops": {
+      "COBBLESTONE": 1.0
+    }
+  },
+  {
+    "type_id": "ICE_GENERATOR",
+    "type": "MINING",
+    "required_actions": 2,
+    "drops": {
+      "ICE": 1.0
+    }
+  },
+  {
+    "type_id": "PUMPKIN_GENERATOR",
+    "type": "FARMING",
+    "required_actions": 2,
+    "drops": {
+      "PUMPKIN": 1.0
+    }
+  },
+  {
+    "type_id": "VOIDLING_GENERATOR",
+    "type": "COMBAT",
+    "required_actions": 2,
+    "drops": {
+      "OBSIDIAN": 1.0,
+      "QUARTZ": 1.0,
+      "ENDER_PEARL": 1.0
+    }
+  },
+  {
+    "type_id": "SUGAR_CANE_GENERATOR",
+    "type": "FARMING",
+    "required_actions": 2,
+    "drops": {
+      "SUGAR_CANE": 3.0
+    }
+  },
+  {
+    "type_id": "FISHING_GENERATOR",
+    "type": "FISHING",
+    "required_actions": 1,
+    "drops": {
+      "RAW_FISH": 0.5,
+      "RAW_FISH-1": 0.25,
+      "RAW_FISH-3": 0.12,
+      "RAW_FISH-2": 0.04,
+      "PRISMARINE_SHARD": 0.03,
+      "PRISMARINE_CRYSTALS": 0.03,
+      "SPONGE": 0.03
+    }
+  },
+  {
+    "type_id": "COAL_GENERATOR",
+    "type": "MINING",
+    "required_actions": 2,
+    "drops": {
+      "COAL": 1.0
+    }
+  },
+  {
+    "type_id": "SNOW_GENERATOR",
+    "type": "MINING",
+    "required_actions": 2,
+    "drops": {
+      "SNOW_BALL": 4.0
+    }
+  },
+  {
+    "type_id": "ZOMBIE_GENERATOR",
+    "type": "COMBAT",
+    "required_actions": 2,
+    "drops": {
+      "ROTTEN_FLESH": 1.0,
+      "CARROT_ITEM": 0.01,
+      "POTATO_ITEM": 0.01,
+      "POISONOUS_POTATO": 0.02
+    }
+  },
+  {
+    "type_id": "MELON_GENERATOR",
+    "type": "FARMING",
+    "required_actions": 2,
+    "//": "Wiki says 3-7",
+    "drops": {
+      "MELON": 5.0
+    }
+  },
+  {
+    "type_id": "MITHRIL_GENERATOR",
+    "type": "MINING",
+    "required_actions": 2,
+    "drops": {
+      "MITHRIL_ORE": 2.0
+    }
+  },
+  {
+    "type_id": "ACACIA_GENERATOR",
+    "type": "FORAGING",
+    "required_actions": 2,
+    "drops": {
+      "LOG_2": 4.0
+    }
+  },
+  {
+    "type_id": "MAGMA_CUBE_GENERATOR",
+    "type": "COMBAT",
+    "required_actions": 2,
+    "//": "Wiki says 1-3",
+    "drops": {
+      "MAGMA_CREAM": 2.0
+    }
+  },
+  {
+    "type_id": "GRAVEL_GENERATOR",
+    "type": "MINING",
+    "required_actions": 2,
+    "drops": {
+      "GRAVEL": 1.0
+    }
+  },
+  {
+    "type_id": "DARK_OAK_GENERATOR",
+    "type": "FORAGING",
+    "required_actions": 2,
+    "drops": {
+      "LOG_2-1": 4.0
+    }
+  },
+  {
+    "type_id": "SLIME_GENERATOR",
+    "type": "COMBAT",
+    "required_actions": 2,
+    "drops": {
+      "SLIME_BALL": 2
+    }
+  },
+  {
+    "type_id": "ENDER_STONE_GENERATOR",
+    "type": "MINING",
+    "required_actions": 2,
+    "drops": {
+      "ENDER_STONE": 1.0
+    }
+  },
+  {
+    "type_id": "NETHER_WARTS_GENERATOR",
+    "type": "FARMING",
+    "required_actions": 2,
+    "//": "Wiki says 2-4",
+    "drops": {
+      "NETHER_STALK": 3
+    }
+  },
+  {
+    "type_id": "GOLD_GENERATOR",
+    "type": "MINING",
+    "requiressmelting": true,
+    "required_actions": 2,
+    "drops": {
+      "GOLD_INGOT": 1.0
+    }
+  },
+  {
+    "type_id": "BIRCH_GENERATOR",
+    "type": "FORAGING",
+    "required_actions": 2,
+    "drops": {
+      "LOG-2": 4.0
+    }
+  },
+  {
+    "type_id": "CREEPER_GENERATOR",
+    "type": "COMBAT",
+    "required_actions": 2,
+    "drops": {
+      "SULPHUR": 1.0
+    }
+  },
+  {
+    "type_id": "MYCELIUM_GENERATOR",
+    "type": "MINING",
+    "required_actions": 2,
+    "drops": {
+      "MYCEL": 1.0
+    }
+  },
+  {
+    "type_id": "CHICKEN_GENERATOR",
+    "type": "FARMING",
+    "required_actions": 2,
+    "drops": {
+      "RAW_CHICKEN": 1.0,
+      "FEATHER": 1.0
+    }
+  },
+  {
+    "type_id": "COW_GENERATOR",
+    "type": "FARMING",
+    "required_actions": 2,
+    "drops": {
+      "RAW_BEEF": 1.0,
+      "LEATHER": 1.0
+    }
+  },
+  {
+    "type_id": "OAK_GENERATOR",
+    "type": "FORAGING",
+    "required_actions": 2,
+    "drops": {
+      "LOG": 4.0
+    }
+  },
+  {
+    "type_id": "HARD_STONE_GENERATOR",
+    "type": "MINING",
+    "required_actions": 2,
+    "drops": {
+      "HARD_STONE": 1.0
+    }
+  },
+  {
+    "type_id": "SPIDER_GENERATOR",
+    "type": "COMBAT",
+    "required_actions": 2,
+    "drops": {
+      "STRING": 1.0,
+      "SPIDER_EYE": 0.5
+    }
+  },
+  {
+    "type_id": "TARANTULA_GENERATOR",
+    "type": "COMBAT",
+    "required_actions": 2,
+    "//": "Wiki says 2-5 (String only)",
+    "drops": {
+      "STRING": 3.5,
+      "SPIDER_EYE": 1.0,
+      "IRON_INGOT": 0.2
+    }
+  },
+  {
+    "type_id": "RED_SAND_GENERATOR",
+    "type": "MINING",
+    "required_actions": 2,
+    "drops": {
+      "SAND-1": 1.0
+    }
+  },
+  {
+    "type_id": "SHEEP_GENERATOR",
+    "type": "FARMING",
+    "required_actions": 2,
+    "drops": {
+      "MUTTON": 1.0,
+      "WOOL": 1.0
+    }
+  },
+  {
+    "type_id": "SPRUCE_GENERATOR",
+    "type": "FORAGING",
+    "required_actions": 2,
+    "drops": {
+      "LOG-1": 4
+    }
+  },
+  {
+    "type_id": "SKELETON_GENERATOR",
+    "type": "COMBAT",
+    "required_actions": 2,
+    "drops": {
+      "BONE": 1.0
+    }
+  },
+  {
+    "type_id": "IRON_GENERATOR",
+    "type": "MINING",
+    "requiressmelting": true,
+    "required_actions": 2,
+    "drops": {
+      "IRON_INGOT": 1.0
+    }
+  },
+  {
+    "type_id": "MUSHROOM_GENERATOR",
+    "type": "FARMING",
+    "required_actions": 2,
+    "drops": {
+      "RED_MUSHROOM": 0.5,
+      "BROWN_MUSHROOM": 0.5
+    }
+  },
+  {
+    "type_id": "EMERALD_GENERATOR",
+    "type": "MINING",
+    "required_actions": 2,
+    "drops": {
+      "EMERALD": 1.0
+    }
+  },
+  {
+    "type_id": "INFERNO_GENERATOR",
+    "required_actions": 2,
+    "type": "COMBAT",
+    "//": "This is the basic stuff, no eyedrops or the T10 buff. Also no Gabagool",
+    "drops": {
+      "CHILI_PEPPER": 0.07353,
+      "INFERNO_VERTEX": 0.001681,
+      "INFERNO_APEX": 0.000007639,
+      "REAPER_PEPPER": 0.00002183,
+      "GABAGOOL_THE_FISH": 0.000002546
+    }
+  },
+  {
+    "type_id": "QUARTZ_GENERATOR",
+    "type": "MINING",
+    "required_actions": 2,
+    "drops": {
+      "QUARTZ": 1.0
+    }
+  },
+  {
+    "type_id": "WHEAT_GENERATOR",
+    "type": "FARMING",
+    "required_actions": 2,
+    "drops": {
+      "WHEAT": 1.0,
+      "SEEDS": 0.5
+    }
+  },
+  {
+    "type_id": "CARROT_GENERATOR",
+    "type": "FARMING",
+    "required_actions": 2,
+    "//": "Wiki says 2-4",
+    "drops": {
+      "CARROT_ITEM": 3
+    }
+  },
+  {
+    "type_id": "REDSTONE_GENERATOR",
+    "type": "MINING",
+    "required_actions": 2,
+    "//": "Wiki says 3-6",
+    "drops": {
+      "REDSTONE": 4.5
+    }
+  },
+  {
+    "type_id": "JUNGLE_GENERATOR",
+    "type": "FORAGING",
+    "required_actions": 2,
+    "drops": {
+      "LOG-3": 4
+    }
+  },
+  {
+    "type_id": "ENDERMAN_GENERATOR",
+    "type": "COMBAT",
+    "required_actions": 2,
+    "drops": {
+      "ENDER_PEARL": 1.0
+    }
+  },
+  {
+    "type_id": "SAND_GENERATOR",
+    "type": "MINING",
+    "required_actions": 2,
+    "drops": {
+      "SAND": 1.0
+    }
+  },
+  {
+    "type_id": "VAMPIRE_GENERATOR",
+    "type": "COMBAT",
+    "required_actions": 2,
+    "drops": {
+      "HEMOVIBE": 1.0
+    }
+  },
+  {
+    "type_id": "REVENANT_GENERATOR",
+    "type": "COMBAT",
+    "required_actions": 2,
+    "//": "Wiki says 2-5 rotten flesh",
+    "drops": {
+      "ROTTEN_FLESH": 3.5,
+      "DIAMOND": 1.0
+    }
+  },
+  {
+    "type_id": "CLAY_GENERATOR",
+    "type": "FISHING",
+    "required_actions": 2,
+    "drops": {
+      "CLAY_BALL": 4
+    }
+  },
+  {
+    "type_id": "GLOWSTONE_GENERATOR",
+    "type": "MINING",
+    "required_actions": 2,
+    "//": "Wiki says 2-4",
+    "drops": {
+      "GLOWSTONE_DUST": 3
+    }
+  },
+  {
+    "type_id": "GHAST_GENERATOR",
+    "type": "COMBAT",
+    "required_actions": 2,
+    "drops": {
+      "GHAST_TEAR": 1.0
+    }
+  },
+  {
+    "type_id": "BLAZE_GENERATOR",
+    "type": "COMBAT",
+    "required_actions": 2,
+    "drops": {
+      "BLAZE_ROD": 1.0
+    }
+  },
+  {
+    "type_id": "CAVESPIDER_GENERATOR",
+    "type": "COMBAT",
+    "required_actions": 2,
+    "drops": {
+      "SPIDER_EYE": 1.0,
+      "STRING": 0.5
+    }
+  },
+  {
+    "type_id": "CACTUS_GENERATOR",
+    "type": "FARMING",
+    "required_actions": 2,
+    "drops": {
+      "CACTUS": 3.0
+    }
+  },
+  {
+    "type_id": "DIAMOND_GENERATOR",
+    "type": "MINING",
+    "required_actions": 2,
+    "drops": {
+      "DIAMOND": 1.0
+    }
+  },
+  {
+    "type_id": "POTATO_GENERATOR",
+    "type": "FARMING",
+    "required_actions": 2,
+    "//": "Wiki says 2-4",
+    "drops": {
+      "POTATO_ITEM": 3
+    }
+  },
+  {
+    "type_id": "RABBIT_GENERATOR",
+    "type": "FARMING",
+    "required_actions": 2,
+    "drops": {
+      "RABBIT": 1.0,
+      "RABBIT_HIDE": 0.35,
+      "RABBIT_FOOT": 0.35
+    }
+  },
+  {
+    "type_id": "OBSIDIAN_GENERATOR",
+    "type": "MINING",
+    "required_actions": 2,
+    "drops": {
+      "OBSIDIAN": 1.0
+    }
+  }
+]
diff --git a/mergeUpstreamCommits.yml b/mergeUpstreamCommits.yml
new file mode 100644
index 000000000..515953537
--- /dev/null
+++ b/mergeUpstreamCommits.yml
@@ -0,0 +1,39 @@
+on:
+  schedule:
+    - cron:  '0 7 * * *'
+    # scheduled at 07:00 every Monday and Thursday
+
+  workflow_dispatch:  # click the button on Github repo!
+
+
+jobs:
+  sync_with_upstream:
+    runs-on: ubuntu-latest
+    name: Sync main with upstream latest
+
+    steps:
+    # Step 1: run a standard checkout action, provided by github
+    - name: Checkout main
+      uses: actions/checkout@v2
+      with:
+        ref: main
+        # submodules: 'recursive'     ### may be needed in your situation
+
+    # Step 2: run this sync action - specify the upstream repo, upstream branch to sync with, and target sync branch
+    - name: Pull (Fast-Forward) upstream changes
+      id: sync
+      uses: aormsby/Fork-Sync-With-Upstream-action@v2.1
+      with:
+        upstream_repository: aormsby/hugo-deploy-to-pages
+        upstream_branch: main
+        target_branch: main
+        git_pull_args: --ff-only                    # optional arg use, defaults to simple 'pull'
+
+    # Step 3: Display a message if 'sync' step had new commits (simple test)
+    - name: Check for new commits
+      if: steps.sync.outputs.has_new_commits
+      run: echo "There were new commits."
+
+    # Step 4: Print a helpful timestamp for your records (not required, just nice)
+    - name: Timestamp
+      run: date