Merge branch 'dev' into bugfix/primitive-creatures-huntmaster

kubejs/assets/gtceu/lang/en_us.json

@@ -132,7 +132,6 @@
   "material.gtceu.damascus_steel": "Swine-steel",
   "material.gtceu.air": "Earth Air",
   "material.gtceu.liquid_air": "Liquid Earth Air",
-  "material.gtceu.fish_oil": "Tallowate",
   "material.gtceu.cooperite": "Cooperite",
   "material.gtceu.armalcolite": "Armalcolite",
   "material.gtceu.desh": "Desh",
@@ -206,6 +205,7 @@
   "gtceu.jei.bedrock_fluid.heavy_ammoniacal_water": "Martian Heavy Ammoniacal Water",
   "gtceu.jei.bedrock_fluid.liquid_ice": "Martian Ice",
   "gtceu.recipe.category.ingot_molding": "Material Molding",
+  "block.gtceu.wire_coil.tooltip_cracking": "§8Cracking Unit, Coal Liquefaction Tower,§r\n§8Moon and Ostrum Harvesters:§r",
   "tagprefix.sword_head": "%s Sword Head",
   "tagprefix.pickaxe_head": "%s Pickaxe Head",
   "tagprefix.shovel_head": "%s Shovel Head",

kubejs/assets/gtceu/lang/zh_cn.json

@@ -13,8 +13,8 @@
   "block.gtceu.evaporation_tower": "蒸发塔",
   "block.gtceu.ostrum_harvester": "紫金采集器",
   "block.gtceu.moon_dust_harvester": "月壤采集器",
-  "block.gtceu.coal_liquefaction_tower": "煤炭液化塔",
   "block.tfg.ostrum_linear_accelerator": "紫金线性加速器",
+  "block.gtceu.coal_liquefaction_tower": "煤炭液化塔",
   "block.gtceu.ulv_super_tank": "基础超级缸",
   "block.gtceu.ulv_super_chest": "基础超级箱",
   "block.gtceu.ulv_hermetic_casing": "基础密封机械方块",
@@ -63,6 +63,8 @@
   "gtceu.tooltip.machine.nuclear_fuel_factory_2": "§7将原始放射性材料加工成裂变燃料§r",
   "gtceu.tooltip.machine.steam_bloomery_1": "§7用蒸汽动力升级你的锻铁炉！§r",
   "gtceu.tooltip.machine.steam_bloomery_2": "§7将含铁矿粉或锭加工成生铁方坯。\n使用焦煤或无烟煤可倍增产量。\n支持最多8组配方并行处理，相应调整蒸汽需求。§r",
+  "gtceu.tooltip.machine.coal_liquefaction_tower_1": "§7碳素奶昔制造机§r",
+  "gtceu.tooltip.machine.coal_liquefaction_tower_2": "§7从碳质固体与杂酚油中提取气体燃料§r",
   "item.gtceu.tiny_wood_dust": "小撮软木浆",
   "item.gtceu.small_wood_dust": "小堆软木浆",
   "item.gtceu.wood_dust": "软木浆",
@@ -130,14 +132,13 @@
   "material.gtceu.damascus_steel": "猪灵钢",
   "material.gtceu.air": "地球空气",
   "material.gtceu.liquid_air": "液态地球空气",
-  "material.gtceu.fish_oil": "脂酸盐",
   "material.gtceu.cooperite": "硫铂矿",
   "material.gtceu.armalcolite": "阿姆阿尔柯尔矿",
   "material.gtceu.desh": "戴斯",
   "material.gtceu.ostrum": "紫金",
   "material.gtceu.calorite": "耐热金属",
   "material.gtceu.etrium": "埃忒恩",
-  "material.gtceu.tarkianite": "塔基安石",
+  "material.gtceu.tarkianite": "塔基安矿",
   "material.gtceu.aluminium_silicate": "硅酸铝",
   "material.gtceu.rocket_alloy_t1": "R型铝钢火箭合金",
   "material.gtceu.rocket_alloy_t2": "ASM 4914 钛合金火箭合金",
