From bc4f8aa452c663440765d9bd8d3a61f7fdc6345b Mon Sep 17 00:00:00 2001 From: Pyritie Date: Mon, 25 Aug 2025 23:13:15 +0100 Subject: [PATCH 1/2] Update CONTRIBUTING.md (#1702) Signed-off-by: Pyritie --- .github/CONTRIBUTING.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index e45d49669..5557f3642 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -80,7 +80,7 @@ #### Step 2: Creating a New Instance in PrismLauncher 1. Open [PrismLauncher] and click on the **`Add Instance`** button. 2. In the **Name** field, enter the name **`TerraFirmaGreg-Modern`**. -3. Select Minecraft version **`1.20.1`** and Forge version **`47.2.6`** — these versions are necessary for the modpack to work correctly. +3. Select Minecraft version **`1.20.1`** and Forge version **`47.4.6`** — these versions are necessary for the modpack to work correctly. > [!TIP] > ![Interface for creating a new instance in PrismLauncher](https://github.com/TerraFirmaGreg-Team/.github/blob/main/wiki/new_instances.png?raw=true) @@ -319,7 +319,7 @@ There are two approaches to creating a Pull Request: via terminal and via GitHub #### Шаг 2: Создание новой инстанции в PrismLauncher 1. Откройте [PrismLauncher] и нажмите на кнопку **`Add Instance`**. 2. В поле **Name** введите название **`TerraFirmaGreg-Modern`**. -3. Выберите версию Minecraft **`1.20.1`** и версию **`Forge 47.2.6`** — именно эти версии необходимы для корректной работы модпака. +3. Выберите версию Minecraft **`1.20.1`** и версию **`Forge 47.4.6`** — именно эти версии необходимы для корректной работы модпака. > [!TIP] > ![Интерфейс для создания новой инстанции в PrismLauncher](https://github.com/TerraFirmaGreg-Team/.github/blob/main/wiki/new_instances.png?raw=true) From 8435c3de214b3176ddb83c947c7c670e9d593957 Mon Sep 17 00:00:00 2001 From: GameStar <56610486+BlueBoat29@users.noreply.github.com> Date: Mon, 25 Aug 2025 17:36:55 -0500 Subject: [PATCH 2/2] I messed up the tooltips oops (#1703) * stuff * Create wraptor.json * Update tags.js * fix wool * eggs * Update constants.js * more recipe stuff * doing tooltips the correct way * oops Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com> * oops --------- Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com> --- kubejs/client_scripts/tooltips.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kubejs/client_scripts/tooltips.js b/kubejs/client_scripts/tooltips.js index 91f52ef65..42450700c 100644 --- a/kubejs/client_scripts/tooltips.js +++ b/kubejs/client_scripts/tooltips.js @@ -125,7 +125,7 @@ const registerTooltips = (event) => { event.addAdvanced(['tfg:sniffer_egg'], (item, advanced, text) => { text.add(1, Text.translate('tfg.tooltip.attribution.sniffer')), - text.add(2, Text.translate('tfg.tooltip.large_egg') + text.add(2, Text.translate('tfg.tooltip.large_egg')) })