Skip to content

Commit cf93ed4

Browse files
dovisutudovisutu
committed
Merge branch 'main' into packer-rework
2 parents a7d554e + b3d37a2 commit cf93ed4

228 files changed

Lines changed: 62291 additions & 3336 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎projects/1.12.2/assets/atlantis/atlantis/lang/en_us.lang‎

Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
1+
//Items
2+
item.atlantis.atlantean_crystal.name=Atlantean Crystal
3+
item.atlantis.ocean_stone.name=Ocean Stone
4+
item.atlantis.ingot_aquamarine.name=Aquamarine Ingot
5+
item.atlantis.drop_of_atlantis.name=Drop of Atlantis
6+
item.atlantis.orb_of_atlantis.name=Orb of Atlantis
7+
8+
//Plants
9+
tile.atlantis.algae.name=Algae
10+
tile.atlantis.underwater_flower.name=Atlantean Flower
11+
12+
//Blocks
13+
tile.atlantis.ancient_spruce_wood_moss.name=Ancient Mossy Spruce Wood
14+
tile.atlantis.ancient_acacia_wood_moss.name=Ancient Mossy Acacia Wood
15+
tile.atlantis.ancient_birch_wood_moss.name=Ancient Mossy Birch Wood
16+
tile.atlantis.ancient_dark_oak_wood_moss.name=Ancient Mossy Dark Oak Wood
17+
tile.atlantis.ancient_oak_wood_moss.name=Ancient Mossy Oak Wood
18+
tile.atlantis.ancient_jungle_wood_moss.name=Ancient Mossy Jungle Wood
19+
tile.atlantis.aquamarine_ore.name=Aquamarine Ore
20+
tile.atlantis.atlantis_portal.name=Atlantis Portal
21+
tile.atlantis.atlantean_core.name=Atlantean Core
22+
tile.atlantis.ocean_lantern.name=Ocean Lantern
23+
tile.atlantis.block_of_aquamarine.name=Block of Aquamarine
24+
tile.atlantis.chiseled_golden_block.name=Chiseled Block of Gold
25+
tile.atlantis.chiseled_golden_aquamarine.name=Chiseled Block of Gold w/ Aquamarine Gem
26+
tile.atlantis.black_colored_shell_block.name=Black Colored Shell Block
27+
tile.atlantis.brown_colored_shell_block.name=Brown Colored Shell Block
28+
tile.atlantis.cyan_colored_shell_block.name=Cyan Colored Shell Block
29+
tile.atlantis.light_gray_colored_shell_block.name=Light Gray Colored Shell Block
30+
tile.atlantis.gray_colored_shell_block.name=Gray Colored Shell Block
31+
tile.atlantis.red_colored_shell_block.name=Red Colored Shell Block
32+
tile.atlantis.yellow_colored_shell_block.name=Yellow Colored Shell Block
33+
tile.atlantis.white_colored_shell_block.name=White Colored Shell Block
34+
tile.atlantis.orange_colored_shell_block.name=Orange Colored Shell Block
35+
tile.atlantis.blue_colored_shell_block.name=Blue Colored Shell Block
36+
tile.atlantis.light_blue_colored_shell_block.name=Light Blue Colored Shell Block
37+
tile.atlantis.pink_colored_shell_block.name=Pink Colored Shell Block
38+
tile.atlantis.purple_colored_shell_block.name=Purple Colored Shell Block
39+
tile.atlantis.magenta_colored_shell_block.name=Magenta Colored Shell Block
40+
tile.atlantis.lime_colored_shell_block.name=Lime Colored Shell Block
41+
tile.atlantis.green_colored_shell_block.name=Green Colored Shell Block
42+
tile.atlantis.oyster_shell_block.name=Oyster Shell Block
43+
tile.atlantis.white_pearl_block.name=White Pearl Block
44+
tile.atlantis.black_pearl_block.name=Black Pearl Block
45+
tile.atlantis.blue_pearl_block.name=Blue Pearl Block
46+
tile.atlantis.brown_pearl_block.name=Brown Pearl Block
47+
tile.atlantis.cyan_pearl_block.name=Cyan Pearl Block
48+
tile.atlantis.gray_pearl_block.name=Gray Pearl Block
49+
tile.atlantis.light_gray_pearl_block.name=Light Gray Pearl Block
50+
tile.atlantis.light_blue_pearl_block.name=Light Blue Pearl Block
51+
tile.atlantis.green_pearl_block.name=Green Pearl Block
52+
tile.atlantis.lime_pearl_block.name=Lime Pearl Block
53+
tile.atlantis.magenta_pearl_block.name=Magenta Pearl Block
54+
tile.atlantis.orange_pearl_block.name=Orange Pearl Block
55+
tile.atlantis.pink_pearl_block.name=Pink Pearl Block
56+
tile.atlantis.purple_pearl_block.name=Purple Pearl Block
57+
tile.atlantis.red_pearl_block.name=Red Pearl Block
58+
tile.atlantis.yellow_pearl_block.name=Yellow Pearl Block
59+
60+
//Tools
61+
item.atlantis.atlantean_shield.name=Atlantean Shield
62+
item.atlantis.axe_aquamarine.name=Aquamarine Axe
63+
item.atlantis.hoe_aquamarine.name=Aquamarine Hoe
64+
item.atlantis.pickaxe_aquamarine.name=Aquamarine Pickaxe
65+
item.atlantis.shovel_aquamarine.name=Aquamarine Shovel
66+
67+
//Weapons
68+
item.atlantis.sword_aquamarine.name=Aquamarine Sword
69+
70+
//Armor
71+
item.atlantis.helmet_aquamarine.name=Aquamarine Helmet
72+
item.atlantis.leggings_aquamarine.name=Aquamarine Leggings
73+
item.atlantis.boots_aquamarine.name=Aquamarine Boots
74+
item.atlantis.chestplate_aquamarine.name=Aquamarine Chestplate
75+
item.atlantis.helmet_wrought.name=Wrought Helmet
76+
item.atlantis.leggings_wrought.name=Wrought Leggings
77+
item.atlantis.boots_wrought.name=Wrought Boots
78+
item.atlantis.chestplate_wrought.name=Wrought Chestplate
79+
//Tabs
80+
itemGroup.Atlantis=§3Atlantis

