Merge branch '1.20.1-v8.0.0' of https://github.com/GregTechCEu/GregTech-Modern into yo/mui2/merge-nightmare

Author: YoungOnionMC

.github/workflows/deploy-pages.yml

@@ -2,13 +2,11 @@ name: Publish docs via GitHub Pages
 on:
   workflow_dispatch:
   push:
-    branches: [1.20.1]
+    branches: ["1.20.1", "1.21"]
     paths: ['docs/**']
 
 permissions:
-  contents: read
-  pages: write
-  id-token: write
+  contents: write
 
 concurrency:
   group: 'pages'
@@ -24,33 +22,17 @@ jobs:
     steps:
       - uses: actions/checkout@v4
         with:
-          ref: '1.20.1'
-          sparse-checkout: './docs'
+          ref: '${{ github.ref_name }}'
+          fetch-depth: 0
       - uses: actions/setup-python@v4
         with:
           python-version: '3.11'
           cache: 'pip'
-      - run: pip install -r ./requirements.txt
-      - uses: actions/cache@v4
-        with:
-          key: 'mkdocs-cache'
-          path: './docs/.cache'
-      - name: Build static files
-        id: mkdocs
-        run: mkdocs build
-      - name: Upload pages as artifact
-        id: artifact
-        uses: actions/upload-pages-artifact@v3
-        with:
-          path: './docs/site/'
-
-  deploy:
-    runs-on: ubuntu-latest
-    needs: build
-    environment:
-      name: github-pages
-      url: ${{ steps.deployment.outputs.page_url }}
-    steps:
-      - name: Deploy Pages
-        id: deployment
-        uses: actions/deploy-pages@v4
+      - name: Install packages
+        run: pip install -r ./requirements.txt
+      - name: Set git username and password
+        run: git config user.name 'github-actions[bot]'; git config user.email '41898282+github-actions[bot]@users.noreply.github.com'
+      - name: Deploy pages to gh-pages branch
+        run: mike deploy "${{ github.ref_name }}" --push
+      - name: Ensure 1.20.1 is the default version
+        run: mike set-default 1.20.1 --push

docs/README.md

@@ -79,3 +79,8 @@ mkdocs serve
 The following plugins for MkDocs are being used:
 - https://squidfunk.github.io/mkdocs-material/
 - https://github.com/lukasgeiter/mkdocs-awesome-pages-plugin
