Merge branch 'main' into main

Signed-off-by: Pyritie <[email protected]>
TerraFirmaGreg-Team · Jan 12, 2025 · 1c55351 · 1c55351
2 parents 0492936 + fface80
commit 1c55351
Show file tree

Hide file tree

Showing 21 changed files with 1,016 additions and 94 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -9,9 +9,6 @@ concurrency:
   group: ${{ github.workflow }}
   cancel-in-progress: true
 
-permissions:
-  pull-requests: none
-
 env:
   RELEASE_TYPE: "release"
   MINECRAFT_VERSION: "1.20.1"
@@ -326,9 +323,59 @@ jobs:
           path: .pakku/multimc-overrides/${{ needs.info.outputs.project_full_name }}-multimc.zip
           if-no-files-found: error
 
+  release-github:
+    name: 🚀 Release to GitHub
+    needs: [info, build-modpack, build-server, build-multimc]
+    runs-on: ubuntu-latest
+    outputs:
+      url: ${{ steps.release.outputs.url }}
+
+    steps:
+      - name: 📦 Checkout
+        uses: actions/[email protected]
+
+      - name: 📦 Download artifact
+        uses: actions/[email protected]
+        with:
+          merge-multiple: true
+
+      - name: 🚫 Сlose fixed in dev
+        uses: Xikaro/close-issues-based-on-label@master
+        env:
+          LABEL: "2. Status: In Dev"
+          COMMENT: In ${{ needs.info.outputs.project_version }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Format diff
+        id: format_diff
+        if: ${{ needs.info.outputs.diff != '' }}
+        uses: roamingowl/[email protected]
+        with:
+          template: |
+            ```markdown
+            ${{ needs.info.outputs.diff }}
+            ```
+
+      - name: 🚀 Create release
+        id: release
+        uses: softprops/[email protected]
+        with:
+          name: ${{ needs.info.outputs.project_version }}
+          tag_name: ${{ needs.info.outputs.project_version }}
+          body: |
+            ${{ needs.info.outputs.changelog }}
+            ${{ steps.format_diff.outputs.text }}
+          files: |
+            ${{ needs.info.outputs.project_full_name }}-curseforge.zip
+            ${{ needs.info.outputs.project_full_name }}-serverpack.zip
+            ${{ needs.info.outputs.project_full_name }}-multimc.zip
+          prerelease: ${{ needs.info.outputs.release_type != 'release' }}
+          generate_release_notes: true
+          token: ${{ secrets.GITHUB_TOKEN }}
+
   release-curseforge:
     name: 🚀 Release to CurseForge
-    needs: [info, build-modpack, build-server]
+    needs: [info, build-modpack, build-server, release-github]
     runs-on: ubuntu-latest
     outputs:
       id: ${{ steps.release.outputs.id }}
@@ -370,7 +417,7 @@ jobs:
 
   # release-modrinth:
   #     name: 🚀 Release to Modrinth
-  #     needs: [info, build-modpack, build-server]
+  #     needs: [info, build-modpack, build-server, release-github]
   #     runs-on: ubuntu-latest
 
   #     steps:
@@ -406,55 +453,6 @@ jobs:
   #           server-display-name: ${{ needs.info.outputs.project_full_name }}-serverpack
   #           release-type: ${{ needs.info.outputs.release_type }}
 
-  release-github:
-    name: 🚀 Release to GitHub
-    needs: [info, build-modpack, build-server, build-multimc]
-    runs-on: ubuntu-latest
-    outputs:
-      url: ${{ steps.release.outputs.url }}
-
-    steps:
-      - name: 📦 Checkout
-        uses: actions/[email protected]
-
-      - name: 📦 Download artifact
-        uses: actions/[email protected]
-        with:
-          merge-multiple: true
-
-      - name: 🚫 Сlose fixed in dev
-        uses: Xikaro/close-issues-based-on-label@master
-        env:
-          LABEL: "2. Status: In Dev"
-          COMMENT: In ${{ needs.info.outputs.project_version }}
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Format diff
-        id: format_diff
-        if: ${{ needs.info.outputs.diff != '' }}
-        uses: roamingowl/[email protected]
-        with:
-          template: |
-            ```markdown
-            ${{ needs.info.outputs.diff }}
-            ```
-
-      - name: 🚀 Create release
-        id: release
-        uses: softprops/[email protected]
-        with:
-          name: ${{ needs.info.outputs.project_version }}
-          tag_name: ${{ needs.info.outputs.project_version }}
-          body: |
-            ${{ needs.info.outputs.changelog }}
-            ${{ steps.format_diff.outputs.text }}
-          files: |
-            ${{ needs.info.outputs.project_full_name }}-curseforge.zip
-            ${{ needs.info.outputs.project_full_name }}-serverpack.zip
-            ${{ needs.info.outputs.project_full_name }}-multimc.zip
-          prerelease: ${{ needs.info.outputs.release_type != 'release' }}
-          generate_release_notes: true
-          token: ${{ secrets.GITHUB_TOKEN }}
 
   discord-message:
     name: 📱 Discord Message
@@ -484,4 +482,4 @@ jobs:
             ```markdown
             ${{ steps.truncated.outputs.text  }}
             - ...```
-            ** [Read more...](${{ needs.release-github.outputs.url }}) **
+            ** [Read more...](${{ needs.release-github.outputs.url }}) **
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,6 +11,11 @@
 - Craft recipe for framed chest so it isn't cheaper then the alternatives (Juzrm).
 - RU_RU translation for tfc guide book (recently added pages) (8oyNextDoor).
 - Based gas multiblocks, more suffering! (Pyritie).
+- Creosote treated planks fixes (Pyritie).
+- Fixed mixer recipes for red/blue steel (Pyritie).
+- Added another recipe for Create's electron tubes (Pyritie).
+- Electric cheese, tomato sauce and cream (Saaghh).
+- Leather producting using GTM machines.
 
 ## [0.7.15] - 08.01.2025
 ### Changes

diff --git a/kubejs/assets/gtceu/lang/en_us.json b/kubejs/assets/gtceu/lang/en_us.json
@@ -6,6 +6,11 @@
 
     "block.gtceu.alternator": "Alternator",
     "gtceu.alternator": "Alternator",
+
+	"block.gtceu.nether_dome": "Netherarium",
+	"gtceu.nether_dome": "Netherarium",
+	"block.gtceu.end_dome": "Enderarium",
+	"gtceu.end_dome": "Enderarium",
 
     "material.treated_wood": "Creosote-Treated Wood",
     "block.gtceu.treated_wood_planks": "Creosote-Treated Wood Planks",
@@ -50,4 +55,4 @@
     "block.gtceu.luv_kinetic_output_box": "Ludicrous Voltage Kinetic Output Box",
     "block.gtceu.zpm_kinetic_output_box": "ZPM Voltage Kinetic Output Box",
     "block.gtceu.uv_kinetic_output_box": "Ultimate Voltage Kinetic Output Box"
-}
+}
diff --git a/kubejs/assets/gtceu/lang/ru_ru.json b/kubejs/assets/gtceu/lang/ru_ru.json
@@ -6,6 +6,11 @@
 
     "block.gtceu.alternator": "Генератор переменного тока",
     "gtceu.alternator": "Генератор переменного тока",
