Merge pull request #1777 from TerraFirmaGreg-Team/dev

Release: 0.10.12

.github/workflows/build.yml

@@ -242,7 +242,7 @@ jobs:
 
       - name: 🔍 Check existing PRs
         id: check_existing_pr
-        uses: actions/github-script@v7.0.1
+        uses: actions/github-script@v8.0.0
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
@@ -305,7 +305,7 @@ jobs:
 
           sed -i -e "s/DEV/${VERSION}/g" pakku.json
           sed -i -e "s/DEV/${VERSION}/g" config/fancymenu/customization/gui_main_menu.txt
-          
+
           sed -i -e "s/DEV/${VERSION}/g" .pakku/multimc-overrides/instance.cfg
           sed -i -e "s/LOADER_VERSION/${LOADER_VERSION}/g" .pakku/multimc-overrides/mmc-pack.json
           sed -i -e "s/LOADER_TYPE/${LOADER_TYPE}/g" .pakku/multimc-overrides/mmc-pack.json
@@ -357,14 +357,15 @@ jobs:
 
       - name: 📁 Preparing the artifact multimc
         run: |
-          mkdir -p .pakku/multimc-overrides/flame .pakku/multimc-overrides/mods
+          mkdir -p .pakku/multimc-overrides/flame
+          mkdir -p .pakku/multimc-overrides/mods
 
           mv -vf .pakku/multimc-overrides ./build/multimc
 
           cp -vf ./build/.cache/curseforge/manifest.json ./build/multimc/flame/manifest.json
 
           cp -rf ./build/.cache/curseforge/overrides ./build/multimc/.minecraft
-          cp -rf ./mods ./build/multimc/.minecraft/mods
+          cp -rf ./mods ./build/multimc/.minecraft/
 
           cd ./build/multimc/
           zip -r ${{ needs.info.outputs.project_full_name }}-multimc.zip icon.png mmc-pack.json instance.cfg .minecraft/ flame/
@@ -435,7 +436,7 @@ jobs:
 
       - name: 🚀 Create release
         id: release
-        uses: softprops/action-gh-release@v2.3.2
+        uses: softprops/action-gh-release@v2.3.3
         with:
           name: ${{ needs.info.outputs.project_version }}
           tag_name: ${{ needs.info.outputs.project_version }}
@@ -445,6 +446,7 @@ jobs:
             ${{ steps.format_diff.outputs.text }}
           files: |
             ${{ needs.info.outputs.project_full_name }}-curseforge.zip
+            ${{ needs.info.outputs.project_full_name }}-modrinth.mrpack
             ${{ needs.info.outputs.project_full_name }}-serverpack.zip
             ${{ needs.info.outputs.project_full_name }}-multimc.zip
           prerelease: ${{ needs.info.outputs.release_type != 'release' }}
@@ -531,19 +533,19 @@ jobs:
             fi
             echo "✔️ All artifacts found"
     
-        - name: 🚀 Upload Modrinth
+        # - name: 🚀 Upload Modrinth
-          id: release
+        #   id: release
-          uses: Xikaro/upload-curseforge-modpack-action@1.1.1
+        #   uses: Xikaro/upload-curseforge-modpack-action@1.1.1
-          with:
+        #   with:
-            api-token: ${{ secrets.MODRINTH_TOKEN }}
+        #     api-token: ${{ secrets.MODRINTH_TOKEN }}
-            project-id: ${{ vars.MODRINTH_ID }}
+        #     project-id: ${{ vars.MODRINTH_ID }}
-            modpack-path: ${{ needs.info.outputs.project_full_name }}-modrinth.mrpack
+        #     modpack-path: ${{ needs.info.outputs.project_full_name }}-modrinth.mrpack
-            changelog: ${{ needs.info.outputs.changelog }}
+        #     changelog: ${{ needs.info.outputs.changelog }}
-            changelog-format: markdown
+        #     changelog-format: markdown
-            game-version: ${{ needs.info.outputs.mc_version }}
+        #     game-version: ${{ needs.info.outputs.mc_version }}
-            display-name: ${{ needs.info.outputs.project_full_name }}
+        #     display-name: ${{ needs.info.outputs.project_full_name }}
 
-            release-type: ${{ needs.info.outputs.release_type }}
+        #     release-type: ${{ needs.info.outputs.release_type }}
 
   discord-message:
     name: 📱 Discord Message
@@ -569,7 +571,7 @@ jobs:
             **Release Type**: `${{ needs.info.outputs.release_type }}`
             **Game Version**: `${{ needs.info.outputs.mc_version }}`
 
