Skip to content

Commit ecd4116

Browse files
authored
Merge branch 'dev' into feature/ochemForFission
2 parents b8f7e4a + 0e80687 commit ecd4116

File tree

31 files changed

+1434
-804
lines changed

31 files changed

+1434
-804
lines changed

kubejs/assets/ad_astra/lang/ja_jp.json

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@
2424
"block.ad_astra.moon_deepslate": "ノーライト",
2525
"block.ad_astra.cheese_block": "ムーンチーズブロック",
2626
"block.ad_astra.moon_cheese_ore": "チーズ鉱石(斜長岩)",
27-
"block.ad_astra.glacian_log": "Glacian Stem",
28-
"block.ad_astra.stripped_glacian_log": "Stripped Glacian Stem",
29-
"block.ad_astra.glacian_leaves": "Glacian Lamella",
27+
"block.ad_astra.glacian_log": "グラシアンの幹",
28+
"block.ad_astra.stripped_glacian_log": "表皮を剥いだグラシアンの幹",
29+
"block.ad_astra.glacian_leaves": "グラシアンのひだ",
3030
"block.ad_astra.mars_sand": "粘土質岩の砂",
3131
"block.ad_astra.mars_stone": "粘土質岩",
3232
"block.ad_astra.mars_cobblestone": "粘土質岩の丸石",
@@ -111,16 +111,16 @@
111111
"block.ad_astra.glacio_globe": "Europa Globe",
112112
"entity.ad_astra.corrupted_lunarian": "月面ゾンビ",
113113
"entity.ad_astra.martian_raptor": "スケルタルラプター",
114-
"entity.ad_astra.tier_1_rocket": "R-Aluminosteel Rocket",
115-
"entity.ad_astra.tier_2_rocket": "ASM 4914 Titanium Rocket",
116-
"entity.ad_astra.tier_3_rocket": "45-Ti Tungstensteel Rocket",
114+
"entity.ad_astra.tier_1_rocket": "R-AS製ロケット",
115+
"entity.ad_astra.tier_2_rocket": "ASM 4914 チタニウム製ロケット",
116+
"entity.ad_astra.tier_3_rocket": "45-Ti タングステンスチール製ロケット",
117117
"entity.ad_astra.tier_1_rover": "探査車",
118118
"fluid_type.ad_astra.oxygen": "人工空気",
119119
"item.ad_astra.steel_cable": "基本型RFケーブル",
120120
"item.ad_astra.desh_cable": "発展型RFケーブル",
121-
"item.ad_astra.tier_1_rocket": "R-Aluminosteel Rocket",
122-
"item.ad_astra.tier_2_rocket": "ASM 4914 Titanium Rocket",
123-
"item.ad_astra.tier_3_rocket": "45-Ti Tungstensteel Rocket",
121+
"item.ad_astra.tier_1_rocket": "R-AS製ロケット",
122+
"item.ad_astra.tier_2_rocket": "ASM 4914 チタニウム製ロケット",
123+
"item.ad_astra.tier_3_rocket": "45-Ti タングステンスチール製ロケット",
124124
"item.ad_astra.oxygen_bucket": "人工空気入りバケツ",
125125
"item.ad_astra.tier_1_rover": "探査車",
126126
"item.ad_astra.photovoltaic_etrium_cell": "発展型太陽電池",
@@ -134,10 +134,10 @@
134134
"item.ad_astra.netherite_space_pants": "§bタングステンスチールの宇宙ズボン",
135135
"item.ad_astra.netherite_space_boots": "§bタングステンスチールの宇宙ブーツ",
136136
"item.ad_astra.cheese": "ムーンチーズ",
137-
"dimension.ad_astra.glacio": "Europa",
137+
"dimension.ad_astra.glacio": "エウロパ",
138138
"dimension.ad_astra.glacio_orbit": "Europa Orbit",
139-
"painting.ad_astra.glacio.title": "Europa",
140-
"planet.ad_astra.glacio": "Europa",
139+
"painting.ad_astra.glacio.title": "エウロパ",
140+
"planet.ad_astra.glacio": "エウロパ",
141141
"planet.ad_astra.glacio_orbit": "Europa Orbit",
142142
"tagprefix.moon_stone": "%s鉱石(斜長岩)",
143143
"tagprefix.moon_deepslate": "%s鉱石(ノーライト)",