+
+## Deployment
+The hosted documentation is found on the `gh-pages` branch of the repository. [Mike](https://github.com/jimporter/mike) is used to deploy both the 1.20.1 and 1.21.1 documentation on the same site through Github Actions.
+
+When working on the docs locally, the plain `mkdocs` commands should be used to view the changes made to the version of the docs you are currently working on, like the previously mentioned `mkdocs serve`.

docs/content/Modpacks/Other-Topics/Custom-Sounds.md

@@ -17,7 +17,7 @@ import static com.examplemod.common.registry.ExampleRegistration.REGISTRATE;
 
 public class ExampleSound {
 
-    public static final SoundEntry MICROVERSE = REGISTRATE.sound("microverse").build();
+    public static final SoundEntry MICROVERSE = REGISTRATE.sound(ExampleMod.id("microverse")).build();
 
     public static void init() {}
 }

docs/content/index.md

@@ -5,8 +5,7 @@ hide:
 title: Home
 ---
 
-
-# Welcome to GregTech CEu Modern's Documentation!
+# Welcome to GregTech CEu Modern's Documentation for 1.20.1!
 
 GregTech CEu Modern is a port of [GregTech Community Edition Unofficial](https://github.com/GregTechCEu/GregTech)
 to modern Minecraft versions.

docs/mkdocs.yml

@@ -47,6 +47,8 @@ extra_css:
   - stylesheets/extra.css
 
 extra:
+  version:
+    provider: mike
   social:
     - icon: fontawesome/brands/discord
       link: https://discord.gg/bWSWuYvURP

docs/requirements.txt

@@ -1,2 +1,3 @@
 mkdocs-material
 mkdocs-awesome-pages-plugin
+mike

src/generated/resources/assets/gtceu/lang/en_ud.json

@@ -2302,8 +2302,10 @@
   "gtceu.electrolyzer": "ɹǝzʎןoɹʇɔǝןƎ",
   "gtceu.electromagnetic_separator": "ɹoʇɐɹɐdǝS ɔıʇǝubɐɯoɹʇɔǝןƎ",
   "gtceu.ender_item_link_cover.title": "ʞuıꞀ ɯǝʇI ɹǝpuƎ",
+  "gtceu.ender_item_link_cover.tooltip": "˙ㄥ§ɹǝʌoƆɟ§ sɐ ㄥ§uoıʇɔǝuuoƆ ɟ§ɹǝpuƎp§ ssǝןǝɹıMɟ§ ɐ ɥʇıʍ ㄥ§sɯǝʇIɟ§ sʇɹodsuɐɹ⟘ㄥ§",
   "gtceu.ender_redstone_link_cover.label": "%d :ɹǝʍod ǝuoʇspǝᴚ",
   "gtceu.ender_redstone_link_cover.title": "ʞuıꞀ ǝuoʇspǝᴚ ɹǝpuƎ",
+  "gtceu.ender_redstone_link_cover.tooltip": "˙ㄥ§ɹǝʌoƆɟ§ sɐ ㄥ§uoıʇɔǝuuoƆ ɟ§ɹǝpuƎp§ ssǝןǝɹıMɟ§ ɐ ɥʇıʍ ㄥ§sןɐubıs ǝuoʇspǝᴚɟ§ sʇıɯsuɐɹ⟘ㄥ§",
   "gtceu.extractor": "ɹoʇɔɐɹʇxƎ",
   "gtceu.extruder": "ɹǝpnɹʇxƎ",
   "gtceu.fermenter": "ɹǝʇuǝɯɹǝℲ",
@@ -2403,6 +2405,8 @@
   "gtceu.gui.content.units.per_second": "s/",
   "gtceu.gui.content.units.per_tick": "ʇ/",
   "gtceu.gui.cover_setting.title": "sbuıʇʇǝS ɹǝʌoƆ",
+  "gtceu.gui.directional_setting.tab_tooltip": "buıʇʇǝS ןɐuoıʇɔǝɹıᗡ ǝbuɐɥƆ",
+  "gtceu.gui.directional_setting.title": "buıʇʇǝS ןɐuoıʇɔǝɹıᗡ",
   "gtceu.gui.editor.group.recipe_type": "dɐɔ",
   "gtceu.gui.editor.tips.citation": "suoıʇɐʇıɔ ɟo ɹǝqɯnN",
   "gtceu.gui.fisher_mode.tooltip.0": "sɯǝʇı ʞunظ ǝןbbo⟘",
@@ -3553,6 +3557,10 @@
   "gtceu.placeholder_info.block.0": "˙)█( ןoqɯʎs ʞɔoןq ǝɥʇ suɹnʇǝᴚ",
   "gtceu.placeholder_info.block.1": ":ǝbɐs∩",
   "gtceu.placeholder_info.block.2": ",█, >- }ʞɔoןq{  ",
+  "gtceu.placeholder_info.blockNbt.0": "ʎʇıʇuǝ ʞɔoןq ǝɥʇ ɟo ⟘ᗺN ǝɥʇ suɹnʇǝᴚ",
+  "gtceu.placeholder_info.blockNbt.1": ":ǝbɐs∩",
+  "gtceu.placeholder_info.blockNbt.2": "ʇqu ʎʇıʇuǝ ʞɔoןq ןןnɟ >- }ʇqNʞɔoןq{  ",
+  "gtceu.placeholder_info.blockNbt.3": "ʇqu ǝɥʇ ɟo ʇɹɐd >- }˙˙˙ ]ᄅʎǝʞ[ ]Ɩʎǝʞ[ ʇqNʞɔoןq{  ",
   "gtceu.placeholder_info.bufferText.0": "ʇɟɐɹƆɹǝʇndɯoƆ ʎq ǝןqıssǝɔɔɐ ɹǝɟɟnq ɐ ɯoɹɟ ʇxǝʇ ǝɥʇ suɹnʇǝᴚ",
   "gtceu.placeholder_info.bufferText.1": ":ǝbɐs∩",
   "gtceu.placeholder_info.bufferText.2": ")00Ɩ-Ɩ sı ǝuıן( ǝuıן pǝıɟıɔǝds ǝɥʇ uo ɹǝɟɟnq ǝɥʇ ɯoɹɟ ʇxǝʇ >- }>ǝuıן< ʇxǝ⟘ɹǝɟɟnq{  ",
@@ -4755,7 +4763,7 @@
   "item.gtceu.tool.behavior.block_rotation": "sʞɔoןᗺ sǝʇɐʇoᴚɟ§ :ɔıuɐɥɔǝWᄅ§",
   "item.gtceu.tool.behavior.crop_harvesting": "sdoɹƆ sʇsǝʌɹɐHɟ§ :ɹǝʇsǝʌɹɐHɐ§",
   "item.gtceu.tool.behavior.damage_boost": "%s ʇsuıɐbɐ ǝbɐɯɐp ɐɹʇxƎɟ§ :ʇsooᗺ ǝbɐɯɐᗡㄣ§",
-  "item.gtceu.tool.behavior.dowse_campfire": "sǝɹıɟdɯɐƆ sǝsʍoᗡɟ§ :ɹǝʇɥbıɟǝɹıℲ§",
+  "item.gtceu.tool.behavior.dowse_campfire": "sǝɹıɟdɯɐƆ sǝsʍoᗡɟ§ :ɹǝʇɥbıɟǝɹıℲƖ§",
   "item.gtceu.tool.behavior.grass_path": "sɥʇɐԀ ssɐɹ⅁ sǝʇɐǝɹƆɟ§ :ɹǝdɐɔspuɐꞀǝ§",
   "item.gtceu.tool.behavior.ground_tilling": "punoɹ⅁ sןןı⟘ɟ§ :ɹǝɯɹɐℲǝ§",
   "item.gtceu.tool.behavior.plunger": "spınןℲ suıɐɹᗡɟ§ :ɹǝqɯnןԀ6§",

src/generated/resources/assets/gtceu/lang/en_us.json

@@ -2302,8 +2302,10 @@
   "gtceu.electrolyzer": "Electrolyzer",
   "gtceu.electromagnetic_separator": "Electromagnetic Separator",
   "gtceu.ender_item_link_cover.title": "Ender Item Link",
+  "gtceu.ender_item_link_cover.tooltip": "§7Transports §fItems§7 with a §fWireless §dEnder§f Connection§7 as §fCover§7.",
   "gtceu.ender_redstone_link_cover.label": "Redstone power: %d",
   "gtceu.ender_redstone_link_cover.title": "Ender Redstone Link",
+  "gtceu.ender_redstone_link_cover.tooltip": "§7Transmits §fRedstone signals§7 with a §fWireless §dEnder§f Connection§7 as §fCover§7.",
   "gtceu.extractor": "Extractor",
   "gtceu.extruder": "Extruder",
   "gtceu.fermenter": "Fermenter",
@@ -2403,6 +2405,8 @@
   "gtceu.gui.content.units.per_second": "/s",
   "gtceu.gui.content.units.per_tick": "/t",
   "gtceu.gui.cover_setting.title": "Cover Settings",
+  "gtceu.gui.directional_setting.tab_tooltip": "Change Directional Setting",
+  "gtceu.gui.directional_setting.title": "Directional Setting",
   "gtceu.gui.editor.group.recipe_type": "cap",
   "gtceu.gui.editor.tips.citation": "Number of citations",
   "gtceu.gui.fisher_mode.tooltip.0": "Toggle junk items",
@@ -3553,6 +3557,10 @@
   "gtceu.placeholder_info.block.0": "Returns the block symbol (█).",
   "gtceu.placeholder_info.block.1": "Usage:",
   "gtceu.placeholder_info.block.2": "  {block} -> '█'",
+  "gtceu.placeholder_info.blockNbt.0": "Returns the NBT of the block entity",
+  "gtceu.placeholder_info.blockNbt.1": "Usage:",
+  "gtceu.placeholder_info.blockNbt.2": "  {blockNbt} -> full block entity nbt",
+  "gtceu.placeholder_info.blockNbt.3": "  {blockNbt [key1] [key2] ...} -> part of the nbt",
   "gtceu.placeholder_info.bufferText.0": "Returns the text from a buffer accessible by ComputerCraft",
   "gtceu.placeholder_info.bufferText.1": "Usage:",
   "gtceu.placeholder_info.bufferText.2": "  {bufferText <line>} -> text from the buffer on the specified line (line is 1-100)",
@@ -4127,9 +4135,7 @@
   "item.gtceu.ender_fluid_link_cover": "Ender Fluid Link",
   "item.gtceu.ender_fluid_link_cover.tooltip": "§7Transports §fFluids§7 with a §fWireless §dEnder§f Connection§7 as §fCover§7.",
   "item.gtceu.ender_item_link_cover": "Ender Item Link",
-  "item.gtceu.ender_item_link_cover.tooltip": "§7Transports §fItems§7 with a §fWireless §dEnder§f Connection§7 as §fCover§7.",
   "item.gtceu.ender_redstone_link_cover": "Ender Redstone Link",
-  "item.gtceu.ender_redstone_link_cover.tooltip": "§7Transmits §fRedstone signals§7 with a §fWireless §dEnder§f Connection§7 as §fCover§7.",
   "item.gtceu.energium_dust": "Energium Dust",
   "item.gtceu.energy_cluster": "Energy Cluster",
   "item.gtceu.energy_cluster.tooltip": "§7Reusable Battery",
@@ -4757,7 +4763,7 @@
   "item.gtceu.tool.behavior.block_rotation": "§2Mechanic: §fRotates Blocks",
   "item.gtceu.tool.behavior.crop_harvesting": "§aHarvester: §fHarvests Crops",
   "item.gtceu.tool.behavior.damage_boost": "§4Damage Boost: §fExtra damage against %s",
-  "item.gtceu.tool.behavior.dowse_campfire": "§Firefighter: §fDowses Campfires",
+  "item.gtceu.tool.behavior.dowse_campfire": "§1Firefighter: §fDowses Campfires",
   "item.gtceu.tool.behavior.grass_path": "§eLandscaper: §fCreates Grass Paths",
   "item.gtceu.tool.behavior.ground_tilling": "§eFarmer: §fTills Ground",
   "item.gtceu.tool.behavior.plunger": "§9Plumber: §fDrains Fluids",

src/generated/resources/data/forge/tags/items/enchanting_fuels.json

@@ -0,0 +1,6 @@
+{
+  "values": [
+    "gtceu:lazurite_gem",
+    "gtceu:sodalite_gem"
+  ]
+}

src/generated/resources/data/gtceu/tags/items/skip_item_detector.json

@@ -0,0 +1,5 @@
+{
+  "values": [
+    "gtceu:programmed_circuit"
+  ]
+}