-            :curseforge_logo: [CurseForge](https://www.curseforge.com/minecraft/modpacks/terrafirmagreg-modern/files/${{ needs.release-curseforge.outputs.id }}) • :github_logo: [GitHub](${{ needs.release-github.outputs.url }}) • [Issues](https://github.com/${{ github.repository }}/issues)
+            [CurseForge](https://www.curseforge.com/minecraft/modpacks/terrafirmagreg-modern/files/${{ needs.release-curseforge.outputs.id }}) • [GitHub](${{ needs.release-github.outputs.url }}) • [Issues](https://github.com/${{ github.repository }}/issues)
             ```markdown
             ${{ steps.truncated.outputs.text  }}
             - ...```

CHANGELOG.md

@@ -4,6 +4,14 @@
 ### Changes
 ### Bug fixes
 
+## [0.10.12] - 09-09-2025
+### Changes
+- Added cobblestone, gravel, polished stone, bricks, and chiseled bricks to all stone types that didn't have those stone types, along with some other unification (#1764) @vidal-adrien
+- Nether brick is now crafted from Keratophyre (#1764) @vidal-adrien
+### Bug fixes
+- Fixed two instances of illegal lang exceptions causing errors on servers. @Redeix
+- Fixed the field guide having no pages @Pyritie
+
 ## [0.10.11] - 08-09-2025
 ### Mods
 - Reverted the change from Embeddium to Xenon, because it was causing more issues than it solved

kubejs/assets/ad_astra/lang/zh_cn.json

@@ -106,11 +106,11 @@
   "block.ad_astra.polished_glacio_stone_slab": "磨制响岩台阶",
   "block.ad_astra.polished_glacio_stone_stairs": "磨制响岩楼梯",
   "entity.ad_astra.corrupted_lunarian": "月球僵尸",
+  "entity.ad_astra.martian_raptor": "骷髅迅猛龙",
   "entity.ad_astra.tier_1_rocket": "R型铝钢火箭",
   "entity.ad_astra.tier_2_rocket": "ASM 4914 钛合金火箭",
   "entity.ad_astra.tier_3_rocket": "45-Ti 钨钢火箭",
   "entity.ad_astra.tier_1_rover": "漫游车",
-  "entity.ad_astra.martian_raptor": "骷髅迅猛龙",
   "fluid_type.ad_astra.oxygen": "可呼吸空气",
   "item.ad_astra.steel_cable": "基础RF电缆",
   "item.ad_astra.desh_cable": "高级RF电缆",

kubejs/assets/betterend/lang/zh_cn.json

@@ -15,7 +15,9 @@
   "block.betterend.bolux_mushroom_wild": "野生波鲁克斯菌丛",
   "block.betterend.bolux_mushroom_dead": "枯萎的波鲁克斯菌丛",
   "block.betterend.bushy_grass": "新星草",
+  "block.betterend.bulb_moss": "球茎苔",
   "block.betterend.cave_bush": "朱红瓣叶",
+  "block.betterend.cave_bush_fallen": "小型朱红瓣叶",
   "block.betterend.cave_grass": "朱砂藓",
   "block.betterend.cave_pumpkin": "球茎南瓜",
   "block.betterend.cave_pumpkin_wild": "野生球茎藤",
@@ -48,10 +50,14 @@
   "block.betterend.hydralux": "水光莲",
   "block.betterend.hydralux_sapling": "水光莲苗",
   "block.betterend.inflexia": "曲枝草",
+  "block.betterend.lacugrove": "泊林木海藻",
   "block.betterend.lamellarium": "叠层藻",
   "block.betterend.lanceleaf": "矛叶草",
   "block.betterend.lanceleaf_small": "矛叶刃",
   "block.betterend.large_amaranita_mushroom": "大紫荆菇",
+  "block.betterend.lucernia_leaves": "卢瑟尼亚瓣叶",
+  "block.betterend.lucernia_leaves_fallen": "小型卢瑟尼亚瓣叶",
+  "block.betterend.lucernia_outer_leaves": "卢瑟尼亚菌核",
   "block.betterend.lutebus": "琉特草",
   "block.betterend.magnula": "磁光草",
   "block.betterend.nightshade_moss": "夜影苔",
@@ -72,12 +78,6 @@
   "block.betterend.umbrella_moss": "伞苔",
   "block.betterend.umbrella_moss_tall": "高伞苔",
   "block.betterend.vaiolush_fern": "幽蓝蕨",
-  "block.betterend.cave_bush_fallen": "小型朱红瓣叶",
-  "block.betterend.lucernia_leaves": "卢瑟尼亚瓣叶",
-  "block.betterend.lucernia_leaves_fallen": "小型卢瑟尼亚瓣叶",
-  "block.betterend.lucernia_outer_leaves": "卢瑟尼亚菌核",
-  "block.betterend.bulb_moss": "球茎苔",
-  "block.betterend.lacugrove": "泊林木海藻",
   "item.betterend.amber_root_product": "琥珀新芽",
   "item.betterend.amber_root_seeds": "琥珀新芽种子",
   "item.betterend.blossom_berry_product": "百花果",

kubejs/assets/gtceu/lang/zh_cn.json

@@ -13,6 +13,10 @@
   "block.gtceu.heat_exchanger": "热交换器",
   "block.gtceu.fission_reactor": "裂变反应堆",
   "block.gtceu.evaporation_tower": "蒸发塔",
+  "block.gtceu.ostrum_harvester": "紫金采集器",
+  "block.gtceu.moon_dust_harvester": "月尘采集器",
+  "block.gtceu.ostrum_linear_accelerator": "紫金线性加速器",
+  "block.tfg.bioreactor": "生物反应器",
   "block.gtceu.copper_crate": "铜板条箱",
   "block.gtceu.copper_drum": "铜桶",
   "block.gtceu.black_bronze_crate": "黑青铜板条箱",
@@ -35,13 +39,9 @@
   "gtceu.heat_exchanger": "热交换器",
   "gtceu.fission_reactor": "裂变反应堆",
   "gtceu.evaporation_tower": "蒸发塔",
-  "block.gtceu.ostrum_harvester": "紫金采集器",
-  "block.gtceu.moon_dust_harvester": "月尘采集器",
   "gtceu.ostrum_harvester": "紫金采集器",
   "gtceu.moon_dust_harvester": "月尘采集器",
-  "block.gtceu.ostrum_linear_accelerator": "紫金线性加速器",
   "gtceu.ostrum_linear_accelerator": "紫金线性加速器",
-  "block.tfg.bioreactor": "生物反应器",
   "gtceu.bioreactor": "生物反应器",
   "item.gtceu.tiny_wood_dust": "小撮软木浆",
   "item.gtceu.small_wood_dust": "小堆软木浆",
@@ -151,13 +151,13 @@
   "material.gtceu.ostrum_vapor": "紫金蒸气",
   "metaitem.dust.tooltip.purify": "投入水中可获得纯净粉末",
   "metaitem.crushed.tooltip.purify": "投入水中可获得纯净矿石",
-  "item.gtceu.tool.behavior.silk_ice": "精准采集可获得浮冰",
+  "item.gtceu.tool.behavior.silk_ice": "§d雕刻家:§r 可用精准采集获取浮冰",
-  "item.gtceu.tool.butchery_knife.tooltip": "屠宰动物可获得更多肉类",
+  "item.gtceu.tool.butchery_knife.tooltip": "§屠夫:§r 屠宰动物可获得更多肉类",
+  "gtceu.machine.lp_steam_extractor.tooltip": "§7不能提取流体",
+  "gtceu.machine.hp_steam_extractor.tooltip": "§7不能提取流体",
   "gtceu.jei.bedrock_fluid.moon_helium": "月球氦气",
   "gtceu.jei.bedrock_fluid.moon_helium_3": "月球氦-3",
   "gtceu.jei.bedrock_fluid.moon_argon": "月球氩气",
-  "gtceu.machine.lp_steam_extractor.tooltip": "§7不能提取流体",
-  "gtceu.machine.hp_steam_extractor.tooltip": "§7不能提取流体",
   "gtceu.jei.bedrock_fluid.semiheavy_ammoniacal_water": "火星半重氨水",
   "gtceu.jei.bedrock_fluid.liquid_carbon_dioxide": "火星液态二氧化碳",
   "gtceu.jei.bedrock_fluid.heavy_ammoniacal_water": "火星重氨水",
@@ -177,6 +177,7 @@
   "tagprefix.double_ingot": "%s双锭",
   "tagprefix.poor_raw": "贫瘠%s原矿",
   "tagprefix.rich_raw": "富集%s原矿",
+  "tagprefix.dusty_raw": "积尘%s原矿",
   "tagprefix.gabbro": "辉长岩%s矿石",
   "tagprefix.shale": "页岩%s矿石",
   "tagprefix.claystone": "黏土岩%s矿石",
@@ -195,6 +196,5 @@
   "tagprefix.marble": "大理岩%s矿石",
   "tagprefix.deepslate": "混合岩%s矿石",
   "tagprefix.pyroxenite": "辉石岩%s矿石",
-  "tagprefix.dripstone": "石灰华%s矿石",
+  "tagprefix.dripstone": "石灰华%s矿石"
-  "tagprefix.dusty_raw": "积尘%s原矿"
 }

kubejs/assets/minecraft/lang/en_gb.json

@@ -40,6 +40,13 @@
   "block.minecraft.polished_blackstone_stairs": "Polished Pyroxenite Stairs",
   "block.minecraft.polished_blackstone_wall": "Polished Pyroxenite Wall",
   "block.minecraft.dripstone_block": "Raw Travertine",
+  "block.minecraft.nether_bricks": "Keratophyre Bricks",
+  "block.minecraft.nether_brick_fence": "Keratophyre Brick Fence",
+  "block.minecraft.nether_brick_slab": "Keratophyre Brick Slab",
+  "block.minecraft.nether_brick_wall": "Keratophyre Brick Wall",
+  "block.minecraft.nether_brick_stairs": "Keratophyre Brick Stairs",
+  "block.minecraft.cracked_nether_bricks": "Cracked Keratophyre Bricks",
+  "block.minecraft.chiseled_nether_bricks": "Chiseled Keratophyre Bricks",
   "block.minecraft.magma_block": "Pyroxenite Magma",
   "block.minecraft.twisting_vines": "Lightbloom Stem",
   "block.minecraft.pearlescent_froglight": "Pearlescent Lightbloom",
@@ -65,5 +72,6 @@
   "item.minecraft.netherite_leggings": "Blue Steel Diving Leggings",
   "item.minecraft.string": "Silk Thread",
   "item.minecraft.glow_ink_sac": "Glowing Dye",
+  "item.minecraft.nether_brick": "Keratophyre Brick",
   "material.tfg.dripstone": "Travertine"
 }

kubejs/assets/minecraft/lang/en_us.json

@@ -40,6 +40,13 @@
   "block.minecraft.polished_blackstone_stairs": "Polished Pyroxenite Stairs",
   "block.minecraft.polished_blackstone_wall": "Polished Pyroxenite Wall",
   "block.minecraft.dripstone_block": "Raw Travertine",
+  "block.minecraft.nether_bricks": "Keratophyre Bricks",
+  "block.minecraft.nether_brick_fence": "Keratophyre Brick Fence",
+  "block.minecraft.nether_brick_slab": "Keratophyre Brick Slab",
+  "block.minecraft.nether_brick_wall": "Keratophyre Brick Wall",
+  "block.minecraft.nether_brick_stairs": "Keratophyre Brick Stairs",
+  "block.minecraft.cracked_nether_bricks": "Cracked Keratophyre Bricks",
+  "block.minecraft.chiseled_nether_bricks": "Chiseled Keratophyre Bricks",
   "block.minecraft.magma_block": "Pyroxenite Magma",
   "block.minecraft.twisting_vines": "Lightbloom Stem",
   "block.minecraft.pearlescent_froglight": "Pearlescent Lightbloom",
@@ -65,5 +72,6 @@
   "item.minecraft.netherite_leggings": "Blue Steel Diving Leggings",
   "item.minecraft.string": "Silk Thread",
   "item.minecraft.glow_ink_sac": "Glowing Dye",
+  "item.minecraft.nether_brick": "Keratophyre Brick",
   "material.tfg.dripstone": "Travertine"
 }

kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/arborfirmacraft/tapping_index.json

@@ -2,7 +2,6 @@
 	"name": "Tapping Index",
 	"category": "tfc:arborfirmacraft",
 	"icon": "afc:wood/sapling/weeping_maple",
-	"priority": true,
 	"read_by_default": true,
 	"pages": [
 		{

kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/mechanics/trowel.json

@@ -2,7 +2,7 @@
 	"name": "Trowel",
 	"icon": "tfg:trowel",
 	"category": "tfc:mechanics",
-	"priority": true,
+	"read_by_default": true,
 	"pages": [
 		{
 			"type": "patchouli:crafting",
@@ -11,8 +11,8 @@
 			"text": "A $(item)Trowel$() allows a builder to place random blocks from their hotbar when right-clicking a surface.$(br2)Trowels also have built-in functionality with the $(item)Roads and Roofs$() mod--Meaning that they can place filler items like bricks or flagstones randomly as well."
 		},
 		{
-		"type": "patchouli:text",
+			"type": "patchouli:text",
-		"text":	"Inspired by the trowel tool from $(item)Quark$()--A mod by Vazkii"
+			"text": "Inspired by the trowel tool from $(item)Quark$()--A mod by Vazkii"
 		}
 	]
 }

kubejs/assets/tfg/blockstates/loose/crackrack.json

@@ -0,0 +1,55 @@
+{
+	"variants": {
+		"count=1": [
+			{
+				"model": "tfg:block/loose/crackrack_1",
+				"y": 90
+			},
+			{
+				"model": "tfg:block/loose/crackrack_1"
+			},
+			{
+				"model": "tfg:block/loose/crackrack_1",
+				"y": 180
+			},
+			{
+				"model": "tfg:block/loose/crackrack_1",
+				"y": 270
+			}
+		],
+		"count=2": [
+			{
+				"model": "tfg:block/loose/crackrack_2",
+				"y": 90
+			},
+			{
+				"model": "tfg:block/loose/crackrack_2"
+			},
+			{
+				"model": "tfg:block/loose/crackrack_2",
+				"y": 180
+			},
+			{
+				"model": "tfg:block/loose/crackrack_2",
+				"y": 270
+			}
+		],
+		"count=3": [
+			{
+				"model": "tfg:block/loose/crackrack_3",
+				"y": 90
+			},
+			{
+				"model": "tfg:block/loose/crackrack_3"
+			},
+			{
+				"model": "tfg:block/loose/crackrack_3",
+				"y": 180
+			},
+			{
+				"model": "tfg:block/loose/crackrack_3",
+				"y": 270
+			}
+		]
+	}
+}

kubejs/assets/tfg/blockstates/rock/bricks_moon_deepslate.json

@@ -0,0 +1,7 @@
+{
+	"variants": {
+		"": {
+			"model": "tfg:block/rock/bricks_moon_deepslate"
+		}
+	}
+}

kubejs/assets/tfg/blockstates/rock/chiseled_bricks_moon_deepslate.json

@@ -0,0 +1,7 @@
+{
+	"variants": {
+		"": {
+			"model": "tfg:block/rock/chiseled_bricks_moon_deepslate"
+		}
+	}
+}

kubejs/assets/tfg/blockstates/rock/cobble_blackstone.json

@@ -0,0 +1,7 @@
+{
+	"variants": {
+		"": {
+			"model": "tfg:block/rock/cobble_blackstone"
+		}
+	}
+}

kubejs/assets/tfg/blockstates/rock/cobble_crackrack.json

@@ -0,0 +1,7 @@
+{
+	"variants": {
+		"": {
+			"model": "tfg:block/rock/cobble_crackrack"
+		}
+	}
+}

kubejs/assets/tfg/blockstates/rock/cobble_dripstone.json

@@ -0,0 +1,7 @@
+{
+	"variants": {
+		"": {
+			"model": "tfg:block/rock/cobble_dripstone"
+		}
+	}
+}

kubejs/assets/tfg/blockstates/rock/cobble_moon_deepslate.json

@@ -0,0 +1,7 @@
+{
+	"variants": {
+		"": {
+			"model": "tfg:block/rock/cobble_moon_deepslate"
+		}
+	}
+}

kubejs/assets/tfg/blockstates/rock/cobble_permafrost.json

@@ -0,0 +1,7 @@
+{
+	"variants": {
+		"": {
+			"model": "tfg:block/rock/cobble_permafrost"
+		}
+	}
+}

kubejs/assets/tfg/blockstates/rock/cracked_bricks_moon_deepslate.json

@@ -0,0 +1,7 @@
+{
+	"variants": {
+		"": {
+			"model": "tfg:block/rock/cracked_bricks_moon_deepslate"
+		}
+	}
+}

kubejs/assets/tfg/blockstates/rock/gravel_blackstone.json

@@ -0,0 +1,7 @@
+{
+	"variants": {
+		"": {
+			"model": "tfg:block/rock/gravel_blackstone"
+		}
+	}
+}

kubejs/assets/tfg/blockstates/rock/gravel_crackrack.json

@@ -0,0 +1,7 @@
+{
+	"variants": {
+		"": {
+			"model": "tfg:block/rock/gravel_crackrack"
+		}
+	}
+}

kubejs/assets/tfg/blockstates/rock/gravel_deepslate.json

@@ -0,0 +1,7 @@
+{
+	"variants": {
+		"": {
+			"model": "tfg:block/rock/gravel_deepslate"
+		}
+	}
+}

kubejs/assets/tfg/blockstates/rock/gravel_dripstone.json

@@ -0,0 +1,7 @@
+{
+	"variants": {
+		"": {
+			"model": "tfg:block/rock/gravel_dripstone"
+		}
+	}
+}

kubejs/assets/tfg/blockstates/rock/gravel_glacio.json

@@ -0,0 +1,7 @@
+{
+	"variants": {
+		"": {
+			"model": "tfg:block/rock/gravel_glacio"
+		}
+	}
+}

kubejs/assets/tfg/blockstates/rock/gravel_mars.json

@@ -0,0 +1,7 @@
+{
+	"variants": {
+		"": {
+			"model": "tfg:block/rock/gravel_mars"
+		}
+	}
+}

kubejs/assets/tfg/blockstates/rock/gravel_mercury.json

@@ -0,0 +1,7 @@
+{
+	"variants": {
+		"": {
+			"model": "tfg:block/rock/gravel_mercury"
+		}
+	}
+}

kubejs/assets/tfg/blockstates/rock/gravel_moon.json

@@ -0,0 +1,7 @@
+{
+	"variants": {
+		"": {
+			"model": "tfg:block/rock/gravel_moon"
+		}
+	}
+}

kubejs/assets/tfg/blockstates/rock/gravel_moon_deepslate.json

@@ -0,0 +1,7 @@
+{
+	"variants": {
+		"": {
+			"model": "tfg:block/rock/gravel_moon_deepslate"
+		}
+	}
+}

kubejs/assets/tfg/blockstates/rock/gravel_permafrost.json

@@ -0,0 +1,7 @@
+{
+	"variants": {
+		"": {
+			"model": "tfg:block/rock/gravel_permafrost"
+		}
+	}
+}

kubejs/assets/tfg/blockstates/rock/gravel_red_granite.json

@@ -0,0 +1,7 @@
+{
+	"variants": {
+		"": {
+			"model": "tfg:block/rock/gravel_red_granite"
+		}
+	}
+}

kubejs/assets/tfg/blockstates/rock/gravel_venus.json

@@ -0,0 +1,7 @@
+{
+	"variants": {
+		"": {
+			"model": "tfg:block/rock/gravel_venus"
+		}
+	}
+}

kubejs/assets/tfg/blockstates/rock/pillar_moon_deepslate.json

@@ -0,0 +1,16 @@
+{
+  "variants": {
+    "axis=x": {
+      "model": "tfg:block/rock/pillar_moon_deepslate_horizontal",
+      "x": 90,
+      "y": 90
+    },
+    "axis=y": {
+      "model": "tfg:block/rock/pillar_moon_deepslate"
+    },
+    "axis=z": {
+      "model": "tfg:block/rock/pillar_moon_deepslate_horizontal",
+      "x": 90
+    }
+  }
+}

kubejs/assets/tfg/blockstates/rock/polished_crackrack.json

@@ -0,0 +1,7 @@
+{
+	"variants": {
+		"": {
+			"model": "tfg:block/rock/polished_crackrack"
+		}
+	}
+}

kubejs/assets/tfg/blockstates/rock/polished_moon_deepslate.json

@@ -0,0 +1,7 @@
+{
+	"variants": {
+		"": {
+			"model": "tfg:block/rock/polished_moon_deepslate"
+		}
+	}
+}

kubejs/assets/tfg/lang/en_us.json

@@ -152,42 +152,65 @@
   "block.tfg.aeronos_support": "Aeronos Support",
   "block.tfg.aeronos_support_horizontal": "Aeronos Horizontal Support",
   "block.tfg.rock.hardened_deepslate": "Hardened Migmatite",
-  "block.tfg.rock.hardened_blackstone": "Hardened Pyroxenite",
+  "block.tfg.rock.gravel_deepslate": "Migmatite Gravel",
-  "block.tfg.rock.hardened_dripstone": "Hardened Travertine",
   "block.tfg.spike.deepslate_spike": "Migmatite Spike",
-  "block.tfg.spike.blackstone_spike": "Pyroxenite Spike",
-  "block.tfg.spike.dripstone_spike": "Travertine Spike",
   "block.tfg.loose.deepslate": "Loose Migmatite Rock",
+  "block.tfg.rock.hardened_blackstone": "Hardened Pyroxenite",
+  "block.tfg.rock.cobble_blackstone": "Pyroxenite Cobblestone",
+  "block.tfg.rock.gravel_blackstone": "Pyroxenite Gravel",
+  "block.tfg.spike.blackstone_spike": "Pyroxenite Spike",
+  "block.tfg.rock.hardened_dripstone": "Hardened Travertine",
+  "block.tfg.rock.cobble_dripstone": "Travertine Cobblestone",
+  "block.tfg.rock.gravel_dripstone": "Travertine Gravel",
+  "block.tfg.spike.dripstone_spike": "Travertine Spike",
   "block.tfg.loose.dripstone": "Loose Travertine Rock",
+  "block.tfg.rock.cobble_crackrack": "Keratophyre Cobblestone",
+  "block.tfg.rock.gravel_crackrack": "Keratophyre Gravel",
+  "block.tfg.rock.polished_crackrack": "Polished Keratophyre",
+  "block.tfg.loose.crackrack": "Loose Keratophyre Rock",
   "block.tfg.mushroom_roots": "Mushroom Roots",
   "block.tfg.mushroom_sprouts": "Mushroom Sprouts",
   "block.tfg.charred_log": "Charred Log",
   "block.tfg.rock.hardened_moon_stone": "Hardened Anorthosite",
+  "block.tfg.rock.gravel_moon": "Anorthosite Gravel",
   "block.tfg.spike.moon_stone_spike": "Anorthosite Spike",
   "block.tfg.loose.moon_stone": "Loose Anorthosite Rock",
   "block.tfg.rock.hardened_moon_deepslate": "Hardened Norite",
+  "block.tfg.rock.cobble_moon_deepslate": "Norite Cobblestone",
+  "block.tfg.rock.gravel_moon_deepslate": "Norite Gravel",
+  "block.tfg.rock.polished_moon_deepslate": "Polished Norite",
+  "block.tfg.rock.bricks_moon_deepslate": "Norite Bricks",
+  "block.tfg.rock.cracked_bricks_moon_deepslate": "Norite Cracked Bricks",
+  "block.tfg.rock.chiseled_bricks_moon_deepslate": "Norite Chiseled Bricks",
+  "block.tfg.rock.pillar_moon_deepslate": "Norite Pillar",
   "block.tfg.spike.moon_deepslate_spike": "Norite Spike",
   "block.tfg.loose.moon_deepslate": "Loose Norite Rock",
   "block.tfg.rock.hardened_mars_stone": "Hardened Argillite",
+  "block.tfg.rock.gravel_mars": "Argillite Gravel",
   "block.tfg.spike.mars_stone_spike": "Argillite Spike",
   "block.tfg.loose.mars_stone": "Loose Argillite Rock",
   "block.tfg.rock.hardened_venus_stone": "Hardened Trachyte",
+  "block.tfg.rock.gravel_venus": "Trachyte Gravel",
   "block.tfg.spike.venus_stone_spike": "Trachyte Spike",
   "block.tfg.loose.venus_stone": "Loose Trachyte Rock",
   "block.tfg.rock.hardened_mercury_stone": "Hardened Komatiite",
+  "block.tfg.rock.gravel_mercury": "Komatiite Gravel",
   "block.tfg.spike.mercury_stone_spike": "Komatiite Spike",
   "block.tfg.loose.mercury_stone": "Loose Komatiite Rock",
   "block.tfg.rock.hardened_glacio_stone": "Hardened Phonolite",
+  "block.tfg.rock.gravel_glacio": "Phonolite Gravel",
   "block.tfg.spike.glacio_stone_spike": "Phonolite Spike",
   "block.tfg.loose.glacio_stone": "Loose Phonolite Rock",
   "block.tfg.rock.hardened_permafrost": "Hardened Permafrost",
+  "block.tfg.rock.cobble_permafrost": "Permafrost Cobblestone",
   "block.tfg.spike.permafrost_spike": "Permafrost Spike",
-  "block.tfg.loose.permafrost": "Permafrost Chunk",
+  "block.tfg.loose.permafrost": "Loose Permafrost Rock",
   "block.tfg.rock.raw.stromatolite": "Raw Stromatolite",
   "block.tfg.rock.spike.stromatolite": "Stromatolite Spike",
   "block.tfg.rock.raw.geyserite": "Raw Geyserite",
   "block.tfg.rock.spike.geyserite": "Geyserite Spike",
   "block.tfg.rock.hardened_red_granite": "Hardened Red Granite",
+  "block.tfg.rock.gravel_red_granite": "Red Granite Gravel",
   "block.tfg.loose.red_granite": "Loose Red Granite Rock",
   "block.tfg.spike.red_granite_spike": "Red Granite Spike",
   "block.tfg.ash_pile": "Ash Pile",
@@ -452,6 +475,7 @@
   "item.tfg.loose.moon_stone": "Loose Anorthosite",
   "item.tfg.brick.moon_stone": "Anorthosite Brick",
   "item.tfg.loose.moon_deepslate": "Loose Norite",
+  "item.tfg.brick.moon_deepslate": "Norite Brick",
   "item.tfg.loose.mars_stone": "Loose Argillite",
   "item.tfg.brick.mars_stone": "Argillite Brick",
   "item.tfg.loose.venus_stone": "Loose Trachyte",

kubejs/assets/tfg/lang/zh_cn.json

@@ -213,28 +213,66 @@
   "block.tfg.mv_aqueous_accumulator": "§b高级蓄水器§r",
   "block.tfg.hv_aqueous_accumulator": "§6高级蓄水器 II§r",
   "block.tfg.ev_aqueous_accumulator": "§5高级蓄水器 III§r",
+  "block.tfg.iv_aqueous_accumulator": "§9精英蓄水器§r",
+  "block.tfg.luv_aqueous_accumulator": "§d精英蓄水器 II§r",
+  "block.tfg.zpm_aqueous_accumulator": "§c精英蓄水器 III§r",
+  "block.tfg.uv_aqueous_accumulator": "§3终极蓄水器§r",
   "block.tfg.electric_greenhouse": "电力温室",
   "block.tfg.lv_food_processor": "基础食物处理机",
   "block.tfg.mv_food_processor": "§b高级食物处理机§r",
   "block.tfg.hv_food_processor": "§6高级食物处理机 II§r",
   "block.tfg.ev_food_processor": "§5高级食物处理机 III§r",
+  "block.tfg.iv_food_processor": "§9精英食物处理机§r",
+  "block.tfg.luv_food_processor": "§d精英食物处理机 II§r",
+  "block.tfg.zpm_food_processor": "§c精英食物处理机 III§r",
+  "block.tfg.uv_food_processor": "§3终极食物处理机§r",
   "block.tfg.lv_food_oven": "基础电炉",
   "block.tfg.mv_food_oven": "§b高级电炉§r",
   "block.tfg.hv_food_oven": "§6高级电炉 II§r",
   "block.tfg.ev_food_oven": "§5高级电炉 III§r",
+  "block.tfg.iv_food_oven": "§9精英电烤箱§r",
+  "block.tfg.luv_food_oven": "§d精英电烤箱 II§r",
+  "block.tfg.zpm_food_oven": "§c精英电烤箱 III§r",
+  "block.tfg.uv_food_oven": "§3终极电烤箱§r",
   "block.tfg.lv_food_refrigerator": "基础冰箱",
   "block.tfg.mv_food_refrigerator": "§b高级冰箱",
   "block.tfg.hv_food_refrigerator": "§6高级冰箱 II§r",
   "block.tfg.ev_food_refrigerator": "§5高级冰箱 III§r",
+  "block.tfg.iv_food_refrigerator": "§9精英冰箱§r",
   "block.tfg.lv_gas_pressurizer": "基础气体加压器",
   "block.tfg.mv_gas_pressurizer": "§b高级气体加压器§r",
   "block.tfg.hv_gas_pressurizer": "§6高级气体加压器 II§r",
   "block.tfg.ev_gas_pressurizer": "§5高级气体加压器 III§r",
+  "block.tfg.iv_gas_pressurizer": "§9精英气体加压器§r",
+  "block.tfg.luv_gas_pressurizer": "§d精英气体加压器 II§r",
+  "block.tfg.zpm_gas_pressurizer": "§c精英气体加压器 III§r",
+  "block.tfg.uv_gas_pressurizer": "§3终极气体加压器§r",
+  "block.tfg.fluid.semiheavy_ammoniacal_water": "半重氨水",
   "block.tfg.grass.mars_dirt": "火星土壤",
+  "block.tfg.grass.mars_clay_dirt": "火星粘土质土壤",
   "block.tfg.grass.mars_farmland": "火星农田",
   "block.tfg.grass.amber_mycelium": "琥珀菌丝",
+  "block.tfg.grass.amber_clay_mycelium": "琥珀黏土菌丝",
+  "block.tfg.grass.amber_kaolin_mycelium": "琥珀高岭土菌丝",
   "block.tfg.grass.rusticus_mycelium": "红锈菌丝",
+  "block.tfg.grass.rusticus_clay_mycelium": "红锈粘土菌丝",
+  "block.tfg.grass.rusticus_kaolin_mycelium": "红锈高岭土菌丝",
   "block.tfg.grass.sangnum_mycelium": "赤血菌丝",
+  "block.tfg.grass.sangnum_clay_mycelium": "赤血黏土菌丝",
+  "block.tfg.grass.sangnum_kaolin_mycelium": "赤血高岭土菌丝",
+  "block.tfg.spice": "紫金矿床",
+  "block.tfg.saplings.crimson": "绯红菌类",
+  "block.tfg.saplings.warped": "扭曲菌类",
+  "block.tfg.saplings.alphacene": "阿尔法辛蘑菇",
+  "block.tfg.saplings.aeronos": "空果菇",
+  "block.tfg.saplings.strophar": "孑节菇",
+  "block.tfg.saplings.glacian": "融冰菇",
+  "block.tfg.groundcover.glider_feather": "滑翔羽毛",
+  "block.tfg.groundcover.wraptor_feather": "扭曲鸟羽毛",
+  "block.tfg.groundcover.aeronos_stick": "空果树枝",
+  "block.tfg.groundcover.strophar_stick": "孑节树枝",
+  "block.tfg.groundcover.glacian_stick": "融冰树枝",
+  "block.tfg.groundcover.alphacene_stick": "阿尔法辛树枝",
   "block.tfg.electromagnetic_accelerator": "电磁加速器",
   "block.tfg.superconductor_coil_large": "大型超导线圈",
   "block.tfg.superconductor_coil_small": "小型超导线圈",
@@ -269,12 +307,22 @@
   "block.tfg.rapeseed": "油菜",
   "block.tfg.rapeseed_wild": "野生油菜",
   "block.tfg.rapeseed_dead": "枯萎的油菜",
+  "block.tfg.flax": "亚麻",
+  "block.tfg.flax_wild": "野生亚麻",
+  "block.tfg.flax_dead": "枯萎的亚麻",
   "block.tfg.casings.machine_casing_iron_desh": "戴斯机械方块",
   "block.tfg.casings.machine_casing_stainless_evaporation": "不锈钢蒸发机械方块",
+  "block.tfg.casings.machine_casing_vacuum_engine_intake": "真空引擎进气机械方块",
+  "block.tfg.casings.machine_casing_mars": "坚固防尘机械方块",
   "block.tfg.casings.machine_casing_blue_solar_panel": "基础太阳能板外壳",
   "block.tfg.casings.machine_casing_green_solar_panel": "高级太阳能板外壳",
   "block.tfg.casings.machine_casing_red_solar_panel": "精英太阳能板外壳",
   "block.tfg.machine_casing_aluminium_plated_steel": "镀铝钢机械方块",
+  "block.tfg.casings.machine_casing_ultraviolet": "§d紫外§f机械外壳",
+  "block.tfg.casings.machine_casing_bioculture": "生物培养机械外壳",
+  "block.tfg.casings.machine_casing_bioculture_glass": "生物培养玻璃",
+  "block.tfg.casings.bioculture_rotor_primary": "主生物培养转子",
+  "block.tfg.casings.bioculture_rotor_secondary": "副生物培养转子",
   "block.tfg.sand.fluorapatite.blue": "蓝色氟磷灰石沙",
   "block.tfg.sandstone.raw.fluorapatite.blue": "天然蓝色氟磷灰石砂岩",
   "block.tfg.sandstone.wall.raw.fluorapatite.blue": "天然蓝色氟磷灰石砂岩墙",
@@ -344,54 +392,6 @@
   "block.tfg.large_nest_box": "大型绯红巢",
   "tfg.block_entity.large_nest_box": "大型巢箱",
   "block.tfg.large_nest_box_warped": "大型诡异巢",
-  "block.tfg.iv_aqueous_accumulator": "§9精英蓄水器§r",
-  "block.tfg.luv_aqueous_accumulator": "§d精英蓄水器 II§r",
-  "block.tfg.zpm_aqueous_accumulator": "§c精英蓄水器 III§r",
-  "block.tfg.uv_aqueous_accumulator": "§3终极蓄水器§r",
-  "block.tfg.iv_food_processor": "§9精英食物处理机§r",
-  "block.tfg.luv_food_processor": "§d精英食物处理机 II§r",
-  "block.tfg.zpm_food_processor": "§c精英食物处理机 III§r",
-  "block.tfg.uv_food_processor": "§3终极食物处理机§r",
-  "block.tfg.iv_food_oven": "§9精英电烤箱§r",
-  "block.tfg.luv_food_oven": "§d精英电烤箱 II§r",
-  "block.tfg.zpm_food_oven": "§c精英电烤箱 III§r",
-  "block.tfg.uv_food_oven": "§3终极电烤箱§r",
-  "block.tfg.iv_food_refrigerator": "§9精英冰箱§r",
-  "block.tfg.iv_gas_pressurizer": "§9精英气体加压器§r",
-  "block.tfg.luv_gas_pressurizer": "§d精英气体加压器 II§r",
-  "block.tfg.zpm_gas_pressurizer": "§c精英气体加压器 III§r",
-  "block.tfg.uv_gas_pressurizer": "§3终极气体加压器§r",
-  "block.tfg.saplings.crimson": "绯红菌类",
-  "block.tfg.saplings.warped": "扭曲菌类",
-  "block.tfg.saplings.alphacene": "阿尔法辛蘑菇",
-  "block.tfg.saplings.aeronos": "空果菇",
-  "block.tfg.saplings.strophar": "孑节菇",
-  "block.tfg.saplings.glacian": "融冰菇",
-  "block.tfg.casings.machine_casing_vacuum_engine_intake": "真空引擎进气机械方块",
-  "block.tfg.casings.machine_casing_mars": "坚固防尘机械方块",
-  "block.tfg.fluid.semiheavy_ammoniacal_water": "半重氨水",
-  "block.tfg.grass.mars_clay_dirt": "火星粘土质土壤",
-  "block.tfg.grass.amber_clay_mycelium": "琥珀黏土菌丝",
-  "block.tfg.grass.amber_kaolin_mycelium": "琥珀高岭土菌丝",
-  "block.tfg.grass.rusticus_clay_mycelium": "红锈粘土菌丝",
-  "block.tfg.grass.rusticus_kaolin_mycelium": "红锈高岭土菌丝",
-  "block.tfg.grass.sangnum_clay_mycelium": "赤血黏土菌丝",
-  "block.tfg.grass.sangnum_kaolin_mycelium": "赤血高岭土菌丝",
-  "block.tfg.spice": "紫金矿床",
-  "block.tfg.groundcover.glider_feather": "滑翔羽毛",
-  "block.tfg.groundcover.wraptor_feather": "扭曲鸟羽毛",
-  "block.tfg.groundcover.aeronos_stick": "空果树枝",
-  "block.tfg.groundcover.strophar_stick": "孑节树枝",
-  "block.tfg.groundcover.glacian_stick": "融冰树枝",
-  "block.tfg.groundcover.alphacene_stick": "阿尔法辛树枝",
-  "block.tfg.flax": "亚麻",
-  "block.tfg.flax_wild": "野生亚麻",
-  "block.tfg.flax_dead": "枯萎的亚麻",
-  "block.tfg.casings.machine_casing_ultraviolet": "§d紫外§f机械外壳",
-  "block.tfg.casings.machine_casing_bioculture": "生物培养机械外壳",
-  "block.tfg.casings.machine_casing_bioculture_glass": "生物培养玻璃",
-  "block.tfg.casings.bioculture_rotor_primary": "主生物培养转子",
-  "block.tfg.casings.bioculture_rotor_secondary": "副生物培养转子",
   "fluid.tfg.nether_slurry": "下界浆液",
   "fluid.tfg.enriched_nether_slurry": "富集下界浆液",
   "fluid.tfg.ender_slurry": "末地浆液",
@@ -687,8 +687,16 @@
   "item.tfg.wood.lumber.aeronos": "空果木材",
   "item.tfg.wood.lumber.strophar": "孑节木材",
   "item.tfg.wood.lumber.glacian": "融冰木材",
+  "item.tfg.twigs.aeronos": "空果树枝",
+  "item.tfg.twigs.strophar": "孑节树枝",
+  "item.tfg.twigs.glacian": "融冰树枝",
+  "item.tfg.twigs.alphacene": "阿尔法辛树枝",
   "item.tfg.glacian_wool": "冰川羊毛",
   "item.tfg.sniffer_wool": "嗅探兽毛",
+  "item.tfg.sniffer_egg": "嗅探兽蛋",
+  "item.tfg.wraptor_wool": "矿物丰饶羽绒",
+  "item.tfg.wraptor_egg": "扭曲鸟蛋",
+  "item.tfg.wraptor_sugar": "扭曲鸟糖",
   "item.tfg.aes_polyurethane": "生物AES增强R-聚氨酯泡沫",
   "item.tfg.mli_shielding": "多层绝缘屏蔽层",
   "item.tfg.rocket_cone_t3": "高级火箭鼻锥",
@@ -729,14 +737,6 @@
   "item.tfg.electric_extendo_grip": "电动伸缩机械手",
   "item.tfg.treated_chipboard_composite": "处理过的刨花板复合材料",
   "item.tfg.high_density_treated_fiberboard": "处理过的中密度纤维板",
-  "item.tfg.sniffer_egg": "嗅探兽蛋",
-  "item.tfg.wraptor_wool": "矿物丰饶羽绒",
-  "item.tfg.wraptor_egg": "扭曲鸟蛋",
-  "item.tfg.wraptor_sugar": "扭曲鸟糖",
-  "item.tfg.twigs.aeronos": "空果树枝",
-  "item.tfg.twigs.strophar": "孑节树枝",
-  "item.tfg.twigs.glacian": "融冰树枝",
-  "item.tfg.twigs.alphacene": "阿尔法辛树枝",
   "item.tfg.flax_seeds": "亚麻种子",
   "item.tfg.flax_product": "亚麻茎杆",
   "item.tfg.flax_line": "亚麻粗纤维",
@@ -746,6 +746,11 @@
   "item.tfg.linen_cloth": "亚麻布",
   "item.tfg.uv_led": "§d紫外§f发光二极管",
   "item.tfg.smd_uv_led": "§f贴片§d紫外§f发光二极管",
+  "item.tfg.empty_dna_syringe": "空注射器",
+  "item.tfg.filled_dna_syringe": "已充满的注射器",
+  "item.tfg.dirty_dna_syringe": "受污染的注射器",
+  "item.tfg.clean_dna_syringe": "洁净的注射器",
+  "item.tfg.stainless_steel_needle": "不锈钢针头",
   "material.tfg.latex": "乳胶",
   "material.tfg.vulcanized_latex": "硫化乳胶",
   "material.tfg.fluix": "福鲁伊克斯",
@@ -805,6 +810,8 @@
   "material.tfg.tmos": "四甲氧基硅烷",
   "material.tfg.silica_gel": "硅胶",
   "material.tfg.soaked_silica_gel": "丙酮浸渍硅胶",
+  "material.tfg.heavy_water": "重水",
+  "material.tfg.semiheavy_water": "半重水",
   "material.tfg.nuclear_residue": "核废料",
   "material.tfg.oxidized_nuclear_residue": "氧化核废料",
   "material.tfg.refined_nuclear_residue": "精炼核废料",
@@ -813,8 +820,6 @@
   "material.tfg.bright_regolith": "亮泽风化土",
   "material.tfg.cassiterite_regolith": "锡石风化土",
   "material.tfg.regolith_mush": "泥泞风化土",
-  "material.tfg.heavy_water": "重水",
-  "material.tfg.semiheavy_water": "半重水",
   "ore_vein.tfg.deep_sheldonite": "硫铂矿, 斑铜矿",
   "ore_vein.tfg.deep_garnet_amethyst": "紫水晶, 石榴石",
   "ore_vein.tfg.deep_garnet_opal": "蛋白石, 石榴石",
@@ -968,6 +973,11 @@
   "entity.tfg.sniffer.male": "嗅探兽",
   "entity.tfg.sniffer.female": "嗅探兽",
   "tfg.tooltip.attribution.sniffer": "§9§o版权归属：Minecraft",
+  "entity.tfg.wraptor.male": "扭曲鸟",
+  "entity.tfg.wraptor.female": "扭曲鸟",
+  "tfg.tooltip.attribution.wraptor": "§9§o版权归属：Species",
+  "effect.tfg.cooling": "§b降温",
+  "effect.tfg.warming": "§6保暖",
   "item.treetap.tap": "已弃用物品，请合成升级",
   "item.gtceu.zinc_ingot": "已弃用物品，请合成升级",
   "item.gtceu.brass_ingot": "已弃用物品，请合成升级",
@@ -1125,6 +1135,7 @@
   "tfg.tooltip.armor.nanomuscle_warmth": "§7温暖度：0",
   "tfg.tooltip.armor.nanomuscle_insulation": "§7隔热：+10",
   "tfg.tooltip.armor.nanomuscle_set": "§7穿戴整套装备可使你完全隔热，不受环境温度影响。",
+  "tfg.tooltip.armor.nanomuscle_legs_buff": "§7装备时提供§9速度 I§7",
   "tfg.tooltip.armor.quarktech_warmth": "§7温暖度：0",
   "tfg.tooltip.armor.quarktech_insulation": "§7隔热：+10",
   "tfg.tooltip.armor.quarktech_set": "§7穿戴整套装备可使你完全隔热，不受环境温度影响。",
@@ -1140,20 +1151,22 @@
   "tfg.tooltip.solar_panel.large_tier2": "§6月球§r上的巨型结构，在§6白天§r可产生 §64096 至 16386 EU/t§r",
   "tfg.tooltip.solar_panel.large_tier3": "§6月球§r上的巨型结构，在§6白天§r可产生 §616384 至 65536 EU/t§r",
   "tfg.tooltip.petrified_egg": "§7需要熔岩孵化",
-  "tfg.tooltip.obsolete.depreciated": "§c已弃用，无法再合成",
-  "entity.tfg.wraptor.male": "扭曲鸟",
-  "entity.tfg.wraptor.female": "扭曲鸟",
-  "tfg.tooltip.attribution.wraptor": "§9§o版权归属：Species",
   "tfg.tooltip.large_egg": "§7只能在§o巨巢§r§7中孵化",
   "tfg.tooltip.sniffer_wool": "§7采集自嗅探兽背后",
   "tfg.tooltip.wraptor_wool": "§7采集自扭曲鸟羽毛",
   "tfg.tooltip.wraptor_sugar": "§7别想太多",
-  "effect.tfg.cooling": "§b降温",
-  "effect.tfg.warming": "§6保暖",
   "tfg.tooltip.cooling_foods": "§b使你体温降低：2°C",
   "tfg.tooltip.cooling_foods_strong": "§b使你体温降低：10°C",
   "tfg.tooltip.warming_foods": "§6使你体温升高：4°C",
+  "tfg.tooltip.obsolete.depreciated": "§c已弃用，无法再合成",
+  "tfg.tooltip.dna_syringe.empty": "一支空注射器。",
+  "tfg.tooltip.dna_syringe.dirty1": "一支使用过的注射器。",
+  "tfg.tooltip.dna_syringe.dirty2": "注意不要用它刺伤任何人...",
+  "tfg.tooltip.dna_syringe.full": "DNA样本:",
+  "tfg.tooltip.dna_syringe.explain": "右键点击生物获取DNA样本。放入合成栏可清空其内容物。",
+  "tfg.tooltip.shift_hint": "[按住Shift]",
   "tfc.jei.flint_knapping": "燧石打制",
+  "tfc.jei.straw_knapping": "秸秆敲制",
   "tfc.recipe.barrel.tfg.barrel.dyeing.decorative_vase.black": "染色",
   "tfc.recipe.barrel.tfg.barrel.dyeing.decorative_vase.gray": "染色",
   "tfc.recipe.barrel.tfg.barrel.dyeing.decorative_vase.light_gray": "染色",
@@ -1267,6 +1280,5 @@
   "tfg.grapplemod.upgrades.vertical_throwing_angle": "将抓钩§l垂直投掷角度§r提升5°，最高90°",
   "tfg.grapplemod.downgrades.vertical_throwing_angle": "将抓钩§l垂直投掷角度§r降低5°，最低0°",
   "tfg.grapplemod.upgrades.angle": "将§l双钩水平投掷角度§r增加5°，最高90°\n需先安装§l副钩§r",
-  "tfg.grapplemod.downgrades.angle": "将§l双钩水平投掷角度§r减少5°，最低5°\n需先安装§l副钩§r",
+  "tfg.grapplemod.downgrades.angle": "将§l双钩水平投掷角度§r减少5°，最低5°\n需先安装§l副钩§r"
-  "tfc.jei.straw_knapping": "秸秆敲制"
 }