@@ -204,7 +205,7 @@
   "gtceu.jei.bedrock_fluid.heavy_ammoniacal_water": "火星重氨水",
   "gtceu.jei.bedrock_fluid.liquid_ice": "火星冰",
   "gtceu.recipe.category.ingot_molding": "压模",
-  "tagprefix.sword_head": "%s剑头",
+  "tagprefix.sword_head": "%s剑身",
   "tagprefix.pickaxe_head": "%s镐头",
   "tagprefix.shovel_head": "%s铲头",
   "tagprefix.axe_head": "%s斧头",
@@ -214,13 +215,13 @@
   "tagprefix.hammer_head": "%s锤头",
   "tagprefix.saw_head": "%s锯头",
   "tagprefix.knife_head": "%s刀头",
-  "tagprefix.butchery_knife_head": "%s屠刀头",
+  "tagprefix.butchery_knife_head": "%s屠宰刀头",
   "tagprefix.mining_hammer_head": "%s采矿锤头",
   "tagprefix.spade_head": "%s锹头",
   "tagprefix.double_ingot": "%s双锭",
-  "tagprefix.poor_raw": "贫瘠%s原矿",
-  "tagprefix.rich_raw": "富集%s原矿",
-  "tagprefix.dusty_raw": "积尘%s原矿",
+  "tagprefix.poor_raw": "贫瘠粗%s",
+  "tagprefix.rich_raw": "富集粗%s",
+  "tagprefix.dusty_raw": "积尘粗%s",
   "tagprefix.gabbro": "辉长岩%s矿石",
   "tagprefix.shale": "页岩%s矿石",
   "tagprefix.claystone": "黏土岩%s矿石",

kubejs/assets/gtceu/models/block/cube_3_layer/all.json

@@ -0,0 +1,24 @@
+{
+  "parent": "gtceu:block/cube_3_layer/default",
+  "textures": {
+    "particle": "#bot_all",
+    "bot_down": "#bot_all",
+    "bot_up": "#bot_all",
+    "bot_north": "#bot_all",
+    "bot_east": "#bot_all",
+    "bot_south": "#bot_all",
+    "bot_west": "#bot_all",
+    "mid_down": "#mid_all",
+    "mid_up": "#mid_all",
+    "mid_north": "#mid_all",
+    "mid_east": "#mid_all",
+    "mid_south": "#mid_all",
+    "mid_west": "#mid_all",
+    "top_down": "#top_all",
+    "top_up": "#top_all",
+    "top_north": "#top_all",
+    "top_east": "#top_all",
+    "top_south": "#top_all",
+    "top_west": "#top_all"
+  }
+}

kubejs/assets/gtceu/models/block/cube_3_layer/all_translucent.json

@@ -0,0 +1,25 @@
+{
+  "parent": "gtceu:block/cube_3_layer/default",
+  "render_type": "translucent",
+  "textures": {
+    "particle": "#bot_all",
+    "bot_down": "#bot_all",
+    "bot_up": "#bot_all",
+    "bot_north": "#bot_all",
+    "bot_east": "#bot_all",
+    "bot_south": "#bot_all",
+    "bot_west": "#bot_all",
+    "mid_down": "#mid_all",
+    "mid_up": "#mid_all",
+    "mid_north": "#mid_all",
+    "mid_east": "#mid_all",
+    "mid_south": "#mid_all",
+    "mid_west": "#mid_all",
+    "top_down": "#top_all",
+    "top_up": "#top_all",
+    "top_north": "#top_all",
+    "top_east": "#top_all",
+    "top_south": "#top_all",
+    "top_west": "#top_all"
+  }
+}

kubejs/assets/gtceu/models/block/cube_3_layer/default.json