‎projects/1.12.2/assets/atlantis/atlantis/lang/zh_cn.lang‎

Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
1+
//Items
2+
item.atlantis.atlantean_crystal.name=亚特兰蒂斯水晶
3+
item.atlantis.ocean_stone.name=深海石
4+
item.atlantis.ingot_aquamarine.name=海蓝宝石锭
5+
item.atlantis.drop_of_atlantis.name=亚特兰蒂斯水滴
6+
item.atlantis.orb_of_atlantis.name=亚特兰蒂斯之球
7+
8+
//Plants
9+
tile.atlantis.algae.name=海藻
10+
tile.atlantis.underwater_flower.name=亚特兰蒂斯花卉
11+
12+
//Blocks
13+
tile.atlantis.ancient_spruce_wood_moss.name=覆苔古老云杉木
14+
tile.atlantis.ancient_acacia_wood_moss.name=覆苔古老金合欢木
15+
tile.atlantis.ancient_birch_wood_moss.name=覆苔古老白桦木
16+
tile.atlantis.ancient_dark_oak_wood_moss.name=覆苔古老深色橡木
17+
tile.atlantis.ancient_oak_wood_moss.name=覆苔古老橡木
18+
tile.atlantis.ancient_jungle_wood_moss.name=覆苔古老丛林木
19+
tile.atlantis.aquamarine_ore.name=海蓝宝石矿石
20+
tile.atlantis.atlantis_portal.name=亚特兰蒂斯之门
21+
tile.atlantis.atlantean_core.name=亚特兰蒂斯核心
22+
tile.atlantis.ocean_lantern.name=海洋灯
23+
tile.atlantis.block_of_aquamarine.name=海蓝宝石块
24+
tile.atlantis.chiseled_golden_block.name=錾制金块
25+
tile.atlantis.chiseled_golden_aquamarine.name=镶嵌海蓝宝石的錾制金块
26+
tile.atlantis.black_colored_shell_block.name=黑色染色贝壳块
27+
tile.atlantis.brown_colored_shell_block.name=棕色染色贝壳块
28+
tile.atlantis.cyan_colored_shell_block.name=青色染色贝壳块
29+
tile.atlantis.light_gray_colored_shell_block.name=淡灰色染色贝壳块
30+
tile.atlantis.gray_colored_shell_block.name=灰色染色贝壳块
31+
tile.atlantis.red_colored_shell_block.name=红色染色贝壳块
32+
tile.atlantis.yellow_colored_shell_block.name=黄色染色贝壳块
33+
tile.atlantis.white_colored_shell_block.name=白色染色贝壳块
34+
tile.atlantis.orange_colored_shell_block.name=橙色染色贝壳块
35+
tile.atlantis.blue_colored_shell_block.name=蓝色染色贝壳块
36+
tile.atlantis.light_blue_colored_shell_block.name=淡蓝色染色贝壳块
37+
tile.atlantis.pink_colored_shell_block.name=粉红色染色贝壳块
38+
tile.atlantis.purple_colored_shell_block.name=紫色染色贝壳块
39+
tile.atlantis.magenta_colored_shell_block.name=品红色染色贝壳块
40+
tile.atlantis.lime_colored_shell_block.name=黄绿色染色贝壳块
41+
tile.atlantis.green_colored_shell_block.name=绿色染色贝壳块
42+
tile.atlantis.oyster_shell_block.name=牡蛎贝壳块
43+
tile.atlantis.white_pearl_block.name=白色珍珠块
44+
tile.atlantis.black_pearl_block.name=黑色珍珠块
45+
tile.atlantis.blue_pearl_block.name=蓝色珍珠块
46+
tile.atlantis.brown_pearl_block.name=棕色珍珠块
47+
tile.atlantis.cyan_pearl_block.name=青色珍珠块
48+
tile.atlantis.gray_pearl_block.name=灰色珍珠块
49+
tile.atlantis.light_gray_pearl_block.name=淡灰色珍珠块
50+
tile.atlantis.light_blue_pearl_block.name=淡蓝色珍珠块
51+
tile.atlantis.green_pearl_block.name=绿色珍珠块
52+
tile.atlantis.lime_pearl_block.name=黄绿色珍珠块
53+
tile.atlantis.magenta_pearl_block.name=品红色珍珠块
54+
tile.atlantis.orange_pearl_block.name=橙色珍珠块
55+
tile.atlantis.pink_pearl_block.name=粉红色珍珠块
56+
tile.atlantis.purple_pearl_block.name=紫色珍珠块
57+
tile.atlantis.red_pearl_block.name=红色珍珠块
58+
tile.atlantis.yellow_pearl_block.name=黄色珍珠块
59+
60+
//Tools
61+
item.atlantis.atlantean_shield.name=亚特兰蒂斯盾牌
62+
item.atlantis.axe_aquamarine.name=海蓝宝石斧
63+
item.atlantis.hoe_aquamarine.name=海蓝宝石锄
64+
item.atlantis.pickaxe_aquamarine.name=海蓝宝石镐
65+
item.atlantis.shovel_aquamarine.name=海蓝宝石锹
66+
67+
//Weapons
68+
item.atlantis.sword_aquamarine.name=海蓝宝石剑
69+
70+
//Armor
71+
item.atlantis.helmet_aquamarine.name=海蓝宝石头盔
72+
item.atlantis.leggings_aquamarine.name=海蓝宝石护腿
73+
item.atlantis.boots_aquamarine.name=海蓝宝石靴子
74+
item.atlantis.chestplate_aquamarine.name=海蓝宝石胸甲
75+
item.atlantis.helmet_wrought.name=锻铁头盔
76+
item.atlantis.leggings_wrought.name=锻铁护腿
77+
item.atlantis.boots_wrought.name=锻铁靴子
78+
item.atlantis.chestplate_wrought.name=锻铁胸甲
79+
//Tabs
80+
itemGroup.Atlantis=§3亚特兰蒂斯

0 commit comments

Comments
 (0)