kubejs/assets/tfg/models/block/loose/crackrack_1.json

@@ -0,0 +1,6 @@
+{
+	"parent": "tfc:block/rock/loose_igneous_intrusive_1",
+	"textures": {
+		"texture": "beneath:block/crackrack"
+	}
+}

kubejs/assets/tfg/models/block/loose/crackrack_2.json

@@ -0,0 +1,6 @@
+{
+	"parent": "tfc:block/rock/loose_igneous_intrusive_2",
+	"textures": {
+		"texture": "beneath:block/crackrack"
+	}
+}

kubejs/assets/tfg/models/block/loose/crackrack_3.json

@@ -0,0 +1,6 @@
+{
+	"parent": "tfc:block/rock/loose_igneous_intrusive_3",
+	"textures": {
+		"texture": "beneath:block/crackrack"
+	}
+}

kubejs/assets/tfg/models/block/rock/bricks_moon_deepslate.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:block/cube_all",
+  "textures": {
+    "all": "tfg:block/rock/bricks_moon_deepslate"
+  }
+}

kubejs/assets/tfg/models/block/rock/chiseled_bricks_moon_deepslate.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:block/cube_all",
+  "textures": {
+    "all": "tfg:block/rock/chiseled_bricks_moon_deepslate"
+  }
+}