@@ -0,0 +1,43 @@
+{
+  "parent": "block/block",
+  "elements": [
+    {
+      "from": [  0,  0,  0 ],
+      "to":   [ 16, 16, 16 ],
+      "faces": {
+        "down":  { "texture": "#bot_down", "cullface": "down", "tintindex": 0 },
+        "up":    { "texture": "#bot_up", "cullface": "up", "tintindex": 0 },
+        "north": { "texture": "#bot_north", "cullface": "north", "tintindex": 0 },
+        "south": { "texture": "#bot_south", "cullface": "south", "tintindex": 0 },
+        "west":  { "texture": "#bot_west", "cullface": "west", "tintindex": 0 },
+        "east":  { "texture": "#bot_east", "cullface": "east", "tintindex": 0 }
+      }
+    },
+    {
+      "from": [  0,  0,  0 ],
+      "to":   [ 16, 16, 16 ],
+      "shade": false,
+      "faces": {
+        "down":  { "texture": "#mid_down", "cullface": "down", "tintindex": 1 },
+        "up":    { "texture": "#mid_up", "cullface": "up", "tintindex": 1 },
+        "north": { "texture": "#mid_north", "cullface": "north", "tintindex": 1 },
+        "south": { "texture": "#mid_south", "cullface": "south", "tintindex": 1 },
+        "west":  { "texture": "#mid_west", "cullface": "west", "tintindex": 1 },
+        "east":  { "texture": "#mid_east", "cullface": "east", "tintindex": 1 }
+      }
+    },
+    {
+      "from": [  0,  0,  0 ],
+      "to":   [ 16, 16, 16 ],
+      "shade": false,
+      "faces": {
+        "down":  { "texture": "#top_down", "cullface": "down", "tintindex": 2 },
+        "up":    { "texture": "#top_up", "cullface": "up", "tintindex": 2 },
+        "north": { "texture": "#top_north", "cullface": "north", "tintindex": 2 },
+        "south": { "texture": "#top_south", "cullface": "south", "tintindex": 2 },
+        "west":  { "texture": "#top_west", "cullface": "west", "tintindex": 2 },
+        "east":  { "texture": "#top_east", "cullface": "east", "tintindex": 2 }
+      }
+    }
+  ]
+}

kubejs/assets/gtceu/models/block/material_sets/chonky/block.json

@@ -0,0 +1,8 @@
+{
+  "parent": "gtceu:block/cube_3_layer/all",
+  "textures": {
+    "bot_all": "gtceu:block/material_sets/chonky/block",
+    "mid_all": "gtceu:block/material_sets/chonky/block_secondary",
+    "top_all": "gtceu:block/material_sets/chonky/block_overlay"
+  }
+}

kubejs/assets/gtceu/models/block/material_sets/chonky/frame_gt.json

@@ -0,0 +1,8 @@
+{
+  "parent": "gtceu:block/cube_3_layer/all_translucent",
+  "textures": {
+    "bot_all": "gtceu:block/material_sets/chonky/frame_gt",
+    "mid_all": "gtceu:block/material_sets/chonky/frame_gt_secondary",
+    "top_all": "gtceu:block/material_sets/chonky/frame_gt_overlay"
+  }
+}

kubejs/assets/gtceu/models/item/material_sets/chonky/block.json

@@ -0,0 +1,3 @@
+{
+    "parent": "gtceu:item/material_sets/chonky/block"
+}

kubejs/assets/gtceu/models/item/material_sets/chonky/bolt.json

@@ -0,0 +1,8 @@
+{
+    "parent": "item/generated",
+    "textures": {
+        "layer0": "gtceu:item/material_sets/chonky/bolt",
+        "layer1": "gtceu:item/material_sets/chonky/bolt_secondary",
+        "layer2": "gtceu:item/material_sets/chonky/bolt_overlay"
+    }
+}