+
+	"block.gtceu.nether_dome": "Террариум нижнего мира",
+	"gtceu.nether_dome": "Террариум нижнего мира",
+	"block.gtceu.end_dome": "Террариум края",
+	"gtceu.end_dome": "Террариум края",
 
     "material.treated_wood": "Обработанное креозотом дерево",
     "block.gtceu.treated_wood_planks": "Доски из обработанного креозотом дерева"

diff --git a/kubejs/assets/tfg/models/block/artificial_end_portal_frame.json b/kubejs/assets/tfg/models/block/artificial_end_portal_frame.json
@@ -0,0 +1,84 @@
+{
+	"textures": {
+		"particle": "block/end_portal_frame_side",
+		"bottom": "block/end_stone",
+		"top": "block/end_portal_frame_top",
+		"side": "block/end_portal_frame_side",
+		"eye": "block/end_portal_frame_eye"
+	},
+	"elements": [
+		{
+			"from": [
+				0,
+				0,
+				0
+			],
+			"to": [
+				16,
+				16,
+				16
+			],
+			"faces": {
+				"down": {
+					"uv": [
+						0,
+						0,
+						16,
+						16
+					],
+					"texture": "#bottom",
+					"cullface": "down"
+				},
+				"up": {
+					"uv": [
+						0,
+						0,
+						16,
+						16
+					],
+					"texture": "#top"
+				},
+				"north": {
+					"uv": [
+						0,
+						3,
+						16,
+						16
+					],
+					"texture": "#side",
+					"cullface": "north"
+				},
+				"south": {
+					"uv": [
+						0,
+						3,
+						16,
+						16
+					],
+					"texture": "#side",
+					"cullface": "south"
+				},
+				"west": {
+					"uv": [
+						0,
+						3,
+						16,
+						16
+					],
+					"texture": "#side",
+					"cullface": "west"
+				},
+				"east": {
+					"uv": [
+						0,
+						3,
+						16,
+						16
+					],
+					"texture": "#side",
+					"cullface": "east"
+				}
+			}
+		}
+	]
+}
diff --git a/kubejs/client_scripts/tooltips.js b/kubejs/client_scripts/tooltips.js
@@ -1,4 +1,7 @@
 ItemEvents.tooltip(event => {
+    event.addAdvanced(['tfc:red_kaolin_clay','tfc:pink_kaolin_clay','tfc:white_kaolin_clay','gtceu:brass_block'], (item, advanced, text) => {
+        text.add(1, [text.of('Used in glassblowing as a replacement for Brass Plated Blocks')])
+    })
     event.addAdvanced(['gtceu:lv_macerator','gtceu:mv_macerator', 'gtceu:hp_steam_macerator'], (item, advanced, text) => {
         text.add(1, [text.of('Only outputs the first slot shown in EMI/JEI until HV.')])
     })
@@ -23,4 +26,12 @@ ItemEvents.tooltip(event => {
 	event.addAdvanced(['firmalife:beehive'], (item, advanced, text) => {
         text.add(1, [text.of('Needs to be filled with empty frames and surrounded by flowers to attract bees.')])
     })
+	event.addAdvanced(['gtceu:nether_dome'], (item, advanced, text) => {
+		text.add(1, text.of('Artificial enviroment to simulate the Nether.')),
+		text.add(2, text.of(`The interior is customizable! Check the multiblock preview in JEI.`))
+	})
+	event.addAdvanced(['gtceu:end_dome'], (item, advanced, text) => {
+		text.add(1, text.of('Artificial enviroment to simulate the End.')),
+		text.add(2, text.of(`The interior is customizable! Check the multiblock preview in JEI.`))
+	})
 })
diff --git a/kubejs/server_scripts/create/recipes.js b/kubejs/server_scripts/create/recipes.js
@@ -809,12 +809,34 @@ const registerCreateRecipes = (event) => {
         'DED' 
     ], {
         A: 'gtceu:glass_tube',
-        B: 'gtceu:resistor',
+        B: '#gtceu:resistors',
         C: 'gtceu:resin_circuit_board',
         D: 'gtceu:red_alloy_single_wire',
         E: '#forge:plates/wrought_iron'
     }).id('tfg:create/shaped/electron_tube')
 
+    event.shaped('2x create:electron_tube', [
+        ' A ',
+        'BCB',
+        'DED' 
+    ], {
+        A: 'gtceu:glass_tube',
+        B: '#gtceu:resistors',
+        C: 'gtceu:plastic_circuit_board',
+        D: 'gtceu:red_alloy_single_wire',
+        E: '#forge:plates/wrought_iron'
+    }).id('tfg:create/shaped/electron_tube2')
+
+    event.shaped('3x create:electron_tube', [
+        ' A ',
+        ' B ',
+        ' C '
+    ], {
+        A: 'gtceu:glass_tube',
+        B: 'gtceu:nand_chip',
+        C: '#forge:plates/wrought_iron'
+    }).id('tfg:create/shaped/electron_tube3')
+
     // Тюбик с клеем
     event.shaped('create:super_glue', [
         'BA',
@@ -1189,11 +1211,10 @@ const registerCreateRecipes = (event) => {
     //#region Механизм точности
 
     event.recipes.gtceu.assembler('tfg:create/precision_mechanism')
-    .itemInputs('#forge:sheets/gold','3x create:cogwheel', '3x create:large_cogwheel', '3x #forge:nuggets/iron')
-    .itemOutputs('create:precision_mechanism')
-    .duration(2000)
-    .EUt(20)
+        .itemInputs('#forge:sheets/gold','3x create:cogwheel', '3x create:large_cogwheel', '3x #forge:nuggets/iron')
+        .itemOutputs('create:precision_mechanism')
+        .duration(2000)
+        .EUt(20)
 
     //#endregion
-
 }