kubejs/assets/tfg/models/block/rock/cobble_blackstone.json

@@ -0,0 +1,6 @@
+{
+	"parent": "minecraft:block/cube_all",
+	"textures": {
+		"all": "minecraft:block/blackstone_top"
+	}
+}

kubejs/assets/tfg/models/block/rock/cobble_crackrack.json

@@ -0,0 +1,6 @@
+{
+	"parent": "minecraft:block/cube_all",
+	"textures": {
+		"all": "tfg:block/rock/cobble_crackrack"
+	}
+}

kubejs/assets/tfg/models/block/rock/cobble_dripstone.json

@@ -0,0 +1,6 @@
+{
+	"parent": "minecraft:block/cube_all",
+	"textures": {
+		"all": "tfg:block/rock/cobble_dripstone"
+	}
+}

kubejs/assets/tfg/models/block/rock/cobble_permafrost.json

@@ -0,0 +1,6 @@
+{
+	"parent": "minecraft:block/cube_all",
+	"textures": {
+		"all": "ad_astra:block/permafrost_top"
+	}
+}

kubejs/assets/tfg/models/block/rock/cracked_bricks_moon_deepslate.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:block/cube_all",
+  "textures": {
+    "all": "tfg:block/rock/cracked_bricks_moon_deepslate"
+  }
+}