kubejs/assets/gtceu/models/item/material_sets/chonky/foil.json

@@ -0,0 +1,8 @@
+{
+    "parent": "item/generated",
+    "textures": {
+        "layer0": "gtceu:item/material_sets/chonky/foil",
+        "layer1": "gtceu:item/material_sets/chonky/foil_secondary",
+        "layer2": "gtceu:item/material_sets/chonky/foil_overlay"
+    }
+}

kubejs/assets/gtceu/models/item/material_sets/chonky/frame_gt.json

@@ -0,0 +1,3 @@
+{
+    "parent": "gtceu:item/material_sets/chonky/frame_gt"
+}

kubejs/assets/gtceu/models/item/material_sets/chonky/gear.json

@@ -0,0 +1,8 @@
+{
+    "parent": "item/generated",
+    "textures": {
+        "layer0": "gtceu:item/material_sets/chonky/gear",
+        "layer1": "gtceu:item/material_sets/chonky/gear_secondary",
+        "layer2": "gtceu:item/material_sets/chonky/gear_overlay"
+    }
+}

kubejs/assets/gtceu/models/item/material_sets/chonky/gear_small.json

@@ -0,0 +1,8 @@
+{
+    "parent": "item/generated",
+    "textures": {
+        "layer0": "gtceu:item/material_sets/chonky/gear_small",
+        "layer1": "gtceu:item/material_sets/chonky/gear_small_secondary",
+        "layer2": "gtceu:item/material_sets/chonky/gear_small_overlay"
+    }
+}

kubejs/assets/gtceu/models/item/material_sets/chonky/ingot.json

@@ -0,0 +1,8 @@
+{
+    "parent": "item/generated",
+    "textures": {
+        "layer0": "gtceu:item/material_sets/chonky/ingot",
+        "layer1": "gtceu:item/material_sets/chonky/ingot_secondary",
+        "layer2": "gtceu:item/material_sets/chonky/ingot_overlay"
+    }
+}

kubejs/assets/gtceu/models/item/material_sets/chonky/ingot_double.json

@@ -0,0 +1,8 @@
+{
+    "parent": "item/generated",
+    "textures": {
+        "layer0": "gtceu:item/material_sets/chonky/ingot_double",
+        "layer1": "gtceu:item/material_sets/chonky/ingot_double_secondary",
+        "layer2": "gtceu:item/material_sets/chonky/ingot_double_overlay"
+    }
+}

kubejs/assets/gtceu/models/item/material_sets/chonky/ingot_hot.json

@@ -0,0 +1,9 @@
+{
+    "parent": "gtceu:item/material_sets/chonky/ingot",
+    "textures": {
+        "layer0":"gtceu:item/material_sets/chonky/ingot",
+        "layer1":"gtceu:item/material_sets/chonky/ingot_secondary",
+        "layer2":"gtceu:item/material_sets/chonky/ingot_overlay",
+        "layer3":"gtceu:item/material_sets/chonky/ingot_hot_overlay"
+    }
+}

kubejs/assets/gtceu/models/item/material_sets/chonky/nugget.json

@@ -0,0 +1,8 @@
+{
+    "parent": "item/generated",
+    "textures": {
+        "layer0": "gtceu:item/material_sets/chonky/nugget",
+        "layer1": "gtceu:item/material_sets/chonky/nugget_secondary",
+        "layer2": "gtceu:item/material_sets/chonky/nugget_overlay"
+    }
+}

kubejs/assets/gtceu/models/item/material_sets/chonky/plate.json

@@ -0,0 +1,8 @@
+{
+    "parent": "item/generated",
+    "textures": {
+        "layer0": "gtceu:item/material_sets/chonky/plate",
+        "layer1": "gtceu:item/material_sets/chonky/plate_secondary",
+        "layer2": "gtceu:item/material_sets/chonky/plate_overlay"
+    }
+}

kubejs/assets/gtceu/models/item/material_sets/chonky/plate_dense.json