kubejs/assets/ad_astra/lang/uk_ua.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@
4646
"block.ad_astra.polished_mars_stone": "Оброблений аргіліт",
4747
"block.ad_astra.polished_mars_stone_slab": "Оброблена аргілітова плита",
4848
"block.ad_astra.polished_mars_stone_stairs": "Оброблені аргілітові сходи",
49-
"block.ad_astra.conglomerate": "Марсіанський конгломерат",
50-
"block.ad_astra.polished_conglomerate": "Оброблений марсіанський конгломерат",
49+
"block.ad_astra.conglomerate": "Мезовий покрив",
50+
"block.ad_astra.polished_conglomerate": "Полірований мезовий покрив",
5151
"block.ad_astra.venus_sand": "Трахітовий пісок",
5252
"block.ad_astra.venus_stone": "Необроблений Трахіт",
5353
"block.ad_astra.venus_cobblestone": "Трахітовий кругляк",

kubejs/assets/ad_astra/lang/zh_cn.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@
4646
"block.ad_astra.polished_mars_stone": "磨制泥岩",
4747
"block.ad_astra.polished_mars_stone_slab": "磨制泥岩台阶",
4848
"block.ad_astra.polished_mars_stone_stairs": "磨制泥岩楼梯",
49-
"block.ad_astra.conglomerate": "火星砾岩",
50-
"block.ad_astra.polished_conglomerate": "磨制火星砾岩",
49+
"block.ad_astra.conglomerate": "高原盖岩",
50+
"block.ad_astra.polished_conglomerate": "磨制高原盖岩",
5151
"block.ad_astra.venus_sand": "粗面岩沙",
5252
"block.ad_astra.venus_stone": "天然粗面岩",
5353
"block.ad_astra.venus_cobblestone": "粗面岩圆石",
Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
{
2+
"__COMMENT__": "This file was auto generated by the LanguageMerger, read the file \".README IF TRANSLATING\" found in \"minecraft/kubejs\" for more information.",
3+
"block.beneath.blackstone_pebble": "輝岩の小石",
4+
"block.beneath.blackstone_aqueduct": "輝岩の用水路",
5+
"block.beneath.loose_blackstone": "輝岩の小石",
6+
"block.beneath.ore.nether_cursecoal": "無煙炭鉱石",
7+
"block.beneath.ore.nether_cursecoal.prospected": "無煙炭",
8+
"block.beneath.cursecoal_pile": "無煙炭の欠片",
9+
"block.beneath.ore.blackstone_sylvite": "カリ岩塩鉱石",
10+
"block.beneath.crackrack": "角斑岩",
11+
"block.beneath.soul_clay": "粘土質の泥",
12+
"block.beneath.wood.log.crimson": "深紅の幹",
13+
"block.beneath.wood.stripped_log.crimson": "表皮を剥いだ深紅の幹",
14+
"block.beneath.wood.wood.crimson": "深紅の菌糸",
15+
"block.beneath.wood.stripped_wood.crimson": "表皮を剥いだ深紅の幹",
16+
"block.beneath.wood.fallen_leaves.crimson": "深紅のひだ",
17+
"block.beneath.wood.leaves.crimson": "深紅のひだ",
18+
"block.beneath.wood.log.warped": "歪んだ幹",
19+
"block.beneath.wood.stripped_log.warped": "表皮を剥いだ歪んだ幹",
20+
"block.beneath.wood.wood.warped": "歪んだ菌糸",
21+
"block.beneath.wood.stripped_wood.warped": "表皮を剥いだ歪んだ菌糸",
22+
"block.beneath.wood.fallen_leaves.warped": "歪んだひだ",
23+
"block.beneath.wood.leaves.warped": "歪んだひだ",
24+
"block.beneath.ancient_altar": "輝岩の台座",
25+
"item.beneath.cursed_hide": "耐火毛皮",
26+
"item.beneath.blackstone_brick": "輝岩のレンガ",
27+
"item.beneath.cursecoal": "無煙炭",
28+
"item.beneath.crackrack_rock": "角斑岩",
29+
"item.beneath.loose_blackstone": "輝岩の小石"
30+
}
Lines changed: 102 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,102 @@
1+
{
2+
"__COMMENT__": "This file was auto generated by the LanguageMerger, read the file \".README IF TRANSLATING\" found in \"minecraft/kubejs\" for more information.",
3+
"block.betterend.aeridium": "Aeridium",
4+
"block.betterend.amaranita_stem": "Amaranita Stem",
5+
"block.betterend.amber_grass": "Amber Grass",
6+
"block.betterend.amber_root_wild": "Wild Amber Shoots",
7+
"block.betterend.amber_root_dead": "Dead Amber Shoots",
8+
"block.betterend.amber_root": "Amber Shoots",
9+
"block.betterend.aurant_polypore": "Aurant Polypore",
10+
"block.betterend.blooming_cooksonia": "Blooming Cooksonia",
11+
"block.betterend.blossom_berry": "Blossom Berry",
12+
"block.betterend.blossom_berry_wild": "Wild Blossom Berry",
13+
"block.betterend.blossom_berry_dead": "Dead Blossom Berry",
14+
"block.betterend.bolux_mushroom": "Bolux Mushroom Colony",
15+
"block.betterend.bolux_mushroom_wild": "Wild Bolux Mushroom Colony",
16+
"block.betterend.bolux_mushroom_dead": "Dead Bolux Mushroom Colony",
17+
"block.betterend.bushy_grass": "Novagrass",
18+
"block.betterend.bulb_moss": "Bulb Moss",
19+
"block.betterend.cave_bush": "Carmine Lamella",
20+
"block.betterend.cave_bush_fallen": "Small Carmine Lamella",
21+
"block.betterend.cave_grass": "Vermilligma",
22+
"block.betterend.cave_pumpkin": "ヒカリカボチャ",
23+
"block.betterend.cave_pumpkin_wild": "野生のヒカリカボチャの茎",
24+
"block.betterend.cave_pumpkin_dead": "枯れたヒカリカボチャの茎",
25+
"block.betterend.cave_pumpkin_plant": "ヒカリカボチャの茎",
26+
"block.betterend.charnia_cyan": "Cyan Charnia",
27+
"block.betterend.charnia_green": "Green Charnia",
28+
"block.betterend.charnia_light_blue": "Teal Charnia",
29+
"block.betterend.charnia_orange": "Orange Charnia",
30+
"block.betterend.charnia_purple": "Purple Charnia",
31+
"block.betterend.charnia_red": "Red Charnia",
32+
"block.betterend.chorus_grass": "Chorus Grass",
33+
"block.betterend.chorus_lily": "Chorus Lily",
34+
"block.betterend.chorus_mushroom": "Chalmie Mushroom Colony",
35+
"block.betterend.chorus_mushroom_wild": "Wild Chalmie Mushroom Colony",
36+
"block.betterend.chorus_mushroom_dead": "Dead Chalmie Mushroom Colony",
37+
"block.betterend.clawfern": "Clawfern",
38+
"block.betterend.crystal_grass": "Crystal Grass",
39+
"block.betterend.end_lily": "Deimos Lily",
40+
"block.betterend.end_lily_seed": "Deimos Lily Sprout",
41+
"block.betterend.end_lotus_flower": "Phobos Lotus Flower",
42+
"block.betterend.end_lotus_leaf": "Phobos Lotus Leaf",
43+
"block.betterend.end_lotus_stem": "Phobos Lotus Stem",
44+
"block.betterend.end_lotus_seed": "Phobos Lotus Sprout",
45+
"block.betterend.filalux_wings": "Filalux Wings",
46+
"block.betterend.flamaea": "Flamaea Mushroom",
47+
"block.betterend.flammalix": "Flammalix Mushroom",
48+
"block.betterend.fracturn": "Fracturn",
49+
"block.betterend.glacian_hymenophore": "Glacian Hymenophore",
50+
"block.betterend.globulagus": "Globulagus",
51+
"block.betterend.hydralux": "Hydralux",
52+
"block.betterend.hydralux_sapling": "Hydralux Sprout",
53+
"block.betterend.inflexia": "Inflexia",
54+
"block.betterend.lacugrove": "Lacugrove Algae",
55+
"block.betterend.lamellarium": "Lamellarium",
56+
"block.betterend.lanceleaf": "Lanceleaf",
57+
"block.betterend.lanceleaf_small": "Lanceleaf Dagger",
58+
"block.betterend.large_amaranita_mushroom": "Large Amaranita Mushroom",
59+
"block.betterend.lucernia_leaves": "Lucernia Lamella",
60+
"block.betterend.lucernia_leaves_fallen": "Small Lucernia Lamella",
61+
"block.betterend.lucernia_outer_leaves": "Lucernia Hyphae",
62+
"block.betterend.lutebus": "Lutebus",
63+
"block.betterend.magnula": "Magnula",
64+
"block.betterend.nightshade_moss": "Nox Moss",
65+
"block.betterend.orango": "Orango",
66+
"block.betterend.pond_anemone": "Anemone",
67+
"block.betterend.purple_polypore": "Purple Polypore",
68+
"block.betterend.rubinea": "Rubinea",
69+
"block.betterend.ruscus": "Ruscus Grass",
70+
"block.betterend.salteago": "Salteago",
71+
"block.betterend.selagine": "Selagine",
72+
"block.betterend.shadow_berry": "Nox Berries",
73+
"block.betterend.shadow_berry_wild": "Wild Nox Berries",
74+
"block.betterend.shadow_berry_dead": "Dead Nox Berries",
75+
"block.betterend.small_amaranita_mushroom": "Small Amaranita Mushroom",
76+
"block.betterend.twisted_moss": "Twisted Moss",
77+
"block.betterend.twisted_umbrella_moss": "Twisted Umbrella Moss",
78+
"block.betterend.twisted_umbrella_moss_tall": "Twisted Umbrella Moss",
79+
"block.betterend.twisted_vine": "Twisted Vine",
80+
"block.betterend.umbrella_moss": "Umbrella Moss",
81+
"block.betterend.umbrella_moss_tall": "Umbrella Moss",
82+
"block.betterend.vaiolush_fern": "Vaiolush Fern",
83+
"item.betterend.amber_root_product": "Amber Shoots",
84+
"item.betterend.amber_root_seeds": "Amber Shoots Seeds",
85+
"item.betterend.blossom_berry_product": "Blossom Berry",
86+
"item.betterend.blossom_berry_seeds": "Blossom Berry Seeds",
87+
"item.betterend.bolux_mushroom_cooked": "Cooked Bolux Mushroom",
88+
"item.betterend.bolux_mushroom_product": "Bolux Mushroom",
89+
"item.betterend.bolux_mushroom_seeds": "Bolux Mushroom Spores",
90+
"item.betterend.cave_pumpkin_chunks": "ヒカリカボチャのぶつ切り",
91+
"item.betterend.cave_pumpkin_product": "ヒカリカボチャ",
92+
"item.betterend.cave_pumpkin_plant_seeds": "ヒカリカボチャの種",
93+
"item.betterend.cave_pumpkin_pie_dough": "ヒカリカボチャパイ生地",
94+
"item.betterend.cave_pumpkin_pie_raw": "皿に入れたヒカリカボチャパイ生地",
95+
"item.betterend.cave_pumpkin_pie": "ヒカリカボチャパイ",
96+
"item.betterend.chorus_mushroom_cooked": "Cooked Chalmie Mushroom",
97+
"item.betterend.chorus_mushroom_product": "Chalmie Mushroom",
98+
"item.betterend.chorus_mushroom_seeds": "Chalmie Mushroom Spores",
99+
"item.betterend.shadow_berry_cooked": "Cooked Nox Berry",
100+
"item.betterend.shadow_berry_product": "Nox Berry",
101+
"item.betterend.shadow_berry_seeds": "Nox Berry Seeds"
102+
}