kubejs/assets/tfg/models/block/rock/gravel_blackstone.json

@@ -0,0 +1,6 @@
+{
+	"parent": "minecraft:block/cube_all",
+	"textures": {
+		"all": "tfg:block/rock/gravel_blackstone"
+	}
+}

kubejs/assets/tfg/models/block/rock/gravel_crackrack.json

@@ -0,0 +1,6 @@
+{
+	"parent": "minecraft:block/cube_all",
+	"textures": {
+		"all": "tfg:block/rock/gravel_crackrack"
+	}
+}

kubejs/assets/tfg/models/block/rock/gravel_deepslate.json

@@ -0,0 +1,6 @@
+{
+	"parent": "minecraft:block/cube_all",
+	"textures": {
+		"all": "tfg:block/rock/gravel_deepslate"
+	}
+}

kubejs/assets/tfg/models/block/rock/gravel_dripstone.json

@@ -0,0 +1,6 @@
+{
+	"parent": "minecraft:block/cube_all",
+	"textures": {
+		"all": "tfg:block/rock/gravel_dripstone"
+	}
+}

kubejs/assets/tfg/models/block/rock/gravel_glacio.json

@@ -0,0 +1,6 @@
+{
+	"parent": "minecraft:block/cube_all",
+	"textures": {
+		"all": "tfg:block/rock/gravel_glacio"
+	}
+}