@@ -0,0 +1,8 @@
+{
+    "parent": "item/generated",
+    "textures": {
+        "layer0": "gtceu:item/material_sets/chonky/plate_dense",
+        "layer1": "gtceu:item/material_sets/chonky/plate_dense_secondary",
+        "layer2": "gtceu:item/material_sets/chonky/plate_dense_overlay"
+    }
+}

kubejs/assets/gtceu/models/item/material_sets/chonky/plate_double.json

@@ -0,0 +1,8 @@
+{
+    "parent": "item/generated",
+    "textures": {
+        "layer0": "gtceu:item/material_sets/chonky/plate_double",
+        "layer1": "gtceu:item/material_sets/chonky/plate_double_secondary",
+        "layer2": "gtceu:item/material_sets/chonky/plate_double_overlay"
+    }
+}

kubejs/assets/gtceu/models/item/material_sets/chonky/ring.json

@@ -0,0 +1,8 @@
+{
+    "parent": "item/generated",
+    "textures": {
+        "layer0": "gtceu:item/material_sets/chonky/ring",
+        "layer1": "gtceu:item/material_sets/chonky/ring_secondary",
+        "layer2": "gtceu:item/material_sets/chonky/ring_overlay"
+    }
+}

kubejs/assets/gtceu/models/item/material_sets/chonky/rod.json

@@ -0,0 +1,8 @@
+{
+    "parent": "item/generated",
+    "textures": {
+        "layer0": "gtceu:item/material_sets/chonky/rod",
+        "layer1": "gtceu:item/material_sets/chonky/rod_secondary",
+        "layer2": "gtceu:item/material_sets/chonky/rod_overlay"
+    }
+}

kubejs/assets/gtceu/models/item/material_sets/chonky/rod_long.json

@@ -0,0 +1,8 @@
+{
+    "parent": "item/generated",
+    "textures": {
+        "layer0": "gtceu:item/material_sets/chonky/rod_long",
+        "layer1": "gtceu:item/material_sets/chonky/rod_long_secondary",
+        "layer2": "gtceu:item/material_sets/chonky/rod_long_overlay"
+    }
+}

kubejs/assets/gtceu/models/item/material_sets/chonky/rotor.json

@@ -0,0 +1,8 @@
+{
+    "parent": "item/generated",
+    "textures": {
+        "layer0": "gtceu:item/material_sets/chonky/rotor",
+        "layer1": "gtceu:item/material_sets/chonky/rotor_secondary",
+        "layer2": "gtceu:item/material_sets/chonky/rotor_overlay"
+    }
+}

kubejs/assets/gtceu/models/item/material_sets/chonky/round.json

@@ -0,0 +1,8 @@
+{
+    "parent": "item/generated",
+    "textures": {
+        "layer0": "gtceu:item/material_sets/chonky/round",
+        "layer1": "gtceu:item/material_sets/chonky/round_secondary",
+        "layer2": "gtceu:item/material_sets/chonky/round_overlay"
+    }
+}

kubejs/assets/gtceu/models/item/material_sets/chonky/screw.json

@@ -0,0 +1,8 @@
+{
+    "parent": "item/generated",
+    "textures": {
+        "layer0": "gtceu:item/material_sets/chonky/screw",
+        "layer1": "gtceu:item/material_sets/chonky/screw_secondary",
+        "layer2": "gtceu:item/material_sets/chonky/screw_overlay"
+    }
+}

kubejs/assets/gtceu/models/item/material_sets/chonky/spring.json

@@ -0,0 +1,8 @@
+{
+    "parent": "item/generated",
+    "textures": {
+        "layer0": "gtceu:item/material_sets/chonky/spring",
+        "layer1": "gtceu:item/material_sets/chonky/spring_secondary",
+        "layer2": "gtceu:item/material_sets/chonky/spring_overlay"
+    }
+}