kubejs/assets/betterend/lang/uk_ua.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,10 +73,10 @@
7373
"block.betterend.shadow_berry_wild": "Дикі ягоди Нокс",
7474
"block.betterend.shadow_berry_dead": "Мертві ягоди Нокс",
7575
"block.betterend.small_amaranita_mushroom": "Малий гриб Амаранита",
76-
"block.betterend.twisted_moss": "Викривлений мох",
77-
"block.betterend.twisted_umbrella_moss": "Викривлений парасольковий мох",
78-
"block.betterend.twisted_umbrella_moss_tall": "Викривлений парасольковий мох",
79-
"block.betterend.twisted_vine": "Викривлена лоза",
76+
"block.betterend.twisted_moss": "Химерний мох",
77+
"block.betterend.twisted_umbrella_moss": "Химерний парасольковий мох",
78+
"block.betterend.twisted_umbrella_moss_tall": "Химерний парасольковий мох",
79+
"block.betterend.twisted_vine": "Химерна лоза",
8080
"block.betterend.umbrella_moss": "Парасолькоподібний мох",
8181
"block.betterend.umbrella_moss_tall": "Парасолькоподібний мох",
8282
"block.betterend.vaiolush_fern": "Папороть Вайолаш",
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"__COMMENT__": "This file was auto generated by the LanguageMerger, read the file \".README IF TRANSLATING\" found in \"minecraft/kubejs\" for more information.",
3+
"item.constructionwand.stone_wand": "銅のワンド",
4+
"item.constructionwand.iron_wand": "錬鉄のワンド",
5+
"item.constructionwand.diamond_wand": "青鋼のワンド",
6+
"item.constructionwand.infinity_wand": "高性能チタニウムワンド"
7+
}
Lines changed: 73 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,73 @@
1+
{
2+
"__COMMENT__": "This file was auto generated by the LanguageMerger, read the file \".README IF TRANSLATING\" found in \"minecraft/kubejs\" for more information.",
3+
"block.createdeco.andesite_bars": "Tin Alloy Bars",
4+
"block.createdeco.andesite_bars_overlay": "Tin Alloy Bars Overlay",
5+
"block.createdeco.andesite_window": "Tin Alloy Window",
6+
"block.createdeco.andesite_window_pane": "Tin Alloy Window Pane",
7+
"block.createdeco.andesite_mesh_fence": "Tin Alloy Mesh Fence",
8+
"block.createdeco.andesite_catwalk": "Tin Alloy Catwalk",
9+
"block.createdeco.andesite_catwalk_stairs": "Tin Alloy Catwalk Stairs",
10+
"block.createdeco.andesite_catwalk_railing": "Tin Alloy Catwalk Railing",
11+
"block.createdeco.andesite_support_wedge": "Tin Alloy Support Wedge",
12+
"block.createdeco.andesite_hull": "Tin Alloy Train Hull",
13+
"block.createdeco.andesite_support": "Tin Alloy Support",
14+
"block.createdeco.yellow_andesite_lamp": "Yellow Tin Alloy Cage Lamp",
15+
"block.createdeco.red_andesite_lamp": "Red Tin Alloy Cage Lamp",
16+
"block.createdeco.blue_andesite_lamp": "Blue Tin Alloy Cage Lamp",
17+
"block.createdeco.green_andesite_lamp": "Green Tin Alloy Cage Lamp",
18+
"block.createdeco.andesite_sheet_metal": "Tin Alloy Sheet Metal",
19+
"block.createdeco.andesite_door": "Tin Alloy Door",
20+
"block.createdeco.locked_andesite_door": "Locked Tin Alloy Door",
21+
"block.createdeco.andesite_trapdoor": "Tin Alloy Trapdoor",
22+
"block.createdeco.andesite_facade": "Tin Alloy Facade",
23+
"block.createdeco.iron_bars": "Wrought Iron Bars",
24+
"block.createdeco.iron_bars_overlay": "Wrought Iron Bars Overlay",
25+
"block.createdeco.iron_window": "Wrought Iron Window",
26+
"block.createdeco.iron_window_pane": "Wrought Iron Window Pane",
27+
"block.createdeco.iron_mesh_fence": "Wrought Iron Mesh Fence",
28+
"block.createdeco.iron_catwalk": "Wrought Iron Catwalk",
29+
"block.createdeco.iron_catwalk_stairs": "Wrought Iron Catwalk Stairs",
30+
"block.createdeco.iron_catwalk_railing": "Wrought Iron Catwalk Railing",
31+
"block.createdeco.iron_support_wedge": "Wrought Iron Support Wedge",
32+
"block.createdeco.iron_hull": "Wrought Iron Train Hull",
33+
"block.createdeco.iron_support": "Wrought Iron Support",
34+
"block.createdeco.yellow_iron_lamp": "Yellow Wrought Iron Cage Lamp",
35+
"block.createdeco.red_iron_lamp": "Red Wrought Iron Cage Lamp",
36+
"block.createdeco.blue_iron_lamp": "Blue Wrought Iron Cage Lamp",
37+
"block.createdeco.green_iron_lamp": "Green Wrought Iron Cage Lamp",
38+
"block.createdeco.iron_sheet_metal": "Wrought Iron Sheet Metal",
39+
"block.createdeco.iron_door": "Wrought Iron Door",
40+
"block.createdeco.locked_iron_door": "Locked Wrought Iron Door",
41+
"block.createdeco.iron_trapdoor": "Wrought Iron Trapdoor",
42+
"block.createdeco.iron_facade": "Wrought Iron Facade",
43+
"block.createdeco.iron_coinstack": "Wrought Iron Coinstack",
44+
"block.createdeco.netherite_coinstack": "Blue Steel Coinstack",
45+
"block.createdeco.industrial_iron_coinstack": "Steel Coinstack",
46+
"block.createdeco.industrial_iron_bars": "Steel Bars",
47+
"block.createdeco.industrial_iron_bars_overlay": "Steel Bars Overlay",
48+
"block.createdeco.industrial_iron_window": "Steel Window",
49+
"block.createdeco.industrial_iron_window_pane": "Steel Window Pane",
50+
"block.createdeco.industrial_iron_mesh_fence": "Steel Mesh Fence",
51+
"block.createdeco.industrial_iron_catwalk": "Steel Catwalk",
52+
"block.createdeco.industrial_iron_catwalk_stairs": "Steel Catwalk Stairs",
53+
"block.createdeco.industrial_iron_catwalk_railing": "Steel Catwalk Railing",
54+
"block.createdeco.industrial_iron_support_wedge": "Steel Support Wedge",
55+
"block.createdeco.industrial_iron_hull": "Steel Train Hull",
56+
"block.createdeco.industrial_iron_support": "Steel Support",
57+
"block.createdeco.yellow_industrial_iron_lamp": "Yellow Steel Cage Lamp",
58+
"block.createdeco.red_industrial_iron_lamp": "Red Steel Cage Lamp",
59+
"block.createdeco.blue_industrial_iron_lamp": "Blue Steel Cage Lamp",
60+
"block.createdeco.green_industrial_iron_lamp": "Green Steel Cage Lamp",
61+
"block.createdeco.industrial_iron_sheet_metal": "Steel Sheet Metal",
62+
"block.createdeco.industrial_iron_door": "Steel Door",
63+
"block.createdeco.locked_industrial_iron_door": "Locked Steel Door",
64+
"block.createdeco.industrial_iron_trapdoor": "Steel Trapdoor",
65+
"block.createdeco.industrial_iron_ladder": "Steel Ladder",
66+
"block.createdeco.industrial_iron_facade": "Steel Facade",
67+
"item.createdeco.iron_coin": "Wrought Iron Coin",
68+
"item.createdeco.netherite_coin": "Blue Steel Coin",
69+
"item.createdeco.industrial_iron_coin": "Steel Coin",
70+
"item.createdeco.iron_coinstack": "Wrought Iron Coinstack",
71+
"item.createdeco.netherite_coinstack": "Blue Steel Coinstack",
72+
"item.createdeco.industrial_iron_coinstack": "Steel Coinstack"
73+
}

0 commit comments

Comments
 (0)