kubejs/assets/tfg/models/block/rock/gravel_mars.json

@@ -0,0 +1,6 @@
+{
+	"parent": "minecraft:block/cube_all",
+	"textures": {
+		"all": "tfg:block/rock/gravel_mars"
+	}
+}

kubejs/assets/tfg/models/block/rock/gravel_mercury.json

@@ -0,0 +1,6 @@
+{
+	"parent": "minecraft:block/cube_all",
+	"textures": {
+		"all": "tfg:block/rock/gravel_mercury"
+	}
+}

kubejs/assets/tfg/models/block/rock/gravel_moon.json

@@ -0,0 +1,6 @@
+{
+	"parent": "minecraft:block/cube_all",
+	"textures": {
+		"all": "tfg:block/rock/gravel_moon"
+	}
+}

kubejs/assets/tfg/models/block/rock/gravel_moon_deepslate.json

@@ -0,0 +1,6 @@
+{
+	"parent": "minecraft:block/cube_all",
+	"textures": {
+		"all": "tfg:block/rock/gravel_moon_deepslate"
+	}
+}

kubejs/assets/tfg/models/block/rock/gravel_permafrost.json

@@ -0,0 +1,6 @@
+{
+	"parent": "minecraft:block/cube_all",
+	"textures": {
+		"all": "tfg:block/rock/gravel_permafrost"
+	}
+}