kubejs/assets/gtceu/models/item/material_sets/chonky/spring_small.json

@@ -0,0 +1,8 @@
+{
+    "parent": "item/generated",
+    "textures": {
+        "layer0": "gtceu:item/material_sets/chonky/spring_small",
+        "layer1": "gtceu:item/material_sets/chonky/spring_small_secondary",
+        "layer2": "gtceu:item/material_sets/chonky/spring_small_overlay"
+    }
+}

kubejs/assets/gtceu/models/item/material_sets/chonky/tool_head_buzz_saw.json

@@ -0,0 +1,8 @@
+{
+    "parent": "item/generated",
+    "textures": {
+        "layer0": "gtceu:item/material_sets/chonky/tool_head_buzz_saw",
+        "layer1": "gtceu:item/material_sets/chonky/tool_head_buzz_saw_secondary",
+        "layer2": "gtceu:item/material_sets/chonky/tool_head_buzz_saw_overlay"
+    }
+}

kubejs/assets/gtceu/models/item/material_sets/chonky/tool_head_chainsaw.json

@@ -0,0 +1,8 @@
+{
+    "parent": "item/generated",
+    "textures": {
+        "layer0": "gtceu:item/material_sets/chonky/tool_head_chainsaw",
+        "layer1": "gtceu:item/material_sets/chonky/tool_head_chainsaw_secondary",
+        "layer2": "gtceu:item/material_sets/chonky/tool_head_chainsaw_overlay"
+    }
+}

kubejs/assets/gtceu/models/item/material_sets/chonky/tool_head_drill.json

@@ -0,0 +1,8 @@
+{
+    "parent": "item/generated",
+    "textures": {
+        "layer0": "gtceu:item/material_sets/chonky/tool_head_drill",
+        "layer1": "gtceu:item/material_sets/chonky/tool_head_drill_secondary",
+        "layer2": "gtceu:item/material_sets/chonky/tool_head_drill_overlay"
+    }
+}

kubejs/assets/gtceu/models/item/material_sets/chonky/tool_head_screwdriver.json

@@ -0,0 +1,8 @@
+{
+    "parent": "item/generated",
+    "textures": {
+        "layer0": "gtceu:item/material_sets/chonky/tool_head_screwdriver",
+        "layer1": "gtceu:item/material_sets/chonky/tool_head_screwdriver_secondary",
+        "layer2": "gtceu:item/material_sets/chonky/tool_head_screwdriver_overlay"
+    }
+}

kubejs/assets/gtceu/models/item/material_sets/chonky/tool_head_wrench.json

@@ -0,0 +1,8 @@
+{
+    "parent": "item/generated",
+    "textures": {
+        "layer0": "gtceu:item/material_sets/chonky/tool_head_wrench",
+        "layer1": "gtceu:item/material_sets/chonky/tool_head_wrench_secondary",
+        "layer2": "gtceu:item/material_sets/chonky/tool_head_wrench_overlay"
+    }
+}

kubejs/assets/gtceu/models/item/material_sets/chonky/turbine_blade.json

@@ -0,0 +1,8 @@
+{
+    "parent": "item/generated",
+    "textures": {
+        "layer0": "gtceu:item/material_sets/chonky/turbine_blade",
+        "layer1": "gtceu:item/material_sets/chonky/turbine_blade_secondary",
+        "layer2": "gtceu:item/material_sets/chonky/turbine_blade_overlay"
+    }
+}

kubejs/assets/gtceu/models/item/material_sets/chonky/wire_fine.json

@@ -0,0 +1,8 @@
+{
+    "parent": "item/generated",
+    "textures": {
+        "layer0": "gtceu:item/material_sets/chonky/wire_fine",
+        "layer1": "gtceu:item/material_sets/chonky/wire_fine_secondary",
+        "layer2": "gtceu:item/material_sets/chonky/wire_fine_overlay"
+    }
+}