diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
index 0ae92fd8a..f9203e933 100644
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -5,6 +5,9 @@
+
+
+
diff --git a/assets/locales/tiles.csv b/assets/locales/tiles.csv
index 403399005..29445f0ff 100644
--- a/assets/locales/tiles.csv
+++ b/assets/locales/tiles.csv
@@ -17,16 +17,16 @@ THIS IS UNUSED AND SHOULD BE REMOVED
"TILE_PLANK_EBONY_PLURAL";;"Ebony planks";"Planches ébène";;;;;;;;;;;;;;;;;;"흑단";
"TILE_PLANK_BIRCH";;"Birch planks";"Planches bouleau";;;;;;;;;;;;;;;;;;"백단";
"TILE_PLANK_BIRCH_PLURAL";;"Birch planks";"Planches bouleau";;;;;;;;;;;;;;;;;;"백단";
-"TILE_PLANK_BLOODROSE";;"Rosewood planks";"Planches palissandre";;;;;;;;;;;;;;;;;;"자단";
-"TILE_PLANK_BLOODROSE_PLURAL";;"Rosewood planks";"Planches palissandre";;;;;;;;;;;;;;;;;;"자단";
+"TILE_PLANK_ROSEWOOD";;"Rosewood planks";"Planches palissandre";;;;;;;;;;;;;;;;;;"자단";
+"TILE_PLANK_ROSEWOOD_PLURAL";;"Rosewood planks";"Planches palissandre";;;;;;;;;;;;;;;;;;"자단";
"TILE_TRUNK_NORMAL";;"Oak log";"Bûche";;;;;;;;;;;;;;;;;;"통나무";
"TILE_TRUNK_NORMAL_PLURAL";;"Oak logs";"Bûches";;;;;;;;;;;;;;;;;;"통나무";
"TILE_TRUNK_EBONY";;"Ebony log";"Bûche ébène";;;;;;;;;;;;;;;;;;"흑단나무";
"TILE_TRUNK_EBONY_PLURAL";;"Ebony logs";"Bûches ébène";;;;;;;;;;;;;;;;;;"흑단나무";
"TILE_TRUNK_BIRCH";;"Birch log";"Bûche bouleau";;;;;;;;;;;;;;;;;;"백단나무";
"TILE_TRUNK_BIRCH_PLURAL";;"Birch logs";"Bûches bouleau";;;;;;;;;;;;;;;;;;"백단나무";
-"TILE_TRUNK_BLOODROSE";;"Rosewood log";"Bûche rouge";;;;;;;;;;;;;;;;;;"자단나무";
-"TILE_TRUNK_BLOODROSE_PLURAL";;"Rosewood logs";"Bûches rouge";;;;;;;;;;;;;;;;;;"자단나무";
+"TILE_TRUNK_ROSEWOOD";;"Rosewood log";"Bûche rouge";;;;;;;;;;;;;;;;;;"자단나무";
+"TILE_TRUNK_ROSEWOOD_PLURAL";;"Rosewood logs";"Bûches rouge";;;;;;;;;;;;;;;;;;"자단나무";
"TILE_STONE_QUARRIED";;"Quarried stone";"Roche extraite";;;;;;;;;;;;;;;;;;"캔 돌";
"TILE_STONE_QUARRIED_PLURAL";;"Quarried stones";"Roches extraites";;;;;;;;;;;;;;;;;;"캔 돌";
"TILE_SAND";;"Sand";"Sable";;;;;;;;;;;;;;;;;;"모래";
@@ -73,8 +73,8 @@ THIS IS UNUSED AND SHOULD BE REMOVED
"TILE_PLATFORM_EBONY_PLURAL";;"Ebony platforms";"Plateformes de planches ébène";;;;;;;;;;;;;;;;;;"흑단 발판";
"TILE_PLATFORM_BIRCH";;"Birch platform";"Plateforme de planche bouleau";;;;;;;;;;;;;;;;;;"백단 발판";
"TILE_PLATFORM_BIRCH_PLURAL";;"Birch platforms";"Plateformes de planche bouleau";;;;;;;;;;;;;;;;;;"백단 발판";
-"TILE_PLATFORM_BLOODROSE";;"Rosewood platform";"Plateforme de planche palissandre";;;;;;;;;;;;;;;;;;"적단 발판";
-"TILE_PLATFORM_BLOODROSE_PLURAL";;"Rosewood platforms";"Plateformes de planche palissandre";;;;;;;;;;;;;;;;;;"적단 발판";
+"TILE_PLATFORM_ROSEWOOD";;"Rosewood platform";"Plateforme de planche palissandre";;;;;;;;;;;;;;;;;;"적단 발판";
+"TILE_PLATFORM_ROSEWOOD_PLURAL";;"Rosewood platforms";"Plateformes de planche palissandre";;;;;;;;;;;;;;;;;;"적단 발판";
"TILE_TORCH";;"Torch";"Torche";;;;;;;;;;;;;;;;;;"횃불";
"TILE_TORCH_PLURAL";;"Torches";"Torches";;;;;;;;;;;;;;;;;;"횃불";
"TILE_WATER";;"Water";"Eau";;;;;;;;;;;;;;;;;;"물";
diff --git a/assets/mods/basegame/blocks/blocks.csv b/assets/mods/basegame/blocks/blocks.csv
index 46f9ced6f..83ea4c7ab 100644
--- a/assets/mods/basegame/blocks/blocks.csv
+++ b/assets/mods/basegame/blocks/blocks.csv
@@ -1,5 +1,5 @@
"id";"drop";"spawn";"name";"shdr";"shdg";"shdb";"shduv";"str";"dsty";"mate";"solid";"wall";"grav";"dlfn";"fv";"fr";"lumr";"lumg";"lumb";"lumuv";"colour";"vscs";"refl";"tags"
-"0";"0";"0";"BLOCK_AIR";"0.0312";"0.0312";"0.0312";"0.0312";"1";"1";"NULL";"0";"1";"N/A";"0";"0";"4";"0.0000";"0.0000";"0.0000";"0.0000";"N/A";"N/A";"0.0";"INCONSEQUENTIAL"
+"0";"0";"0";"BLOCK_AIR";"0.0312";"0.0312";"0.0312";"0.0312";"1";"1";"NULL";"0";"1";"N/A";"0";"0";"4";"0.0000";"0.0000";"0.0000";"0.0000";"N/A";"N/A";"0.0";"INCONSEQUENTIAL,AIR"
"16";"17";"17";"BLOCK_STONE";"0.1252";"0.1252";"0.1252";"0.1252";"48";"2400";"ROCK";"1";"1";"N/A";"0";"4";"16";"0.0000";"0.0000";"0.0000";"0.0000";"N/A";"N/A";"0.0";"ROCK,NATURAL"
"17";"17";"17";"BLOCK_STONE_QUARRIED";"0.1252";"0.1252";"0.1252";"0.1252";"48";"2400";"ROCK";"1";"1";"N/A";"0";"4";"16";"0.0000";"0.0000";"0.0000";"0.0000";"N/A";"N/A";"0.0";"ROCK"
"18";"18";"18";"BLOCK_STONE_TILE_WHITE";"0.1252";"0.1252";"0.1252";"0.1252";"48";"2400";"ROCK";"1";"1";"N/A";"0";"4";"16";"0.0000";"0.0000";"0.0000";"0.0000";"N/A";"N/A";"0.18";"STONE"
@@ -18,11 +18,11 @@
"48";"48";"48";"BLOCK_PLANK_NORMAL";"0.1252";"0.1252";"0.1252";"0.1252";"16";"740";"WOOD";"1";"1";"N/A";"0";"0";"16";"0.0000";"0.0000";"0.0000";"0.0000";"N/A";"N/A";"0.0";"WOOD"
"49";"49";"49";"BLOCK_PLANK_EBONY";"0.1252";"0.1252";"0.1252";"0.1252";"19";"1200";"WOOD";"1";"1";"N/A";"0";"0";"16";"0.0000";"0.0000";"0.0000";"0.0000";"N/A";"N/A";"0.0";"WOOD"
"50";"50";"50";"BLOCK_PLANK_BIRCH";"0.1252";"0.1252";"0.1252";"0.1252";"15";"670";"WOOD";"1";"1";"N/A";"0";"0";"16";"0.0000";"0.0000";"0.0000";"0.0000";"N/A";"N/A";"0.0";"WOOD"
-"51";"51";"51";"BLOCK_PLANK_BLOODROSE";"0.1252";"0.1252";"0.1252";"0.1252";"17";"900";"WOOD";"1";"1";"N/A";"0";"0";"16";"0.0000";"0.0000";"0.0000";"0.0000";"N/A";"N/A";"0.0";"WOOD"
+"51";"51";"51";"BLOCK_PLANK_ROSEWOOD";"0.1252";"0.1252";"0.1252";"0.1252";"17";"900";"WOOD";"1";"1";"N/A";"0";"0";"16";"0.0000";"0.0000";"0.0000";"0.0000";"N/A";"N/A";"0.0";"WOOD"
"64";"64";"64";"BLOCK_TRUNK_NORMAL";"0.0312";"0.0312";"0.0312";"0.0312";"16";"740";"WOOD";"0";"0";"N/A";"0";"0";"16";"0.0000";"0.0000";"0.0000";"0.0000";"N/A";"N/A";"0.0";"TREE,NATURAL"
"65";"65";"65";"BLOCK_TRUNK_EBONY";"0.0312";"0.0312";"0.0312";"0.0312";"19";"1200";"WOOD";"0";"0";"N/A";"0";"0";"16";"0.0000";"0.0000";"0.0000";"0.0000";"N/A";"N/A";"0.0";"TREE,NATURAL"
"66";"66";"66";"BLOCK_TRUNK_BIRCH";"0.0312";"0.0312";"0.0312";"0.0312";"15";"670";"WOOD";"0";"0";"N/A";"0";"0";"16";"0.0000";"0.0000";"0.0000";"0.0000";"N/A";"N/A";"0.0";"TREE,NATURAL"
-"67";"67";"67";"BLOCK_TRUNK_BLOODROSE";"0.0312";"0.0312";"0.0312";"0.0312";"17";"900";"WOOD";"0";"0";"N/A";"0";"0";"16";"0.0000";"0.0000";"0.0000";"0.0000";"N/A";"N/A";"0.0";"TREE,NATURAL"
+"67";"67";"67";"BLOCK_TRUNK_ROSEWOOD";"0.0312";"0.0312";"0.0312";"0.0312";"17";"900";"WOOD";"0";"0";"N/A";"0";"0";"16";"0.0000";"0.0000";"0.0000";"0.0000";"N/A";"N/A";"0.0";"TREE,NATURAL"
"80";"80";"80";"BLOCK_SAND";"0.1252";"0.1252";"0.1252";"0.1252";"24";"2400";"SAND";"1";"0";"0";"0";"4";"16";"0.0000";"0.0000";"0.0000";"0.0000";"N/A";"N/A";"0.06";"SAND,NATURAL,WARM"
"81";"81";"81";"BLOCK_SAND_WHITE";"0.1252";"0.1252";"0.1252";"0.1252";"24";"2400";"SAND";"1";"0";"0";"0";"4";"16";"0.0000";"0.0000";"0.0000";"0.0000";"N/A";"N/A";"0.06";"SAND,NATURAL,WARM"
"82";"82";"82";"BLOCK_SAND_RED";"0.1252";"0.1252";"0.1252";"0.1252";"24";"2400";"SAND";"1";"0";"0";"0";"4";"16";"0.0000";"0.0000";"0.0000";"0.0000";"N/A";"N/A";"0.06";"SAND,NATURAL,WARM"
@@ -54,7 +54,7 @@
"161";"161";"161";"BLOCK_PLATFORM_WOODEN";"0.0312";"0.0312";"0.0312";"0.0312";"5";"740";"WOOD";"0";"0";"N/A";"0";"0";"16";"0.0000";"0.0000";"0.0000";"0.0000";"N/A";"N/A";"0.0";"PLATFORM"
"162";"162";"162";"BLOCK_PLATFORM_EBONY";"0.0312";"0.0312";"0.0312";"0.0312";"5";"1200";"WOOD";"0";"0";"N/A";"0";"0";"16";"0.0000";"0.0000";"0.0000";"0.0000";"N/A";"N/A";"0.0";"PLATFORM"
"163";"163";"163";"BLOCK_PLATFORM_BIRCH";"0.0312";"0.0312";"0.0312";"0.0312";"5";"670";"WOOD";"0";"0";"N/A";"0";"0";"16";"0.0000";"0.0000";"0.0000";"0.0000";"N/A";"N/A";"0.0";"PLATFORM"
-"164";"164";"164";"BLOCK_PLATFORM_BLOODROSE";"0.0312";"0.0312";"0.0312";"0.0312";"5";"900";"WOOD";"0";"0";"N/A";"0";"0";"16";"0.0000";"0.0000";"0.0000";"0.0000";"N/A";"N/A";"0.0";"PLATFORM"
+"164";"164";"164";"BLOCK_PLATFORM_ROSEWOOD";"0.0312";"0.0312";"0.0312";"0.0312";"5";"900";"WOOD";"0";"0";"N/A";"0";"0";"16";"0.0000";"0.0000";"0.0000";"0.0000";"N/A";"N/A";"0.0";"PLATFORM"
"176";"176";"176";"BLOCK_TORCH";"0.0312";"0.0312";"0.0312";"0.0312";"1";"800";"FXTR";"0";"0";"N/A";"1";"0";"16";"1.0000";"0.6372";"0.0000";"0.0000";"N/A";"N/A";"0.0";"LIGHT"
"177";"177";"177";"BLOCK_TORCH_FROST";"0.0312";"0.0312";"0.0312";"0.0312";"1";"1100";"FXTR";"0";"0";"N/A";"1";"0";"16";"0.3048";"0.4848";"1.0000";"0.0000";"N/A";"N/A";"0.0";"LIGHT"
"192";"176";"176";"BLOCK_TORCH";"0.0312";"0.0312";"0.0312";"0.0312";"1";"800";"FXTR";"0";"0";"N/A";"0";"0";"16";"0.0000";"0.0000";"0.0000";"0.0000";"N/A";"N/A";"0.0";"LIGHT,UNLIT"
@@ -103,7 +103,7 @@
"272";"272";"272";"BLOCK_SCAFFOLDING_NORMAL";"0.0312";"0.0312";"0.0312";"0.0312";"1";"740";"WOOD";"0";"0";"6";"0";"0";"16";"0.0";"0.0";"0.0";"0.0";"N/A";"N/A";"0.0";"PLATFORM"
"273";"273";"273";"BLOCK_SCAFFOLDING_EBONY";"0.0312";"0.0312";"0.0312";"0.0312";"1";"1400";"WOOD";"0";"0";"6";"0";"0";"16";"0.0";"0.0";"0.0";"0.0";"N/A";"N/A";"0.0";"PLATFORM"
"274";"274";"274";"BLOCK_SCAFFOLDING_BIRCH";"0.0312";"0.0312";"0.0312";"0.0312";"1";"670";"WOOD";"0";"0";"6";"0";"0";"16";"0.0";"0.0";"0.0";"0.0";"N/A";"N/A";"0.0";"PLATFORM"
-"275";"275";"275";"BLOCK_SCAFFOLDING_BLOODROSE";"0.0312";"0.0312";"0.0312";"0.0312";"1";"900";"WOOD";"0";"0";"6";"0";"0";"16";"0.0";"0.0";"0.0";"0.0";"N/A";"N/A";"0.0";"PLATFORM"
+"275";"275";"275";"BLOCK_SCAFFOLDING_ROSEWOOD";"0.0312";"0.0312";"0.0312";"0.0312";"1";"900";"WOOD";"0";"0";"6";"0";"0";"16";"0.0";"0.0";"0.0";"0.0";"N/A";"N/A";"0.0";"PLATFORM"
"288";"288";"288";"BLOCK_PLASTIC_WHITE"; "0.0903";"0.0903";"0.0903";"0.1752";"36";"660";"PLST";"1";"1";"N/A";"0";"0";"16";"0";"0";"0";"0";"N/A";"N/A";"0.0";"THERMOPLASTIC"
"289";"289";"289";"BLOCK_PLASTIC_YELLOW"; "0.0894";"0.0919";"0.1234";"0.1752";"36";"660";"PLST";"1";"1";"N/A";"0";"0";"16";"0";"0";"0";"0";"N/A";"N/A";"0.0";"THERMOPLASTIC"
diff --git a/assets/mods/basegame/crafting/items.json b/assets/mods/basegame/crafting/items.json
index 46d0e3be7..55e7910b3 100644
--- a/assets/mods/basegame/crafting/items.json
+++ b/assets/mods/basegame/crafting/items.json
@@ -2,13 +2,15 @@
"item@basegame:5": {
"workbench": "",
"ingredients": [
- [1, 3, "$WOOD", 1, "basegame:176"]
+ [1, 3, "$WOOD", 1, "basegame:176"],
+ [1, 3, "$WOOD", 1, "basegame:192"]
]
},
- "item@basegame:5": {
+
+ "item@basegame:16": {
"workbench": "",
"ingredients": [
- [1, 3, "$WOOD", 1, "basegame:192"]
+ [1, 6, "$WOOD"]
]
},
diff --git a/assets/mods/basegame/locales/en/blocks.json b/assets/mods/basegame/locales/en/blocks.json
index 9e2611964..d3b0f22ad 100644
--- a/assets/mods/basegame/locales/en/blocks.json
+++ b/assets/mods/basegame/locales/en/blocks.json
@@ -1,5 +1,6 @@
{
"BLOCK_WALL_NAME_TEMPLATE": "%1$s Wall",
+ "BLOCK_UNLIT_TEMPLATE": "Unlit %1$s",
"BLOCK_AIR": "Air",
@@ -7,6 +8,8 @@
"BLOCK_STONE_QUARRIED": "Quarried Stone",
"BLOCK_STONE_TILE_WHITE": "Stone Tile",
"BLOCK_STONE_BRICKS": "Stone Bricks",
+ "BLOCK_STONE_DEEP": "Deepstone",
+ "BLOCK_STONE_MARBLE": "Marble",
"BLOCK_DIRT": "Dirt",
"BLOCK_GRASS": "Grass",
@@ -15,12 +18,12 @@
"BLOCK_PLANK_NORMAL": "Wooden Planks",
"BLOCK_PLANK_EBONY": "Ebony Planks",
"BLOCK_PLANK_BIRCH": "Birch Planks",
- "BLOCK_PLANK_BLOODROSE": "Rosewood Planks",
+ "BLOCK_PLANK_ROSEWOOD": "Rosewood Planks",
"BLOCK_TRUNK_NORMAL": "Oak Log",
"BLOCK_TRUNK_EBONY": "Ebony Log",
"BLOCK_TRUNK_BIRCH": "Birch Log",
- "BLOCK_TRUNK_BLOODROSE": "Rosewood Log",
+ "BLOCK_TRUNK_ROSEWOOD": "Rosewood Log",
"BLOCK_SAND": "Sand",
"BLOCK_SAND_WHITE": "White Sand",
@@ -30,7 +33,7 @@
"BLOCK_SAND_GREEN": "Green Sand",
"BLOCK_GRAVEL": "Gravel",
- "BLOCK_GRAVEL_GREY": "Grey gravel",
+ "BLOCK_GRAVEL_GREY": "Grey Gravel",
"BLOCK_ORE_MALACHITE": "Malachite",
"BLOCK_ORE_HEMATITE": "Hematite",
@@ -59,7 +62,7 @@
"BLOCK_PLATFORM_WOODEN": "Wooden Platform",
"BLOCK_PLATFORM_EBONY": "Ebony Platform",
"BLOCK_PLATFORM_BIRCH": "Birch Platform",
- "BLOCK_PLATFORM_BLOODROSE": "Rosewood Platform",
+ "BLOCK_PLATFORM_ROSEWOOD": "Rosewood Platform",
"BLOCK_TORCH": "Torch",
"BLOCK_TORCH_FROST": "Frost Torch",
@@ -88,6 +91,8 @@
"BLOCK_SANDSTONE_BLACK": "Black Sandstone",
"BLOCK_SANDSTONE_GREEN": "Green Sandstone",
+ "BLOCK_SCAFFOLDING_NORMAL": "Scaffolding",
+
"BLOCK_LANTERN": "Lantern",
"BLOCK_SUNSTONE": "Sunstone",
"BLOCK_DAYLIGHT_CAPACITOR": "Daylight Capacitor",
diff --git a/assets/mods/basegame/locales/en/items.json b/assets/mods/basegame/locales/en/items.json
index 849122b4e..19efde848 100644
--- a/assets/mods/basegame/locales/en/items.json
+++ b/assets/mods/basegame/locales/en/items.json
@@ -1,9 +1,9 @@
{
- "BLOCK_STONE_DEEP": "Deepstone",
- "BLOCK_SCAFFOLDING_NORMAL": "Scaffolding",
- "BLOCK_STONE_MARBLE": "Marble",
-
"ITEM_CALENDAR": "Calendar",
+ "ITEM_DOOR_OAK": "Oak Door",
+ "ITEM_DOOR_EBONY": "Ebony Door",
+ "ITEM_DOOR_BIRCH": "Birch Door",
+ "ITEM_DOOR_ROSEWOOD": "Rosewood Door",
"ITEM_LOGIC_SIGNAL_EMITTER": "Logic Signal Emitter",
"ITEM_PICK_COPPER": "Copper Pickaxe",
"ITEM_PICK_IRON": "Iron Pickaxe",
@@ -16,6 +16,8 @@
"ITEM_TYPEWRITER": "Typewriter",
"ITEM_WIRE": "Wire",
"ITEM_WIRE_CUTTER": "Wire Cutter",
+ "ITEM_WORKBENCH": "Workbench",
+ "ITEM_WORLD_PORTAL": "Teleportation Station",
"ACTORBLOCK_ALLOW_MOVE_DOWN": "Urist Arôlcustith",
"ACTORBLOCK_FULL_COLLISION": "Urist Berdanrifot",
diff --git a/assets/mods/basegame/locales/koKR/blocks.json b/assets/mods/basegame/locales/koKR/blocks.json
index 3924141eb..e6a42b816 100644
--- a/assets/mods/basegame/locales/koKR/blocks.json
+++ b/assets/mods/basegame/locales/koKR/blocks.json
@@ -1,80 +1,156 @@
{
"BLOCK_WALL_NAME_TEMPLATE": "%1$s 벽",
+ "BLOCK_UNLIT_TEMPLATE": "꺼진 %1$s",
+
+ "BLOCK_AIR": "공기",
"BLOCK_STONE": "돌",
- "BLOCK_STONE_PLURAL": "돌",
- "BLOCK_DIRT": "흙",
- "BLOCK_DIRT_PLURAL": "흙",
- "BLOCK_GRASS": "잔디",
- "BLOCK_GRAS_PLURALS": "잔디",
- "BLOCK_PLANK_NORMAL": "나무판자",
- "BLOCK_PLANK_NORMAL_PLURAL": "나무판자",
- "BLOCK_PLANK_EBONY": "검정 나무판자",
- "BLOCK_PLANK_EBONY_PLURAL": "검정 나무판자",
- "BLOCK_PLANK_BIRCH": "하양 나무판자",
- "BLOCK_PLANK_BIRCH_PLURAL": "하양 나무판자",
- "BLOCK_PLANK_BLOODROSE": "빨강 나무판자",
- "BLOCK_PLANK_BLOODROSE_PLURAL": "빨강 나무판자",
- "BLOCK_TRUNK_NORMAL": "통나무",
- "BLOCK_TRUNK_NORMAL_PLURAL": "통나무",
- "BLOCK_TRUNK_EBONY": "흑단나무",
- "BLOCK_TRUNK_EBONY_PLURAL": "흑단나무",
- "BLOCK_TRUNK_BIRCH": "자작나무",
- "BLOCK_TRUNK_BIRCH_PLURAL": "자작나무",
- "BLOCK_TRUNK_BLOODROSE": "자단나무",
- "BLOCK_TRUNK_BLOODROSE_PLURAL": "자단나무",
"BLOCK_STONE_QUARRIED": "조약돌",
- "BLOCK_STONE_QUARRIED_PLURAL": "조약돌",
+ "BLOCK_STONE_TILE_WHITE": "돌 타일",
+ "BLOCK_STONE_BRICKS": "돌 벽돌",
+ "BLOCK_STONE_DEEP": "심층석",
+ "BLOCK_STONE_MARBLE": "대리석",
+
+ "BLOCK_DIRT": "흙",
+ "BLOCK_GRASS": "잔디",
+ "BLOCK_GRASSWALL": "잔디",
+
+ "BLOCK_PLANK_NORMAL": "나무 판자",
+ "BLOCK_PLANK_EBONY": "흑단 판자",
+ "BLOCK_PLANK_BIRCH": "백단 판자",
+ "BLOCK_PLANK_ROSEWOOD": "자단 판자",
+
+ "BLOCK_TRUNK_NORMAL": "통나무",
+ "BLOCK_TRUNK_EBONY": "흑단목",
+ "BLOCK_TRUNK_BIRCH": "백단목",
+ "BLOCK_TRUNK_ROSEWOOD": "자단목",
+
"BLOCK_SAND": "모래",
- "BLOCK_SAND_PLURAL": "모래",
+ "BLOCK_SAND_WHITE": "흰 모래",
+ "BLOCK_SAND_RED": "붉은 모래",
+ "BLOCK_SAND_DESERT": "사막 모래",
+ "BLOCK_SAND_BLACK": "검은 모래",
+ "BLOCK_SAND_GREEN": "녹색 모래",
+
"BLOCK_GRAVEL": "자갈",
- "BLOCK_GRAVEL_PLURAL": "자갈",
+ "BLOCK_GRAVEL_GREY": "회색 자갈",
+
"BLOCK_ORE_MALACHITE": "공작석",
- "BLOCK_ORE_MALACHITES": "공작석",
"BLOCK_ORE_HEMATITE": "적철석",
- "BLOCK_ORE_HEMATITE_PLURAL": "적철석",
- "BLOCK_ORE_NATURAL_GOLD": "자연금",
- "BLOCK_ORE_NATERAL_GOLD_PLURAL": "자연금",
- "BLOCK_ORE_NATURAL_SILVER": "자연은",
- "BLOCK_ORE_NATURAL_SILVER_PLURAL": "자연은",
+ "BLOCK_ORE_NATURAL_GOLD": "금덩어리",
+ "BLOCK_ORE_NATURAL_SILVER": "은덩어리",
"BLOCK_ORE_RUTILE": "금홍석",
- "BLOCK_ORE_RUTILE_PLURAL": "금홍석",
"BLOCK_ORE_AURICHALCUMITE": "진금석",
- "BLOCK_ORE_AURICHALCUMITE_PLURAL": "진금석",
+
"BLOCK_GEM_RUBY": "홍옥석",
- "BLOCK_GEM_RUBY_PLURAL": "홍옥석",
"BLOCK_GEM_EMERALD": "취옥석",
- "BLOCK_GEM_EMERALD_PLURAL": "취옥석",
"BLOCK_GEM_SAPPHIRE": "청옥석",
- "BLOCK_GEM_SAPPHIRE_PLURAL": "청옥석",
"BLOCK_GEM_TOPAZ": "황옥석",
- "BLOCK_GEM_TOPAZ_PLURAL": "황옥석",
"BLOCK_GEM_DIAMOND": "금강석",
- "BLOCK_GEM_DIAMOND_PLURAL": "금강석",
"BLOCK_GEM_AMETHYST": "자수정석",
- "BLOCK_GEM_AMETHYST_PLURAL": "자수정석",
+
"BLOCK_SNOW": "눈",
- "BLOCK_SNOW_PLURAL": "눈",
+
"BLOCK_ICE_FRAGILE": "살얼음",
- "BLOCK_ICE_FRAGILE_PLURAL": "살얼음",
"BLOCK_ICE_NATURAL": "얼음",
- "BLOCK_ICE_NATURAL_PLURAL": "얼음",
- "BLOCK_ICE_CLEAR_MAGICAL": "깨끗한 얼음",
- "BLOCK_ICE_CLEAR_MAGICAL_PLURAL": "깨끗한 얼음",
+ "BLOCK_ICE_CLEAR_MAGICAL": "투명 얼음",
+
+ "BLOCK_GLASS_CRUDE": "유리",
+ "BLOCK_GLASS_CLEAN": "투명 유리",
+
"BLOCK_PLATFORM_STONE": "돌 발판",
- "BLOCK_PLATFORM_STONE_PLURAL": "돌 발판",
"BLOCK_PLATFORM_WOODEN": "나무 발판",
- "BLOCK_PLATFORM_WOODEN_PLURAL": "나무 발판",
"BLOCK_PLATFORM_EBONY": "흑단 발판",
- "BLOCK_PLATFORM_EBONY_PLURAL": "흑단 발판",
"BLOCK_PLATFORM_BIRCH": "백단 발판",
- "BLOCK_PLATFORM_BIRCH_PLURAL": "백단 발판",
- "BLOCK_PLATFORM_BLOODROSE": "적단 발판",
- "BLOCK_PLATFORM_BLOODROSE_PLURAL": "적단 발판",
+ "BLOCK_PLATFORM_ROSEWOOD": "자단 발판",
+
"BLOCK_TORCH": "횃불",
- "BLOCK_TORCH_PLURAL": "횃불",
- "BLOCK_WATER": "물",
- "BLOCK_WATER_PLURAL": "물",
- "BLOCK_LAVA": "용암",
- "BLOCK_LAVA_PLURAL": "용암"
+ "BLOCK_TORCH_FROST": "서리 횃불",
+
+ "BLOCK_ILLUMINATOR_WHITE" : "백색 조명기",
+ "BLOCK_ILLUMINATOR_YELLOW" : "황색 조명기",
+ "BLOCK_ILLUMINATOR_ORANGE" : "주황색 조명기",
+ "BLOCK_ILLUMINATOR_RED" : "적색 조명기",
+ "BLOCK_ILLUMINATOR_FUCHSIA" : "분홍색 조명기",
+ "BLOCK_ILLUMINATOR_PURPLE" : "보라색 조명기",
+ "BLOCK_ILLUMINATOR_BLUE" : "청색 조명기",
+ "BLOCK_ILLUMINATOR_CYAN" : "청록색 조명기",
+ "BLOCK_ILLUMINATOR_GREEN" : "녹색 조명기",
+ "BLOCK_ILLUMINATOR_GREEN_DARK": "암록색 조명기",
+ "BLOCK_ILLUMINATOR_BROWN" : "갈색 조명기",
+ "BLOCK_ILLUMINATOR_TAN" : "황갈색 조명기",
+ "BLOCK_ILLUMINATOR_GREY_LIGHT": "연회색 조명기",
+ "BLOCK_ILLUMINATOR_GREY_MED" : "회색 조명기",
+ "BLOCK_ILLUMINATOR_GREY_DARK" : "암회색 조명기",
+ "BLOCK_ILLUMINATOR_BLACK" : "블랙라이트 조명기",
+
+ "BLOCK_SANDSTONE": "사암",
+ "BLOCK_SANDSTONE_WHITE": "흰 사암",
+ "BLOCK_SANDSTONE_RED": "붉은 사암",
+ "BLOCK_SANDSTONE_DESERT": "사막 사암",
+ "BLOCK_SANDSTONE_BLACK": "검은 사암",
+ "BLOCK_SANDSTONE_GREEN": "초록 사암",
+
+ "BLOCK_SCAFFOLDING_NORMAL": "사다리",
+
+ "BLOCK_LANTERN": "램프",
+ "BLOCK_SUNSTONE": "태양석",
+ "BLOCK_DAYLIGHT_CAPACITOR": "축광기",
+
+ "BLOCK_PLASTIC_WHITE" : "백색 플라스틱 블록",
+ "BLOCK_PLASTIC_YELLOW" : "황색 플라스틱 블록",
+ "BLOCK_PLASTIC_ORANGE" : "주황색 플라스틱 블록",
+ "BLOCK_PLASTIC_RED" : "적색 플라스틱 블록",
+ "BLOCK_PLASTIC_FUCHSIA" : "분홍색 플라스틱 블록",
+ "BLOCK_PLASTIC_PURPLE" : "보라색 플라스틱 블록",
+ "BLOCK_PLASTIC_BLUE" : "청색 플라스틱 블록",
+ "BLOCK_PLASTIC_CYAN" : "청록색 플라스틱 블록",
+ "BLOCK_PLASTIC_GREEN" : "녹색 플라스틱 블록",
+ "BLOCK_PLASTIC_GREEN_DARK": "암록색 플라스틱 블록",
+ "BLOCK_PLASTIC_BROWN" : "갈색 플라스틱 블록",
+ "BLOCK_PLASTIC_TAN" : "황갈색 플라스틱 블록",
+ "BLOCK_PLASTIC_GREY_LIGHT": "연회색 플라스틱 블록",
+ "BLOCK_PLASTIC_GREY_MED" : "회색 플라스틱 블록",
+ "BLOCK_PLASTIC_GREY_DARK" : "암회색 플라스틱 블록",
+ "BLOCK_PLASTIC_BLACK" : "흑색 플라스틱 블록",
+
+ "BLOCK_WATER": "Water",
+ "BLOCK_LAVA": "Lava",
+
+ "WIRE_RED": "Red Wire",
+ "WIRE_GREEN": "Green Wire",
+ "WIRE_BLUE": "Blue Wire",
+ "WIRE_BUNDLE": "Wire Bundle"
+
+ /*
+# CODE OF CONDUCT
+
+## 색상명의 번역
+ - 16색 팔레트에 의한 색 이름의 경우, 다음의 단어를 사용한다:
+ - White -> 백색
+ - Yellow -> 황색
+ - Orange -> 주황색
+ - Red -> 적색
+ - Fuchsia -> 분홍색
+ - Purple -> 보라색
+ - Blue -> 청색
+ - Cyan -> 청록색
+ - Green -> 녹색
+ - Dark Green -> 암록색
+ - Brown -> 갈색
+ - Tan -> 황갈색
+ - Light Grey -> 연회색
+ - Grey -> 회색
+ - Dark Grey -> 암회색
+ - Black -> 흑색
+ - 자연색의 경우 (모래, 사암 등), 가급적 고유어 단어를 사용한다
+ - Grey는 가급적 '잿빛'으로 옮기지 않는다 (일상에서 사용되지 않는 단어)
+
+## 목재명의 번역
+ - 추가적 논의가 있기 전까지는 다음의 단어를 사용한다:
+ - Oak -> 나무
+ - Ebony -> 흑단
+ - Birch -> 적단
+ - Rosewood -> 자단
+ */
}
\ No newline at end of file
diff --git a/assets/mods/basegame/locales/koKR/items.json b/assets/mods/basegame/locales/koKR/items.json
index dbb05de54..17bd057a3 100644
--- a/assets/mods/basegame/locales/koKR/items.json
+++ b/assets/mods/basegame/locales/koKR/items.json
@@ -1,9 +1,9 @@
{
- "BLOCK_STONE_DEEP": "심층석",
- "BLOCK_SCAFFOLDING_NORMAL": "발판",
- "BLOCK_STONE_MARBLE": "대리석",
-
"ITEM_CALENDAR": "달력",
+ "ITEM_DOOR_OAK": "나무 문",
+ "ITEM_DOOR_EBONY": "흑단 문",
+ "ITEM_DOOR_BIRCH": "백단 문",
+ "ITEM_DOOR_ROSEWOOD": "자단 문",
"ITEM_LOGIC_SIGNAL_EMITTER": "신호발생기",
"ITEM_PICK_COPPER": "구리 곡괭이",
"ITEM_PICK_IRON": "철 곡괭이",
@@ -15,5 +15,7 @@
"ITEM_TIKI_TORCH": "티키 토치",
"ITEM_TYPEWRITER": "타자기",
"ITEM_WIRE": "전선",
- "ITEM_WIRE_CUTTER": "전선 절단기"
+ "ITEM_WIRE_CUTTER": "전선 절단기",
+ "ITEM_WORKBENCH": "작업대",
+ "ITEM_WORLD_PORTAL": "텔레포트 스테이션"
}
\ No newline at end of file
diff --git a/src/net/torvald/terrarum/blockproperties/Block.kt b/src/net/torvald/terrarum/blockproperties/Block.kt
index 266c3280f..7270d00f7 100644
--- a/src/net/torvald/terrarum/blockproperties/Block.kt
+++ b/src/net/torvald/terrarum/blockproperties/Block.kt
@@ -21,12 +21,12 @@ object Block {
const val PLANK_NORMAL = "basegame:48"
const val PLANK_EBONY = "basegame:49"
const val PLANK_BIRCH = "basegame:50"
- const val PLANK_BLOODROSE = "basegame:51"
+ const val PLANK_ROSEWOOD = "basegame:51"
const val TRUNK_NORMAL = "basegame:64"
const val TRUNK_EBONY = "basegame:65"
const val TRUNK_BIRCH = "basegame:66"
- const val TRUNK_BLOODROSE = "basegame:67"
+ const val TRUNK_ROSEWOOD = "basegame:67"
const val SAND = "basegame:80"
const val SAND_WHITE = "basegame:81"
@@ -64,7 +64,7 @@ object Block {
const val PLATFORM_WOODEN = "basegame:161"
const val PLATFORM_EBONY = "basegame:162"
const val PLATFORM_BIRCH = "basegame:163"
- const val PLATFORM_BLOODROSE = "basegame:164"
+ const val PLATFORM_ROSEWOOD = "basegame:164"
const val TORCH = "basegame:176"
const val TORCH_FROST = "basegame:177"
diff --git a/src/net/torvald/terrarum/modulebasegame/EntryPoint.kt b/src/net/torvald/terrarum/modulebasegame/EntryPoint.kt
index 6bafc6e54..b64f4778a 100644
--- a/src/net/torvald/terrarum/modulebasegame/EntryPoint.kt
+++ b/src/net/torvald/terrarum/modulebasegame/EntryPoint.kt
@@ -94,7 +94,6 @@ class EntryPoint : ModuleEntryPoint() {
override val isUnique: Boolean = false
override var baseMass: Double = tile.density / 1000.0
override var baseToolSize: Double? = null
- override val originalName = if (isWall) "${tile.nameKey}>>=BLOCK_WALL_NAME_TEMPLATE" else tile.nameKey
override var stackable = true
override var inventoryCategory = if (isWall) Category.WALL else Category.BLOCK
override var isDynamic = false
@@ -114,6 +113,12 @@ class EntryPoint : ModuleEntryPoint() {
tags.addAll(tile.tags)
}
+ override val originalName: String =
+ if (isWall && tags.contains("UNLIT")) "${tile.nameKey}>>=BLOCK_UNLIT_TEMPLATE>>=BLOCK_WALL_NAME_TEMPLATE"
+ else if (isWall) "${tile.nameKey}>>=BLOCK_WALL_NAME_TEMPLATE"
+ else if (tags.contains("UNLIT")) "${tile.nameKey}>>=BLOCK_UNLIT_TEMPLATE"
+ else tile.nameKey
+
override fun startPrimaryUse(actor: ActorWithBody, delta: Float): Long {
return BlockBase.blockStartPrimaryUse(actor, this, dynamicID, delta)
}
diff --git a/src/net/torvald/terrarum/modulebasegame/gameactors/PlayerBuilderSigrid.kt b/src/net/torvald/terrarum/modulebasegame/gameactors/PlayerBuilderSigrid.kt
index a9a1a5e09..526c94c74 100644
--- a/src/net/torvald/terrarum/modulebasegame/gameactors/PlayerBuilderSigrid.kt
+++ b/src/net/torvald/terrarum/modulebasegame/gameactors/PlayerBuilderSigrid.kt
@@ -74,7 +74,8 @@ object PlayerBuilderSigrid {
fun fillTestInventory(inventory: ActorInventory) {
App.tileMaker.tags.forEach { (t, _) ->
- if (!BlockCodex[t].isActorBlock) {
+ val prop = BlockCodex[t]
+ if (!prop.isActorBlock && !prop.hasTag("AIR")) {
inventory.add(t, 9995)
try {