kubejs/assets/tfg/models/block/rock/gravel_red_granite.json

@@ -0,0 +1,6 @@
+{
+	"parent": "minecraft:block/cube_all",
+	"textures": {
+		"all": "tfg:block/rock/gravel_red_granite"
+	}
+}

kubejs/assets/tfg/models/block/rock/gravel_venus.json

@@ -0,0 +1,6 @@
+{
+	"parent": "minecraft:block/cube_all",
+	"textures": {
+		"all": "tfg:block/rock/gravel_venus"
+	}
+}

kubejs/assets/tfg/models/block/rock/pillar_moon_deepslate.json

@@ -0,0 +1,7 @@
+{
+  "parent": "minecraft:block/cube_column",
+  "textures": {
+    "end": "tfg:block/rock/pillar_moon_deepslate_top",
+    "side": "tfg:block/rock/pillar_moon_deepslate"
+  }
+}

kubejs/assets/tfg/models/block/rock/pillar_moon_deepslate_horizontal.json

@@ -0,0 +1,7 @@
+{
+  "parent": "minecraft:block/cube_column_horizontal",
+  "textures": {
+    "end": "tfg:block/rock/pillar_moon_deepslate_top",
+    "side": "tfg:block/rock/pillar_moon_deepslate"
+  }
+}

kubejs/assets/tfg/models/block/rock/polished_crackrack.json

@@ -0,0 +1,6 @@
+{
+	"parent": "minecraft:block/cube_all",
+	"textures": {
+		"all": "tfg:block/rock/polished_crackrack"
+	}
+}

kubejs/assets/tfg/models/block/rock/polished_moon_deepslate.json

@@ -0,0 +1,6 @@
+{
+	"parent": "minecraft:block/cube_all",
+	"textures": {
+		"all": "tfg:block/rock/polished_moon_deepslate"
+	}
+}

kubejs/assets/tfg/models/item/clean_dna_syringe.json

@@ -0,0 +1,40 @@
+{
+	"parent": "item/generated",
+	"textures": {
+		"layer0": "tfg:item/dna_syringe_clean"
+	},
+	"display": {
+		"thirdperson_righthand": {
+			"rotation": [0, 90, 40],
+			"translation": [0, 3, 1],
+			"scale": [0.4, 0.4, 0.4]
+		},
+		"thirdperson_lefthand": {
+			"rotation": [0, 90, -40],
+			"translation": [0, 3, 1],
+			"scale": [0.4, 0.4, 0.4]
+		},
+		"firstperson_righthand": {
+			"rotation": [0, 90, -20],
+			"translation": [1.13, 3.2, 0.25],
+			"scale": [0.6, 0.6, 0.6]
+		},
+		"firstperson_lefthand": {
+			"rotation": [0, -90, 20],
+			"translation": [1.13, 3.2, 0.25],
+			"scale": [0.6, 0.6, 0.6]
+		},
+		"ground": {
+			"translation": [0, 2, 0],
+			"scale": [0.5, 0.5, 0.5]
+		},
+		"head": {
+			"rotation": [49, 4, -70],
+			"translation": [-9.75, -3.25, 1.75],
+			"scale": [0.4, 0.4, 0.4]
+		},
+		"fixed": {
+			"rotation": [0, -180, 0]
+		}
+	}
+}

kubejs/assets/tfg/models/item/dirty_dna_syringe.json

@@ -0,0 +1,40 @@
+{
+	"parent": "item/generated",
+	"textures": {
+		"layer0": "tfg:item/dna_syringe_dirty"
+	},
+	"display": {
+		"thirdperson_righthand": {
+			"rotation": [0, 90, 40],
+			"translation": [0, 3, 1],
+			"scale": [0.4, 0.4, 0.4]
+		},
+		"thirdperson_lefthand": {
+			"rotation": [0, 90, -40],
+			"translation": [0, 3, 1],
+			"scale": [0.4, 0.4, 0.4]
+		},
+		"firstperson_righthand": {
+			"rotation": [0, 90, -20],
+			"translation": [1.13, 3.2, 0.25],
+			"scale": [0.6, 0.6, 0.6]
+		},
+		"firstperson_lefthand": {
+			"rotation": [0, -90, 20],
+			"translation": [1.13, 3.2, 0.25],
+			"scale": [0.6, 0.6, 0.6]
+		},
+		"ground": {
+			"translation": [0, 2, 0],
+			"scale": [0.5, 0.5, 0.5]
+		},
+		"head": {
+			"rotation": [49, 4, -70],
+			"translation": [-9.75, -3.25, 1.75],
+			"scale": [0.4, 0.4, 0.4]
+		},
+		"fixed": {
+			"rotation": [0, -180, 0]
+		}
+	}
+}

kubejs/assets/tfg/models/item/empty_dna_syringe.json

@@ -0,0 +1,40 @@
+{
+	"parent": "item/generated",
+	"textures": {
+		"layer0": "tfg:item/dna_syringe_empty"
+	},
+	"display": {
+		"thirdperson_righthand": {
+			"rotation": [0, 90, 40],
+			"translation": [0, 3, 1],
+			"scale": [0.4, 0.4, 0.4]
+		},
+		"thirdperson_lefthand": {
+			"rotation": [0, 90, -40],
+			"translation": [0, 3, 1],
+			"scale": [0.4, 0.4, 0.4]
+		},
+		"firstperson_righthand": {
+			"rotation": [0, 90, -20],
+			"translation": [1.13, 3.2, 0.25],
+			"scale": [0.6, 0.6, 0.6]
+		},
+		"firstperson_lefthand": {
+			"rotation": [0, -90, 20],
+			"translation": [1.13, 3.2, 0.25],
+			"scale": [0.6, 0.6, 0.6]
+		},
+		"ground": {
+			"translation": [0, 2, 0],
+			"scale": [0.5, 0.5, 0.5]
+		},
+		"head": {
+			"rotation": [49, 4, -70],
+			"translation": [-9.75, -3.25, 1.75],
+			"scale": [0.4, 0.4, 0.4]
+		},
+		"fixed": {
+			"rotation": [0, -180, 0]
+		}
+	}
+}

kubejs/assets/tfg/models/item/filled_dna_syringe.json

@@ -0,0 +1,42 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "tfg:item/dna_syringe_background",
+    "layer1": "tfg:item/dna_syringe_base",
+    "layer2": "tfg:item/dna_syringe_overlay"
+  },
+	"display": {
+		"thirdperson_righthand": {
+			"rotation": [0, 90, 40],
+			"translation": [0, 3, 1],
+			"scale": [0.4, 0.4, 0.4]
+		},
+		"thirdperson_lefthand": {
+			"rotation": [0, 90, -40],
+			"translation": [0, 3, 1],
+			"scale": [0.4, 0.4, 0.4]
+		},
+		"firstperson_righthand": {
+			"rotation": [0, 90, -20],
+			"translation": [1.13, 3.2, 0.25],
+			"scale": [0.6, 0.6, 0.6]
+		},
+		"firstperson_lefthand": {
+			"rotation": [0, -90, 20],
+			"translation": [1.13, 3.2, 0.25],
+			"scale": [0.6, 0.6, 0.6]
+		},
+		"ground": {
+			"translation": [0, 2, 0],
+			"scale": [0.5, 0.5, 0.5]
+		},
+		"head": {
+			"rotation": [49, 4, -70],
+			"translation": [-9.75, -3.25, 1.75],
+			"scale": [0.4, 0.4, 0.4]
+		},
+		"fixed": {
+			"rotation": [0, -180, 0]
+		}
+	}
+}