diff --git a/data/textures/marble.png b/data/textures/marble.png
new file mode 100755
index 0000000..5479ec1
Binary files /dev/null and b/data/textures/marble.png differ
diff --git a/data/textures/pine.png b/data/textures/pine.png
index 963f99f..5c01a7a 100644
Binary files a/data/textures/pine.png and b/data/textures/pine.png differ
diff --git a/po/da/voxelands.po b/po/da/voxelands.po
index cc70421..9a17621 100644
--- a/po/da/voxelands.po
+++ b/po/da/voxelands.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-10-19 01:55+1000\n"
+"POT-Creation-Date: 2015-12-21 11:27+1000\n"
 "PO-Revision-Date: 2011-08-02 00:31+0100\n"
 "Last-Translator: Frederik Helth <Guides@live.dk>\n"
 "Language-Team: \n"
@@ -266,7 +266,7 @@ msgstr ""
 msgid "Done"
 msgstr ""
 
-#: src/character_creator.cpp:423 src/keycode.cpp:229
+#: src/character_creator.cpp:423 src/keycode.cpp:236
 msgid "Cancel"
 msgstr "Afslut"
 
@@ -1120,7 +1120,7 @@ msgstr ""
 msgid "Steel Ingot"
 msgstr ""
 
-#: src/content_craftitem.cpp:225 src/content_mapnode.cpp:710
+#: src/content_craftitem.cpp:225 src/content_mapnode.cpp:723
 msgid "Brick"
 msgstr ""
 
@@ -1549,11 +1549,11 @@ msgstr ""
 msgid "Unbound Mithril"
 msgstr ""
 
-#: src/content_craftitem.cpp:1516
+#: src/content_craftitem.cpp:1516 src/mineral.cpp:142
 msgid "Mithril"
 msgstr ""
 
-#: src/content_craftitem.cpp:1525
+#: src/content_craftitem.cpp:1525 src/mineral.cpp:149
 msgid "Ruby"
 msgstr ""
 
@@ -1561,15 +1561,15 @@ msgstr ""
 msgid "Turquiose"
 msgstr ""
 
-#: src/content_craftitem.cpp:1541
+#: src/content_craftitem.cpp:1541 src/mineral.cpp:165
 msgid "Amethyst"
 msgstr ""
 
-#: src/content_craftitem.cpp:1549
+#: src/content_craftitem.cpp:1549 src/mineral.cpp:173
 msgid "Sapphire"
 msgstr ""
 
-#: src/content_craftitem.cpp:1557
+#: src/content_craftitem.cpp:1557 src/mineral.cpp:181
 msgid "Sunstone"
 msgstr ""
 
@@ -1581,392 +1581,396 @@ msgstr ""
 msgid "Limestone"
 msgstr ""
 
-#: src/content_mapnode.cpp:219
+#: src/content_mapnode.cpp:221
+msgid "Marble"
+msgstr ""
+
+#: src/content_mapnode.cpp:232
 msgid "Rock"
 msgstr ""
 
-#: src/content_mapnode.cpp:241
+#: src/content_mapnode.cpp:254
 msgid "Ice"
 msgstr ""
 
-#: src/content_mapnode.cpp:257
+#: src/content_mapnode.cpp:270
 msgid "Coal Block"
 msgstr ""
 
-#: src/content_mapnode.cpp:274
+#: src/content_mapnode.cpp:287
 msgid "Charcoal Block"
 msgstr ""
 
-#: src/content_mapnode.cpp:291
+#: src/content_mapnode.cpp:304
 msgid "Stone Brick"
 msgstr ""
 
-#: src/content_mapnode.cpp:305
+#: src/content_mapnode.cpp:318
 msgid "Stone Block"
 msgstr ""
 
-#: src/content_mapnode.cpp:319
+#: src/content_mapnode.cpp:332
 msgid "Rough Stone Brick"
 msgstr ""
 
-#: src/content_mapnode.cpp:336
+#: src/content_mapnode.cpp:349
 msgid "Rough Stone Block"
 msgstr ""
 
-#: src/content_mapnode.cpp:352 src/content_mapnode.cpp:385
-#: src/content_mapnode.cpp:399 src/content_mapnode.cpp:432
+#: src/content_mapnode.cpp:365 src/content_mapnode.cpp:398
+#: src/content_mapnode.cpp:412 src/content_mapnode.cpp:445
 msgid "Grass"
 msgstr ""
 
-#: src/content_mapnode.cpp:370 src/content_mapnode.cpp:417
+#: src/content_mapnode.cpp:383 src/content_mapnode.cpp:430
 msgid "Growing Grass"
 msgstr ""
 
-#: src/content_mapnode.cpp:446
+#: src/content_mapnode.cpp:459
 msgid "Muddy Snow"
 msgstr ""
 
-#: src/content_mapnode.cpp:462
+#: src/content_mapnode.cpp:475
 msgid "Mud"
 msgstr ""
 
-#: src/content_mapnode.cpp:478
+#: src/content_mapnode.cpp:491
 msgid "Ash Block"
 msgstr ""
 
-#: src/content_mapnode.cpp:493
+#: src/content_mapnode.cpp:506
 msgid "Sand"
 msgstr ""
 
-#: src/content_mapnode.cpp:512
+#: src/content_mapnode.cpp:525
 msgid "Gravel"
 msgstr ""
 
-#: src/content_mapnode.cpp:529
+#: src/content_mapnode.cpp:542
 msgid "Sand Stone"
 msgstr ""
 
-#: src/content_mapnode.cpp:544
+#: src/content_mapnode.cpp:557
 msgid "Sand Stone Bricks"
 msgstr ""
 
-#: src/content_mapnode.cpp:559
+#: src/content_mapnode.cpp:572
 msgid "Sand Stone Blocks"
 msgstr ""
 
-#: src/content_mapnode.cpp:574
+#: src/content_mapnode.cpp:587
 msgid "Clay"
 msgstr ""
 
-#: src/content_mapnode.cpp:591
+#: src/content_mapnode.cpp:604
 msgid "Blue Clay"
 msgstr ""
 
-#: src/content_mapnode.cpp:608
+#: src/content_mapnode.cpp:621
 msgid "Green Clay"
 msgstr ""
 
-#: src/content_mapnode.cpp:625
+#: src/content_mapnode.cpp:638
 msgid "Orange Clay"
 msgstr ""
 
-#: src/content_mapnode.cpp:642
+#: src/content_mapnode.cpp:655
 msgid "Purple Clay"
 msgstr ""
 
-#: src/content_mapnode.cpp:659
+#: src/content_mapnode.cpp:672
 msgid "Red Clay"
 msgstr ""
 
-#: src/content_mapnode.cpp:676
+#: src/content_mapnode.cpp:689
 msgid "Yellow Clay"
 msgstr ""
 
-#: src/content_mapnode.cpp:693
+#: src/content_mapnode.cpp:706
 msgid "Black Clay"
 msgstr ""
 
-#: src/content_mapnode.cpp:729
+#: src/content_mapnode.cpp:742
 msgid "Terracotta"
 msgstr ""
 
-#: src/content_mapnode.cpp:741
+#: src/content_mapnode.cpp:754
 msgid "Terracotta Brick"
 msgstr ""
 
-#: src/content_mapnode.cpp:755
+#: src/content_mapnode.cpp:768
 msgid "Terracotta Block"
 msgstr ""
 
-#: src/content_mapnode.cpp:769
+#: src/content_mapnode.cpp:782
 msgid "Terracotta Tile"
 msgstr ""
 
-#: src/content_mapnode.cpp:789
+#: src/content_mapnode.cpp:802
 msgid "Glass"
 msgstr ""
 
-#: src/content_mapnode.cpp:809
+#: src/content_mapnode.cpp:822
 msgid "Blue Glass"
 msgstr ""
 
-#: src/content_mapnode.cpp:831
+#: src/content_mapnode.cpp:844
 msgid "Green Glass"
 msgstr ""
 
-#: src/content_mapnode.cpp:853
+#: src/content_mapnode.cpp:866
 msgid "Orange Glass"
 msgstr ""
 
-#: src/content_mapnode.cpp:875
+#: src/content_mapnode.cpp:888
 msgid "Purple Glass"
 msgstr ""
 
-#: src/content_mapnode.cpp:897
+#: src/content_mapnode.cpp:910
 msgid "Red Glass"
 msgstr ""
 
-#: src/content_mapnode.cpp:919
+#: src/content_mapnode.cpp:932
 msgid "Yellow Glass"
 msgstr ""
 
-#: src/content_mapnode.cpp:941
+#: src/content_mapnode.cpp:954
 msgid "Black Glass"
 msgstr ""
 
-#: src/content_mapnode.cpp:963
+#: src/content_mapnode.cpp:976
 msgid "Glass Pane"
 msgstr ""
 
-#: src/content_mapnode.cpp:997
+#: src/content_mapnode.cpp:1010
 msgid "Blue Glass Pane"
 msgstr ""
 
-#: src/content_mapnode.cpp:1032
+#: src/content_mapnode.cpp:1045
 msgid "Green Glass Pane"
 msgstr ""
 
-#: src/content_mapnode.cpp:1067
+#: src/content_mapnode.cpp:1080
 msgid "Orange Glass Pane"
 msgstr ""
 
-#: src/content_mapnode.cpp:1102
+#: src/content_mapnode.cpp:1115
 msgid "Purple Glass Pane"
 msgstr ""
 
-#: src/content_mapnode.cpp:1137
+#: src/content_mapnode.cpp:1150
 msgid "Red Glass Pane"
 msgstr ""
 
-#: src/content_mapnode.cpp:1172
+#: src/content_mapnode.cpp:1185
 msgid "Yellow Glass Pane"
 msgstr ""
 
-#: src/content_mapnode.cpp:1207
+#: src/content_mapnode.cpp:1220
 msgid "Black Glass Pane"
 msgstr ""
 
-#: src/content_mapnode.cpp:1242 src/content_mapnode_farm.cpp:333
+#: src/content_mapnode.cpp:1255 src/content_mapnode_farm.cpp:333
 msgid "Glass Light"
 msgstr ""
 
-#: src/content_mapnode.cpp:1265
+#: src/content_mapnode.cpp:1278
 msgid "Wood"
 msgstr ""
 
-#: src/content_mapnode.cpp:1291
+#: src/content_mapnode.cpp:1304
 msgid "Jungle Wood"
 msgstr ""
 
-#: src/content_mapnode.cpp:1316
+#: src/content_mapnode.cpp:1329
 msgid "Pine"
 msgstr ""
 
-#: src/content_mapnode.cpp:1341
+#: src/content_mapnode.cpp:1354
 msgid "Sponge"
 msgstr ""
 
-#: src/content_mapnode.cpp:1356
+#: src/content_mapnode.cpp:1369
 msgid "Waterlogged Sponge"
 msgstr ""
 
-#: src/content_mapnode.cpp:1371
+#: src/content_mapnode.cpp:1384
 msgid "Hay Bale"
 msgstr ""
 
-#: src/content_mapnode.cpp:1388
+#: src/content_mapnode.cpp:1401
 msgid "Raw Apple Pie"
 msgstr ""
 
-#: src/content_mapnode.cpp:1417
+#: src/content_mapnode.cpp:1430
 msgid "Apple Pie"
 msgstr ""
 
-#: src/content_mapnode.cpp:1512
+#: src/content_mapnode.cpp:1525
 msgid "Raw Pumpkin Pie"
 msgstr ""
 
-#: src/content_mapnode.cpp:1541
+#: src/content_mapnode.cpp:1554
 msgid "Pumpkin Pie"
 msgstr ""
 
-#: src/content_mapnode.cpp:1636 src/content_mapnode.cpp:1715
+#: src/content_mapnode.cpp:1649 src/content_mapnode.cpp:1728
 msgid "Snow"
 msgstr ""
 
-#: src/content_mapnode.cpp:1652
+#: src/content_mapnode.cpp:1665
 msgid "Snowman"
 msgstr ""
 
-#: src/content_mapnode.cpp:1738 src/content_mapnode_farm.cpp:445
+#: src/content_mapnode.cpp:1752 src/content_mapnode_farm.cpp:445
 msgid "Cotton"
 msgstr ""
 
-#: src/content_mapnode.cpp:1769
+#: src/content_mapnode.cpp:1783
 msgid "Blue Cotton"
 msgstr ""
 
-#: src/content_mapnode.cpp:1786
+#: src/content_mapnode.cpp:1800
 msgid "Green Cotton"
 msgstr ""
 
-#: src/content_mapnode.cpp:1803
+#: src/content_mapnode.cpp:1817
 msgid "Orange Cotton"
 msgstr ""
 
-#: src/content_mapnode.cpp:1820
+#: src/content_mapnode.cpp:1834
 msgid "Purple Cotton"
 msgstr ""
 
-#: src/content_mapnode.cpp:1837
+#: src/content_mapnode.cpp:1851
 msgid "Red Cotton"
 msgstr ""
 
-#: src/content_mapnode.cpp:1854
+#: src/content_mapnode.cpp:1868
 msgid "Yellow Cotton"
 msgstr ""
 
-#: src/content_mapnode.cpp:1871
+#: src/content_mapnode.cpp:1885
 msgid "Black Cotton"
 msgstr ""
 
-#: src/content_mapnode.cpp:1888
+#: src/content_mapnode.cpp:1902
 msgid "Carpet"
 msgstr ""
 
-#: src/content_mapnode.cpp:1911
+#: src/content_mapnode.cpp:1925
 msgid "Blue Carpet"
 msgstr ""
 
-#: src/content_mapnode.cpp:1935
+#: src/content_mapnode.cpp:1949
 msgid "Green Carpet"
 msgstr ""
 
-#: src/content_mapnode.cpp:1959
+#: src/content_mapnode.cpp:1973
 msgid "Orange Carpet"
 msgstr ""
 
-#: src/content_mapnode.cpp:1983
+#: src/content_mapnode.cpp:1997
 msgid "Purple Carpet"
 msgstr ""
 
-#: src/content_mapnode.cpp:2007
+#: src/content_mapnode.cpp:2021
 msgid "Red Carpet"
 msgstr ""
 
-#: src/content_mapnode.cpp:2031
+#: src/content_mapnode.cpp:2045
 msgid "Yellow Carpet"
 msgstr ""
 
-#: src/content_mapnode.cpp:2055
+#: src/content_mapnode.cpp:2069
 msgid "Black Carpet"
 msgstr ""
 
-#: src/content_mapnode.cpp:2079
+#: src/content_mapnode.cpp:2093
 msgid "Air"
 msgstr ""
 
-#: src/content_mapnode.cpp:2095
+#: src/content_mapnode.cpp:2109
 msgid "Vacuum"
 msgstr ""
 
-#: src/content_mapnode.cpp:2112 src/content_mapnode.cpp:2142
+#: src/content_mapnode.cpp:2126 src/content_mapnode.cpp:2156
 msgid "Water"
 msgstr ""
 
-#: src/content_mapnode.cpp:2172 src/content_mapnode.cpp:2200
+#: src/content_mapnode.cpp:2186 src/content_mapnode.cpp:2214
 msgid "Lava"
 msgstr ""
 
-#: src/content_mapnode.cpp:2231
+#: src/content_mapnode.cpp:2245
 msgid "Rough Stone"
 msgstr ""
 
-#: src/content_mapnode.cpp:2248
+#: src/content_mapnode.cpp:2262
 msgid "Cobble Stone"
 msgstr ""
 
-#: src/content_mapnode.cpp:2264
+#: src/content_mapnode.cpp:2278
 msgid "Mossy Cobble Stone"
 msgstr ""
 
-#: src/content_mapnode.cpp:2277
+#: src/content_mapnode.cpp:2291
 msgid "Steel Block"
 msgstr ""
 
-#: src/content_mapnode.cpp:2294
+#: src/content_mapnode.cpp:2308
 msgid "Mithril Block"
 msgstr ""
 
-#: src/content_mapnode.cpp:2310
+#: src/content_mapnode.cpp:2324
 msgid "Stone Knob"
 msgstr ""
 
-#: src/content_mapnode.cpp:2311
+#: src/content_mapnode.cpp:2325
 msgid "Rough Stone Knob"
 msgstr ""
 
-#: src/content_mapnode.cpp:2312
+#: src/content_mapnode.cpp:2326
 msgid "Sandstone Knob"
 msgstr ""
 
-#: src/content_mapnode.cpp:2313
+#: src/content_mapnode.cpp:2327
 msgid "Wooden Knob"
 msgstr ""
 
-#: src/content_mapnode.cpp:2314
+#: src/content_mapnode.cpp:2328
 msgid "Junglewood Knob"
 msgstr ""
 
-#: src/content_mapnode.cpp:2315
+#: src/content_mapnode.cpp:2329
 msgid "Pine Knob"
 msgstr ""
 
-#: src/content_mapnode.cpp:2319
+#: src/content_mapnode.cpp:2333
 msgid "Copper Block"
 msgstr ""
 
-#: src/content_mapnode.cpp:2336
+#: src/content_mapnode.cpp:2350
 msgid "Gold Block"
 msgstr ""
 
-#: src/content_mapnode.cpp:2353
+#: src/content_mapnode.cpp:2367
 msgid "Silver Block"
 msgstr ""
 
-#: src/content_mapnode.cpp:2370
+#: src/content_mapnode.cpp:2384
 msgid "Tin Block"
 msgstr ""
 
-#: src/content_mapnode.cpp:2387
+#: src/content_mapnode.cpp:2401
 msgid "Quartz Block"
 msgstr ""
 
-#: src/content_mapnode.cpp:2404
+#: src/content_mapnode.cpp:2418
 msgid "Stone Tiles"
 msgstr ""
 
-#: src/content_mapnode.cpp:2426
+#: src/content_mapnode.cpp:2440
 msgid "Wood Tiles"
 msgstr ""
 
@@ -2015,29 +2019,29 @@ msgstr ""
 msgid "Repeater"
 msgstr ""
 
-#: src/content_mapnode_circuit.cpp:369 src/content_mapnode_circuit.cpp:393
+#: src/content_mapnode_circuit.cpp:369 src/content_mapnode_circuit.cpp:390
 msgid "Electric Lamp"
 msgstr ""
 
-#: src/content_mapnode_circuit.cpp:427 src/content_mapnode_circuit.cpp:462
-#: src/content_mapnode_circuit.cpp:516 src/content_mapnode_circuit.cpp:537
-#: src/content_mapnode_circuit.cpp:582 src/content_mapnode_circuit.cpp:603
+#: src/content_mapnode_circuit.cpp:424 src/content_mapnode_circuit.cpp:459
+#: src/content_mapnode_circuit.cpp:513 src/content_mapnode_circuit.cpp:534
+#: src/content_mapnode_circuit.cpp:579 src/content_mapnode_circuit.cpp:600
 msgid "Piston"
 msgstr ""
 
-#: src/content_mapnode_circuit.cpp:489 src/content_mapnode_circuit.cpp:560
-#: src/content_mapnode_circuit.cpp:626
+#: src/content_mapnode_circuit.cpp:486 src/content_mapnode_circuit.cpp:557
+#: src/content_mapnode_circuit.cpp:623
 msgid "Piston Arm"
 msgstr ""
 
-#: src/content_mapnode_circuit.cpp:648 src/content_mapnode_circuit.cpp:676
-#: src/content_mapnode_circuit.cpp:730 src/content_mapnode_circuit.cpp:751
-#: src/content_mapnode_circuit.cpp:796 src/content_mapnode_circuit.cpp:817
+#: src/content_mapnode_circuit.cpp:645 src/content_mapnode_circuit.cpp:673
+#: src/content_mapnode_circuit.cpp:727 src/content_mapnode_circuit.cpp:748
+#: src/content_mapnode_circuit.cpp:793 src/content_mapnode_circuit.cpp:814
 msgid "Sticky Piston"
 msgstr ""
 
-#: src/content_mapnode_circuit.cpp:703 src/content_mapnode_circuit.cpp:774
-#: src/content_mapnode_circuit.cpp:840
+#: src/content_mapnode_circuit.cpp:700 src/content_mapnode_circuit.cpp:771
+#: src/content_mapnode_circuit.cpp:837
 msgid "Sticky Piston Arm"
 msgstr ""
 
@@ -2177,7 +2181,7 @@ msgstr ""
 msgid "Trellis Grape"
 msgstr ""
 
-#: src/content_mapnode_farm.cpp:493 src/content_mapnode_farm.cpp:512
+#: src/content_mapnode_farm.cpp:494 src/content_mapnode_farm.cpp:513
 msgid "Dead Vine"
 msgstr ""
 
@@ -2193,131 +2197,137 @@ msgstr ""
 msgid "Pine Book Shelf"
 msgstr ""
 
-#: src/content_mapnode_furniture.cpp:150 src/content_mapnode_furniture.cpp:169
-#: src/content_mapnode_furniture.cpp:188 src/content_mapnode_furniture.cpp:207
-#: src/content_mapnode_furniture.cpp:226 src/content_mapnode_furniture.cpp:245
+#: src/content_mapnode_furniture.cpp:150 src/content_mapnode_furniture.cpp:170
+#: src/content_mapnode_furniture.cpp:190 src/content_mapnode_furniture.cpp:210
+#: src/content_mapnode_furniture.cpp:230 src/content_mapnode_furniture.cpp:250
 msgid "Couch"
 msgstr ""
 
-#: src/content_mapnode_furniture.cpp:274 src/content_mapnode_furniture.cpp:293
-#: src/content_mapnode_furniture.cpp:312 src/content_mapnode_furniture.cpp:331
-#: src/content_mapnode_furniture.cpp:350 src/content_mapnode_furniture.cpp:369
+#: src/content_mapnode_furniture.cpp:280 src/content_mapnode_furniture.cpp:300
+#: src/content_mapnode_furniture.cpp:320 src/content_mapnode_furniture.cpp:340
+#: src/content_mapnode_furniture.cpp:360 src/content_mapnode_furniture.cpp:380
 msgid "Blue Couch"
 msgstr ""
 
-#: src/content_mapnode_furniture.cpp:392 src/content_mapnode_furniture.cpp:411
-#: src/content_mapnode_furniture.cpp:430 src/content_mapnode_furniture.cpp:449
-#: src/content_mapnode_furniture.cpp:468 src/content_mapnode_furniture.cpp:487
+#: src/content_mapnode_furniture.cpp:404 src/content_mapnode_furniture.cpp:424
+#: src/content_mapnode_furniture.cpp:444 src/content_mapnode_furniture.cpp:464
+#: src/content_mapnode_furniture.cpp:484 src/content_mapnode_furniture.cpp:504
 msgid "Green Couch"
 msgstr ""
 
-#: src/content_mapnode_furniture.cpp:510 src/content_mapnode_furniture.cpp:529
-#: src/content_mapnode_furniture.cpp:548 src/content_mapnode_furniture.cpp:567
-#: src/content_mapnode_furniture.cpp:586 src/content_mapnode_furniture.cpp:605
+#: src/content_mapnode_furniture.cpp:528 src/content_mapnode_furniture.cpp:548
+#: src/content_mapnode_furniture.cpp:568 src/content_mapnode_furniture.cpp:588
+#: src/content_mapnode_furniture.cpp:608 src/content_mapnode_furniture.cpp:628
 msgid "Orange Couch"
 msgstr ""
 
-#: src/content_mapnode_furniture.cpp:628 src/content_mapnode_furniture.cpp:647
-#: src/content_mapnode_furniture.cpp:666 src/content_mapnode_furniture.cpp:685
-#: src/content_mapnode_furniture.cpp:704 src/content_mapnode_furniture.cpp:723
+#: src/content_mapnode_furniture.cpp:652 src/content_mapnode_furniture.cpp:672
+#: src/content_mapnode_furniture.cpp:692 src/content_mapnode_furniture.cpp:712
+#: src/content_mapnode_furniture.cpp:732 src/content_mapnode_furniture.cpp:752
 msgid "Purple Couch"
 msgstr ""
 
-#: src/content_mapnode_furniture.cpp:746 src/content_mapnode_furniture.cpp:765
-#: src/content_mapnode_furniture.cpp:784 src/content_mapnode_furniture.cpp:803
-#: src/content_mapnode_furniture.cpp:822 src/content_mapnode_furniture.cpp:841
+#: src/content_mapnode_furniture.cpp:776 src/content_mapnode_furniture.cpp:796
+#: src/content_mapnode_furniture.cpp:816 src/content_mapnode_furniture.cpp:836
+#: src/content_mapnode_furniture.cpp:856 src/content_mapnode_furniture.cpp:876
 msgid "Red Couch"
 msgstr ""
 
-#: src/content_mapnode_furniture.cpp:864 src/content_mapnode_furniture.cpp:883
-#: src/content_mapnode_furniture.cpp:902 src/content_mapnode_furniture.cpp:921
-#: src/content_mapnode_furniture.cpp:940 src/content_mapnode_furniture.cpp:959
+#: src/content_mapnode_furniture.cpp:900 src/content_mapnode_furniture.cpp:920
+#: src/content_mapnode_furniture.cpp:940 src/content_mapnode_furniture.cpp:960
+#: src/content_mapnode_furniture.cpp:980
+#: src/content_mapnode_furniture.cpp:1000
 msgid "Yellow Couch"
 msgstr ""
 
-#: src/content_mapnode_furniture.cpp:982
-#: src/content_mapnode_furniture.cpp:1001
-#: src/content_mapnode_furniture.cpp:1020
-#: src/content_mapnode_furniture.cpp:1039
-#: src/content_mapnode_furniture.cpp:1058
-#: src/content_mapnode_furniture.cpp:1077
+#: src/content_mapnode_furniture.cpp:1024
+#: src/content_mapnode_furniture.cpp:1044
+#: src/content_mapnode_furniture.cpp:1064
+#: src/content_mapnode_furniture.cpp:1084
+#: src/content_mapnode_furniture.cpp:1104
+#: src/content_mapnode_furniture.cpp:1124
 msgid "Black Couch"
 msgstr ""
 
-#: src/content_mapnode_furniture.cpp:1100
+#: src/content_mapnode_furniture.cpp:1148
+#: src/content_mapnode_furniture.cpp:1182
+#: src/content_mapnode_furniture.cpp:1206
+#: src/content_mapnode_furniture.cpp:1230
+#: src/content_mapnode_furniture.cpp:1254
+#: src/content_mapnode_furniture.cpp:1278
 msgid "Chair"
 msgstr ""
 
-#: src/content_mapnode_furniture.cpp:1149
+#: src/content_mapnode_furniture.cpp:1302
 msgid "Table"
 msgstr ""
 
-#: src/content_mapnode_furniture.cpp:1206
-#: src/content_mapnode_furniture.cpp:1239
+#: src/content_mapnode_furniture.cpp:1333
+#: src/content_mapnode_furniture.cpp:1366
 msgid "Bed"
 msgstr ""
 
-#: src/content_mapnode_furniture.cpp:1267
-#: src/content_mapnode_furniture.cpp:1300
+#: src/content_mapnode_furniture.cpp:1394
+#: src/content_mapnode_furniture.cpp:1427
 msgid "Blue Bed"
 msgstr ""
 
-#: src/content_mapnode_furniture.cpp:1328
-#: src/content_mapnode_furniture.cpp:1361
+#: src/content_mapnode_furniture.cpp:1455
+#: src/content_mapnode_furniture.cpp:1488
 msgid "Green Bed"
 msgstr ""
 
-#: src/content_mapnode_furniture.cpp:1389
-#: src/content_mapnode_furniture.cpp:1422
+#: src/content_mapnode_furniture.cpp:1516
+#: src/content_mapnode_furniture.cpp:1549
 msgid "Orange Bed"
 msgstr ""
 
-#: src/content_mapnode_furniture.cpp:1450
-#: src/content_mapnode_furniture.cpp:1483
+#: src/content_mapnode_furniture.cpp:1577
+#: src/content_mapnode_furniture.cpp:1610
 msgid "Purple Bed"
 msgstr ""
 
-#: src/content_mapnode_furniture.cpp:1511
-#: src/content_mapnode_furniture.cpp:1544
+#: src/content_mapnode_furniture.cpp:1638
+#: src/content_mapnode_furniture.cpp:1671
 msgid "Red Bed"
 msgstr ""
 
-#: src/content_mapnode_furniture.cpp:1572
-#: src/content_mapnode_furniture.cpp:1605
+#: src/content_mapnode_furniture.cpp:1699
+#: src/content_mapnode_furniture.cpp:1732
 msgid "Yellow Bed"
 msgstr ""
 
-#: src/content_mapnode_furniture.cpp:1633
-#: src/content_mapnode_furniture.cpp:1666
+#: src/content_mapnode_furniture.cpp:1760
+#: src/content_mapnode_furniture.cpp:1793
 msgid "Black Bed"
 msgstr ""
 
-#: src/content_mapnode_furniture.cpp:1694
-#: src/content_mapnode_furniture.cpp:1729
+#: src/content_mapnode_furniture.cpp:1821
+#: src/content_mapnode_furniture.cpp:1856
 msgid "Camp Bed"
 msgstr ""
 
-#: src/content_mapnode_furniture.cpp:1753
+#: src/content_mapnode_furniture.cpp:1880
 msgid "Colorful Painting"
 msgstr ""
 
-#: src/content_mapnode_furniture.cpp:1788
+#: src/content_mapnode_furniture.cpp:1915
 msgid "Red Rose Painting"
 msgstr ""
 
-#: src/content_mapnode_furniture.cpp:1823
+#: src/content_mapnode_furniture.cpp:1950
 msgid "Field Painting"
 msgstr ""
 
-#: src/content_mapnode_furniture.cpp:1858
+#: src/content_mapnode_furniture.cpp:1985
 msgid "Blue Flower Painting"
 msgstr ""
 
-#: src/content_mapnode_furniture.cpp:1893
+#: src/content_mapnode_furniture.cpp:2020
 msgid "Painting Canvas"
 msgstr ""
 
-#: src/content_mapnode_furniture.cpp:1931
+#: src/content_mapnode_furniture.cpp:2058
 msgid "Clock"
 msgstr ""
 
@@ -2637,7 +2647,7 @@ msgid "Decraft Book"
 msgstr ""
 
 #: src/content_mapnode_special.cpp:753 src/content_mapnode_special.cpp:948
-#: src/content_nodemeta.cpp:2693
+#: src/content_nodemeta.cpp:2694
 msgid "Diary"
 msgstr ""
 
@@ -2687,11 +2697,11 @@ msgstr ""
 msgid "Locking Sign"
 msgstr ""
 
-#: src/content_mapnode_special.cpp:1286 src/content_nodemeta.cpp:500
+#: src/content_mapnode_special.cpp:1286 src/content_nodemeta.cpp:501
 msgid "Chest"
 msgstr ""
 
-#: src/content_mapnode_special.cpp:1310 src/content_nodemeta.cpp:775
+#: src/content_mapnode_special.cpp:1310 src/content_nodemeta.cpp:776
 #, fuzzy
 msgid "Creative Chest"
 msgstr "Kreativ mode"
@@ -2813,7 +2823,7 @@ msgstr ""
 msgid "Cauldron"
 msgstr ""
 
-#: src/content_mapnode_special.cpp:2082 src/content_nodemeta.cpp:3312
+#: src/content_mapnode_special.cpp:2082 src/content_nodemeta.cpp:3313
 msgid "Forge"
 msgstr ""
 
@@ -2917,565 +2927,569 @@ msgstr ""
 msgid "Ginger Kitten"
 msgstr ""
 
-#: src/content_nodemeta.cpp:75 src/content_nodemeta.cpp:138
-#: src/content_nodemeta.cpp:2677 src/content_nodemeta.cpp:2776
+#: src/content_nodemeta.cpp:76 src/content_nodemeta.cpp:139
+#: src/content_nodemeta.cpp:2678 src/content_nodemeta.cpp:2777
 msgid "Save"
 msgstr "Gem"
 
-#: src/content_nodemeta.cpp:185
+#: src/content_nodemeta.cpp:186
 #, fuzzy, c-format
 msgid "%s's Home Flag"
 msgstr "Hjem"
 
-#: src/content_nodemeta.cpp:269 src/content_nodemeta.cpp:282
-#: src/content_nodemeta.cpp:436 src/content_nodemeta.cpp:449
+#: src/content_nodemeta.cpp:270 src/content_nodemeta.cpp:283
+#: src/content_nodemeta.cpp:437 src/content_nodemeta.cpp:450
 msgid "You can't sleep yet."
 msgstr ""
 
-#: src/content_nodemeta.cpp:273 src/content_nodemeta.cpp:440
+#: src/content_nodemeta.cpp:274 src/content_nodemeta.cpp:441
 msgid "Go to sleep"
 msgstr ""
 
-#: src/content_nodemeta.cpp:278 src/content_nodemeta.cpp:445
+#: src/content_nodemeta.cpp:279 src/content_nodemeta.cpp:446
 msgid "Someone else is sleeping here."
 msgstr ""
 
-#: src/content_nodemeta.cpp:286 src/content_nodemeta.cpp:453
+#: src/content_nodemeta.cpp:287 src/content_nodemeta.cpp:454
 msgid "Get out of bed"
 msgstr ""
 
-#: src/content_nodemeta.cpp:432
+#: src/content_nodemeta.cpp:433
 msgid "This bed is too uncomfortable to sleep in."
 msgstr ""
 
-#: src/content_nodemeta.cpp:573
+#: src/content_nodemeta.cpp:574
 #, c-format
 msgid "Locking Chest owned by '%s'"
 msgstr ""
 
-#: src/content_nodemeta.cpp:647
+#: src/content_nodemeta.cpp:648
 #, c-format
 msgid "Safe owned by '%s'"
 msgstr ""
 
-#: src/content_nodemeta.cpp:816 src/content_nodemeta.cpp:1870
-#: src/content_nodemeta.cpp:2157 src/content_nodemeta.cpp:2349
-#: src/content_nodemeta.cpp:2563
+#: src/content_nodemeta.cpp:817 src/content_nodemeta.cpp:1871
+#: src/content_nodemeta.cpp:2158 src/content_nodemeta.cpp:2350
+#: src/content_nodemeta.cpp:2564
 #, c-format
 msgid "Page %d of %d"
 msgstr ""
 
-#: src/content_nodemeta.cpp:820 src/content_nodemeta.cpp:1898
-#: src/content_nodemeta.cpp:2176 src/content_nodemeta.cpp:2358
-#: src/content_nodemeta.cpp:2579
+#: src/content_nodemeta.cpp:821 src/content_nodemeta.cpp:1899
+#: src/content_nodemeta.cpp:2177 src/content_nodemeta.cpp:2359
+#: src/content_nodemeta.cpp:2580
 msgid "<< Previous Page"
 msgstr ""
 
-#: src/content_nodemeta.cpp:826 src/content_nodemeta.cpp:1904
-#: src/content_nodemeta.cpp:2182 src/content_nodemeta.cpp:2364
-#: src/content_nodemeta.cpp:2585
+#: src/content_nodemeta.cpp:827 src/content_nodemeta.cpp:1905
+#: src/content_nodemeta.cpp:2183 src/content_nodemeta.cpp:2365
+#: src/content_nodemeta.cpp:2586
 msgid "Next Page >>"
 msgstr ""
 
-#: src/content_nodemeta.cpp:869
+#: src/content_nodemeta.cpp:870
 #, c-format
 msgid "Border Stone owned by '%s'"
 msgstr ""
 
-#: src/content_nodemeta.cpp:944
+#: src/content_nodemeta.cpp:945
 msgid "Furnace is overloaded"
 msgstr ""
 
-#: src/content_nodemeta.cpp:945
+#: src/content_nodemeta.cpp:946
 msgid "Furnace is out of fuel"
 msgstr ""
 
-#: src/content_nodemeta.cpp:947
+#: src/content_nodemeta.cpp:948
 msgid "Furnace is inactive"
 msgstr ""
 
-#: src/content_nodemeta.cpp:950
+#: src/content_nodemeta.cpp:951
 msgid "Furnace is active"
 msgstr ""
 
-#: src/content_nodemeta.cpp:1209
+#: src/content_nodemeta.cpp:1210
 msgid "Locking Furnace is overloaded"
 msgstr ""
 
-#: src/content_nodemeta.cpp:1210
+#: src/content_nodemeta.cpp:1211
 msgid "Locking Furnace is out of fuel"
 msgstr ""
 
-#: src/content_nodemeta.cpp:1212
+#: src/content_nodemeta.cpp:1213
 msgid "Locking Furnace is inactive"
 msgstr ""
 
-#: src/content_nodemeta.cpp:1215
+#: src/content_nodemeta.cpp:1216
 msgid "Locking Furnace is active"
 msgstr ""
 
-#: src/content_nodemeta.cpp:1470
+#: src/content_nodemeta.cpp:1471
 msgid "Armed Explosive: about to detonate"
 msgstr ""
 
-#: src/content_nodemeta.cpp:1473
+#: src/content_nodemeta.cpp:1474
 #, c-format
 msgid "Armed Explosive: %d second till detonation"
 msgid_plural "Armed Explosive: %d seconds till detonation"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/content_nodemeta.cpp:1534 src/content_nodemeta.cpp:1539
+#: src/content_nodemeta.cpp:1535 src/content_nodemeta.cpp:1540
 msgid "Incinerator is active"
 msgstr ""
 
-#: src/content_nodemeta.cpp:1541
+#: src/content_nodemeta.cpp:1542
 msgid "Incinerator is inactive"
 msgstr ""
 
-#: src/content_nodemeta.cpp:1633
+#: src/content_nodemeta.cpp:1634
 msgid "Add fuel, then punch to incinerate wielded item"
 msgstr ""
 
-#: src/content_nodemeta.cpp:1874 src/content_nodemeta.cpp:2162
+#: src/content_nodemeta.cpp:1875 src/content_nodemeta.cpp:2163
 msgid "Add item here to see recipe"
 msgstr ""
 
-#: src/content_nodemeta.cpp:1879 src/content_nodemeta.cpp:2167
+#: src/content_nodemeta.cpp:1880 src/content_nodemeta.cpp:2168
 #, c-format
 msgid "Recipe %d of %d"
 msgstr ""
 
-#: src/content_nodemeta.cpp:1888
+#: src/content_nodemeta.cpp:1889
 msgid "Gives"
 msgstr ""
 
-#: src/content_nodemeta.cpp:2353
+#: src/content_nodemeta.cpp:2354
 msgid "Add item here to see cook result"
 msgstr ""
 
-#: src/content_nodemeta.cpp:2567
+#: src/content_nodemeta.cpp:2568
 msgid "Add item here to see dig result"
 msgstr ""
 
-#: src/content_nodemeta.cpp:2571
+#: src/content_nodemeta.cpp:2572
 msgid "Dig Result"
 msgstr ""
 
-#: src/content_nodemeta.cpp:2575
+#: src/content_nodemeta.cpp:2576
 msgid "Random Drop"
 msgstr ""
 
-#: src/content_nodemeta.cpp:2667 src/content_nodemeta.cpp:2766
+#: src/content_nodemeta.cpp:2668 src/content_nodemeta.cpp:2767
 msgid "Title"
 msgstr ""
 
-#: src/content_nodemeta.cpp:2672 src/content_nodemeta.cpp:2771
+#: src/content_nodemeta.cpp:2673 src/content_nodemeta.cpp:2772
 #, fuzzy
 msgid "Content"
 msgstr "Fortsæt"
 
-#: src/content_nodemeta.cpp:3127
+#: src/content_nodemeta.cpp:3128
 msgid "Cauldron is active"
 msgstr ""
 
-#: src/content_nodemeta.cpp:3130
+#: src/content_nodemeta.cpp:3131
 msgid "Cauldron is hot"
 msgstr ""
 
-#: src/content_nodemeta.cpp:3132
+#: src/content_nodemeta.cpp:3133
 msgid "Cauldron is cool"
 msgstr ""
 
-#: src/content_nodemeta.cpp:3134
+#: src/content_nodemeta.cpp:3135
 msgid "Cauldron is empty"
 msgstr ""
 
-#: src/content_nodemeta.cpp:3138
+#: src/content_nodemeta.cpp:3139
 msgid "Cauldron is inactive"
 msgstr ""
 
-#: src/content_nodemeta.cpp:3139
+#: src/content_nodemeta.cpp:3140
 msgid "Cauldron is out of fuel"
 msgstr ""
 
-#: src/content_nodemeta.cpp:3218
+#: src/content_nodemeta.cpp:3219
 msgid "Add fuel, then punch to add or remove water"
 msgstr ""
 
-#: src/content_nodemeta.cpp:3484
+#: src/content_nodemeta.cpp:3487
 msgid "Show Enchanting"
 msgstr ""
 
-#: src/content_nodemeta.cpp:3491 src/game.cpp:208
+#: src/content_nodemeta.cpp:3494 src/game.cpp:209
 msgid "Show Crafting"
 msgstr ""
 
-#: src/content_toolitem.cpp:213
+#: src/content_toolitem.cpp:216
 msgid "Small Stone Pick"
 msgstr ""
 
-#: src/content_toolitem.cpp:236
+#: src/content_toolitem.cpp:239
 msgid "Stone Pick"
 msgstr ""
 
-#: src/content_toolitem.cpp:250
+#: src/content_toolitem.cpp:253
 msgid "Flint Pick"
 msgstr ""
 
-#: src/content_toolitem.cpp:264
+#: src/content_toolitem.cpp:267
 msgid "Steel Pick"
 msgstr ""
 
-#: src/content_toolitem.cpp:278
+#: src/content_toolitem.cpp:281
 #, fuzzy
 msgid "Creative Pick"
 msgstr "Kreativ mode"
 
-#: src/content_toolitem.cpp:292
+#: src/content_toolitem.cpp:295
 msgid "Stone Trowel"
 msgstr ""
 
-#: src/content_toolitem.cpp:306
+#: src/content_toolitem.cpp:309
 msgid "Stone Shovel"
 msgstr ""
 
-#: src/content_toolitem.cpp:320
+#: src/content_toolitem.cpp:323
 msgid "Flint Shovel"
 msgstr ""
 
-#: src/content_toolitem.cpp:334
+#: src/content_toolitem.cpp:337
 msgid "Steel Shovel"
 msgstr ""
 
-#: src/content_toolitem.cpp:348
+#: src/content_toolitem.cpp:351
 msgid "Small Stone Axe"
 msgstr ""
 
-#: src/content_toolitem.cpp:369
+#: src/content_toolitem.cpp:372
 msgid "Stone Axe"
 msgstr ""
 
-#: src/content_toolitem.cpp:383
+#: src/content_toolitem.cpp:386
 msgid "Flint Axe"
 msgstr ""
 
-#: src/content_toolitem.cpp:397
+#: src/content_toolitem.cpp:400
 msgid "Steel Axe"
 msgstr ""
 
-#: src/content_toolitem.cpp:411
+#: src/content_toolitem.cpp:414
 msgid "Wooden Club"
 msgstr ""
 
-#: src/content_toolitem.cpp:426
+#: src/content_toolitem.cpp:429
 msgid "Stone Sword"
 msgstr ""
 
-#: src/content_toolitem.cpp:440
+#: src/content_toolitem.cpp:443
 msgid "Steel Sword"
 msgstr ""
 
-#: src/content_toolitem.cpp:454
+#: src/content_toolitem.cpp:457
 msgid "Flint Shears"
 msgstr ""
 
-#: src/content_toolitem.cpp:468
+#: src/content_toolitem.cpp:471
 msgid "Steel Shears"
 msgstr ""
 
-#: src/content_toolitem.cpp:482
+#: src/content_toolitem.cpp:485
 msgid "Wooden Bucket"
 msgstr ""
 
-#: src/content_toolitem.cpp:499
+#: src/content_toolitem.cpp:502
 msgid "Tin Bucket"
 msgstr ""
 
-#: src/content_toolitem.cpp:515
+#: src/content_toolitem.cpp:518
 msgid "Wooden Bucket of Water"
 msgstr ""
 
-#: src/content_toolitem.cpp:526
+#: src/content_toolitem.cpp:529
 msgid "Tin Bucket of Water"
 msgstr ""
 
-#: src/content_toolitem.cpp:537
+#: src/content_toolitem.cpp:540
 msgid "Steel Bucket"
 msgstr ""
 
-#: src/content_toolitem.cpp:552
+#: src/content_toolitem.cpp:555
 msgid "Steel Bucket of Water"
 msgstr ""
 
-#: src/content_toolitem.cpp:563
+#: src/content_toolitem.cpp:566
 msgid "Steel Bucket of Lava"
 msgstr ""
 
-#: src/content_toolitem.cpp:575
+#: src/content_toolitem.cpp:578
 msgid "Fire Starter"
 msgstr ""
 
-#: src/content_toolitem.cpp:589
+#: src/content_toolitem.cpp:592
 msgid "Crowbar"
 msgstr ""
 
-#: src/content_toolitem.cpp:602
+#: src/content_toolitem.cpp:605
 msgid "Key"
 msgstr ""
 
-#: src/content_toolitem.cpp:614
+#: src/content_toolitem.cpp:617
 msgid "Stone Spear"
 msgstr ""
 
-#: src/content_toolitem.cpp:628
+#: src/content_toolitem.cpp:631
 msgid "Flint Spear"
 msgstr ""
 
-#: src/content_toolitem.cpp:642
+#: src/content_toolitem.cpp:645
 msgid "Steel Spear"
 msgstr ""
 
-#: src/content_toolitem.cpp:656
+#: src/content_toolitem.cpp:659
 msgid "Bow"
 msgstr ""
 
-#: src/content_toolitem.cpp:676
+#: src/content_toolitem.cpp:679
 msgid "Raw Mithril Pick"
 msgstr ""
 
-#: src/content_toolitem.cpp:690
+#: src/content_toolitem.cpp:693
 msgid "Raw Mithril Shovel"
 msgstr ""
 
-#: src/content_toolitem.cpp:704
+#: src/content_toolitem.cpp:707
 msgid "Raw Mithril Axe"
 msgstr ""
 
-#: src/content_toolitem.cpp:718
+#: src/content_toolitem.cpp:721
 msgid "Raw Mithril Sword"
 msgstr ""
 
-#: src/content_toolitem.cpp:732
+#: src/content_toolitem.cpp:735
 msgid "Raw Mithril Spear"
 msgstr ""
 
-#: src/content_toolitem.cpp:746
+#: src/content_toolitem.cpp:749
 msgid "Unbound Mithril Pick"
 msgstr ""
 
-#: src/content_toolitem.cpp:760
+#: src/content_toolitem.cpp:763
 msgid "Unbound Mithril Shovel"
 msgstr ""
 
-#: src/content_toolitem.cpp:774
+#: src/content_toolitem.cpp:777
 msgid "Unbound Mithril Axe"
 msgstr ""
 
-#: src/content_toolitem.cpp:788
+#: src/content_toolitem.cpp:791
 msgid "Unbound Mithril Sword"
 msgstr ""
 
-#: src/content_toolitem.cpp:802
+#: src/content_toolitem.cpp:805
 msgid "Unbound Mithril Spear"
 msgstr ""
 
-#: src/content_toolitem.cpp:816
+#: src/content_toolitem.cpp:819
 msgid "Mithril Pick"
 msgstr ""
 
-#: src/content_toolitem.cpp:831
+#: src/content_toolitem.cpp:834
 msgid "Mithril Shovel"
 msgstr ""
 
-#: src/content_toolitem.cpp:845
+#: src/content_toolitem.cpp:848
 msgid "Mithril Axe"
 msgstr ""
 
-#: src/content_toolitem.cpp:859
+#: src/content_toolitem.cpp:862
 msgid "Mithril Sword"
 msgstr ""
 
-#: src/content_toolitem.cpp:873
+#: src/content_toolitem.cpp:876
 msgid "Mithril Spear"
 msgstr ""
 
-#: src/content_toolitem.cpp:887
+#: src/content_toolitem.cpp:890
 msgid "Mob Spawner"
 msgstr ""
 
-#: src/game.cpp:209
-msgid "Clothes"
+#: src/content_toolitem.cpp:909
+msgid "Mithril Key"
 msgstr ""
 
 #: src/game.cpp:210
+msgid "Clothes"
+msgstr ""
+
+#: src/game.cpp:211
 msgid "Hat/Helmet"
 msgstr ""
 
-#: src/game.cpp:212
+#: src/game.cpp:213
 msgid "Jacket"
 msgstr ""
 
-#: src/game.cpp:214
+#: src/game.cpp:215
 msgid "Decorative"
 msgstr ""
 
-#: src/game.cpp:216
+#: src/game.cpp:217
 msgid "Shirt"
 msgstr ""
 
-#: src/game.cpp:218
+#: src/game.cpp:219
 msgid "Belt"
 msgstr ""
 
-#: src/game.cpp:220
+#: src/game.cpp:221
 msgid "Pants"
 msgstr ""
 
-#: src/game.cpp:222
+#: src/game.cpp:223
 msgid "Boots"
 msgstr ""
 
-#: src/game.cpp:229
+#: src/game.cpp:230
 msgid "Drop to Ground"
 msgstr ""
 
-#: src/game.cpp:231
+#: src/game.cpp:232
 msgid "Change Clothing"
 msgstr ""
 
-#: src/game.cpp:590
+#: src/game.cpp:591
 msgid "Loading"
 msgstr ""
 
-#: src/game.cpp:662
+#: src/game.cpp:663
 msgid "Loading..."
 msgstr ""
 
-#: src/game.cpp:671
+#: src/game.cpp:672
 msgid "Creating server..."
 msgstr ""
 
-#: src/game.cpp:682
+#: src/game.cpp:683
 msgid "Creating client..."
 msgstr ""
 
-#: src/game.cpp:687
+#: src/game.cpp:688
 msgid "Resolving address..."
 msgstr ""
 
-#: src/game.cpp:698
+#: src/game.cpp:699
 msgid "Couldn't resolve address"
 msgstr ""
 
-#: src/game.cpp:738
+#: src/game.cpp:739
 #, c-format
 msgid "Connecting to server... (timeout in %d second)"
 msgid_plural "Connecting to server... (timeout in %d seconds)"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/game.cpp:767
+#: src/game.cpp:768
 #, c-format
 msgid "Access denied. Reason: %ls"
 msgstr ""
 
-#: src/game.cpp:771
+#: src/game.cpp:772
 msgid "Unable to Connect (port already in use?)."
 msgstr ""
 
-#: src/game.cpp:774
+#: src/game.cpp:775
 msgid "Connection timed out."
 msgstr ""
 
-#: src/game.cpp:927
+#: src/game.cpp:928
 msgid "Access denied. Reason: "
 msgstr ""
 
-#: src/game.cpp:1161
+#: src/game.cpp:1162
 msgid "free_move disabled"
 msgstr ""
 
-#: src/game.cpp:1165
+#: src/game.cpp:1166
 msgid "free_move enabled"
 msgstr ""
 
-#: src/game.cpp:1177
+#: src/game.cpp:1178
 #, c-format
 msgid "Saved screenshot to '%s'"
 msgstr ""
 
-#: src/game.cpp:1189
+#: src/game.cpp:1190
 msgid "HUD shown"
 msgstr ""
 
-#: src/game.cpp:1191
+#: src/game.cpp:1192
 msgid "HUD hidden"
 msgstr ""
 
-#: src/game.cpp:1197
+#: src/game.cpp:1198
 msgid "Chat shown"
 msgstr ""
 
-#: src/game.cpp:1199
+#: src/game.cpp:1200
 msgid "Chat hidden"
 msgstr ""
 
-#: src/game.cpp:1205
+#: src/game.cpp:1206
 msgid "Fog disabled"
 msgstr ""
 
-#: src/game.cpp:1207
+#: src/game.cpp:1208
 msgid "Fog enabled"
 msgstr ""
 
-#: src/game.cpp:1213
+#: src/game.cpp:1214
 msgid "Camera update disabled"
 msgstr ""
 
-#: src/game.cpp:1215
+#: src/game.cpp:1216
 msgid "Camera update enabled"
 msgstr ""
 
-#: src/game.cpp:1225
+#: src/game.cpp:1226
 msgid "Debug info shown"
 msgstr ""
 
-#: src/game.cpp:1230
+#: src/game.cpp:1231
 msgid "Debug info and frametime graph hidden"
 msgstr ""
 
-#: src/game.cpp:1234
+#: src/game.cpp:1235
 msgid "Frametime graph shown"
 msgstr ""
 
-#: src/game.cpp:1246
+#: src/game.cpp:1247
 #, c-format
 msgid "Profiler shown (page %d of %d)"
 msgstr ""
 
-#: src/game.cpp:1250
+#: src/game.cpp:1251
 msgid "Profiler hidden"
 msgstr ""
 
-#: src/game.cpp:1258 src/game.cpp:1269
+#: src/game.cpp:1259 src/game.cpp:1270
 #, c-format
 msgid "Minimum viewing range changed to %d"
 msgstr ""
 
-#: src/game.cpp:1338
+#: src/game.cpp:1339
 msgid "Enabled full viewing range"
 msgstr ""
 
-#: src/game.cpp:1342
+#: src/game.cpp:1343
 msgid "Disabled full viewing range"
 msgstr ""
 
-#: src/game.cpp:1995
+#: src/game.cpp:1950
 msgid "Disconnected (Network Timeout)"
 msgstr ""
 
-#: src/game.cpp:2407
+#: src/game.cpp:2382
 msgid "Shutting down..."
 msgstr ""
 
@@ -3495,237 +3509,224 @@ msgstr ""
 msgid "Write It"
 msgstr ""
 
-#: src/guiMainMenu.cpp:347
+#: src/guiMainMenu.cpp:319
 msgid "Character Creator"
 msgstr ""
 
-#: src/guiMainMenu.cpp:353 src/guiMainMenu.cpp:478 src/guiMainMenu.cpp:520
-#: src/guiMainMenu.cpp:631
+#: src/guiMainMenu.cpp:325 src/guiMainMenu.cpp:386 src/guiMainMenu.cpp:428
+#: src/guiMainMenu.cpp:539
 msgid "Single Player"
 msgstr ""
 
-#: src/guiMainMenu.cpp:359 src/guiMainMenu.cpp:410
+#: src/guiMainMenu.cpp:331 src/guiMultiplayerMenu.cpp:161
 msgid "Multi Player"
 msgstr ""
 
-#: src/guiMainMenu.cpp:365 src/guiPauseMenu.cpp:155
+#: src/guiMainMenu.cpp:337 src/guiPauseMenu.cpp:155
 msgid "Settings"
 msgstr ""
 
-#: src/guiMainMenu.cpp:371
+#: src/guiMainMenu.cpp:343
 msgid "Credits"
 msgstr ""
 
-#: src/guiMainMenu.cpp:377
+#: src/guiMainMenu.cpp:349
 msgid "Quit"
 msgstr ""
 
-#: src/guiMainMenu.cpp:418
-msgid "Name/Password"
-msgstr "Navn/kodeord"
-
-#: src/guiMainMenu.cpp:446
-msgid "Address/Port"
-msgstr "Adresse/port"
-
-#: src/guiMainMenu.cpp:472
-#, fuzzy
-msgid "Connect"
-msgstr "Logud"
-
-#: src/guiMainMenu.cpp:487 src/guiMainMenu.cpp:529 src/guiMainMenu.cpp:640
+#: src/guiMainMenu.cpp:395 src/guiMainMenu.cpp:437 src/guiMainMenu.cpp:548
 msgid "Creative Mode"
 msgstr "Kreativ mode"
 
-#: src/guiMainMenu.cpp:488 src/guiMainMenu.cpp:530 src/guiMainMenu.cpp:641
+#: src/guiMainMenu.cpp:396 src/guiMainMenu.cpp:438 src/guiMainMenu.cpp:549
 msgid "Adventure Mode"
 msgstr ""
 
-#: src/guiMainMenu.cpp:489 src/guiMainMenu.cpp:531 src/guiMainMenu.cpp:642
+#: src/guiMainMenu.cpp:397 src/guiMainMenu.cpp:439 src/guiMainMenu.cpp:550
 #, fuzzy
 msgid "Survival Mode"
 msgstr "Kreativ mode"
 
-#: src/guiMainMenu.cpp:502 src/guiMainMenu.cpp:655
+#: src/guiMainMenu.cpp:410 src/guiMainMenu.cpp:563
 msgid "Advanced Settings"
 msgstr ""
 
-#: src/guiMainMenu.cpp:508 src/guiMainMenu.cpp:550
+#: src/guiMainMenu.cpp:416 src/guiMainMenu.cpp:458
 msgid "Map Options"
 msgstr ""
 
-#: src/guiMainMenu.cpp:514 src/guiMainMenu.cpp:625 src/guiMainMenu.cpp:750
+#: src/guiMainMenu.cpp:422 src/guiMainMenu.cpp:533 src/guiMainMenu.cpp:658
 #, fuzzy
 msgid "Start Game"
 msgstr "Start spil"
 
-#: src/guiMainMenu.cpp:544
+#: src/guiMainMenu.cpp:452
 msgid "Hide Advanced Settings"
 msgstr ""
 
-#: src/guiMainMenu.cpp:555
+#: src/guiMainMenu.cpp:463
 #, fuzzy
 msgid "Creatures"
 msgstr "Kreativ mode"
 
-#: src/guiMainMenu.cpp:562
+#: src/guiMainMenu.cpp:470
 msgid "None"
 msgstr ""
 
-#: src/guiMainMenu.cpp:563
+#: src/guiMainMenu.cpp:471
 msgid "Passive"
 msgstr ""
 
-#: src/guiMainMenu.cpp:564
+#: src/guiMainMenu.cpp:472
 msgid "Passive & Aggressive"
 msgstr ""
 
-#: src/guiMainMenu.cpp:565
+#: src/guiMainMenu.cpp:473
 msgid "Passive, Aggressive, & Destructive"
 msgstr ""
 
-#: src/guiMainMenu.cpp:579
+#: src/guiMainMenu.cpp:487
 #, fuzzy
 msgid "Player Damage"
 msgstr "Tag imod skade"
 
-#: src/guiMainMenu.cpp:584
+#: src/guiMainMenu.cpp:492
 msgid "Suffocation/Drowning"
 msgstr ""
 
-#: src/guiMainMenu.cpp:589
+#: src/guiMainMenu.cpp:497
 msgid "Hunger"
 msgstr ""
 
-#: src/guiMainMenu.cpp:594
+#: src/guiMainMenu.cpp:502
 msgid "Tool Wear"
 msgstr ""
 
-#: src/guiMainMenu.cpp:599
+#: src/guiMainMenu.cpp:507
 msgid "Dangerous Fire"
 msgstr ""
 
-#: src/guiMainMenu.cpp:604
+#: src/guiMainMenu.cpp:512
 #, fuzzy
 msgid "Infinite Inventory"
 msgstr "Ting"
 
-#: src/guiMainMenu.cpp:609
+#: src/guiMainMenu.cpp:517
 #, fuzzy
 msgid "Initial Inventory"
 msgstr "Ting"
 
-#: src/guiMainMenu.cpp:614
+#: src/guiMainMenu.cpp:522
 #, fuzzy
 msgid "Droppable Inventory"
 msgstr "Ting"
 
-#: src/guiMainMenu.cpp:619
+#: src/guiMainMenu.cpp:527
 #, fuzzy
 msgid "Death drops Inventory"
 msgstr "Ting"
 
-#: src/guiMainMenu.cpp:661
+#: src/guiMainMenu.cpp:569
 msgid "Hide Map Options"
 msgstr ""
 
-#: src/guiMainMenu.cpp:666
+#: src/guiMainMenu.cpp:574
 msgid "Create New Map"
 msgstr ""
 
-#: src/guiMainMenu.cpp:672
+#: src/guiMainMenu.cpp:580
 msgid "Warning! Your old map will be deleted!"
 msgstr ""
 
-#: src/guiMainMenu.cpp:678
+#: src/guiMainMenu.cpp:586
 msgid "Map Type"
 msgstr ""
 
-#: src/guiMainMenu.cpp:685
+#: src/guiMainMenu.cpp:593
 msgid "Flat"
 msgstr ""
 
-#: src/guiMainMenu.cpp:686
+#: src/guiMainMenu.cpp:594
 msgid "Flatter"
 msgstr ""
 
-#: src/guiMainMenu.cpp:687
+#: src/guiMainMenu.cpp:595
 msgid "Smoother"
 msgstr ""
 
-#: src/guiMainMenu.cpp:688
+#: src/guiMainMenu.cpp:596
 msgid "Default"
 msgstr ""
 
-#: src/guiMainMenu.cpp:689
+#: src/guiMainMenu.cpp:597
 msgid "Hilly"
 msgstr ""
 
-#: src/guiMainMenu.cpp:690
+#: src/guiMainMenu.cpp:598
 msgid "Mountains"
 msgstr ""
 
-#: src/guiMainMenu.cpp:691
+#: src/guiMainMenu.cpp:599
 msgid "Crazy"
 msgstr ""
 
-#: src/guiMainMenu.cpp:692
+#: src/guiMainMenu.cpp:600
 msgid "Crazy Hills"
 msgstr ""
 
-#: src/guiMainMenu.cpp:714
+#: src/guiMainMenu.cpp:622
 msgid "Use Fixed Seed"
 msgstr ""
 
-#: src/guiMainMenu.cpp:720
+#: src/guiMainMenu.cpp:628
 msgid "Map Seed"
 msgstr ""
 
-#: src/guiMainMenu.cpp:737
+#: src/guiMainMenu.cpp:645
 #, fuzzy
 msgid "Clear Map"
 msgstr "Rens"
 
-#: src/guiMainMenu.cpp:742
+#: src/guiMainMenu.cpp:650
 msgid "Warning! This will delete all construction from your map!"
 msgstr ""
 
-#: src/guiMainMenu.cpp:760
+#: src/guiMainMenu.cpp:668
 msgid ""
 "Voxelands\n"
 "http://www.voxelands.com/\n"
 "By Lisa 'darkrose' Milne <lisa@ltmnet.com> and contributors."
 msgstr ""
 
-#: src/guiMainMenu.cpp:767
+#: src/guiMainMenu.cpp:675
 msgid "Programmers"
 msgstr ""
 
-#: src/guiMainMenu.cpp:770
+#: src/guiMainMenu.cpp:678
 msgid "Artists and Modellers"
 msgstr ""
 
-#: src/guiMainMenu.cpp:773
+#: src/guiMainMenu.cpp:681
 msgid "Translators"
 msgstr ""
 
-#: src/guiMainMenu.cpp:776
+#: src/guiMainMenu.cpp:684
 msgid "Documentation Writters"
 msgstr ""
 
-#: src/guiMainMenu.cpp:779
+#: src/guiMainMenu.cpp:687
 msgid "Testers, Packagers, and Builders"
 msgstr ""
 
-#: src/guiMainMenu.cpp:782
+#: src/guiMainMenu.cpp:690
 msgid "Music and Sound Effects Composers"
 msgstr ""
 
-#: src/guiMainMenu.cpp:785
+#: src/guiMainMenu.cpp:693
 msgid "Other Contributers, and Special Thanks"
 msgstr ""
 
-#: src/guiMainMenu.cpp:789
+#: src/guiMainMenu.cpp:697
 msgid ""
 "Based on Minetest-C55 by Perttu Ahola <celeron55@gmail.com>\n"
 "and contributors: PilzAdam, Taoki, tango_, kahrl (kaaaaaahrl?), darkrose, "
@@ -3737,6 +3738,64 @@ msgstr ""
 msgid "Continue"
 msgstr "Fortsæt"
 
+#: src/guiMultiplayerMenu.cpp:135 src/guiSettingsMenu.cpp:277
+msgid "Main Menu"
+msgstr ""
+
+#: src/guiMultiplayerMenu.cpp:142
+msgid "All Servers"
+msgstr ""
+
+#: src/guiMultiplayerMenu.cpp:148
+msgid "Favourite Servers"
+msgstr ""
+
+#: src/guiMultiplayerMenu.cpp:154
+#, fuzzy
+msgid "Custom Connect"
+msgstr "Logud"
+
+#: src/guiMultiplayerMenu.cpp:169
+msgid "Custom Connection"
+msgstr ""
+
+#: src/guiMultiplayerMenu.cpp:176
+msgid "Address/Port"
+msgstr "Adresse/port"
+
+#: src/guiMultiplayerMenu.cpp:201 src/guiMultiplayerMenu.cpp:313
+msgid "Add to Favourites"
+msgstr ""
+
+#: src/guiMultiplayerMenu.cpp:206 src/guiMultiplayerMenu.cpp:320
+#, fuzzy
+msgid "Connect"
+msgstr "Logud"
+
+#: src/guiMultiplayerMenu.cpp:213
+msgid "Name/Password"
+msgstr "Navn/kodeord"
+
+#: src/guiMultiplayerMenu.cpp:240
+msgid "Join Server"
+msgstr ""
+
+#: src/guiMultiplayerMenu.cpp:262
+msgid "My Favourites"
+msgstr ""
+
+#: src/guiMultiplayerMenu.cpp:265
+msgid "Server List"
+msgstr ""
+
+#: src/guiMultiplayerMenu.cpp:270
+msgid "Get New List"
+msgstr ""
+
+#: src/guiMultiplayerMenu.cpp:307
+msgid "Remove from Favourites"
+msgstr ""
+
 #: src/guiPasswordChange.cpp:105
 msgid "Old Password"
 msgstr "Gamle kodeord"
@@ -3777,11 +3836,11 @@ msgstr "Frem"
 msgid "Backward"
 msgstr "Tilbage"
 
-#: src/guiSettingsMenu.cpp:72 src/keycode.cpp:234
+#: src/guiSettingsMenu.cpp:72 src/keycode.cpp:263
 msgid "Left"
 msgstr "Venstre"
 
-#: src/guiSettingsMenu.cpp:73 src/keycode.cpp:234
+#: src/guiSettingsMenu.cpp:73 src/keycode.cpp:265
 msgid "Right"
 msgstr "Højre"
 
@@ -3819,11 +3878,11 @@ msgstr "Afstands load"
 msgid "Toggle Fly"
 msgstr "Flyvning"
 
-#: src/guiSettingsMenu.cpp:82 src/keycode.cpp:234
+#: src/guiSettingsMenu.cpp:82 src/keycode.cpp:264
 msgid "Up"
 msgstr "Op"
 
-#: src/guiSettingsMenu.cpp:83 src/keycode.cpp:234
+#: src/guiSettingsMenu.cpp:83 src/keycode.cpp:266
 msgid "Down"
 msgstr "Ned"
 
@@ -3870,10 +3929,6 @@ msgstr ""
 msgid "Next Item"
 msgstr "Næste"
 
-#: src/guiSettingsMenu.cpp:277
-msgid "Main Menu"
-msgstr ""
-
 #: src/guiSettingsMenu.cpp:284 src/guiSettingsMenu.cpp:311
 #, fuzzy
 msgid "Controls"
@@ -3982,364 +4037,577 @@ msgstr ""
 msgid "Cold Protection: %d:%02d"
 msgstr ""
 
-#: src/inventory.cpp:230 src/inventory.cpp:352
-msgid "Cookable: Yes"
-msgstr ""
-
-#: src/inventory.cpp:235 src/inventory.cpp:357 src/inventory.cpp:532
-msgid "Fuel Burn Time: "
-msgstr ""
-
-#: src/inventory.cpp:321
-msgid "Hunger: "
-msgstr ""
-
-#: src/inventory.cpp:327
-msgid "Health: "
-msgstr ""
-
-#: src/inventory.cpp:334
-msgid "Cold Protection: "
-msgstr ""
-
-#: src/inventory.cpp:343
-msgid "Energy Boost: "
-msgstr ""
-
-#: src/inventory.cpp:521
-msgid "Strength: "
-msgstr ""
-
-#: src/inventory.cpp:524
-msgid "Speed: "
-msgstr ""
-
-#: src/inventory.cpp:527
-msgid "Level: "
-msgstr ""
-
-#: src/inventory.cpp:557
+#: src/inventory.cpp:246 src/inventory.cpp:580
 #, fuzzy
 msgid "Contains: "
 msgstr "Fortsæt"
 
-#: src/inventory.cpp:643
+#: src/inventory.cpp:253 src/inventory.cpp:375
+msgid "Cookable: Yes"
+msgstr ""
+
+#: src/inventory.cpp:258 src/inventory.cpp:380 src/inventory.cpp:555
+msgid "Fuel Burn Time: "
+msgstr ""
+
+#: src/inventory.cpp:344
+msgid "Hunger: "
+msgstr ""
+
+#: src/inventory.cpp:350
+msgid "Health: "
+msgstr ""
+
+#: src/inventory.cpp:357
+msgid "Cold Protection: "
+msgstr ""
+
+#: src/inventory.cpp:366
+msgid "Energy Boost: "
+msgstr ""
+
+#: src/inventory.cpp:544
+msgid "Strength: "
+msgstr ""
+
+#: src/inventory.cpp:547
+msgid "Speed: "
+msgstr ""
+
+#: src/inventory.cpp:550
+msgid "Level: "
+msgstr ""
+
+#: src/inventory.cpp:666
 msgid "Armour: "
 msgstr ""
 
-#: src/inventory.cpp:649
+#: src/inventory.cpp:672
 msgid "Warmth: "
 msgstr ""
 
-#: src/inventory.cpp:655
+#: src/inventory.cpp:678
 msgid "Pressure: "
 msgstr ""
 
-#: src/inventory.cpp:661
+#: src/inventory.cpp:684
 msgid "Suffocation: "
 msgstr ""
 
-#: src/inventory.cpp:667
+#: src/inventory.cpp:690
 msgid "Durability: "
 msgstr ""
 
-#: src/inventory.cpp:672
+#: src/inventory.cpp:695
 msgid "Effect Boost: "
 msgstr ""
 
-#: src/keycode.cpp:229
+#: src/keycode.cpp:232
+msgid "-"
+msgstr ""
+
+#: src/keycode.cpp:234
 msgid "Left Button"
 msgstr "Venstre Knap"
 
-#: src/keycode.cpp:229
-msgid "Middle Button"
-msgstr "Midt Knap"
-
-#: src/keycode.cpp:229
+#: src/keycode.cpp:235
 msgid "Right Button"
 msgstr "Højre Knap"
 
-#: src/keycode.cpp:229
+#: src/keycode.cpp:237
+msgid "Middle Button"
+msgstr "Midt Knap"
+
+#: src/keycode.cpp:238
 msgid "X Button 1"
 msgstr ""
 
-#: src/keycode.cpp:230
-msgid "Back"
-msgstr "Tilbage"
-
-#: src/keycode.cpp:230
-msgid "Clear"
-msgstr "Rens"
-
-#: src/keycode.cpp:230
-msgid "Return"
-msgstr "Tilbage"
-
-#: src/keycode.cpp:230
-msgid "Tab"
-msgstr ""
-
-#: src/keycode.cpp:230
+#: src/keycode.cpp:239
 msgid "X Button 2"
 msgstr ""
 
-#: src/keycode.cpp:231
-msgid "Capital"
+#: src/keycode.cpp:240
+msgid "Back"
+msgstr "Tilbage"
+
+#: src/keycode.cpp:241
+msgid "Tab"
 msgstr ""
 
-#: src/keycode.cpp:231
-msgid "Control"
-msgstr "Kontrol"
+#: src/keycode.cpp:242
+msgid "Clear"
+msgstr "Rens"
 
-#: src/keycode.cpp:231
-msgid "Kana"
-msgstr ""
+#: src/keycode.cpp:243
+msgid "Return"
+msgstr "Tilbage"
 
-#: src/keycode.cpp:231
-msgid "Menu"
-msgstr ""
-
-#: src/keycode.cpp:231
-msgid "Pause"
-msgstr ""
-
-#: src/keycode.cpp:231
+#: src/keycode.cpp:244
 msgid "Shift"
 msgstr ""
 
-#: src/keycode.cpp:232
-msgid "Convert"
+#: src/keycode.cpp:245
+msgid "Control"
+msgstr "Kontrol"
+
+#: src/keycode.cpp:246
+msgid "Menu"
 msgstr ""
 
-#: src/keycode.cpp:232
-msgid "Escape"
+#: src/keycode.cpp:247
+msgid "Pause"
 msgstr ""
 
-#: src/keycode.cpp:232
-msgid "Final"
+#: src/keycode.cpp:248
+msgid "Capital"
 msgstr ""
 
-#: src/keycode.cpp:232
+#: src/keycode.cpp:249
+msgid "Kana"
+msgstr ""
+
+#: src/keycode.cpp:250
 msgid "Junja"
 msgstr ""
 
-#: src/keycode.cpp:232
+#: src/keycode.cpp:251
+msgid "Final"
+msgstr ""
+
+#: src/keycode.cpp:252
 msgid "Kanji"
 msgstr ""
 
-#: src/keycode.cpp:232
+#: src/keycode.cpp:253
+msgid "Escape"
+msgstr ""
+
+#: src/keycode.cpp:254
+msgid "Convert"
+msgstr ""
+
+#: src/keycode.cpp:255
 msgid "Nonconvert"
 msgstr ""
 
-#: src/keycode.cpp:233
+#: src/keycode.cpp:256
 msgid "Accept"
 msgstr "Accepter"
 
-#: src/keycode.cpp:233
-msgid "End"
-msgstr "Slut"
-
-#: src/keycode.cpp:233
-msgid "Home"
-msgstr "Hjem"
-
-#: src/keycode.cpp:233
+#: src/keycode.cpp:257
 msgid "Mode Change"
 msgstr "Mode skift"
 
-#: src/keycode.cpp:233
-msgid "Next"
-msgstr "Næste"
-
-#: src/keycode.cpp:233
-msgid "Prior"
-msgstr ""
-
-#: src/keycode.cpp:233
+#: src/keycode.cpp:258
 msgid "Space"
 msgstr "Mellemrum"
 
-#: src/keycode.cpp:234
-msgid "Execute"
+#: src/keycode.cpp:259
+msgid "Prior"
 msgstr ""
 
-#: src/keycode.cpp:234
-msgid "Print"
-msgstr ""
+#: src/keycode.cpp:260
+msgid "Next"
+msgstr "Næste"
 
-#: src/keycode.cpp:234
+#: src/keycode.cpp:261
+msgid "End"
+msgstr "Slut"
+
+#: src/keycode.cpp:262
+msgid "Home"
+msgstr "Hjem"
+
+#: src/keycode.cpp:267
 msgid "Select"
 msgstr "Vælge"
 
-#: src/keycode.cpp:235
-msgid "Delete"
-msgstr "Slet"
+#: src/keycode.cpp:268
+msgid "Print"
+msgstr ""
 
-#: src/keycode.cpp:235
-msgid "Help"
-msgstr "Hjælp"
+#: src/keycode.cpp:269
+msgid "Execute"
+msgstr ""
 
-#: src/keycode.cpp:235
-msgid "Insert"
-msgstr "Indset"
-
-#: src/keycode.cpp:235
+#: src/keycode.cpp:270
 msgid "Snapshot"
 msgstr "Screenshot"
 
-#: src/keycode.cpp:238
+#: src/keycode.cpp:271
+msgid "Insert"
+msgstr "Indset"
+
+#: src/keycode.cpp:272
+msgid "Delete"
+msgstr "Slet"
+
+#: src/keycode.cpp:273
+msgid "Help"
+msgstr "Hjælp"
+
+#: src/keycode.cpp:274
+msgid "0"
+msgstr ""
+
+#: src/keycode.cpp:275
+msgid "1"
+msgstr ""
+
+#: src/keycode.cpp:276
+msgid "2"
+msgstr ""
+
+#: src/keycode.cpp:277
+msgid "3"
+msgstr ""
+
+#: src/keycode.cpp:278
+msgid "4"
+msgstr ""
+
+#: src/keycode.cpp:279
+msgid "5"
+msgstr ""
+
+#: src/keycode.cpp:280
+msgid "6"
+msgstr ""
+
+#: src/keycode.cpp:281
+msgid "7"
+msgstr ""
+
+#: src/keycode.cpp:282
+msgid "8"
+msgstr ""
+
+#: src/keycode.cpp:283
+msgid "9"
+msgstr ""
+
+#: src/keycode.cpp:284
+msgid "A"
+msgstr ""
+
+#: src/keycode.cpp:285
+msgid "B"
+msgstr ""
+
+#: src/keycode.cpp:286
+msgid "C"
+msgstr ""
+
+#: src/keycode.cpp:287
+msgid "D"
+msgstr ""
+
+#: src/keycode.cpp:288
+msgid "E"
+msgstr ""
+
+#: src/keycode.cpp:289
+msgid "F"
+msgstr ""
+
+#: src/keycode.cpp:290
+msgid "G"
+msgstr ""
+
+#: src/keycode.cpp:291
+msgid "H"
+msgstr ""
+
+#: src/keycode.cpp:292
+msgid "I"
+msgstr ""
+
+#: src/keycode.cpp:293
+msgid "J"
+msgstr ""
+
+#: src/keycode.cpp:294
+msgid "K"
+msgstr ""
+
+#: src/keycode.cpp:295
+msgid "L"
+msgstr ""
+
+#: src/keycode.cpp:296
+msgid "M"
+msgstr ""
+
+#: src/keycode.cpp:297
+msgid "N"
+msgstr ""
+
+#: src/keycode.cpp:298
+msgid "O"
+msgstr ""
+
+#: src/keycode.cpp:299
+msgid "P"
+msgstr ""
+
+#: src/keycode.cpp:300
+msgid "Q"
+msgstr ""
+
+#: src/keycode.cpp:301
+msgid "R"
+msgstr ""
+
+#: src/keycode.cpp:302
+msgid "S"
+msgstr ""
+
+#: src/keycode.cpp:303
+msgid "T"
+msgstr ""
+
+#: src/keycode.cpp:304
+#, fuzzy
+msgid "U"
+msgstr "Op"
+
+#: src/keycode.cpp:305
+msgid "V"
+msgstr ""
+
+#: src/keycode.cpp:306
+msgid "W"
+msgstr ""
+
+#: src/keycode.cpp:307
+msgid "X"
+msgstr ""
+
+#: src/keycode.cpp:308
+msgid "Y"
+msgstr ""
+
+#: src/keycode.cpp:309
+msgid "Z"
+msgstr ""
+
+#: src/keycode.cpp:310
 msgid "Left Windows"
 msgstr "Venstre windows"
 
-#: src/keycode.cpp:239
-msgid "Apps"
-msgstr ""
-
-#: src/keycode.cpp:239
-msgid "Numpad 0"
-msgstr ""
-
-#: src/keycode.cpp:239
-msgid "Numpad 1"
-msgstr ""
-
-#: src/keycode.cpp:239
+#: src/keycode.cpp:311
 msgid "Right Windows"
 msgstr ""
 
-#: src/keycode.cpp:239
+#: src/keycode.cpp:312
+msgid "Apps"
+msgstr ""
+
+#: src/keycode.cpp:313
 msgid "Sleep"
 msgstr ""
 
-#: src/keycode.cpp:240
+#: src/keycode.cpp:314
+msgid "Numpad 0"
+msgstr ""
+
+#: src/keycode.cpp:315
+msgid "Numpad 1"
+msgstr ""
+
+#: src/keycode.cpp:316
 msgid "Numpad 2"
 msgstr ""
 
-#: src/keycode.cpp:240
+#: src/keycode.cpp:317
 msgid "Numpad 3"
 msgstr ""
 
-#: src/keycode.cpp:240
+#: src/keycode.cpp:318
 msgid "Numpad 4"
 msgstr ""
 
-#: src/keycode.cpp:240
+#: src/keycode.cpp:319
 msgid "Numpad 5"
 msgstr ""
 
-#: src/keycode.cpp:240
+#: src/keycode.cpp:320
 msgid "Numpad 6"
 msgstr ""
 
-#: src/keycode.cpp:240
+#: src/keycode.cpp:321
 msgid "Numpad 7"
 msgstr ""
 
-#: src/keycode.cpp:241
-msgid "Numpad *"
-msgstr ""
-
-#: src/keycode.cpp:241
-msgid "Numpad +"
-msgstr ""
-
-#: src/keycode.cpp:241
-msgid "Numpad -"
-msgstr ""
-
-#: src/keycode.cpp:241
-msgid "Numpad /"
-msgstr ""
-
-#: src/keycode.cpp:241
+#: src/keycode.cpp:322
 msgid "Numpad 8"
 msgstr ""
 
-#: src/keycode.cpp:241
+#: src/keycode.cpp:323
 msgid "Numpad 9"
 msgstr ""
 
-#: src/keycode.cpp:245
+#: src/keycode.cpp:324
+msgid "Numpad *"
+msgstr ""
+
+#: src/keycode.cpp:325
+msgid "Numpad +"
+msgstr ""
+
+#: src/keycode.cpp:326 src/keycode.cpp:329
+msgid "Numpad /"
+msgstr ""
+
+#: src/keycode.cpp:327
+msgid "Numpad -"
+msgstr ""
+
+#: src/keycode.cpp:328
+msgid "Numpad ."
+msgstr ""
+
+#: src/keycode.cpp:330
+msgid "F10"
+msgstr ""
+
+#: src/keycode.cpp:331
+msgid "F11"
+msgstr ""
+
+#: src/keycode.cpp:332
+msgid "F12"
+msgstr ""
+
+#: src/keycode.cpp:333
+msgid "F13"
+msgstr ""
+
+#: src/keycode.cpp:334
+msgid "F14"
+msgstr ""
+
+#: src/keycode.cpp:335
+msgid "F15"
+msgstr ""
+
+#: src/keycode.cpp:336
+msgid "F16"
+msgstr ""
+
+#: src/keycode.cpp:337
+msgid "F17"
+msgstr ""
+
+#: src/keycode.cpp:338
+msgid "F18"
+msgstr ""
+
+#: src/keycode.cpp:339
+msgid "F19"
+msgstr ""
+
+#: src/keycode.cpp:340
+msgid "F20"
+msgstr ""
+
+#: src/keycode.cpp:341
+msgid "F21"
+msgstr ""
+
+#: src/keycode.cpp:342
+msgid "F22"
+msgstr ""
+
+#: src/keycode.cpp:343
+msgid "F23"
+msgstr ""
+
+#: src/keycode.cpp:344
+msgid "F24"
+msgstr ""
+
+#: src/keycode.cpp:345
 msgid "Num Lock"
 msgstr ""
 
-#: src/keycode.cpp:245
+#: src/keycode.cpp:346
 msgid "Scroll Lock"
 msgstr ""
 
-#: src/keycode.cpp:246
+#: src/keycode.cpp:347
 msgid "Left Shift"
 msgstr ""
 
-#: src/keycode.cpp:246
+#: src/keycode.cpp:348
 #, fuzzy
 msgid "Right Shift"
 msgstr "Højre"
 
-#: src/keycode.cpp:247
+#: src/keycode.cpp:349
 msgid "Left Control"
 msgstr ""
 
-#: src/keycode.cpp:247
-msgid "Left Menu"
-msgstr ""
-
-#: src/keycode.cpp:247
+#: src/keycode.cpp:350
 msgid "Right Control"
 msgstr ""
 
-#: src/keycode.cpp:247
+#: src/keycode.cpp:351
+msgid "Left Menu"
+msgstr ""
+
+#: src/keycode.cpp:352
 msgid "Right Menu"
 msgstr ""
 
-#: src/keycode.cpp:249
-msgid "Comma"
-msgstr ""
-
-#: src/keycode.cpp:249
-msgid "Minus"
-msgstr ""
-
-#: src/keycode.cpp:249
-msgid "Period"
-msgstr ""
-
-#: src/keycode.cpp:249
+#: src/keycode.cpp:353
 msgid "Plus"
 msgstr ""
 
-#: src/keycode.cpp:253
+#: src/keycode.cpp:354
+msgid "Comma"
+msgstr ""
+
+#: src/keycode.cpp:355
+msgid "Minus"
+msgstr ""
+
+#: src/keycode.cpp:356
+msgid "Period"
+msgstr ""
+
+#: src/keycode.cpp:357
 msgid "Attn"
 msgstr ""
 
-#: src/keycode.cpp:253
+#: src/keycode.cpp:358
 msgid "CrSel"
 msgstr ""
 
-#: src/keycode.cpp:254
-msgid "Erase OEF"
-msgstr ""
-
-#: src/keycode.cpp:254
+#: src/keycode.cpp:359
 msgid "ExSel"
 msgstr ""
 
-#: src/keycode.cpp:254
-msgid "OEM Clear"
+#: src/keycode.cpp:360
+msgid "Erase OEF"
 msgstr ""
 
-#: src/keycode.cpp:254
-msgid "PA1"
-msgstr ""
-
-#: src/keycode.cpp:254
+#: src/keycode.cpp:361
 msgid "Play"
 msgstr "Spil"
 
-#: src/keycode.cpp:254
+#: src/keycode.cpp:362
 msgid "Zoom"
 msgstr ""
 
+#: src/keycode.cpp:363
+msgid "PA1"
+msgstr ""
+
+#: src/keycode.cpp:364
+msgid "OEM Clear"
+msgstr ""
+
 #: src/main.cpp:1131
 msgid "Setting Up UI"
 msgstr ""
@@ -4356,54 +4624,86 @@ msgstr ""
 msgid "Setting Up Sound"
 msgstr ""
 
-#: src/mapnode.cpp:282
+#: src/mapnode.cpp:285
 msgid "Loading Base MapNodes"
 msgstr ""
 
-#: src/mapnode.cpp:286
+#: src/mapnode.cpp:289
 msgid "Loading Circuit MapNodes"
 msgstr ""
 
-#: src/mapnode.cpp:290
+#: src/mapnode.cpp:293
 msgid "Loading Plant MapNodes"
 msgstr ""
 
-#: src/mapnode.cpp:294
+#: src/mapnode.cpp:297
 msgid "Loading Farming MapNodes"
 msgstr ""
 
-#: src/mapnode.cpp:298
+#: src/mapnode.cpp:301
 msgid "Loading Decorative MapNodes"
 msgstr ""
 
-#: src/mapnode.cpp:302
+#: src/mapnode.cpp:305
 msgid "Loading Interactive MapNodes"
 msgstr ""
 
-#: src/mapnode.cpp:306
+#: src/mapnode.cpp:309
 msgid "Loading Special MapNodes"
 msgstr ""
 
-#~ msgid "Use"
-#~ msgstr "Brug"
+#: src/mineral.cpp:93
+msgid "Coal"
+msgstr ""
 
-#~ msgid "Toggle fast"
-#~ msgstr "Hurtig flyvning"
+#: src/mineral.cpp:99
+msgid "Iron"
+msgstr ""
 
-#~ msgid "Print stacks"
-#~ msgstr "Print stykker"
+#: src/mineral.cpp:106
+msgid "Tin"
+msgstr ""
 
-#~ msgid "Change keys"
-#~ msgstr "Indstillinger"
+#: src/mineral.cpp:113
+msgid "Copper"
+msgstr ""
 
-#~ msgid "Exit to OS"
-#~ msgstr "Afslut til OS"
+#: src/mineral.cpp:121
+msgid "Silver"
+msgstr ""
 
-#~ msgid "Leave address blank to start a local server."
-#~ msgstr "Lad black for at spille localt"
+#: src/mineral.cpp:128
+msgid "Gold"
+msgstr ""
+
+#: src/mineral.cpp:135
+msgid "Quartz"
+msgstr ""
+
+#: src/mineral.cpp:157
+msgid "Turquoise"
+msgstr ""
+
+#~ msgid "Proceed"
+#~ msgstr "Fortsæt"
 
 #~ msgid "Delete map"
 #~ msgstr "Slet mappen"
 
-#~ msgid "Proceed"
-#~ msgstr "Fortsæt"
+#~ msgid "Leave address blank to start a local server."
+#~ msgstr "Lad black for at spille localt"
+
+#~ msgid "Exit to OS"
+#~ msgstr "Afslut til OS"
+
+#~ msgid "Change keys"
+#~ msgstr "Indstillinger"
+
+#~ msgid "Print stacks"
+#~ msgstr "Print stykker"
+
+#~ msgid "Toggle fast"
+#~ msgstr "Hurtig flyvning"
+
+#~ msgid "Use"
+#~ msgstr "Brug"
diff --git a/po/de/voxelands.po b/po/de/voxelands.po
index 944e16a..d95fea5 100644
--- a/po/de/voxelands.po
+++ b/po/de/voxelands.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Lisa 'darkrose' Milne
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # Wuzzy <almikes@aol.com>, 2014-2015
 # Jan Rößler <soognarf@googlemail.com>, 2014
@@ -10,14 +10,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Voxelands\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-10-19 01:55+1000\n"
+"POT-Creation-Date: 2015-12-21 11:27+1000\n"
 "PO-Revision-Date: 2015-10-18 22:10+0000\n"
 "Last-Translator: Wuzzy <almikes@aol.com>\n"
-"Language-Team: German (http://www.transifex.com/voxelands/voxelands/language/de/)\n"
+"Language-Team: German (http://www.transifex.com/voxelands/voxelands/language/"
+"de/)\n"
+"Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: src/character_creator.cpp:55
@@ -230,9 +231,18 @@ msgstr "Leinenschuhe"
 
 #: src/character_creator.cpp:202
 msgid ""
-"Here you can create your default character, this is how other players will see you in-game. When you join a new server you will start with the clothing you select here. Additional clothing, both protective and decorative, can be crafted in-game.\n"
+"Here you can create your default character, this is how other players will "
+"see you in-game. When you join a new server you will start with the clothing "
+"you select here. Additional clothing, both protective and decorative, can be "
+"crafted in-game.\n"
 "You can return here from the main menu anytime to change your character."
-msgstr "Hier können Sie Ihre Standardfigur erstellen; so werden Sie von anderen Spieler im Spiel gesehen. Wenn Sie einem neuen Server beitreten, werden Sie mit der hier ausgewählten Kleidung anfangen. Weitere Kleidung, sowohl zum Schutz als auch zur Dekoration, kann im Spiel angefertigt werden.\nSie können jederzeit hierher aus dem Hauptmenü zurückkehren, um Ihre Figur zu wechseln."
+msgstr ""
+"Hier können Sie Ihre Standardfigur erstellen; so werden Sie von anderen "
+"Spieler im Spiel gesehen. Wenn Sie einem neuen Server beitreten, werden Sie "
+"mit der hier ausgewählten Kleidung anfangen. Weitere Kleidung, sowohl zum "
+"Schutz als auch zur Dekoration, kann im Spiel angefertigt werden.\n"
+"Sie können jederzeit hierher aus dem Hauptmenü zurückkehren, um Ihre Figur "
+"zu wechseln."
 
 #: src/character_creator.cpp:223
 msgid "Create Your Character"
@@ -266,7 +276,7 @@ msgstr "Dünner"
 msgid "Done"
 msgstr "Fertig"
 
-#: src/character_creator.cpp:423 src/keycode.cpp:229
+#: src/character_creator.cpp:423 src/keycode.cpp:236
 msgid "Cancel"
 msgstr "Abbruch"
 
@@ -1118,7 +1128,7 @@ msgstr "Feuerstein"
 msgid "Steel Ingot"
 msgstr "Stahlbarren"
 
-#: src/content_craftitem.cpp:225 src/content_mapnode.cpp:710
+#: src/content_craftitem.cpp:225 src/content_mapnode.cpp:723
 msgid "Brick"
 msgstr "Ziegel"
 
@@ -1546,11 +1556,11 @@ msgstr "Rohmithril"
 msgid "Unbound Mithril"
 msgstr "bindungsloses Mithril"
 
-#: src/content_craftitem.cpp:1516
+#: src/content_craftitem.cpp:1516 src/mineral.cpp:142
 msgid "Mithril"
 msgstr "Mithril"
 
-#: src/content_craftitem.cpp:1525
+#: src/content_craftitem.cpp:1525 src/mineral.cpp:149
 msgid "Ruby"
 msgstr "Rubin"
 
@@ -1558,15 +1568,15 @@ msgstr "Rubin"
 msgid "Turquiose"
 msgstr "Türkis"
 
-#: src/content_craftitem.cpp:1541
+#: src/content_craftitem.cpp:1541 src/mineral.cpp:165
 msgid "Amethyst"
 msgstr "Amethyst"
 
-#: src/content_craftitem.cpp:1549
+#: src/content_craftitem.cpp:1549 src/mineral.cpp:173
 msgid "Sapphire"
 msgstr "Saphir"
 
-#: src/content_craftitem.cpp:1557
+#: src/content_craftitem.cpp:1557 src/mineral.cpp:181
 msgid "Sunstone"
 msgstr "Sonnenstein"
 
@@ -1578,392 +1588,396 @@ msgstr "Stein"
 msgid "Limestone"
 msgstr "Kalkstein"
 
-#: src/content_mapnode.cpp:219
+#: src/content_mapnode.cpp:221
+msgid "Marble"
+msgstr ""
+
+#: src/content_mapnode.cpp:232
 msgid "Rock"
 msgstr "Gestein"
 
-#: src/content_mapnode.cpp:241
+#: src/content_mapnode.cpp:254
 msgid "Ice"
 msgstr "Eis"
 
-#: src/content_mapnode.cpp:257
+#: src/content_mapnode.cpp:270
 msgid "Coal Block"
 msgstr "Kohleblock"
 
-#: src/content_mapnode.cpp:274
+#: src/content_mapnode.cpp:287
 msgid "Charcoal Block"
 msgstr "Holzkohleblock"
 
-#: src/content_mapnode.cpp:291
+#: src/content_mapnode.cpp:304
 msgid "Stone Brick"
 msgstr "Steinziegel"
 
-#: src/content_mapnode.cpp:305
+#: src/content_mapnode.cpp:318
 msgid "Stone Block"
 msgstr "Steinblock"
 
-#: src/content_mapnode.cpp:319
+#: src/content_mapnode.cpp:332
 msgid "Rough Stone Brick"
 msgstr "grober Steinziegel"
 
-#: src/content_mapnode.cpp:336
+#: src/content_mapnode.cpp:349
 msgid "Rough Stone Block"
 msgstr "grober Steinblock"
 
-#: src/content_mapnode.cpp:352 src/content_mapnode.cpp:385
-#: src/content_mapnode.cpp:399 src/content_mapnode.cpp:432
+#: src/content_mapnode.cpp:365 src/content_mapnode.cpp:398
+#: src/content_mapnode.cpp:412 src/content_mapnode.cpp:445
 msgid "Grass"
 msgstr "Gras"
 
-#: src/content_mapnode.cpp:370 src/content_mapnode.cpp:417
+#: src/content_mapnode.cpp:383 src/content_mapnode.cpp:430
 msgid "Growing Grass"
 msgstr "wachsendes Gras"
 
-#: src/content_mapnode.cpp:446
+#: src/content_mapnode.cpp:459
 msgid "Muddy Snow"
 msgstr "matschiger Schnee"
 
-#: src/content_mapnode.cpp:462
+#: src/content_mapnode.cpp:475
 msgid "Mud"
 msgstr "Matsch"
 
-#: src/content_mapnode.cpp:478
+#: src/content_mapnode.cpp:491
 msgid "Ash Block"
 msgstr "Ascheblock"
 
-#: src/content_mapnode.cpp:493
+#: src/content_mapnode.cpp:506
 msgid "Sand"
 msgstr "Sand"
 
-#: src/content_mapnode.cpp:512
+#: src/content_mapnode.cpp:525
 msgid "Gravel"
 msgstr "Kies"
 
-#: src/content_mapnode.cpp:529
+#: src/content_mapnode.cpp:542
 msgid "Sand Stone"
 msgstr "Sandstein"
 
-#: src/content_mapnode.cpp:544
+#: src/content_mapnode.cpp:557
 msgid "Sand Stone Bricks"
 msgstr "Sandsteinziegel"
 
-#: src/content_mapnode.cpp:559
+#: src/content_mapnode.cpp:572
 msgid "Sand Stone Blocks"
 msgstr "Sandsteinblock"
 
-#: src/content_mapnode.cpp:574
+#: src/content_mapnode.cpp:587
 msgid "Clay"
 msgstr "Ton"
 
-#: src/content_mapnode.cpp:591
+#: src/content_mapnode.cpp:604
 msgid "Blue Clay"
 msgstr "blauer Ton"
 
-#: src/content_mapnode.cpp:608
+#: src/content_mapnode.cpp:621
 msgid "Green Clay"
 msgstr "grüner Ton"
 
-#: src/content_mapnode.cpp:625
+#: src/content_mapnode.cpp:638
 msgid "Orange Clay"
 msgstr "orange Ton"
 
-#: src/content_mapnode.cpp:642
+#: src/content_mapnode.cpp:655
 msgid "Purple Clay"
 msgstr "lila Ton"
 
-#: src/content_mapnode.cpp:659
+#: src/content_mapnode.cpp:672
 msgid "Red Clay"
 msgstr "roter Ton"
 
-#: src/content_mapnode.cpp:676
+#: src/content_mapnode.cpp:689
 msgid "Yellow Clay"
 msgstr "gelber Ton"
 
-#: src/content_mapnode.cpp:693
+#: src/content_mapnode.cpp:706
 msgid "Black Clay"
 msgstr "schwarzer Ton"
 
-#: src/content_mapnode.cpp:729
+#: src/content_mapnode.cpp:742
 msgid "Terracotta"
 msgstr "Terrakotta"
 
-#: src/content_mapnode.cpp:741
+#: src/content_mapnode.cpp:754
 msgid "Terracotta Brick"
 msgstr "Terrakottaziegel"
 
-#: src/content_mapnode.cpp:755
+#: src/content_mapnode.cpp:768
 msgid "Terracotta Block"
 msgstr "Terrakottablock"
 
-#: src/content_mapnode.cpp:769
+#: src/content_mapnode.cpp:782
 msgid "Terracotta Tile"
 msgstr "Terrakottaplatte"
 
-#: src/content_mapnode.cpp:789
+#: src/content_mapnode.cpp:802
 msgid "Glass"
 msgstr "Glas"
 
-#: src/content_mapnode.cpp:809
+#: src/content_mapnode.cpp:822
 msgid "Blue Glass"
 msgstr "blaues Glas"
 
-#: src/content_mapnode.cpp:831
+#: src/content_mapnode.cpp:844
 msgid "Green Glass"
 msgstr "grünes Glas"
 
-#: src/content_mapnode.cpp:853
+#: src/content_mapnode.cpp:866
 msgid "Orange Glass"
 msgstr "orange Glas"
 
-#: src/content_mapnode.cpp:875
+#: src/content_mapnode.cpp:888
 msgid "Purple Glass"
 msgstr "lila Glas"
 
-#: src/content_mapnode.cpp:897
+#: src/content_mapnode.cpp:910
 msgid "Red Glass"
 msgstr "rotes Glas"
 
-#: src/content_mapnode.cpp:919
+#: src/content_mapnode.cpp:932
 msgid "Yellow Glass"
 msgstr "gelbes Glas"
 
-#: src/content_mapnode.cpp:941
+#: src/content_mapnode.cpp:954
 msgid "Black Glass"
 msgstr "schwarzes Glas"
 
-#: src/content_mapnode.cpp:963
+#: src/content_mapnode.cpp:976
 msgid "Glass Pane"
 msgstr "Glasscheibe"
 
-#: src/content_mapnode.cpp:997
+#: src/content_mapnode.cpp:1010
 msgid "Blue Glass Pane"
 msgstr "blaue Glasscheibe"
 
-#: src/content_mapnode.cpp:1032
+#: src/content_mapnode.cpp:1045
 msgid "Green Glass Pane"
 msgstr "grüne Glasscheibe"
 
-#: src/content_mapnode.cpp:1067
+#: src/content_mapnode.cpp:1080
 msgid "Orange Glass Pane"
 msgstr "orange Glasscheibe"
 
-#: src/content_mapnode.cpp:1102
+#: src/content_mapnode.cpp:1115
 msgid "Purple Glass Pane"
 msgstr "lila Glasscheibe"
 
-#: src/content_mapnode.cpp:1137
+#: src/content_mapnode.cpp:1150
 msgid "Red Glass Pane"
 msgstr "rote Glasscheibe"
 
-#: src/content_mapnode.cpp:1172
+#: src/content_mapnode.cpp:1185
 msgid "Yellow Glass Pane"
 msgstr "gelbe Glasscheibe"
 
-#: src/content_mapnode.cpp:1207
+#: src/content_mapnode.cpp:1220
 msgid "Black Glass Pane"
 msgstr "schwarze Glasscheibe"
 
-#: src/content_mapnode.cpp:1242 src/content_mapnode_farm.cpp:333
+#: src/content_mapnode.cpp:1255 src/content_mapnode_farm.cpp:333
 msgid "Glass Light"
 msgstr "Glaslampe"
 
-#: src/content_mapnode.cpp:1265
+#: src/content_mapnode.cpp:1278
 msgid "Wood"
 msgstr "Holz"
 
-#: src/content_mapnode.cpp:1291
+#: src/content_mapnode.cpp:1304
 msgid "Jungle Wood"
 msgstr "Dschungelholz"
 
-#: src/content_mapnode.cpp:1316
+#: src/content_mapnode.cpp:1329
 msgid "Pine"
 msgstr "Pinienholz"
 
-#: src/content_mapnode.cpp:1341
+#: src/content_mapnode.cpp:1354
 msgid "Sponge"
 msgstr "Schwamm"
 
-#: src/content_mapnode.cpp:1356
+#: src/content_mapnode.cpp:1369
 msgid "Waterlogged Sponge"
 msgstr "wassergetränkter Schwamm"
 
-#: src/content_mapnode.cpp:1371
+#: src/content_mapnode.cpp:1384
 msgid "Hay Bale"
 msgstr "Heuballen"
 
-#: src/content_mapnode.cpp:1388
+#: src/content_mapnode.cpp:1401
 msgid "Raw Apple Pie"
 msgstr "Apfelkuchenteig"
 
-#: src/content_mapnode.cpp:1417
+#: src/content_mapnode.cpp:1430
 msgid "Apple Pie"
 msgstr "Apfelkuchen"
 
-#: src/content_mapnode.cpp:1512
+#: src/content_mapnode.cpp:1525
 msgid "Raw Pumpkin Pie"
 msgstr "Kürbiskuchenteig"
 
-#: src/content_mapnode.cpp:1541
+#: src/content_mapnode.cpp:1554
 msgid "Pumpkin Pie"
 msgstr "Kürbiskuchen"
 
-#: src/content_mapnode.cpp:1636 src/content_mapnode.cpp:1715
+#: src/content_mapnode.cpp:1649 src/content_mapnode.cpp:1728
 msgid "Snow"
 msgstr "Schnee"
 
-#: src/content_mapnode.cpp:1652
+#: src/content_mapnode.cpp:1665
 msgid "Snowman"
 msgstr "Schneemann"
 
-#: src/content_mapnode.cpp:1738 src/content_mapnode_farm.cpp:445
+#: src/content_mapnode.cpp:1752 src/content_mapnode_farm.cpp:445
 msgid "Cotton"
 msgstr "Baumwolle"
 
-#: src/content_mapnode.cpp:1769
+#: src/content_mapnode.cpp:1783
 msgid "Blue Cotton"
 msgstr "blaue Baumwolle"
 
-#: src/content_mapnode.cpp:1786
+#: src/content_mapnode.cpp:1800
 msgid "Green Cotton"
 msgstr "grüne Baumwolle"
 
-#: src/content_mapnode.cpp:1803
+#: src/content_mapnode.cpp:1817
 msgid "Orange Cotton"
 msgstr "orange Baumwolle"
 
-#: src/content_mapnode.cpp:1820
+#: src/content_mapnode.cpp:1834
 msgid "Purple Cotton"
 msgstr "lila Baumwolle"
 
-#: src/content_mapnode.cpp:1837
+#: src/content_mapnode.cpp:1851
 msgid "Red Cotton"
 msgstr "rote Baumwolle"
 
-#: src/content_mapnode.cpp:1854
+#: src/content_mapnode.cpp:1868
 msgid "Yellow Cotton"
 msgstr "gelbe Baumwolle"
 
-#: src/content_mapnode.cpp:1871
+#: src/content_mapnode.cpp:1885
 msgid "Black Cotton"
 msgstr "schwarze Baumwolle"
 
-#: src/content_mapnode.cpp:1888
+#: src/content_mapnode.cpp:1902
 msgid "Carpet"
 msgstr "Teppich"
 
-#: src/content_mapnode.cpp:1911
+#: src/content_mapnode.cpp:1925
 msgid "Blue Carpet"
 msgstr "blauer Teppich"
 
-#: src/content_mapnode.cpp:1935
+#: src/content_mapnode.cpp:1949
 msgid "Green Carpet"
 msgstr "grüner Teppich"
 
-#: src/content_mapnode.cpp:1959
+#: src/content_mapnode.cpp:1973
 msgid "Orange Carpet"
 msgstr "orange Teppich"
 
-#: src/content_mapnode.cpp:1983
+#: src/content_mapnode.cpp:1997
 msgid "Purple Carpet"
 msgstr "lila Teppich"
 
-#: src/content_mapnode.cpp:2007
+#: src/content_mapnode.cpp:2021
 msgid "Red Carpet"
 msgstr "roter Teppich"
 
-#: src/content_mapnode.cpp:2031
+#: src/content_mapnode.cpp:2045
 msgid "Yellow Carpet"
 msgstr "gelber Teppich"
 
-#: src/content_mapnode.cpp:2055
+#: src/content_mapnode.cpp:2069
 msgid "Black Carpet"
 msgstr "schwarzer Teppich"
 
-#: src/content_mapnode.cpp:2079
+#: src/content_mapnode.cpp:2093
 msgid "Air"
 msgstr "Luft"
 
-#: src/content_mapnode.cpp:2095
+#: src/content_mapnode.cpp:2109
 msgid "Vacuum"
 msgstr "Vakuum"
 
-#: src/content_mapnode.cpp:2112 src/content_mapnode.cpp:2142
+#: src/content_mapnode.cpp:2126 src/content_mapnode.cpp:2156
 msgid "Water"
 msgstr "Wasser"
 
-#: src/content_mapnode.cpp:2172 src/content_mapnode.cpp:2200
+#: src/content_mapnode.cpp:2186 src/content_mapnode.cpp:2214
 msgid "Lava"
 msgstr "Lava"
 
-#: src/content_mapnode.cpp:2231
+#: src/content_mapnode.cpp:2245
 msgid "Rough Stone"
 msgstr "grober Stein"
 
-#: src/content_mapnode.cpp:2248
+#: src/content_mapnode.cpp:2262
 msgid "Cobble Stone"
 msgstr "Kopfsteinpflaster"
 
-#: src/content_mapnode.cpp:2264
+#: src/content_mapnode.cpp:2278
 msgid "Mossy Cobble Stone"
 msgstr "bemostes Kopfsteinpflaster"
 
-#: src/content_mapnode.cpp:2277
+#: src/content_mapnode.cpp:2291
 msgid "Steel Block"
 msgstr "Stahlblock"
 
-#: src/content_mapnode.cpp:2294
+#: src/content_mapnode.cpp:2308
 msgid "Mithril Block"
 msgstr "Mithrilblock"
 
-#: src/content_mapnode.cpp:2310
+#: src/content_mapnode.cpp:2324
 msgid "Stone Knob"
 msgstr "Steinknauf"
 
-#: src/content_mapnode.cpp:2311
+#: src/content_mapnode.cpp:2325
 msgid "Rough Stone Knob"
 msgstr "grober Steinknauf"
 
-#: src/content_mapnode.cpp:2312
+#: src/content_mapnode.cpp:2326
 msgid "Sandstone Knob"
 msgstr "Sandsteinknauf"
 
-#: src/content_mapnode.cpp:2313
+#: src/content_mapnode.cpp:2327
 msgid "Wooden Knob"
 msgstr "Holzknauf"
 
-#: src/content_mapnode.cpp:2314
+#: src/content_mapnode.cpp:2328
 msgid "Junglewood Knob"
 msgstr "Dschungelholzknauf"
 
-#: src/content_mapnode.cpp:2315
+#: src/content_mapnode.cpp:2329
 msgid "Pine Knob"
 msgstr "Pinienholzknauf"
 
-#: src/content_mapnode.cpp:2319
+#: src/content_mapnode.cpp:2333
 msgid "Copper Block"
 msgstr "Kupferblock"
 
-#: src/content_mapnode.cpp:2336
+#: src/content_mapnode.cpp:2350
 msgid "Gold Block"
 msgstr "Goldblock"
 
-#: src/content_mapnode.cpp:2353
+#: src/content_mapnode.cpp:2367
 msgid "Silver Block"
 msgstr "Silberblock"
 
-#: src/content_mapnode.cpp:2370
+#: src/content_mapnode.cpp:2384
 msgid "Tin Block"
 msgstr "Zinnblock"
 
-#: src/content_mapnode.cpp:2387
+#: src/content_mapnode.cpp:2401
 msgid "Quartz Block"
 msgstr "Quarzblock"
 
-#: src/content_mapnode.cpp:2404
+#: src/content_mapnode.cpp:2418
 msgid "Stone Tiles"
 msgstr "Steinkacheln"
 
-#: src/content_mapnode.cpp:2426
+#: src/content_mapnode.cpp:2440
 msgid "Wood Tiles"
 msgstr "Holzkacheln"
 
@@ -2011,29 +2025,29 @@ msgstr "Nicht-Gatter"
 msgid "Repeater"
 msgstr "Verstärker"
 
-#: src/content_mapnode_circuit.cpp:369 src/content_mapnode_circuit.cpp:393
+#: src/content_mapnode_circuit.cpp:369 src/content_mapnode_circuit.cpp:390
 msgid "Electric Lamp"
 msgstr "elektrische Lampe"
 
-#: src/content_mapnode_circuit.cpp:427 src/content_mapnode_circuit.cpp:462
-#: src/content_mapnode_circuit.cpp:516 src/content_mapnode_circuit.cpp:537
-#: src/content_mapnode_circuit.cpp:582 src/content_mapnode_circuit.cpp:603
+#: src/content_mapnode_circuit.cpp:424 src/content_mapnode_circuit.cpp:459
+#: src/content_mapnode_circuit.cpp:513 src/content_mapnode_circuit.cpp:534
+#: src/content_mapnode_circuit.cpp:579 src/content_mapnode_circuit.cpp:600
 msgid "Piston"
 msgstr "Kolben"
 
-#: src/content_mapnode_circuit.cpp:489 src/content_mapnode_circuit.cpp:560
-#: src/content_mapnode_circuit.cpp:626
+#: src/content_mapnode_circuit.cpp:486 src/content_mapnode_circuit.cpp:557
+#: src/content_mapnode_circuit.cpp:623
 msgid "Piston Arm"
 msgstr "Kolbenarm"
 
-#: src/content_mapnode_circuit.cpp:648 src/content_mapnode_circuit.cpp:676
-#: src/content_mapnode_circuit.cpp:730 src/content_mapnode_circuit.cpp:751
-#: src/content_mapnode_circuit.cpp:796 src/content_mapnode_circuit.cpp:817
+#: src/content_mapnode_circuit.cpp:645 src/content_mapnode_circuit.cpp:673
+#: src/content_mapnode_circuit.cpp:727 src/content_mapnode_circuit.cpp:748
+#: src/content_mapnode_circuit.cpp:793 src/content_mapnode_circuit.cpp:814
 msgid "Sticky Piston"
 msgstr "Klebekolben"
 
-#: src/content_mapnode_circuit.cpp:703 src/content_mapnode_circuit.cpp:774
-#: src/content_mapnode_circuit.cpp:840
+#: src/content_mapnode_circuit.cpp:700 src/content_mapnode_circuit.cpp:771
+#: src/content_mapnode_circuit.cpp:837
 msgid "Sticky Piston Arm"
 msgstr "Klebekolbenarm"
 
@@ -2173,7 +2187,7 @@ msgstr "Trauben"
 msgid "Trellis Grape"
 msgstr "Spaliertrauben"
 
-#: src/content_mapnode_farm.cpp:493 src/content_mapnode_farm.cpp:512
+#: src/content_mapnode_farm.cpp:494 src/content_mapnode_farm.cpp:513
 msgid "Dead Vine"
 msgstr "tote Weinranke"
 
@@ -2189,131 +2203,137 @@ msgstr "Dschungelholzbücherregal"
 msgid "Pine Book Shelf"
 msgstr "Pinienbücherregal"
 
-#: src/content_mapnode_furniture.cpp:150 src/content_mapnode_furniture.cpp:169
-#: src/content_mapnode_furniture.cpp:188 src/content_mapnode_furniture.cpp:207
-#: src/content_mapnode_furniture.cpp:226 src/content_mapnode_furniture.cpp:245
+#: src/content_mapnode_furniture.cpp:150 src/content_mapnode_furniture.cpp:170
+#: src/content_mapnode_furniture.cpp:190 src/content_mapnode_furniture.cpp:210
+#: src/content_mapnode_furniture.cpp:230 src/content_mapnode_furniture.cpp:250
 msgid "Couch"
 msgstr "Sofa"
 
-#: src/content_mapnode_furniture.cpp:274 src/content_mapnode_furniture.cpp:293
-#: src/content_mapnode_furniture.cpp:312 src/content_mapnode_furniture.cpp:331
-#: src/content_mapnode_furniture.cpp:350 src/content_mapnode_furniture.cpp:369
+#: src/content_mapnode_furniture.cpp:280 src/content_mapnode_furniture.cpp:300
+#: src/content_mapnode_furniture.cpp:320 src/content_mapnode_furniture.cpp:340
+#: src/content_mapnode_furniture.cpp:360 src/content_mapnode_furniture.cpp:380
 msgid "Blue Couch"
 msgstr "blaues Sofa"
 
-#: src/content_mapnode_furniture.cpp:392 src/content_mapnode_furniture.cpp:411
-#: src/content_mapnode_furniture.cpp:430 src/content_mapnode_furniture.cpp:449
-#: src/content_mapnode_furniture.cpp:468 src/content_mapnode_furniture.cpp:487
+#: src/content_mapnode_furniture.cpp:404 src/content_mapnode_furniture.cpp:424
+#: src/content_mapnode_furniture.cpp:444 src/content_mapnode_furniture.cpp:464
+#: src/content_mapnode_furniture.cpp:484 src/content_mapnode_furniture.cpp:504
 msgid "Green Couch"
 msgstr "grünes Sofa"
 
-#: src/content_mapnode_furniture.cpp:510 src/content_mapnode_furniture.cpp:529
-#: src/content_mapnode_furniture.cpp:548 src/content_mapnode_furniture.cpp:567
-#: src/content_mapnode_furniture.cpp:586 src/content_mapnode_furniture.cpp:605
+#: src/content_mapnode_furniture.cpp:528 src/content_mapnode_furniture.cpp:548
+#: src/content_mapnode_furniture.cpp:568 src/content_mapnode_furniture.cpp:588
+#: src/content_mapnode_furniture.cpp:608 src/content_mapnode_furniture.cpp:628
 msgid "Orange Couch"
 msgstr "orange Sofa"
 
-#: src/content_mapnode_furniture.cpp:628 src/content_mapnode_furniture.cpp:647
-#: src/content_mapnode_furniture.cpp:666 src/content_mapnode_furniture.cpp:685
-#: src/content_mapnode_furniture.cpp:704 src/content_mapnode_furniture.cpp:723
+#: src/content_mapnode_furniture.cpp:652 src/content_mapnode_furniture.cpp:672
+#: src/content_mapnode_furniture.cpp:692 src/content_mapnode_furniture.cpp:712
+#: src/content_mapnode_furniture.cpp:732 src/content_mapnode_furniture.cpp:752
 msgid "Purple Couch"
 msgstr "lila Sofa"
 
-#: src/content_mapnode_furniture.cpp:746 src/content_mapnode_furniture.cpp:765
-#: src/content_mapnode_furniture.cpp:784 src/content_mapnode_furniture.cpp:803
-#: src/content_mapnode_furniture.cpp:822 src/content_mapnode_furniture.cpp:841
+#: src/content_mapnode_furniture.cpp:776 src/content_mapnode_furniture.cpp:796
+#: src/content_mapnode_furniture.cpp:816 src/content_mapnode_furniture.cpp:836
+#: src/content_mapnode_furniture.cpp:856 src/content_mapnode_furniture.cpp:876
 msgid "Red Couch"
 msgstr "rotes Sofa"
 
-#: src/content_mapnode_furniture.cpp:864 src/content_mapnode_furniture.cpp:883
-#: src/content_mapnode_furniture.cpp:902 src/content_mapnode_furniture.cpp:921
-#: src/content_mapnode_furniture.cpp:940 src/content_mapnode_furniture.cpp:959
+#: src/content_mapnode_furniture.cpp:900 src/content_mapnode_furniture.cpp:920
+#: src/content_mapnode_furniture.cpp:940 src/content_mapnode_furniture.cpp:960
+#: src/content_mapnode_furniture.cpp:980
+#: src/content_mapnode_furniture.cpp:1000
 msgid "Yellow Couch"
 msgstr "gelbes Sofa"
 
-#: src/content_mapnode_furniture.cpp:982
-#: src/content_mapnode_furniture.cpp:1001
-#: src/content_mapnode_furniture.cpp:1020
-#: src/content_mapnode_furniture.cpp:1039
-#: src/content_mapnode_furniture.cpp:1058
-#: src/content_mapnode_furniture.cpp:1077
+#: src/content_mapnode_furniture.cpp:1024
+#: src/content_mapnode_furniture.cpp:1044
+#: src/content_mapnode_furniture.cpp:1064
+#: src/content_mapnode_furniture.cpp:1084
+#: src/content_mapnode_furniture.cpp:1104
+#: src/content_mapnode_furniture.cpp:1124
 msgid "Black Couch"
 msgstr "schwarzes Sofa"
 
-#: src/content_mapnode_furniture.cpp:1100
+#: src/content_mapnode_furniture.cpp:1148
+#: src/content_mapnode_furniture.cpp:1182
+#: src/content_mapnode_furniture.cpp:1206
+#: src/content_mapnode_furniture.cpp:1230
+#: src/content_mapnode_furniture.cpp:1254
+#: src/content_mapnode_furniture.cpp:1278
 msgid "Chair"
 msgstr "Stuhl"
 
-#: src/content_mapnode_furniture.cpp:1149
+#: src/content_mapnode_furniture.cpp:1302
 msgid "Table"
 msgstr "Tisch"
 
-#: src/content_mapnode_furniture.cpp:1206
-#: src/content_mapnode_furniture.cpp:1239
+#: src/content_mapnode_furniture.cpp:1333
+#: src/content_mapnode_furniture.cpp:1366
 msgid "Bed"
 msgstr "Bett"
 
-#: src/content_mapnode_furniture.cpp:1267
-#: src/content_mapnode_furniture.cpp:1300
+#: src/content_mapnode_furniture.cpp:1394
+#: src/content_mapnode_furniture.cpp:1427
 msgid "Blue Bed"
 msgstr "blaues Bett"
 
-#: src/content_mapnode_furniture.cpp:1328
-#: src/content_mapnode_furniture.cpp:1361
+#: src/content_mapnode_furniture.cpp:1455
+#: src/content_mapnode_furniture.cpp:1488
 msgid "Green Bed"
 msgstr "grünes Bett"
 
-#: src/content_mapnode_furniture.cpp:1389
-#: src/content_mapnode_furniture.cpp:1422
+#: src/content_mapnode_furniture.cpp:1516
+#: src/content_mapnode_furniture.cpp:1549
 msgid "Orange Bed"
 msgstr "orange Bett"
 
-#: src/content_mapnode_furniture.cpp:1450
-#: src/content_mapnode_furniture.cpp:1483
+#: src/content_mapnode_furniture.cpp:1577
+#: src/content_mapnode_furniture.cpp:1610
 msgid "Purple Bed"
 msgstr "lila Bett"
 
-#: src/content_mapnode_furniture.cpp:1511
-#: src/content_mapnode_furniture.cpp:1544
+#: src/content_mapnode_furniture.cpp:1638
+#: src/content_mapnode_furniture.cpp:1671
 msgid "Red Bed"
 msgstr "rotes Bett"
 
-#: src/content_mapnode_furniture.cpp:1572
-#: src/content_mapnode_furniture.cpp:1605
+#: src/content_mapnode_furniture.cpp:1699
+#: src/content_mapnode_furniture.cpp:1732
 msgid "Yellow Bed"
 msgstr "gelbes Bett"
 
-#: src/content_mapnode_furniture.cpp:1633
-#: src/content_mapnode_furniture.cpp:1666
+#: src/content_mapnode_furniture.cpp:1760
+#: src/content_mapnode_furniture.cpp:1793
 msgid "Black Bed"
 msgstr "schwarzes Bett"
 
-#: src/content_mapnode_furniture.cpp:1694
-#: src/content_mapnode_furniture.cpp:1729
+#: src/content_mapnode_furniture.cpp:1821
+#: src/content_mapnode_furniture.cpp:1856
 msgid "Camp Bed"
 msgstr "Feldbett"
 
-#: src/content_mapnode_furniture.cpp:1753
+#: src/content_mapnode_furniture.cpp:1880
 msgid "Colorful Painting"
 msgstr "buntes Gemälde"
 
-#: src/content_mapnode_furniture.cpp:1788
+#: src/content_mapnode_furniture.cpp:1915
 msgid "Red Rose Painting"
 msgstr "Bild mit roter Rose"
 
-#: src/content_mapnode_furniture.cpp:1823
+#: src/content_mapnode_furniture.cpp:1950
 msgid "Field Painting"
 msgstr "Landschaftsgemälde"
 
-#: src/content_mapnode_furniture.cpp:1858
+#: src/content_mapnode_furniture.cpp:1985
 msgid "Blue Flower Painting"
 msgstr "Bild mit blauer Blume"
 
-#: src/content_mapnode_furniture.cpp:1893
+#: src/content_mapnode_furniture.cpp:2020
 msgid "Painting Canvas"
 msgstr "Malerleinwand"
 
-#: src/content_mapnode_furniture.cpp:1931
+#: src/content_mapnode_furniture.cpp:2058
 msgid "Clock"
 msgstr "Uhr"
 
@@ -2633,7 +2653,7 @@ msgid "Decraft Book"
 msgstr "Zerlegungsbuch"
 
 #: src/content_mapnode_special.cpp:753 src/content_mapnode_special.cpp:948
-#: src/content_nodemeta.cpp:2693
+#: src/content_nodemeta.cpp:2694
 msgid "Diary"
 msgstr "Tagebuch"
 
@@ -2683,11 +2703,11 @@ msgstr "Schild"
 msgid "Locking Sign"
 msgstr "abschließbares Schild"
 
-#: src/content_mapnode_special.cpp:1286 src/content_nodemeta.cpp:500
+#: src/content_mapnode_special.cpp:1286 src/content_nodemeta.cpp:501
 msgid "Chest"
 msgstr "Truhe"
 
-#: src/content_mapnode_special.cpp:1310 src/content_nodemeta.cpp:775
+#: src/content_mapnode_special.cpp:1310 src/content_nodemeta.cpp:776
 msgid "Creative Chest"
 msgstr "Kreativtruhe"
 
@@ -2807,7 +2827,7 @@ msgstr "Paket"
 msgid "Cauldron"
 msgstr "Kessel"
 
-#: src/content_mapnode_special.cpp:2082 src/content_nodemeta.cpp:3312
+#: src/content_mapnode_special.cpp:2082 src/content_nodemeta.cpp:3313
 msgid "Forge"
 msgstr "Schmiede"
 
@@ -2911,563 +2931,570 @@ msgstr "Siamkatze"
 msgid "Ginger Kitten"
 msgstr "Gingerkatze"
 
-#: src/content_nodemeta.cpp:75 src/content_nodemeta.cpp:138
-#: src/content_nodemeta.cpp:2677 src/content_nodemeta.cpp:2776
+#: src/content_nodemeta.cpp:76 src/content_nodemeta.cpp:139
+#: src/content_nodemeta.cpp:2678 src/content_nodemeta.cpp:2777
 msgid "Save"
 msgstr "Speichern"
 
-#: src/content_nodemeta.cpp:185
+#: src/content_nodemeta.cpp:186
 #, c-format
 msgid "%s's Home Flag"
 msgstr "Heimatflagge von %s"
 
-#: src/content_nodemeta.cpp:269 src/content_nodemeta.cpp:282
-#: src/content_nodemeta.cpp:436 src/content_nodemeta.cpp:449
+#: src/content_nodemeta.cpp:270 src/content_nodemeta.cpp:283
+#: src/content_nodemeta.cpp:437 src/content_nodemeta.cpp:450
 msgid "You can't sleep yet."
 msgstr "Sie können jetzt nicht schlafen."
 
-#: src/content_nodemeta.cpp:273 src/content_nodemeta.cpp:440
+#: src/content_nodemeta.cpp:274 src/content_nodemeta.cpp:441
 msgid "Go to sleep"
 msgstr "Schlafen gehen"
 
-#: src/content_nodemeta.cpp:278 src/content_nodemeta.cpp:445
+#: src/content_nodemeta.cpp:279 src/content_nodemeta.cpp:446
 msgid "Someone else is sleeping here."
 msgstr "Hier schläft jemand anderes."
 
-#: src/content_nodemeta.cpp:286 src/content_nodemeta.cpp:453
+#: src/content_nodemeta.cpp:287 src/content_nodemeta.cpp:454
 msgid "Get out of bed"
 msgstr "Aufstehen"
 
-#: src/content_nodemeta.cpp:432
+#: src/content_nodemeta.cpp:433
 msgid "This bed is too uncomfortable to sleep in."
 msgstr "Dieses Bett ist zu unbequem, um darin zu schlafen."
 
-#: src/content_nodemeta.cpp:573
+#: src/content_nodemeta.cpp:574
 #, c-format
 msgid "Locking Chest owned by '%s'"
 msgstr "abschließbare Truhe (Eigentümer: %s)"
 
-#: src/content_nodemeta.cpp:647
+#: src/content_nodemeta.cpp:648
 #, c-format
 msgid "Safe owned by '%s'"
 msgstr "Tresor (Eigentümer: %s)"
 
-#: src/content_nodemeta.cpp:816 src/content_nodemeta.cpp:1870
-#: src/content_nodemeta.cpp:2157 src/content_nodemeta.cpp:2349
-#: src/content_nodemeta.cpp:2563
+#: src/content_nodemeta.cpp:817 src/content_nodemeta.cpp:1871
+#: src/content_nodemeta.cpp:2158 src/content_nodemeta.cpp:2350
+#: src/content_nodemeta.cpp:2564
 #, c-format
 msgid "Page %d of %d"
 msgstr "Seite %d von %d"
 
-#: src/content_nodemeta.cpp:820 src/content_nodemeta.cpp:1898
-#: src/content_nodemeta.cpp:2176 src/content_nodemeta.cpp:2358
-#: src/content_nodemeta.cpp:2579
+#: src/content_nodemeta.cpp:821 src/content_nodemeta.cpp:1899
+#: src/content_nodemeta.cpp:2177 src/content_nodemeta.cpp:2359
+#: src/content_nodemeta.cpp:2580
 msgid "<< Previous Page"
 msgstr "<< Vorherige Seite"
 
-#: src/content_nodemeta.cpp:826 src/content_nodemeta.cpp:1904
-#: src/content_nodemeta.cpp:2182 src/content_nodemeta.cpp:2364
-#: src/content_nodemeta.cpp:2585
+#: src/content_nodemeta.cpp:827 src/content_nodemeta.cpp:1905
+#: src/content_nodemeta.cpp:2183 src/content_nodemeta.cpp:2365
+#: src/content_nodemeta.cpp:2586
 msgid "Next Page >>"
 msgstr "Nächste Seite >>"
 
-#: src/content_nodemeta.cpp:869
+#: src/content_nodemeta.cpp:870
 #, c-format
 msgid "Border Stone owned by '%s'"
 msgstr "Grenzstein (Eigentümer: %s)"
 
-#: src/content_nodemeta.cpp:944
+#: src/content_nodemeta.cpp:945
 msgid "Furnace is overloaded"
 msgstr "Ofen ist überladen"
 
-#: src/content_nodemeta.cpp:945
+#: src/content_nodemeta.cpp:946
 msgid "Furnace is out of fuel"
 msgstr "Ofen hat keinen Brennstoff"
 
-#: src/content_nodemeta.cpp:947
+#: src/content_nodemeta.cpp:948
 msgid "Furnace is inactive"
 msgstr "Ofen ist inaktiv"
 
-#: src/content_nodemeta.cpp:950
+#: src/content_nodemeta.cpp:951
 msgid "Furnace is active"
 msgstr "Ofen ist aktiv"
 
-#: src/content_nodemeta.cpp:1209
+#: src/content_nodemeta.cpp:1210
 msgid "Locking Furnace is overloaded"
 msgstr "Abschließbarer Ofen ist überladen."
 
-#: src/content_nodemeta.cpp:1210
+#: src/content_nodemeta.cpp:1211
 msgid "Locking Furnace is out of fuel"
 msgstr "Abschließbarer Ofen hat keinen Brennstoff."
 
-#: src/content_nodemeta.cpp:1212
+#: src/content_nodemeta.cpp:1213
 msgid "Locking Furnace is inactive"
 msgstr "Abschließbarer Ofen ist inaktiv."
 
-#: src/content_nodemeta.cpp:1215
+#: src/content_nodemeta.cpp:1216
 msgid "Locking Furnace is active"
 msgstr "Abschließbarer Ofen ist aktiv."
 
-#: src/content_nodemeta.cpp:1470
+#: src/content_nodemeta.cpp:1471
 msgid "Armed Explosive: about to detonate"
 msgstr "Scharfer Sprengstoff: Im Begriff, zu detonieren"
 
-#: src/content_nodemeta.cpp:1473
+#: src/content_nodemeta.cpp:1474
 #, c-format
 msgid "Armed Explosive: %d second till detonation"
 msgid_plural "Armed Explosive: %d seconds till detonation"
 msgstr[0] "Scharfer Sprengstoff: %d Sekunde bis zur Detonation"
 msgstr[1] "Scharfer Sprengstoff: %d Sekunden bis zur Detonation"
 
-#: src/content_nodemeta.cpp:1534 src/content_nodemeta.cpp:1539
+#: src/content_nodemeta.cpp:1535 src/content_nodemeta.cpp:1540
 msgid "Incinerator is active"
 msgstr "Müllverbrennungsanlage ist aktiv"
 
-#: src/content_nodemeta.cpp:1541
+#: src/content_nodemeta.cpp:1542
 msgid "Incinerator is inactive"
 msgstr "Müllverbrennungsanlage ist inaktiv"
 
-#: src/content_nodemeta.cpp:1633
+#: src/content_nodemeta.cpp:1634
 msgid "Add fuel, then punch to incinerate wielded item"
-msgstr "Brennstoff zugeben, dann schlagen, um getragenen Gegenstand zu verbrennen"
+msgstr ""
+"Brennstoff zugeben, dann schlagen, um getragenen Gegenstand zu verbrennen"
 
-#: src/content_nodemeta.cpp:1874 src/content_nodemeta.cpp:2162
+#: src/content_nodemeta.cpp:1875 src/content_nodemeta.cpp:2163
 msgid "Add item here to see recipe"
 msgstr "Gegenstand hier ablegen, um Rezept zu sehen"
 
-#: src/content_nodemeta.cpp:1879 src/content_nodemeta.cpp:2167
+#: src/content_nodemeta.cpp:1880 src/content_nodemeta.cpp:2168
 #, c-format
 msgid "Recipe %d of %d"
 msgstr "Rezept %d von %d"
 
-#: src/content_nodemeta.cpp:1888
+#: src/content_nodemeta.cpp:1889
 msgid "Gives"
 msgstr "Gibt"
 
-#: src/content_nodemeta.cpp:2353
+#: src/content_nodemeta.cpp:2354
 msgid "Add item here to see cook result"
 msgstr "Gegenstand hier ablegen, um Ergebnis zu sehen"
 
-#: src/content_nodemeta.cpp:2567
+#: src/content_nodemeta.cpp:2568
 msgid "Add item here to see dig result"
 msgstr "Gegenstand hier ablegen, um Ergebnis zu sehen"
 
-#: src/content_nodemeta.cpp:2571
+#: src/content_nodemeta.cpp:2572
 msgid "Dig Result"
 msgstr "Grabeergebnis"
 
-#: src/content_nodemeta.cpp:2575
+#: src/content_nodemeta.cpp:2576
 msgid "Random Drop"
 msgstr "Zufälliger Abwurf"
 
-#: src/content_nodemeta.cpp:2667 src/content_nodemeta.cpp:2766
+#: src/content_nodemeta.cpp:2668 src/content_nodemeta.cpp:2767
 msgid "Title"
 msgstr "Titel"
 
-#: src/content_nodemeta.cpp:2672 src/content_nodemeta.cpp:2771
+#: src/content_nodemeta.cpp:2673 src/content_nodemeta.cpp:2772
 msgid "Content"
 msgstr "Inhalt"
 
-#: src/content_nodemeta.cpp:3127
+#: src/content_nodemeta.cpp:3128
 msgid "Cauldron is active"
 msgstr "Kessel ist aktiv"
 
-#: src/content_nodemeta.cpp:3130
+#: src/content_nodemeta.cpp:3131
 msgid "Cauldron is hot"
 msgstr "Kessel ist heiß"
 
-#: src/content_nodemeta.cpp:3132
+#: src/content_nodemeta.cpp:3133
 msgid "Cauldron is cool"
 msgstr "Kessel ist kühl"
 
-#: src/content_nodemeta.cpp:3134
+#: src/content_nodemeta.cpp:3135
 msgid "Cauldron is empty"
 msgstr "Kessel ist leer"
 
-#: src/content_nodemeta.cpp:3138
+#: src/content_nodemeta.cpp:3139
 msgid "Cauldron is inactive"
 msgstr "Kessel ist inaktiv"
 
-#: src/content_nodemeta.cpp:3139
+#: src/content_nodemeta.cpp:3140
 msgid "Cauldron is out of fuel"
 msgstr "Kessel hat keinen Brennstoff"
 
-#: src/content_nodemeta.cpp:3218
+#: src/content_nodemeta.cpp:3219
 msgid "Add fuel, then punch to add or remove water"
-msgstr "Brennstoff zufügen, dann schlagen, um Wasser hinzuzufügen oder zu entfernen"
+msgstr ""
+"Brennstoff zufügen, dann schlagen, um Wasser hinzuzufügen oder zu entfernen"
 
-#: src/content_nodemeta.cpp:3484
+#: src/content_nodemeta.cpp:3487
 msgid "Show Enchanting"
 msgstr "Verzauberung zeigen"
 
-#: src/content_nodemeta.cpp:3491 src/game.cpp:208
+#: src/content_nodemeta.cpp:3494 src/game.cpp:209
 msgid "Show Crafting"
 msgstr "Fertigung anzeigen"
 
-#: src/content_toolitem.cpp:213
+#: src/content_toolitem.cpp:216
 msgid "Small Stone Pick"
 msgstr "kleine Steinspitzhacke"
 
-#: src/content_toolitem.cpp:236
+#: src/content_toolitem.cpp:239
 msgid "Stone Pick"
 msgstr "Steinspitzhacke"
 
-#: src/content_toolitem.cpp:250
+#: src/content_toolitem.cpp:253
 msgid "Flint Pick"
 msgstr "Feuersteinspitzhacke"
 
-#: src/content_toolitem.cpp:264
+#: src/content_toolitem.cpp:267
 msgid "Steel Pick"
 msgstr "Stahlspitzhacke"
 
-#: src/content_toolitem.cpp:278
+#: src/content_toolitem.cpp:281
 msgid "Creative Pick"
 msgstr "Kreativspitzhacke"
 
-#: src/content_toolitem.cpp:292
+#: src/content_toolitem.cpp:295
 msgid "Stone Trowel"
 msgstr "Steinpflanzschaufel"
 
-#: src/content_toolitem.cpp:306
+#: src/content_toolitem.cpp:309
 msgid "Stone Shovel"
 msgstr "Steinschaufel"
 
-#: src/content_toolitem.cpp:320
+#: src/content_toolitem.cpp:323
 msgid "Flint Shovel"
 msgstr "Feuersteinschaufel"
 
-#: src/content_toolitem.cpp:334
+#: src/content_toolitem.cpp:337
 msgid "Steel Shovel"
 msgstr "Stahlschaufel"
 
-#: src/content_toolitem.cpp:348
+#: src/content_toolitem.cpp:351
 msgid "Small Stone Axe"
 msgstr "kleine Steinaxt"
 
-#: src/content_toolitem.cpp:369
+#: src/content_toolitem.cpp:372
 msgid "Stone Axe"
 msgstr "Steinaxt"
 
-#: src/content_toolitem.cpp:383
+#: src/content_toolitem.cpp:386
 msgid "Flint Axe"
 msgstr "Feuersteinaxt"
 
-#: src/content_toolitem.cpp:397
+#: src/content_toolitem.cpp:400
 msgid "Steel Axe"
 msgstr "Stahlaxt"
 
-#: src/content_toolitem.cpp:411
+#: src/content_toolitem.cpp:414
 msgid "Wooden Club"
 msgstr "Holzkeule"
 
-#: src/content_toolitem.cpp:426
+#: src/content_toolitem.cpp:429
 msgid "Stone Sword"
 msgstr "Steinschwert"
 
-#: src/content_toolitem.cpp:440
+#: src/content_toolitem.cpp:443
 msgid "Steel Sword"
 msgstr "Stahlschwert"
 
-#: src/content_toolitem.cpp:454
+#: src/content_toolitem.cpp:457
 msgid "Flint Shears"
 msgstr "Feuersteinschere"
 
-#: src/content_toolitem.cpp:468
+#: src/content_toolitem.cpp:471
 msgid "Steel Shears"
 msgstr "Stahlschere"
 
-#: src/content_toolitem.cpp:482
+#: src/content_toolitem.cpp:485
 msgid "Wooden Bucket"
 msgstr "Holzeimer"
 
-#: src/content_toolitem.cpp:499
+#: src/content_toolitem.cpp:502
 msgid "Tin Bucket"
 msgstr "Zinneimer"
 
-#: src/content_toolitem.cpp:515
+#: src/content_toolitem.cpp:518
 msgid "Wooden Bucket of Water"
 msgstr "Holzeimer mit Wasser"
 
-#: src/content_toolitem.cpp:526
+#: src/content_toolitem.cpp:529
 msgid "Tin Bucket of Water"
 msgstr "Zinneimer mit Wasser"
 
-#: src/content_toolitem.cpp:537
+#: src/content_toolitem.cpp:540
 msgid "Steel Bucket"
 msgstr "Stahleimer"
 
-#: src/content_toolitem.cpp:552
+#: src/content_toolitem.cpp:555
 msgid "Steel Bucket of Water"
 msgstr "Stahleimer mit Wasser"
 
-#: src/content_toolitem.cpp:563
+#: src/content_toolitem.cpp:566
 msgid "Steel Bucket of Lava"
 msgstr "Stahleimer mit Lava"
 
-#: src/content_toolitem.cpp:575
+#: src/content_toolitem.cpp:578
 msgid "Fire Starter"
 msgstr "Feuerzeug"
 
-#: src/content_toolitem.cpp:589
+#: src/content_toolitem.cpp:592
 msgid "Crowbar"
 msgstr "Brecheisen"
 
-#: src/content_toolitem.cpp:602
+#: src/content_toolitem.cpp:605
 msgid "Key"
 msgstr "Schlüssel"
 
-#: src/content_toolitem.cpp:614
+#: src/content_toolitem.cpp:617
 msgid "Stone Spear"
 msgstr "Steinspeer"
 
-#: src/content_toolitem.cpp:628
+#: src/content_toolitem.cpp:631
 msgid "Flint Spear"
 msgstr "Feuersteinspeer"
 
-#: src/content_toolitem.cpp:642
+#: src/content_toolitem.cpp:645
 msgid "Steel Spear"
 msgstr "Stahlspeer"
 
-#: src/content_toolitem.cpp:656
+#: src/content_toolitem.cpp:659
 msgid "Bow"
 msgstr "Bogen"
 
-#: src/content_toolitem.cpp:676
+#: src/content_toolitem.cpp:679
 msgid "Raw Mithril Pick"
 msgstr "Rohmithrilspitzhacke"
 
-#: src/content_toolitem.cpp:690
+#: src/content_toolitem.cpp:693
 msgid "Raw Mithril Shovel"
 msgstr "Rohmithrilschaufel"
 
-#: src/content_toolitem.cpp:704
+#: src/content_toolitem.cpp:707
 msgid "Raw Mithril Axe"
 msgstr "Rohmithrilaxt"
 
-#: src/content_toolitem.cpp:718
+#: src/content_toolitem.cpp:721
 msgid "Raw Mithril Sword"
 msgstr "Rohmithrilschwert"
 
-#: src/content_toolitem.cpp:732
+#: src/content_toolitem.cpp:735
 msgid "Raw Mithril Spear"
 msgstr "Rohmithrilspeer"
 
-#: src/content_toolitem.cpp:746
+#: src/content_toolitem.cpp:749
 msgid "Unbound Mithril Pick"
 msgstr "Mithrilspitzhacke (bindungslos)"
 
-#: src/content_toolitem.cpp:760
+#: src/content_toolitem.cpp:763
 msgid "Unbound Mithril Shovel"
 msgstr "Mithrilschaufel (bindungslos)"
 
-#: src/content_toolitem.cpp:774
+#: src/content_toolitem.cpp:777
 msgid "Unbound Mithril Axe"
 msgstr "Mithrilaxt (bindungslos)"
 
-#: src/content_toolitem.cpp:788
+#: src/content_toolitem.cpp:791
 msgid "Unbound Mithril Sword"
 msgstr "Mithrilschwert (bindungslos)"
 
-#: src/content_toolitem.cpp:802
+#: src/content_toolitem.cpp:805
 msgid "Unbound Mithril Spear"
 msgstr "Mithrilspeer (bindungslos)"
 
-#: src/content_toolitem.cpp:816
+#: src/content_toolitem.cpp:819
 msgid "Mithril Pick"
 msgstr "Mithrilspitzhacke"
 
-#: src/content_toolitem.cpp:831
+#: src/content_toolitem.cpp:834
 msgid "Mithril Shovel"
 msgstr "Mithrilschaufel"
 
-#: src/content_toolitem.cpp:845
+#: src/content_toolitem.cpp:848
 msgid "Mithril Axe"
 msgstr "Mithrilaxt"
 
-#: src/content_toolitem.cpp:859
+#: src/content_toolitem.cpp:862
 msgid "Mithril Sword"
 msgstr "Mithrilschwert"
 
-#: src/content_toolitem.cpp:873
+#: src/content_toolitem.cpp:876
 msgid "Mithril Spear"
 msgstr "Mithrilspeer"
 
-#: src/content_toolitem.cpp:887
+#: src/content_toolitem.cpp:890
 msgid "Mob Spawner"
 msgstr "Mob-Erzeuger"
 
-#: src/game.cpp:209
+#: src/content_toolitem.cpp:909
+#, fuzzy
+msgid "Mithril Key"
+msgstr "Mithrilaxt"
+
+#: src/game.cpp:210
 msgid "Clothes"
 msgstr "Kleidung"
 
-#: src/game.cpp:210
+#: src/game.cpp:211
 msgid "Hat/Helmet"
 msgstr "Hut/Helm"
 
-#: src/game.cpp:212
+#: src/game.cpp:213
 msgid "Jacket"
 msgstr "Jacke"
 
-#: src/game.cpp:214
+#: src/game.cpp:215
 msgid "Decorative"
 msgstr "Deko"
 
-#: src/game.cpp:216
+#: src/game.cpp:217
 msgid "Shirt"
 msgstr "Hemd"
 
-#: src/game.cpp:218
+#: src/game.cpp:219
 msgid "Belt"
 msgstr "Gürtel"
 
-#: src/game.cpp:220
+#: src/game.cpp:221
 msgid "Pants"
 msgstr "Hose"
 
-#: src/game.cpp:222
+#: src/game.cpp:223
 msgid "Boots"
 msgstr "Schuhwerk"
 
-#: src/game.cpp:229
+#: src/game.cpp:230
 msgid "Drop to Ground"
 msgstr "Wegwerfen"
 
-#: src/game.cpp:231
+#: src/game.cpp:232
 msgid "Change Clothing"
 msgstr "Umziehen"
 
-#: src/game.cpp:590
+#: src/game.cpp:591
 msgid "Loading"
 msgstr "Laden"
 
-#: src/game.cpp:662
+#: src/game.cpp:663
 msgid "Loading..."
 msgstr "Laden ..."
 
-#: src/game.cpp:671
+#: src/game.cpp:672
 msgid "Creating server..."
 msgstr "Server erzeugen ..."
 
-#: src/game.cpp:682
+#: src/game.cpp:683
 msgid "Creating client..."
 msgstr "Client erzeugen ..."
 
-#: src/game.cpp:687
+#: src/game.cpp:688
 msgid "Resolving address..."
 msgstr "Adresse auflösen ..."
 
-#: src/game.cpp:698
+#: src/game.cpp:699
 msgid "Couldn't resolve address"
 msgstr "Adresse konnte nicht aufgelöst werden"
 
-#: src/game.cpp:738
+#: src/game.cpp:739
 #, c-format
 msgid "Connecting to server... (timeout in %d second)"
 msgid_plural "Connecting to server... (timeout in %d seconds)"
 msgstr[0] "Zum Server verbinden … (Zeitüberschreitung in %d Sekunde)"
 msgstr[1] "Zum Server verbinden … (Zeitüberschreitung in %d Sekunden)"
 
-#: src/game.cpp:767
+#: src/game.cpp:768
 #, c-format
 msgid "Access denied. Reason: %ls"
 msgstr "Zugriff verwehrt. Grund: %ls"
 
-#: src/game.cpp:771
+#: src/game.cpp:772
 msgid "Unable to Connect (port already in use?)."
 msgstr "Verbindung nicht möglich (Port bereits verwendet?)."
 
-#: src/game.cpp:774
+#: src/game.cpp:775
 msgid "Connection timed out."
 msgstr "Zeitüberschreitung der Verbindung."
 
-#: src/game.cpp:927
+#: src/game.cpp:928
 msgid "Access denied. Reason: "
 msgstr "Zugriff verweigert. Grund: "
 
-#: src/game.cpp:1161
+#: src/game.cpp:1162
 msgid "free_move disabled"
 msgstr "Flugmodus deaktiviert"
 
-#: src/game.cpp:1165
+#: src/game.cpp:1166
 msgid "free_move enabled"
 msgstr "Flugmodus aktiviert"
 
-#: src/game.cpp:1177
+#: src/game.cpp:1178
 #, c-format
 msgid "Saved screenshot to '%s'"
 msgstr "Screenshot nach »%s« gespeichert"
 
-#: src/game.cpp:1189
+#: src/game.cpp:1190
 msgid "HUD shown"
 msgstr "HUD angezeigt"
 
-#: src/game.cpp:1191
+#: src/game.cpp:1192
 msgid "HUD hidden"
 msgstr "HUD verborgen"
 
-#: src/game.cpp:1197
+#: src/game.cpp:1198
 msgid "Chat shown"
 msgstr "Chat angezeigt"
 
-#: src/game.cpp:1199
+#: src/game.cpp:1200
 msgid "Chat hidden"
 msgstr "Chat verborgen"
 
-#: src/game.cpp:1205
+#: src/game.cpp:1206
 msgid "Fog disabled"
 msgstr "Nebel deaktiviert"
 
-#: src/game.cpp:1207
+#: src/game.cpp:1208
 msgid "Fog enabled"
 msgstr "Nebel aktiviert"
 
-#: src/game.cpp:1213
+#: src/game.cpp:1214
 msgid "Camera update disabled"
 msgstr "Kameraaktualisierung deaktiviert"
 
-#: src/game.cpp:1215
+#: src/game.cpp:1216
 msgid "Camera update enabled"
 msgstr "Kameraaktualisierung aktiviert"
 
-#: src/game.cpp:1225
+#: src/game.cpp:1226
 msgid "Debug info shown"
 msgstr "Debuginfos angezeigt"
 
-#: src/game.cpp:1230
+#: src/game.cpp:1231
 msgid "Debug info and frametime graph hidden"
 msgstr "Debuginfos und Framezeit-Graph verborgen"
 
-#: src/game.cpp:1234
+#: src/game.cpp:1235
 msgid "Frametime graph shown"
 msgstr "Framezeit-Graph angezeigt"
 
-#: src/game.cpp:1246
+#: src/game.cpp:1247
 #, c-format
 msgid "Profiler shown (page %d of %d)"
 msgstr "Profiler angezeigt (Seite %d von %d)"
 
-#: src/game.cpp:1250
+#: src/game.cpp:1251
 msgid "Profiler hidden"
 msgstr "Profiler verborgen"
 
-#: src/game.cpp:1258 src/game.cpp:1269
+#: src/game.cpp:1259 src/game.cpp:1270
 #, c-format
 msgid "Minimum viewing range changed to %d"
 msgstr "Minimale Sichtweite auf %d gesetzt"
 
-#: src/game.cpp:1338
+#: src/game.cpp:1339
 msgid "Enabled full viewing range"
 msgstr "Volle Sichtweite aktiviert"
 
-#: src/game.cpp:1342
+#: src/game.cpp:1343
 msgid "Disabled full viewing range"
 msgstr "Volle Sichtweite deaktiviert"
 
-#: src/game.cpp:1995
+#: src/game.cpp:1950
 msgid "Disconnected (Network Timeout)"
 msgstr "Getrennt (Netzwerkzeitüberschreitung)"
 
-#: src/game.cpp:2407
+#: src/game.cpp:2382
 msgid "Shutting down..."
 msgstr "Beenden ..."
 
@@ -3481,242 +3508,298 @@ msgstr "Wiederbeleben"
 
 #: src/guiFormSpecMenu.cpp:436
 msgid "Left click: Move all items, Right click: Move single item"
-msgstr "Linksklick: Alle Gegenstände verschieben, Rechtsklick: 1 Gegenstand verschieben"
+msgstr ""
+"Linksklick: Alle Gegenstände verschieben, Rechtsklick: 1 Gegenstand "
+"verschieben"
 
 #: src/guiFormSpecMenu.cpp:458
 msgid "Write It"
 msgstr "Schreiben"
 
-#: src/guiMainMenu.cpp:347
+#: src/guiMainMenu.cpp:319
 msgid "Character Creator"
 msgstr "Figurenersteller"
 
-#: src/guiMainMenu.cpp:353 src/guiMainMenu.cpp:478 src/guiMainMenu.cpp:520
-#: src/guiMainMenu.cpp:631
+#: src/guiMainMenu.cpp:325 src/guiMainMenu.cpp:386 src/guiMainMenu.cpp:428
+#: src/guiMainMenu.cpp:539
 msgid "Single Player"
 msgstr "Einzelspieler"
 
-#: src/guiMainMenu.cpp:359 src/guiMainMenu.cpp:410
+#: src/guiMainMenu.cpp:331 src/guiMultiplayerMenu.cpp:161
 msgid "Multi Player"
 msgstr "Netzwerkserver"
 
-#: src/guiMainMenu.cpp:365 src/guiPauseMenu.cpp:155
+#: src/guiMainMenu.cpp:337 src/guiPauseMenu.cpp:155
 msgid "Settings"
 msgstr "Einstellungen"
 
-#: src/guiMainMenu.cpp:371
+#: src/guiMainMenu.cpp:343
 msgid "Credits"
 msgstr "Mitwirkende"
 
-#: src/guiMainMenu.cpp:377
+#: src/guiMainMenu.cpp:349
 msgid "Quit"
 msgstr "Beenden"
 
-#: src/guiMainMenu.cpp:418
-msgid "Name/Password"
-msgstr "Name/Passwort"
-
-#: src/guiMainMenu.cpp:446
-msgid "Address/Port"
-msgstr "Adresse/Port"
-
-#: src/guiMainMenu.cpp:472
-msgid "Connect"
-msgstr "Verbinden"
-
-#: src/guiMainMenu.cpp:487 src/guiMainMenu.cpp:529 src/guiMainMenu.cpp:640
+#: src/guiMainMenu.cpp:395 src/guiMainMenu.cpp:437 src/guiMainMenu.cpp:548
 msgid "Creative Mode"
 msgstr "Kreativmodus"
 
-#: src/guiMainMenu.cpp:488 src/guiMainMenu.cpp:530 src/guiMainMenu.cpp:641
+#: src/guiMainMenu.cpp:396 src/guiMainMenu.cpp:438 src/guiMainMenu.cpp:549
 msgid "Adventure Mode"
 msgstr "Abenteuermodus"
 
-#: src/guiMainMenu.cpp:489 src/guiMainMenu.cpp:531 src/guiMainMenu.cpp:642
+#: src/guiMainMenu.cpp:397 src/guiMainMenu.cpp:439 src/guiMainMenu.cpp:550
 msgid "Survival Mode"
 msgstr "Überlebensmodus"
 
-#: src/guiMainMenu.cpp:502 src/guiMainMenu.cpp:655
+#: src/guiMainMenu.cpp:410 src/guiMainMenu.cpp:563
 msgid "Advanced Settings"
 msgstr "Erweiterte Einstellungen"
 
-#: src/guiMainMenu.cpp:508 src/guiMainMenu.cpp:550
+#: src/guiMainMenu.cpp:416 src/guiMainMenu.cpp:458
 msgid "Map Options"
 msgstr "Karteneinstellungen"
 
-#: src/guiMainMenu.cpp:514 src/guiMainMenu.cpp:625 src/guiMainMenu.cpp:750
+#: src/guiMainMenu.cpp:422 src/guiMainMenu.cpp:533 src/guiMainMenu.cpp:658
 msgid "Start Game"
 msgstr "Spiel starten"
 
-#: src/guiMainMenu.cpp:544
+#: src/guiMainMenu.cpp:452
 msgid "Hide Advanced Settings"
 msgstr "Erweiterte Einstellungen verbergen"
 
-#: src/guiMainMenu.cpp:555
+#: src/guiMainMenu.cpp:463
 msgid "Creatures"
 msgstr "Kreaturen"
 
-#: src/guiMainMenu.cpp:562
+#: src/guiMainMenu.cpp:470
 msgid "None"
 msgstr "Keine"
 
-#: src/guiMainMenu.cpp:563
+#: src/guiMainMenu.cpp:471
 msgid "Passive"
 msgstr "Passiv"
 
-#: src/guiMainMenu.cpp:564
+#: src/guiMainMenu.cpp:472
 msgid "Passive & Aggressive"
 msgstr "Passiv und aggressiv"
 
-#: src/guiMainMenu.cpp:565
+#: src/guiMainMenu.cpp:473
 msgid "Passive, Aggressive, & Destructive"
 msgstr "Passiv, aggressiv und destruktiv"
 
-#: src/guiMainMenu.cpp:579
+#: src/guiMainMenu.cpp:487
 msgid "Player Damage"
 msgstr "Spielerschaden"
 
-#: src/guiMainMenu.cpp:584
+#: src/guiMainMenu.cpp:492
 msgid "Suffocation/Drowning"
 msgstr "Ersticken/Ertrinken"
 
-#: src/guiMainMenu.cpp:589
+#: src/guiMainMenu.cpp:497
 msgid "Hunger"
 msgstr "Hunger"
 
-#: src/guiMainMenu.cpp:594
+#: src/guiMainMenu.cpp:502
 msgid "Tool Wear"
 msgstr "Werkzeugabnutzung"
 
-#: src/guiMainMenu.cpp:599
+#: src/guiMainMenu.cpp:507
 msgid "Dangerous Fire"
 msgstr "Gefährliches Feuer"
 
-#: src/guiMainMenu.cpp:604
+#: src/guiMainMenu.cpp:512
 msgid "Infinite Inventory"
 msgstr "Unendliches Inventar"
 
-#: src/guiMainMenu.cpp:609
+#: src/guiMainMenu.cpp:517
 msgid "Initial Inventory"
 msgstr "Startausrüstung"
 
-#: src/guiMainMenu.cpp:614
+#: src/guiMainMenu.cpp:522
 msgid "Droppable Inventory"
 msgstr "Wegwerfbares Inventar"
 
-#: src/guiMainMenu.cpp:619
+#: src/guiMainMenu.cpp:527
 msgid "Death drops Inventory"
 msgstr "Tod lässt Inventar fallen"
 
-#: src/guiMainMenu.cpp:661
+#: src/guiMainMenu.cpp:569
 msgid "Hide Map Options"
 msgstr "Karteneinstellungen verbergen"
 
-#: src/guiMainMenu.cpp:666
+#: src/guiMainMenu.cpp:574
 msgid "Create New Map"
 msgstr "Neue Karte erstellen"
 
-#: src/guiMainMenu.cpp:672
+#: src/guiMainMenu.cpp:580
 msgid "Warning! Your old map will be deleted!"
 msgstr "Warnung! Ihre alte Karte wird gelöscht!"
 
-#: src/guiMainMenu.cpp:678
+#: src/guiMainMenu.cpp:586
 msgid "Map Type"
 msgstr "Kartentyp"
 
-#: src/guiMainMenu.cpp:685
+#: src/guiMainMenu.cpp:593
 msgid "Flat"
 msgstr "Flach"
 
-#: src/guiMainMenu.cpp:686
+#: src/guiMainMenu.cpp:594
 msgid "Flatter"
 msgstr "Flacher"
 
-#: src/guiMainMenu.cpp:687
+#: src/guiMainMenu.cpp:595
 msgid "Smoother"
 msgstr "Weicher"
 
-#: src/guiMainMenu.cpp:688
+#: src/guiMainMenu.cpp:596
 msgid "Default"
 msgstr "Standard"
 
-#: src/guiMainMenu.cpp:689
+#: src/guiMainMenu.cpp:597
 msgid "Hilly"
 msgstr "Hügelig"
 
-#: src/guiMainMenu.cpp:690
+#: src/guiMainMenu.cpp:598
 msgid "Mountains"
 msgstr "Berge"
 
-#: src/guiMainMenu.cpp:691
+#: src/guiMainMenu.cpp:599
 msgid "Crazy"
 msgstr "Verrückt"
 
-#: src/guiMainMenu.cpp:692
+#: src/guiMainMenu.cpp:600
 msgid "Crazy Hills"
 msgstr "Verrückte Hügel"
 
-#: src/guiMainMenu.cpp:714
+#: src/guiMainMenu.cpp:622
 msgid "Use Fixed Seed"
 msgstr "Festen Startwert benutzen"
 
-#: src/guiMainMenu.cpp:720
+#: src/guiMainMenu.cpp:628
 msgid "Map Seed"
 msgstr "Kartenstartwert"
 
-#: src/guiMainMenu.cpp:737
+#: src/guiMainMenu.cpp:645
 msgid "Clear Map"
 msgstr "Karte leeren"
 
-#: src/guiMainMenu.cpp:742
+#: src/guiMainMenu.cpp:650
 msgid "Warning! This will delete all construction from your map!"
 msgstr "Warnung! Dies wird alle Bauten aus Ihrer Karte entfernen!"
 
-#: src/guiMainMenu.cpp:760
+#: src/guiMainMenu.cpp:668
 msgid ""
 "Voxelands\n"
 "http://www.voxelands.com/\n"
 "By Lisa 'darkrose' Milne <lisa@ltmnet.com> and contributors."
-msgstr "Voxelands\nhttp://www.voxelands.com/\nVon Lisa »darkrose« Milne <lisa@ltmnet.com> und Mitwirkenden."
+msgstr ""
+"Voxelands\n"
+"http://www.voxelands.com/\n"
+"Von Lisa »darkrose« Milne <lisa@ltmnet.com> und Mitwirkenden."
 
-#: src/guiMainMenu.cpp:767
+#: src/guiMainMenu.cpp:675
 msgid "Programmers"
 msgstr "Programmierer"
 
-#: src/guiMainMenu.cpp:770
+#: src/guiMainMenu.cpp:678
 msgid "Artists and Modellers"
 msgstr "2D- und 3D-Künstler"
 
-#: src/guiMainMenu.cpp:773
+#: src/guiMainMenu.cpp:681
 msgid "Translators"
 msgstr "Übersetzer"
 
-#: src/guiMainMenu.cpp:776
+#: src/guiMainMenu.cpp:684
 msgid "Documentation Writters"
 msgstr "Dokumentationsautoren"
 
-#: src/guiMainMenu.cpp:779
+#: src/guiMainMenu.cpp:687
 msgid "Testers, Packagers, and Builders"
 msgstr "Tester und Softwarepaketebauer"
 
-#: src/guiMainMenu.cpp:782
+#: src/guiMainMenu.cpp:690
 msgid "Music and Sound Effects Composers"
 msgstr "Musik- und Toneffektkomponisten"
 
-#: src/guiMainMenu.cpp:785
+#: src/guiMainMenu.cpp:693
 msgid "Other Contributers, and Special Thanks"
 msgstr "Andere Mitwirkende und besonderes Dankeschön"
 
-#: src/guiMainMenu.cpp:789
+#: src/guiMainMenu.cpp:697
 msgid ""
 "Based on Minetest-C55 by Perttu Ahola <celeron55@gmail.com>\n"
-"and contributors: PilzAdam, Taoki, tango_, kahrl (kaaaaaahrl?), darkrose, matttpt, erlehmann, SpeedProg, JacobF, teddydestodes, marktraceur, Jonathan Neuschafer, thexyz, VanessaE, sfan5... and tens of more random people."
-msgstr "Basierend auf Minetest-C55 von Perttu Ahola <celeron55@gmail.com>\nund Mitwirkenden: PilzAdam, Taoki, tango_, kahrl (kaaaaaahrl?), darkrose, matttpt, erlehmann, SpeedProg, JacobF, teddydestodes, marktraceur, Jonathan Neuschafer, thexyz, VanessaE, sfan5 … und zig weiteren zufälligen Leuten."
+"and contributors: PilzAdam, Taoki, tango_, kahrl (kaaaaaahrl?), darkrose, "
+"matttpt, erlehmann, SpeedProg, JacobF, teddydestodes, marktraceur, Jonathan "
+"Neuschafer, thexyz, VanessaE, sfan5... and tens of more random people."
+msgstr ""
+"Basierend auf Minetest-C55 von Perttu Ahola <celeron55@gmail.com>\n"
+"und Mitwirkenden: PilzAdam, Taoki, tango_, kahrl (kaaaaaahrl?), darkrose, "
+"matttpt, erlehmann, SpeedProg, JacobF, teddydestodes, marktraceur, Jonathan "
+"Neuschafer, thexyz, VanessaE, sfan5 … und zig weiteren zufälligen Leuten."
 
 #: src/guiMessageMenu.cpp:112 src/guiPauseMenu.cpp:143
 msgid "Continue"
 msgstr "Weiter"
 
+#: src/guiMultiplayerMenu.cpp:135 src/guiSettingsMenu.cpp:277
+msgid "Main Menu"
+msgstr "Hauptmenü"
+
+#: src/guiMultiplayerMenu.cpp:142
+msgid "All Servers"
+msgstr ""
+
+#: src/guiMultiplayerMenu.cpp:148
+msgid "Favourite Servers"
+msgstr ""
+
+#: src/guiMultiplayerMenu.cpp:154
+#, fuzzy
+msgid "Custom Connect"
+msgstr "Verbinden"
+
+#: src/guiMultiplayerMenu.cpp:169
+msgid "Custom Connection"
+msgstr ""
+
+#: src/guiMultiplayerMenu.cpp:176
+msgid "Address/Port"
+msgstr "Adresse/Port"
+
+#: src/guiMultiplayerMenu.cpp:201 src/guiMultiplayerMenu.cpp:313
+msgid "Add to Favourites"
+msgstr ""
+
+#: src/guiMultiplayerMenu.cpp:206 src/guiMultiplayerMenu.cpp:320
+msgid "Connect"
+msgstr "Verbinden"
+
+#: src/guiMultiplayerMenu.cpp:213
+msgid "Name/Password"
+msgstr "Name/Passwort"
+
+#: src/guiMultiplayerMenu.cpp:240
+msgid "Join Server"
+msgstr ""
+
+#: src/guiMultiplayerMenu.cpp:262
+msgid "My Favourites"
+msgstr ""
+
+#: src/guiMultiplayerMenu.cpp:265
+msgid "Server List"
+msgstr ""
+
+#: src/guiMultiplayerMenu.cpp:270
+msgid "Get New List"
+msgstr ""
+
+#: src/guiMultiplayerMenu.cpp:307
+msgid "Remove from Favourites"
+msgstr ""
+
 #: src/guiPasswordChange.cpp:105
 msgid "Old Password"
 msgstr "Altes Passwort"
@@ -3757,11 +3840,11 @@ msgstr "Vorwärts"
 msgid "Backward"
 msgstr "Rückwärts"
 
-#: src/guiSettingsMenu.cpp:72 src/keycode.cpp:234
+#: src/guiSettingsMenu.cpp:72 src/keycode.cpp:263
 msgid "Left"
 msgstr "Links"
 
-#: src/guiSettingsMenu.cpp:73 src/keycode.cpp:234
+#: src/guiSettingsMenu.cpp:73 src/keycode.cpp:265
 msgid "Right"
 msgstr "Rechts"
 
@@ -3797,11 +3880,11 @@ msgstr "Weite Sicht"
 msgid "Toggle Fly"
 msgstr "Fliegen an/aus"
 
-#: src/guiSettingsMenu.cpp:82 src/keycode.cpp:234
+#: src/guiSettingsMenu.cpp:82 src/keycode.cpp:264
 msgid "Up"
 msgstr "Hoch"
 
-#: src/guiSettingsMenu.cpp:83 src/keycode.cpp:234
+#: src/guiSettingsMenu.cpp:83 src/keycode.cpp:266
 msgid "Down"
 msgstr "Runter"
 
@@ -3845,10 +3928,6 @@ msgstr "Vorheriger Gegenstand"
 msgid "Next Item"
 msgstr "Nächster Gegenstand"
 
-#: src/guiSettingsMenu.cpp:277
-msgid "Main Menu"
-msgstr "Hauptmenü"
-
 #: src/guiSettingsMenu.cpp:284 src/guiSettingsMenu.cpp:311
 msgid "Controls"
 msgstr "Steuerung"
@@ -3956,362 +4035,576 @@ msgstr "Energieschub: %d:%02d"
 msgid "Cold Protection: %d:%02d"
 msgstr "Kälteschutz: %d:%02d"
 
-#: src/inventory.cpp:230 src/inventory.cpp:352
-msgid "Cookable: Yes"
-msgstr "Kochbar: Ja"
-
-#: src/inventory.cpp:235 src/inventory.cpp:357 src/inventory.cpp:532
-msgid "Fuel Burn Time: "
-msgstr "Brennstoffbrenndauer: "
-
-#: src/inventory.cpp:321
-msgid "Hunger: "
-msgstr "Hunger: "
-
-#: src/inventory.cpp:327
-msgid "Health: "
-msgstr "Gesundheit: "
-
-#: src/inventory.cpp:334
-msgid "Cold Protection: "
-msgstr "Kälteschutz: "
-
-#: src/inventory.cpp:343
-msgid "Energy Boost: "
-msgstr "Energieschub: "
-
-#: src/inventory.cpp:521
-msgid "Strength: "
-msgstr "Stärke: "
-
-#: src/inventory.cpp:524
-msgid "Speed: "
-msgstr "Geschwindigkeit: "
-
-#: src/inventory.cpp:527
-msgid "Level: "
-msgstr "Stufe: "
-
-#: src/inventory.cpp:557
+#: src/inventory.cpp:246 src/inventory.cpp:580
 msgid "Contains: "
 msgstr "Enthält:"
 
-#: src/inventory.cpp:643
+#: src/inventory.cpp:253 src/inventory.cpp:375
+msgid "Cookable: Yes"
+msgstr "Kochbar: Ja"
+
+#: src/inventory.cpp:258 src/inventory.cpp:380 src/inventory.cpp:555
+msgid "Fuel Burn Time: "
+msgstr "Brennstoffbrenndauer: "
+
+#: src/inventory.cpp:344
+msgid "Hunger: "
+msgstr "Hunger: "
+
+#: src/inventory.cpp:350
+msgid "Health: "
+msgstr "Gesundheit: "
+
+#: src/inventory.cpp:357
+msgid "Cold Protection: "
+msgstr "Kälteschutz: "
+
+#: src/inventory.cpp:366
+msgid "Energy Boost: "
+msgstr "Energieschub: "
+
+#: src/inventory.cpp:544
+msgid "Strength: "
+msgstr "Stärke: "
+
+#: src/inventory.cpp:547
+msgid "Speed: "
+msgstr "Geschwindigkeit: "
+
+#: src/inventory.cpp:550
+msgid "Level: "
+msgstr "Stufe: "
+
+#: src/inventory.cpp:666
 msgid "Armour: "
 msgstr "Panzerung: "
 
-#: src/inventory.cpp:649
+#: src/inventory.cpp:672
 msgid "Warmth: "
 msgstr "Wärme: "
 
-#: src/inventory.cpp:655
+#: src/inventory.cpp:678
 msgid "Pressure: "
 msgstr "Druck: "
 
-#: src/inventory.cpp:661
+#: src/inventory.cpp:684
 msgid "Suffocation: "
 msgstr "Ersticken: "
 
-#: src/inventory.cpp:667
+#: src/inventory.cpp:690
 msgid "Durability: "
 msgstr "Haltbarkeit: "
 
-#: src/inventory.cpp:672
+#: src/inventory.cpp:695
 msgid "Effect Boost: "
 msgstr "Wirkungsschub: "
 
-#: src/keycode.cpp:229
+#: src/keycode.cpp:232
+msgid "-"
+msgstr ""
+
+#: src/keycode.cpp:234
 msgid "Left Button"
 msgstr "Linke Taste"
 
-#: src/keycode.cpp:229
-msgid "Middle Button"
-msgstr "Mittlere Taste"
-
-#: src/keycode.cpp:229
+#: src/keycode.cpp:235
 msgid "Right Button"
 msgstr "Rechte Taste"
 
-#: src/keycode.cpp:229
+#: src/keycode.cpp:237
+msgid "Middle Button"
+msgstr "Mittlere Taste"
+
+#: src/keycode.cpp:238
 msgid "X Button 1"
 msgstr "X-Button 1"
 
-#: src/keycode.cpp:230
-msgid "Back"
-msgstr "Back"
-
-#: src/keycode.cpp:230
-msgid "Clear"
-msgstr "Clear"
-
-#: src/keycode.cpp:230
-msgid "Return"
-msgstr "Enter"
-
-#: src/keycode.cpp:230
-msgid "Tab"
-msgstr "Tab"
-
-#: src/keycode.cpp:230
+#: src/keycode.cpp:239
 msgid "X Button 2"
 msgstr "X-Button 2"
 
-#: src/keycode.cpp:231
-msgid "Capital"
-msgstr "Feststelltaste"
+#: src/keycode.cpp:240
+msgid "Back"
+msgstr "Back"
 
-#: src/keycode.cpp:231
-msgid "Control"
-msgstr "Strg"
+#: src/keycode.cpp:241
+msgid "Tab"
+msgstr "Tab"
 
-#: src/keycode.cpp:231
-msgid "Kana"
-msgstr "Kana"
+#: src/keycode.cpp:242
+msgid "Clear"
+msgstr "Clear"
 
-#: src/keycode.cpp:231
-msgid "Menu"
-msgstr "Menü"
+#: src/keycode.cpp:243
+msgid "Return"
+msgstr "Enter"
 
-#: src/keycode.cpp:231
-msgid "Pause"
-msgstr "Pause"
-
-#: src/keycode.cpp:231
+#: src/keycode.cpp:244
 msgid "Shift"
 msgstr "Umschalt"
 
-#: src/keycode.cpp:232
-msgid "Convert"
-msgstr "Convert"
+#: src/keycode.cpp:245
+msgid "Control"
+msgstr "Strg"
 
-#: src/keycode.cpp:232
-msgid "Escape"
-msgstr "Esc"
+#: src/keycode.cpp:246
+msgid "Menu"
+msgstr "Menü"
 
-#: src/keycode.cpp:232
-msgid "Final"
-msgstr "Final"
+#: src/keycode.cpp:247
+msgid "Pause"
+msgstr "Pause"
 
-#: src/keycode.cpp:232
+#: src/keycode.cpp:248
+msgid "Capital"
+msgstr "Feststelltaste"
+
+#: src/keycode.cpp:249
+msgid "Kana"
+msgstr "Kana"
+
+#: src/keycode.cpp:250
 msgid "Junja"
 msgstr "Junja"
 
-#: src/keycode.cpp:232
+#: src/keycode.cpp:251
+msgid "Final"
+msgstr "Final"
+
+#: src/keycode.cpp:252
 msgid "Kanji"
 msgstr "Kanji"
 
-#: src/keycode.cpp:232
+#: src/keycode.cpp:253
+msgid "Escape"
+msgstr "Esc"
+
+#: src/keycode.cpp:254
+msgid "Convert"
+msgstr "Convert"
+
+#: src/keycode.cpp:255
 msgid "Nonconvert"
 msgstr "Nonconvert"
 
-#: src/keycode.cpp:233
+#: src/keycode.cpp:256
 msgid "Accept"
 msgstr "Accept"
 
-#: src/keycode.cpp:233
-msgid "End"
-msgstr "Ende"
-
-#: src/keycode.cpp:233
-msgid "Home"
-msgstr "Pos1"
-
-#: src/keycode.cpp:233
+#: src/keycode.cpp:257
 msgid "Mode Change"
 msgstr "Mode Change"
 
-#: src/keycode.cpp:233
-msgid "Next"
-msgstr "Bild ab"
-
-#: src/keycode.cpp:233
-msgid "Prior"
-msgstr "Bild auf"
-
-#: src/keycode.cpp:233
+#: src/keycode.cpp:258
 msgid "Space"
 msgstr "Leertaste"
 
-#: src/keycode.cpp:234
-msgid "Execute"
-msgstr "Execute"
+#: src/keycode.cpp:259
+msgid "Prior"
+msgstr "Bild auf"
 
-#: src/keycode.cpp:234
-msgid "Print"
-msgstr "Druck"
+#: src/keycode.cpp:260
+msgid "Next"
+msgstr "Bild ab"
 
-#: src/keycode.cpp:234
+#: src/keycode.cpp:261
+msgid "End"
+msgstr "Ende"
+
+#: src/keycode.cpp:262
+msgid "Home"
+msgstr "Pos1"
+
+#: src/keycode.cpp:267
 msgid "Select"
 msgstr "Select"
 
-#: src/keycode.cpp:235
-msgid "Delete"
-msgstr "Entf"
+#: src/keycode.cpp:268
+msgid "Print"
+msgstr "Druck"
 
-#: src/keycode.cpp:235
-msgid "Help"
-msgstr "Hilfe"
+#: src/keycode.cpp:269
+msgid "Execute"
+msgstr "Execute"
 
-#: src/keycode.cpp:235
-msgid "Insert"
-msgstr "Einfg"
-
-#: src/keycode.cpp:235
+#: src/keycode.cpp:270
 msgid "Snapshot"
 msgstr "Druck"
 
-#: src/keycode.cpp:238
+#: src/keycode.cpp:271
+msgid "Insert"
+msgstr "Einfg"
+
+#: src/keycode.cpp:272
+msgid "Delete"
+msgstr "Entf"
+
+#: src/keycode.cpp:273
+msgid "Help"
+msgstr "Hilfe"
+
+#: src/keycode.cpp:274
+msgid "0"
+msgstr ""
+
+#: src/keycode.cpp:275
+msgid "1"
+msgstr ""
+
+#: src/keycode.cpp:276
+msgid "2"
+msgstr ""
+
+#: src/keycode.cpp:277
+msgid "3"
+msgstr ""
+
+#: src/keycode.cpp:278
+msgid "4"
+msgstr ""
+
+#: src/keycode.cpp:279
+msgid "5"
+msgstr ""
+
+#: src/keycode.cpp:280
+msgid "6"
+msgstr ""
+
+#: src/keycode.cpp:281
+msgid "7"
+msgstr ""
+
+#: src/keycode.cpp:282
+msgid "8"
+msgstr ""
+
+#: src/keycode.cpp:283
+msgid "9"
+msgstr ""
+
+#: src/keycode.cpp:284
+msgid "A"
+msgstr ""
+
+#: src/keycode.cpp:285
+msgid "B"
+msgstr ""
+
+#: src/keycode.cpp:286
+msgid "C"
+msgstr ""
+
+#: src/keycode.cpp:287
+msgid "D"
+msgstr ""
+
+#: src/keycode.cpp:288
+msgid "E"
+msgstr ""
+
+#: src/keycode.cpp:289
+msgid "F"
+msgstr ""
+
+#: src/keycode.cpp:290
+msgid "G"
+msgstr ""
+
+#: src/keycode.cpp:291
+msgid "H"
+msgstr ""
+
+#: src/keycode.cpp:292
+msgid "I"
+msgstr ""
+
+#: src/keycode.cpp:293
+msgid "J"
+msgstr ""
+
+#: src/keycode.cpp:294
+msgid "K"
+msgstr ""
+
+#: src/keycode.cpp:295
+msgid "L"
+msgstr ""
+
+#: src/keycode.cpp:296
+msgid "M"
+msgstr ""
+
+#: src/keycode.cpp:297
+msgid "N"
+msgstr ""
+
+#: src/keycode.cpp:298
+msgid "O"
+msgstr ""
+
+#: src/keycode.cpp:299
+msgid "P"
+msgstr ""
+
+#: src/keycode.cpp:300
+msgid "Q"
+msgstr ""
+
+#: src/keycode.cpp:301
+msgid "R"
+msgstr ""
+
+#: src/keycode.cpp:302
+msgid "S"
+msgstr ""
+
+#: src/keycode.cpp:303
+msgid "T"
+msgstr ""
+
+#: src/keycode.cpp:304
+#, fuzzy
+msgid "U"
+msgstr "Hoch"
+
+#: src/keycode.cpp:305
+msgid "V"
+msgstr ""
+
+#: src/keycode.cpp:306
+msgid "W"
+msgstr ""
+
+#: src/keycode.cpp:307
+msgid "X"
+msgstr ""
+
+#: src/keycode.cpp:308
+msgid "Y"
+msgstr ""
+
+#: src/keycode.cpp:309
+msgid "Z"
+msgstr ""
+
+#: src/keycode.cpp:310
 msgid "Left Windows"
 msgstr "linke Windowstaste"
 
-#: src/keycode.cpp:239
-msgid "Apps"
-msgstr "Apps"
-
-#: src/keycode.cpp:239
-msgid "Numpad 0"
-msgstr "Ziffernblock 0"
-
-#: src/keycode.cpp:239
-msgid "Numpad 1"
-msgstr "Ziffernblock 1"
-
-#: src/keycode.cpp:239
+#: src/keycode.cpp:311
 msgid "Right Windows"
 msgstr "rechte Windowstaste"
 
-#: src/keycode.cpp:239
+#: src/keycode.cpp:312
+msgid "Apps"
+msgstr "Apps"
+
+#: src/keycode.cpp:313
 msgid "Sleep"
 msgstr "Sleep"
 
-#: src/keycode.cpp:240
+#: src/keycode.cpp:314
+msgid "Numpad 0"
+msgstr "Ziffernblock 0"
+
+#: src/keycode.cpp:315
+msgid "Numpad 1"
+msgstr "Ziffernblock 1"
+
+#: src/keycode.cpp:316
 msgid "Numpad 2"
 msgstr "Ziffernblock 2"
 
-#: src/keycode.cpp:240
+#: src/keycode.cpp:317
 msgid "Numpad 3"
 msgstr "Ziffernblock 3"
 
-#: src/keycode.cpp:240
+#: src/keycode.cpp:318
 msgid "Numpad 4"
 msgstr "Ziffernblock 4"
 
-#: src/keycode.cpp:240
+#: src/keycode.cpp:319
 msgid "Numpad 5"
 msgstr "Ziffernblock 5"
 
-#: src/keycode.cpp:240
+#: src/keycode.cpp:320
 msgid "Numpad 6"
 msgstr "Ziffernblock 6"
 
-#: src/keycode.cpp:240
+#: src/keycode.cpp:321
 msgid "Numpad 7"
 msgstr "Ziffernblock 7"
 
-#: src/keycode.cpp:241
-msgid "Numpad *"
-msgstr "Ziffernblock *"
-
-#: src/keycode.cpp:241
-msgid "Numpad +"
-msgstr "Ziffernblock +"
-
-#: src/keycode.cpp:241
-msgid "Numpad -"
-msgstr "Ziffernblock -"
-
-#: src/keycode.cpp:241
-msgid "Numpad /"
-msgstr "Ziffernblock /"
-
-#: src/keycode.cpp:241
+#: src/keycode.cpp:322
 msgid "Numpad 8"
 msgstr "Ziffernblock 8"
 
-#: src/keycode.cpp:241
+#: src/keycode.cpp:323
 msgid "Numpad 9"
 msgstr "Ziffernblock 9"
 
-#: src/keycode.cpp:245
+#: src/keycode.cpp:324
+msgid "Numpad *"
+msgstr "Ziffernblock *"
+
+#: src/keycode.cpp:325
+msgid "Numpad +"
+msgstr "Ziffernblock +"
+
+#: src/keycode.cpp:326 src/keycode.cpp:329
+msgid "Numpad /"
+msgstr "Ziffernblock /"
+
+#: src/keycode.cpp:327
+msgid "Numpad -"
+msgstr "Ziffernblock -"
+
+#: src/keycode.cpp:328
+#, fuzzy
+msgid "Numpad ."
+msgstr "Ziffernblock 0"
+
+#: src/keycode.cpp:330
+msgid "F10"
+msgstr ""
+
+#: src/keycode.cpp:331
+msgid "F11"
+msgstr ""
+
+#: src/keycode.cpp:332
+msgid "F12"
+msgstr ""
+
+#: src/keycode.cpp:333
+msgid "F13"
+msgstr ""
+
+#: src/keycode.cpp:334
+msgid "F14"
+msgstr ""
+
+#: src/keycode.cpp:335
+msgid "F15"
+msgstr ""
+
+#: src/keycode.cpp:336
+msgid "F16"
+msgstr ""
+
+#: src/keycode.cpp:337
+msgid "F17"
+msgstr ""
+
+#: src/keycode.cpp:338
+msgid "F18"
+msgstr ""
+
+#: src/keycode.cpp:339
+msgid "F19"
+msgstr ""
+
+#: src/keycode.cpp:340
+msgid "F20"
+msgstr ""
+
+#: src/keycode.cpp:341
+msgid "F21"
+msgstr ""
+
+#: src/keycode.cpp:342
+msgid "F22"
+msgstr ""
+
+#: src/keycode.cpp:343
+msgid "F23"
+msgstr ""
+
+#: src/keycode.cpp:344
+msgid "F24"
+msgstr ""
+
+#: src/keycode.cpp:345
 msgid "Num Lock"
 msgstr "Numlock"
 
-#: src/keycode.cpp:245
+#: src/keycode.cpp:346
 msgid "Scroll Lock"
 msgstr "Rollen"
 
-#: src/keycode.cpp:246
+#: src/keycode.cpp:347
 msgid "Left Shift"
 msgstr "Umschalt links"
 
-#: src/keycode.cpp:246
+#: src/keycode.cpp:348
 msgid "Right Shift"
 msgstr "Umschalt rechts"
 
-#: src/keycode.cpp:247
+#: src/keycode.cpp:349
 msgid "Left Control"
 msgstr "Strg links"
 
-#: src/keycode.cpp:247
-msgid "Left Menu"
-msgstr "Menü links"
-
-#: src/keycode.cpp:247
+#: src/keycode.cpp:350
 msgid "Right Control"
 msgstr "Strg rechts"
 
-#: src/keycode.cpp:247
+#: src/keycode.cpp:351
+msgid "Left Menu"
+msgstr "Menü links"
+
+#: src/keycode.cpp:352
 msgid "Right Menu"
 msgstr "Menü rechts"
 
-#: src/keycode.cpp:249
-msgid "Comma"
-msgstr "Komma"
-
-#: src/keycode.cpp:249
-msgid "Minus"
-msgstr "Minus"
-
-#: src/keycode.cpp:249
-msgid "Period"
-msgstr "Punkt"
-
-#: src/keycode.cpp:249
+#: src/keycode.cpp:353
 msgid "Plus"
 msgstr "Plus"
 
-#: src/keycode.cpp:253
+#: src/keycode.cpp:354
+msgid "Comma"
+msgstr "Komma"
+
+#: src/keycode.cpp:355
+msgid "Minus"
+msgstr "Minus"
+
+#: src/keycode.cpp:356
+msgid "Period"
+msgstr "Punkt"
+
+#: src/keycode.cpp:357
 msgid "Attn"
 msgstr "Attn"
 
-#: src/keycode.cpp:253
+#: src/keycode.cpp:358
 msgid "CrSel"
 msgstr "CrSel"
 
-#: src/keycode.cpp:254
-msgid "Erase OEF"
-msgstr "Erase OEF"
-
-#: src/keycode.cpp:254
+#: src/keycode.cpp:359
 msgid "ExSel"
 msgstr "ExSel"
 
-#: src/keycode.cpp:254
-msgid "OEM Clear"
-msgstr "OEM Clear"
+#: src/keycode.cpp:360
+msgid "Erase OEF"
+msgstr "Erase OEF"
 
-#: src/keycode.cpp:254
-msgid "PA1"
-msgstr "PA1"
-
-#: src/keycode.cpp:254
+#: src/keycode.cpp:361
 msgid "Play"
 msgstr "Play"
 
-#: src/keycode.cpp:254
+#: src/keycode.cpp:362
 msgid "Zoom"
 msgstr "Zoom"
 
+#: src/keycode.cpp:363
+msgid "PA1"
+msgstr "PA1"
+
+#: src/keycode.cpp:364
+msgid "OEM Clear"
+msgstr "OEM Clear"
+
 #: src/main.cpp:1131
 msgid "Setting Up UI"
 msgstr "Benutzeroberfläche aufsetzen"
@@ -4328,30 +4621,70 @@ msgstr "Kreaturen laden"
 msgid "Setting Up Sound"
 msgstr "Ton vorbereiten"
 
-#: src/mapnode.cpp:282
+#: src/mapnode.cpp:285
 msgid "Loading Base MapNodes"
 msgstr "Basis-MapNodes laden"
 
-#: src/mapnode.cpp:286
+#: src/mapnode.cpp:289
 msgid "Loading Circuit MapNodes"
 msgstr "Schaltungs-MapNodes laden"
 
-#: src/mapnode.cpp:290
+#: src/mapnode.cpp:293
 msgid "Loading Plant MapNodes"
 msgstr "Pflanzen-MapNodes laden"
 
-#: src/mapnode.cpp:294
+#: src/mapnode.cpp:297
 msgid "Loading Farming MapNodes"
 msgstr "Landwirtschafts-MapNodes laden"
 
-#: src/mapnode.cpp:298
+#: src/mapnode.cpp:301
 msgid "Loading Decorative MapNodes"
 msgstr "Dekorative MapNodes laden"
 
-#: src/mapnode.cpp:302
+#: src/mapnode.cpp:305
 msgid "Loading Interactive MapNodes"
 msgstr "Interaktive MapNodes laden"
 
-#: src/mapnode.cpp:306
+#: src/mapnode.cpp:309
 msgid "Loading Special MapNodes"
 msgstr "Besondere MapNodes laden"
+
+#: src/mineral.cpp:93
+#, fuzzy
+msgid "Coal"
+msgstr "Kohleklumpen"
+
+#: src/mineral.cpp:99
+#, fuzzy
+msgid "Iron"
+msgstr "Eisenklumpen"
+
+#: src/mineral.cpp:106
+#, fuzzy
+msgid "Tin"
+msgstr "Dünner"
+
+#: src/mineral.cpp:113
+#, fuzzy
+msgid "Copper"
+msgstr "Kupferklumpen"
+
+#: src/mineral.cpp:121
+#, fuzzy
+msgid "Silver"
+msgstr "Silberklumpen"
+
+#: src/mineral.cpp:128
+#, fuzzy
+msgid "Gold"
+msgstr "Goldklumpen"
+
+#: src/mineral.cpp:135
+#, fuzzy
+msgid "Quartz"
+msgstr "Quarzstaub"
+
+#: src/mineral.cpp:157
+#, fuzzy
+msgid "Turquoise"
+msgstr "Türkis"
diff --git a/po/es/voxelands.po b/po/es/voxelands.po
index 071f976..e22f74a 100644
--- a/po/es/voxelands.po
+++ b/po/es/voxelands.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Lisa 'darkrose' Milne
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # Adolfo Jayme Barrientos, 2014
 # Pablo Roberto Francisco Lezaeta Reyes <prflr88@gmail.com>, 2014-2015
@@ -9,14 +9,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Voxelands\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-10-19 01:55+1000\n"
+"POT-Creation-Date: 2015-12-21 11:27+1000\n"
 "PO-Revision-Date: 2015-10-22 01:17+0000\n"
 "Last-Translator: Pablo Roberto Francisco Lezaeta Reyes <prflr88@gmail.com>\n"
-"Language-Team: Spanish (http://www.transifex.com/voxelands/voxelands/language/es/)\n"
+"Language-Team: Spanish (http://www.transifex.com/voxelands/voxelands/"
+"language/es/)\n"
+"Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: src/character_creator.cpp:55
@@ -229,9 +230,18 @@ msgstr "Zapatos de lona"
 
 #: src/character_creator.cpp:202
 msgid ""
-"Here you can create your default character, this is how other players will see you in-game. When you join a new server you will start with the clothing you select here. Additional clothing, both protective and decorative, can be crafted in-game.\n"
+"Here you can create your default character, this is how other players will "
+"see you in-game. When you join a new server you will start with the clothing "
+"you select here. Additional clothing, both protective and decorative, can be "
+"crafted in-game.\n"
 "You can return here from the main menu anytime to change your character."
-msgstr "Aquí puede crear su personaje predeterminado, que le representará ante otros jugadores durante las partidas. Cuando se una a un servidor nuevo comenzará con las ropas que elija aquí. Se pueden elaborar prendas adicionales, de protección y decorativas, durante el juego.\nPodrá volver aquí en cualquier momento, mediante el menú principal, para cambiar su personaje."
+msgstr ""
+"Aquí puede crear su personaje predeterminado, que le representará ante otros "
+"jugadores durante las partidas. Cuando se una a un servidor nuevo comenzará "
+"con las ropas que elija aquí. Se pueden elaborar prendas adicionales, de "
+"protección y decorativas, durante el juego.\n"
+"Podrá volver aquí en cualquier momento, mediante el menú principal, para "
+"cambiar su personaje."
 
 #: src/character_creator.cpp:223
 msgid "Create Your Character"
@@ -265,7 +275,7 @@ msgstr "Delgado"
 msgid "Done"
 msgstr "Listo"
 
-#: src/character_creator.cpp:423 src/keycode.cpp:229
+#: src/character_creator.cpp:423 src/keycode.cpp:236
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -1117,7 +1127,7 @@ msgstr "Sílex"
 msgid "Steel Ingot"
 msgstr "Lingote de acero"
 
-#: src/content_craftitem.cpp:225 src/content_mapnode.cpp:710
+#: src/content_craftitem.cpp:225 src/content_mapnode.cpp:723
 msgid "Brick"
 msgstr "Ladrillo"
 
@@ -1545,11 +1555,11 @@ msgstr "Mitrilo en bruto"
 msgid "Unbound Mithril"
 msgstr "Mitrilo sin consolidar"
 
-#: src/content_craftitem.cpp:1516
+#: src/content_craftitem.cpp:1516 src/mineral.cpp:142
 msgid "Mithril"
 msgstr "Mitrilo"
 
-#: src/content_craftitem.cpp:1525
+#: src/content_craftitem.cpp:1525 src/mineral.cpp:149
 msgid "Ruby"
 msgstr "Rubí"
 
@@ -1557,15 +1567,15 @@ msgstr "Rubí"
 msgid "Turquiose"
 msgstr "Turquesa"
 
-#: src/content_craftitem.cpp:1541
+#: src/content_craftitem.cpp:1541 src/mineral.cpp:165
 msgid "Amethyst"
 msgstr "Amatista"
 
-#: src/content_craftitem.cpp:1549
+#: src/content_craftitem.cpp:1549 src/mineral.cpp:173
 msgid "Sapphire"
 msgstr "Safiro"
 
-#: src/content_craftitem.cpp:1557
+#: src/content_craftitem.cpp:1557 src/mineral.cpp:181
 msgid "Sunstone"
 msgstr "Piedra solar"
 
@@ -1577,392 +1587,396 @@ msgstr "Piedra"
 msgid "Limestone"
 msgstr "Caliza"
 
-#: src/content_mapnode.cpp:219
+#: src/content_mapnode.cpp:221
+msgid "Marble"
+msgstr ""
+
+#: src/content_mapnode.cpp:232
 msgid "Rock"
 msgstr "Roca"
 
-#: src/content_mapnode.cpp:241
+#: src/content_mapnode.cpp:254
 msgid "Ice"
 msgstr "Hielo"
 
-#: src/content_mapnode.cpp:257
+#: src/content_mapnode.cpp:270
 msgid "Coal Block"
 msgstr "Bloque de carbón mineral"
 
-#: src/content_mapnode.cpp:274
+#: src/content_mapnode.cpp:287
 msgid "Charcoal Block"
 msgstr "Bloque de carbón vegetal"
 
-#: src/content_mapnode.cpp:291
+#: src/content_mapnode.cpp:304
 msgid "Stone Brick"
 msgstr "Ladrillo de piedra"
 
-#: src/content_mapnode.cpp:305
+#: src/content_mapnode.cpp:318
 msgid "Stone Block"
 msgstr "Bloque de piedra"
 
-#: src/content_mapnode.cpp:319
+#: src/content_mapnode.cpp:332
 msgid "Rough Stone Brick"
 msgstr "Ladrillo de piedra en bruto"
 
-#: src/content_mapnode.cpp:336
+#: src/content_mapnode.cpp:349
 msgid "Rough Stone Block"
 msgstr "Bloque de piedra en bruto"
 
-#: src/content_mapnode.cpp:352 src/content_mapnode.cpp:385
-#: src/content_mapnode.cpp:399 src/content_mapnode.cpp:432
+#: src/content_mapnode.cpp:365 src/content_mapnode.cpp:398
+#: src/content_mapnode.cpp:412 src/content_mapnode.cpp:445
 msgid "Grass"
 msgstr "Pasto"
 
-#: src/content_mapnode.cpp:370 src/content_mapnode.cpp:417
+#: src/content_mapnode.cpp:383 src/content_mapnode.cpp:430
 msgid "Growing Grass"
 msgstr "Pasto en crecimiento"
 
-#: src/content_mapnode.cpp:446
+#: src/content_mapnode.cpp:459
 msgid "Muddy Snow"
 msgstr "Nieve lodosa"
 
-#: src/content_mapnode.cpp:462
+#: src/content_mapnode.cpp:475
 msgid "Mud"
 msgstr "Lodo"
 
-#: src/content_mapnode.cpp:478
+#: src/content_mapnode.cpp:491
 msgid "Ash Block"
 msgstr "Bloque de ceniza"
 
-#: src/content_mapnode.cpp:493
+#: src/content_mapnode.cpp:506
 msgid "Sand"
 msgstr "Arena"
 
-#: src/content_mapnode.cpp:512
+#: src/content_mapnode.cpp:525
 msgid "Gravel"
 msgstr "Grava"
 
-#: src/content_mapnode.cpp:529
+#: src/content_mapnode.cpp:542
 msgid "Sand Stone"
 msgstr "Arenisca"
 
-#: src/content_mapnode.cpp:544
+#: src/content_mapnode.cpp:557
 msgid "Sand Stone Bricks"
 msgstr "Ladrillo de arenisca"
 
-#: src/content_mapnode.cpp:559
+#: src/content_mapnode.cpp:572
 msgid "Sand Stone Blocks"
 msgstr "Bloque de arenisca"
 
-#: src/content_mapnode.cpp:574
+#: src/content_mapnode.cpp:587
 msgid "Clay"
 msgstr "Arcilla"
 
-#: src/content_mapnode.cpp:591
+#: src/content_mapnode.cpp:604
 msgid "Blue Clay"
 msgstr "Arcilla azul"
 
-#: src/content_mapnode.cpp:608
+#: src/content_mapnode.cpp:621
 msgid "Green Clay"
 msgstr "Arcilla verde"
 
-#: src/content_mapnode.cpp:625
+#: src/content_mapnode.cpp:638
 msgid "Orange Clay"
 msgstr "Arcilla naranja"
 
-#: src/content_mapnode.cpp:642
+#: src/content_mapnode.cpp:655
 msgid "Purple Clay"
 msgstr "Arcilla púrpura"
 
-#: src/content_mapnode.cpp:659
+#: src/content_mapnode.cpp:672
 msgid "Red Clay"
 msgstr "Arcilla roja"
 
-#: src/content_mapnode.cpp:676
+#: src/content_mapnode.cpp:689
 msgid "Yellow Clay"
 msgstr "Arcilla amarilla"
 
-#: src/content_mapnode.cpp:693
+#: src/content_mapnode.cpp:706
 msgid "Black Clay"
 msgstr "Arcilla negra"
 
-#: src/content_mapnode.cpp:729
+#: src/content_mapnode.cpp:742
 msgid "Terracotta"
 msgstr "Terracota"
 
-#: src/content_mapnode.cpp:741
+#: src/content_mapnode.cpp:754
 msgid "Terracotta Brick"
 msgstr "LAdrillo de terracota"
 
-#: src/content_mapnode.cpp:755
+#: src/content_mapnode.cpp:768
 msgid "Terracotta Block"
 msgstr "Bloque de terracota"
 
-#: src/content_mapnode.cpp:769
+#: src/content_mapnode.cpp:782
 msgid "Terracotta Tile"
 msgstr "Baldosa de terracota"
 
-#: src/content_mapnode.cpp:789
+#: src/content_mapnode.cpp:802
 msgid "Glass"
 msgstr "Cristal"
 
-#: src/content_mapnode.cpp:809
+#: src/content_mapnode.cpp:822
 msgid "Blue Glass"
 msgstr "Cristal azul"
 
-#: src/content_mapnode.cpp:831
+#: src/content_mapnode.cpp:844
 msgid "Green Glass"
 msgstr "Cristal verde"
 
-#: src/content_mapnode.cpp:853
+#: src/content_mapnode.cpp:866
 msgid "Orange Glass"
 msgstr "Cristal naranja"
 
-#: src/content_mapnode.cpp:875
+#: src/content_mapnode.cpp:888
 msgid "Purple Glass"
 msgstr "Cristal púrpura"
 
-#: src/content_mapnode.cpp:897
+#: src/content_mapnode.cpp:910
 msgid "Red Glass"
 msgstr "Cristal rojo"
 
-#: src/content_mapnode.cpp:919
+#: src/content_mapnode.cpp:932
 msgid "Yellow Glass"
 msgstr "Cristal amarillo"
 
-#: src/content_mapnode.cpp:941
+#: src/content_mapnode.cpp:954
 msgid "Black Glass"
 msgstr "Cristal negro"
 
-#: src/content_mapnode.cpp:963
+#: src/content_mapnode.cpp:976
 msgid "Glass Pane"
 msgstr "Panel de cristal"
 
-#: src/content_mapnode.cpp:997
+#: src/content_mapnode.cpp:1010
 msgid "Blue Glass Pane"
 msgstr "Panel de cristal azul"
 
-#: src/content_mapnode.cpp:1032
+#: src/content_mapnode.cpp:1045
 msgid "Green Glass Pane"
 msgstr "Panel de cristal verde"
 
-#: src/content_mapnode.cpp:1067
+#: src/content_mapnode.cpp:1080
 msgid "Orange Glass Pane"
 msgstr "Panel de cristal naranja"
 
-#: src/content_mapnode.cpp:1102
+#: src/content_mapnode.cpp:1115
 msgid "Purple Glass Pane"
 msgstr "Panel de cristal púrpura"
 
-#: src/content_mapnode.cpp:1137
+#: src/content_mapnode.cpp:1150
 msgid "Red Glass Pane"
 msgstr "Panel de cristal rojo"
 
-#: src/content_mapnode.cpp:1172
+#: src/content_mapnode.cpp:1185
 msgid "Yellow Glass Pane"
 msgstr "Panel de cristal amarillo"
 
-#: src/content_mapnode.cpp:1207
+#: src/content_mapnode.cpp:1220
 msgid "Black Glass Pane"
 msgstr "Panel de cristal azul"
 
-#: src/content_mapnode.cpp:1242 src/content_mapnode_farm.cpp:333
+#: src/content_mapnode.cpp:1255 src/content_mapnode_farm.cpp:333
 msgid "Glass Light"
 msgstr "Luz de cristal"
 
-#: src/content_mapnode.cpp:1265
+#: src/content_mapnode.cpp:1278
 msgid "Wood"
 msgstr "Madera"
 
-#: src/content_mapnode.cpp:1291
+#: src/content_mapnode.cpp:1304
 msgid "Jungle Wood"
 msgstr "Madera selvática"
 
-#: src/content_mapnode.cpp:1316
+#: src/content_mapnode.cpp:1329
 msgid "Pine"
 msgstr "Pino"
 
-#: src/content_mapnode.cpp:1341
+#: src/content_mapnode.cpp:1354
 msgid "Sponge"
 msgstr "Esponja"
 
-#: src/content_mapnode.cpp:1356
+#: src/content_mapnode.cpp:1369
 msgid "Waterlogged Sponge"
 msgstr "Esponja anegada"
 
-#: src/content_mapnode.cpp:1371
+#: src/content_mapnode.cpp:1384
 msgid "Hay Bale"
 msgstr "Fardo de heno"
 
-#: src/content_mapnode.cpp:1388
+#: src/content_mapnode.cpp:1401
 msgid "Raw Apple Pie"
 msgstr "Tarta de manzana cruda"
 
-#: src/content_mapnode.cpp:1417
+#: src/content_mapnode.cpp:1430
 msgid "Apple Pie"
 msgstr "Tarta de manzana"
 
-#: src/content_mapnode.cpp:1512
+#: src/content_mapnode.cpp:1525
 msgid "Raw Pumpkin Pie"
 msgstr "Tarta de calabaza cruda"
 
-#: src/content_mapnode.cpp:1541
+#: src/content_mapnode.cpp:1554
 msgid "Pumpkin Pie"
 msgstr "Tarta de calabaza"
 
-#: src/content_mapnode.cpp:1636 src/content_mapnode.cpp:1715
+#: src/content_mapnode.cpp:1649 src/content_mapnode.cpp:1728
 msgid "Snow"
 msgstr "Nieve"
 
-#: src/content_mapnode.cpp:1652
+#: src/content_mapnode.cpp:1665
 msgid "Snowman"
 msgstr "Muñeco de nieve"
 
-#: src/content_mapnode.cpp:1738 src/content_mapnode_farm.cpp:445
+#: src/content_mapnode.cpp:1752 src/content_mapnode_farm.cpp:445
 msgid "Cotton"
 msgstr "Algodón"
 
-#: src/content_mapnode.cpp:1769
+#: src/content_mapnode.cpp:1783
 msgid "Blue Cotton"
 msgstr "Algodón azul"
 
-#: src/content_mapnode.cpp:1786
+#: src/content_mapnode.cpp:1800
 msgid "Green Cotton"
 msgstr "Algodón verde"
 
-#: src/content_mapnode.cpp:1803
+#: src/content_mapnode.cpp:1817
 msgid "Orange Cotton"
 msgstr "Algodón naranja"
 
-#: src/content_mapnode.cpp:1820
+#: src/content_mapnode.cpp:1834
 msgid "Purple Cotton"
 msgstr "Algodón púrpura"
 
-#: src/content_mapnode.cpp:1837
+#: src/content_mapnode.cpp:1851
 msgid "Red Cotton"
 msgstr "Algodón rojo"
 
-#: src/content_mapnode.cpp:1854
+#: src/content_mapnode.cpp:1868
 msgid "Yellow Cotton"
 msgstr "Algodón amarillo"
 
-#: src/content_mapnode.cpp:1871
+#: src/content_mapnode.cpp:1885
 msgid "Black Cotton"
 msgstr "Algodón negro"
 
-#: src/content_mapnode.cpp:1888
+#: src/content_mapnode.cpp:1902
 msgid "Carpet"
 msgstr "Alfombra"
 
-#: src/content_mapnode.cpp:1911
+#: src/content_mapnode.cpp:1925
 msgid "Blue Carpet"
 msgstr "Alfombra azul"
 
-#: src/content_mapnode.cpp:1935
+#: src/content_mapnode.cpp:1949
 msgid "Green Carpet"
 msgstr "Alfombra verde"
 
-#: src/content_mapnode.cpp:1959
+#: src/content_mapnode.cpp:1973
 msgid "Orange Carpet"
 msgstr "Alfombra naranja"
 
-#: src/content_mapnode.cpp:1983
+#: src/content_mapnode.cpp:1997
 msgid "Purple Carpet"
 msgstr "Alfombra púrpura"
 
-#: src/content_mapnode.cpp:2007
+#: src/content_mapnode.cpp:2021
 msgid "Red Carpet"
 msgstr "Alfombra roja"
 
-#: src/content_mapnode.cpp:2031
+#: src/content_mapnode.cpp:2045
 msgid "Yellow Carpet"
 msgstr "Alfombra amarilla"
 
-#: src/content_mapnode.cpp:2055
+#: src/content_mapnode.cpp:2069
 msgid "Black Carpet"
 msgstr "Alfombra negra"
 
-#: src/content_mapnode.cpp:2079
+#: src/content_mapnode.cpp:2093
 msgid "Air"
 msgstr "Aire"
 
-#: src/content_mapnode.cpp:2095
+#: src/content_mapnode.cpp:2109
 msgid "Vacuum"
 msgstr "Aspiradora"
 
-#: src/content_mapnode.cpp:2112 src/content_mapnode.cpp:2142
+#: src/content_mapnode.cpp:2126 src/content_mapnode.cpp:2156
 msgid "Water"
 msgstr "Agua"
 
-#: src/content_mapnode.cpp:2172 src/content_mapnode.cpp:2200
+#: src/content_mapnode.cpp:2186 src/content_mapnode.cpp:2214
 msgid "Lava"
 msgstr "Lava"
 
-#: src/content_mapnode.cpp:2231
+#: src/content_mapnode.cpp:2245
 msgid "Rough Stone"
 msgstr "Piedra en bruto"
 
-#: src/content_mapnode.cpp:2248
+#: src/content_mapnode.cpp:2262
 msgid "Cobble Stone"
 msgstr "Adoquín"
 
-#: src/content_mapnode.cpp:2264
+#: src/content_mapnode.cpp:2278
 msgid "Mossy Cobble Stone"
 msgstr "Adoquín musgoso"
 
-#: src/content_mapnode.cpp:2277
+#: src/content_mapnode.cpp:2291
 msgid "Steel Block"
 msgstr "Bloque de acero"
 
-#: src/content_mapnode.cpp:2294
+#: src/content_mapnode.cpp:2308
 msgid "Mithril Block"
 msgstr "Bloque de mitrilo"
 
-#: src/content_mapnode.cpp:2310
+#: src/content_mapnode.cpp:2324
 msgid "Stone Knob"
 msgstr "Perilla de piedra"
 
-#: src/content_mapnode.cpp:2311
+#: src/content_mapnode.cpp:2325
 msgid "Rough Stone Knob"
 msgstr "Perilla de piedra en bruto"
 
-#: src/content_mapnode.cpp:2312
+#: src/content_mapnode.cpp:2326
 msgid "Sandstone Knob"
 msgstr "Perilla de arenisca"
 
-#: src/content_mapnode.cpp:2313
+#: src/content_mapnode.cpp:2327
 msgid "Wooden Knob"
 msgstr "Perilla de madera"
 
-#: src/content_mapnode.cpp:2314
+#: src/content_mapnode.cpp:2328
 msgid "Junglewood Knob"
 msgstr "Perilla de madera de selva"
 
-#: src/content_mapnode.cpp:2315
+#: src/content_mapnode.cpp:2329
 msgid "Pine Knob"
 msgstr "Perilla de pino"
 
-#: src/content_mapnode.cpp:2319
+#: src/content_mapnode.cpp:2333
 msgid "Copper Block"
 msgstr "Bloque de cobre"
 
-#: src/content_mapnode.cpp:2336
+#: src/content_mapnode.cpp:2350
 msgid "Gold Block"
 msgstr "Bloque de oro"
 
-#: src/content_mapnode.cpp:2353
+#: src/content_mapnode.cpp:2367
 msgid "Silver Block"
 msgstr "Bloque de plata"
 
-#: src/content_mapnode.cpp:2370
+#: src/content_mapnode.cpp:2384
 msgid "Tin Block"
 msgstr "Bloque de estaño"
 
-#: src/content_mapnode.cpp:2387
+#: src/content_mapnode.cpp:2401
 msgid "Quartz Block"
 msgstr "Bloque de cuarzo"
 
-#: src/content_mapnode.cpp:2404
+#: src/content_mapnode.cpp:2418
 msgid "Stone Tiles"
 msgstr "Baldosas de piedra"
 
-#: src/content_mapnode.cpp:2426
+#: src/content_mapnode.cpp:2440
 msgid "Wood Tiles"
 msgstr "Baldosas de madera"
 
@@ -2010,29 +2024,29 @@ msgstr "Sin portón"
 msgid "Repeater"
 msgstr "Repetidor"
 
-#: src/content_mapnode_circuit.cpp:369 src/content_mapnode_circuit.cpp:393
+#: src/content_mapnode_circuit.cpp:369 src/content_mapnode_circuit.cpp:390
 msgid "Electric Lamp"
 msgstr "Lámpara eléctrica"
 
-#: src/content_mapnode_circuit.cpp:427 src/content_mapnode_circuit.cpp:462
-#: src/content_mapnode_circuit.cpp:516 src/content_mapnode_circuit.cpp:537
-#: src/content_mapnode_circuit.cpp:582 src/content_mapnode_circuit.cpp:603
+#: src/content_mapnode_circuit.cpp:424 src/content_mapnode_circuit.cpp:459
+#: src/content_mapnode_circuit.cpp:513 src/content_mapnode_circuit.cpp:534
+#: src/content_mapnode_circuit.cpp:579 src/content_mapnode_circuit.cpp:600
 msgid "Piston"
 msgstr "Pistón"
 
-#: src/content_mapnode_circuit.cpp:489 src/content_mapnode_circuit.cpp:560
-#: src/content_mapnode_circuit.cpp:626
+#: src/content_mapnode_circuit.cpp:486 src/content_mapnode_circuit.cpp:557
+#: src/content_mapnode_circuit.cpp:623
 msgid "Piston Arm"
 msgstr "Brazo de pistón"
 
-#: src/content_mapnode_circuit.cpp:648 src/content_mapnode_circuit.cpp:676
-#: src/content_mapnode_circuit.cpp:730 src/content_mapnode_circuit.cpp:751
-#: src/content_mapnode_circuit.cpp:796 src/content_mapnode_circuit.cpp:817
+#: src/content_mapnode_circuit.cpp:645 src/content_mapnode_circuit.cpp:673
+#: src/content_mapnode_circuit.cpp:727 src/content_mapnode_circuit.cpp:748
+#: src/content_mapnode_circuit.cpp:793 src/content_mapnode_circuit.cpp:814
 msgid "Sticky Piston"
 msgstr "Pistón pegajoso"
 
-#: src/content_mapnode_circuit.cpp:703 src/content_mapnode_circuit.cpp:774
-#: src/content_mapnode_circuit.cpp:840
+#: src/content_mapnode_circuit.cpp:700 src/content_mapnode_circuit.cpp:771
+#: src/content_mapnode_circuit.cpp:837
 msgid "Sticky Piston Arm"
 msgstr "Brazo de pistón pegajoso"
 
@@ -2172,7 +2186,7 @@ msgstr "Uva"
 msgid "Trellis Grape"
 msgstr "Uvas en rejas"
 
-#: src/content_mapnode_farm.cpp:493 src/content_mapnode_farm.cpp:512
+#: src/content_mapnode_farm.cpp:494 src/content_mapnode_farm.cpp:513
 msgid "Dead Vine"
 msgstr "Ramas de vid secas"
 
@@ -2188,131 +2202,137 @@ msgstr "Estante de madera de selva"
 msgid "Pine Book Shelf"
 msgstr "Estante de pino"
 
-#: src/content_mapnode_furniture.cpp:150 src/content_mapnode_furniture.cpp:169
-#: src/content_mapnode_furniture.cpp:188 src/content_mapnode_furniture.cpp:207
-#: src/content_mapnode_furniture.cpp:226 src/content_mapnode_furniture.cpp:245
+#: src/content_mapnode_furniture.cpp:150 src/content_mapnode_furniture.cpp:170
+#: src/content_mapnode_furniture.cpp:190 src/content_mapnode_furniture.cpp:210
+#: src/content_mapnode_furniture.cpp:230 src/content_mapnode_furniture.cpp:250
 msgid "Couch"
 msgstr "Sofá"
 
-#: src/content_mapnode_furniture.cpp:274 src/content_mapnode_furniture.cpp:293
-#: src/content_mapnode_furniture.cpp:312 src/content_mapnode_furniture.cpp:331
-#: src/content_mapnode_furniture.cpp:350 src/content_mapnode_furniture.cpp:369
+#: src/content_mapnode_furniture.cpp:280 src/content_mapnode_furniture.cpp:300
+#: src/content_mapnode_furniture.cpp:320 src/content_mapnode_furniture.cpp:340
+#: src/content_mapnode_furniture.cpp:360 src/content_mapnode_furniture.cpp:380
 msgid "Blue Couch"
 msgstr "Sofá azul"
 
-#: src/content_mapnode_furniture.cpp:392 src/content_mapnode_furniture.cpp:411
-#: src/content_mapnode_furniture.cpp:430 src/content_mapnode_furniture.cpp:449
-#: src/content_mapnode_furniture.cpp:468 src/content_mapnode_furniture.cpp:487
+#: src/content_mapnode_furniture.cpp:404 src/content_mapnode_furniture.cpp:424
+#: src/content_mapnode_furniture.cpp:444 src/content_mapnode_furniture.cpp:464
+#: src/content_mapnode_furniture.cpp:484 src/content_mapnode_furniture.cpp:504
 msgid "Green Couch"
 msgstr "Sofá verde"
 
-#: src/content_mapnode_furniture.cpp:510 src/content_mapnode_furniture.cpp:529
-#: src/content_mapnode_furniture.cpp:548 src/content_mapnode_furniture.cpp:567
-#: src/content_mapnode_furniture.cpp:586 src/content_mapnode_furniture.cpp:605
+#: src/content_mapnode_furniture.cpp:528 src/content_mapnode_furniture.cpp:548
+#: src/content_mapnode_furniture.cpp:568 src/content_mapnode_furniture.cpp:588
+#: src/content_mapnode_furniture.cpp:608 src/content_mapnode_furniture.cpp:628
 msgid "Orange Couch"
 msgstr "Sofá naranja"
 
-#: src/content_mapnode_furniture.cpp:628 src/content_mapnode_furniture.cpp:647
-#: src/content_mapnode_furniture.cpp:666 src/content_mapnode_furniture.cpp:685
-#: src/content_mapnode_furniture.cpp:704 src/content_mapnode_furniture.cpp:723
+#: src/content_mapnode_furniture.cpp:652 src/content_mapnode_furniture.cpp:672
+#: src/content_mapnode_furniture.cpp:692 src/content_mapnode_furniture.cpp:712
+#: src/content_mapnode_furniture.cpp:732 src/content_mapnode_furniture.cpp:752
 msgid "Purple Couch"
 msgstr "Sofá púrpura"
 
-#: src/content_mapnode_furniture.cpp:746 src/content_mapnode_furniture.cpp:765
-#: src/content_mapnode_furniture.cpp:784 src/content_mapnode_furniture.cpp:803
-#: src/content_mapnode_furniture.cpp:822 src/content_mapnode_furniture.cpp:841
+#: src/content_mapnode_furniture.cpp:776 src/content_mapnode_furniture.cpp:796
+#: src/content_mapnode_furniture.cpp:816 src/content_mapnode_furniture.cpp:836
+#: src/content_mapnode_furniture.cpp:856 src/content_mapnode_furniture.cpp:876
 msgid "Red Couch"
 msgstr "Sofá rojo"
 
-#: src/content_mapnode_furniture.cpp:864 src/content_mapnode_furniture.cpp:883
-#: src/content_mapnode_furniture.cpp:902 src/content_mapnode_furniture.cpp:921
-#: src/content_mapnode_furniture.cpp:940 src/content_mapnode_furniture.cpp:959
+#: src/content_mapnode_furniture.cpp:900 src/content_mapnode_furniture.cpp:920
+#: src/content_mapnode_furniture.cpp:940 src/content_mapnode_furniture.cpp:960
+#: src/content_mapnode_furniture.cpp:980
+#: src/content_mapnode_furniture.cpp:1000
 msgid "Yellow Couch"
 msgstr "Sofá amarillo"
 
-#: src/content_mapnode_furniture.cpp:982
-#: src/content_mapnode_furniture.cpp:1001
-#: src/content_mapnode_furniture.cpp:1020
-#: src/content_mapnode_furniture.cpp:1039
-#: src/content_mapnode_furniture.cpp:1058
-#: src/content_mapnode_furniture.cpp:1077
+#: src/content_mapnode_furniture.cpp:1024
+#: src/content_mapnode_furniture.cpp:1044
+#: src/content_mapnode_furniture.cpp:1064
+#: src/content_mapnode_furniture.cpp:1084
+#: src/content_mapnode_furniture.cpp:1104
+#: src/content_mapnode_furniture.cpp:1124
 msgid "Black Couch"
 msgstr "Sofá negro"
 
-#: src/content_mapnode_furniture.cpp:1100
+#: src/content_mapnode_furniture.cpp:1148
+#: src/content_mapnode_furniture.cpp:1182
+#: src/content_mapnode_furniture.cpp:1206
+#: src/content_mapnode_furniture.cpp:1230
+#: src/content_mapnode_furniture.cpp:1254
+#: src/content_mapnode_furniture.cpp:1278
 msgid "Chair"
 msgstr "Silla"
 
-#: src/content_mapnode_furniture.cpp:1149
+#: src/content_mapnode_furniture.cpp:1302
 msgid "Table"
 msgstr "Mesa"
 
-#: src/content_mapnode_furniture.cpp:1206
-#: src/content_mapnode_furniture.cpp:1239
+#: src/content_mapnode_furniture.cpp:1333
+#: src/content_mapnode_furniture.cpp:1366
 msgid "Bed"
 msgstr "Cama"
 
-#: src/content_mapnode_furniture.cpp:1267
-#: src/content_mapnode_furniture.cpp:1300
+#: src/content_mapnode_furniture.cpp:1394
+#: src/content_mapnode_furniture.cpp:1427
 msgid "Blue Bed"
 msgstr "Cama azul"
 
-#: src/content_mapnode_furniture.cpp:1328
-#: src/content_mapnode_furniture.cpp:1361
+#: src/content_mapnode_furniture.cpp:1455
+#: src/content_mapnode_furniture.cpp:1488
 msgid "Green Bed"
 msgstr "Cama verde"
 
-#: src/content_mapnode_furniture.cpp:1389
-#: src/content_mapnode_furniture.cpp:1422
+#: src/content_mapnode_furniture.cpp:1516
+#: src/content_mapnode_furniture.cpp:1549
 msgid "Orange Bed"
 msgstr "Cama naranja"
 
-#: src/content_mapnode_furniture.cpp:1450
-#: src/content_mapnode_furniture.cpp:1483
+#: src/content_mapnode_furniture.cpp:1577
+#: src/content_mapnode_furniture.cpp:1610
 msgid "Purple Bed"
 msgstr "Cama púrpura"
 
-#: src/content_mapnode_furniture.cpp:1511
-#: src/content_mapnode_furniture.cpp:1544
+#: src/content_mapnode_furniture.cpp:1638
+#: src/content_mapnode_furniture.cpp:1671
 msgid "Red Bed"
 msgstr "Cama roja"
 
-#: src/content_mapnode_furniture.cpp:1572
-#: src/content_mapnode_furniture.cpp:1605
+#: src/content_mapnode_furniture.cpp:1699
+#: src/content_mapnode_furniture.cpp:1732
 msgid "Yellow Bed"
 msgstr "Cama amarilla"
 
-#: src/content_mapnode_furniture.cpp:1633
-#: src/content_mapnode_furniture.cpp:1666
+#: src/content_mapnode_furniture.cpp:1760
+#: src/content_mapnode_furniture.cpp:1793
 msgid "Black Bed"
 msgstr "Cama negra"
 
-#: src/content_mapnode_furniture.cpp:1694
-#: src/content_mapnode_furniture.cpp:1729
+#: src/content_mapnode_furniture.cpp:1821
+#: src/content_mapnode_furniture.cpp:1856
 msgid "Camp Bed"
 msgstr "Cama de campamento"
 
-#: src/content_mapnode_furniture.cpp:1753
+#: src/content_mapnode_furniture.cpp:1880
 msgid "Colorful Painting"
 msgstr "Pintura de colores"
 
-#: src/content_mapnode_furniture.cpp:1788
+#: src/content_mapnode_furniture.cpp:1915
 msgid "Red Rose Painting"
 msgstr "Pintura de rosa roja"
 
-#: src/content_mapnode_furniture.cpp:1823
+#: src/content_mapnode_furniture.cpp:1950
 msgid "Field Painting"
 msgstr "Pintura de campo"
 
-#: src/content_mapnode_furniture.cpp:1858
+#: src/content_mapnode_furniture.cpp:1985
 msgid "Blue Flower Painting"
 msgstr "Pintura de flor azul"
 
-#: src/content_mapnode_furniture.cpp:1893
+#: src/content_mapnode_furniture.cpp:2020
 msgid "Painting Canvas"
 msgstr "Lona de pintura"
 
-#: src/content_mapnode_furniture.cpp:1931
+#: src/content_mapnode_furniture.cpp:2058
 msgid "Clock"
 msgstr "Reloj"
 
@@ -2632,7 +2652,7 @@ msgid "Decraft Book"
 msgstr "Libro de contrartesanías"
 
 #: src/content_mapnode_special.cpp:753 src/content_mapnode_special.cpp:948
-#: src/content_nodemeta.cpp:2693
+#: src/content_nodemeta.cpp:2694
 msgid "Diary"
 msgstr "Diario"
 
@@ -2682,11 +2702,11 @@ msgstr "Signo"
 msgid "Locking Sign"
 msgstr "Signo de bloqueo"
 
-#: src/content_mapnode_special.cpp:1286 src/content_nodemeta.cpp:500
+#: src/content_mapnode_special.cpp:1286 src/content_nodemeta.cpp:501
 msgid "Chest"
 msgstr "Cofre"
 
-#: src/content_mapnode_special.cpp:1310 src/content_nodemeta.cpp:775
+#: src/content_mapnode_special.cpp:1310 src/content_nodemeta.cpp:776
 msgid "Creative Chest"
 msgstr "Cofre creativo"
 
@@ -2806,7 +2826,7 @@ msgstr "Parcela"
 msgid "Cauldron"
 msgstr "Caldera"
 
-#: src/content_mapnode_special.cpp:2082 src/content_nodemeta.cpp:3312
+#: src/content_mapnode_special.cpp:2082 src/content_nodemeta.cpp:3313
 msgid "Forge"
 msgstr "Forjar"
 
@@ -2910,563 +2930,568 @@ msgstr "Gato siamés"
 msgid "Ginger Kitten"
 msgstr "Gato del jengibre"
 
-#: src/content_nodemeta.cpp:75 src/content_nodemeta.cpp:138
-#: src/content_nodemeta.cpp:2677 src/content_nodemeta.cpp:2776
+#: src/content_nodemeta.cpp:76 src/content_nodemeta.cpp:139
+#: src/content_nodemeta.cpp:2678 src/content_nodemeta.cpp:2777
 msgid "Save"
 msgstr "Guardar"
 
-#: src/content_nodemeta.cpp:185
+#: src/content_nodemeta.cpp:186
 #, c-format
 msgid "%s's Home Flag"
 msgstr "Bandera de la casa de %s"
 
-#: src/content_nodemeta.cpp:269 src/content_nodemeta.cpp:282
-#: src/content_nodemeta.cpp:436 src/content_nodemeta.cpp:449
+#: src/content_nodemeta.cpp:270 src/content_nodemeta.cpp:283
+#: src/content_nodemeta.cpp:437 src/content_nodemeta.cpp:450
 msgid "You can't sleep yet."
 msgstr "Aún no puede dormir."
 
-#: src/content_nodemeta.cpp:273 src/content_nodemeta.cpp:440
+#: src/content_nodemeta.cpp:274 src/content_nodemeta.cpp:441
 msgid "Go to sleep"
 msgstr "Ir a dormir"
 
-#: src/content_nodemeta.cpp:278 src/content_nodemeta.cpp:445
+#: src/content_nodemeta.cpp:279 src/content_nodemeta.cpp:446
 msgid "Someone else is sleeping here."
 msgstr "Alguién más duerme aquí."
 
-#: src/content_nodemeta.cpp:286 src/content_nodemeta.cpp:453
+#: src/content_nodemeta.cpp:287 src/content_nodemeta.cpp:454
 msgid "Get out of bed"
 msgstr "Salir de la cama"
 
-#: src/content_nodemeta.cpp:432
+#: src/content_nodemeta.cpp:433
 msgid "This bed is too uncomfortable to sleep in."
 msgstr "Esta cama es demasiado poco confortable para dormir."
 
-#: src/content_nodemeta.cpp:573
+#: src/content_nodemeta.cpp:574
 #, c-format
 msgid "Locking Chest owned by '%s'"
 msgstr "Cofre propiedad de «%s»"
 
-#: src/content_nodemeta.cpp:647
+#: src/content_nodemeta.cpp:648
 #, c-format
 msgid "Safe owned by '%s'"
 msgstr "Seguro propiedad de «%s»"
 
-#: src/content_nodemeta.cpp:816 src/content_nodemeta.cpp:1870
-#: src/content_nodemeta.cpp:2157 src/content_nodemeta.cpp:2349
-#: src/content_nodemeta.cpp:2563
+#: src/content_nodemeta.cpp:817 src/content_nodemeta.cpp:1871
+#: src/content_nodemeta.cpp:2158 src/content_nodemeta.cpp:2350
+#: src/content_nodemeta.cpp:2564
 #, c-format
 msgid "Page %d of %d"
 msgstr "Página %d de %d"
 
-#: src/content_nodemeta.cpp:820 src/content_nodemeta.cpp:1898
-#: src/content_nodemeta.cpp:2176 src/content_nodemeta.cpp:2358
-#: src/content_nodemeta.cpp:2579
+#: src/content_nodemeta.cpp:821 src/content_nodemeta.cpp:1899
+#: src/content_nodemeta.cpp:2177 src/content_nodemeta.cpp:2359
+#: src/content_nodemeta.cpp:2580
 msgid "<< Previous Page"
 msgstr "<< Página anterior"
 
-#: src/content_nodemeta.cpp:826 src/content_nodemeta.cpp:1904
-#: src/content_nodemeta.cpp:2182 src/content_nodemeta.cpp:2364
-#: src/content_nodemeta.cpp:2585
+#: src/content_nodemeta.cpp:827 src/content_nodemeta.cpp:1905
+#: src/content_nodemeta.cpp:2183 src/content_nodemeta.cpp:2365
+#: src/content_nodemeta.cpp:2586
 msgid "Next Page >>"
 msgstr "Página siguiente >>"
 
-#: src/content_nodemeta.cpp:869
+#: src/content_nodemeta.cpp:870
 #, c-format
 msgid "Border Stone owned by '%s'"
 msgstr "Frontera de piedra propiedad de «%s»"
 
-#: src/content_nodemeta.cpp:944
+#: src/content_nodemeta.cpp:945
 msgid "Furnace is overloaded"
 msgstr "Horno sobrecargado"
 
-#: src/content_nodemeta.cpp:945
+#: src/content_nodemeta.cpp:946
 msgid "Furnace is out of fuel"
 msgstr "Horno sin combustible"
 
-#: src/content_nodemeta.cpp:947
+#: src/content_nodemeta.cpp:948
 msgid "Furnace is inactive"
 msgstr "Horno inactivo"
 
-#: src/content_nodemeta.cpp:950
+#: src/content_nodemeta.cpp:951
 msgid "Furnace is active"
 msgstr "Horno activo"
 
-#: src/content_nodemeta.cpp:1209
+#: src/content_nodemeta.cpp:1210
 msgid "Locking Furnace is overloaded"
 msgstr "Horno de bloqueo sobrecargado"
 
-#: src/content_nodemeta.cpp:1210
+#: src/content_nodemeta.cpp:1211
 msgid "Locking Furnace is out of fuel"
 msgstr "Horno de bloqueo sin combustilble"
 
-#: src/content_nodemeta.cpp:1212
+#: src/content_nodemeta.cpp:1213
 msgid "Locking Furnace is inactive"
 msgstr "Horno de bloqueo inactivo"
 
-#: src/content_nodemeta.cpp:1215
+#: src/content_nodemeta.cpp:1216
 msgid "Locking Furnace is active"
 msgstr "Horno de bloqueo activo"
 
-#: src/content_nodemeta.cpp:1470
+#: src/content_nodemeta.cpp:1471
 msgid "Armed Explosive: about to detonate"
 msgstr "Eplosivo armado: apunto de detonar"
 
-#: src/content_nodemeta.cpp:1473
+#: src/content_nodemeta.cpp:1474
 #, c-format
 msgid "Armed Explosive: %d second till detonation"
 msgid_plural "Armed Explosive: %d seconds till detonation"
 msgstr[0] "Explosivo armado: %d segundo para la detonación"
 msgstr[1] "Explosivo armado: %d segundos para la detonación"
 
-#: src/content_nodemeta.cpp:1534 src/content_nodemeta.cpp:1539
+#: src/content_nodemeta.cpp:1535 src/content_nodemeta.cpp:1540
 msgid "Incinerator is active"
 msgstr "Incinerador activado"
 
-#: src/content_nodemeta.cpp:1541
+#: src/content_nodemeta.cpp:1542
 msgid "Incinerator is inactive"
 msgstr "Incinerador desactivado"
 
-#: src/content_nodemeta.cpp:1633
+#: src/content_nodemeta.cpp:1634
 msgid "Add fuel, then punch to incinerate wielded item"
 msgstr "Añadir combustible, luego golpear para incinerar el objeto esgrimido"
 
-#: src/content_nodemeta.cpp:1874 src/content_nodemeta.cpp:2162
+#: src/content_nodemeta.cpp:1875 src/content_nodemeta.cpp:2163
 msgid "Add item here to see recipe"
 msgstr "Agregar un objeto aquí para ver la receta"
 
-#: src/content_nodemeta.cpp:1879 src/content_nodemeta.cpp:2167
+#: src/content_nodemeta.cpp:1880 src/content_nodemeta.cpp:2168
 #, c-format
 msgid "Recipe %d of %d"
 msgstr "Receta %d de %d"
 
-#: src/content_nodemeta.cpp:1888
+#: src/content_nodemeta.cpp:1889
 msgid "Gives"
 msgstr "Da"
 
-#: src/content_nodemeta.cpp:2353
+#: src/content_nodemeta.cpp:2354
 msgid "Add item here to see cook result"
 msgstr "Agregar un objeto aquí para ver el platillo resultante"
 
-#: src/content_nodemeta.cpp:2567
+#: src/content_nodemeta.cpp:2568
 msgid "Add item here to see dig result"
 msgstr "Agregar objeto aquí para ver el excavado resultante"
 
-#: src/content_nodemeta.cpp:2571
+#: src/content_nodemeta.cpp:2572
 msgid "Dig Result"
 msgstr "Resultado de excavación"
 
-#: src/content_nodemeta.cpp:2575
+#: src/content_nodemeta.cpp:2576
 msgid "Random Drop"
 msgstr "Desechar al azar"
 
-#: src/content_nodemeta.cpp:2667 src/content_nodemeta.cpp:2766
+#: src/content_nodemeta.cpp:2668 src/content_nodemeta.cpp:2767
 msgid "Title"
 msgstr "Título"
 
-#: src/content_nodemeta.cpp:2672 src/content_nodemeta.cpp:2771
+#: src/content_nodemeta.cpp:2673 src/content_nodemeta.cpp:2772
 msgid "Content"
 msgstr "Contenido"
 
-#: src/content_nodemeta.cpp:3127
+#: src/content_nodemeta.cpp:3128
 msgid "Cauldron is active"
 msgstr "Caldera activa"
 
-#: src/content_nodemeta.cpp:3130
+#: src/content_nodemeta.cpp:3131
 msgid "Cauldron is hot"
 msgstr "Caldera caliente"
 
-#: src/content_nodemeta.cpp:3132
+#: src/content_nodemeta.cpp:3133
 msgid "Cauldron is cool"
 msgstr "Caldera fría"
 
-#: src/content_nodemeta.cpp:3134
+#: src/content_nodemeta.cpp:3135
 msgid "Cauldron is empty"
 msgstr "Caldera vacía"
 
-#: src/content_nodemeta.cpp:3138
+#: src/content_nodemeta.cpp:3139
 msgid "Cauldron is inactive"
 msgstr "Caldera inactiva"
 
-#: src/content_nodemeta.cpp:3139
+#: src/content_nodemeta.cpp:3140
 msgid "Cauldron is out of fuel"
 msgstr "Caldera sin combustible"
 
-#: src/content_nodemeta.cpp:3218
+#: src/content_nodemeta.cpp:3219
 msgid "Add fuel, then punch to add or remove water"
 msgstr "Añada combustible luego golpee para añadir o quitar agua"
 
-#: src/content_nodemeta.cpp:3484
+#: src/content_nodemeta.cpp:3487
 msgid "Show Enchanting"
 msgstr "Mostrar encantador"
 
-#: src/content_nodemeta.cpp:3491 src/game.cpp:208
+#: src/content_nodemeta.cpp:3494 src/game.cpp:209
 msgid "Show Crafting"
 msgstr "Mostrar artesanías"
 
-#: src/content_toolitem.cpp:213
+#: src/content_toolitem.cpp:216
 msgid "Small Stone Pick"
 msgstr "Pequeña grupo de piedra"
 
-#: src/content_toolitem.cpp:236
+#: src/content_toolitem.cpp:239
 msgid "Stone Pick"
 msgstr "Pica de piedra"
 
-#: src/content_toolitem.cpp:250
+#: src/content_toolitem.cpp:253
 msgid "Flint Pick"
 msgstr "Pica de sílex"
 
-#: src/content_toolitem.cpp:264
+#: src/content_toolitem.cpp:267
 msgid "Steel Pick"
 msgstr "Pica de acero"
 
-#: src/content_toolitem.cpp:278
+#: src/content_toolitem.cpp:281
 msgid "Creative Pick"
 msgstr "Pica creativa"
 
-#: src/content_toolitem.cpp:292
+#: src/content_toolitem.cpp:295
 msgid "Stone Trowel"
 msgstr "Paleta de piedra"
 
-#: src/content_toolitem.cpp:306
+#: src/content_toolitem.cpp:309
 msgid "Stone Shovel"
 msgstr "Pala de piedra"
 
-#: src/content_toolitem.cpp:320
+#: src/content_toolitem.cpp:323
 msgid "Flint Shovel"
 msgstr "Pala de sílex"
 
-#: src/content_toolitem.cpp:334
+#: src/content_toolitem.cpp:337
 msgid "Steel Shovel"
 msgstr "Pala de acero"
 
-#: src/content_toolitem.cpp:348
+#: src/content_toolitem.cpp:351
 msgid "Small Stone Axe"
 msgstr "Prqueña hacha de piedra"
 
-#: src/content_toolitem.cpp:369
+#: src/content_toolitem.cpp:372
 msgid "Stone Axe"
 msgstr "Hacha de piedra"
 
-#: src/content_toolitem.cpp:383
+#: src/content_toolitem.cpp:386
 msgid "Flint Axe"
 msgstr "Hacha de pedernal"
 
-#: src/content_toolitem.cpp:397
+#: src/content_toolitem.cpp:400
 msgid "Steel Axe"
 msgstr "Hacha de acero"
 
-#: src/content_toolitem.cpp:411
+#: src/content_toolitem.cpp:414
 msgid "Wooden Club"
 msgstr "Garrote de madera"
 
-#: src/content_toolitem.cpp:426
+#: src/content_toolitem.cpp:429
 msgid "Stone Sword"
 msgstr "Espada de piedra"
 
-#: src/content_toolitem.cpp:440
+#: src/content_toolitem.cpp:443
 msgid "Steel Sword"
 msgstr "Espada de acero"
 
-#: src/content_toolitem.cpp:454
+#: src/content_toolitem.cpp:457
 msgid "Flint Shears"
 msgstr "Cizalla de sílex"
 
-#: src/content_toolitem.cpp:468
+#: src/content_toolitem.cpp:471
 msgid "Steel Shears"
 msgstr "Cizalla de acero"
 
-#: src/content_toolitem.cpp:482
+#: src/content_toolitem.cpp:485
 msgid "Wooden Bucket"
 msgstr "Balde de madera"
 
-#: src/content_toolitem.cpp:499
+#: src/content_toolitem.cpp:502
 msgid "Tin Bucket"
 msgstr "Cubeta de estaño"
 
-#: src/content_toolitem.cpp:515
+#: src/content_toolitem.cpp:518
 msgid "Wooden Bucket of Water"
 msgstr "Balde de madera con agua"
 
-#: src/content_toolitem.cpp:526
+#: src/content_toolitem.cpp:529
 msgid "Tin Bucket of Water"
 msgstr "Balde de lata con agua"
 
-#: src/content_toolitem.cpp:537
+#: src/content_toolitem.cpp:540
 msgid "Steel Bucket"
 msgstr "Balde de acero"
 
-#: src/content_toolitem.cpp:552
+#: src/content_toolitem.cpp:555
 msgid "Steel Bucket of Water"
 msgstr "Balde de acero con agua"
 
-#: src/content_toolitem.cpp:563
+#: src/content_toolitem.cpp:566
 msgid "Steel Bucket of Lava"
 msgstr "Balde de acero con lava"
 
-#: src/content_toolitem.cpp:575
+#: src/content_toolitem.cpp:578
 msgid "Fire Starter"
 msgstr "Iniciador de fuego"
 
-#: src/content_toolitem.cpp:589
+#: src/content_toolitem.cpp:592
 msgid "Crowbar"
 msgstr "Palanca"
 
-#: src/content_toolitem.cpp:602
+#: src/content_toolitem.cpp:605
 msgid "Key"
 msgstr "Llave"
 
-#: src/content_toolitem.cpp:614
+#: src/content_toolitem.cpp:617
 msgid "Stone Spear"
 msgstr "Lanza de piedra"
 
-#: src/content_toolitem.cpp:628
+#: src/content_toolitem.cpp:631
 msgid "Flint Spear"
 msgstr "Lanza de sílex"
 
-#: src/content_toolitem.cpp:642
+#: src/content_toolitem.cpp:645
 msgid "Steel Spear"
 msgstr "Lanza de acero"
 
-#: src/content_toolitem.cpp:656
+#: src/content_toolitem.cpp:659
 msgid "Bow"
 msgstr "Arco"
 
-#: src/content_toolitem.cpp:676
+#: src/content_toolitem.cpp:679
 msgid "Raw Mithril Pick"
 msgstr "Pica de mitrilo en bruto"
 
-#: src/content_toolitem.cpp:690
+#: src/content_toolitem.cpp:693
 msgid "Raw Mithril Shovel"
 msgstr "Pala de mitrilo en buto"
 
-#: src/content_toolitem.cpp:704
+#: src/content_toolitem.cpp:707
 msgid "Raw Mithril Axe"
 msgstr "Hacha de mitrilo en bruto"
 
-#: src/content_toolitem.cpp:718
+#: src/content_toolitem.cpp:721
 msgid "Raw Mithril Sword"
 msgstr "Espada de mitrilo en bruto"
 
-#: src/content_toolitem.cpp:732
+#: src/content_toolitem.cpp:735
 msgid "Raw Mithril Spear"
 msgstr "Lanza de mitrilo en bruto"
 
-#: src/content_toolitem.cpp:746
+#: src/content_toolitem.cpp:749
 msgid "Unbound Mithril Pick"
 msgstr "Pica de mitrilo sin consolidar"
 
-#: src/content_toolitem.cpp:760
+#: src/content_toolitem.cpp:763
 msgid "Unbound Mithril Shovel"
 msgstr "Pala de mitrilo sin consolidar"
 
-#: src/content_toolitem.cpp:774
+#: src/content_toolitem.cpp:777
 msgid "Unbound Mithril Axe"
 msgstr "Hacha de mitrilo sin consolidar"
 
-#: src/content_toolitem.cpp:788
+#: src/content_toolitem.cpp:791
 msgid "Unbound Mithril Sword"
 msgstr "Espada de mitrilo sin consolidar"
 
-#: src/content_toolitem.cpp:802
+#: src/content_toolitem.cpp:805
 msgid "Unbound Mithril Spear"
 msgstr "Lanza de mitrilo sin consolidar"
 
-#: src/content_toolitem.cpp:816
+#: src/content_toolitem.cpp:819
 msgid "Mithril Pick"
 msgstr "Pica de mitrilo"
 
-#: src/content_toolitem.cpp:831
+#: src/content_toolitem.cpp:834
 msgid "Mithril Shovel"
 msgstr "Pala de mitrilo"
 
-#: src/content_toolitem.cpp:845
+#: src/content_toolitem.cpp:848
 msgid "Mithril Axe"
 msgstr "Hacha de mitrilo"
 
-#: src/content_toolitem.cpp:859
+#: src/content_toolitem.cpp:862
 msgid "Mithril Sword"
 msgstr "Espada de mitrilo"
 
-#: src/content_toolitem.cpp:873
+#: src/content_toolitem.cpp:876
 msgid "Mithril Spear"
 msgstr "Lanza de mitrilo"
 
-#: src/content_toolitem.cpp:887
+#: src/content_toolitem.cpp:890
 msgid "Mob Spawner"
 msgstr "Turba desovadora"
 
-#: src/game.cpp:209
+#: src/content_toolitem.cpp:909
+#, fuzzy
+msgid "Mithril Key"
+msgstr "Hacha de mitrilo"
+
+#: src/game.cpp:210
 msgid "Clothes"
 msgstr "Ropa"
 
-#: src/game.cpp:210
+#: src/game.cpp:211
 msgid "Hat/Helmet"
 msgstr "Sombrero/Casco"
 
-#: src/game.cpp:212
+#: src/game.cpp:213
 msgid "Jacket"
 msgstr "Chaqueta"
 
-#: src/game.cpp:214
+#: src/game.cpp:215
 msgid "Decorative"
 msgstr "Decorativo"
 
-#: src/game.cpp:216
+#: src/game.cpp:217
 msgid "Shirt"
 msgstr "Camisa"
 
-#: src/game.cpp:218
+#: src/game.cpp:219
 msgid "Belt"
 msgstr "Cinturón"
 
-#: src/game.cpp:220
+#: src/game.cpp:221
 msgid "Pants"
 msgstr "Pantalón"
 
-#: src/game.cpp:222
+#: src/game.cpp:223
 msgid "Boots"
 msgstr "Botas"
 
-#: src/game.cpp:229
+#: src/game.cpp:230
 msgid "Drop to Ground"
 msgstr "Desechar al suelo"
 
-#: src/game.cpp:231
+#: src/game.cpp:232
 msgid "Change Clothing"
 msgstr "Cambiar de ropa"
 
-#: src/game.cpp:590
+#: src/game.cpp:591
 msgid "Loading"
 msgstr "Cargando"
 
-#: src/game.cpp:662
+#: src/game.cpp:663
 msgid "Loading..."
 msgstr "Cargando..."
 
-#: src/game.cpp:671
+#: src/game.cpp:672
 msgid "Creating server..."
 msgstr "Creando servidor..."
 
-#: src/game.cpp:682
+#: src/game.cpp:683
 msgid "Creating client..."
 msgstr "Creando cliente..."
 
-#: src/game.cpp:687
+#: src/game.cpp:688
 msgid "Resolving address..."
 msgstr "Resolviendo dirección..."
 
-#: src/game.cpp:698
+#: src/game.cpp:699
 msgid "Couldn't resolve address"
 msgstr "No se pudo resolver la dirección"
 
-#: src/game.cpp:738
+#: src/game.cpp:739
 #, c-format
 msgid "Connecting to server... (timeout in %d second)"
 msgid_plural "Connecting to server... (timeout in %d seconds)"
 msgstr[0] "Conectando al servidor... (Tiempo de espera de %d segundo)"
 msgstr[1] "Conectando al servidor... (Tiempo de espera de %d segundos)"
 
-#: src/game.cpp:767
+#: src/game.cpp:768
 #, c-format
 msgid "Access denied. Reason: %ls"
 msgstr "Acceso denegado. Razón: %ls"
 
-#: src/game.cpp:771
+#: src/game.cpp:772
 msgid "Unable to Connect (port already in use?)."
 msgstr "No se pudo conectar (¿puerto en uso?)"
 
-#: src/game.cpp:774
+#: src/game.cpp:775
 msgid "Connection timed out."
 msgstr "Tiempo de espera de la conexión agotado."
 
-#: src/game.cpp:927
+#: src/game.cpp:928
 msgid "Access denied. Reason: "
 msgstr "Acceso denegado. Razón:"
 
-#: src/game.cpp:1161
+#: src/game.cpp:1162
 msgid "free_move disabled"
 msgstr "Movimiento_libre desactivado"
 
-#: src/game.cpp:1165
+#: src/game.cpp:1166
 msgid "free_move enabled"
 msgstr "Movimiento_libre activado"
 
-#: src/game.cpp:1177
+#: src/game.cpp:1178
 #, c-format
 msgid "Saved screenshot to '%s'"
 msgstr "Se guardó la captura de pantalla en «%s»"
 
-#: src/game.cpp:1189
+#: src/game.cpp:1190
 msgid "HUD shown"
 msgstr "Mostrar interfaz HUD"
 
-#: src/game.cpp:1191
+#: src/game.cpp:1192
 msgid "HUD hidden"
 msgstr "Ocultar interfaz HUD"
 
-#: src/game.cpp:1197
+#: src/game.cpp:1198
 msgid "Chat shown"
 msgstr "Mostrar chat"
 
-#: src/game.cpp:1199
+#: src/game.cpp:1200
 msgid "Chat hidden"
 msgstr "Ocultar chat"
 
-#: src/game.cpp:1205
+#: src/game.cpp:1206
 msgid "Fog disabled"
 msgstr "Niebla desactivada"
 
-#: src/game.cpp:1207
+#: src/game.cpp:1208
 msgid "Fog enabled"
 msgstr "Niebla activada"
 
-#: src/game.cpp:1213
+#: src/game.cpp:1214
 msgid "Camera update disabled"
 msgstr "Actualización de la cámara desactivada"
 
-#: src/game.cpp:1215
+#: src/game.cpp:1216
 msgid "Camera update enabled"
 msgstr "Actualización de cámara activada"
 
-#: src/game.cpp:1225
+#: src/game.cpp:1226
 msgid "Debug info shown"
 msgstr "Mostrar información de depuración"
 
-#: src/game.cpp:1230
+#: src/game.cpp:1231
 msgid "Debug info and frametime graph hidden"
 msgstr "Ocultar información de depuración y gráfico de tiempo de trama"
 
-#: src/game.cpp:1234
+#: src/game.cpp:1235
 msgid "Frametime graph shown"
 msgstr "Mostrar gráfico de tiempo de trama"
 
-#: src/game.cpp:1246
+#: src/game.cpp:1247
 #, c-format
 msgid "Profiler shown (page %d of %d)"
 msgstr "Mostrar perfilador (página %d de %d)"
 
-#: src/game.cpp:1250
+#: src/game.cpp:1251
 msgid "Profiler hidden"
 msgstr "Ocultar perfilador"
 
-#: src/game.cpp:1258 src/game.cpp:1269
+#: src/game.cpp:1259 src/game.cpp:1270
 #, c-format
 msgid "Minimum viewing range changed to %d"
 msgstr "Rango mínimo de visión cambiado a %d"
 
-#: src/game.cpp:1338
+#: src/game.cpp:1339
 msgid "Enabled full viewing range"
 msgstr "Activar rango completo de visión"
 
-#: src/game.cpp:1342
+#: src/game.cpp:1343
 msgid "Disabled full viewing range"
 msgstr "Desactivar rango completo de visión"
 
-#: src/game.cpp:1995
+#: src/game.cpp:1950
 msgid "Disconnected (Network Timeout)"
 msgstr "Desconectado (La red alcanzó el tiempo máximo de espera)"
 
-#: src/game.cpp:2407
+#: src/game.cpp:2382
 msgid "Shutting down..."
 msgstr "Apagando..."
 
@@ -3480,242 +3505,298 @@ msgstr "Reapareciendo"
 
 #: src/guiFormSpecMenu.cpp:436
 msgid "Left click: Move all items, Right click: Move single item"
-msgstr "Clic izquierdo: Mueve todos los objetos, Clic derecho: Mueve un solo objeto"
+msgstr ""
+"Clic izquierdo: Mueve todos los objetos, Clic derecho: Mueve un solo objeto"
 
 #: src/guiFormSpecMenu.cpp:458
 msgid "Write It"
 msgstr "Escribirlo"
 
-#: src/guiMainMenu.cpp:347
+#: src/guiMainMenu.cpp:319
 msgid "Character Creator"
 msgstr "Creador de personaje"
 
-#: src/guiMainMenu.cpp:353 src/guiMainMenu.cpp:478 src/guiMainMenu.cpp:520
-#: src/guiMainMenu.cpp:631
+#: src/guiMainMenu.cpp:325 src/guiMainMenu.cpp:386 src/guiMainMenu.cpp:428
+#: src/guiMainMenu.cpp:539
 msgid "Single Player"
 msgstr "Un jugador"
 
-#: src/guiMainMenu.cpp:359 src/guiMainMenu.cpp:410
+#: src/guiMainMenu.cpp:331 src/guiMultiplayerMenu.cpp:161
 msgid "Multi Player"
 msgstr "Multijugador"
 
-#: src/guiMainMenu.cpp:365 src/guiPauseMenu.cpp:155
+#: src/guiMainMenu.cpp:337 src/guiPauseMenu.cpp:155
 msgid "Settings"
 msgstr "Configuraciones"
 
-#: src/guiMainMenu.cpp:371
+#: src/guiMainMenu.cpp:343
 msgid "Credits"
 msgstr "Créditos"
 
-#: src/guiMainMenu.cpp:377
+#: src/guiMainMenu.cpp:349
 msgid "Quit"
 msgstr "Salir"
 
-#: src/guiMainMenu.cpp:418
-msgid "Name/Password"
-msgstr "Nombre/Contraseña"
-
-#: src/guiMainMenu.cpp:446
-msgid "Address/Port"
-msgstr "Dirección/Puerto"
-
-#: src/guiMainMenu.cpp:472
-msgid "Connect"
-msgstr "Conectar"
-
-#: src/guiMainMenu.cpp:487 src/guiMainMenu.cpp:529 src/guiMainMenu.cpp:640
+#: src/guiMainMenu.cpp:395 src/guiMainMenu.cpp:437 src/guiMainMenu.cpp:548
 msgid "Creative Mode"
 msgstr "Modo creativo"
 
-#: src/guiMainMenu.cpp:488 src/guiMainMenu.cpp:530 src/guiMainMenu.cpp:641
+#: src/guiMainMenu.cpp:396 src/guiMainMenu.cpp:438 src/guiMainMenu.cpp:549
 msgid "Adventure Mode"
 msgstr "Modo aventura"
 
-#: src/guiMainMenu.cpp:489 src/guiMainMenu.cpp:531 src/guiMainMenu.cpp:642
+#: src/guiMainMenu.cpp:397 src/guiMainMenu.cpp:439 src/guiMainMenu.cpp:550
 msgid "Survival Mode"
 msgstr "Modo supervivencia"
 
-#: src/guiMainMenu.cpp:502 src/guiMainMenu.cpp:655
+#: src/guiMainMenu.cpp:410 src/guiMainMenu.cpp:563
 msgid "Advanced Settings"
 msgstr "Configuraciones avanzadas"
 
-#: src/guiMainMenu.cpp:508 src/guiMainMenu.cpp:550
+#: src/guiMainMenu.cpp:416 src/guiMainMenu.cpp:458
 msgid "Map Options"
 msgstr "Opciones de mapeo"
 
-#: src/guiMainMenu.cpp:514 src/guiMainMenu.cpp:625 src/guiMainMenu.cpp:750
+#: src/guiMainMenu.cpp:422 src/guiMainMenu.cpp:533 src/guiMainMenu.cpp:658
 msgid "Start Game"
 msgstr "Iniciar juego"
 
-#: src/guiMainMenu.cpp:544
+#: src/guiMainMenu.cpp:452
 msgid "Hide Advanced Settings"
 msgstr "Ocultar configuraciones avanzadas"
 
-#: src/guiMainMenu.cpp:555
+#: src/guiMainMenu.cpp:463
 msgid "Creatures"
 msgstr "Monstruos"
 
-#: src/guiMainMenu.cpp:562
+#: src/guiMainMenu.cpp:470
 msgid "None"
 msgstr "Nada"
 
-#: src/guiMainMenu.cpp:563
+#: src/guiMainMenu.cpp:471
 msgid "Passive"
 msgstr "Pasivo"
 
-#: src/guiMainMenu.cpp:564
+#: src/guiMainMenu.cpp:472
 msgid "Passive & Aggressive"
 msgstr "Pasivo y agresivo"
 
-#: src/guiMainMenu.cpp:565
+#: src/guiMainMenu.cpp:473
 msgid "Passive, Aggressive, & Destructive"
 msgstr "Pasivo, agresivo y destructivo"
 
-#: src/guiMainMenu.cpp:579
+#: src/guiMainMenu.cpp:487
 msgid "Player Damage"
 msgstr "Daño al jugador"
 
-#: src/guiMainMenu.cpp:584
+#: src/guiMainMenu.cpp:492
 msgid "Suffocation/Drowning"
 msgstr "Asfixia/ahogo"
 
-#: src/guiMainMenu.cpp:589
+#: src/guiMainMenu.cpp:497
 msgid "Hunger"
 msgstr "Hambre"
 
-#: src/guiMainMenu.cpp:594
+#: src/guiMainMenu.cpp:502
 msgid "Tool Wear"
 msgstr "Desgaste de la herramiente"
 
-#: src/guiMainMenu.cpp:599
+#: src/guiMainMenu.cpp:507
 msgid "Dangerous Fire"
 msgstr "Fuego peligroso"
 
-#: src/guiMainMenu.cpp:604
+#: src/guiMainMenu.cpp:512
 msgid "Infinite Inventory"
 msgstr "Inventario infinito"
 
-#: src/guiMainMenu.cpp:609
+#: src/guiMainMenu.cpp:517
 msgid "Initial Inventory"
 msgstr "Inventario inicial"
 
-#: src/guiMainMenu.cpp:614
+#: src/guiMainMenu.cpp:522
 msgid "Droppable Inventory"
 msgstr "Inventario desechable"
 
-#: src/guiMainMenu.cpp:619
+#: src/guiMainMenu.cpp:527
 msgid "Death drops Inventory"
 msgstr "Al morir se deja caer el inventario"
 
-#: src/guiMainMenu.cpp:661
+#: src/guiMainMenu.cpp:569
 msgid "Hide Map Options"
 msgstr "Ocultar opciones de mapeo"
 
-#: src/guiMainMenu.cpp:666
+#: src/guiMainMenu.cpp:574
 msgid "Create New Map"
 msgstr "Crear un nuevo mundo"
 
-#: src/guiMainMenu.cpp:672
+#: src/guiMainMenu.cpp:580
 msgid "Warning! Your old map will be deleted!"
 msgstr "¡Advertencia, Su antiguo mapa será borrado!"
 
-#: src/guiMainMenu.cpp:678
+#: src/guiMainMenu.cpp:586
 msgid "Map Type"
 msgstr "Tipo de mapa"
 
-#: src/guiMainMenu.cpp:685
+#: src/guiMainMenu.cpp:593
 msgid "Flat"
 msgstr "Plano"
 
-#: src/guiMainMenu.cpp:686
+#: src/guiMainMenu.cpp:594
 msgid "Flatter"
 msgstr "Planísimo"
 
-#: src/guiMainMenu.cpp:687
+#: src/guiMainMenu.cpp:595
 msgid "Smoother"
 msgstr "Suavísimo"
 
-#: src/guiMainMenu.cpp:688
+#: src/guiMainMenu.cpp:596
 msgid "Default"
 msgstr "Predeterminado"
 
-#: src/guiMainMenu.cpp:689
+#: src/guiMainMenu.cpp:597
 msgid "Hilly"
 msgstr "Colinoso"
 
-#: src/guiMainMenu.cpp:690
+#: src/guiMainMenu.cpp:598
 msgid "Mountains"
 msgstr "Montaña"
 
-#: src/guiMainMenu.cpp:691
+#: src/guiMainMenu.cpp:599
 msgid "Crazy"
 msgstr "Loco"
 
-#: src/guiMainMenu.cpp:692
+#: src/guiMainMenu.cpp:600
 msgid "Crazy Hills"
 msgstr "Colinas locas"
 
-#: src/guiMainMenu.cpp:714
+#: src/guiMainMenu.cpp:622
 msgid "Use Fixed Seed"
 msgstr "Usar semilla fija"
 
-#: src/guiMainMenu.cpp:720
+#: src/guiMainMenu.cpp:628
 msgid "Map Seed"
 msgstr "Semilla del mapa"
 
-#: src/guiMainMenu.cpp:737
+#: src/guiMainMenu.cpp:645
 msgid "Clear Map"
 msgstr "Limpiar mapa"
 
-#: src/guiMainMenu.cpp:742
+#: src/guiMainMenu.cpp:650
 msgid "Warning! This will delete all construction from your map!"
 msgstr "¡Advertencia! ¡Esto eliminará todas las construcciones del mapa!"
 
-#: src/guiMainMenu.cpp:760
+#: src/guiMainMenu.cpp:668
 msgid ""
 "Voxelands\n"
 "http://www.voxelands.com/\n"
 "By Lisa 'darkrose' Milne <lisa@ltmnet.com> and contributors."
-msgstr "Voxelands\nhttp://www.voxelands.com/\nPor Lisa «darkrose» Milne <lisa@ltmnet.com> y otros contribuidores."
+msgstr ""
+"Voxelands\n"
+"http://www.voxelands.com/\n"
+"Por Lisa «darkrose» Milne <lisa@ltmnet.com> y otros contribuidores."
 
-#: src/guiMainMenu.cpp:767
+#: src/guiMainMenu.cpp:675
 msgid "Programmers"
 msgstr "Programadores"
 
-#: src/guiMainMenu.cpp:770
+#: src/guiMainMenu.cpp:678
 msgid "Artists and Modellers"
 msgstr "Artistas y modeladores"
 
-#: src/guiMainMenu.cpp:773
+#: src/guiMainMenu.cpp:681
 msgid "Translators"
 msgstr "Traductores"
 
-#: src/guiMainMenu.cpp:776
+#: src/guiMainMenu.cpp:684
 msgid "Documentation Writters"
 msgstr "Escritores de la documentación"
 
-#: src/guiMainMenu.cpp:779
+#: src/guiMainMenu.cpp:687
 msgid "Testers, Packagers, and Builders"
 msgstr "Probadores, empaquetadores y constructores"
 
-#: src/guiMainMenu.cpp:782
+#: src/guiMainMenu.cpp:690
 msgid "Music and Sound Effects Composers"
 msgstr "Compositores de la música y efectos de sonido"
 
-#: src/guiMainMenu.cpp:785
+#: src/guiMainMenu.cpp:693
 msgid "Other Contributers, and Special Thanks"
 msgstr "Otros contribuidores y agradecimientos especiales"
 
-#: src/guiMainMenu.cpp:789
+#: src/guiMainMenu.cpp:697
 msgid ""
 "Based on Minetest-C55 by Perttu Ahola <celeron55@gmail.com>\n"
-"and contributors: PilzAdam, Taoki, tango_, kahrl (kaaaaaahrl?), darkrose, matttpt, erlehmann, SpeedProg, JacobF, teddydestodes, marktraceur, Jonathan Neuschafer, thexyz, VanessaE, sfan5... and tens of more random people."
-msgstr "Basado en Minetest-C55 por Perttu Ahola <celeron55@gmail.com>\ny otro contribuidores: PilzAdam, Taoki, tango_, kahrl (kaaaaaahrl?), darkrose, matttpt, erlehmann, SpeedProg, JacobF, teddydestodes, marktraceur, Jonathan Neuschafer, thexyz, VanessaE, sfan5... y una docena de otras personas."
+"and contributors: PilzAdam, Taoki, tango_, kahrl (kaaaaaahrl?), darkrose, "
+"matttpt, erlehmann, SpeedProg, JacobF, teddydestodes, marktraceur, Jonathan "
+"Neuschafer, thexyz, VanessaE, sfan5... and tens of more random people."
+msgstr ""
+"Basado en Minetest-C55 por Perttu Ahola <celeron55@gmail.com>\n"
+"y otro contribuidores: PilzAdam, Taoki, tango_, kahrl (kaaaaaahrl?), "
+"darkrose, matttpt, erlehmann, SpeedProg, JacobF, teddydestodes, marktraceur, "
+"Jonathan Neuschafer, thexyz, VanessaE, sfan5... y una docena de otras "
+"personas."
 
 #: src/guiMessageMenu.cpp:112 src/guiPauseMenu.cpp:143
 msgid "Continue"
 msgstr "Continuar"
 
+#: src/guiMultiplayerMenu.cpp:135 src/guiSettingsMenu.cpp:277
+msgid "Main Menu"
+msgstr "Menú principal"
+
+#: src/guiMultiplayerMenu.cpp:142
+msgid "All Servers"
+msgstr ""
+
+#: src/guiMultiplayerMenu.cpp:148
+msgid "Favourite Servers"
+msgstr ""
+
+#: src/guiMultiplayerMenu.cpp:154
+#, fuzzy
+msgid "Custom Connect"
+msgstr "Conectar"
+
+#: src/guiMultiplayerMenu.cpp:169
+msgid "Custom Connection"
+msgstr ""
+
+#: src/guiMultiplayerMenu.cpp:176
+msgid "Address/Port"
+msgstr "Dirección/Puerto"
+
+#: src/guiMultiplayerMenu.cpp:201 src/guiMultiplayerMenu.cpp:313
+msgid "Add to Favourites"
+msgstr ""
+
+#: src/guiMultiplayerMenu.cpp:206 src/guiMultiplayerMenu.cpp:320
+msgid "Connect"
+msgstr "Conectar"
+
+#: src/guiMultiplayerMenu.cpp:213
+msgid "Name/Password"
+msgstr "Nombre/Contraseña"
+
+#: src/guiMultiplayerMenu.cpp:240
+msgid "Join Server"
+msgstr ""
+
+#: src/guiMultiplayerMenu.cpp:262
+msgid "My Favourites"
+msgstr ""
+
+#: src/guiMultiplayerMenu.cpp:265
+msgid "Server List"
+msgstr ""
+
+#: src/guiMultiplayerMenu.cpp:270
+msgid "Get New List"
+msgstr ""
+
+#: src/guiMultiplayerMenu.cpp:307
+msgid "Remove from Favourites"
+msgstr ""
+
 #: src/guiPasswordChange.cpp:105
 msgid "Old Password"
 msgstr "Antigua contraseña"
@@ -3756,11 +3837,11 @@ msgstr "Hacia adelante"
 msgid "Backward"
 msgstr "Hacia atrás"
 
-#: src/guiSettingsMenu.cpp:72 src/keycode.cpp:234
+#: src/guiSettingsMenu.cpp:72 src/keycode.cpp:263
 msgid "Left"
 msgstr "Izquierda"
 
-#: src/guiSettingsMenu.cpp:73 src/keycode.cpp:234
+#: src/guiSettingsMenu.cpp:73 src/keycode.cpp:265
 msgid "Right"
 msgstr "Derecha"
 
@@ -3796,11 +3877,11 @@ msgstr "Seleccionar rango"
 msgid "Toggle Fly"
 msgstr "Des/Activar vuelo"
 
-#: src/guiSettingsMenu.cpp:82 src/keycode.cpp:234
+#: src/guiSettingsMenu.cpp:82 src/keycode.cpp:264
 msgid "Up"
 msgstr "Arriba"
 
-#: src/guiSettingsMenu.cpp:83 src/keycode.cpp:234
+#: src/guiSettingsMenu.cpp:83 src/keycode.cpp:266
 msgid "Down"
 msgstr "Abajo"
 
@@ -3844,10 +3925,6 @@ msgstr "Anterior objeto"
 msgid "Next Item"
 msgstr "Siguiente objeto"
 
-#: src/guiSettingsMenu.cpp:277
-msgid "Main Menu"
-msgstr "Menú principal"
-
 #: src/guiSettingsMenu.cpp:284 src/guiSettingsMenu.cpp:311
 msgid "Controls"
 msgstr "Controles"
@@ -3955,362 +4032,576 @@ msgstr "Aumento de energía: %d:%02d"
 msgid "Cold Protection: %d:%02d"
 msgstr "Proyección contra el frío: %d:%02d"
 
-#: src/inventory.cpp:230 src/inventory.cpp:352
-msgid "Cookable: Yes"
-msgstr "Cocinable: Sí"
-
-#: src/inventory.cpp:235 src/inventory.cpp:357 src/inventory.cpp:532
-msgid "Fuel Burn Time: "
-msgstr "Tiempo de consumo de combustible:"
-
-#: src/inventory.cpp:321
-msgid "Hunger: "
-msgstr "Hambre:"
-
-#: src/inventory.cpp:327
-msgid "Health: "
-msgstr "Salud:"
-
-#: src/inventory.cpp:334
-msgid "Cold Protection: "
-msgstr "Protección contra el frío:"
-
-#: src/inventory.cpp:343
-msgid "Energy Boost: "
-msgstr "Aumento de energía:"
-
-#: src/inventory.cpp:521
-msgid "Strength: "
-msgstr "Fuerza:"
-
-#: src/inventory.cpp:524
-msgid "Speed: "
-msgstr "Velocidad:"
-
-#: src/inventory.cpp:527
-msgid "Level: "
-msgstr "Nivel:"
-
-#: src/inventory.cpp:557
+#: src/inventory.cpp:246 src/inventory.cpp:580
 msgid "Contains: "
 msgstr "Contiene:"
 
-#: src/inventory.cpp:643
+#: src/inventory.cpp:253 src/inventory.cpp:375
+msgid "Cookable: Yes"
+msgstr "Cocinable: Sí"
+
+#: src/inventory.cpp:258 src/inventory.cpp:380 src/inventory.cpp:555
+msgid "Fuel Burn Time: "
+msgstr "Tiempo de consumo de combustible:"
+
+#: src/inventory.cpp:344
+msgid "Hunger: "
+msgstr "Hambre:"
+
+#: src/inventory.cpp:350
+msgid "Health: "
+msgstr "Salud:"
+
+#: src/inventory.cpp:357
+msgid "Cold Protection: "
+msgstr "Protección contra el frío:"
+
+#: src/inventory.cpp:366
+msgid "Energy Boost: "
+msgstr "Aumento de energía:"
+
+#: src/inventory.cpp:544
+msgid "Strength: "
+msgstr "Fuerza:"
+
+#: src/inventory.cpp:547
+msgid "Speed: "
+msgstr "Velocidad:"
+
+#: src/inventory.cpp:550
+msgid "Level: "
+msgstr "Nivel:"
+
+#: src/inventory.cpp:666
 msgid "Armour: "
 msgstr "Armadura:"
 
-#: src/inventory.cpp:649
+#: src/inventory.cpp:672
 msgid "Warmth: "
 msgstr "Calor:"
 
-#: src/inventory.cpp:655
+#: src/inventory.cpp:678
 msgid "Pressure: "
 msgstr "Presión:"
 
-#: src/inventory.cpp:661
+#: src/inventory.cpp:684
 msgid "Suffocation: "
 msgstr "Asfixia:"
 
-#: src/inventory.cpp:667
+#: src/inventory.cpp:690
 msgid "Durability: "
 msgstr "Durabilidad:"
 
-#: src/inventory.cpp:672
+#: src/inventory.cpp:695
 msgid "Effect Boost: "
 msgstr "Aumento de efecto:"
 
-#: src/keycode.cpp:229
+#: src/keycode.cpp:232
+msgid "-"
+msgstr ""
+
+#: src/keycode.cpp:234
 msgid "Left Button"
 msgstr "Botón izquierdo"
 
-#: src/keycode.cpp:229
-msgid "Middle Button"
-msgstr "Botón del medio"
-
-#: src/keycode.cpp:229
+#: src/keycode.cpp:235
 msgid "Right Button"
 msgstr "Botón derecho"
 
-#: src/keycode.cpp:229
+#: src/keycode.cpp:237
+msgid "Middle Button"
+msgstr "Botón del medio"
+
+#: src/keycode.cpp:238
 msgid "X Button 1"
 msgstr "X botón 1"
 
-#: src/keycode.cpp:230
-msgid "Back"
-msgstr "Atrás"
-
-#: src/keycode.cpp:230
-msgid "Clear"
-msgstr "Limpiar"
-
-#: src/keycode.cpp:230
-msgid "Return"
-msgstr "Regresar"
-
-#: src/keycode.cpp:230
-msgid "Tab"
-msgstr "Tab"
-
-#: src/keycode.cpp:230
+#: src/keycode.cpp:239
 msgid "X Button 2"
 msgstr "X botón 2"
 
-#: src/keycode.cpp:231
-msgid "Capital"
-msgstr "Mayúscula"
+#: src/keycode.cpp:240
+msgid "Back"
+msgstr "Atrás"
 
-#: src/keycode.cpp:231
-msgid "Control"
-msgstr "Control"
+#: src/keycode.cpp:241
+msgid "Tab"
+msgstr "Tab"
 
-#: src/keycode.cpp:231
-msgid "Kana"
-msgstr "Kana"
+#: src/keycode.cpp:242
+msgid "Clear"
+msgstr "Limpiar"
 
-#: src/keycode.cpp:231
-msgid "Menu"
-msgstr "Menú"
+#: src/keycode.cpp:243
+msgid "Return"
+msgstr "Regresar"
 
-#: src/keycode.cpp:231
-msgid "Pause"
-msgstr "Pausa"
-
-#: src/keycode.cpp:231
+#: src/keycode.cpp:244
 msgid "Shift"
 msgstr "Mayús."
 
-#: src/keycode.cpp:232
-msgid "Convert"
-msgstr "Convertir"
+#: src/keycode.cpp:245
+msgid "Control"
+msgstr "Control"
 
-#: src/keycode.cpp:232
-msgid "Escape"
-msgstr "Escape"
+#: src/keycode.cpp:246
+msgid "Menu"
+msgstr "Menú"
 
-#: src/keycode.cpp:232
-msgid "Final"
-msgstr "Final"
+#: src/keycode.cpp:247
+msgid "Pause"
+msgstr "Pausa"
 
-#: src/keycode.cpp:232
+#: src/keycode.cpp:248
+msgid "Capital"
+msgstr "Mayúscula"
+
+#: src/keycode.cpp:249
+msgid "Kana"
+msgstr "Kana"
+
+#: src/keycode.cpp:250
 msgid "Junja"
 msgstr "Junja"
 
-#: src/keycode.cpp:232
+#: src/keycode.cpp:251
+msgid "Final"
+msgstr "Final"
+
+#: src/keycode.cpp:252
 msgid "Kanji"
 msgstr "Kanji"
 
-#: src/keycode.cpp:232
+#: src/keycode.cpp:253
+msgid "Escape"
+msgstr "Escape"
+
+#: src/keycode.cpp:254
+msgid "Convert"
+msgstr "Convertir"
+
+#: src/keycode.cpp:255
 msgid "Nonconvert"
 msgstr "No convertir"
 
-#: src/keycode.cpp:233
+#: src/keycode.cpp:256
 msgid "Accept"
 msgstr "Aceptar"
 
-#: src/keycode.cpp:233
-msgid "End"
-msgstr "Fin"
-
-#: src/keycode.cpp:233
-msgid "Home"
-msgstr "Casa"
-
-#: src/keycode.cpp:233
+#: src/keycode.cpp:257
 msgid "Mode Change"
 msgstr "Cambiar modo"
 
-#: src/keycode.cpp:233
-msgid "Next"
-msgstr "Siguiente"
-
-#: src/keycode.cpp:233
-msgid "Prior"
-msgstr "Previo"
-
-#: src/keycode.cpp:233
+#: src/keycode.cpp:258
 msgid "Space"
 msgstr "Espacio"
 
-#: src/keycode.cpp:234
-msgid "Execute"
-msgstr "Ejecutar"
+#: src/keycode.cpp:259
+msgid "Prior"
+msgstr "Previo"
 
-#: src/keycode.cpp:234
-msgid "Print"
-msgstr "Pet sis"
+#: src/keycode.cpp:260
+msgid "Next"
+msgstr "Siguiente"
 
-#: src/keycode.cpp:234
+#: src/keycode.cpp:261
+msgid "End"
+msgstr "Fin"
+
+#: src/keycode.cpp:262
+msgid "Home"
+msgstr "Casa"
+
+#: src/keycode.cpp:267
 msgid "Select"
 msgstr "Seleccionar"
 
-#: src/keycode.cpp:235
-msgid "Delete"
-msgstr "Borrar"
+#: src/keycode.cpp:268
+msgid "Print"
+msgstr "Pet sis"
 
-#: src/keycode.cpp:235
-msgid "Help"
-msgstr "Ayuda"
+#: src/keycode.cpp:269
+msgid "Execute"
+msgstr "Ejecutar"
 
-#: src/keycode.cpp:235
-msgid "Insert"
-msgstr "Insertar"
-
-#: src/keycode.cpp:235
+#: src/keycode.cpp:270
 msgid "Snapshot"
 msgstr "Captura de pantalla"
 
-#: src/keycode.cpp:238
+#: src/keycode.cpp:271
+msgid "Insert"
+msgstr "Insertar"
+
+#: src/keycode.cpp:272
+msgid "Delete"
+msgstr "Borrar"
+
+#: src/keycode.cpp:273
+msgid "Help"
+msgstr "Ayuda"
+
+#: src/keycode.cpp:274
+msgid "0"
+msgstr ""
+
+#: src/keycode.cpp:275
+msgid "1"
+msgstr ""
+
+#: src/keycode.cpp:276
+msgid "2"
+msgstr ""
+
+#: src/keycode.cpp:277
+msgid "3"
+msgstr ""
+
+#: src/keycode.cpp:278
+msgid "4"
+msgstr ""
+
+#: src/keycode.cpp:279
+msgid "5"
+msgstr ""
+
+#: src/keycode.cpp:280
+msgid "6"
+msgstr ""
+
+#: src/keycode.cpp:281
+msgid "7"
+msgstr ""
+
+#: src/keycode.cpp:282
+msgid "8"
+msgstr ""
+
+#: src/keycode.cpp:283
+msgid "9"
+msgstr ""
+
+#: src/keycode.cpp:284
+msgid "A"
+msgstr ""
+
+#: src/keycode.cpp:285
+msgid "B"
+msgstr ""
+
+#: src/keycode.cpp:286
+msgid "C"
+msgstr ""
+
+#: src/keycode.cpp:287
+msgid "D"
+msgstr ""
+
+#: src/keycode.cpp:288
+msgid "E"
+msgstr ""
+
+#: src/keycode.cpp:289
+msgid "F"
+msgstr ""
+
+#: src/keycode.cpp:290
+msgid "G"
+msgstr ""
+
+#: src/keycode.cpp:291
+msgid "H"
+msgstr ""
+
+#: src/keycode.cpp:292
+msgid "I"
+msgstr ""
+
+#: src/keycode.cpp:293
+msgid "J"
+msgstr ""
+
+#: src/keycode.cpp:294
+msgid "K"
+msgstr ""
+
+#: src/keycode.cpp:295
+msgid "L"
+msgstr ""
+
+#: src/keycode.cpp:296
+msgid "M"
+msgstr ""
+
+#: src/keycode.cpp:297
+msgid "N"
+msgstr ""
+
+#: src/keycode.cpp:298
+msgid "O"
+msgstr ""
+
+#: src/keycode.cpp:299
+msgid "P"
+msgstr ""
+
+#: src/keycode.cpp:300
+msgid "Q"
+msgstr ""
+
+#: src/keycode.cpp:301
+msgid "R"
+msgstr ""
+
+#: src/keycode.cpp:302
+msgid "S"
+msgstr ""
+
+#: src/keycode.cpp:303
+msgid "T"
+msgstr ""
+
+#: src/keycode.cpp:304
+#, fuzzy
+msgid "U"
+msgstr "Arriba"
+
+#: src/keycode.cpp:305
+msgid "V"
+msgstr ""
+
+#: src/keycode.cpp:306
+msgid "W"
+msgstr ""
+
+#: src/keycode.cpp:307
+msgid "X"
+msgstr ""
+
+#: src/keycode.cpp:308
+msgid "Y"
+msgstr ""
+
+#: src/keycode.cpp:309
+msgid "Z"
+msgstr ""
+
+#: src/keycode.cpp:310
 msgid "Left Windows"
 msgstr "Ventanas izquierdas"
 
-#: src/keycode.cpp:239
-msgid "Apps"
-msgstr "Aplicaciones"
-
-#: src/keycode.cpp:239
-msgid "Numpad 0"
-msgstr "Teclado numérico 0"
-
-#: src/keycode.cpp:239
-msgid "Numpad 1"
-msgstr "Teclado numérico 1"
-
-#: src/keycode.cpp:239
+#: src/keycode.cpp:311
 msgid "Right Windows"
 msgstr "Ventanas derecha"
 
-#: src/keycode.cpp:239
+#: src/keycode.cpp:312
+msgid "Apps"
+msgstr "Aplicaciones"
+
+#: src/keycode.cpp:313
 msgid "Sleep"
 msgstr "Suspender"
 
-#: src/keycode.cpp:240
+#: src/keycode.cpp:314
+msgid "Numpad 0"
+msgstr "Teclado numérico 0"
+
+#: src/keycode.cpp:315
+msgid "Numpad 1"
+msgstr "Teclado numérico 1"
+
+#: src/keycode.cpp:316
 msgid "Numpad 2"
 msgstr "Teclado numérico 2"
 
-#: src/keycode.cpp:240
+#: src/keycode.cpp:317
 msgid "Numpad 3"
 msgstr "Teclado numérico 3"
 
-#: src/keycode.cpp:240
+#: src/keycode.cpp:318
 msgid "Numpad 4"
 msgstr "Teclado numérico 4"
 
-#: src/keycode.cpp:240
+#: src/keycode.cpp:319
 msgid "Numpad 5"
 msgstr "Teclado numérico 5"
 
-#: src/keycode.cpp:240
+#: src/keycode.cpp:320
 msgid "Numpad 6"
 msgstr "Teclado numérico 6"
 
-#: src/keycode.cpp:240
+#: src/keycode.cpp:321
 msgid "Numpad 7"
 msgstr "Teclado numérico 7"
 
-#: src/keycode.cpp:241
-msgid "Numpad *"
-msgstr "Teclado numérico *"
-
-#: src/keycode.cpp:241
-msgid "Numpad +"
-msgstr "Teclado numérico +"
-
-#: src/keycode.cpp:241
-msgid "Numpad -"
-msgstr "Teclado numérico -"
-
-#: src/keycode.cpp:241
-msgid "Numpad /"
-msgstr "Teclado numérico /"
-
-#: src/keycode.cpp:241
+#: src/keycode.cpp:322
 msgid "Numpad 8"
 msgstr "Teclado numérico 8"
 
-#: src/keycode.cpp:241
+#: src/keycode.cpp:323
 msgid "Numpad 9"
 msgstr "Teclado numérico 9"
 
-#: src/keycode.cpp:245
+#: src/keycode.cpp:324
+msgid "Numpad *"
+msgstr "Teclado numérico *"
+
+#: src/keycode.cpp:325
+msgid "Numpad +"
+msgstr "Teclado numérico +"
+
+#: src/keycode.cpp:326 src/keycode.cpp:329
+msgid "Numpad /"
+msgstr "Teclado numérico /"
+
+#: src/keycode.cpp:327
+msgid "Numpad -"
+msgstr "Teclado numérico -"
+
+#: src/keycode.cpp:328
+#, fuzzy
+msgid "Numpad ."
+msgstr "Teclado numérico 0"
+
+#: src/keycode.cpp:330
+msgid "F10"
+msgstr ""
+
+#: src/keycode.cpp:331
+msgid "F11"
+msgstr ""
+
+#: src/keycode.cpp:332
+msgid "F12"
+msgstr ""
+
+#: src/keycode.cpp:333
+msgid "F13"
+msgstr ""
+
+#: src/keycode.cpp:334
+msgid "F14"
+msgstr ""
+
+#: src/keycode.cpp:335
+msgid "F15"
+msgstr ""
+
+#: src/keycode.cpp:336
+msgid "F16"
+msgstr ""
+
+#: src/keycode.cpp:337
+msgid "F17"
+msgstr ""
+
+#: src/keycode.cpp:338
+msgid "F18"
+msgstr ""
+
+#: src/keycode.cpp:339
+msgid "F19"
+msgstr ""
+
+#: src/keycode.cpp:340
+msgid "F20"
+msgstr ""
+
+#: src/keycode.cpp:341
+msgid "F21"
+msgstr ""
+
+#: src/keycode.cpp:342
+msgid "F22"
+msgstr ""
+
+#: src/keycode.cpp:343
+msgid "F23"
+msgstr ""
+
+#: src/keycode.cpp:344
+msgid "F24"
+msgstr ""
+
+#: src/keycode.cpp:345
 msgid "Num Lock"
 msgstr "Bloq núm"
 
-#: src/keycode.cpp:245
+#: src/keycode.cpp:346
 msgid "Scroll Lock"
 msgstr "bloq despl"
 
-#: src/keycode.cpp:246
+#: src/keycode.cpp:347
 msgid "Left Shift"
 msgstr "Mayús izquierdo"
 
-#: src/keycode.cpp:246
+#: src/keycode.cpp:348
 msgid "Right Shift"
 msgstr "Mayús derecho"
 
-#: src/keycode.cpp:247
+#: src/keycode.cpp:349
 msgid "Left Control"
 msgstr "Control izquierdo"
 
-#: src/keycode.cpp:247
-msgid "Left Menu"
-msgstr "Menú izquierdo"
-
-#: src/keycode.cpp:247
+#: src/keycode.cpp:350
 msgid "Right Control"
 msgstr "Control Derecho"
 
-#: src/keycode.cpp:247
+#: src/keycode.cpp:351
+msgid "Left Menu"
+msgstr "Menú izquierdo"
+
+#: src/keycode.cpp:352
 msgid "Right Menu"
 msgstr "Menú derecho"
 
-#: src/keycode.cpp:249
-msgid "Comma"
-msgstr "Coma"
-
-#: src/keycode.cpp:249
-msgid "Minus"
-msgstr "Menos"
-
-#: src/keycode.cpp:249
-msgid "Period"
-msgstr "Punto"
-
-#: src/keycode.cpp:249
+#: src/keycode.cpp:353
 msgid "Plus"
 msgstr "Más"
 
-#: src/keycode.cpp:253
+#: src/keycode.cpp:354
+msgid "Comma"
+msgstr "Coma"
+
+#: src/keycode.cpp:355
+msgid "Minus"
+msgstr "Menos"
+
+#: src/keycode.cpp:356
+msgid "Period"
+msgstr "Punto"
+
+#: src/keycode.cpp:357
 msgid "Attn"
 msgstr "Attn"
 
-#: src/keycode.cpp:253
+#: src/keycode.cpp:358
 msgid "CrSel"
 msgstr "LmSel"
 
-#: src/keycode.cpp:254
-msgid "Erase OEF"
-msgstr "Borrar OEF"
-
-#: src/keycode.cpp:254
+#: src/keycode.cpp:359
 msgid "ExSel"
 msgstr "SlSel"
 
-#: src/keycode.cpp:254
-msgid "OEM Clear"
-msgstr "Limpiar OEM"
+#: src/keycode.cpp:360
+msgid "Erase OEF"
+msgstr "Borrar OEF"
 
-#: src/keycode.cpp:254
-msgid "PA1"
-msgstr "PA1"
-
-#: src/keycode.cpp:254
+#: src/keycode.cpp:361
 msgid "Play"
 msgstr "Reproducir"
 
-#: src/keycode.cpp:254
+#: src/keycode.cpp:362
 msgid "Zoom"
 msgstr "Zum"
 
+#: src/keycode.cpp:363
+msgid "PA1"
+msgstr "PA1"
+
+#: src/keycode.cpp:364
+msgid "OEM Clear"
+msgstr "Limpiar OEM"
+
 #: src/main.cpp:1131
 msgid "Setting Up UI"
 msgstr "Configurando interfaz"
@@ -4327,30 +4618,70 @@ msgstr "Cargando criaturas"
 msgid "Setting Up Sound"
 msgstr "Configurando sonido"
 
-#: src/mapnode.cpp:282
+#: src/mapnode.cpp:285
 msgid "Loading Base MapNodes"
 msgstr "Cargando nodos de bases del mapa"
 
-#: src/mapnode.cpp:286
+#: src/mapnode.cpp:289
 msgid "Loading Circuit MapNodes"
 msgstr "Cargando nodos de circuitos del mapa"
 
-#: src/mapnode.cpp:290
+#: src/mapnode.cpp:293
 msgid "Loading Plant MapNodes"
 msgstr "Cargando nodos de plantas del mapa"
 
-#: src/mapnode.cpp:294
+#: src/mapnode.cpp:297
 msgid "Loading Farming MapNodes"
 msgstr "Cargando nodos de agricultura del mapa"
 
-#: src/mapnode.cpp:298
+#: src/mapnode.cpp:301
 msgid "Loading Decorative MapNodes"
 msgstr "Cargando nodos de decoración del mapa"
 
-#: src/mapnode.cpp:302
+#: src/mapnode.cpp:305
 msgid "Loading Interactive MapNodes"
 msgstr "Cargando nodos de interacción del mapa"
 
-#: src/mapnode.cpp:306
+#: src/mapnode.cpp:309
 msgid "Loading Special MapNodes"
 msgstr "Cargando nodo especial del mapa"
+
+#: src/mineral.cpp:93
+#, fuzzy
+msgid "Coal"
+msgstr "Cúmulo de carbón mineral"
+
+#: src/mineral.cpp:99
+#, fuzzy
+msgid "Iron"
+msgstr "Cúmulo de hierro"
+
+#: src/mineral.cpp:106
+#, fuzzy
+msgid "Tin"
+msgstr "Delgado"
+
+#: src/mineral.cpp:113
+#, fuzzy
+msgid "Copper"
+msgstr "Cúmulo de cobre"
+
+#: src/mineral.cpp:121
+#, fuzzy
+msgid "Silver"
+msgstr "Cúmulo de plata"
+
+#: src/mineral.cpp:128
+#, fuzzy
+msgid "Gold"
+msgstr "Cúmulo de oro"
+
+#: src/mineral.cpp:135
+#, fuzzy
+msgid "Quartz"
+msgstr "Polvo de cuarzo"
+
+#: src/mineral.cpp:157
+#, fuzzy
+msgid "Turquoise"
+msgstr "Turquesa"
diff --git a/po/fr/voxelands.po b/po/fr/voxelands.po
index 0786538..87664ab 100644
--- a/po/fr/voxelands.po
+++ b/po/fr/voxelands.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Lisa 'darkrose' Milne
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # David Salbei <david@chalvia.fr>, 2015
 # Judas C, 2015
@@ -10,14 +10,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Voxelands\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-10-19 01:55+1000\n"
+"POT-Creation-Date: 2015-12-21 11:27+1000\n"
 "PO-Revision-Date: 2015-10-19 17:38+0000\n"
 "Last-Translator: Judas C\n"
-"Language-Team: French (France) (http://www.transifex.com/voxelands/voxelands/language/fr_FR/)\n"
+"Language-Team: French (France) (http://www.transifex.com/voxelands/voxelands/"
+"language/fr_FR/)\n"
+"Language: fr_FR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: fr_FR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: src/character_creator.cpp:55
@@ -230,9 +231,19 @@ msgstr "Chaussures en Toile"
 
 #: src/character_creator.cpp:202
 msgid ""
-"Here you can create your default character, this is how other players will see you in-game. When you join a new server you will start with the clothing you select here. Additional clothing, both protective and decorative, can be crafted in-game.\n"
+"Here you can create your default character, this is how other players will "
+"see you in-game. When you join a new server you will start with the clothing "
+"you select here. Additional clothing, both protective and decorative, can be "
+"crafted in-game.\n"
 "You can return here from the main menu anytime to change your character."
-msgstr "Ici, vous pouvez créer votre personnage par défaut, c'est la façon dont les autres joueurs vous verrons dans le jeu. Lorsque vous rejoignez un nouveau serveur, vous commencez avec les vêtements sélectionnés ici. Des vêtements supplémentaires, à la fois protecteurs et décoratifs, peuvent être conçu dans le jeu.\nVous pouvez revenir ici dans le menu principal à tout moment pour changer votre personnage."
+msgstr ""
+"Ici, vous pouvez créer votre personnage par défaut, c'est la façon dont les "
+"autres joueurs vous verrons dans le jeu. Lorsque vous rejoignez un nouveau "
+"serveur, vous commencez avec les vêtements sélectionnés ici. Des vêtements "
+"supplémentaires, à la fois protecteurs et décoratifs, peuvent être conçu "
+"dans le jeu.\n"
+"Vous pouvez revenir ici dans le menu principal à tout moment pour changer "
+"votre personnage."
 
 #: src/character_creator.cpp:223
 msgid "Create Your Character"
@@ -266,7 +277,7 @@ msgstr "Plus Mince"
 msgid "Done"
 msgstr "Terminé"
 
-#: src/character_creator.cpp:423 src/keycode.cpp:229
+#: src/character_creator.cpp:423 src/keycode.cpp:236
 msgid "Cancel"
 msgstr "Annuler"
 
@@ -1118,7 +1129,7 @@ msgstr "Silex"
 msgid "Steel Ingot"
 msgstr "Lingot d'Acier"
 
-#: src/content_craftitem.cpp:225 src/content_mapnode.cpp:710
+#: src/content_craftitem.cpp:225 src/content_mapnode.cpp:723
 msgid "Brick"
 msgstr "Brique"
 
@@ -1546,11 +1557,11 @@ msgstr "Mithril Brut"
 msgid "Unbound Mithril"
 msgstr "Mithril Ordinaire"
 
-#: src/content_craftitem.cpp:1516
+#: src/content_craftitem.cpp:1516 src/mineral.cpp:142
 msgid "Mithril"
 msgstr "Mithril"
 
-#: src/content_craftitem.cpp:1525
+#: src/content_craftitem.cpp:1525 src/mineral.cpp:149
 msgid "Ruby"
 msgstr "Rubi"
 
@@ -1558,15 +1569,15 @@ msgstr "Rubi"
 msgid "Turquiose"
 msgstr "Turquoise"
 
-#: src/content_craftitem.cpp:1541
+#: src/content_craftitem.cpp:1541 src/mineral.cpp:165
 msgid "Amethyst"
 msgstr "Amethyste"
 
-#: src/content_craftitem.cpp:1549
+#: src/content_craftitem.cpp:1549 src/mineral.cpp:173
 msgid "Sapphire"
 msgstr "Saphire"
 
-#: src/content_craftitem.cpp:1557
+#: src/content_craftitem.cpp:1557 src/mineral.cpp:181
 msgid "Sunstone"
 msgstr "Héliolite"
 
@@ -1578,392 +1589,396 @@ msgstr "Pierre"
 msgid "Limestone"
 msgstr "Calcaire"
 
-#: src/content_mapnode.cpp:219
+#: src/content_mapnode.cpp:221
+msgid "Marble"
+msgstr ""
+
+#: src/content_mapnode.cpp:232
 msgid "Rock"
 msgstr ""
 
-#: src/content_mapnode.cpp:241
+#: src/content_mapnode.cpp:254
 msgid "Ice"
 msgstr "Glace"
 
-#: src/content_mapnode.cpp:257
+#: src/content_mapnode.cpp:270
 msgid "Coal Block"
 msgstr "Block de charbon"
 
-#: src/content_mapnode.cpp:274
+#: src/content_mapnode.cpp:287
 msgid "Charcoal Block"
 msgstr "Bloc de Charbon"
 
-#: src/content_mapnode.cpp:291
+#: src/content_mapnode.cpp:304
 msgid "Stone Brick"
 msgstr "Brique de Pierre"
 
-#: src/content_mapnode.cpp:305
+#: src/content_mapnode.cpp:318
 msgid "Stone Block"
 msgstr "Bloc de Pierre"
 
-#: src/content_mapnode.cpp:319
+#: src/content_mapnode.cpp:332
 msgid "Rough Stone Brick"
 msgstr "Brique de Pierre Brute"
 
-#: src/content_mapnode.cpp:336
+#: src/content_mapnode.cpp:349
 msgid "Rough Stone Block"
 msgstr "Bloc de Pierre Brute"
 
-#: src/content_mapnode.cpp:352 src/content_mapnode.cpp:385
-#: src/content_mapnode.cpp:399 src/content_mapnode.cpp:432
+#: src/content_mapnode.cpp:365 src/content_mapnode.cpp:398
+#: src/content_mapnode.cpp:412 src/content_mapnode.cpp:445
 msgid "Grass"
 msgstr "Herbe"
 
-#: src/content_mapnode.cpp:370 src/content_mapnode.cpp:417
+#: src/content_mapnode.cpp:383 src/content_mapnode.cpp:430
 msgid "Growing Grass"
 msgstr "Herbe Qui Pousse"
 
-#: src/content_mapnode.cpp:446
+#: src/content_mapnode.cpp:459
 msgid "Muddy Snow"
 msgstr "Neige Boueuse"
 
-#: src/content_mapnode.cpp:462
+#: src/content_mapnode.cpp:475
 msgid "Mud"
 msgstr "Boue"
 
-#: src/content_mapnode.cpp:478
+#: src/content_mapnode.cpp:491
 msgid "Ash Block"
 msgstr "Bloc de Cendre"
 
-#: src/content_mapnode.cpp:493
+#: src/content_mapnode.cpp:506
 msgid "Sand"
 msgstr "Sable"
 
-#: src/content_mapnode.cpp:512
+#: src/content_mapnode.cpp:525
 msgid "Gravel"
 msgstr "Gravier"
 
-#: src/content_mapnode.cpp:529
+#: src/content_mapnode.cpp:542
 msgid "Sand Stone"
 msgstr "Grès"
 
-#: src/content_mapnode.cpp:544
+#: src/content_mapnode.cpp:557
 msgid "Sand Stone Bricks"
 msgstr "Briques de Grès"
 
-#: src/content_mapnode.cpp:559
+#: src/content_mapnode.cpp:572
 msgid "Sand Stone Blocks"
 msgstr "Blocs de Grès"
 
-#: src/content_mapnode.cpp:574
+#: src/content_mapnode.cpp:587
 msgid "Clay"
 msgstr "Argile"
 
-#: src/content_mapnode.cpp:591
+#: src/content_mapnode.cpp:604
 msgid "Blue Clay"
 msgstr "Argile Bleue"
 
-#: src/content_mapnode.cpp:608
+#: src/content_mapnode.cpp:621
 msgid "Green Clay"
 msgstr "Argile Verte"
 
-#: src/content_mapnode.cpp:625
+#: src/content_mapnode.cpp:638
 msgid "Orange Clay"
 msgstr "Argile Orange"
 
-#: src/content_mapnode.cpp:642
+#: src/content_mapnode.cpp:655
 msgid "Purple Clay"
 msgstr "Argile Violette"
 
-#: src/content_mapnode.cpp:659
+#: src/content_mapnode.cpp:672
 msgid "Red Clay"
 msgstr "Argile Rouge"
 
-#: src/content_mapnode.cpp:676
+#: src/content_mapnode.cpp:689
 msgid "Yellow Clay"
 msgstr "Argile Jaune"
 
-#: src/content_mapnode.cpp:693
+#: src/content_mapnode.cpp:706
 msgid "Black Clay"
 msgstr "Argile Noire"
 
-#: src/content_mapnode.cpp:729
+#: src/content_mapnode.cpp:742
 msgid "Terracotta"
 msgstr "Terre Cuite"
 
-#: src/content_mapnode.cpp:741
+#: src/content_mapnode.cpp:754
 msgid "Terracotta Brick"
 msgstr "Brique de Terre Cuite"
 
-#: src/content_mapnode.cpp:755
+#: src/content_mapnode.cpp:768
 msgid "Terracotta Block"
 msgstr "Bloc de Terre Cuite"
 
-#: src/content_mapnode.cpp:769
+#: src/content_mapnode.cpp:782
 msgid "Terracotta Tile"
 msgstr "Carreau de Grès"
 
-#: src/content_mapnode.cpp:789
+#: src/content_mapnode.cpp:802
 msgid "Glass"
 msgstr "Verre"
 
-#: src/content_mapnode.cpp:809
+#: src/content_mapnode.cpp:822
 msgid "Blue Glass"
 msgstr "Verre Bleu"
 
-#: src/content_mapnode.cpp:831
+#: src/content_mapnode.cpp:844
 msgid "Green Glass"
 msgstr "Verre Vert"
 
-#: src/content_mapnode.cpp:853
+#: src/content_mapnode.cpp:866
 msgid "Orange Glass"
 msgstr "Vert Orange"
 
-#: src/content_mapnode.cpp:875
+#: src/content_mapnode.cpp:888
 msgid "Purple Glass"
 msgstr "Verre Violet"
 
-#: src/content_mapnode.cpp:897
+#: src/content_mapnode.cpp:910
 msgid "Red Glass"
 msgstr "Verre Rouge"
 
-#: src/content_mapnode.cpp:919
+#: src/content_mapnode.cpp:932
 msgid "Yellow Glass"
 msgstr "Verre Jaune"
 
-#: src/content_mapnode.cpp:941
+#: src/content_mapnode.cpp:954
 msgid "Black Glass"
 msgstr "Verre Noir"
 
-#: src/content_mapnode.cpp:963
+#: src/content_mapnode.cpp:976
 msgid "Glass Pane"
 msgstr "Vitre"
 
-#: src/content_mapnode.cpp:997
+#: src/content_mapnode.cpp:1010
 msgid "Blue Glass Pane"
 msgstr "Vitre Bleue"
 
-#: src/content_mapnode.cpp:1032
+#: src/content_mapnode.cpp:1045
 msgid "Green Glass Pane"
 msgstr "Vitre Verte"
 
-#: src/content_mapnode.cpp:1067
+#: src/content_mapnode.cpp:1080
 msgid "Orange Glass Pane"
 msgstr "Vitre Orange"
 
-#: src/content_mapnode.cpp:1102
+#: src/content_mapnode.cpp:1115
 msgid "Purple Glass Pane"
 msgstr "Vitre Violette"
 
-#: src/content_mapnode.cpp:1137
+#: src/content_mapnode.cpp:1150
 msgid "Red Glass Pane"
 msgstr "Vitre Rouge"
 
-#: src/content_mapnode.cpp:1172
+#: src/content_mapnode.cpp:1185
 msgid "Yellow Glass Pane"
 msgstr "Vitre Jaune"
 
-#: src/content_mapnode.cpp:1207
+#: src/content_mapnode.cpp:1220
 msgid "Black Glass Pane"
 msgstr "Vitre Noire"
 
-#: src/content_mapnode.cpp:1242 src/content_mapnode_farm.cpp:333
+#: src/content_mapnode.cpp:1255 src/content_mapnode_farm.cpp:333
 msgid "Glass Light"
 msgstr "Verre Lumineux"
 
-#: src/content_mapnode.cpp:1265
+#: src/content_mapnode.cpp:1278
 msgid "Wood"
 msgstr "Bois"
 
-#: src/content_mapnode.cpp:1291
+#: src/content_mapnode.cpp:1304
 msgid "Jungle Wood"
 msgstr "Bois de la Jungle"
 
-#: src/content_mapnode.cpp:1316
+#: src/content_mapnode.cpp:1329
 msgid "Pine"
 msgstr "Pin"
 
-#: src/content_mapnode.cpp:1341
+#: src/content_mapnode.cpp:1354
 msgid "Sponge"
 msgstr "Éponge"
 
-#: src/content_mapnode.cpp:1356
+#: src/content_mapnode.cpp:1369
 msgid "Waterlogged Sponge"
 msgstr "Éponge Détrempée"
 
-#: src/content_mapnode.cpp:1371
+#: src/content_mapnode.cpp:1384
 msgid "Hay Bale"
 msgstr "Balle de Foin"
 
-#: src/content_mapnode.cpp:1388
+#: src/content_mapnode.cpp:1401
 msgid "Raw Apple Pie"
 msgstr "Tarte aux Pommes Crue"
 
-#: src/content_mapnode.cpp:1417
+#: src/content_mapnode.cpp:1430
 msgid "Apple Pie"
 msgstr "Tarte aux Pommes"
 
-#: src/content_mapnode.cpp:1512
+#: src/content_mapnode.cpp:1525
 msgid "Raw Pumpkin Pie"
 msgstr "Tarte à la Courge Crue"
 
-#: src/content_mapnode.cpp:1541
+#: src/content_mapnode.cpp:1554
 msgid "Pumpkin Pie"
 msgstr "Tarte au Potiron"
 
-#: src/content_mapnode.cpp:1636 src/content_mapnode.cpp:1715
+#: src/content_mapnode.cpp:1649 src/content_mapnode.cpp:1728
 msgid "Snow"
 msgstr "Neige"
 
-#: src/content_mapnode.cpp:1652
+#: src/content_mapnode.cpp:1665
 msgid "Snowman"
 msgstr "Bonhomme de Neige"
 
-#: src/content_mapnode.cpp:1738 src/content_mapnode_farm.cpp:445
+#: src/content_mapnode.cpp:1752 src/content_mapnode_farm.cpp:445
 msgid "Cotton"
 msgstr "Coton"
 
-#: src/content_mapnode.cpp:1769
+#: src/content_mapnode.cpp:1783
 msgid "Blue Cotton"
 msgstr "Coton Bleu"
 
-#: src/content_mapnode.cpp:1786
+#: src/content_mapnode.cpp:1800
 msgid "Green Cotton"
 msgstr "Coton Vert"
 
-#: src/content_mapnode.cpp:1803
+#: src/content_mapnode.cpp:1817
 msgid "Orange Cotton"
 msgstr "Coton Orange"
 
-#: src/content_mapnode.cpp:1820
+#: src/content_mapnode.cpp:1834
 msgid "Purple Cotton"
 msgstr "Coton Violet"
 
-#: src/content_mapnode.cpp:1837
+#: src/content_mapnode.cpp:1851
 msgid "Red Cotton"
 msgstr "Coton Rouge"
 
-#: src/content_mapnode.cpp:1854
+#: src/content_mapnode.cpp:1868
 msgid "Yellow Cotton"
 msgstr "Coton Jaune"
 
-#: src/content_mapnode.cpp:1871
+#: src/content_mapnode.cpp:1885
 msgid "Black Cotton"
 msgstr "Coton Noir"
 
-#: src/content_mapnode.cpp:1888
+#: src/content_mapnode.cpp:1902
 msgid "Carpet"
 msgstr "Tapis"
 
-#: src/content_mapnode.cpp:1911
+#: src/content_mapnode.cpp:1925
 msgid "Blue Carpet"
 msgstr "Tapis Bleu"
 
-#: src/content_mapnode.cpp:1935
+#: src/content_mapnode.cpp:1949
 msgid "Green Carpet"
 msgstr "Tapis Vert"
 
-#: src/content_mapnode.cpp:1959
+#: src/content_mapnode.cpp:1973
 msgid "Orange Carpet"
 msgstr "Tapis Orange"
 
-#: src/content_mapnode.cpp:1983
+#: src/content_mapnode.cpp:1997
 msgid "Purple Carpet"
 msgstr "Tapis Violet"
 
-#: src/content_mapnode.cpp:2007
+#: src/content_mapnode.cpp:2021
 msgid "Red Carpet"
 msgstr "Tapis Rouge"
 
-#: src/content_mapnode.cpp:2031
+#: src/content_mapnode.cpp:2045
 msgid "Yellow Carpet"
 msgstr "Tapis Jaune"
 
-#: src/content_mapnode.cpp:2055
+#: src/content_mapnode.cpp:2069
 msgid "Black Carpet"
 msgstr "Tapis Noir"
 
-#: src/content_mapnode.cpp:2079
+#: src/content_mapnode.cpp:2093
 msgid "Air"
 msgstr "Air"
 
-#: src/content_mapnode.cpp:2095
+#: src/content_mapnode.cpp:2109
 msgid "Vacuum"
 msgstr "Vide"
 
-#: src/content_mapnode.cpp:2112 src/content_mapnode.cpp:2142
+#: src/content_mapnode.cpp:2126 src/content_mapnode.cpp:2156
 msgid "Water"
 msgstr "Eau"
 
-#: src/content_mapnode.cpp:2172 src/content_mapnode.cpp:2200
+#: src/content_mapnode.cpp:2186 src/content_mapnode.cpp:2214
 msgid "Lava"
 msgstr "Lave"
 
-#: src/content_mapnode.cpp:2231
+#: src/content_mapnode.cpp:2245
 msgid "Rough Stone"
 msgstr "Pierre Brute"
 
-#: src/content_mapnode.cpp:2248
+#: src/content_mapnode.cpp:2262
 msgid "Cobble Stone"
 msgstr "Pierre"
 
-#: src/content_mapnode.cpp:2264
+#: src/content_mapnode.cpp:2278
 msgid "Mossy Cobble Stone"
 msgstr "Pierre Moussue"
 
-#: src/content_mapnode.cpp:2277
+#: src/content_mapnode.cpp:2291
 msgid "Steel Block"
 msgstr "Bloc d'Acier"
 
-#: src/content_mapnode.cpp:2294
+#: src/content_mapnode.cpp:2308
 msgid "Mithril Block"
 msgstr "Bloc de Mithril"
 
-#: src/content_mapnode.cpp:2310
+#: src/content_mapnode.cpp:2324
 msgid "Stone Knob"
 msgstr "Bidule en Pierre"
 
-#: src/content_mapnode.cpp:2311
+#: src/content_mapnode.cpp:2325
 msgid "Rough Stone Knob"
 msgstr "Bidule en Pierre Brute"
 
-#: src/content_mapnode.cpp:2312
+#: src/content_mapnode.cpp:2326
 msgid "Sandstone Knob"
 msgstr "Bidule en Grès"
 
-#: src/content_mapnode.cpp:2313
+#: src/content_mapnode.cpp:2327
 msgid "Wooden Knob"
 msgstr "Bidule en Bois"
 
-#: src/content_mapnode.cpp:2314
+#: src/content_mapnode.cpp:2328
 msgid "Junglewood Knob"
 msgstr "Bidule en Acajou"
 
-#: src/content_mapnode.cpp:2315
+#: src/content_mapnode.cpp:2329
 msgid "Pine Knob"
 msgstr "Bidule en Pin"
 
-#: src/content_mapnode.cpp:2319
+#: src/content_mapnode.cpp:2333
 msgid "Copper Block"
 msgstr "Bloc de Cuivre"
 
-#: src/content_mapnode.cpp:2336
+#: src/content_mapnode.cpp:2350
 msgid "Gold Block"
 msgstr "Bloc d'Or"
 
-#: src/content_mapnode.cpp:2353
+#: src/content_mapnode.cpp:2367
 msgid "Silver Block"
 msgstr "Bloc d'Argent"
 
-#: src/content_mapnode.cpp:2370
+#: src/content_mapnode.cpp:2384
 msgid "Tin Block"
 msgstr "Bloc d'Étain"
 
-#: src/content_mapnode.cpp:2387
+#: src/content_mapnode.cpp:2401
 msgid "Quartz Block"
 msgstr "Bloc de Quartz"
 
-#: src/content_mapnode.cpp:2404
+#: src/content_mapnode.cpp:2418
 msgid "Stone Tiles"
 msgstr "Carreau de Pierre"
 
-#: src/content_mapnode.cpp:2426
+#: src/content_mapnode.cpp:2440
 msgid "Wood Tiles"
 msgstr "Carreau de Bois"
 
@@ -2011,29 +2026,29 @@ msgstr "Porte NON"
 msgid "Repeater"
 msgstr "Répéteur"
 
-#: src/content_mapnode_circuit.cpp:369 src/content_mapnode_circuit.cpp:393
+#: src/content_mapnode_circuit.cpp:369 src/content_mapnode_circuit.cpp:390
 msgid "Electric Lamp"
 msgstr "Lampe Éléctrique"
 
-#: src/content_mapnode_circuit.cpp:427 src/content_mapnode_circuit.cpp:462
-#: src/content_mapnode_circuit.cpp:516 src/content_mapnode_circuit.cpp:537
-#: src/content_mapnode_circuit.cpp:582 src/content_mapnode_circuit.cpp:603
+#: src/content_mapnode_circuit.cpp:424 src/content_mapnode_circuit.cpp:459
+#: src/content_mapnode_circuit.cpp:513 src/content_mapnode_circuit.cpp:534
+#: src/content_mapnode_circuit.cpp:579 src/content_mapnode_circuit.cpp:600
 msgid "Piston"
 msgstr "Piston"
 
-#: src/content_mapnode_circuit.cpp:489 src/content_mapnode_circuit.cpp:560
-#: src/content_mapnode_circuit.cpp:626
+#: src/content_mapnode_circuit.cpp:486 src/content_mapnode_circuit.cpp:557
+#: src/content_mapnode_circuit.cpp:623
 msgid "Piston Arm"
 msgstr "Bras de Piston"
 
-#: src/content_mapnode_circuit.cpp:648 src/content_mapnode_circuit.cpp:676
-#: src/content_mapnode_circuit.cpp:730 src/content_mapnode_circuit.cpp:751
-#: src/content_mapnode_circuit.cpp:796 src/content_mapnode_circuit.cpp:817
+#: src/content_mapnode_circuit.cpp:645 src/content_mapnode_circuit.cpp:673
+#: src/content_mapnode_circuit.cpp:727 src/content_mapnode_circuit.cpp:748
+#: src/content_mapnode_circuit.cpp:793 src/content_mapnode_circuit.cpp:814
 msgid "Sticky Piston"
 msgstr "Piston Collant"
 
-#: src/content_mapnode_circuit.cpp:703 src/content_mapnode_circuit.cpp:774
-#: src/content_mapnode_circuit.cpp:840
+#: src/content_mapnode_circuit.cpp:700 src/content_mapnode_circuit.cpp:771
+#: src/content_mapnode_circuit.cpp:837
 msgid "Sticky Piston Arm"
 msgstr "Bras de Piston Collant"
 
@@ -2173,7 +2188,7 @@ msgstr "Raisin"
 msgid "Trellis Grape"
 msgstr ""
 
-#: src/content_mapnode_farm.cpp:493 src/content_mapnode_farm.cpp:512
+#: src/content_mapnode_farm.cpp:494 src/content_mapnode_farm.cpp:513
 msgid "Dead Vine"
 msgstr ""
 
@@ -2189,131 +2204,137 @@ msgstr "Bibliothèque en Bois de Jungle"
 msgid "Pine Book Shelf"
 msgstr "Bibliothèque en Pin"
 
-#: src/content_mapnode_furniture.cpp:150 src/content_mapnode_furniture.cpp:169
-#: src/content_mapnode_furniture.cpp:188 src/content_mapnode_furniture.cpp:207
-#: src/content_mapnode_furniture.cpp:226 src/content_mapnode_furniture.cpp:245
+#: src/content_mapnode_furniture.cpp:150 src/content_mapnode_furniture.cpp:170
+#: src/content_mapnode_furniture.cpp:190 src/content_mapnode_furniture.cpp:210
+#: src/content_mapnode_furniture.cpp:230 src/content_mapnode_furniture.cpp:250
 msgid "Couch"
 msgstr "Canapé"
 
-#: src/content_mapnode_furniture.cpp:274 src/content_mapnode_furniture.cpp:293
-#: src/content_mapnode_furniture.cpp:312 src/content_mapnode_furniture.cpp:331
-#: src/content_mapnode_furniture.cpp:350 src/content_mapnode_furniture.cpp:369
+#: src/content_mapnode_furniture.cpp:280 src/content_mapnode_furniture.cpp:300
+#: src/content_mapnode_furniture.cpp:320 src/content_mapnode_furniture.cpp:340
+#: src/content_mapnode_furniture.cpp:360 src/content_mapnode_furniture.cpp:380
 msgid "Blue Couch"
 msgstr "Canapé Bleu"
 
-#: src/content_mapnode_furniture.cpp:392 src/content_mapnode_furniture.cpp:411
-#: src/content_mapnode_furniture.cpp:430 src/content_mapnode_furniture.cpp:449
-#: src/content_mapnode_furniture.cpp:468 src/content_mapnode_furniture.cpp:487
+#: src/content_mapnode_furniture.cpp:404 src/content_mapnode_furniture.cpp:424
+#: src/content_mapnode_furniture.cpp:444 src/content_mapnode_furniture.cpp:464
+#: src/content_mapnode_furniture.cpp:484 src/content_mapnode_furniture.cpp:504
 msgid "Green Couch"
 msgstr "Canapé Vert"
 
-#: src/content_mapnode_furniture.cpp:510 src/content_mapnode_furniture.cpp:529
-#: src/content_mapnode_furniture.cpp:548 src/content_mapnode_furniture.cpp:567
-#: src/content_mapnode_furniture.cpp:586 src/content_mapnode_furniture.cpp:605
+#: src/content_mapnode_furniture.cpp:528 src/content_mapnode_furniture.cpp:548
+#: src/content_mapnode_furniture.cpp:568 src/content_mapnode_furniture.cpp:588
+#: src/content_mapnode_furniture.cpp:608 src/content_mapnode_furniture.cpp:628
 msgid "Orange Couch"
 msgstr "Canapé Orange"
 
-#: src/content_mapnode_furniture.cpp:628 src/content_mapnode_furniture.cpp:647
-#: src/content_mapnode_furniture.cpp:666 src/content_mapnode_furniture.cpp:685
-#: src/content_mapnode_furniture.cpp:704 src/content_mapnode_furniture.cpp:723
+#: src/content_mapnode_furniture.cpp:652 src/content_mapnode_furniture.cpp:672
+#: src/content_mapnode_furniture.cpp:692 src/content_mapnode_furniture.cpp:712
+#: src/content_mapnode_furniture.cpp:732 src/content_mapnode_furniture.cpp:752
 msgid "Purple Couch"
 msgstr "Canapé Violet"
 
-#: src/content_mapnode_furniture.cpp:746 src/content_mapnode_furniture.cpp:765
-#: src/content_mapnode_furniture.cpp:784 src/content_mapnode_furniture.cpp:803
-#: src/content_mapnode_furniture.cpp:822 src/content_mapnode_furniture.cpp:841
+#: src/content_mapnode_furniture.cpp:776 src/content_mapnode_furniture.cpp:796
+#: src/content_mapnode_furniture.cpp:816 src/content_mapnode_furniture.cpp:836
+#: src/content_mapnode_furniture.cpp:856 src/content_mapnode_furniture.cpp:876
 msgid "Red Couch"
 msgstr "Canapé Rouge"
 
-#: src/content_mapnode_furniture.cpp:864 src/content_mapnode_furniture.cpp:883
-#: src/content_mapnode_furniture.cpp:902 src/content_mapnode_furniture.cpp:921
-#: src/content_mapnode_furniture.cpp:940 src/content_mapnode_furniture.cpp:959
+#: src/content_mapnode_furniture.cpp:900 src/content_mapnode_furniture.cpp:920
+#: src/content_mapnode_furniture.cpp:940 src/content_mapnode_furniture.cpp:960
+#: src/content_mapnode_furniture.cpp:980
+#: src/content_mapnode_furniture.cpp:1000
 msgid "Yellow Couch"
 msgstr "Canapé Jaune"
 
-#: src/content_mapnode_furniture.cpp:982
-#: src/content_mapnode_furniture.cpp:1001
-#: src/content_mapnode_furniture.cpp:1020
-#: src/content_mapnode_furniture.cpp:1039
-#: src/content_mapnode_furniture.cpp:1058
-#: src/content_mapnode_furniture.cpp:1077
+#: src/content_mapnode_furniture.cpp:1024
+#: src/content_mapnode_furniture.cpp:1044
+#: src/content_mapnode_furniture.cpp:1064
+#: src/content_mapnode_furniture.cpp:1084
+#: src/content_mapnode_furniture.cpp:1104
+#: src/content_mapnode_furniture.cpp:1124
 msgid "Black Couch"
 msgstr "Canapé Noir"
 
-#: src/content_mapnode_furniture.cpp:1100
+#: src/content_mapnode_furniture.cpp:1148
+#: src/content_mapnode_furniture.cpp:1182
+#: src/content_mapnode_furniture.cpp:1206
+#: src/content_mapnode_furniture.cpp:1230
+#: src/content_mapnode_furniture.cpp:1254
+#: src/content_mapnode_furniture.cpp:1278
 msgid "Chair"
 msgstr "Chaise"
 
-#: src/content_mapnode_furniture.cpp:1149
+#: src/content_mapnode_furniture.cpp:1302
 msgid "Table"
 msgstr "Table"
 
-#: src/content_mapnode_furniture.cpp:1206
-#: src/content_mapnode_furniture.cpp:1239
+#: src/content_mapnode_furniture.cpp:1333
+#: src/content_mapnode_furniture.cpp:1366
 msgid "Bed"
 msgstr "Lit"
 
-#: src/content_mapnode_furniture.cpp:1267
-#: src/content_mapnode_furniture.cpp:1300
+#: src/content_mapnode_furniture.cpp:1394
+#: src/content_mapnode_furniture.cpp:1427
 msgid "Blue Bed"
 msgstr "Lit Bleu"
 
-#: src/content_mapnode_furniture.cpp:1328
-#: src/content_mapnode_furniture.cpp:1361
+#: src/content_mapnode_furniture.cpp:1455
+#: src/content_mapnode_furniture.cpp:1488
 msgid "Green Bed"
 msgstr "Lit Vert"
 
-#: src/content_mapnode_furniture.cpp:1389
-#: src/content_mapnode_furniture.cpp:1422
+#: src/content_mapnode_furniture.cpp:1516
+#: src/content_mapnode_furniture.cpp:1549
 msgid "Orange Bed"
 msgstr "Lit Orange"
 
-#: src/content_mapnode_furniture.cpp:1450
-#: src/content_mapnode_furniture.cpp:1483
+#: src/content_mapnode_furniture.cpp:1577
+#: src/content_mapnode_furniture.cpp:1610
 msgid "Purple Bed"
 msgstr "Lit Violet"
 
-#: src/content_mapnode_furniture.cpp:1511
-#: src/content_mapnode_furniture.cpp:1544
+#: src/content_mapnode_furniture.cpp:1638
+#: src/content_mapnode_furniture.cpp:1671
 msgid "Red Bed"
 msgstr "Lit Rouge"
 
-#: src/content_mapnode_furniture.cpp:1572
-#: src/content_mapnode_furniture.cpp:1605
+#: src/content_mapnode_furniture.cpp:1699
+#: src/content_mapnode_furniture.cpp:1732
 msgid "Yellow Bed"
 msgstr "Lit Jaune"
 
-#: src/content_mapnode_furniture.cpp:1633
-#: src/content_mapnode_furniture.cpp:1666
+#: src/content_mapnode_furniture.cpp:1760
+#: src/content_mapnode_furniture.cpp:1793
 msgid "Black Bed"
 msgstr "Lit Noir"
 
-#: src/content_mapnode_furniture.cpp:1694
-#: src/content_mapnode_furniture.cpp:1729
+#: src/content_mapnode_furniture.cpp:1821
+#: src/content_mapnode_furniture.cpp:1856
 msgid "Camp Bed"
 msgstr "Lit de Camp"
 
-#: src/content_mapnode_furniture.cpp:1753
+#: src/content_mapnode_furniture.cpp:1880
 msgid "Colorful Painting"
 msgstr "Tableau Coloré"
 
-#: src/content_mapnode_furniture.cpp:1788
+#: src/content_mapnode_furniture.cpp:1915
 msgid "Red Rose Painting"
 msgstr "Tableau Figurant une Rose Rouge"
 
-#: src/content_mapnode_furniture.cpp:1823
+#: src/content_mapnode_furniture.cpp:1950
 msgid "Field Painting"
 msgstr "Tableau Figurant un Paysage"
 
-#: src/content_mapnode_furniture.cpp:1858
+#: src/content_mapnode_furniture.cpp:1985
 msgid "Blue Flower Painting"
 msgstr "Tableau Figurant une Fleur Bleue"
 
-#: src/content_mapnode_furniture.cpp:1893
+#: src/content_mapnode_furniture.cpp:2020
 msgid "Painting Canvas"
 msgstr "Toile de Peinture"
 
-#: src/content_mapnode_furniture.cpp:1931
+#: src/content_mapnode_furniture.cpp:2058
 msgid "Clock"
 msgstr "Horloge"
 
@@ -2633,7 +2654,7 @@ msgid "Decraft Book"
 msgstr "Livre de démontage"
 
 #: src/content_mapnode_special.cpp:753 src/content_mapnode_special.cpp:948
-#: src/content_nodemeta.cpp:2693
+#: src/content_nodemeta.cpp:2694
 msgid "Diary"
 msgstr "Journal"
 
@@ -2683,11 +2704,11 @@ msgstr "Panneau"
 msgid "Locking Sign"
 msgstr ""
 
-#: src/content_mapnode_special.cpp:1286 src/content_nodemeta.cpp:500
+#: src/content_mapnode_special.cpp:1286 src/content_nodemeta.cpp:501
 msgid "Chest"
 msgstr "Coffre"
 
-#: src/content_mapnode_special.cpp:1310 src/content_nodemeta.cpp:775
+#: src/content_mapnode_special.cpp:1310 src/content_nodemeta.cpp:776
 msgid "Creative Chest"
 msgstr "Coffre de création"
 
@@ -2807,7 +2828,7 @@ msgstr ""
 msgid "Cauldron"
 msgstr "Chaudron"
 
-#: src/content_mapnode_special.cpp:2082 src/content_nodemeta.cpp:3312
+#: src/content_mapnode_special.cpp:2082 src/content_nodemeta.cpp:3313
 msgid "Forge"
 msgstr "Forge"
 
@@ -2911,563 +2932,568 @@ msgstr "Chaton Siamois"
 msgid "Ginger Kitten"
 msgstr "Chaton Roux"
 
-#: src/content_nodemeta.cpp:75 src/content_nodemeta.cpp:138
-#: src/content_nodemeta.cpp:2677 src/content_nodemeta.cpp:2776
+#: src/content_nodemeta.cpp:76 src/content_nodemeta.cpp:139
+#: src/content_nodemeta.cpp:2678 src/content_nodemeta.cpp:2777
 msgid "Save"
 msgstr "Sauvegarder"
 
-#: src/content_nodemeta.cpp:185
+#: src/content_nodemeta.cpp:186
 #, c-format
 msgid "%s's Home Flag"
 msgstr "Drapeau de Foyer de %s"
 
-#: src/content_nodemeta.cpp:269 src/content_nodemeta.cpp:282
-#: src/content_nodemeta.cpp:436 src/content_nodemeta.cpp:449
+#: src/content_nodemeta.cpp:270 src/content_nodemeta.cpp:283
+#: src/content_nodemeta.cpp:437 src/content_nodemeta.cpp:450
 msgid "You can't sleep yet."
 msgstr "Vous ne pouvez pas encore dormir."
 
-#: src/content_nodemeta.cpp:273 src/content_nodemeta.cpp:440
+#: src/content_nodemeta.cpp:274 src/content_nodemeta.cpp:441
 msgid "Go to sleep"
 msgstr "Aller dormir"
 
-#: src/content_nodemeta.cpp:278 src/content_nodemeta.cpp:445
+#: src/content_nodemeta.cpp:279 src/content_nodemeta.cpp:446
 msgid "Someone else is sleeping here."
 msgstr "Quelqu'un dort déjà ici."
 
-#: src/content_nodemeta.cpp:286 src/content_nodemeta.cpp:453
+#: src/content_nodemeta.cpp:287 src/content_nodemeta.cpp:454
 msgid "Get out of bed"
 msgstr "Sortir du lit"
 
-#: src/content_nodemeta.cpp:432
+#: src/content_nodemeta.cpp:433
 msgid "This bed is too uncomfortable to sleep in."
 msgstr "Ce lit est trop inconfortable pour dormir"
 
-#: src/content_nodemeta.cpp:573
+#: src/content_nodemeta.cpp:574
 #, c-format
 msgid "Locking Chest owned by '%s'"
 msgstr "Fermeture du Coffre '%s'"
 
-#: src/content_nodemeta.cpp:647
+#: src/content_nodemeta.cpp:648
 #, c-format
 msgid "Safe owned by '%s'"
 msgstr "Coffre Fort de '%s'"
 
-#: src/content_nodemeta.cpp:816 src/content_nodemeta.cpp:1870
-#: src/content_nodemeta.cpp:2157 src/content_nodemeta.cpp:2349
-#: src/content_nodemeta.cpp:2563
+#: src/content_nodemeta.cpp:817 src/content_nodemeta.cpp:1871
+#: src/content_nodemeta.cpp:2158 src/content_nodemeta.cpp:2350
+#: src/content_nodemeta.cpp:2564
 #, c-format
 msgid "Page %d of %d"
 msgstr "Page %d sur %d"
 
-#: src/content_nodemeta.cpp:820 src/content_nodemeta.cpp:1898
-#: src/content_nodemeta.cpp:2176 src/content_nodemeta.cpp:2358
-#: src/content_nodemeta.cpp:2579
+#: src/content_nodemeta.cpp:821 src/content_nodemeta.cpp:1899
+#: src/content_nodemeta.cpp:2177 src/content_nodemeta.cpp:2359
+#: src/content_nodemeta.cpp:2580
 msgid "<< Previous Page"
 msgstr "<< Page précédente"
 
-#: src/content_nodemeta.cpp:826 src/content_nodemeta.cpp:1904
-#: src/content_nodemeta.cpp:2182 src/content_nodemeta.cpp:2364
-#: src/content_nodemeta.cpp:2585
+#: src/content_nodemeta.cpp:827 src/content_nodemeta.cpp:1905
+#: src/content_nodemeta.cpp:2183 src/content_nodemeta.cpp:2365
+#: src/content_nodemeta.cpp:2586
 msgid "Next Page >>"
 msgstr "Page suivante >>"
 
-#: src/content_nodemeta.cpp:869
+#: src/content_nodemeta.cpp:870
 #, c-format
 msgid "Border Stone owned by '%s'"
 msgstr ""
 
-#: src/content_nodemeta.cpp:944
+#: src/content_nodemeta.cpp:945
 msgid "Furnace is overloaded"
 msgstr "Four trop chargé"
 
-#: src/content_nodemeta.cpp:945
+#: src/content_nodemeta.cpp:946
 msgid "Furnace is out of fuel"
 msgstr "Four sans combustible"
 
-#: src/content_nodemeta.cpp:947
+#: src/content_nodemeta.cpp:948
 msgid "Furnace is inactive"
 msgstr "Four inactif"
 
-#: src/content_nodemeta.cpp:950
+#: src/content_nodemeta.cpp:951
 msgid "Furnace is active"
 msgstr "Four actif"
 
-#: src/content_nodemeta.cpp:1209
+#: src/content_nodemeta.cpp:1210
 msgid "Locking Furnace is overloaded"
 msgstr "Four vérrouillé trop chargé"
 
-#: src/content_nodemeta.cpp:1210
+#: src/content_nodemeta.cpp:1211
 msgid "Locking Furnace is out of fuel"
 msgstr "Four vérrouillé sans combustible"
 
-#: src/content_nodemeta.cpp:1212
+#: src/content_nodemeta.cpp:1213
 msgid "Locking Furnace is inactive"
 msgstr "Four vérrouillé inactif"
 
-#: src/content_nodemeta.cpp:1215
+#: src/content_nodemeta.cpp:1216
 msgid "Locking Furnace is active"
 msgstr "Four vérrouillé actif"
 
-#: src/content_nodemeta.cpp:1470
+#: src/content_nodemeta.cpp:1471
 msgid "Armed Explosive: about to detonate"
 msgstr "Explosif Armé : sur le point d'exploser"
 
-#: src/content_nodemeta.cpp:1473
+#: src/content_nodemeta.cpp:1474
 #, c-format
 msgid "Armed Explosive: %d second till detonation"
 msgid_plural "Armed Explosive: %d seconds till detonation"
 msgstr[0] "Explosif armé : %d seconde avant détonation"
 msgstr[1] "Explosif armé : %d secondes avant détonation"
 
-#: src/content_nodemeta.cpp:1534 src/content_nodemeta.cpp:1539
+#: src/content_nodemeta.cpp:1535 src/content_nodemeta.cpp:1540
 msgid "Incinerator is active"
 msgstr "Incinérateur actif"
 
-#: src/content_nodemeta.cpp:1541
+#: src/content_nodemeta.cpp:1542
 msgid "Incinerator is inactive"
 msgstr "Incinérateur inactif"
 
-#: src/content_nodemeta.cpp:1633
+#: src/content_nodemeta.cpp:1634
 msgid "Add fuel, then punch to incinerate wielded item"
 msgstr "Ajouter du carburant puis frapper pour incinérer l'objet en main"
 
-#: src/content_nodemeta.cpp:1874 src/content_nodemeta.cpp:2162
+#: src/content_nodemeta.cpp:1875 src/content_nodemeta.cpp:2163
 msgid "Add item here to see recipe"
 msgstr "Ajouter objet ici pour voir la recette"
 
-#: src/content_nodemeta.cpp:1879 src/content_nodemeta.cpp:2167
+#: src/content_nodemeta.cpp:1880 src/content_nodemeta.cpp:2168
 #, c-format
 msgid "Recipe %d of %d"
 msgstr "Recette %d sur %d"
 
-#: src/content_nodemeta.cpp:1888
+#: src/content_nodemeta.cpp:1889
 msgid "Gives"
 msgstr "Donne"
 
-#: src/content_nodemeta.cpp:2353
+#: src/content_nodemeta.cpp:2354
 msgid "Add item here to see cook result"
 msgstr "Ajouter objet ici pour voir le résultat de cuisson"
 
-#: src/content_nodemeta.cpp:2567
+#: src/content_nodemeta.cpp:2568
 msgid "Add item here to see dig result"
 msgstr "Insérer objet ici pour voir résultat de fouille"
 
-#: src/content_nodemeta.cpp:2571
+#: src/content_nodemeta.cpp:2572
 msgid "Dig Result"
 msgstr "Résultat de Fouille"
 
-#: src/content_nodemeta.cpp:2575
+#: src/content_nodemeta.cpp:2576
 msgid "Random Drop"
 msgstr "Butin Aléatoire"
 
-#: src/content_nodemeta.cpp:2667 src/content_nodemeta.cpp:2766
+#: src/content_nodemeta.cpp:2668 src/content_nodemeta.cpp:2767
 msgid "Title"
 msgstr "Titre"
 
-#: src/content_nodemeta.cpp:2672 src/content_nodemeta.cpp:2771
+#: src/content_nodemeta.cpp:2673 src/content_nodemeta.cpp:2772
 msgid "Content"
 msgstr "Contenu"
 
-#: src/content_nodemeta.cpp:3127
+#: src/content_nodemeta.cpp:3128
 msgid "Cauldron is active"
 msgstr "Chaudron actif"
 
-#: src/content_nodemeta.cpp:3130
+#: src/content_nodemeta.cpp:3131
 msgid "Cauldron is hot"
 msgstr "Chaudron chaud"
 
-#: src/content_nodemeta.cpp:3132
+#: src/content_nodemeta.cpp:3133
 msgid "Cauldron is cool"
 msgstr "Chaudron froid"
 
-#: src/content_nodemeta.cpp:3134
+#: src/content_nodemeta.cpp:3135
 msgid "Cauldron is empty"
 msgstr "Chaudron vide"
 
-#: src/content_nodemeta.cpp:3138
+#: src/content_nodemeta.cpp:3139
 msgid "Cauldron is inactive"
 msgstr "Chaudron inactif"
 
-#: src/content_nodemeta.cpp:3139
+#: src/content_nodemeta.cpp:3140
 msgid "Cauldron is out of fuel"
 msgstr "Chaudron sans combustible"
 
-#: src/content_nodemeta.cpp:3218
+#: src/content_nodemeta.cpp:3219
 msgid "Add fuel, then punch to add or remove water"
 msgstr "Ajouter du carburant, puis frapper pour ajouter ou enlever l'eau"
 
-#: src/content_nodemeta.cpp:3484
+#: src/content_nodemeta.cpp:3487
 msgid "Show Enchanting"
 msgstr "Montrer Enchantement"
 
-#: src/content_nodemeta.cpp:3491 src/game.cpp:208
+#: src/content_nodemeta.cpp:3494 src/game.cpp:209
 msgid "Show Crafting"
 msgstr "Montrer Artisanat"
 
-#: src/content_toolitem.cpp:213
+#: src/content_toolitem.cpp:216
 msgid "Small Stone Pick"
 msgstr "Petite Pioche en Pierre"
 
-#: src/content_toolitem.cpp:236
+#: src/content_toolitem.cpp:239
 msgid "Stone Pick"
 msgstr "Pioche en pierre"
 
-#: src/content_toolitem.cpp:250
+#: src/content_toolitem.cpp:253
 msgid "Flint Pick"
 msgstr "Pioche en silex"
 
-#: src/content_toolitem.cpp:264
+#: src/content_toolitem.cpp:267
 msgid "Steel Pick"
 msgstr "Pioche en fer"
 
-#: src/content_toolitem.cpp:278
+#: src/content_toolitem.cpp:281
 msgid "Creative Pick"
 msgstr "Pioche Créatrice"
 
-#: src/content_toolitem.cpp:292
+#: src/content_toolitem.cpp:295
 msgid "Stone Trowel"
 msgstr "Truelle en Pierre"
 
-#: src/content_toolitem.cpp:306
+#: src/content_toolitem.cpp:309
 msgid "Stone Shovel"
 msgstr "Pelle en pierre"
 
-#: src/content_toolitem.cpp:320
+#: src/content_toolitem.cpp:323
 msgid "Flint Shovel"
 msgstr "Pelle en silex"
 
-#: src/content_toolitem.cpp:334
+#: src/content_toolitem.cpp:337
 msgid "Steel Shovel"
 msgstr "Pelle en fer"
 
-#: src/content_toolitem.cpp:348
+#: src/content_toolitem.cpp:351
 msgid "Small Stone Axe"
 msgstr "Petite Hache en Pierre"
 
-#: src/content_toolitem.cpp:369
+#: src/content_toolitem.cpp:372
 msgid "Stone Axe"
 msgstr "Hache en pierre"
 
-#: src/content_toolitem.cpp:383
+#: src/content_toolitem.cpp:386
 msgid "Flint Axe"
 msgstr "Hache en silex"
 
-#: src/content_toolitem.cpp:397
+#: src/content_toolitem.cpp:400
 msgid "Steel Axe"
 msgstr "Hache en fer"
 
-#: src/content_toolitem.cpp:411
+#: src/content_toolitem.cpp:414
 msgid "Wooden Club"
 msgstr "Massue en Bois"
 
-#: src/content_toolitem.cpp:426
+#: src/content_toolitem.cpp:429
 msgid "Stone Sword"
 msgstr "Epée en pierre"
 
-#: src/content_toolitem.cpp:440
+#: src/content_toolitem.cpp:443
 msgid "Steel Sword"
 msgstr "Epée en fer"
 
-#: src/content_toolitem.cpp:454
+#: src/content_toolitem.cpp:457
 msgid "Flint Shears"
 msgstr "Cisaille en silex"
 
-#: src/content_toolitem.cpp:468
+#: src/content_toolitem.cpp:471
 msgid "Steel Shears"
 msgstr "Cisaille en fer"
 
-#: src/content_toolitem.cpp:482
+#: src/content_toolitem.cpp:485
 msgid "Wooden Bucket"
 msgstr "Seau en bois"
 
-#: src/content_toolitem.cpp:499
+#: src/content_toolitem.cpp:502
 msgid "Tin Bucket"
 msgstr "Seau en étain"
 
-#: src/content_toolitem.cpp:515
+#: src/content_toolitem.cpp:518
 msgid "Wooden Bucket of Water"
 msgstr "Seau d'eau en bois"
 
-#: src/content_toolitem.cpp:526
+#: src/content_toolitem.cpp:529
 msgid "Tin Bucket of Water"
 msgstr "Seau d'eau en étain"
 
-#: src/content_toolitem.cpp:537
+#: src/content_toolitem.cpp:540
 msgid "Steel Bucket"
 msgstr "Seau en acier"
 
-#: src/content_toolitem.cpp:552
+#: src/content_toolitem.cpp:555
 msgid "Steel Bucket of Water"
 msgstr "Seau d'eau en acier"
 
-#: src/content_toolitem.cpp:563
+#: src/content_toolitem.cpp:566
 msgid "Steel Bucket of Lava"
 msgstr "Seau de lave en acier"
 
-#: src/content_toolitem.cpp:575
+#: src/content_toolitem.cpp:578
 msgid "Fire Starter"
 msgstr "Allume-Feu"
 
-#: src/content_toolitem.cpp:589
+#: src/content_toolitem.cpp:592
 msgid "Crowbar"
 msgstr "Pied-de-Biche"
 
-#: src/content_toolitem.cpp:602
+#: src/content_toolitem.cpp:605
 msgid "Key"
 msgstr "Clé"
 
-#: src/content_toolitem.cpp:614
+#: src/content_toolitem.cpp:617
 msgid "Stone Spear"
 msgstr "Lance en Pierre"
 
-#: src/content_toolitem.cpp:628
+#: src/content_toolitem.cpp:631
 msgid "Flint Spear"
 msgstr "Lance en Silex"
 
-#: src/content_toolitem.cpp:642
+#: src/content_toolitem.cpp:645
 msgid "Steel Spear"
 msgstr "Lance en Acier"
 
-#: src/content_toolitem.cpp:656
+#: src/content_toolitem.cpp:659
 msgid "Bow"
 msgstr "Arc"
 
-#: src/content_toolitem.cpp:676
+#: src/content_toolitem.cpp:679
 msgid "Raw Mithril Pick"
 msgstr "Pioche de Mithril Brut"
 
-#: src/content_toolitem.cpp:690
+#: src/content_toolitem.cpp:693
 msgid "Raw Mithril Shovel"
 msgstr "Pelle en Mithril Brut"
 
-#: src/content_toolitem.cpp:704
+#: src/content_toolitem.cpp:707
 msgid "Raw Mithril Axe"
 msgstr "Hache de Mithril Brut"
 
-#: src/content_toolitem.cpp:718
+#: src/content_toolitem.cpp:721
 msgid "Raw Mithril Sword"
 msgstr "Épée en Mithril Brut"
 
-#: src/content_toolitem.cpp:732
+#: src/content_toolitem.cpp:735
 msgid "Raw Mithril Spear"
 msgstr "Lance en Mithril Brut"
 
-#: src/content_toolitem.cpp:746
+#: src/content_toolitem.cpp:749
 msgid "Unbound Mithril Pick"
 msgstr "Pioche de Mithril Ordinaire"
 
-#: src/content_toolitem.cpp:760
+#: src/content_toolitem.cpp:763
 msgid "Unbound Mithril Shovel"
 msgstr "Pelle en Mithril Ordinaire"
 
-#: src/content_toolitem.cpp:774
+#: src/content_toolitem.cpp:777
 msgid "Unbound Mithril Axe"
 msgstr "Hache de Mithril Ordinaire"
 
-#: src/content_toolitem.cpp:788
+#: src/content_toolitem.cpp:791
 msgid "Unbound Mithril Sword"
 msgstr "Épée en Mithril Ordinaire"
 
-#: src/content_toolitem.cpp:802
+#: src/content_toolitem.cpp:805
 msgid "Unbound Mithril Spear"
 msgstr "Lance de Mithril Ordinaire"
 
-#: src/content_toolitem.cpp:816
+#: src/content_toolitem.cpp:819
 msgid "Mithril Pick"
 msgstr "Pioche de Mithril"
 
-#: src/content_toolitem.cpp:831
+#: src/content_toolitem.cpp:834
 msgid "Mithril Shovel"
 msgstr "Pelle en Mithril"
 
-#: src/content_toolitem.cpp:845
+#: src/content_toolitem.cpp:848
 msgid "Mithril Axe"
 msgstr "Hache de Mithril"
 
-#: src/content_toolitem.cpp:859
+#: src/content_toolitem.cpp:862
 msgid "Mithril Sword"
 msgstr "Épée en Mithril"
 
-#: src/content_toolitem.cpp:873
+#: src/content_toolitem.cpp:876
 msgid "Mithril Spear"
 msgstr "Lance en Mithril"
 
-#: src/content_toolitem.cpp:887
+#: src/content_toolitem.cpp:890
 msgid "Mob Spawner"
 msgstr "Spawner de Mob"
 
-#: src/game.cpp:209
+#: src/content_toolitem.cpp:909
+#, fuzzy
+msgid "Mithril Key"
+msgstr "Hache de Mithril"
+
+#: src/game.cpp:210
 msgid "Clothes"
 msgstr "Vêtements"
 
-#: src/game.cpp:210
+#: src/game.cpp:211
 msgid "Hat/Helmet"
 msgstr "Chapeau/Casque"
 
-#: src/game.cpp:212
+#: src/game.cpp:213
 msgid "Jacket"
 msgstr "Veste"
 
-#: src/game.cpp:214
+#: src/game.cpp:215
 msgid "Decorative"
 msgstr "Décoration"
 
-#: src/game.cpp:216
+#: src/game.cpp:217
 msgid "Shirt"
 msgstr "Chemise"
 
-#: src/game.cpp:218
+#: src/game.cpp:219
 msgid "Belt"
 msgstr "Ceinture"
 
-#: src/game.cpp:220
+#: src/game.cpp:221
 msgid "Pants"
 msgstr "Pantalon"
 
-#: src/game.cpp:222
+#: src/game.cpp:223
 msgid "Boots"
 msgstr "Bottes"
 
-#: src/game.cpp:229
+#: src/game.cpp:230
 msgid "Drop to Ground"
 msgstr "Jeter au Sol"
 
-#: src/game.cpp:231
+#: src/game.cpp:232
 msgid "Change Clothing"
 msgstr "Changer de Vêtements"
 
-#: src/game.cpp:590
+#: src/game.cpp:591
 msgid "Loading"
 msgstr "Chargement"
 
-#: src/game.cpp:662
+#: src/game.cpp:663
 msgid "Loading..."
 msgstr "Chargement..."
 
-#: src/game.cpp:671
+#: src/game.cpp:672
 msgid "Creating server..."
 msgstr "Création du serveur..."
 
-#: src/game.cpp:682
+#: src/game.cpp:683
 msgid "Creating client..."
 msgstr "Création du client..."
 
-#: src/game.cpp:687
+#: src/game.cpp:688
 msgid "Resolving address..."
 msgstr "Résolution de l'adresse..."
 
-#: src/game.cpp:698
+#: src/game.cpp:699
 msgid "Couldn't resolve address"
 msgstr "Impossible de résoudre l'adresse"
 
-#: src/game.cpp:738
+#: src/game.cpp:739
 #, c-format
 msgid "Connecting to server... (timeout in %d second)"
 msgid_plural "Connecting to server... (timeout in %d seconds)"
 msgstr[0] "Connection au serveur... (expiré dans %d seconde)"
 msgstr[1] "Connection au serveur... (expiré dans %d secondes)"
 
-#: src/game.cpp:767
+#: src/game.cpp:768
 #, c-format
 msgid "Access denied. Reason: %ls"
 msgstr "Acces interdit. Raison: %ls"
 
-#: src/game.cpp:771
+#: src/game.cpp:772
 msgid "Unable to Connect (port already in use?)."
 msgstr "Connexion impossible (port déjà utilisé ?)."
 
-#: src/game.cpp:774
+#: src/game.cpp:775
 msgid "Connection timed out."
 msgstr "Connection expiré"
 
-#: src/game.cpp:927
+#: src/game.cpp:928
 msgid "Access denied. Reason: "
 msgstr "Acces interdit. Raison:"
 
-#: src/game.cpp:1161
+#: src/game.cpp:1162
 msgid "free_move disabled"
 msgstr "Mouvement libre désactivé"
 
-#: src/game.cpp:1165
+#: src/game.cpp:1166
 msgid "free_move enabled"
 msgstr "Mouvement libre activé"
 
-#: src/game.cpp:1177
+#: src/game.cpp:1178
 #, c-format
 msgid "Saved screenshot to '%s'"
 msgstr "Enregistrement de la capture d'écran dans '%s'"
 
-#: src/game.cpp:1189
+#: src/game.cpp:1190
 msgid "HUD shown"
 msgstr "HUD affiché"
 
-#: src/game.cpp:1191
+#: src/game.cpp:1192
 msgid "HUD hidden"
 msgstr "HUD caché"
 
-#: src/game.cpp:1197
+#: src/game.cpp:1198
 msgid "Chat shown"
 msgstr "Caht affiché"
 
-#: src/game.cpp:1199
+#: src/game.cpp:1200
 msgid "Chat hidden"
 msgstr "Chat caché"
 
-#: src/game.cpp:1205
+#: src/game.cpp:1206
 msgid "Fog disabled"
 msgstr "Brouillard désactivé"
 
-#: src/game.cpp:1207
+#: src/game.cpp:1208
 msgid "Fog enabled"
 msgstr "Brouillard activé"
 
-#: src/game.cpp:1213
+#: src/game.cpp:1214
 msgid "Camera update disabled"
 msgstr "Mise à jour de la Caméra Désactivée"
 
-#: src/game.cpp:1215
+#: src/game.cpp:1216
 msgid "Camera update enabled"
 msgstr "Mise à jour de la Caméra Activée"
 
-#: src/game.cpp:1225
+#: src/game.cpp:1226
 msgid "Debug info shown"
 msgstr "Affichage des infos de debug"
 
-#: src/game.cpp:1230
+#: src/game.cpp:1231
 msgid "Debug info and frametime graph hidden"
 msgstr "Info de debug et graph de temps de frame cachés"
 
-#: src/game.cpp:1234
+#: src/game.cpp:1235
 msgid "Frametime graph shown"
 msgstr "Graph de temps de frame visible"
 
-#: src/game.cpp:1246
+#: src/game.cpp:1247
 #, c-format
 msgid "Profiler shown (page %d of %d)"
 msgstr ""
 
-#: src/game.cpp:1250
+#: src/game.cpp:1251
 msgid "Profiler hidden"
 msgstr ""
 
-#: src/game.cpp:1258 src/game.cpp:1269
+#: src/game.cpp:1259 src/game.cpp:1270
 #, c-format
 msgid "Minimum viewing range changed to %d"
 msgstr "Champs de vision minimal changé pour %d"
 
-#: src/game.cpp:1338
+#: src/game.cpp:1339
 msgid "Enabled full viewing range"
 msgstr "Champs de vision entier activé"
 
-#: src/game.cpp:1342
+#: src/game.cpp:1343
 msgid "Disabled full viewing range"
 msgstr "Champs de vision entier désactivé"
 
-#: src/game.cpp:1995
+#: src/game.cpp:1950
 msgid "Disconnected (Network Timeout)"
 msgstr "Deconnectez (Réseau Timeout)"
 
-#: src/game.cpp:2407
+#: src/game.cpp:2382
 msgid "Shutting down..."
 msgstr "Exctinction..."
 
@@ -3481,242 +3507,299 @@ msgstr "Respawn"
 
 #: src/guiFormSpecMenu.cpp:436
 msgid "Left click: Move all items, Right click: Move single item"
-msgstr "Clic gauche: Déplace tout les objets, clic droit: Déplace un seul objet"
+msgstr ""
+"Clic gauche: Déplace tout les objets, clic droit: Déplace un seul objet"
 
 #: src/guiFormSpecMenu.cpp:458
 msgid "Write It"
 msgstr "Ecrire ici"
 
-#: src/guiMainMenu.cpp:347
+#: src/guiMainMenu.cpp:319
 msgid "Character Creator"
 msgstr "Créateur de personnage"
 
-#: src/guiMainMenu.cpp:353 src/guiMainMenu.cpp:478 src/guiMainMenu.cpp:520
-#: src/guiMainMenu.cpp:631
+#: src/guiMainMenu.cpp:325 src/guiMainMenu.cpp:386 src/guiMainMenu.cpp:428
+#: src/guiMainMenu.cpp:539
 msgid "Single Player"
 msgstr "Solo"
 
-#: src/guiMainMenu.cpp:359 src/guiMainMenu.cpp:410
+#: src/guiMainMenu.cpp:331 src/guiMultiplayerMenu.cpp:161
 msgid "Multi Player"
 msgstr "Multi joueurs"
 
-#: src/guiMainMenu.cpp:365 src/guiPauseMenu.cpp:155
+#: src/guiMainMenu.cpp:337 src/guiPauseMenu.cpp:155
 msgid "Settings"
 msgstr "Options"
 
-#: src/guiMainMenu.cpp:371
+#: src/guiMainMenu.cpp:343
 msgid "Credits"
 msgstr "Crédits"
 
-#: src/guiMainMenu.cpp:377
+#: src/guiMainMenu.cpp:349
 msgid "Quit"
 msgstr "Quitter"
 
-#: src/guiMainMenu.cpp:418
-msgid "Name/Password"
-msgstr "Pseudo/Mot de passe"
-
-#: src/guiMainMenu.cpp:446
-msgid "Address/Port"
-msgstr "Adresse/Port"
-
-#: src/guiMainMenu.cpp:472
-msgid "Connect"
-msgstr "Connection"
-
-#: src/guiMainMenu.cpp:487 src/guiMainMenu.cpp:529 src/guiMainMenu.cpp:640
+#: src/guiMainMenu.cpp:395 src/guiMainMenu.cpp:437 src/guiMainMenu.cpp:548
 msgid "Creative Mode"
 msgstr "Mode créatif"
 
-#: src/guiMainMenu.cpp:488 src/guiMainMenu.cpp:530 src/guiMainMenu.cpp:641
+#: src/guiMainMenu.cpp:396 src/guiMainMenu.cpp:438 src/guiMainMenu.cpp:549
 msgid "Adventure Mode"
 msgstr "Mode aventure"
 
-#: src/guiMainMenu.cpp:489 src/guiMainMenu.cpp:531 src/guiMainMenu.cpp:642
+#: src/guiMainMenu.cpp:397 src/guiMainMenu.cpp:439 src/guiMainMenu.cpp:550
 msgid "Survival Mode"
 msgstr "Mode survie"
 
-#: src/guiMainMenu.cpp:502 src/guiMainMenu.cpp:655
+#: src/guiMainMenu.cpp:410 src/guiMainMenu.cpp:563
 msgid "Advanced Settings"
 msgstr "Options avancées"
 
-#: src/guiMainMenu.cpp:508 src/guiMainMenu.cpp:550
+#: src/guiMainMenu.cpp:416 src/guiMainMenu.cpp:458
 msgid "Map Options"
 msgstr "Options de carte"
 
-#: src/guiMainMenu.cpp:514 src/guiMainMenu.cpp:625 src/guiMainMenu.cpp:750
+#: src/guiMainMenu.cpp:422 src/guiMainMenu.cpp:533 src/guiMainMenu.cpp:658
 msgid "Start Game"
 msgstr "Démarrer le jeu"
 
-#: src/guiMainMenu.cpp:544
+#: src/guiMainMenu.cpp:452
 msgid "Hide Advanced Settings"
 msgstr "Cacher les options avancées"
 
-#: src/guiMainMenu.cpp:555
+#: src/guiMainMenu.cpp:463
 msgid "Creatures"
 msgstr "Créatures"
 
-#: src/guiMainMenu.cpp:562
+#: src/guiMainMenu.cpp:470
 msgid "None"
 msgstr "Aucun"
 
-#: src/guiMainMenu.cpp:563
+#: src/guiMainMenu.cpp:471
 msgid "Passive"
 msgstr "Passive"
 
-#: src/guiMainMenu.cpp:564
+#: src/guiMainMenu.cpp:472
 msgid "Passive & Aggressive"
 msgstr "Passive & Agressive"
 
-#: src/guiMainMenu.cpp:565
+#: src/guiMainMenu.cpp:473
 msgid "Passive, Aggressive, & Destructive"
 msgstr "Passive, Agressive, & Destructive"
 
-#: src/guiMainMenu.cpp:579
+#: src/guiMainMenu.cpp:487
 msgid "Player Damage"
 msgstr "Blessure sur joueur"
 
-#: src/guiMainMenu.cpp:584
+#: src/guiMainMenu.cpp:492
 msgid "Suffocation/Drowning"
 msgstr "Asphyxie/Noyade"
 
-#: src/guiMainMenu.cpp:589
+#: src/guiMainMenu.cpp:497
 msgid "Hunger"
 msgstr "Faim"
 
-#: src/guiMainMenu.cpp:594
+#: src/guiMainMenu.cpp:502
 msgid "Tool Wear"
 msgstr "Usure d'Outil"
 
-#: src/guiMainMenu.cpp:599
+#: src/guiMainMenu.cpp:507
 msgid "Dangerous Fire"
 msgstr "Feu Dangereux"
 
-#: src/guiMainMenu.cpp:604
+#: src/guiMainMenu.cpp:512
 msgid "Infinite Inventory"
 msgstr "Inventaire infini"
 
-#: src/guiMainMenu.cpp:609
+#: src/guiMainMenu.cpp:517
 msgid "Initial Inventory"
 msgstr "Inventaire initial"
 
-#: src/guiMainMenu.cpp:614
+#: src/guiMainMenu.cpp:522
 msgid "Droppable Inventory"
 msgstr "Inventaire jetable"
 
-#: src/guiMainMenu.cpp:619
+#: src/guiMainMenu.cpp:527
 msgid "Death drops Inventory"
 msgstr "Inventaire Perdu lors de la Mort"
 
-#: src/guiMainMenu.cpp:661
+#: src/guiMainMenu.cpp:569
 msgid "Hide Map Options"
 msgstr "Cacher les options de carte"
 
-#: src/guiMainMenu.cpp:666
+#: src/guiMainMenu.cpp:574
 msgid "Create New Map"
 msgstr "Créer nouvelle carte"
 
-#: src/guiMainMenu.cpp:672
+#: src/guiMainMenu.cpp:580
 msgid "Warning! Your old map will be deleted!"
 msgstr "Attention! votre ancienne carte va être supprimée"
 
-#: src/guiMainMenu.cpp:678
+#: src/guiMainMenu.cpp:586
 msgid "Map Type"
 msgstr "Type de carte"
 
-#: src/guiMainMenu.cpp:685
+#: src/guiMainMenu.cpp:593
 msgid "Flat"
 msgstr "Plat"
 
-#: src/guiMainMenu.cpp:686
+#: src/guiMainMenu.cpp:594
 msgid "Flatter"
 msgstr "Plus plat"
 
-#: src/guiMainMenu.cpp:687
+#: src/guiMainMenu.cpp:595
 msgid "Smoother"
 msgstr "Plus doux"
 
-#: src/guiMainMenu.cpp:688
+#: src/guiMainMenu.cpp:596
 msgid "Default"
 msgstr "Défaut"
 
-#: src/guiMainMenu.cpp:689
+#: src/guiMainMenu.cpp:597
 msgid "Hilly"
 msgstr "Vallonné"
 
-#: src/guiMainMenu.cpp:690
+#: src/guiMainMenu.cpp:598
 msgid "Mountains"
 msgstr "Montagnes"
 
-#: src/guiMainMenu.cpp:691
+#: src/guiMainMenu.cpp:599
 msgid "Crazy"
 msgstr "Montagnes"
 
-#: src/guiMainMenu.cpp:692
+#: src/guiMainMenu.cpp:600
 msgid "Crazy Hills"
 msgstr "Collines Démentes"
 
-#: src/guiMainMenu.cpp:714
+#: src/guiMainMenu.cpp:622
 msgid "Use Fixed Seed"
 msgstr "Utiliser une Seed Fixe"
 
-#: src/guiMainMenu.cpp:720
+#: src/guiMainMenu.cpp:628
 msgid "Map Seed"
 msgstr "Seed de la carte"
 
-#: src/guiMainMenu.cpp:737
+#: src/guiMainMenu.cpp:645
 msgid "Clear Map"
 msgstr "Effacer carte"
 
-#: src/guiMainMenu.cpp:742
+#: src/guiMainMenu.cpp:650
 msgid "Warning! This will delete all construction from your map!"
-msgstr "Attention! Vous allez supprimer toutes les constructions de votre carte!"
+msgstr ""
+"Attention! Vous allez supprimer toutes les constructions de votre carte!"
 
-#: src/guiMainMenu.cpp:760
+#: src/guiMainMenu.cpp:668
 msgid ""
 "Voxelands\n"
 "http://www.voxelands.com/\n"
 "By Lisa 'darkrose' Milne <lisa@ltmnet.com> and contributors."
-msgstr "Voxelands\nhttp://www.voxelands.com/\nPar Lisa 'darkrose' Milne <lisa@ltmnet.com> et contributeurs."
+msgstr ""
+"Voxelands\n"
+"http://www.voxelands.com/\n"
+"Par Lisa 'darkrose' Milne <lisa@ltmnet.com> et contributeurs."
 
-#: src/guiMainMenu.cpp:767
+#: src/guiMainMenu.cpp:675
 msgid "Programmers"
 msgstr "Programmeurs"
 
-#: src/guiMainMenu.cpp:770
+#: src/guiMainMenu.cpp:678
 msgid "Artists and Modellers"
 msgstr "Artistes et Modélistes"
 
-#: src/guiMainMenu.cpp:773
+#: src/guiMainMenu.cpp:681
 msgid "Translators"
 msgstr "Traducteurs"
 
-#: src/guiMainMenu.cpp:776
+#: src/guiMainMenu.cpp:684
 msgid "Documentation Writters"
 msgstr "Auteurs de la Documentation"
 
-#: src/guiMainMenu.cpp:779
+#: src/guiMainMenu.cpp:687
 msgid "Testers, Packagers, and Builders"
 msgstr "Testeurs, Packagers et Builders"
 
-#: src/guiMainMenu.cpp:782
+#: src/guiMainMenu.cpp:690
 msgid "Music and Sound Effects Composers"
 msgstr "Compositeurs pour la Musique et le Son"
 
-#: src/guiMainMenu.cpp:785
+#: src/guiMainMenu.cpp:693
 msgid "Other Contributers, and Special Thanks"
 msgstr "Autres Contributeurs et Remerciements Spéciaux"
 
-#: src/guiMainMenu.cpp:789
+#: src/guiMainMenu.cpp:697
 msgid ""
 "Based on Minetest-C55 by Perttu Ahola <celeron55@gmail.com>\n"
-"and contributors: PilzAdam, Taoki, tango_, kahrl (kaaaaaahrl?), darkrose, matttpt, erlehmann, SpeedProg, JacobF, teddydestodes, marktraceur, Jonathan Neuschafer, thexyz, VanessaE, sfan5... and tens of more random people."
-msgstr "Basé sur Minetest-C55 par Perttu Ahola <celeron55@gmail.com>\net contributeurs : PilzAdam, Taoki, tango_, kahrl (kaaaaaahrl?), darkrose, matttpt, erlehmann, SpeedProg, JacobF, teddydestodes, marktraceur, Jonathan Neuschafer, thexyz, VanessaE, sfan5... et des dizaines d'autres gens plus divers les uns que les autres."
+"and contributors: PilzAdam, Taoki, tango_, kahrl (kaaaaaahrl?), darkrose, "
+"matttpt, erlehmann, SpeedProg, JacobF, teddydestodes, marktraceur, Jonathan "
+"Neuschafer, thexyz, VanessaE, sfan5... and tens of more random people."
+msgstr ""
+"Basé sur Minetest-C55 par Perttu Ahola <celeron55@gmail.com>\n"
+"et contributeurs : PilzAdam, Taoki, tango_, kahrl (kaaaaaahrl?), darkrose, "
+"matttpt, erlehmann, SpeedProg, JacobF, teddydestodes, marktraceur, Jonathan "
+"Neuschafer, thexyz, VanessaE, sfan5... et des dizaines d'autres gens plus "
+"divers les uns que les autres."
 
 #: src/guiMessageMenu.cpp:112 src/guiPauseMenu.cpp:143
 msgid "Continue"
 msgstr "Continuer"
 
+#: src/guiMultiplayerMenu.cpp:135 src/guiSettingsMenu.cpp:277
+msgid "Main Menu"
+msgstr "Menu principal"
+
+#: src/guiMultiplayerMenu.cpp:142
+msgid "All Servers"
+msgstr ""
+
+#: src/guiMultiplayerMenu.cpp:148
+msgid "Favourite Servers"
+msgstr ""
+
+#: src/guiMultiplayerMenu.cpp:154
+#, fuzzy
+msgid "Custom Connect"
+msgstr "Connection"
+
+#: src/guiMultiplayerMenu.cpp:169
+msgid "Custom Connection"
+msgstr ""
+
+#: src/guiMultiplayerMenu.cpp:176
+msgid "Address/Port"
+msgstr "Adresse/Port"
+
+#: src/guiMultiplayerMenu.cpp:201 src/guiMultiplayerMenu.cpp:313
+msgid "Add to Favourites"
+msgstr ""
+
+#: src/guiMultiplayerMenu.cpp:206 src/guiMultiplayerMenu.cpp:320
+msgid "Connect"
+msgstr "Connection"
+
+#: src/guiMultiplayerMenu.cpp:213
+msgid "Name/Password"
+msgstr "Pseudo/Mot de passe"
+
+#: src/guiMultiplayerMenu.cpp:240
+msgid "Join Server"
+msgstr ""
+
+#: src/guiMultiplayerMenu.cpp:262
+msgid "My Favourites"
+msgstr ""
+
+#: src/guiMultiplayerMenu.cpp:265
+msgid "Server List"
+msgstr ""
+
+#: src/guiMultiplayerMenu.cpp:270
+msgid "Get New List"
+msgstr ""
+
+#: src/guiMultiplayerMenu.cpp:307
+msgid "Remove from Favourites"
+msgstr ""
+
 #: src/guiPasswordChange.cpp:105
 msgid "Old Password"
 msgstr "Ancien mot de passe"
@@ -3757,11 +3840,11 @@ msgstr "Avant"
 msgid "Backward"
 msgstr "Arrière"
 
-#: src/guiSettingsMenu.cpp:72 src/keycode.cpp:234
+#: src/guiSettingsMenu.cpp:72 src/keycode.cpp:263
 msgid "Left"
 msgstr "Gauche"
 
-#: src/guiSettingsMenu.cpp:73 src/keycode.cpp:234
+#: src/guiSettingsMenu.cpp:73 src/keycode.cpp:265
 msgid "Right"
 msgstr "Droite"
 
@@ -3797,11 +3880,11 @@ msgstr ""
 msgid "Toggle Fly"
 msgstr "(Dés)Activer Vol"
 
-#: src/guiSettingsMenu.cpp:82 src/keycode.cpp:234
+#: src/guiSettingsMenu.cpp:82 src/keycode.cpp:264
 msgid "Up"
 msgstr "Monter"
 
-#: src/guiSettingsMenu.cpp:83 src/keycode.cpp:234
+#: src/guiSettingsMenu.cpp:83 src/keycode.cpp:266
 msgid "Down"
 msgstr "Descendre"
 
@@ -3845,10 +3928,6 @@ msgstr "Objet précedent"
 msgid "Next Item"
 msgstr "Objet suivant"
 
-#: src/guiSettingsMenu.cpp:277
-msgid "Main Menu"
-msgstr "Menu principal"
-
 #: src/guiSettingsMenu.cpp:284 src/guiSettingsMenu.cpp:311
 msgid "Controls"
 msgstr "Touches"
@@ -3956,362 +4035,576 @@ msgstr "Boost d'Énergie : %d:%02d"
 msgid "Cold Protection: %d:%02d"
 msgstr "Protection Contre le Froid : %d:%02d"
 
-#: src/inventory.cpp:230 src/inventory.cpp:352
-msgid "Cookable: Yes"
-msgstr "Cuisable : Oui"
-
-#: src/inventory.cpp:235 src/inventory.cpp:357 src/inventory.cpp:532
-msgid "Fuel Burn Time: "
-msgstr "Temps de Combustion :"
-
-#: src/inventory.cpp:321
-msgid "Hunger: "
-msgstr "Faim :"
-
-#: src/inventory.cpp:327
-msgid "Health: "
-msgstr "Santé :"
-
-#: src/inventory.cpp:334
-msgid "Cold Protection: "
-msgstr "Protection Contre le Froid :"
-
-#: src/inventory.cpp:343
-msgid "Energy Boost: "
-msgstr "Boost d'Énergie"
-
-#: src/inventory.cpp:521
-msgid "Strength: "
-msgstr "Force :"
-
-#: src/inventory.cpp:524
-msgid "Speed: "
-msgstr "Vitesse :"
-
-#: src/inventory.cpp:527
-msgid "Level: "
-msgstr "Niveau :"
-
-#: src/inventory.cpp:557
+#: src/inventory.cpp:246 src/inventory.cpp:580
 msgid "Contains: "
 msgstr "Contiens :"
 
-#: src/inventory.cpp:643
+#: src/inventory.cpp:253 src/inventory.cpp:375
+msgid "Cookable: Yes"
+msgstr "Cuisable : Oui"
+
+#: src/inventory.cpp:258 src/inventory.cpp:380 src/inventory.cpp:555
+msgid "Fuel Burn Time: "
+msgstr "Temps de Combustion :"
+
+#: src/inventory.cpp:344
+msgid "Hunger: "
+msgstr "Faim :"
+
+#: src/inventory.cpp:350
+msgid "Health: "
+msgstr "Santé :"
+
+#: src/inventory.cpp:357
+msgid "Cold Protection: "
+msgstr "Protection Contre le Froid :"
+
+#: src/inventory.cpp:366
+msgid "Energy Boost: "
+msgstr "Boost d'Énergie"
+
+#: src/inventory.cpp:544
+msgid "Strength: "
+msgstr "Force :"
+
+#: src/inventory.cpp:547
+msgid "Speed: "
+msgstr "Vitesse :"
+
+#: src/inventory.cpp:550
+msgid "Level: "
+msgstr "Niveau :"
+
+#: src/inventory.cpp:666
 msgid "Armour: "
 msgstr "Armure :"
 
-#: src/inventory.cpp:649
+#: src/inventory.cpp:672
 msgid "Warmth: "
 msgstr "Chaleur :"
 
-#: src/inventory.cpp:655
+#: src/inventory.cpp:678
 msgid "Pressure: "
 msgstr "Pression :"
 
-#: src/inventory.cpp:661
+#: src/inventory.cpp:684
 msgid "Suffocation: "
 msgstr "Asphyxie :"
 
-#: src/inventory.cpp:667
+#: src/inventory.cpp:690
 msgid "Durability: "
 msgstr "Durabilité :"
 
-#: src/inventory.cpp:672
+#: src/inventory.cpp:695
 msgid "Effect Boost: "
 msgstr "Boost d'Effet :"
 
-#: src/keycode.cpp:229
+#: src/keycode.cpp:232
+msgid "-"
+msgstr ""
+
+#: src/keycode.cpp:234
 msgid "Left Button"
 msgstr "Bouton gauche"
 
-#: src/keycode.cpp:229
-msgid "Middle Button"
-msgstr "Bouton du milieu"
-
-#: src/keycode.cpp:229
+#: src/keycode.cpp:235
 msgid "Right Button"
 msgstr "Bouton droit"
 
-#: src/keycode.cpp:229
+#: src/keycode.cpp:237
+msgid "Middle Button"
+msgstr "Bouton du milieu"
+
+#: src/keycode.cpp:238
 msgid "X Button 1"
 msgstr "Bouton X 1"
 
-#: src/keycode.cpp:230
-msgid "Back"
-msgstr "Retour Arrière"
-
-#: src/keycode.cpp:230
-msgid "Clear"
-msgstr ""
-
-#: src/keycode.cpp:230
-msgid "Return"
-msgstr "Entrée"
-
-#: src/keycode.cpp:230
-msgid "Tab"
-msgstr "Tab"
-
-#: src/keycode.cpp:230
+#: src/keycode.cpp:239
 msgid "X Button 2"
 msgstr "Bouton X 2"
 
-#: src/keycode.cpp:231
-msgid "Capital"
+#: src/keycode.cpp:240
+msgid "Back"
+msgstr "Retour Arrière"
+
+#: src/keycode.cpp:241
+msgid "Tab"
+msgstr "Tab"
+
+#: src/keycode.cpp:242
+msgid "Clear"
 msgstr ""
 
-#: src/keycode.cpp:231
-msgid "Control"
-msgstr "Contrôle"
+#: src/keycode.cpp:243
+msgid "Return"
+msgstr "Entrée"
 
-#: src/keycode.cpp:231
-msgid "Kana"
-msgstr ""
-
-#: src/keycode.cpp:231
-msgid "Menu"
-msgstr "Menu"
-
-#: src/keycode.cpp:231
-msgid "Pause"
-msgstr "Pause"
-
-#: src/keycode.cpp:231
+#: src/keycode.cpp:244
 msgid "Shift"
 msgstr "Shift"
 
-#: src/keycode.cpp:232
-msgid "Convert"
+#: src/keycode.cpp:245
+msgid "Control"
+msgstr "Contrôle"
+
+#: src/keycode.cpp:246
+msgid "Menu"
+msgstr "Menu"
+
+#: src/keycode.cpp:247
+msgid "Pause"
+msgstr "Pause"
+
+#: src/keycode.cpp:248
+msgid "Capital"
 msgstr ""
 
-#: src/keycode.cpp:232
-msgid "Escape"
-msgstr "Echape"
-
-#: src/keycode.cpp:232
-msgid "Final"
+#: src/keycode.cpp:249
+msgid "Kana"
 msgstr ""
 
-#: src/keycode.cpp:232
+#: src/keycode.cpp:250
 msgid "Junja"
 msgstr ""
 
-#: src/keycode.cpp:232
+#: src/keycode.cpp:251
+msgid "Final"
+msgstr ""
+
+#: src/keycode.cpp:252
 msgid "Kanji"
 msgstr ""
 
-#: src/keycode.cpp:232
+#: src/keycode.cpp:253
+msgid "Escape"
+msgstr "Echape"
+
+#: src/keycode.cpp:254
+msgid "Convert"
+msgstr ""
+
+#: src/keycode.cpp:255
 msgid "Nonconvert"
 msgstr ""
 
-#: src/keycode.cpp:233
+#: src/keycode.cpp:256
 msgid "Accept"
 msgstr "Accepter"
 
-#: src/keycode.cpp:233
-msgid "End"
-msgstr "Fin"
-
-#: src/keycode.cpp:233
-msgid "Home"
-msgstr ""
-
-#: src/keycode.cpp:233
+#: src/keycode.cpp:257
 msgid "Mode Change"
 msgstr ""
 
-#: src/keycode.cpp:233
-msgid "Next"
-msgstr "Suivant"
-
-#: src/keycode.cpp:233
-msgid "Prior"
-msgstr ""
-
-#: src/keycode.cpp:233
+#: src/keycode.cpp:258
 msgid "Space"
 msgstr "Esapce"
 
-#: src/keycode.cpp:234
-msgid "Execute"
+#: src/keycode.cpp:259
+msgid "Prior"
 msgstr ""
 
-#: src/keycode.cpp:234
-msgid "Print"
-msgstr "Imprimer"
+#: src/keycode.cpp:260
+msgid "Next"
+msgstr "Suivant"
 
-#: src/keycode.cpp:234
+#: src/keycode.cpp:261
+msgid "End"
+msgstr "Fin"
+
+#: src/keycode.cpp:262
+msgid "Home"
+msgstr ""
+
+#: src/keycode.cpp:267
 msgid "Select"
 msgstr ""
 
-#: src/keycode.cpp:235
-msgid "Delete"
-msgstr "Effacer"
+#: src/keycode.cpp:268
+msgid "Print"
+msgstr "Imprimer"
 
-#: src/keycode.cpp:235
-msgid "Help"
-msgstr "Aide"
-
-#: src/keycode.cpp:235
-msgid "Insert"
+#: src/keycode.cpp:269
+msgid "Execute"
 msgstr ""
 
-#: src/keycode.cpp:235
+#: src/keycode.cpp:270
 msgid "Snapshot"
 msgstr ""
 
-#: src/keycode.cpp:238
+#: src/keycode.cpp:271
+msgid "Insert"
+msgstr ""
+
+#: src/keycode.cpp:272
+msgid "Delete"
+msgstr "Effacer"
+
+#: src/keycode.cpp:273
+msgid "Help"
+msgstr "Aide"
+
+#: src/keycode.cpp:274
+msgid "0"
+msgstr ""
+
+#: src/keycode.cpp:275
+msgid "1"
+msgstr ""
+
+#: src/keycode.cpp:276
+msgid "2"
+msgstr ""
+
+#: src/keycode.cpp:277
+msgid "3"
+msgstr ""
+
+#: src/keycode.cpp:278
+msgid "4"
+msgstr ""
+
+#: src/keycode.cpp:279
+msgid "5"
+msgstr ""
+
+#: src/keycode.cpp:280
+msgid "6"
+msgstr ""
+
+#: src/keycode.cpp:281
+msgid "7"
+msgstr ""
+
+#: src/keycode.cpp:282
+msgid "8"
+msgstr ""
+
+#: src/keycode.cpp:283
+msgid "9"
+msgstr ""
+
+#: src/keycode.cpp:284
+msgid "A"
+msgstr ""
+
+#: src/keycode.cpp:285
+msgid "B"
+msgstr ""
+
+#: src/keycode.cpp:286
+msgid "C"
+msgstr ""
+
+#: src/keycode.cpp:287
+msgid "D"
+msgstr ""
+
+#: src/keycode.cpp:288
+msgid "E"
+msgstr ""
+
+#: src/keycode.cpp:289
+msgid "F"
+msgstr ""
+
+#: src/keycode.cpp:290
+msgid "G"
+msgstr ""
+
+#: src/keycode.cpp:291
+msgid "H"
+msgstr ""
+
+#: src/keycode.cpp:292
+msgid "I"
+msgstr ""
+
+#: src/keycode.cpp:293
+msgid "J"
+msgstr ""
+
+#: src/keycode.cpp:294
+msgid "K"
+msgstr ""
+
+#: src/keycode.cpp:295
+msgid "L"
+msgstr ""
+
+#: src/keycode.cpp:296
+msgid "M"
+msgstr ""
+
+#: src/keycode.cpp:297
+msgid "N"
+msgstr ""
+
+#: src/keycode.cpp:298
+msgid "O"
+msgstr ""
+
+#: src/keycode.cpp:299
+msgid "P"
+msgstr ""
+
+#: src/keycode.cpp:300
+msgid "Q"
+msgstr ""
+
+#: src/keycode.cpp:301
+msgid "R"
+msgstr ""
+
+#: src/keycode.cpp:302
+msgid "S"
+msgstr ""
+
+#: src/keycode.cpp:303
+msgid "T"
+msgstr ""
+
+#: src/keycode.cpp:304
+#, fuzzy
+msgid "U"
+msgstr "Monter"
+
+#: src/keycode.cpp:305
+msgid "V"
+msgstr ""
+
+#: src/keycode.cpp:306
+msgid "W"
+msgstr ""
+
+#: src/keycode.cpp:307
+msgid "X"
+msgstr ""
+
+#: src/keycode.cpp:308
+msgid "Y"
+msgstr ""
+
+#: src/keycode.cpp:309
+msgid "Z"
+msgstr ""
+
+#: src/keycode.cpp:310
 msgid "Left Windows"
 msgstr "Windows gauche"
 
-#: src/keycode.cpp:239
-msgid "Apps"
-msgstr ""
-
-#: src/keycode.cpp:239
-msgid "Numpad 0"
-msgstr "Pavé Numérique 0"
-
-#: src/keycode.cpp:239
-msgid "Numpad 1"
-msgstr "Pavé Numérique 1"
-
-#: src/keycode.cpp:239
+#: src/keycode.cpp:311
 msgid "Right Windows"
 msgstr "Windows droit"
 
-#: src/keycode.cpp:239
+#: src/keycode.cpp:312
+msgid "Apps"
+msgstr ""
+
+#: src/keycode.cpp:313
 msgid "Sleep"
 msgstr ""
 
-#: src/keycode.cpp:240
+#: src/keycode.cpp:314
+msgid "Numpad 0"
+msgstr "Pavé Numérique 0"
+
+#: src/keycode.cpp:315
+msgid "Numpad 1"
+msgstr "Pavé Numérique 1"
+
+#: src/keycode.cpp:316
 msgid "Numpad 2"
 msgstr "Pavé Numérique 2"
 
-#: src/keycode.cpp:240
+#: src/keycode.cpp:317
 msgid "Numpad 3"
 msgstr "Pavé Numérique 3"
 
-#: src/keycode.cpp:240
+#: src/keycode.cpp:318
 msgid "Numpad 4"
 msgstr "Pavé Numérique 4"
 
-#: src/keycode.cpp:240
+#: src/keycode.cpp:319
 msgid "Numpad 5"
 msgstr "Pavé Numérique 5"
 
-#: src/keycode.cpp:240
+#: src/keycode.cpp:320
 msgid "Numpad 6"
 msgstr "Pavé Numérique 6"
 
-#: src/keycode.cpp:240
+#: src/keycode.cpp:321
 msgid "Numpad 7"
 msgstr "Pavé Numérique 7"
 
-#: src/keycode.cpp:241
-msgid "Numpad *"
-msgstr "Pavé Numérique *"
-
-#: src/keycode.cpp:241
-msgid "Numpad +"
-msgstr "Pavé Numérique +"
-
-#: src/keycode.cpp:241
-msgid "Numpad -"
-msgstr "Pavé Numérique -"
-
-#: src/keycode.cpp:241
-msgid "Numpad /"
-msgstr "Pavé Numérique /"
-
-#: src/keycode.cpp:241
+#: src/keycode.cpp:322
 msgid "Numpad 8"
 msgstr "Pavé Numérique 8"
 
-#: src/keycode.cpp:241
+#: src/keycode.cpp:323
 msgid "Numpad 9"
 msgstr "Pavé Numérique 9"
 
-#: src/keycode.cpp:245
+#: src/keycode.cpp:324
+msgid "Numpad *"
+msgstr "Pavé Numérique *"
+
+#: src/keycode.cpp:325
+msgid "Numpad +"
+msgstr "Pavé Numérique +"
+
+#: src/keycode.cpp:326 src/keycode.cpp:329
+msgid "Numpad /"
+msgstr "Pavé Numérique /"
+
+#: src/keycode.cpp:327
+msgid "Numpad -"
+msgstr "Pavé Numérique -"
+
+#: src/keycode.cpp:328
+#, fuzzy
+msgid "Numpad ."
+msgstr "Pavé Numérique 0"
+
+#: src/keycode.cpp:330
+msgid "F10"
+msgstr ""
+
+#: src/keycode.cpp:331
+msgid "F11"
+msgstr ""
+
+#: src/keycode.cpp:332
+msgid "F12"
+msgstr ""
+
+#: src/keycode.cpp:333
+msgid "F13"
+msgstr ""
+
+#: src/keycode.cpp:334
+msgid "F14"
+msgstr ""
+
+#: src/keycode.cpp:335
+msgid "F15"
+msgstr ""
+
+#: src/keycode.cpp:336
+msgid "F16"
+msgstr ""
+
+#: src/keycode.cpp:337
+msgid "F17"
+msgstr ""
+
+#: src/keycode.cpp:338
+msgid "F18"
+msgstr ""
+
+#: src/keycode.cpp:339
+msgid "F19"
+msgstr ""
+
+#: src/keycode.cpp:340
+msgid "F20"
+msgstr ""
+
+#: src/keycode.cpp:341
+msgid "F21"
+msgstr ""
+
+#: src/keycode.cpp:342
+msgid "F22"
+msgstr ""
+
+#: src/keycode.cpp:343
+msgid "F23"
+msgstr ""
+
+#: src/keycode.cpp:344
+msgid "F24"
+msgstr ""
+
+#: src/keycode.cpp:345
 msgid "Num Lock"
 msgstr "Vérrouillage numérique"
 
-#: src/keycode.cpp:245
+#: src/keycode.cpp:346
 msgid "Scroll Lock"
 msgstr ""
 
-#: src/keycode.cpp:246
+#: src/keycode.cpp:347
 msgid "Left Shift"
 msgstr "Shift gauche"
 
-#: src/keycode.cpp:246
+#: src/keycode.cpp:348
 msgid "Right Shift"
 msgstr "Shift droit"
 
-#: src/keycode.cpp:247
+#: src/keycode.cpp:349
 msgid "Left Control"
 msgstr "Ctrl gauche"
 
-#: src/keycode.cpp:247
-msgid "Left Menu"
-msgstr "Menu de gauche"
-
-#: src/keycode.cpp:247
+#: src/keycode.cpp:350
 msgid "Right Control"
 msgstr "Ctrl droite"
 
-#: src/keycode.cpp:247
+#: src/keycode.cpp:351
+msgid "Left Menu"
+msgstr "Menu de gauche"
+
+#: src/keycode.cpp:352
 msgid "Right Menu"
 msgstr "Menu de droite"
 
-#: src/keycode.cpp:249
-msgid "Comma"
-msgstr "Virgule"
-
-#: src/keycode.cpp:249
-msgid "Minus"
-msgstr "Moins"
-
-#: src/keycode.cpp:249
-msgid "Period"
-msgstr "Point"
-
-#: src/keycode.cpp:249
+#: src/keycode.cpp:353
 msgid "Plus"
 msgstr "Plus"
 
-#: src/keycode.cpp:253
+#: src/keycode.cpp:354
+msgid "Comma"
+msgstr "Virgule"
+
+#: src/keycode.cpp:355
+msgid "Minus"
+msgstr "Moins"
+
+#: src/keycode.cpp:356
+msgid "Period"
+msgstr "Point"
+
+#: src/keycode.cpp:357
 msgid "Attn"
 msgstr ""
 
-#: src/keycode.cpp:253
+#: src/keycode.cpp:358
 msgid "CrSel"
 msgstr ""
 
-#: src/keycode.cpp:254
-msgid "Erase OEF"
-msgstr ""
-
-#: src/keycode.cpp:254
+#: src/keycode.cpp:359
 msgid "ExSel"
 msgstr ""
 
-#: src/keycode.cpp:254
-msgid "OEM Clear"
+#: src/keycode.cpp:360
+msgid "Erase OEF"
 msgstr ""
 
-#: src/keycode.cpp:254
-msgid "PA1"
-msgstr ""
-
-#: src/keycode.cpp:254
+#: src/keycode.cpp:361
 msgid "Play"
 msgstr "Jouer"
 
-#: src/keycode.cpp:254
+#: src/keycode.cpp:362
 msgid "Zoom"
 msgstr "Zoom"
 
+#: src/keycode.cpp:363
+msgid "PA1"
+msgstr ""
+
+#: src/keycode.cpp:364
+msgid "OEM Clear"
+msgstr ""
+
 #: src/main.cpp:1131
 msgid "Setting Up UI"
 msgstr "Configuration de l'interface utilisateur"
@@ -4328,30 +4621,70 @@ msgstr "Chargement des créatures"
 msgid "Setting Up Sound"
 msgstr "Configuration du son"
 
-#: src/mapnode.cpp:282
+#: src/mapnode.cpp:285
 msgid "Loading Base MapNodes"
 msgstr "Chargement des MapNodes de bases"
 
-#: src/mapnode.cpp:286
+#: src/mapnode.cpp:289
 msgid "Loading Circuit MapNodes"
 msgstr "Chargement des MapNodes de circuit"
 
-#: src/mapnode.cpp:290
+#: src/mapnode.cpp:293
 msgid "Loading Plant MapNodes"
 msgstr "Chargement des MapNodes de végétations"
 
-#: src/mapnode.cpp:294
+#: src/mapnode.cpp:297
 msgid "Loading Farming MapNodes"
 msgstr "Chargement des MapNodes d'agricultures"
 
-#: src/mapnode.cpp:298
+#: src/mapnode.cpp:301
 msgid "Loading Decorative MapNodes"
 msgstr "Chargement des MapNodes décoratifs"
 
-#: src/mapnode.cpp:302
+#: src/mapnode.cpp:305
 msgid "Loading Interactive MapNodes"
 msgstr "Chargement des MapNodes intéractifs"
 
-#: src/mapnode.cpp:306
+#: src/mapnode.cpp:309
 msgid "Loading Special MapNodes"
 msgstr "Chargement des MapNodes spéciaux"
+
+#: src/mineral.cpp:93
+#, fuzzy
+msgid "Coal"
+msgstr "Morceau de Charbon"
+
+#: src/mineral.cpp:99
+#, fuzzy
+msgid "Iron"
+msgstr "Minerai de Fer"
+
+#: src/mineral.cpp:106
+#, fuzzy
+msgid "Tin"
+msgstr "Plus Mince"
+
+#: src/mineral.cpp:113
+#, fuzzy
+msgid "Copper"
+msgstr "Minerai de Cuivre"
+
+#: src/mineral.cpp:121
+#, fuzzy
+msgid "Silver"
+msgstr "Minerai d'Argent"
+
+#: src/mineral.cpp:128
+#, fuzzy
+msgid "Gold"
+msgstr "Minerai d'Or"
+
+#: src/mineral.cpp:135
+#, fuzzy
+msgid "Quartz"
+msgstr "Poussière de Quartz"
+
+#: src/mineral.cpp:157
+#, fuzzy
+msgid "Turquoise"
+msgstr "Turquoise"
diff --git a/po/it/voxelands.po b/po/it/voxelands.po
index c42f873..7a8aa39 100644
--- a/po/it/voxelands.po
+++ b/po/it/voxelands.po
@@ -1,21 +1,22 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Lisa 'darkrose' Milne
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # trekmarvel <trekmarvel@gmail.com>, 2015
 msgid ""
 msgstr ""
 "Project-Id-Version: Voxelands\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-10-19 01:55+1000\n"
+"POT-Creation-Date: 2015-12-21 11:27+1000\n"
 "PO-Revision-Date: 2015-10-18 20:40+0000\n"
 "Last-Translator: Emon <emon@openmailbox.org>\n"
-"Language-Team: Italian (http://www.transifex.com/voxelands/voxelands/language/it/)\n"
+"Language-Team: Italian (http://www.transifex.com/voxelands/voxelands/"
+"language/it/)\n"
+"Language: it\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: it\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: src/character_creator.cpp:55
@@ -228,9 +229,18 @@ msgstr "Scarpe di tela"
 
 #: src/character_creator.cpp:202
 msgid ""
-"Here you can create your default character, this is how other players will see you in-game. When you join a new server you will start with the clothing you select here. Additional clothing, both protective and decorative, can be crafted in-game.\n"
+"Here you can create your default character, this is how other players will "
+"see you in-game. When you join a new server you will start with the clothing "
+"you select here. Additional clothing, both protective and decorative, can be "
+"crafted in-game.\n"
 "You can return here from the main menu anytime to change your character."
-msgstr "Qua puoi creare il tuo personaggio e gli altri giocatori ti vedranno con questo aspetto. Quando accedi ad un nuovo server, inizierai con i vestiti che hai scelto. L'abbigliamento aggiuntivo, sia protettivo che decorativo, può essere creato durante la partita.\nPuoi tornare qua dal menu principale ogni volta che vuoi modificare il tuo personaggio."
+msgstr ""
+"Qua puoi creare il tuo personaggio e gli altri giocatori ti vedranno con "
+"questo aspetto. Quando accedi ad un nuovo server, inizierai con i vestiti "
+"che hai scelto. L'abbigliamento aggiuntivo, sia protettivo che decorativo, "
+"può essere creato durante la partita.\n"
+"Puoi tornare qua dal menu principale ogni volta che vuoi modificare il tuo "
+"personaggio."
 
 #: src/character_creator.cpp:223
 msgid "Create Your Character"
@@ -264,7 +274,7 @@ msgstr "Sottile"
 msgid "Done"
 msgstr "Fatto"
 
-#: src/character_creator.cpp:423 src/keycode.cpp:229
+#: src/character_creator.cpp:423 src/keycode.cpp:236
 msgid "Cancel"
 msgstr "Cancella"
 
@@ -1116,7 +1126,7 @@ msgstr "Selce"
 msgid "Steel Ingot"
 msgstr "Lingotto di acciaio"
 
-#: src/content_craftitem.cpp:225 src/content_mapnode.cpp:710
+#: src/content_craftitem.cpp:225 src/content_mapnode.cpp:723
 msgid "Brick"
 msgstr "Mattone"
 
@@ -1544,11 +1554,11 @@ msgstr "Mithril grezzo"
 msgid "Unbound Mithril"
 msgstr "Mithril sciolto"
 
-#: src/content_craftitem.cpp:1516
+#: src/content_craftitem.cpp:1516 src/mineral.cpp:142
 msgid "Mithril"
 msgstr "Mithril"
 
-#: src/content_craftitem.cpp:1525
+#: src/content_craftitem.cpp:1525 src/mineral.cpp:149
 msgid "Ruby"
 msgstr "Rubino"
 
@@ -1556,15 +1566,15 @@ msgstr "Rubino"
 msgid "Turquiose"
 msgstr "Turchese"
 
-#: src/content_craftitem.cpp:1541
+#: src/content_craftitem.cpp:1541 src/mineral.cpp:165
 msgid "Amethyst"
 msgstr "Ametista"
 
-#: src/content_craftitem.cpp:1549
+#: src/content_craftitem.cpp:1549 src/mineral.cpp:173
 msgid "Sapphire"
 msgstr "Zaffiro"
 
-#: src/content_craftitem.cpp:1557
+#: src/content_craftitem.cpp:1557 src/mineral.cpp:181
 msgid "Sunstone"
 msgstr "Avventurina"
 
@@ -1576,392 +1586,396 @@ msgstr "Pietra"
 msgid "Limestone"
 msgstr "Pietra calcarea"
 
-#: src/content_mapnode.cpp:219
+#: src/content_mapnode.cpp:221
+msgid "Marble"
+msgstr ""
+
+#: src/content_mapnode.cpp:232
 msgid "Rock"
 msgstr "Roccia"
 
-#: src/content_mapnode.cpp:241
+#: src/content_mapnode.cpp:254
 msgid "Ice"
 msgstr "Ghiaccio"
 
-#: src/content_mapnode.cpp:257
+#: src/content_mapnode.cpp:270
 msgid "Coal Block"
 msgstr "Blocco di carbone"
 
-#: src/content_mapnode.cpp:274
+#: src/content_mapnode.cpp:287
 msgid "Charcoal Block"
 msgstr "Blocco di carbonella"
 
-#: src/content_mapnode.cpp:291
+#: src/content_mapnode.cpp:304
 msgid "Stone Brick"
 msgstr "Mattone di pietra"
 
-#: src/content_mapnode.cpp:305
+#: src/content_mapnode.cpp:318
 msgid "Stone Block"
 msgstr "Blocco di pietra"
 
-#: src/content_mapnode.cpp:319
+#: src/content_mapnode.cpp:332
 msgid "Rough Stone Brick"
 msgstr "Mattone di pietra ruvida"
 
-#: src/content_mapnode.cpp:336
+#: src/content_mapnode.cpp:349
 msgid "Rough Stone Block"
 msgstr "Blocco di pietra ruvida"
 
-#: src/content_mapnode.cpp:352 src/content_mapnode.cpp:385
-#: src/content_mapnode.cpp:399 src/content_mapnode.cpp:432
+#: src/content_mapnode.cpp:365 src/content_mapnode.cpp:398
+#: src/content_mapnode.cpp:412 src/content_mapnode.cpp:445
 msgid "Grass"
 msgstr "Erba"
 
-#: src/content_mapnode.cpp:370 src/content_mapnode.cpp:417
+#: src/content_mapnode.cpp:383 src/content_mapnode.cpp:430
 msgid "Growing Grass"
 msgstr "Erba in crescita"
 
-#: src/content_mapnode.cpp:446
+#: src/content_mapnode.cpp:459
 msgid "Muddy Snow"
 msgstr "Neve fangosa"
 
-#: src/content_mapnode.cpp:462
+#: src/content_mapnode.cpp:475
 msgid "Mud"
 msgstr "Fango"
 
-#: src/content_mapnode.cpp:478
+#: src/content_mapnode.cpp:491
 msgid "Ash Block"
 msgstr "Blocco di cenere"
 
-#: src/content_mapnode.cpp:493
+#: src/content_mapnode.cpp:506
 msgid "Sand"
 msgstr "Sabbia"
 
-#: src/content_mapnode.cpp:512
+#: src/content_mapnode.cpp:525
 msgid "Gravel"
 msgstr "Ghiaia"
 
-#: src/content_mapnode.cpp:529
+#: src/content_mapnode.cpp:542
 msgid "Sand Stone"
 msgstr "Arenaria"
 
-#: src/content_mapnode.cpp:544
+#: src/content_mapnode.cpp:557
 msgid "Sand Stone Bricks"
 msgstr "Mattoni di arenaria"
 
-#: src/content_mapnode.cpp:559
+#: src/content_mapnode.cpp:572
 msgid "Sand Stone Blocks"
 msgstr "Blocchi di arenaria"
 
-#: src/content_mapnode.cpp:574
+#: src/content_mapnode.cpp:587
 msgid "Clay"
 msgstr "Argilla"
 
-#: src/content_mapnode.cpp:591
+#: src/content_mapnode.cpp:604
 msgid "Blue Clay"
 msgstr "Argilla blu"
 
-#: src/content_mapnode.cpp:608
+#: src/content_mapnode.cpp:621
 msgid "Green Clay"
 msgstr "Argilla verde"
 
-#: src/content_mapnode.cpp:625
+#: src/content_mapnode.cpp:638
 msgid "Orange Clay"
 msgstr "Argilla arancione"
 
-#: src/content_mapnode.cpp:642
+#: src/content_mapnode.cpp:655
 msgid "Purple Clay"
 msgstr "Argilla viola"
 
-#: src/content_mapnode.cpp:659
+#: src/content_mapnode.cpp:672
 msgid "Red Clay"
 msgstr "Argilla rossa"
 
-#: src/content_mapnode.cpp:676
+#: src/content_mapnode.cpp:689
 msgid "Yellow Clay"
 msgstr "Argilla arancione"
 
-#: src/content_mapnode.cpp:693
+#: src/content_mapnode.cpp:706
 msgid "Black Clay"
 msgstr "Argilla nera"
 
-#: src/content_mapnode.cpp:729
+#: src/content_mapnode.cpp:742
 msgid "Terracotta"
 msgstr "Terracotta"
 
-#: src/content_mapnode.cpp:741
+#: src/content_mapnode.cpp:754
 msgid "Terracotta Brick"
 msgstr "Mattone di terracotta"
 
-#: src/content_mapnode.cpp:755
+#: src/content_mapnode.cpp:768
 msgid "Terracotta Block"
 msgstr "Blocco di terracotta"
 
-#: src/content_mapnode.cpp:769
+#: src/content_mapnode.cpp:782
 msgid "Terracotta Tile"
 msgstr "Piastrella di terracotta"
 
-#: src/content_mapnode.cpp:789
+#: src/content_mapnode.cpp:802
 msgid "Glass"
 msgstr "Vetro"
 
-#: src/content_mapnode.cpp:809
+#: src/content_mapnode.cpp:822
 msgid "Blue Glass"
 msgstr "Vetro blu"
 
-#: src/content_mapnode.cpp:831
+#: src/content_mapnode.cpp:844
 msgid "Green Glass"
 msgstr "Vetro verde"
 
-#: src/content_mapnode.cpp:853
+#: src/content_mapnode.cpp:866
 msgid "Orange Glass"
 msgstr "Vetro arancione"
 
-#: src/content_mapnode.cpp:875
+#: src/content_mapnode.cpp:888
 msgid "Purple Glass"
 msgstr "Vetro viola"
 
-#: src/content_mapnode.cpp:897
+#: src/content_mapnode.cpp:910
 msgid "Red Glass"
 msgstr "Vetro rosso"
 
-#: src/content_mapnode.cpp:919
+#: src/content_mapnode.cpp:932
 msgid "Yellow Glass"
 msgstr "Vetro giallo"
 
-#: src/content_mapnode.cpp:941
+#: src/content_mapnode.cpp:954
 msgid "Black Glass"
 msgstr "Vetro nero"
 
-#: src/content_mapnode.cpp:963
+#: src/content_mapnode.cpp:976
 msgid "Glass Pane"
 msgstr "Lastra di vetro"
 
-#: src/content_mapnode.cpp:997
+#: src/content_mapnode.cpp:1010
 msgid "Blue Glass Pane"
 msgstr "Lastra di vetro blu"
 
-#: src/content_mapnode.cpp:1032
+#: src/content_mapnode.cpp:1045
 msgid "Green Glass Pane"
 msgstr "Lastra di vetro verde"
 
-#: src/content_mapnode.cpp:1067
+#: src/content_mapnode.cpp:1080
 msgid "Orange Glass Pane"
 msgstr "Lastra di vetro arancione"
 
-#: src/content_mapnode.cpp:1102
+#: src/content_mapnode.cpp:1115
 msgid "Purple Glass Pane"
 msgstr "Lastra di vetro viola"
 
-#: src/content_mapnode.cpp:1137
+#: src/content_mapnode.cpp:1150
 msgid "Red Glass Pane"
 msgstr "Lastra di vetro rosso"
 
-#: src/content_mapnode.cpp:1172
+#: src/content_mapnode.cpp:1185
 msgid "Yellow Glass Pane"
 msgstr "Lastra di vetro giallo"
 
-#: src/content_mapnode.cpp:1207
+#: src/content_mapnode.cpp:1220
 msgid "Black Glass Pane"
 msgstr "Lastra di vetro nero"
 
-#: src/content_mapnode.cpp:1242 src/content_mapnode_farm.cpp:333
+#: src/content_mapnode.cpp:1255 src/content_mapnode_farm.cpp:333
 msgid "Glass Light"
 msgstr "Vetro luminoso"
 
-#: src/content_mapnode.cpp:1265
+#: src/content_mapnode.cpp:1278
 msgid "Wood"
 msgstr "Legno"
 
-#: src/content_mapnode.cpp:1291
+#: src/content_mapnode.cpp:1304
 msgid "Jungle Wood"
 msgstr "Legno della giungla"
 
-#: src/content_mapnode.cpp:1316
+#: src/content_mapnode.cpp:1329
 msgid "Pine"
 msgstr "Pino"
 
-#: src/content_mapnode.cpp:1341
+#: src/content_mapnode.cpp:1354
 msgid "Sponge"
 msgstr "Spugna"
 
-#: src/content_mapnode.cpp:1356
+#: src/content_mapnode.cpp:1369
 msgid "Waterlogged Sponge"
 msgstr "Spugna inzuppata"
 
-#: src/content_mapnode.cpp:1371
+#: src/content_mapnode.cpp:1384
 msgid "Hay Bale"
 msgstr "Balla di fieno"
 
-#: src/content_mapnode.cpp:1388
+#: src/content_mapnode.cpp:1401
 msgid "Raw Apple Pie"
 msgstr "Torta di mele cruda"
 
-#: src/content_mapnode.cpp:1417
+#: src/content_mapnode.cpp:1430
 msgid "Apple Pie"
 msgstr "Torta di mele"
 
-#: src/content_mapnode.cpp:1512
+#: src/content_mapnode.cpp:1525
 msgid "Raw Pumpkin Pie"
 msgstr "Torta di zucca cruda"
 
-#: src/content_mapnode.cpp:1541
+#: src/content_mapnode.cpp:1554
 msgid "Pumpkin Pie"
 msgstr "Torta di zucca"
 
-#: src/content_mapnode.cpp:1636 src/content_mapnode.cpp:1715
+#: src/content_mapnode.cpp:1649 src/content_mapnode.cpp:1728
 msgid "Snow"
 msgstr "Neve"
 
-#: src/content_mapnode.cpp:1652
+#: src/content_mapnode.cpp:1665
 msgid "Snowman"
 msgstr "Pupazzo di neve"
 
-#: src/content_mapnode.cpp:1738 src/content_mapnode_farm.cpp:445
+#: src/content_mapnode.cpp:1752 src/content_mapnode_farm.cpp:445
 msgid "Cotton"
 msgstr "Cotone"
 
-#: src/content_mapnode.cpp:1769
+#: src/content_mapnode.cpp:1783
 msgid "Blue Cotton"
 msgstr "Cotone blu"
 
-#: src/content_mapnode.cpp:1786
+#: src/content_mapnode.cpp:1800
 msgid "Green Cotton"
 msgstr "Cotone verte"
 
-#: src/content_mapnode.cpp:1803
+#: src/content_mapnode.cpp:1817
 msgid "Orange Cotton"
 msgstr "Cotone arancione"
 
-#: src/content_mapnode.cpp:1820
+#: src/content_mapnode.cpp:1834
 msgid "Purple Cotton"
 msgstr "Cotone viola"
 
-#: src/content_mapnode.cpp:1837
+#: src/content_mapnode.cpp:1851
 msgid "Red Cotton"
 msgstr "Cotone rosso"
 
-#: src/content_mapnode.cpp:1854
+#: src/content_mapnode.cpp:1868
 msgid "Yellow Cotton"
 msgstr "Cotone giallo"
 
-#: src/content_mapnode.cpp:1871
+#: src/content_mapnode.cpp:1885
 msgid "Black Cotton"
 msgstr "Cotone nero"
 
-#: src/content_mapnode.cpp:1888
+#: src/content_mapnode.cpp:1902
 msgid "Carpet"
 msgstr "Tappeto"
 
-#: src/content_mapnode.cpp:1911
+#: src/content_mapnode.cpp:1925
 msgid "Blue Carpet"
 msgstr "Tappeto blu"
 
-#: src/content_mapnode.cpp:1935
+#: src/content_mapnode.cpp:1949
 msgid "Green Carpet"
 msgstr "Tappeto verde"
 
-#: src/content_mapnode.cpp:1959
+#: src/content_mapnode.cpp:1973
 msgid "Orange Carpet"
 msgstr "Tappeto arancione"
 
-#: src/content_mapnode.cpp:1983
+#: src/content_mapnode.cpp:1997
 msgid "Purple Carpet"
 msgstr "Tappeto viola"
 
-#: src/content_mapnode.cpp:2007
+#: src/content_mapnode.cpp:2021
 msgid "Red Carpet"
 msgstr "Tappeto rosso"
 
-#: src/content_mapnode.cpp:2031
+#: src/content_mapnode.cpp:2045
 msgid "Yellow Carpet"
 msgstr "Teppeto giallo"
 
-#: src/content_mapnode.cpp:2055
+#: src/content_mapnode.cpp:2069
 msgid "Black Carpet"
 msgstr "Teppeto nero"
 
-#: src/content_mapnode.cpp:2079
+#: src/content_mapnode.cpp:2093
 msgid "Air"
 msgstr "Aria"
 
-#: src/content_mapnode.cpp:2095
+#: src/content_mapnode.cpp:2109
 msgid "Vacuum"
 msgstr "Vuoto"
 
-#: src/content_mapnode.cpp:2112 src/content_mapnode.cpp:2142
+#: src/content_mapnode.cpp:2126 src/content_mapnode.cpp:2156
 msgid "Water"
 msgstr "Acqua"
 
-#: src/content_mapnode.cpp:2172 src/content_mapnode.cpp:2200
+#: src/content_mapnode.cpp:2186 src/content_mapnode.cpp:2214
 msgid "Lava"
 msgstr "Lava"
 
-#: src/content_mapnode.cpp:2231
+#: src/content_mapnode.cpp:2245
 msgid "Rough Stone"
 msgstr "Pietra ruvida"
 
-#: src/content_mapnode.cpp:2248
+#: src/content_mapnode.cpp:2262
 msgid "Cobble Stone"
 msgstr "Acciottolato"
 
-#: src/content_mapnode.cpp:2264
+#: src/content_mapnode.cpp:2278
 msgid "Mossy Cobble Stone"
 msgstr "Acciottolato  muschioso"
 
-#: src/content_mapnode.cpp:2277
+#: src/content_mapnode.cpp:2291
 msgid "Steel Block"
 msgstr "Blocco di acciaio"
 
-#: src/content_mapnode.cpp:2294
+#: src/content_mapnode.cpp:2308
 msgid "Mithril Block"
 msgstr "Blocco di mithril"
 
-#: src/content_mapnode.cpp:2310
+#: src/content_mapnode.cpp:2324
 msgid "Stone Knob"
 msgstr "Pomello di pietra"
 
-#: src/content_mapnode.cpp:2311
+#: src/content_mapnode.cpp:2325
 msgid "Rough Stone Knob"
 msgstr "Pomello di pietra ruvida"
 
-#: src/content_mapnode.cpp:2312
+#: src/content_mapnode.cpp:2326
 msgid "Sandstone Knob"
 msgstr "Pomello di arenaria"
 
-#: src/content_mapnode.cpp:2313
+#: src/content_mapnode.cpp:2327
 msgid "Wooden Knob"
 msgstr "Pomello di legno"
 
-#: src/content_mapnode.cpp:2314
+#: src/content_mapnode.cpp:2328
 msgid "Junglewood Knob"
 msgstr "Pomello di legno della giungla"
 
-#: src/content_mapnode.cpp:2315
+#: src/content_mapnode.cpp:2329
 msgid "Pine Knob"
 msgstr "Pomello di pino"
 
-#: src/content_mapnode.cpp:2319
+#: src/content_mapnode.cpp:2333
 msgid "Copper Block"
 msgstr "Blocco di rame"
 
-#: src/content_mapnode.cpp:2336
+#: src/content_mapnode.cpp:2350
 msgid "Gold Block"
 msgstr "Blocco di oro"
 
-#: src/content_mapnode.cpp:2353
+#: src/content_mapnode.cpp:2367
 msgid "Silver Block"
 msgstr "Blocco di argento"
 
-#: src/content_mapnode.cpp:2370
+#: src/content_mapnode.cpp:2384
 msgid "Tin Block"
 msgstr "Blocco di latta"
 
-#: src/content_mapnode.cpp:2387
+#: src/content_mapnode.cpp:2401
 msgid "Quartz Block"
 msgstr "Blocco di quarzo"
 
-#: src/content_mapnode.cpp:2404
+#: src/content_mapnode.cpp:2418
 msgid "Stone Tiles"
 msgstr "Piastrelle di pietra"
 
-#: src/content_mapnode.cpp:2426
+#: src/content_mapnode.cpp:2440
 msgid "Wood Tiles"
 msgstr "Piastrelle di legno"
 
@@ -2009,29 +2023,29 @@ msgstr "Cancello Not"
 msgid "Repeater"
 msgstr "Ripetitore"
 
-#: src/content_mapnode_circuit.cpp:369 src/content_mapnode_circuit.cpp:393
+#: src/content_mapnode_circuit.cpp:369 src/content_mapnode_circuit.cpp:390
 msgid "Electric Lamp"
 msgstr "Lampada elettrica"
 
-#: src/content_mapnode_circuit.cpp:427 src/content_mapnode_circuit.cpp:462
-#: src/content_mapnode_circuit.cpp:516 src/content_mapnode_circuit.cpp:537
-#: src/content_mapnode_circuit.cpp:582 src/content_mapnode_circuit.cpp:603
+#: src/content_mapnode_circuit.cpp:424 src/content_mapnode_circuit.cpp:459
+#: src/content_mapnode_circuit.cpp:513 src/content_mapnode_circuit.cpp:534
+#: src/content_mapnode_circuit.cpp:579 src/content_mapnode_circuit.cpp:600
 msgid "Piston"
 msgstr "Pistone"
 
-#: src/content_mapnode_circuit.cpp:489 src/content_mapnode_circuit.cpp:560
-#: src/content_mapnode_circuit.cpp:626
+#: src/content_mapnode_circuit.cpp:486 src/content_mapnode_circuit.cpp:557
+#: src/content_mapnode_circuit.cpp:623
 msgid "Piston Arm"
 msgstr "Braccio di pistone"
 
-#: src/content_mapnode_circuit.cpp:648 src/content_mapnode_circuit.cpp:676
-#: src/content_mapnode_circuit.cpp:730 src/content_mapnode_circuit.cpp:751
-#: src/content_mapnode_circuit.cpp:796 src/content_mapnode_circuit.cpp:817
+#: src/content_mapnode_circuit.cpp:645 src/content_mapnode_circuit.cpp:673
+#: src/content_mapnode_circuit.cpp:727 src/content_mapnode_circuit.cpp:748
+#: src/content_mapnode_circuit.cpp:793 src/content_mapnode_circuit.cpp:814
 msgid "Sticky Piston"
 msgstr "Pistone appiccicoso"
 
-#: src/content_mapnode_circuit.cpp:703 src/content_mapnode_circuit.cpp:774
-#: src/content_mapnode_circuit.cpp:840
+#: src/content_mapnode_circuit.cpp:700 src/content_mapnode_circuit.cpp:771
+#: src/content_mapnode_circuit.cpp:837
 msgid "Sticky Piston Arm"
 msgstr "Braccio di pistone appiccicoso"
 
@@ -2171,7 +2185,7 @@ msgstr "Uva"
 msgid "Trellis Grape"
 msgstr "Graticcio di uva"
 
-#: src/content_mapnode_farm.cpp:493 src/content_mapnode_farm.cpp:512
+#: src/content_mapnode_farm.cpp:494 src/content_mapnode_farm.cpp:513
 msgid "Dead Vine"
 msgstr "Vite morta"
 
@@ -2187,131 +2201,137 @@ msgstr "Libreria di legno di giungla"
 msgid "Pine Book Shelf"
 msgstr "Libreria di legno di pino"
 
-#: src/content_mapnode_furniture.cpp:150 src/content_mapnode_furniture.cpp:169
-#: src/content_mapnode_furniture.cpp:188 src/content_mapnode_furniture.cpp:207
-#: src/content_mapnode_furniture.cpp:226 src/content_mapnode_furniture.cpp:245
+#: src/content_mapnode_furniture.cpp:150 src/content_mapnode_furniture.cpp:170
+#: src/content_mapnode_furniture.cpp:190 src/content_mapnode_furniture.cpp:210
+#: src/content_mapnode_furniture.cpp:230 src/content_mapnode_furniture.cpp:250
 msgid "Couch"
 msgstr "Poltrona"
 
-#: src/content_mapnode_furniture.cpp:274 src/content_mapnode_furniture.cpp:293
-#: src/content_mapnode_furniture.cpp:312 src/content_mapnode_furniture.cpp:331
-#: src/content_mapnode_furniture.cpp:350 src/content_mapnode_furniture.cpp:369
+#: src/content_mapnode_furniture.cpp:280 src/content_mapnode_furniture.cpp:300
+#: src/content_mapnode_furniture.cpp:320 src/content_mapnode_furniture.cpp:340
+#: src/content_mapnode_furniture.cpp:360 src/content_mapnode_furniture.cpp:380
 msgid "Blue Couch"
 msgstr "Poltrona blu"
 
-#: src/content_mapnode_furniture.cpp:392 src/content_mapnode_furniture.cpp:411
-#: src/content_mapnode_furniture.cpp:430 src/content_mapnode_furniture.cpp:449
-#: src/content_mapnode_furniture.cpp:468 src/content_mapnode_furniture.cpp:487
+#: src/content_mapnode_furniture.cpp:404 src/content_mapnode_furniture.cpp:424
+#: src/content_mapnode_furniture.cpp:444 src/content_mapnode_furniture.cpp:464
+#: src/content_mapnode_furniture.cpp:484 src/content_mapnode_furniture.cpp:504
 msgid "Green Couch"
 msgstr "Poltrona verde"
 
-#: src/content_mapnode_furniture.cpp:510 src/content_mapnode_furniture.cpp:529
-#: src/content_mapnode_furniture.cpp:548 src/content_mapnode_furniture.cpp:567
-#: src/content_mapnode_furniture.cpp:586 src/content_mapnode_furniture.cpp:605
+#: src/content_mapnode_furniture.cpp:528 src/content_mapnode_furniture.cpp:548
+#: src/content_mapnode_furniture.cpp:568 src/content_mapnode_furniture.cpp:588
+#: src/content_mapnode_furniture.cpp:608 src/content_mapnode_furniture.cpp:628
 msgid "Orange Couch"
 msgstr "Poltrona arancione"
 
-#: src/content_mapnode_furniture.cpp:628 src/content_mapnode_furniture.cpp:647
-#: src/content_mapnode_furniture.cpp:666 src/content_mapnode_furniture.cpp:685
-#: src/content_mapnode_furniture.cpp:704 src/content_mapnode_furniture.cpp:723
+#: src/content_mapnode_furniture.cpp:652 src/content_mapnode_furniture.cpp:672
+#: src/content_mapnode_furniture.cpp:692 src/content_mapnode_furniture.cpp:712
+#: src/content_mapnode_furniture.cpp:732 src/content_mapnode_furniture.cpp:752
 msgid "Purple Couch"
 msgstr "Poltrona viola"
 
-#: src/content_mapnode_furniture.cpp:746 src/content_mapnode_furniture.cpp:765
-#: src/content_mapnode_furniture.cpp:784 src/content_mapnode_furniture.cpp:803
-#: src/content_mapnode_furniture.cpp:822 src/content_mapnode_furniture.cpp:841
+#: src/content_mapnode_furniture.cpp:776 src/content_mapnode_furniture.cpp:796
+#: src/content_mapnode_furniture.cpp:816 src/content_mapnode_furniture.cpp:836
+#: src/content_mapnode_furniture.cpp:856 src/content_mapnode_furniture.cpp:876
 msgid "Red Couch"
 msgstr "Poltrona rossa"
 
-#: src/content_mapnode_furniture.cpp:864 src/content_mapnode_furniture.cpp:883
-#: src/content_mapnode_furniture.cpp:902 src/content_mapnode_furniture.cpp:921
-#: src/content_mapnode_furniture.cpp:940 src/content_mapnode_furniture.cpp:959
+#: src/content_mapnode_furniture.cpp:900 src/content_mapnode_furniture.cpp:920
+#: src/content_mapnode_furniture.cpp:940 src/content_mapnode_furniture.cpp:960
+#: src/content_mapnode_furniture.cpp:980
+#: src/content_mapnode_furniture.cpp:1000
 msgid "Yellow Couch"
 msgstr "Poltrona gialla"
 
-#: src/content_mapnode_furniture.cpp:982
-#: src/content_mapnode_furniture.cpp:1001
-#: src/content_mapnode_furniture.cpp:1020
-#: src/content_mapnode_furniture.cpp:1039
-#: src/content_mapnode_furniture.cpp:1058
-#: src/content_mapnode_furniture.cpp:1077
+#: src/content_mapnode_furniture.cpp:1024
+#: src/content_mapnode_furniture.cpp:1044
+#: src/content_mapnode_furniture.cpp:1064
+#: src/content_mapnode_furniture.cpp:1084
+#: src/content_mapnode_furniture.cpp:1104
+#: src/content_mapnode_furniture.cpp:1124
 msgid "Black Couch"
 msgstr "Poltrona nera"
 
-#: src/content_mapnode_furniture.cpp:1100
+#: src/content_mapnode_furniture.cpp:1148
+#: src/content_mapnode_furniture.cpp:1182
+#: src/content_mapnode_furniture.cpp:1206
+#: src/content_mapnode_furniture.cpp:1230
+#: src/content_mapnode_furniture.cpp:1254
+#: src/content_mapnode_furniture.cpp:1278
 msgid "Chair"
 msgstr "Sedia"
 
-#: src/content_mapnode_furniture.cpp:1149
+#: src/content_mapnode_furniture.cpp:1302
 msgid "Table"
 msgstr "Tavolo"
 
-#: src/content_mapnode_furniture.cpp:1206
-#: src/content_mapnode_furniture.cpp:1239
+#: src/content_mapnode_furniture.cpp:1333
+#: src/content_mapnode_furniture.cpp:1366
 msgid "Bed"
 msgstr "Letto"
 
-#: src/content_mapnode_furniture.cpp:1267
-#: src/content_mapnode_furniture.cpp:1300
+#: src/content_mapnode_furniture.cpp:1394
+#: src/content_mapnode_furniture.cpp:1427
 msgid "Blue Bed"
 msgstr "Letto blu"
 
-#: src/content_mapnode_furniture.cpp:1328
-#: src/content_mapnode_furniture.cpp:1361
+#: src/content_mapnode_furniture.cpp:1455
+#: src/content_mapnode_furniture.cpp:1488
 msgid "Green Bed"
 msgstr "Letto verde"
 
-#: src/content_mapnode_furniture.cpp:1389
-#: src/content_mapnode_furniture.cpp:1422
+#: src/content_mapnode_furniture.cpp:1516
+#: src/content_mapnode_furniture.cpp:1549
 msgid "Orange Bed"
 msgstr "Letto arancione"
 
-#: src/content_mapnode_furniture.cpp:1450
-#: src/content_mapnode_furniture.cpp:1483
+#: src/content_mapnode_furniture.cpp:1577
+#: src/content_mapnode_furniture.cpp:1610
 msgid "Purple Bed"
 msgstr "Letto viola"
 
-#: src/content_mapnode_furniture.cpp:1511
-#: src/content_mapnode_furniture.cpp:1544
+#: src/content_mapnode_furniture.cpp:1638
+#: src/content_mapnode_furniture.cpp:1671
 msgid "Red Bed"
 msgstr "Letto rosso"
 
-#: src/content_mapnode_furniture.cpp:1572
-#: src/content_mapnode_furniture.cpp:1605
+#: src/content_mapnode_furniture.cpp:1699
+#: src/content_mapnode_furniture.cpp:1732
 msgid "Yellow Bed"
 msgstr "Letto giallo"
 
-#: src/content_mapnode_furniture.cpp:1633
-#: src/content_mapnode_furniture.cpp:1666
+#: src/content_mapnode_furniture.cpp:1760
+#: src/content_mapnode_furniture.cpp:1793
 msgid "Black Bed"
 msgstr "Letto nero"
 
-#: src/content_mapnode_furniture.cpp:1694
-#: src/content_mapnode_furniture.cpp:1729
+#: src/content_mapnode_furniture.cpp:1821
+#: src/content_mapnode_furniture.cpp:1856
 msgid "Camp Bed"
 msgstr "Letto da campo"
 
-#: src/content_mapnode_furniture.cpp:1753
+#: src/content_mapnode_furniture.cpp:1880
 msgid "Colorful Painting"
 msgstr "Dipinto colorato"
 
-#: src/content_mapnode_furniture.cpp:1788
+#: src/content_mapnode_furniture.cpp:1915
 msgid "Red Rose Painting"
 msgstr "Dipinto di rosa rossa"
 
-#: src/content_mapnode_furniture.cpp:1823
+#: src/content_mapnode_furniture.cpp:1950
 msgid "Field Painting"
 msgstr "Dipinto campestre"
 
-#: src/content_mapnode_furniture.cpp:1858
+#: src/content_mapnode_furniture.cpp:1985
 msgid "Blue Flower Painting"
 msgstr "Dipinto di fiore blu"
 
-#: src/content_mapnode_furniture.cpp:1893
+#: src/content_mapnode_furniture.cpp:2020
 msgid "Painting Canvas"
 msgstr "Tela da dipinto"
 
-#: src/content_mapnode_furniture.cpp:1931
+#: src/content_mapnode_furniture.cpp:2058
 msgid "Clock"
 msgstr "Orologio"
 
@@ -2631,7 +2651,7 @@ msgid "Decraft Book"
 msgstr "Manuale di smontaggio"
 
 #: src/content_mapnode_special.cpp:753 src/content_mapnode_special.cpp:948
-#: src/content_nodemeta.cpp:2693
+#: src/content_nodemeta.cpp:2694
 msgid "Diary"
 msgstr "Diario"
 
@@ -2681,11 +2701,11 @@ msgstr "Cartello"
 msgid "Locking Sign"
 msgstr "Cartello con serratura"
 
-#: src/content_mapnode_special.cpp:1286 src/content_nodemeta.cpp:500
+#: src/content_mapnode_special.cpp:1286 src/content_nodemeta.cpp:501
 msgid "Chest"
 msgstr "Cassa"
 
-#: src/content_mapnode_special.cpp:1310 src/content_nodemeta.cpp:775
+#: src/content_mapnode_special.cpp:1310 src/content_nodemeta.cpp:776
 msgid "Creative Chest"
 msgstr "Cassa creativa"
 
@@ -2805,7 +2825,7 @@ msgstr "Lotto"
 msgid "Cauldron"
 msgstr "Calderone"
 
-#: src/content_mapnode_special.cpp:2082 src/content_nodemeta.cpp:3312
+#: src/content_mapnode_special.cpp:2082 src/content_nodemeta.cpp:3313
 msgid "Forge"
 msgstr "Forgia"
 
@@ -2909,563 +2929,569 @@ msgstr "Gattino siamese"
 msgid "Ginger Kitten"
 msgstr "Gattino rosso"
 
-#: src/content_nodemeta.cpp:75 src/content_nodemeta.cpp:138
-#: src/content_nodemeta.cpp:2677 src/content_nodemeta.cpp:2776
+#: src/content_nodemeta.cpp:76 src/content_nodemeta.cpp:139
+#: src/content_nodemeta.cpp:2678 src/content_nodemeta.cpp:2777
 msgid "Save"
 msgstr "Salvare"
 
-#: src/content_nodemeta.cpp:185
+#: src/content_nodemeta.cpp:186
 #, c-format
 msgid "%s's Home Flag"
 msgstr "Bandiera di casa di %s"
 
-#: src/content_nodemeta.cpp:269 src/content_nodemeta.cpp:282
-#: src/content_nodemeta.cpp:436 src/content_nodemeta.cpp:449
+#: src/content_nodemeta.cpp:270 src/content_nodemeta.cpp:283
+#: src/content_nodemeta.cpp:437 src/content_nodemeta.cpp:450
 msgid "You can't sleep yet."
 msgstr "Non potete ancora dormire."
 
-#: src/content_nodemeta.cpp:273 src/content_nodemeta.cpp:440
+#: src/content_nodemeta.cpp:274 src/content_nodemeta.cpp:441
 msgid "Go to sleep"
 msgstr "Andare a dormire"
 
-#: src/content_nodemeta.cpp:278 src/content_nodemeta.cpp:445
+#: src/content_nodemeta.cpp:279 src/content_nodemeta.cpp:446
 msgid "Someone else is sleeping here."
 msgstr "Qualcun'altro/a sta dormendo qui."
 
-#: src/content_nodemeta.cpp:286 src/content_nodemeta.cpp:453
+#: src/content_nodemeta.cpp:287 src/content_nodemeta.cpp:454
 msgid "Get out of bed"
 msgstr "Uscire dal letto"
 
-#: src/content_nodemeta.cpp:432
+#: src/content_nodemeta.cpp:433
 msgid "This bed is too uncomfortable to sleep in."
 msgstr "Questo letto è troppo scomodo per dormirci."
 
-#: src/content_nodemeta.cpp:573
+#: src/content_nodemeta.cpp:574
 #, c-format
 msgid "Locking Chest owned by '%s'"
 msgstr "Cassa con serratura di '%s'"
 
-#: src/content_nodemeta.cpp:647
+#: src/content_nodemeta.cpp:648
 #, c-format
 msgid "Safe owned by '%s'"
 msgstr "Cassaforte di  '%s'"
 
-#: src/content_nodemeta.cpp:816 src/content_nodemeta.cpp:1870
-#: src/content_nodemeta.cpp:2157 src/content_nodemeta.cpp:2349
-#: src/content_nodemeta.cpp:2563
+#: src/content_nodemeta.cpp:817 src/content_nodemeta.cpp:1871
+#: src/content_nodemeta.cpp:2158 src/content_nodemeta.cpp:2350
+#: src/content_nodemeta.cpp:2564
 #, c-format
 msgid "Page %d of %d"
 msgstr "Pagina %d di %d"
 
-#: src/content_nodemeta.cpp:820 src/content_nodemeta.cpp:1898
-#: src/content_nodemeta.cpp:2176 src/content_nodemeta.cpp:2358
-#: src/content_nodemeta.cpp:2579
+#: src/content_nodemeta.cpp:821 src/content_nodemeta.cpp:1899
+#: src/content_nodemeta.cpp:2177 src/content_nodemeta.cpp:2359
+#: src/content_nodemeta.cpp:2580
 msgid "<< Previous Page"
 msgstr "<< Pag. prec."
 
-#: src/content_nodemeta.cpp:826 src/content_nodemeta.cpp:1904
-#: src/content_nodemeta.cpp:2182 src/content_nodemeta.cpp:2364
-#: src/content_nodemeta.cpp:2585
+#: src/content_nodemeta.cpp:827 src/content_nodemeta.cpp:1905
+#: src/content_nodemeta.cpp:2183 src/content_nodemeta.cpp:2365
+#: src/content_nodemeta.cpp:2586
 msgid "Next Page >>"
 msgstr "Pag. succ. >>"
 
-#: src/content_nodemeta.cpp:869
+#: src/content_nodemeta.cpp:870
 #, c-format
 msgid "Border Stone owned by '%s'"
 msgstr "Pietra di confine di  '%s'"
 
-#: src/content_nodemeta.cpp:944
+#: src/content_nodemeta.cpp:945
 msgid "Furnace is overloaded"
 msgstr "La fornace è sovraccarica"
 
-#: src/content_nodemeta.cpp:945
+#: src/content_nodemeta.cpp:946
 msgid "Furnace is out of fuel"
 msgstr "La fornace è senza combustibile"
 
-#: src/content_nodemeta.cpp:947
+#: src/content_nodemeta.cpp:948
 msgid "Furnace is inactive"
 msgstr "La fornace non è attiva"
 
-#: src/content_nodemeta.cpp:950
+#: src/content_nodemeta.cpp:951
 msgid "Furnace is active"
 msgstr "La fornace è attiva"
 
-#: src/content_nodemeta.cpp:1209
+#: src/content_nodemeta.cpp:1210
 msgid "Locking Furnace is overloaded"
 msgstr "La fornace con serratura è sovraccarica"
 
-#: src/content_nodemeta.cpp:1210
+#: src/content_nodemeta.cpp:1211
 msgid "Locking Furnace is out of fuel"
 msgstr "La fornace con serratura è senza combustibile"
 
-#: src/content_nodemeta.cpp:1212
+#: src/content_nodemeta.cpp:1213
 msgid "Locking Furnace is inactive"
 msgstr "La fornace con serratura non è attiva"
 
-#: src/content_nodemeta.cpp:1215
+#: src/content_nodemeta.cpp:1216
 msgid "Locking Furnace is active"
 msgstr "La fornace con serratura è attiva"
 
-#: src/content_nodemeta.cpp:1470
+#: src/content_nodemeta.cpp:1471
 msgid "Armed Explosive: about to detonate"
 msgstr "Esplosivo armato: prossimo alla detonazione"
 
-#: src/content_nodemeta.cpp:1473
+#: src/content_nodemeta.cpp:1474
 #, c-format
 msgid "Armed Explosive: %d second till detonation"
 msgid_plural "Armed Explosive: %d seconds till detonation"
 msgstr[0] "Esplosivo armato: %d secondo alla detonazione"
 msgstr[1] "Esplosivo armato: %d secondi alla detonazione"
 
-#: src/content_nodemeta.cpp:1534 src/content_nodemeta.cpp:1539
+#: src/content_nodemeta.cpp:1535 src/content_nodemeta.cpp:1540
 msgid "Incinerator is active"
 msgstr "L'inceneritore è attivo"
 
-#: src/content_nodemeta.cpp:1541
+#: src/content_nodemeta.cpp:1542
 msgid "Incinerator is inactive"
 msgstr "L'inceneritore non è attivo"
 
-#: src/content_nodemeta.cpp:1633
+#: src/content_nodemeta.cpp:1634
 msgid "Add fuel, then punch to incinerate wielded item"
-msgstr "Aggiungete combustibile, poi colpite per incenerire l'oggetto impugnato"
+msgstr ""
+"Aggiungete combustibile, poi colpite per incenerire l'oggetto impugnato"
 
-#: src/content_nodemeta.cpp:1874 src/content_nodemeta.cpp:2162
+#: src/content_nodemeta.cpp:1875 src/content_nodemeta.cpp:2163
 msgid "Add item here to see recipe"
 msgstr "Oggetto della ricetta"
 
-#: src/content_nodemeta.cpp:1879 src/content_nodemeta.cpp:2167
+#: src/content_nodemeta.cpp:1880 src/content_nodemeta.cpp:2168
 #, c-format
 msgid "Recipe %d of %d"
 msgstr "Ricetta %d di %d"
 
-#: src/content_nodemeta.cpp:1888
+#: src/content_nodemeta.cpp:1889
 msgid "Gives"
 msgstr "Da` "
 
-#: src/content_nodemeta.cpp:2353
+#: src/content_nodemeta.cpp:2354
 msgid "Add item here to see cook result"
 msgstr "Oggetto della cottura"
 
-#: src/content_nodemeta.cpp:2567
+#: src/content_nodemeta.cpp:2568
 msgid "Add item here to see dig result"
 msgstr "Oggetto dello scavo"
 
-#: src/content_nodemeta.cpp:2571
+#: src/content_nodemeta.cpp:2572
 msgid "Dig Result"
 msgstr "Risultato di scavo"
 
-#: src/content_nodemeta.cpp:2575
+#: src/content_nodemeta.cpp:2576
 msgid "Random Drop"
 msgstr "Rilascio casuale"
 
-#: src/content_nodemeta.cpp:2667 src/content_nodemeta.cpp:2766
+#: src/content_nodemeta.cpp:2668 src/content_nodemeta.cpp:2767
 msgid "Title"
 msgstr "Titolo"
 
-#: src/content_nodemeta.cpp:2672 src/content_nodemeta.cpp:2771
+#: src/content_nodemeta.cpp:2673 src/content_nodemeta.cpp:2772
 msgid "Content"
 msgstr "Contenuto"
 
-#: src/content_nodemeta.cpp:3127
+#: src/content_nodemeta.cpp:3128
 msgid "Cauldron is active"
 msgstr "Il calderone è attivo"
 
-#: src/content_nodemeta.cpp:3130
+#: src/content_nodemeta.cpp:3131
 msgid "Cauldron is hot"
 msgstr "Il calderone scotta"
 
-#: src/content_nodemeta.cpp:3132
+#: src/content_nodemeta.cpp:3133
 msgid "Cauldron is cool"
 msgstr "Il calderone è freddo"
 
-#: src/content_nodemeta.cpp:3134
+#: src/content_nodemeta.cpp:3135
 msgid "Cauldron is empty"
 msgstr "Il calderone è vuoto"
 
-#: src/content_nodemeta.cpp:3138
+#: src/content_nodemeta.cpp:3139
 msgid "Cauldron is inactive"
 msgstr "Il calderone non è attivo"
 
-#: src/content_nodemeta.cpp:3139
+#: src/content_nodemeta.cpp:3140
 msgid "Cauldron is out of fuel"
 msgstr "Il calderone è senza combustibile"
 
-#: src/content_nodemeta.cpp:3218
+#: src/content_nodemeta.cpp:3219
 msgid "Add fuel, then punch to add or remove water"
 msgstr "Aggiungete combustibile, poi colpite per aggiungere o rimuovere acqua"
 
-#: src/content_nodemeta.cpp:3484
+#: src/content_nodemeta.cpp:3487
 msgid "Show Enchanting"
 msgstr "Mostrare l'incantamento"
 
-#: src/content_nodemeta.cpp:3491 src/game.cpp:208
+#: src/content_nodemeta.cpp:3494 src/game.cpp:209
 msgid "Show Crafting"
 msgstr "Mostra assemblaggio"
 
-#: src/content_toolitem.cpp:213
+#: src/content_toolitem.cpp:216
 msgid "Small Stone Pick"
 msgstr "Piccolo piccone di pietra"
 
-#: src/content_toolitem.cpp:236
+#: src/content_toolitem.cpp:239
 msgid "Stone Pick"
 msgstr "Piccone di pietra"
 
-#: src/content_toolitem.cpp:250
+#: src/content_toolitem.cpp:253
 msgid "Flint Pick"
 msgstr "Piccone di selce"
 
-#: src/content_toolitem.cpp:264
+#: src/content_toolitem.cpp:267
 msgid "Steel Pick"
 msgstr "Piccone di acciaio"
 
-#: src/content_toolitem.cpp:278
+#: src/content_toolitem.cpp:281
 msgid "Creative Pick"
 msgstr "Piccone creativo"
 
-#: src/content_toolitem.cpp:292
+#: src/content_toolitem.cpp:295
 msgid "Stone Trowel"
 msgstr "Paletta da giardiniere di pietra"
 
-#: src/content_toolitem.cpp:306
+#: src/content_toolitem.cpp:309
 msgid "Stone Shovel"
 msgstr "Vanga di pietra"
 
-#: src/content_toolitem.cpp:320
+#: src/content_toolitem.cpp:323
 msgid "Flint Shovel"
 msgstr "Vanga di selce"
 
-#: src/content_toolitem.cpp:334
+#: src/content_toolitem.cpp:337
 msgid "Steel Shovel"
 msgstr "Vanga di acciaio"
 
-#: src/content_toolitem.cpp:348
+#: src/content_toolitem.cpp:351
 msgid "Small Stone Axe"
 msgstr "Piccola ascia di pietra"
 
-#: src/content_toolitem.cpp:369
+#: src/content_toolitem.cpp:372
 msgid "Stone Axe"
 msgstr "Ascia di pietra"
 
-#: src/content_toolitem.cpp:383
+#: src/content_toolitem.cpp:386
 msgid "Flint Axe"
 msgstr "Ascia di selce"
 
-#: src/content_toolitem.cpp:397
+#: src/content_toolitem.cpp:400
 msgid "Steel Axe"
 msgstr "Ascia di acciaio"
 
-#: src/content_toolitem.cpp:411
+#: src/content_toolitem.cpp:414
 msgid "Wooden Club"
 msgstr "Mazza di legno"
 
-#: src/content_toolitem.cpp:426
+#: src/content_toolitem.cpp:429
 msgid "Stone Sword"
 msgstr "Spada di pietra"
 
-#: src/content_toolitem.cpp:440
+#: src/content_toolitem.cpp:443
 msgid "Steel Sword"
 msgstr "Spada di acciaio"
 
-#: src/content_toolitem.cpp:454
+#: src/content_toolitem.cpp:457
 msgid "Flint Shears"
 msgstr "Cesoie di selce"
 
-#: src/content_toolitem.cpp:468
+#: src/content_toolitem.cpp:471
 msgid "Steel Shears"
 msgstr "Cesoie di acciaio"
 
-#: src/content_toolitem.cpp:482
+#: src/content_toolitem.cpp:485
 msgid "Wooden Bucket"
 msgstr "Secchio di legno"
 
-#: src/content_toolitem.cpp:499
+#: src/content_toolitem.cpp:502
 msgid "Tin Bucket"
 msgstr "Secchio di latta"
 
-#: src/content_toolitem.cpp:515
+#: src/content_toolitem.cpp:518
 msgid "Wooden Bucket of Water"
 msgstr "Secchio di legno con acqua"
 
-#: src/content_toolitem.cpp:526
+#: src/content_toolitem.cpp:529
 msgid "Tin Bucket of Water"
 msgstr "Secchio di latta con acqua"
 
-#: src/content_toolitem.cpp:537
+#: src/content_toolitem.cpp:540
 msgid "Steel Bucket"
 msgstr "Secchio di acciaio"
 
-#: src/content_toolitem.cpp:552
+#: src/content_toolitem.cpp:555
 msgid "Steel Bucket of Water"
 msgstr "Secchio di acciaio con acqua"
 
-#: src/content_toolitem.cpp:563
+#: src/content_toolitem.cpp:566
 msgid "Steel Bucket of Lava"
 msgstr "Secchio di acciaio con lava"
 
-#: src/content_toolitem.cpp:575
+#: src/content_toolitem.cpp:578
 msgid "Fire Starter"
 msgstr "Acciarino"
 
-#: src/content_toolitem.cpp:589
+#: src/content_toolitem.cpp:592
 msgid "Crowbar"
 msgstr "Piede di porco"
 
-#: src/content_toolitem.cpp:602
+#: src/content_toolitem.cpp:605
 msgid "Key"
 msgstr "Chiave"
 
-#: src/content_toolitem.cpp:614
+#: src/content_toolitem.cpp:617
 msgid "Stone Spear"
 msgstr "Lancia di pietra"
 
-#: src/content_toolitem.cpp:628
+#: src/content_toolitem.cpp:631
 msgid "Flint Spear"
 msgstr "Lancia di selce"
 
-#: src/content_toolitem.cpp:642
+#: src/content_toolitem.cpp:645
 msgid "Steel Spear"
 msgstr "Lancia di acciaio"
 
-#: src/content_toolitem.cpp:656
+#: src/content_toolitem.cpp:659
 msgid "Bow"
 msgstr "Arco"
 
-#: src/content_toolitem.cpp:676
+#: src/content_toolitem.cpp:679
 msgid "Raw Mithril Pick"
 msgstr "Piccone di mithril grezzo"
 
-#: src/content_toolitem.cpp:690
+#: src/content_toolitem.cpp:693
 msgid "Raw Mithril Shovel"
 msgstr "Vanga di mithril grezzo"
 
-#: src/content_toolitem.cpp:704
+#: src/content_toolitem.cpp:707
 msgid "Raw Mithril Axe"
 msgstr "Ascia di mithril grezzo"
 
-#: src/content_toolitem.cpp:718
+#: src/content_toolitem.cpp:721
 msgid "Raw Mithril Sword"
 msgstr "Spada di mithril grezzo"
 
-#: src/content_toolitem.cpp:732
+#: src/content_toolitem.cpp:735
 msgid "Raw Mithril Spear"
 msgstr "Lancia di mithril grezzo"
 
-#: src/content_toolitem.cpp:746
+#: src/content_toolitem.cpp:749
 msgid "Unbound Mithril Pick"
 msgstr "Piccone di mithril sciolto"
 
-#: src/content_toolitem.cpp:760
+#: src/content_toolitem.cpp:763
 msgid "Unbound Mithril Shovel"
 msgstr "Vanga di mithril sciolto"
 
-#: src/content_toolitem.cpp:774
+#: src/content_toolitem.cpp:777
 msgid "Unbound Mithril Axe"
 msgstr "Ascia di mithril sciolto"
 
-#: src/content_toolitem.cpp:788
+#: src/content_toolitem.cpp:791
 msgid "Unbound Mithril Sword"
 msgstr "Spada di mithril sciolto"
 
-#: src/content_toolitem.cpp:802
+#: src/content_toolitem.cpp:805
 msgid "Unbound Mithril Spear"
 msgstr "Lancia di mithril sciolto"
 
-#: src/content_toolitem.cpp:816
+#: src/content_toolitem.cpp:819
 msgid "Mithril Pick"
 msgstr "Piccone di mithril"
 
-#: src/content_toolitem.cpp:831
+#: src/content_toolitem.cpp:834
 msgid "Mithril Shovel"
 msgstr "Vanga di mithril"
 
-#: src/content_toolitem.cpp:845
+#: src/content_toolitem.cpp:848
 msgid "Mithril Axe"
 msgstr "Ascia di mithril"
 
-#: src/content_toolitem.cpp:859
+#: src/content_toolitem.cpp:862
 msgid "Mithril Sword"
 msgstr "Spada di mithril"
 
-#: src/content_toolitem.cpp:873
+#: src/content_toolitem.cpp:876
 msgid "Mithril Spear"
 msgstr "Lancia di mithril"
 
-#: src/content_toolitem.cpp:887
+#: src/content_toolitem.cpp:890
 msgid "Mob Spawner"
 msgstr "Generatore di mob"
 
-#: src/game.cpp:209
+#: src/content_toolitem.cpp:909
+#, fuzzy
+msgid "Mithril Key"
+msgstr "Ascia di mithril"
+
+#: src/game.cpp:210
 msgid "Clothes"
 msgstr "Abiti"
 
-#: src/game.cpp:210
+#: src/game.cpp:211
 msgid "Hat/Helmet"
 msgstr "Cappello/Elmo"
 
-#: src/game.cpp:212
+#: src/game.cpp:213
 msgid "Jacket"
 msgstr "Giacca"
 
-#: src/game.cpp:214
+#: src/game.cpp:215
 msgid "Decorative"
 msgstr "Decorativo"
 
-#: src/game.cpp:216
+#: src/game.cpp:217
 msgid "Shirt"
 msgstr "Camicia"
 
-#: src/game.cpp:218
+#: src/game.cpp:219
 msgid "Belt"
 msgstr "Cintura"
 
-#: src/game.cpp:220
+#: src/game.cpp:221
 msgid "Pants"
 msgstr "Pantaloni"
 
-#: src/game.cpp:222
+#: src/game.cpp:223
 msgid "Boots"
 msgstr "Stivali"
 
-#: src/game.cpp:229
+#: src/game.cpp:230
 msgid "Drop to Ground"
 msgstr "Lascia a terra"
 
-#: src/game.cpp:231
+#: src/game.cpp:232
 msgid "Change Clothing"
 msgstr "Cambia gli abiti"
 
-#: src/game.cpp:590
+#: src/game.cpp:591
 msgid "Loading"
 msgstr "Caricamento"
 
-#: src/game.cpp:662
+#: src/game.cpp:663
 msgid "Loading..."
 msgstr "Caricamento..."
 
-#: src/game.cpp:671
+#: src/game.cpp:672
 msgid "Creating server..."
 msgstr "Creazione del server..."
 
-#: src/game.cpp:682
+#: src/game.cpp:683
 msgid "Creating client..."
 msgstr "Creazione del client..."
 
-#: src/game.cpp:687
+#: src/game.cpp:688
 msgid "Resolving address..."
 msgstr "Determinazione dell'indirizzo..."
 
-#: src/game.cpp:698
+#: src/game.cpp:699
 msgid "Couldn't resolve address"
 msgstr "Non è stato possibile determinare l'indirizzo"
 
-#: src/game.cpp:738
+#: src/game.cpp:739
 #, c-format
 msgid "Connecting to server... (timeout in %d second)"
 msgid_plural "Connecting to server... (timeout in %d seconds)"
 msgstr[0] "Connessione al server... (scadenza in %d secondo)"
 msgstr[1] "Connessione al server... (scadenza in %d secondi)"
 
-#: src/game.cpp:767
+#: src/game.cpp:768
 #, c-format
 msgid "Access denied. Reason: %ls"
 msgstr "Accesso negato. Motivo: %ls"
 
-#: src/game.cpp:771
+#: src/game.cpp:772
 msgid "Unable to Connect (port already in use?)."
 msgstr "Impossibile connettersi (porta già in uso?)."
 
-#: src/game.cpp:774
+#: src/game.cpp:775
 msgid "Connection timed out."
 msgstr "Tempo di connessione scaduto."
 
-#: src/game.cpp:927
+#: src/game.cpp:928
 msgid "Access denied. Reason: "
 msgstr "Accesso negato. Motivo:"
 
-#: src/game.cpp:1161
+#: src/game.cpp:1162
 msgid "free_move disabled"
 msgstr "movimento_libero disabilitato"
 
-#: src/game.cpp:1165
+#: src/game.cpp:1166
 msgid "free_move enabled"
 msgstr "movimento_libero abilitato"
 
-#: src/game.cpp:1177
+#: src/game.cpp:1178
 #, c-format
 msgid "Saved screenshot to '%s'"
 msgstr "Schermata salvata in '%s'"
 
-#: src/game.cpp:1189
+#: src/game.cpp:1190
 msgid "HUD shown"
 msgstr "Visore visibile"
 
-#: src/game.cpp:1191
+#: src/game.cpp:1192
 msgid "HUD hidden"
 msgstr "Visore nascosto"
 
-#: src/game.cpp:1197
+#: src/game.cpp:1198
 msgid "Chat shown"
 msgstr "Messaggistica visibile"
 
-#: src/game.cpp:1199
+#: src/game.cpp:1200
 msgid "Chat hidden"
 msgstr "Messaggistica nascosta"
 
-#: src/game.cpp:1205
+#: src/game.cpp:1206
 msgid "Fog disabled"
 msgstr "Nebbia disabilitata"
 
-#: src/game.cpp:1207
+#: src/game.cpp:1208
 msgid "Fog enabled"
 msgstr "Nebbia abilitata"
 
-#: src/game.cpp:1213
+#: src/game.cpp:1214
 msgid "Camera update disabled"
 msgstr "Aggiornamento della camera disabilitato"
 
-#: src/game.cpp:1215
+#: src/game.cpp:1216
 msgid "Camera update enabled"
 msgstr "Aggiornamento della camera abilitato"
 
-#: src/game.cpp:1225
+#: src/game.cpp:1226
 msgid "Debug info shown"
 msgstr "Info. di debug visibili"
 
-#: src/game.cpp:1230
+#: src/game.cpp:1231
 msgid "Debug info and frametime graph hidden"
 msgstr "Info. di debug e dei fotogrammi nascoste"
 
-#: src/game.cpp:1234
+#: src/game.cpp:1235
 msgid "Frametime graph shown"
 msgstr "Grafico dei fotogrammi visibile"
 
-#: src/game.cpp:1246
+#: src/game.cpp:1247
 #, c-format
 msgid "Profiler shown (page %d of %d)"
 msgstr "Profiler visualizzato (pagina %d di %d)"
 
-#: src/game.cpp:1250
+#: src/game.cpp:1251
 msgid "Profiler hidden"
 msgstr "Profiler nascosto"
 
-#: src/game.cpp:1258 src/game.cpp:1269
+#: src/game.cpp:1259 src/game.cpp:1270
 #, c-format
 msgid "Minimum viewing range changed to %d"
 msgstr "Raggio visivo minimo impostato a %d"
 
-#: src/game.cpp:1338
+#: src/game.cpp:1339
 msgid "Enabled full viewing range"
 msgstr "Raggio visivo completo abilitato"
 
-#: src/game.cpp:1342
+#: src/game.cpp:1343
 msgid "Disabled full viewing range"
 msgstr "Raggio visivo completo disabilitato"
 
-#: src/game.cpp:1995
+#: src/game.cpp:1950
 msgid "Disconnected (Network Timeout)"
 msgstr "Disconnessione (timeout di rete)"
 
-#: src/game.cpp:2407
+#: src/game.cpp:2382
 msgid "Shutting down..."
 msgstr "Spegnimento..."
 
@@ -3485,236 +3511,290 @@ msgstr "Click sx: muove tutti gli oggetti; click dx: muove un oggetto"
 msgid "Write It"
 msgstr "Scriverlo"
 
-#: src/guiMainMenu.cpp:347
+#: src/guiMainMenu.cpp:319
 msgid "Character Creator"
 msgstr "Creatore del personaggio"
 
-#: src/guiMainMenu.cpp:353 src/guiMainMenu.cpp:478 src/guiMainMenu.cpp:520
-#: src/guiMainMenu.cpp:631
+#: src/guiMainMenu.cpp:325 src/guiMainMenu.cpp:386 src/guiMainMenu.cpp:428
+#: src/guiMainMenu.cpp:539
 msgid "Single Player"
 msgstr "Giocatore singolo"
 
-#: src/guiMainMenu.cpp:359 src/guiMainMenu.cpp:410
+#: src/guiMainMenu.cpp:331 src/guiMultiplayerMenu.cpp:161
 msgid "Multi Player"
 msgstr "Giocatori multipli"
 
-#: src/guiMainMenu.cpp:365 src/guiPauseMenu.cpp:155
+#: src/guiMainMenu.cpp:337 src/guiPauseMenu.cpp:155
 msgid "Settings"
 msgstr "Impostazioni"
 
-#: src/guiMainMenu.cpp:371
+#: src/guiMainMenu.cpp:343
 msgid "Credits"
 msgstr "Riconoscimenti"
 
-#: src/guiMainMenu.cpp:377
+#: src/guiMainMenu.cpp:349
 msgid "Quit"
 msgstr "Uscire"
 
-#: src/guiMainMenu.cpp:418
-msgid "Name/Password"
-msgstr "Nome/Password"
-
-#: src/guiMainMenu.cpp:446
-msgid "Address/Port"
-msgstr "Indirizzo/Porta"
-
-#: src/guiMainMenu.cpp:472
-msgid "Connect"
-msgstr "Connessione"
-
-#: src/guiMainMenu.cpp:487 src/guiMainMenu.cpp:529 src/guiMainMenu.cpp:640
+#: src/guiMainMenu.cpp:395 src/guiMainMenu.cpp:437 src/guiMainMenu.cpp:548
 msgid "Creative Mode"
 msgstr "Modalità creativa"
 
-#: src/guiMainMenu.cpp:488 src/guiMainMenu.cpp:530 src/guiMainMenu.cpp:641
+#: src/guiMainMenu.cpp:396 src/guiMainMenu.cpp:438 src/guiMainMenu.cpp:549
 msgid "Adventure Mode"
 msgstr "Modalità avventura"
 
-#: src/guiMainMenu.cpp:489 src/guiMainMenu.cpp:531 src/guiMainMenu.cpp:642
+#: src/guiMainMenu.cpp:397 src/guiMainMenu.cpp:439 src/guiMainMenu.cpp:550
 msgid "Survival Mode"
 msgstr "Modalità sopravvivenza"
 
-#: src/guiMainMenu.cpp:502 src/guiMainMenu.cpp:655
+#: src/guiMainMenu.cpp:410 src/guiMainMenu.cpp:563
 msgid "Advanced Settings"
 msgstr "Impostazioni avanzate"
 
-#: src/guiMainMenu.cpp:508 src/guiMainMenu.cpp:550
+#: src/guiMainMenu.cpp:416 src/guiMainMenu.cpp:458
 msgid "Map Options"
 msgstr "Opzioni della mappa"
 
-#: src/guiMainMenu.cpp:514 src/guiMainMenu.cpp:625 src/guiMainMenu.cpp:750
+#: src/guiMainMenu.cpp:422 src/guiMainMenu.cpp:533 src/guiMainMenu.cpp:658
 msgid "Start Game"
 msgstr "Avvio del gioco"
 
-#: src/guiMainMenu.cpp:544
+#: src/guiMainMenu.cpp:452
 msgid "Hide Advanced Settings"
 msgstr "Nascondere le impostazioni avanzate"
 
-#: src/guiMainMenu.cpp:555
+#: src/guiMainMenu.cpp:463
 msgid "Creatures"
 msgstr "Creature"
 
-#: src/guiMainMenu.cpp:562
+#: src/guiMainMenu.cpp:470
 msgid "None"
 msgstr "Nessuna"
 
-#: src/guiMainMenu.cpp:563
+#: src/guiMainMenu.cpp:471
 msgid "Passive"
 msgstr "Passive"
 
-#: src/guiMainMenu.cpp:564
+#: src/guiMainMenu.cpp:472
 msgid "Passive & Aggressive"
 msgstr "Passive e aggressive"
 
-#: src/guiMainMenu.cpp:565
+#: src/guiMainMenu.cpp:473
 msgid "Passive, Aggressive, & Destructive"
 msgstr "Passive, aggressive e distruttive"
 
-#: src/guiMainMenu.cpp:579
+#: src/guiMainMenu.cpp:487
 msgid "Player Damage"
 msgstr "Giocatore vulnerabile"
 
-#: src/guiMainMenu.cpp:584
+#: src/guiMainMenu.cpp:492
 msgid "Suffocation/Drowning"
 msgstr "Soffocamento/Annegamento"
 
-#: src/guiMainMenu.cpp:589
+#: src/guiMainMenu.cpp:497
 msgid "Hunger"
 msgstr "Fame"
 
-#: src/guiMainMenu.cpp:594
+#: src/guiMainMenu.cpp:502
 msgid "Tool Wear"
 msgstr "Indossare gli attrezzi"
 
-#: src/guiMainMenu.cpp:599
+#: src/guiMainMenu.cpp:507
 msgid "Dangerous Fire"
 msgstr "Fuoco pericoloso"
 
-#: src/guiMainMenu.cpp:604
+#: src/guiMainMenu.cpp:512
 msgid "Infinite Inventory"
 msgstr "Inventario infinito"
 
-#: src/guiMainMenu.cpp:609
+#: src/guiMainMenu.cpp:517
 msgid "Initial Inventory"
 msgstr "Inventario iniziale"
 
-#: src/guiMainMenu.cpp:614
+#: src/guiMainMenu.cpp:522
 msgid "Droppable Inventory"
 msgstr "Inventario rilasciabile a terra"
 
-#: src/guiMainMenu.cpp:619
+#: src/guiMainMenu.cpp:527
 msgid "Death drops Inventory"
 msgstr "Morire rilascia l'inventario"
 
-#: src/guiMainMenu.cpp:661
+#: src/guiMainMenu.cpp:569
 msgid "Hide Map Options"
 msgstr "Nascondere le opzioni della mappa"
 
-#: src/guiMainMenu.cpp:666
+#: src/guiMainMenu.cpp:574
 msgid "Create New Map"
 msgstr "Creare una nuova mappa"
 
-#: src/guiMainMenu.cpp:672
+#: src/guiMainMenu.cpp:580
 msgid "Warning! Your old map will be deleted!"
 msgstr "Attenzione! La vostra vecchia mappa verrà cancellata!"
 
-#: src/guiMainMenu.cpp:678
+#: src/guiMainMenu.cpp:586
 msgid "Map Type"
 msgstr "Tipo di mappa"
 
-#: src/guiMainMenu.cpp:685
+#: src/guiMainMenu.cpp:593
 msgid "Flat"
 msgstr "Piatta"
 
-#: src/guiMainMenu.cpp:686
+#: src/guiMainMenu.cpp:594
 msgid "Flatter"
 msgstr "Più piatta"
 
-#: src/guiMainMenu.cpp:687
+#: src/guiMainMenu.cpp:595
 msgid "Smoother"
 msgstr "Più levigata"
 
-#: src/guiMainMenu.cpp:688
+#: src/guiMainMenu.cpp:596
 msgid "Default"
 msgstr "Predefinita"
 
-#: src/guiMainMenu.cpp:689
+#: src/guiMainMenu.cpp:597
 msgid "Hilly"
 msgstr "Collinosa"
 
-#: src/guiMainMenu.cpp:690
+#: src/guiMainMenu.cpp:598
 msgid "Mountains"
 msgstr "Con montagne"
 
-#: src/guiMainMenu.cpp:691
+#: src/guiMainMenu.cpp:599
 msgid "Crazy"
 msgstr "Pazzesca"
 
-#: src/guiMainMenu.cpp:692
+#: src/guiMainMenu.cpp:600
 msgid "Crazy Hills"
 msgstr "Colline pazzesche"
 
-#: src/guiMainMenu.cpp:714
+#: src/guiMainMenu.cpp:622
 msgid "Use Fixed Seed"
 msgstr "Seme casuale fisso"
 
-#: src/guiMainMenu.cpp:720
+#: src/guiMainMenu.cpp:628
 msgid "Map Seed"
 msgstr "Seme casuale"
 
-#: src/guiMainMenu.cpp:737
+#: src/guiMainMenu.cpp:645
 msgid "Clear Map"
 msgstr "Pulire la mappa"
 
-#: src/guiMainMenu.cpp:742
+#: src/guiMainMenu.cpp:650
 msgid "Warning! This will delete all construction from your map!"
 msgstr "Attenzione! Questo cancellerà tutte le costruzioni dalla vostra mappa!"
 
-#: src/guiMainMenu.cpp:760
+#: src/guiMainMenu.cpp:668
 msgid ""
 "Voxelands\n"
 "http://www.voxelands.com/\n"
 "By Lisa 'darkrose' Milne <lisa@ltmnet.com> and contributors."
-msgstr "Voxelands\nhttp://www.voxelands.com/\nDi Lisa 'darkrose' Milne <lisa@ltmnet.com> e contributori."
+msgstr ""
+"Voxelands\n"
+"http://www.voxelands.com/\n"
+"Di Lisa 'darkrose' Milne <lisa@ltmnet.com> e contributori."
 
-#: src/guiMainMenu.cpp:767
+#: src/guiMainMenu.cpp:675
 msgid "Programmers"
 msgstr "Programmatori"
 
-#: src/guiMainMenu.cpp:770
+#: src/guiMainMenu.cpp:678
 msgid "Artists and Modellers"
 msgstr "Artisti e modellisti"
 
-#: src/guiMainMenu.cpp:773
+#: src/guiMainMenu.cpp:681
 msgid "Translators"
 msgstr "Traduttori"
 
-#: src/guiMainMenu.cpp:776
+#: src/guiMainMenu.cpp:684
 msgid "Documentation Writters"
 msgstr "Scrittori della documentazione"
 
-#: src/guiMainMenu.cpp:779
+#: src/guiMainMenu.cpp:687
 msgid "Testers, Packagers, and Builders"
 msgstr "Tester, impacchettatori, e builder"
 
-#: src/guiMainMenu.cpp:782
+#: src/guiMainMenu.cpp:690
 msgid "Music and Sound Effects Composers"
 msgstr "Compositori di musica ed effetti sonori"
 
-#: src/guiMainMenu.cpp:785
+#: src/guiMainMenu.cpp:693
 msgid "Other Contributers, and Special Thanks"
 msgstr "Altri contributori, e ringraziamenti speciali"
 
-#: src/guiMainMenu.cpp:789
+#: src/guiMainMenu.cpp:697
 msgid ""
 "Based on Minetest-C55 by Perttu Ahola <celeron55@gmail.com>\n"
-"and contributors: PilzAdam, Taoki, tango_, kahrl (kaaaaaahrl?), darkrose, matttpt, erlehmann, SpeedProg, JacobF, teddydestodes, marktraceur, Jonathan Neuschafer, thexyz, VanessaE, sfan5... and tens of more random people."
-msgstr "Basato su Minetest-C55 di Perttu Ahola <celeron55@gmail.com>\ne contributori: PilzAdam, Taoki, tango_, kahrl (kaaaaaahrl?), darkrose, matttpt, erlehmann, SpeedProg, JacobF, teddydestodes, marktraceur, Jonathan Neuschafer, thexyz, VanessaE, sfan5... e decine d'altre persone a caso."
+"and contributors: PilzAdam, Taoki, tango_, kahrl (kaaaaaahrl?), darkrose, "
+"matttpt, erlehmann, SpeedProg, JacobF, teddydestodes, marktraceur, Jonathan "
+"Neuschafer, thexyz, VanessaE, sfan5... and tens of more random people."
+msgstr ""
+"Basato su Minetest-C55 di Perttu Ahola <celeron55@gmail.com>\n"
+"e contributori: PilzAdam, Taoki, tango_, kahrl (kaaaaaahrl?), darkrose, "
+"matttpt, erlehmann, SpeedProg, JacobF, teddydestodes, marktraceur, Jonathan "
+"Neuschafer, thexyz, VanessaE, sfan5... e decine d'altre persone a caso."
 
 #: src/guiMessageMenu.cpp:112 src/guiPauseMenu.cpp:143
 msgid "Continue"
 msgstr "Proseguire"
 
+#: src/guiMultiplayerMenu.cpp:135 src/guiSettingsMenu.cpp:277
+msgid "Main Menu"
+msgstr "Menu principale"
+
+#: src/guiMultiplayerMenu.cpp:142
+msgid "All Servers"
+msgstr ""
+
+#: src/guiMultiplayerMenu.cpp:148
+msgid "Favourite Servers"
+msgstr ""
+
+#: src/guiMultiplayerMenu.cpp:154
+#, fuzzy
+msgid "Custom Connect"
+msgstr "Connessione"
+
+#: src/guiMultiplayerMenu.cpp:169
+msgid "Custom Connection"
+msgstr ""
+
+#: src/guiMultiplayerMenu.cpp:176
+msgid "Address/Port"
+msgstr "Indirizzo/Porta"
+
+#: src/guiMultiplayerMenu.cpp:201 src/guiMultiplayerMenu.cpp:313
+msgid "Add to Favourites"
+msgstr ""
+
+#: src/guiMultiplayerMenu.cpp:206 src/guiMultiplayerMenu.cpp:320
+msgid "Connect"
+msgstr "Connessione"
+
+#: src/guiMultiplayerMenu.cpp:213
+msgid "Name/Password"
+msgstr "Nome/Password"
+
+#: src/guiMultiplayerMenu.cpp:240
+msgid "Join Server"
+msgstr ""
+
+#: src/guiMultiplayerMenu.cpp:262
+msgid "My Favourites"
+msgstr ""
+
+#: src/guiMultiplayerMenu.cpp:265
+msgid "Server List"
+msgstr ""
+
+#: src/guiMultiplayerMenu.cpp:270
+msgid "Get New List"
+msgstr ""
+
+#: src/guiMultiplayerMenu.cpp:307
+msgid "Remove from Favourites"
+msgstr ""
+
 #: src/guiPasswordChange.cpp:105
 msgid "Old Password"
 msgstr "Vecchia password"
@@ -3755,11 +3835,11 @@ msgstr "Avanti"
 msgid "Backward"
 msgstr "Indietro"
 
-#: src/guiSettingsMenu.cpp:72 src/keycode.cpp:234
+#: src/guiSettingsMenu.cpp:72 src/keycode.cpp:263
 msgid "Left"
 msgstr "Sinistra"
 
-#: src/guiSettingsMenu.cpp:73 src/keycode.cpp:234
+#: src/guiSettingsMenu.cpp:73 src/keycode.cpp:265
 msgid "Right"
 msgstr "Destra"
 
@@ -3795,11 +3875,11 @@ msgstr "Selezione raggio"
 msgid "Toggle Fly"
 msgstr "Volare Sì/No"
 
-#: src/guiSettingsMenu.cpp:82 src/keycode.cpp:234
+#: src/guiSettingsMenu.cpp:82 src/keycode.cpp:264
 msgid "Up"
 msgstr "Su"
 
-#: src/guiSettingsMenu.cpp:83 src/keycode.cpp:234
+#: src/guiSettingsMenu.cpp:83 src/keycode.cpp:266
 msgid "Down"
 msgstr "Giu"
 
@@ -3843,10 +3923,6 @@ msgstr "Oggetto precedente"
 msgid "Next Item"
 msgstr "Oggetto successivo"
 
-#: src/guiSettingsMenu.cpp:277
-msgid "Main Menu"
-msgstr "Menu principale"
-
 #: src/guiSettingsMenu.cpp:284 src/guiSettingsMenu.cpp:311
 msgid "Controls"
 msgstr "Controlli"
@@ -3954,362 +4030,576 @@ msgstr "Incremento energetico: %d:%02d"
 msgid "Cold Protection: %d:%02d"
 msgstr "Protezione dal freddo: %d:%02d"
 
-#: src/inventory.cpp:230 src/inventory.cpp:352
-msgid "Cookable: Yes"
-msgstr "Cucinabile: sì"
-
-#: src/inventory.cpp:235 src/inventory.cpp:357 src/inventory.cpp:532
-msgid "Fuel Burn Time: "
-msgstr "Tempo di bruciatura del combustibile: "
-
-#: src/inventory.cpp:321
-msgid "Hunger: "
-msgstr "Fame: "
-
-#: src/inventory.cpp:327
-msgid "Health: "
-msgstr "Salute: "
-
-#: src/inventory.cpp:334
-msgid "Cold Protection: "
-msgstr "Protezione dal freddo: "
-
-#: src/inventory.cpp:343
-msgid "Energy Boost: "
-msgstr "Incremento energetico: "
-
-#: src/inventory.cpp:521
-msgid "Strength: "
-msgstr "Forza: "
-
-#: src/inventory.cpp:524
-msgid "Speed: "
-msgstr "Velocità: "
-
-#: src/inventory.cpp:527
-msgid "Level: "
-msgstr "Livello: "
-
-#: src/inventory.cpp:557
+#: src/inventory.cpp:246 src/inventory.cpp:580
 msgid "Contains: "
 msgstr "Contiene: "
 
-#: src/inventory.cpp:643
+#: src/inventory.cpp:253 src/inventory.cpp:375
+msgid "Cookable: Yes"
+msgstr "Cucinabile: sì"
+
+#: src/inventory.cpp:258 src/inventory.cpp:380 src/inventory.cpp:555
+msgid "Fuel Burn Time: "
+msgstr "Tempo di bruciatura del combustibile: "
+
+#: src/inventory.cpp:344
+msgid "Hunger: "
+msgstr "Fame: "
+
+#: src/inventory.cpp:350
+msgid "Health: "
+msgstr "Salute: "
+
+#: src/inventory.cpp:357
+msgid "Cold Protection: "
+msgstr "Protezione dal freddo: "
+
+#: src/inventory.cpp:366
+msgid "Energy Boost: "
+msgstr "Incremento energetico: "
+
+#: src/inventory.cpp:544
+msgid "Strength: "
+msgstr "Forza: "
+
+#: src/inventory.cpp:547
+msgid "Speed: "
+msgstr "Velocità: "
+
+#: src/inventory.cpp:550
+msgid "Level: "
+msgstr "Livello: "
+
+#: src/inventory.cpp:666
 msgid "Armour: "
 msgstr "Armatura: "
 
-#: src/inventory.cpp:649
+#: src/inventory.cpp:672
 msgid "Warmth: "
 msgstr "Calore: "
 
-#: src/inventory.cpp:655
+#: src/inventory.cpp:678
 msgid "Pressure: "
 msgstr "Pressione: "
 
-#: src/inventory.cpp:661
+#: src/inventory.cpp:684
 msgid "Suffocation: "
 msgstr "Soffocamento: "
 
-#: src/inventory.cpp:667
+#: src/inventory.cpp:690
 msgid "Durability: "
 msgstr "Durata: "
 
-#: src/inventory.cpp:672
+#: src/inventory.cpp:695
 msgid "Effect Boost: "
 msgstr "Effetto di incremento: "
 
-#: src/keycode.cpp:229
+#: src/keycode.cpp:232
+msgid "-"
+msgstr ""
+
+#: src/keycode.cpp:234
 msgid "Left Button"
 msgstr "Pulsante sinistro"
 
-#: src/keycode.cpp:229
-msgid "Middle Button"
-msgstr "Pulsante centrale"
-
-#: src/keycode.cpp:229
+#: src/keycode.cpp:235
 msgid "Right Button"
 msgstr "Pulsante destro"
 
-#: src/keycode.cpp:229
+#: src/keycode.cpp:237
+msgid "Middle Button"
+msgstr "Pulsante centrale"
+
+#: src/keycode.cpp:238
 msgid "X Button 1"
 msgstr "Pulsante X 1"
 
-#: src/keycode.cpp:230
-msgid "Back"
-msgstr "Indietro"
-
-#: src/keycode.cpp:230
-msgid "Clear"
-msgstr "Pulire"
-
-#: src/keycode.cpp:230
-msgid "Return"
-msgstr "Invio"
-
-#: src/keycode.cpp:230
-msgid "Tab"
-msgstr "Tabulazione"
-
-#: src/keycode.cpp:230
+#: src/keycode.cpp:239
 msgid "X Button 2"
 msgstr "Pulsante X 2"
 
-#: src/keycode.cpp:231
-msgid "Capital"
-msgstr "Maiuscolo"
+#: src/keycode.cpp:240
+msgid "Back"
+msgstr "Indietro"
 
-#: src/keycode.cpp:231
-msgid "Control"
-msgstr "Control"
+#: src/keycode.cpp:241
+msgid "Tab"
+msgstr "Tabulazione"
 
-#: src/keycode.cpp:231
-msgid "Kana"
-msgstr "Kana"
+#: src/keycode.cpp:242
+msgid "Clear"
+msgstr "Pulire"
 
-#: src/keycode.cpp:231
-msgid "Menu"
-msgstr "Menu"
+#: src/keycode.cpp:243
+msgid "Return"
+msgstr "Invio"
 
-#: src/keycode.cpp:231
-msgid "Pause"
-msgstr "Pausa"
-
-#: src/keycode.cpp:231
+#: src/keycode.cpp:244
 msgid "Shift"
 msgstr "Shift"
 
-#: src/keycode.cpp:232
-msgid "Convert"
-msgstr "Convertire"
+#: src/keycode.cpp:245
+msgid "Control"
+msgstr "Control"
 
-#: src/keycode.cpp:232
-msgid "Escape"
-msgstr "Esc"
+#: src/keycode.cpp:246
+msgid "Menu"
+msgstr "Menu"
 
-#: src/keycode.cpp:232
-msgid "Final"
-msgstr "Finale"
+#: src/keycode.cpp:247
+msgid "Pause"
+msgstr "Pausa"
 
-#: src/keycode.cpp:232
+#: src/keycode.cpp:248
+msgid "Capital"
+msgstr "Maiuscolo"
+
+#: src/keycode.cpp:249
+msgid "Kana"
+msgstr "Kana"
+
+#: src/keycode.cpp:250
 msgid "Junja"
 msgstr "Junja"
 
-#: src/keycode.cpp:232
+#: src/keycode.cpp:251
+msgid "Final"
+msgstr "Finale"
+
+#: src/keycode.cpp:252
 msgid "Kanji"
 msgstr "Kanji"
 
-#: src/keycode.cpp:232
+#: src/keycode.cpp:253
+msgid "Escape"
+msgstr "Esc"
+
+#: src/keycode.cpp:254
+msgid "Convert"
+msgstr "Convertire"
+
+#: src/keycode.cpp:255
 msgid "Nonconvert"
 msgstr "Non convertire"
 
-#: src/keycode.cpp:233
+#: src/keycode.cpp:256
 msgid "Accept"
 msgstr "Accettare"
 
-#: src/keycode.cpp:233
-msgid "End"
-msgstr "Fine"
-
-#: src/keycode.cpp:233
-msgid "Home"
-msgstr "Inizio"
-
-#: src/keycode.cpp:233
+#: src/keycode.cpp:257
 msgid "Mode Change"
 msgstr "Cambio di modo"
 
-#: src/keycode.cpp:233
-msgid "Next"
-msgstr "Prossimo"
-
-#: src/keycode.cpp:233
-msgid "Prior"
-msgstr "Precedente"
-
-#: src/keycode.cpp:233
+#: src/keycode.cpp:258
 msgid "Space"
 msgstr "Spazio"
 
-#: src/keycode.cpp:234
-msgid "Execute"
-msgstr "Esegui"
+#: src/keycode.cpp:259
+msgid "Prior"
+msgstr "Precedente"
 
-#: src/keycode.cpp:234
-msgid "Print"
-msgstr "Stampa"
+#: src/keycode.cpp:260
+msgid "Next"
+msgstr "Prossimo"
 
-#: src/keycode.cpp:234
+#: src/keycode.cpp:261
+msgid "End"
+msgstr "Fine"
+
+#: src/keycode.cpp:262
+msgid "Home"
+msgstr "Inizio"
+
+#: src/keycode.cpp:267
 msgid "Select"
 msgstr "Seleziona"
 
-#: src/keycode.cpp:235
-msgid "Delete"
-msgstr "Cancella"
+#: src/keycode.cpp:268
+msgid "Print"
+msgstr "Stampa"
 
-#: src/keycode.cpp:235
-msgid "Help"
-msgstr "Aiuto"
+#: src/keycode.cpp:269
+msgid "Execute"
+msgstr "Esegui"
 
-#: src/keycode.cpp:235
-msgid "Insert"
-msgstr "Ins"
-
-#: src/keycode.cpp:235
+#: src/keycode.cpp:270
 msgid "Snapshot"
 msgstr "Istantanea"
 
-#: src/keycode.cpp:238
+#: src/keycode.cpp:271
+msgid "Insert"
+msgstr "Ins"
+
+#: src/keycode.cpp:272
+msgid "Delete"
+msgstr "Cancella"
+
+#: src/keycode.cpp:273
+msgid "Help"
+msgstr "Aiuto"
+
+#: src/keycode.cpp:274
+msgid "0"
+msgstr ""
+
+#: src/keycode.cpp:275
+msgid "1"
+msgstr ""
+
+#: src/keycode.cpp:276
+msgid "2"
+msgstr ""
+
+#: src/keycode.cpp:277
+msgid "3"
+msgstr ""
+
+#: src/keycode.cpp:278
+msgid "4"
+msgstr ""
+
+#: src/keycode.cpp:279
+msgid "5"
+msgstr ""
+
+#: src/keycode.cpp:280
+msgid "6"
+msgstr ""
+
+#: src/keycode.cpp:281
+msgid "7"
+msgstr ""
+
+#: src/keycode.cpp:282
+msgid "8"
+msgstr ""
+
+#: src/keycode.cpp:283
+msgid "9"
+msgstr ""
+
+#: src/keycode.cpp:284
+msgid "A"
+msgstr ""
+
+#: src/keycode.cpp:285
+msgid "B"
+msgstr ""
+
+#: src/keycode.cpp:286
+msgid "C"
+msgstr ""
+
+#: src/keycode.cpp:287
+msgid "D"
+msgstr ""
+
+#: src/keycode.cpp:288
+msgid "E"
+msgstr ""
+
+#: src/keycode.cpp:289
+msgid "F"
+msgstr ""
+
+#: src/keycode.cpp:290
+msgid "G"
+msgstr ""
+
+#: src/keycode.cpp:291
+msgid "H"
+msgstr ""
+
+#: src/keycode.cpp:292
+msgid "I"
+msgstr ""
+
+#: src/keycode.cpp:293
+msgid "J"
+msgstr ""
+
+#: src/keycode.cpp:294
+msgid "K"
+msgstr ""
+
+#: src/keycode.cpp:295
+msgid "L"
+msgstr ""
+
+#: src/keycode.cpp:296
+msgid "M"
+msgstr ""
+
+#: src/keycode.cpp:297
+msgid "N"
+msgstr ""
+
+#: src/keycode.cpp:298
+msgid "O"
+msgstr ""
+
+#: src/keycode.cpp:299
+msgid "P"
+msgstr ""
+
+#: src/keycode.cpp:300
+msgid "Q"
+msgstr ""
+
+#: src/keycode.cpp:301
+msgid "R"
+msgstr ""
+
+#: src/keycode.cpp:302
+msgid "S"
+msgstr ""
+
+#: src/keycode.cpp:303
+msgid "T"
+msgstr ""
+
+#: src/keycode.cpp:304
+#, fuzzy
+msgid "U"
+msgstr "Su"
+
+#: src/keycode.cpp:305
+msgid "V"
+msgstr ""
+
+#: src/keycode.cpp:306
+msgid "W"
+msgstr ""
+
+#: src/keycode.cpp:307
+msgid "X"
+msgstr ""
+
+#: src/keycode.cpp:308
+msgid "Y"
+msgstr ""
+
+#: src/keycode.cpp:309
+msgid "Z"
+msgstr ""
+
+#: src/keycode.cpp:310
 msgid "Left Windows"
 msgstr "Windows sinistro"
 
-#: src/keycode.cpp:239
-msgid "Apps"
-msgstr "App"
-
-#: src/keycode.cpp:239
-msgid "Numpad 0"
-msgstr "Tastierino numerico 0"
-
-#: src/keycode.cpp:239
-msgid "Numpad 1"
-msgstr "Tastierino numerico 1"
-
-#: src/keycode.cpp:239
+#: src/keycode.cpp:311
 msgid "Right Windows"
 msgstr "Windows dsestro"
 
-#: src/keycode.cpp:239
+#: src/keycode.cpp:312
+msgid "Apps"
+msgstr "App"
+
+#: src/keycode.cpp:313
 msgid "Sleep"
 msgstr "Sospensione"
 
-#: src/keycode.cpp:240
+#: src/keycode.cpp:314
+msgid "Numpad 0"
+msgstr "Tastierino numerico 0"
+
+#: src/keycode.cpp:315
+msgid "Numpad 1"
+msgstr "Tastierino numerico 1"
+
+#: src/keycode.cpp:316
 msgid "Numpad 2"
 msgstr "Tastierino numerico 2"
 
-#: src/keycode.cpp:240
+#: src/keycode.cpp:317
 msgid "Numpad 3"
 msgstr "Tastierino numerico 3"
 
-#: src/keycode.cpp:240
+#: src/keycode.cpp:318
 msgid "Numpad 4"
 msgstr "Tastierino numerico 4"
 
-#: src/keycode.cpp:240
+#: src/keycode.cpp:319
 msgid "Numpad 5"
 msgstr "Tastierino numerico 5"
 
-#: src/keycode.cpp:240
+#: src/keycode.cpp:320
 msgid "Numpad 6"
 msgstr "Tastierino numerico 6"
 
-#: src/keycode.cpp:240
+#: src/keycode.cpp:321
 msgid "Numpad 7"
 msgstr "Tastierino numerico 7"
 
-#: src/keycode.cpp:241
-msgid "Numpad *"
-msgstr "Tastierino numerico *"
-
-#: src/keycode.cpp:241
-msgid "Numpad +"
-msgstr "Tastierino numerico +"
-
-#: src/keycode.cpp:241
-msgid "Numpad -"
-msgstr "Tastierino numerico -"
-
-#: src/keycode.cpp:241
-msgid "Numpad /"
-msgstr "Tastierino numerico /"
-
-#: src/keycode.cpp:241
+#: src/keycode.cpp:322
 msgid "Numpad 8"
 msgstr "Tastierino numerico 8"
 
-#: src/keycode.cpp:241
+#: src/keycode.cpp:323
 msgid "Numpad 9"
 msgstr "Tastierino numerico 9"
 
-#: src/keycode.cpp:245
+#: src/keycode.cpp:324
+msgid "Numpad *"
+msgstr "Tastierino numerico *"
+
+#: src/keycode.cpp:325
+msgid "Numpad +"
+msgstr "Tastierino numerico +"
+
+#: src/keycode.cpp:326 src/keycode.cpp:329
+msgid "Numpad /"
+msgstr "Tastierino numerico /"
+
+#: src/keycode.cpp:327
+msgid "Numpad -"
+msgstr "Tastierino numerico -"
+
+#: src/keycode.cpp:328
+#, fuzzy
+msgid "Numpad ."
+msgstr "Tastierino numerico 0"
+
+#: src/keycode.cpp:330
+msgid "F10"
+msgstr ""
+
+#: src/keycode.cpp:331
+msgid "F11"
+msgstr ""
+
+#: src/keycode.cpp:332
+msgid "F12"
+msgstr ""
+
+#: src/keycode.cpp:333
+msgid "F13"
+msgstr ""
+
+#: src/keycode.cpp:334
+msgid "F14"
+msgstr ""
+
+#: src/keycode.cpp:335
+msgid "F15"
+msgstr ""
+
+#: src/keycode.cpp:336
+msgid "F16"
+msgstr ""
+
+#: src/keycode.cpp:337
+msgid "F17"
+msgstr ""
+
+#: src/keycode.cpp:338
+msgid "F18"
+msgstr ""
+
+#: src/keycode.cpp:339
+msgid "F19"
+msgstr ""
+
+#: src/keycode.cpp:340
+msgid "F20"
+msgstr ""
+
+#: src/keycode.cpp:341
+msgid "F21"
+msgstr ""
+
+#: src/keycode.cpp:342
+msgid "F22"
+msgstr ""
+
+#: src/keycode.cpp:343
+msgid "F23"
+msgstr ""
+
+#: src/keycode.cpp:344
+msgid "F24"
+msgstr ""
+
+#: src/keycode.cpp:345
 msgid "Num Lock"
 msgstr "Bloc num"
 
-#: src/keycode.cpp:245
+#: src/keycode.cpp:346
 msgid "Scroll Lock"
 msgstr "Bloc scorr"
 
-#: src/keycode.cpp:246
+#: src/keycode.cpp:347
 msgid "Left Shift"
 msgstr "Maiuscolo sinistro"
 
-#: src/keycode.cpp:246
+#: src/keycode.cpp:348
 msgid "Right Shift"
 msgstr "Maiuscolo destro"
 
-#: src/keycode.cpp:247
+#: src/keycode.cpp:349
 msgid "Left Control"
 msgstr "Control sinistro"
 
-#: src/keycode.cpp:247
-msgid "Left Menu"
-msgstr "Menù sinistro"
-
-#: src/keycode.cpp:247
+#: src/keycode.cpp:350
 msgid "Right Control"
 msgstr "Control destro"
 
-#: src/keycode.cpp:247
+#: src/keycode.cpp:351
+msgid "Left Menu"
+msgstr "Menù sinistro"
+
+#: src/keycode.cpp:352
 msgid "Right Menu"
 msgstr "Menù destro"
 
-#: src/keycode.cpp:249
-msgid "Comma"
-msgstr "Virgola"
-
-#: src/keycode.cpp:249
-msgid "Minus"
-msgstr "Meno"
-
-#: src/keycode.cpp:249
-msgid "Period"
-msgstr "Punto"
-
-#: src/keycode.cpp:249
+#: src/keycode.cpp:353
 msgid "Plus"
 msgstr "Più"
 
-#: src/keycode.cpp:253
+#: src/keycode.cpp:354
+msgid "Comma"
+msgstr "Virgola"
+
+#: src/keycode.cpp:355
+msgid "Minus"
+msgstr "Meno"
+
+#: src/keycode.cpp:356
+msgid "Period"
+msgstr "Punto"
+
+#: src/keycode.cpp:357
 msgid "Attn"
 msgstr "Attn"
 
-#: src/keycode.cpp:253
+#: src/keycode.cpp:358
 msgid "CrSel"
 msgstr "CrSel"
 
-#: src/keycode.cpp:254
-msgid "Erase OEF"
-msgstr "Erase OEF"
-
-#: src/keycode.cpp:254
+#: src/keycode.cpp:359
 msgid "ExSel"
 msgstr "ExSel"
 
-#: src/keycode.cpp:254
-msgid "OEM Clear"
-msgstr "OEM Clear"
+#: src/keycode.cpp:360
+msgid "Erase OEF"
+msgstr "Erase OEF"
 
-#: src/keycode.cpp:254
-msgid "PA1"
-msgstr "PA1"
-
-#: src/keycode.cpp:254
+#: src/keycode.cpp:361
 msgid "Play"
 msgstr "Esegui"
 
-#: src/keycode.cpp:254
+#: src/keycode.cpp:362
 msgid "Zoom"
 msgstr "Zoom"
 
+#: src/keycode.cpp:363
+msgid "PA1"
+msgstr "PA1"
+
+#: src/keycode.cpp:364
+msgid "OEM Clear"
+msgstr "OEM Clear"
+
 #: src/main.cpp:1131
 msgid "Setting Up UI"
 msgstr "Impostazione dell'interfaccia utente"
@@ -4326,30 +4616,70 @@ msgstr "Caricamento delle creature"
 msgid "Setting Up Sound"
 msgstr "Impostazione del suono"
 
-#: src/mapnode.cpp:282
+#: src/mapnode.cpp:285
 msgid "Loading Base MapNodes"
 msgstr "Caricamento dei nodi mappa di base"
 
-#: src/mapnode.cpp:286
+#: src/mapnode.cpp:289
 msgid "Loading Circuit MapNodes"
 msgstr "Caricamento dei nodi mappa della circuiteria"
 
-#: src/mapnode.cpp:290
+#: src/mapnode.cpp:293
 msgid "Loading Plant MapNodes"
 msgstr "Caricamento dei nodi mappa delle piante"
 
-#: src/mapnode.cpp:294
+#: src/mapnode.cpp:297
 msgid "Loading Farming MapNodes"
 msgstr "Caricamento dei nodi mappa agricoli"
 
-#: src/mapnode.cpp:298
+#: src/mapnode.cpp:301
 msgid "Loading Decorative MapNodes"
 msgstr "Caricamento dei nodi mappa decorativi"
 
-#: src/mapnode.cpp:302
+#: src/mapnode.cpp:305
 msgid "Loading Interactive MapNodes"
 msgstr "Caricamento dei nodi mappa interattivi"
 
-#: src/mapnode.cpp:306
+#: src/mapnode.cpp:309
 msgid "Loading Special MapNodes"
 msgstr "Caricamento dei nodi mappa speciali"
+
+#: src/mineral.cpp:93
+#, fuzzy
+msgid "Coal"
+msgstr "Grumo di carbone"
+
+#: src/mineral.cpp:99
+#, fuzzy
+msgid "Iron"
+msgstr "Grumo di ferro"
+
+#: src/mineral.cpp:106
+#, fuzzy
+msgid "Tin"
+msgstr "Sottile"
+
+#: src/mineral.cpp:113
+#, fuzzy
+msgid "Copper"
+msgstr "Grumo di rame"
+
+#: src/mineral.cpp:121
+#, fuzzy
+msgid "Silver"
+msgstr "Grumo di argento"
+
+#: src/mineral.cpp:128
+#, fuzzy
+msgid "Gold"
+msgstr "Grumo di oro"
+
+#: src/mineral.cpp:135
+#, fuzzy
+msgid "Quartz"
+msgstr "Polvere di quarzo"
+
+#: src/mineral.cpp:157
+#, fuzzy
+msgid "Turquoise"
+msgstr "Turchese"
diff --git a/po/ja/voxelands.po b/po/ja/voxelands.po
index 1ca520e..7eecd74 100644
--- a/po/ja/voxelands.po
+++ b/po/ja/voxelands.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Lisa 'darkrose' Milne
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # Rui, 2015
 # Rui Takeda, 2015
@@ -10,14 +10,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Voxelands\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-10-19 01:55+1000\n"
+"POT-Creation-Date: 2015-12-21 11:27+1000\n"
 "PO-Revision-Date: 2015-10-19 17:42+0000\n"
 "Last-Translator: Rui\n"
-"Language-Team: Japanese (http://www.transifex.com/voxelands/voxelands/language/ja/)\n"
+"Language-Team: Japanese (http://www.transifex.com/voxelands/voxelands/"
+"language/ja/)\n"
+"Language: ja\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: ja\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: src/character_creator.cpp:55
@@ -230,9 +231,15 @@ msgstr "ズック靴"
 
 #: src/character_creator.cpp:202
 msgid ""
-"Here you can create your default character, this is how other players will see you in-game. When you join a new server you will start with the clothing you select here. Additional clothing, both protective and decorative, can be crafted in-game.\n"
+"Here you can create your default character, this is how other players will "
+"see you in-game. When you join a new server you will start with the clothing "
+"you select here. Additional clothing, both protective and decorative, can be "
+"crafted in-game.\n"
 "You can return here from the main menu anytime to change your character."
-msgstr "ここではスキンを作成できます。\nスキンは他のプレイヤーに表示されます。\nタイトルからもこの設定に戻れます。"
+msgstr ""
+"ここではスキンを作成できます。\n"
+"スキンは他のプレイヤーに表示されます。\n"
+"タイトルからもこの設定に戻れます。"
 
 #: src/character_creator.cpp:223
 msgid "Create Your Character"
@@ -266,7 +273,7 @@ msgstr "細くする"
 msgid "Done"
 msgstr "決定"
 
-#: src/character_creator.cpp:423 src/keycode.cpp:229
+#: src/character_creator.cpp:423 src/keycode.cpp:236
 msgid "Cancel"
 msgstr "キャンセル"
 
@@ -1118,7 +1125,7 @@ msgstr "火打石"
 msgid "Steel Ingot"
 msgstr "鉄インゴット"
 
-#: src/content_craftitem.cpp:225 src/content_mapnode.cpp:710
+#: src/content_craftitem.cpp:225 src/content_mapnode.cpp:723
 msgid "Brick"
 msgstr "レンガ"
 
@@ -1546,11 +1553,11 @@ msgstr "未加工のミスリル"
 msgid "Unbound Mithril"
 msgstr "未製のミスリル"
 
-#: src/content_craftitem.cpp:1516
+#: src/content_craftitem.cpp:1516 src/mineral.cpp:142
 msgid "Mithril"
 msgstr "ミスリル"
 
-#: src/content_craftitem.cpp:1525
+#: src/content_craftitem.cpp:1525 src/mineral.cpp:149
 msgid "Ruby"
 msgstr "ルビー"
 
@@ -1558,15 +1565,15 @@ msgstr "ルビー"
 msgid "Turquiose"
 msgstr "ターコイズ"
 
-#: src/content_craftitem.cpp:1541
+#: src/content_craftitem.cpp:1541 src/mineral.cpp:165
 msgid "Amethyst"
 msgstr "アメジスト"
 
-#: src/content_craftitem.cpp:1549
+#: src/content_craftitem.cpp:1549 src/mineral.cpp:173
 msgid "Sapphire"
 msgstr "サファイア"
 
-#: src/content_craftitem.cpp:1557
+#: src/content_craftitem.cpp:1557 src/mineral.cpp:181
 msgid "Sunstone"
 msgstr "サンストーン"
 
@@ -1578,392 +1585,396 @@ msgstr "石"
 msgid "Limestone"
 msgstr "石灰岩"
 
-#: src/content_mapnode.cpp:219
+#: src/content_mapnode.cpp:221
+msgid "Marble"
+msgstr ""
+
+#: src/content_mapnode.cpp:232
 msgid "Rock"
 msgstr "岩"
 
-#: src/content_mapnode.cpp:241
+#: src/content_mapnode.cpp:254
 msgid "Ice"
 msgstr "氷"
 
-#: src/content_mapnode.cpp:257
+#: src/content_mapnode.cpp:270
 msgid "Coal Block"
 msgstr "石炭ブロック"
 
-#: src/content_mapnode.cpp:274
+#: src/content_mapnode.cpp:287
 msgid "Charcoal Block"
 msgstr "木炭ブロック"
 
-#: src/content_mapnode.cpp:291
+#: src/content_mapnode.cpp:304
 msgid "Stone Brick"
 msgstr "石レンガ"
 
-#: src/content_mapnode.cpp:305
+#: src/content_mapnode.cpp:318
 msgid "Stone Block"
 msgstr "石ブロック"
 
-#: src/content_mapnode.cpp:319
+#: src/content_mapnode.cpp:332
 msgid "Rough Stone Brick"
 msgstr "ラフストーンレンガ"
 
-#: src/content_mapnode.cpp:336
+#: src/content_mapnode.cpp:349
 msgid "Rough Stone Block"
 msgstr "ラフストーンブロック"
 
-#: src/content_mapnode.cpp:352 src/content_mapnode.cpp:385
-#: src/content_mapnode.cpp:399 src/content_mapnode.cpp:432
+#: src/content_mapnode.cpp:365 src/content_mapnode.cpp:398
+#: src/content_mapnode.cpp:412 src/content_mapnode.cpp:445
 msgid "Grass"
 msgstr "草"
 
-#: src/content_mapnode.cpp:370 src/content_mapnode.cpp:417
+#: src/content_mapnode.cpp:383 src/content_mapnode.cpp:430
 msgid "Growing Grass"
 msgstr "育ち盛りの草"
 
-#: src/content_mapnode.cpp:446
+#: src/content_mapnode.cpp:459
 msgid "Muddy Snow"
 msgstr "汚い雪"
 
-#: src/content_mapnode.cpp:462
+#: src/content_mapnode.cpp:475
 msgid "Mud"
 msgstr "泥"
 
-#: src/content_mapnode.cpp:478
+#: src/content_mapnode.cpp:491
 msgid "Ash Block"
 msgstr "灰ブロック"
 
-#: src/content_mapnode.cpp:493
+#: src/content_mapnode.cpp:506
 msgid "Sand"
 msgstr "砂"
 
-#: src/content_mapnode.cpp:512
+#: src/content_mapnode.cpp:525
 msgid "Gravel"
 msgstr "砂利"
 
-#: src/content_mapnode.cpp:529
+#: src/content_mapnode.cpp:542
 msgid "Sand Stone"
 msgstr "砂岩"
 
-#: src/content_mapnode.cpp:544
+#: src/content_mapnode.cpp:557
 msgid "Sand Stone Bricks"
 msgstr "砂岩のレンガ"
 
-#: src/content_mapnode.cpp:559
+#: src/content_mapnode.cpp:572
 msgid "Sand Stone Blocks"
 msgstr "砂岩のブロック"
 
-#: src/content_mapnode.cpp:574
+#: src/content_mapnode.cpp:587
 msgid "Clay"
 msgstr "粘土"
 
-#: src/content_mapnode.cpp:591
+#: src/content_mapnode.cpp:604
 msgid "Blue Clay"
 msgstr "青い粘土"
 
-#: src/content_mapnode.cpp:608
+#: src/content_mapnode.cpp:621
 msgid "Green Clay"
 msgstr "緑色の粘土"
 
-#: src/content_mapnode.cpp:625
+#: src/content_mapnode.cpp:638
 msgid "Orange Clay"
 msgstr "オレンジ色の粘土"
 
-#: src/content_mapnode.cpp:642
+#: src/content_mapnode.cpp:655
 msgid "Purple Clay"
 msgstr "紫色の粘土"
 
-#: src/content_mapnode.cpp:659
+#: src/content_mapnode.cpp:672
 msgid "Red Clay"
 msgstr "赤い粘土"
 
-#: src/content_mapnode.cpp:676
+#: src/content_mapnode.cpp:689
 msgid "Yellow Clay"
 msgstr "黄色い粘土"
 
-#: src/content_mapnode.cpp:693
+#: src/content_mapnode.cpp:706
 msgid "Black Clay"
 msgstr "黒い粘土"
 
-#: src/content_mapnode.cpp:729
+#: src/content_mapnode.cpp:742
 msgid "Terracotta"
 msgstr "テラコッタ"
 
-#: src/content_mapnode.cpp:741
+#: src/content_mapnode.cpp:754
 msgid "Terracotta Brick"
 msgstr "テラコッタレンガ"
 
-#: src/content_mapnode.cpp:755
+#: src/content_mapnode.cpp:768
 msgid "Terracotta Block"
 msgstr "テラコッタブロック"
 
-#: src/content_mapnode.cpp:769
+#: src/content_mapnode.cpp:782
 msgid "Terracotta Tile"
 msgstr "テラコッタタイル"
 
-#: src/content_mapnode.cpp:789
+#: src/content_mapnode.cpp:802
 msgid "Glass"
 msgstr "ガラス"
 
-#: src/content_mapnode.cpp:809
+#: src/content_mapnode.cpp:822
 msgid "Blue Glass"
 msgstr "青いガラス"
 
-#: src/content_mapnode.cpp:831
+#: src/content_mapnode.cpp:844
 msgid "Green Glass"
 msgstr "緑色のガラス"
 
-#: src/content_mapnode.cpp:853
+#: src/content_mapnode.cpp:866
 msgid "Orange Glass"
 msgstr "オレンジ色のガラス"
 
-#: src/content_mapnode.cpp:875
+#: src/content_mapnode.cpp:888
 msgid "Purple Glass"
 msgstr "紫色のガラス"
 
-#: src/content_mapnode.cpp:897
+#: src/content_mapnode.cpp:910
 msgid "Red Glass"
 msgstr "赤いガラス"
 
-#: src/content_mapnode.cpp:919
+#: src/content_mapnode.cpp:932
 msgid "Yellow Glass"
 msgstr "黄色いガラス"
 
-#: src/content_mapnode.cpp:941
+#: src/content_mapnode.cpp:954
 msgid "Black Glass"
 msgstr "黒いガラス"
 
-#: src/content_mapnode.cpp:963
+#: src/content_mapnode.cpp:976
 msgid "Glass Pane"
 msgstr "板ガラス"
 
-#: src/content_mapnode.cpp:997
+#: src/content_mapnode.cpp:1010
 msgid "Blue Glass Pane"
 msgstr "青い板ガラス"
 
-#: src/content_mapnode.cpp:1032
+#: src/content_mapnode.cpp:1045
 msgid "Green Glass Pane"
 msgstr "緑色の板ガラス"
 
-#: src/content_mapnode.cpp:1067
+#: src/content_mapnode.cpp:1080
 msgid "Orange Glass Pane"
 msgstr "オレンジ色の板ガラス"
 
-#: src/content_mapnode.cpp:1102
+#: src/content_mapnode.cpp:1115
 msgid "Purple Glass Pane"
 msgstr "紫色の板ガラス"
 
-#: src/content_mapnode.cpp:1137
+#: src/content_mapnode.cpp:1150
 msgid "Red Glass Pane"
 msgstr "赤い板ガラス"
 
-#: src/content_mapnode.cpp:1172
+#: src/content_mapnode.cpp:1185
 msgid "Yellow Glass Pane"
 msgstr "黄色い板ガラス"
 
-#: src/content_mapnode.cpp:1207
+#: src/content_mapnode.cpp:1220
 msgid "Black Glass Pane"
 msgstr "黒い板ガラス"
 
-#: src/content_mapnode.cpp:1242 src/content_mapnode_farm.cpp:333
+#: src/content_mapnode.cpp:1255 src/content_mapnode_farm.cpp:333
 msgid "Glass Light"
 msgstr "光るガラス"
 
-#: src/content_mapnode.cpp:1265
+#: src/content_mapnode.cpp:1278
 msgid "Wood"
 msgstr "木"
 
-#: src/content_mapnode.cpp:1291
+#: src/content_mapnode.cpp:1304
 msgid "Jungle Wood"
 msgstr "ジャングルの木"
 
-#: src/content_mapnode.cpp:1316
+#: src/content_mapnode.cpp:1329
 msgid "Pine"
 msgstr "松"
 
-#: src/content_mapnode.cpp:1341
+#: src/content_mapnode.cpp:1354
 msgid "Sponge"
 msgstr "スポンジ"
 
-#: src/content_mapnode.cpp:1356
+#: src/content_mapnode.cpp:1369
 msgid "Waterlogged Sponge"
 msgstr "水を吸ったスポンジ"
 
-#: src/content_mapnode.cpp:1371
+#: src/content_mapnode.cpp:1384
 msgid "Hay Bale"
 msgstr "干草の俵"
 
-#: src/content_mapnode.cpp:1388
+#: src/content_mapnode.cpp:1401
 msgid "Raw Apple Pie"
 msgstr "生のアップルパイ"
 
-#: src/content_mapnode.cpp:1417
+#: src/content_mapnode.cpp:1430
 msgid "Apple Pie"
 msgstr "アップルパイ"
 
-#: src/content_mapnode.cpp:1512
+#: src/content_mapnode.cpp:1525
 msgid "Raw Pumpkin Pie"
 msgstr "生のパンプキンパイ"
 
-#: src/content_mapnode.cpp:1541
+#: src/content_mapnode.cpp:1554
 msgid "Pumpkin Pie"
 msgstr "パンプキンパイ"
 
-#: src/content_mapnode.cpp:1636 src/content_mapnode.cpp:1715
+#: src/content_mapnode.cpp:1649 src/content_mapnode.cpp:1728
 msgid "Snow"
 msgstr "雪"
 
-#: src/content_mapnode.cpp:1652
+#: src/content_mapnode.cpp:1665
 msgid "Snowman"
 msgstr "雪だるま"
 
-#: src/content_mapnode.cpp:1738 src/content_mapnode_farm.cpp:445
+#: src/content_mapnode.cpp:1752 src/content_mapnode_farm.cpp:445
 msgid "Cotton"
 msgstr "コットン"
 
-#: src/content_mapnode.cpp:1769
+#: src/content_mapnode.cpp:1783
 msgid "Blue Cotton"
 msgstr "青いコットン"
 
-#: src/content_mapnode.cpp:1786
+#: src/content_mapnode.cpp:1800
 msgid "Green Cotton"
 msgstr "緑色のコットン"
 
-#: src/content_mapnode.cpp:1803
+#: src/content_mapnode.cpp:1817
 msgid "Orange Cotton"
 msgstr "オレンジ色のコットン"
 
-#: src/content_mapnode.cpp:1820
+#: src/content_mapnode.cpp:1834
 msgid "Purple Cotton"
 msgstr "紫色のコットン"
 
-#: src/content_mapnode.cpp:1837
+#: src/content_mapnode.cpp:1851
 msgid "Red Cotton"
 msgstr "赤いコットン"
 
-#: src/content_mapnode.cpp:1854
+#: src/content_mapnode.cpp:1868
 msgid "Yellow Cotton"
 msgstr "黄色いコットン"
 
-#: src/content_mapnode.cpp:1871
+#: src/content_mapnode.cpp:1885
 msgid "Black Cotton"
 msgstr "黒いコットン"
 
-#: src/content_mapnode.cpp:1888
+#: src/content_mapnode.cpp:1902
 msgid "Carpet"
 msgstr "カーペット"
 
-#: src/content_mapnode.cpp:1911
+#: src/content_mapnode.cpp:1925
 msgid "Blue Carpet"
 msgstr "青いカーペット"
 
-#: src/content_mapnode.cpp:1935
+#: src/content_mapnode.cpp:1949
 msgid "Green Carpet"
 msgstr "緑色のカーペット"
 
-#: src/content_mapnode.cpp:1959
+#: src/content_mapnode.cpp:1973
 msgid "Orange Carpet"
 msgstr "オレンジ色のカーペット"
 
-#: src/content_mapnode.cpp:1983
+#: src/content_mapnode.cpp:1997
 msgid "Purple Carpet"
 msgstr "紫色のカーペット"
 
-#: src/content_mapnode.cpp:2007
+#: src/content_mapnode.cpp:2021
 msgid "Red Carpet"
 msgstr "赤いカーペット"
 
-#: src/content_mapnode.cpp:2031
+#: src/content_mapnode.cpp:2045
 msgid "Yellow Carpet"
 msgstr "黄色いカーペット"
 
-#: src/content_mapnode.cpp:2055
+#: src/content_mapnode.cpp:2069
 msgid "Black Carpet"
 msgstr "黒いカーペット"
 
-#: src/content_mapnode.cpp:2079
+#: src/content_mapnode.cpp:2093
 msgid "Air"
 msgstr "空気"
 
-#: src/content_mapnode.cpp:2095
+#: src/content_mapnode.cpp:2109
 msgid "Vacuum"
 msgstr "真空"
 
-#: src/content_mapnode.cpp:2112 src/content_mapnode.cpp:2142
+#: src/content_mapnode.cpp:2126 src/content_mapnode.cpp:2156
 msgid "Water"
 msgstr "水"
 
-#: src/content_mapnode.cpp:2172 src/content_mapnode.cpp:2200
+#: src/content_mapnode.cpp:2186 src/content_mapnode.cpp:2214
 msgid "Lava"
 msgstr "溶岩"
 
-#: src/content_mapnode.cpp:2231
+#: src/content_mapnode.cpp:2245
 msgid "Rough Stone"
 msgstr "ラフストーン"
 
-#: src/content_mapnode.cpp:2248
+#: src/content_mapnode.cpp:2262
 msgid "Cobble Stone"
 msgstr "丸石"
 
-#: src/content_mapnode.cpp:2264
+#: src/content_mapnode.cpp:2278
 msgid "Mossy Cobble Stone"
 msgstr "苔石"
 
-#: src/content_mapnode.cpp:2277
+#: src/content_mapnode.cpp:2291
 msgid "Steel Block"
 msgstr "鉄ブロック"
 
-#: src/content_mapnode.cpp:2294
+#: src/content_mapnode.cpp:2308
 msgid "Mithril Block"
 msgstr "ミスリルブロック"
 
-#: src/content_mapnode.cpp:2310
+#: src/content_mapnode.cpp:2324
 msgid "Stone Knob"
 msgstr "小石"
 
-#: src/content_mapnode.cpp:2311
+#: src/content_mapnode.cpp:2325
 msgid "Rough Stone Knob"
 msgstr "ラフストーンの欠片"
 
-#: src/content_mapnode.cpp:2312
+#: src/content_mapnode.cpp:2326
 msgid "Sandstone Knob"
 msgstr "砂岩の欠片"
 
-#: src/content_mapnode.cpp:2313
+#: src/content_mapnode.cpp:2327
 msgid "Wooden Knob"
 msgstr "木の欠片"
 
-#: src/content_mapnode.cpp:2314
+#: src/content_mapnode.cpp:2328
 msgid "Junglewood Knob"
 msgstr "ジャングルの木の欠片"
 
-#: src/content_mapnode.cpp:2315
+#: src/content_mapnode.cpp:2329
 msgid "Pine Knob"
 msgstr "松の木の欠片"
 
-#: src/content_mapnode.cpp:2319
+#: src/content_mapnode.cpp:2333
 msgid "Copper Block"
 msgstr "銅ブロック"
 
-#: src/content_mapnode.cpp:2336
+#: src/content_mapnode.cpp:2350
 msgid "Gold Block"
 msgstr "金ブロック"
 
-#: src/content_mapnode.cpp:2353
+#: src/content_mapnode.cpp:2367
 msgid "Silver Block"
 msgstr "銀ブロック"
 
-#: src/content_mapnode.cpp:2370
+#: src/content_mapnode.cpp:2384
 msgid "Tin Block"
 msgstr "錫ブロック"
 
-#: src/content_mapnode.cpp:2387
+#: src/content_mapnode.cpp:2401
 msgid "Quartz Block"
 msgstr "水晶ブロック"
 
-#: src/content_mapnode.cpp:2404
+#: src/content_mapnode.cpp:2418
 msgid "Stone Tiles"
 msgstr "石のタイル"
 
-#: src/content_mapnode.cpp:2426
+#: src/content_mapnode.cpp:2440
 msgid "Wood Tiles"
 msgstr "木のタイル"
 
@@ -2011,29 +2022,29 @@ msgstr "NOTゲート"
 msgid "Repeater"
 msgstr "リピーター"
 
-#: src/content_mapnode_circuit.cpp:369 src/content_mapnode_circuit.cpp:393
+#: src/content_mapnode_circuit.cpp:369 src/content_mapnode_circuit.cpp:390
 msgid "Electric Lamp"
 msgstr "電球"
 
-#: src/content_mapnode_circuit.cpp:427 src/content_mapnode_circuit.cpp:462
-#: src/content_mapnode_circuit.cpp:516 src/content_mapnode_circuit.cpp:537
-#: src/content_mapnode_circuit.cpp:582 src/content_mapnode_circuit.cpp:603
+#: src/content_mapnode_circuit.cpp:424 src/content_mapnode_circuit.cpp:459
+#: src/content_mapnode_circuit.cpp:513 src/content_mapnode_circuit.cpp:534
+#: src/content_mapnode_circuit.cpp:579 src/content_mapnode_circuit.cpp:600
 msgid "Piston"
 msgstr "ピストン"
 
-#: src/content_mapnode_circuit.cpp:489 src/content_mapnode_circuit.cpp:560
-#: src/content_mapnode_circuit.cpp:626
+#: src/content_mapnode_circuit.cpp:486 src/content_mapnode_circuit.cpp:557
+#: src/content_mapnode_circuit.cpp:623
 msgid "Piston Arm"
 msgstr "ピストンアーム"
 
-#: src/content_mapnode_circuit.cpp:648 src/content_mapnode_circuit.cpp:676
-#: src/content_mapnode_circuit.cpp:730 src/content_mapnode_circuit.cpp:751
-#: src/content_mapnode_circuit.cpp:796 src/content_mapnode_circuit.cpp:817
+#: src/content_mapnode_circuit.cpp:645 src/content_mapnode_circuit.cpp:673
+#: src/content_mapnode_circuit.cpp:727 src/content_mapnode_circuit.cpp:748
+#: src/content_mapnode_circuit.cpp:793 src/content_mapnode_circuit.cpp:814
 msgid "Sticky Piston"
 msgstr "粘着ピストン"
 
-#: src/content_mapnode_circuit.cpp:703 src/content_mapnode_circuit.cpp:774
-#: src/content_mapnode_circuit.cpp:840
+#: src/content_mapnode_circuit.cpp:700 src/content_mapnode_circuit.cpp:771
+#: src/content_mapnode_circuit.cpp:837
 msgid "Sticky Piston Arm"
 msgstr "粘着ピストンアーム"
 
@@ -2173,7 +2184,7 @@ msgstr "ブドウ"
 msgid "Trellis Grape"
 msgstr "ブドウのツタ"
 
-#: src/content_mapnode_farm.cpp:493 src/content_mapnode_farm.cpp:512
+#: src/content_mapnode_farm.cpp:494 src/content_mapnode_farm.cpp:513
 msgid "Dead Vine"
 msgstr "枯れ木"
 
@@ -2189,131 +2200,137 @@ msgstr "ジャングルの木材の本棚"
 msgid "Pine Book Shelf"
 msgstr "松の本棚"
 
-#: src/content_mapnode_furniture.cpp:150 src/content_mapnode_furniture.cpp:169
-#: src/content_mapnode_furniture.cpp:188 src/content_mapnode_furniture.cpp:207
-#: src/content_mapnode_furniture.cpp:226 src/content_mapnode_furniture.cpp:245
+#: src/content_mapnode_furniture.cpp:150 src/content_mapnode_furniture.cpp:170
+#: src/content_mapnode_furniture.cpp:190 src/content_mapnode_furniture.cpp:210
+#: src/content_mapnode_furniture.cpp:230 src/content_mapnode_furniture.cpp:250
 msgid "Couch"
 msgstr "ソファ"
 
-#: src/content_mapnode_furniture.cpp:274 src/content_mapnode_furniture.cpp:293
-#: src/content_mapnode_furniture.cpp:312 src/content_mapnode_furniture.cpp:331
-#: src/content_mapnode_furniture.cpp:350 src/content_mapnode_furniture.cpp:369
+#: src/content_mapnode_furniture.cpp:280 src/content_mapnode_furniture.cpp:300
+#: src/content_mapnode_furniture.cpp:320 src/content_mapnode_furniture.cpp:340
+#: src/content_mapnode_furniture.cpp:360 src/content_mapnode_furniture.cpp:380
 msgid "Blue Couch"
 msgstr "青いソファ"
 
-#: src/content_mapnode_furniture.cpp:392 src/content_mapnode_furniture.cpp:411
-#: src/content_mapnode_furniture.cpp:430 src/content_mapnode_furniture.cpp:449
-#: src/content_mapnode_furniture.cpp:468 src/content_mapnode_furniture.cpp:487
+#: src/content_mapnode_furniture.cpp:404 src/content_mapnode_furniture.cpp:424
+#: src/content_mapnode_furniture.cpp:444 src/content_mapnode_furniture.cpp:464
+#: src/content_mapnode_furniture.cpp:484 src/content_mapnode_furniture.cpp:504
 msgid "Green Couch"
 msgstr "緑色のソファ"
 
-#: src/content_mapnode_furniture.cpp:510 src/content_mapnode_furniture.cpp:529
-#: src/content_mapnode_furniture.cpp:548 src/content_mapnode_furniture.cpp:567
-#: src/content_mapnode_furniture.cpp:586 src/content_mapnode_furniture.cpp:605
+#: src/content_mapnode_furniture.cpp:528 src/content_mapnode_furniture.cpp:548
+#: src/content_mapnode_furniture.cpp:568 src/content_mapnode_furniture.cpp:588
+#: src/content_mapnode_furniture.cpp:608 src/content_mapnode_furniture.cpp:628
 msgid "Orange Couch"
 msgstr "オレンジ色のソファ"
 
-#: src/content_mapnode_furniture.cpp:628 src/content_mapnode_furniture.cpp:647
-#: src/content_mapnode_furniture.cpp:666 src/content_mapnode_furniture.cpp:685
-#: src/content_mapnode_furniture.cpp:704 src/content_mapnode_furniture.cpp:723
+#: src/content_mapnode_furniture.cpp:652 src/content_mapnode_furniture.cpp:672
+#: src/content_mapnode_furniture.cpp:692 src/content_mapnode_furniture.cpp:712
+#: src/content_mapnode_furniture.cpp:732 src/content_mapnode_furniture.cpp:752
 msgid "Purple Couch"
 msgstr "紫色のソファ"
 
-#: src/content_mapnode_furniture.cpp:746 src/content_mapnode_furniture.cpp:765
-#: src/content_mapnode_furniture.cpp:784 src/content_mapnode_furniture.cpp:803
-#: src/content_mapnode_furniture.cpp:822 src/content_mapnode_furniture.cpp:841
+#: src/content_mapnode_furniture.cpp:776 src/content_mapnode_furniture.cpp:796
+#: src/content_mapnode_furniture.cpp:816 src/content_mapnode_furniture.cpp:836
+#: src/content_mapnode_furniture.cpp:856 src/content_mapnode_furniture.cpp:876
 msgid "Red Couch"
 msgstr "赤いソファ"
 
-#: src/content_mapnode_furniture.cpp:864 src/content_mapnode_furniture.cpp:883
-#: src/content_mapnode_furniture.cpp:902 src/content_mapnode_furniture.cpp:921
-#: src/content_mapnode_furniture.cpp:940 src/content_mapnode_furniture.cpp:959
+#: src/content_mapnode_furniture.cpp:900 src/content_mapnode_furniture.cpp:920
+#: src/content_mapnode_furniture.cpp:940 src/content_mapnode_furniture.cpp:960
+#: src/content_mapnode_furniture.cpp:980
+#: src/content_mapnode_furniture.cpp:1000
 msgid "Yellow Couch"
 msgstr "黄色いソファ"
 
-#: src/content_mapnode_furniture.cpp:982
-#: src/content_mapnode_furniture.cpp:1001
-#: src/content_mapnode_furniture.cpp:1020
-#: src/content_mapnode_furniture.cpp:1039
-#: src/content_mapnode_furniture.cpp:1058
-#: src/content_mapnode_furniture.cpp:1077
+#: src/content_mapnode_furniture.cpp:1024
+#: src/content_mapnode_furniture.cpp:1044
+#: src/content_mapnode_furniture.cpp:1064
+#: src/content_mapnode_furniture.cpp:1084
+#: src/content_mapnode_furniture.cpp:1104
+#: src/content_mapnode_furniture.cpp:1124
 msgid "Black Couch"
 msgstr "黒いソファ"
 
-#: src/content_mapnode_furniture.cpp:1100
+#: src/content_mapnode_furniture.cpp:1148
+#: src/content_mapnode_furniture.cpp:1182
+#: src/content_mapnode_furniture.cpp:1206
+#: src/content_mapnode_furniture.cpp:1230
+#: src/content_mapnode_furniture.cpp:1254
+#: src/content_mapnode_furniture.cpp:1278
 msgid "Chair"
 msgstr "椅子"
 
-#: src/content_mapnode_furniture.cpp:1149
+#: src/content_mapnode_furniture.cpp:1302
 msgid "Table"
 msgstr "テーブル"
 
-#: src/content_mapnode_furniture.cpp:1206
-#: src/content_mapnode_furniture.cpp:1239
+#: src/content_mapnode_furniture.cpp:1333
+#: src/content_mapnode_furniture.cpp:1366
 msgid "Bed"
 msgstr "ベッド"
 
-#: src/content_mapnode_furniture.cpp:1267
-#: src/content_mapnode_furniture.cpp:1300
+#: src/content_mapnode_furniture.cpp:1394
+#: src/content_mapnode_furniture.cpp:1427
 msgid "Blue Bed"
 msgstr "青いベッド"
 
-#: src/content_mapnode_furniture.cpp:1328
-#: src/content_mapnode_furniture.cpp:1361
+#: src/content_mapnode_furniture.cpp:1455
+#: src/content_mapnode_furniture.cpp:1488
 msgid "Green Bed"
 msgstr "緑色のベッド"
 
-#: src/content_mapnode_furniture.cpp:1389
-#: src/content_mapnode_furniture.cpp:1422
+#: src/content_mapnode_furniture.cpp:1516
+#: src/content_mapnode_furniture.cpp:1549
 msgid "Orange Bed"
 msgstr "オレンジ色のベッド"
 
-#: src/content_mapnode_furniture.cpp:1450
-#: src/content_mapnode_furniture.cpp:1483
+#: src/content_mapnode_furniture.cpp:1577
+#: src/content_mapnode_furniture.cpp:1610
 msgid "Purple Bed"
 msgstr "紫色のベッド"
 
-#: src/content_mapnode_furniture.cpp:1511
-#: src/content_mapnode_furniture.cpp:1544
+#: src/content_mapnode_furniture.cpp:1638
+#: src/content_mapnode_furniture.cpp:1671
 msgid "Red Bed"
 msgstr "赤いベッド"
 
-#: src/content_mapnode_furniture.cpp:1572
-#: src/content_mapnode_furniture.cpp:1605
+#: src/content_mapnode_furniture.cpp:1699
+#: src/content_mapnode_furniture.cpp:1732
 msgid "Yellow Bed"
 msgstr "黄色いベッド"
 
-#: src/content_mapnode_furniture.cpp:1633
-#: src/content_mapnode_furniture.cpp:1666
+#: src/content_mapnode_furniture.cpp:1760
+#: src/content_mapnode_furniture.cpp:1793
 msgid "Black Bed"
 msgstr "黒いベッド"
 
-#: src/content_mapnode_furniture.cpp:1694
-#: src/content_mapnode_furniture.cpp:1729
+#: src/content_mapnode_furniture.cpp:1821
+#: src/content_mapnode_furniture.cpp:1856
 msgid "Camp Bed"
 msgstr "キャンプベッド"
 
-#: src/content_mapnode_furniture.cpp:1753
+#: src/content_mapnode_furniture.cpp:1880
 msgid "Colorful Painting"
 msgstr "カラフルな絵"
 
-#: src/content_mapnode_furniture.cpp:1788
+#: src/content_mapnode_furniture.cpp:1915
 msgid "Red Rose Painting"
 msgstr "バラの絵"
 
-#: src/content_mapnode_furniture.cpp:1823
+#: src/content_mapnode_furniture.cpp:1950
 msgid "Field Painting"
 msgstr "風景画"
 
-#: src/content_mapnode_furniture.cpp:1858
+#: src/content_mapnode_furniture.cpp:1985
 msgid "Blue Flower Painting"
 msgstr "青い花の絵"
 
-#: src/content_mapnode_furniture.cpp:1893
+#: src/content_mapnode_furniture.cpp:2020
 msgid "Painting Canvas"
 msgstr "キャンバス"
 
-#: src/content_mapnode_furniture.cpp:1931
+#: src/content_mapnode_furniture.cpp:2058
 msgid "Clock"
 msgstr "時計"
 
@@ -2633,7 +2650,7 @@ msgid "Decraft Book"
 msgstr "デクラフトブック"
 
 #: src/content_mapnode_special.cpp:753 src/content_mapnode_special.cpp:948
-#: src/content_nodemeta.cpp:2693
+#: src/content_nodemeta.cpp:2694
 msgid "Diary"
 msgstr "日記"
 
@@ -2683,11 +2700,11 @@ msgstr "看板"
 msgid "Locking Sign"
 msgstr "鍵付きの看板"
 
-#: src/content_mapnode_special.cpp:1286 src/content_nodemeta.cpp:500
+#: src/content_mapnode_special.cpp:1286 src/content_nodemeta.cpp:501
 msgid "Chest"
 msgstr "チェスト"
 
-#: src/content_mapnode_special.cpp:1310 src/content_nodemeta.cpp:775
+#: src/content_mapnode_special.cpp:1310 src/content_nodemeta.cpp:776
 msgid "Creative Chest"
 msgstr "クリエイティブチェスト"
 
@@ -2807,7 +2824,7 @@ msgstr "小包"
 msgid "Cauldron"
 msgstr "大釜"
 
-#: src/content_mapnode_special.cpp:2082 src/content_nodemeta.cpp:3312
+#: src/content_mapnode_special.cpp:2082 src/content_nodemeta.cpp:3313
 msgid "Forge"
 msgstr "炉"
 
@@ -2911,561 +2928,566 @@ msgstr "シャム猫"
 msgid "Ginger Kitten"
 msgstr "ジンジャー色の子猫"
 
-#: src/content_nodemeta.cpp:75 src/content_nodemeta.cpp:138
-#: src/content_nodemeta.cpp:2677 src/content_nodemeta.cpp:2776
+#: src/content_nodemeta.cpp:76 src/content_nodemeta.cpp:139
+#: src/content_nodemeta.cpp:2678 src/content_nodemeta.cpp:2777
 msgid "Save"
 msgstr "保存"
 
-#: src/content_nodemeta.cpp:185
+#: src/content_nodemeta.cpp:186
 #, c-format
 msgid "%s's Home Flag"
 msgstr "%sの旗"
 
-#: src/content_nodemeta.cpp:269 src/content_nodemeta.cpp:282
-#: src/content_nodemeta.cpp:436 src/content_nodemeta.cpp:449
+#: src/content_nodemeta.cpp:270 src/content_nodemeta.cpp:283
+#: src/content_nodemeta.cpp:437 src/content_nodemeta.cpp:450
 msgid "You can't sleep yet."
 msgstr "まだ寝ることはできません。"
 
-#: src/content_nodemeta.cpp:273 src/content_nodemeta.cpp:440
+#: src/content_nodemeta.cpp:274 src/content_nodemeta.cpp:441
 msgid "Go to sleep"
 msgstr "寝る"
 
-#: src/content_nodemeta.cpp:278 src/content_nodemeta.cpp:445
+#: src/content_nodemeta.cpp:279 src/content_nodemeta.cpp:446
 msgid "Someone else is sleeping here."
 msgstr "他の誰かがここに眠っています。"
 
-#: src/content_nodemeta.cpp:286 src/content_nodemeta.cpp:453
+#: src/content_nodemeta.cpp:287 src/content_nodemeta.cpp:454
 msgid "Get out of bed"
 msgstr "ベッドから出ます"
 
-#: src/content_nodemeta.cpp:432
+#: src/content_nodemeta.cpp:433
 msgid "This bed is too uncomfortable to sleep in."
 msgstr "このベッドで寝るのはかなり不快です。"
 
-#: src/content_nodemeta.cpp:573
+#: src/content_nodemeta.cpp:574
 #, c-format
 msgid "Locking Chest owned by '%s'"
 msgstr "このチェストの所有者は%sです"
 
-#: src/content_nodemeta.cpp:647
+#: src/content_nodemeta.cpp:648
 #, c-format
 msgid "Safe owned by '%s'"
 msgstr "この金庫の所有者は%sです"
 
-#: src/content_nodemeta.cpp:816 src/content_nodemeta.cpp:1870
-#: src/content_nodemeta.cpp:2157 src/content_nodemeta.cpp:2349
-#: src/content_nodemeta.cpp:2563
+#: src/content_nodemeta.cpp:817 src/content_nodemeta.cpp:1871
+#: src/content_nodemeta.cpp:2158 src/content_nodemeta.cpp:2350
+#: src/content_nodemeta.cpp:2564
 #, c-format
 msgid "Page %d of %d"
 msgstr "ページ %d/%d"
 
-#: src/content_nodemeta.cpp:820 src/content_nodemeta.cpp:1898
-#: src/content_nodemeta.cpp:2176 src/content_nodemeta.cpp:2358
-#: src/content_nodemeta.cpp:2579
+#: src/content_nodemeta.cpp:821 src/content_nodemeta.cpp:1899
+#: src/content_nodemeta.cpp:2177 src/content_nodemeta.cpp:2359
+#: src/content_nodemeta.cpp:2580
 msgid "<< Previous Page"
 msgstr "＜＜ 前のページへ"
 
-#: src/content_nodemeta.cpp:826 src/content_nodemeta.cpp:1904
-#: src/content_nodemeta.cpp:2182 src/content_nodemeta.cpp:2364
-#: src/content_nodemeta.cpp:2585
+#: src/content_nodemeta.cpp:827 src/content_nodemeta.cpp:1905
+#: src/content_nodemeta.cpp:2183 src/content_nodemeta.cpp:2365
+#: src/content_nodemeta.cpp:2586
 msgid "Next Page >>"
 msgstr "次のページへ ＞＞"
 
-#: src/content_nodemeta.cpp:869
+#: src/content_nodemeta.cpp:870
 #, c-format
 msgid "Border Stone owned by '%s'"
 msgstr "このボーダーストーンの所有者は%sです"
 
-#: src/content_nodemeta.cpp:944
+#: src/content_nodemeta.cpp:945
 msgid "Furnace is overloaded"
 msgstr "かまどが過負荷になっています"
 
-#: src/content_nodemeta.cpp:945
+#: src/content_nodemeta.cpp:946
 msgid "Furnace is out of fuel"
 msgstr "かまどの燃料が切れています"
 
-#: src/content_nodemeta.cpp:947
+#: src/content_nodemeta.cpp:948
 msgid "Furnace is inactive"
 msgstr "かまどは使用されていません"
 
-#: src/content_nodemeta.cpp:950
+#: src/content_nodemeta.cpp:951
 msgid "Furnace is active"
 msgstr "かまどは使用中です"
 
-#: src/content_nodemeta.cpp:1209
+#: src/content_nodemeta.cpp:1210
 msgid "Locking Furnace is overloaded"
 msgstr "鍵付きかまどが過負荷になっています"
 
-#: src/content_nodemeta.cpp:1210
+#: src/content_nodemeta.cpp:1211
 msgid "Locking Furnace is out of fuel"
 msgstr "鍵付きかまどの燃料が切れています"
 
-#: src/content_nodemeta.cpp:1212
+#: src/content_nodemeta.cpp:1213
 msgid "Locking Furnace is inactive"
 msgstr "鍵付きかまどは使用されていません"
 
-#: src/content_nodemeta.cpp:1215
+#: src/content_nodemeta.cpp:1216
 msgid "Locking Furnace is active"
 msgstr "鍵付きかまどは使用中です"
 
-#: src/content_nodemeta.cpp:1470
+#: src/content_nodemeta.cpp:1471
 msgid "Armed Explosive: about to detonate"
 msgstr "警告：爆発します"
 
-#: src/content_nodemeta.cpp:1473
+#: src/content_nodemeta.cpp:1474
 #, c-format
 msgid "Armed Explosive: %d second till detonation"
 msgid_plural "Armed Explosive: %d seconds till detonation"
 msgstr[0] "警告：爆発まで%d秒です"
 
-#: src/content_nodemeta.cpp:1534 src/content_nodemeta.cpp:1539
+#: src/content_nodemeta.cpp:1535 src/content_nodemeta.cpp:1540
 msgid "Incinerator is active"
 msgstr "焼却炉は使用中です"
 
-#: src/content_nodemeta.cpp:1541
+#: src/content_nodemeta.cpp:1542
 msgid "Incinerator is inactive"
 msgstr "焼却炉は使用されていません"
 
-#: src/content_nodemeta.cpp:1633
+#: src/content_nodemeta.cpp:1634
 msgid "Add fuel, then punch to incinerate wielded item"
 msgstr "燃料を入れて、焼却したいアイテムを手に持ってパンチしてください"
 
-#: src/content_nodemeta.cpp:1874 src/content_nodemeta.cpp:2162
+#: src/content_nodemeta.cpp:1875 src/content_nodemeta.cpp:2163
 msgid "Add item here to see recipe"
 msgstr "レシピを見たいアイテム"
 
-#: src/content_nodemeta.cpp:1879 src/content_nodemeta.cpp:2167
+#: src/content_nodemeta.cpp:1880 src/content_nodemeta.cpp:2168
 #, c-format
 msgid "Recipe %d of %d"
 msgstr "レシピ %d/%d"
 
-#: src/content_nodemeta.cpp:1888
+#: src/content_nodemeta.cpp:1889
 msgid "Gives"
 msgstr "個数"
 
-#: src/content_nodemeta.cpp:2353
+#: src/content_nodemeta.cpp:2354
 msgid "Add item here to see cook result"
 msgstr "精錬レシピを見たいアイテムを選択してください"
 
-#: src/content_nodemeta.cpp:2567
+#: src/content_nodemeta.cpp:2568
 msgid "Add item here to see dig result"
 msgstr "破壊した際に入手できるアイテム"
 
-#: src/content_nodemeta.cpp:2571
+#: src/content_nodemeta.cpp:2572
 msgid "Dig Result"
 msgstr "入手"
 
-#: src/content_nodemeta.cpp:2575
+#: src/content_nodemeta.cpp:2576
 msgid "Random Drop"
 msgstr "ランダム入手"
 
-#: src/content_nodemeta.cpp:2667 src/content_nodemeta.cpp:2766
+#: src/content_nodemeta.cpp:2668 src/content_nodemeta.cpp:2767
 msgid "Title"
 msgstr "題名"
 
-#: src/content_nodemeta.cpp:2672 src/content_nodemeta.cpp:2771
+#: src/content_nodemeta.cpp:2673 src/content_nodemeta.cpp:2772
 msgid "Content"
 msgstr "本文"
 
-#: src/content_nodemeta.cpp:3127
+#: src/content_nodemeta.cpp:3128
 msgid "Cauldron is active"
 msgstr "大釜は使用中です"
 
-#: src/content_nodemeta.cpp:3130
+#: src/content_nodemeta.cpp:3131
 msgid "Cauldron is hot"
 msgstr "大釜は熱くなっています"
 
-#: src/content_nodemeta.cpp:3132
+#: src/content_nodemeta.cpp:3133
 msgid "Cauldron is cool"
 msgstr "大釜は冷たくなっています"
 
-#: src/content_nodemeta.cpp:3134
+#: src/content_nodemeta.cpp:3135
 msgid "Cauldron is empty"
 msgstr "大釜は空です"
 
-#: src/content_nodemeta.cpp:3138
+#: src/content_nodemeta.cpp:3139
 msgid "Cauldron is inactive"
 msgstr "大釜は使用されていません"
 
-#: src/content_nodemeta.cpp:3139
+#: src/content_nodemeta.cpp:3140
 msgid "Cauldron is out of fuel"
 msgstr "大釜は燃料切れです"
 
-#: src/content_nodemeta.cpp:3218
+#: src/content_nodemeta.cpp:3219
 msgid "Add fuel, then punch to add or remove water"
 msgstr "燃料を入れて、パンチで追加または水を除去します"
 
-#: src/content_nodemeta.cpp:3484
+#: src/content_nodemeta.cpp:3487
 msgid "Show Enchanting"
 msgstr "エンチャント表示"
 
-#: src/content_nodemeta.cpp:3491 src/game.cpp:208
+#: src/content_nodemeta.cpp:3494 src/game.cpp:209
 msgid "Show Crafting"
 msgstr "クラフティング表示"
 
-#: src/content_toolitem.cpp:213
+#: src/content_toolitem.cpp:216
 msgid "Small Stone Pick"
 msgstr "小さい石のピッケル"
 
-#: src/content_toolitem.cpp:236
+#: src/content_toolitem.cpp:239
 msgid "Stone Pick"
 msgstr "石のピッケル"
 
-#: src/content_toolitem.cpp:250
+#: src/content_toolitem.cpp:253
 msgid "Flint Pick"
 msgstr "燧石のピッケル"
 
-#: src/content_toolitem.cpp:264
+#: src/content_toolitem.cpp:267
 msgid "Steel Pick"
 msgstr "鉄のピッケル"
 
-#: src/content_toolitem.cpp:278
+#: src/content_toolitem.cpp:281
 msgid "Creative Pick"
 msgstr "クリエイティブピッケル"
 
-#: src/content_toolitem.cpp:292
+#: src/content_toolitem.cpp:295
 msgid "Stone Trowel"
 msgstr "石のコテ"
 
-#: src/content_toolitem.cpp:306
+#: src/content_toolitem.cpp:309
 msgid "Stone Shovel"
 msgstr "石のシャベル"
 
-#: src/content_toolitem.cpp:320
+#: src/content_toolitem.cpp:323
 msgid "Flint Shovel"
 msgstr "燧石のシャベル"
 
-#: src/content_toolitem.cpp:334
+#: src/content_toolitem.cpp:337
 msgid "Steel Shovel"
 msgstr "鉄のシャベル"
 
-#: src/content_toolitem.cpp:348
+#: src/content_toolitem.cpp:351
 msgid "Small Stone Axe"
 msgstr "小さい石の斧"
 
-#: src/content_toolitem.cpp:369
+#: src/content_toolitem.cpp:372
 msgid "Stone Axe"
 msgstr "石の斧"
 
-#: src/content_toolitem.cpp:383
+#: src/content_toolitem.cpp:386
 msgid "Flint Axe"
 msgstr "燧石の斧"
 
-#: src/content_toolitem.cpp:397
+#: src/content_toolitem.cpp:400
 msgid "Steel Axe"
 msgstr "鉄の斧"
 
-#: src/content_toolitem.cpp:411
+#: src/content_toolitem.cpp:414
 msgid "Wooden Club"
 msgstr "木の棍棒"
 
-#: src/content_toolitem.cpp:426
+#: src/content_toolitem.cpp:429
 msgid "Stone Sword"
 msgstr "石の剣"
 
-#: src/content_toolitem.cpp:440
+#: src/content_toolitem.cpp:443
 msgid "Steel Sword"
 msgstr "鉄の剣"
 
-#: src/content_toolitem.cpp:454
+#: src/content_toolitem.cpp:457
 msgid "Flint Shears"
 msgstr "燧石のハサミ"
 
-#: src/content_toolitem.cpp:468
+#: src/content_toolitem.cpp:471
 msgid "Steel Shears"
 msgstr "鉄のハサミ"
 
-#: src/content_toolitem.cpp:482
+#: src/content_toolitem.cpp:485
 msgid "Wooden Bucket"
 msgstr "木のバケツ"
 
-#: src/content_toolitem.cpp:499
+#: src/content_toolitem.cpp:502
 msgid "Tin Bucket"
 msgstr "錫のバケツ"
 
-#: src/content_toolitem.cpp:515
+#: src/content_toolitem.cpp:518
 msgid "Wooden Bucket of Water"
 msgstr "水が入った木のバケツ"
 
-#: src/content_toolitem.cpp:526
+#: src/content_toolitem.cpp:529
 msgid "Tin Bucket of Water"
 msgstr "水が入った錫のバケツ"
 
-#: src/content_toolitem.cpp:537
+#: src/content_toolitem.cpp:540
 msgid "Steel Bucket"
 msgstr "鉄のバケツ"
 
-#: src/content_toolitem.cpp:552
+#: src/content_toolitem.cpp:555
 msgid "Steel Bucket of Water"
 msgstr "水が入った鉄のバケツ"
 
-#: src/content_toolitem.cpp:563
+#: src/content_toolitem.cpp:566
 msgid "Steel Bucket of Lava"
 msgstr "溶岩が入った鉄のバケツ"
 
-#: src/content_toolitem.cpp:575
+#: src/content_toolitem.cpp:578
 msgid "Fire Starter"
 msgstr "発火具"
 
-#: src/content_toolitem.cpp:589
+#: src/content_toolitem.cpp:592
 msgid "Crowbar"
 msgstr "クローバー"
 
-#: src/content_toolitem.cpp:602
+#: src/content_toolitem.cpp:605
 msgid "Key"
 msgstr "鍵"
 
-#: src/content_toolitem.cpp:614
+#: src/content_toolitem.cpp:617
 msgid "Stone Spear"
 msgstr "石の槍"
 
-#: src/content_toolitem.cpp:628
+#: src/content_toolitem.cpp:631
 msgid "Flint Spear"
 msgstr "燧石の槍"
 
-#: src/content_toolitem.cpp:642
+#: src/content_toolitem.cpp:645
 msgid "Steel Spear"
 msgstr "鉄の槍"
 
-#: src/content_toolitem.cpp:656
+#: src/content_toolitem.cpp:659
 msgid "Bow"
 msgstr "弓"
 
-#: src/content_toolitem.cpp:676
+#: src/content_toolitem.cpp:679
 msgid "Raw Mithril Pick"
 msgstr "未加工のミスリルのピッケル"
 
-#: src/content_toolitem.cpp:690
+#: src/content_toolitem.cpp:693
 msgid "Raw Mithril Shovel"
 msgstr "未加工のミスリルのショベル"
 
-#: src/content_toolitem.cpp:704
+#: src/content_toolitem.cpp:707
 msgid "Raw Mithril Axe"
 msgstr "未加工のミスリルの斧"
 
-#: src/content_toolitem.cpp:718
+#: src/content_toolitem.cpp:721
 msgid "Raw Mithril Sword"
 msgstr "未加工のミスリルの剣"
 
-#: src/content_toolitem.cpp:732
+#: src/content_toolitem.cpp:735
 msgid "Raw Mithril Spear"
 msgstr "未加工のミスリルの槍"
 
-#: src/content_toolitem.cpp:746
+#: src/content_toolitem.cpp:749
 msgid "Unbound Mithril Pick"
 msgstr "未製のミスリルのピッケル"
 
-#: src/content_toolitem.cpp:760
+#: src/content_toolitem.cpp:763
 msgid "Unbound Mithril Shovel"
 msgstr "未製のミスリルのショベル"
 
-#: src/content_toolitem.cpp:774
+#: src/content_toolitem.cpp:777
 msgid "Unbound Mithril Axe"
 msgstr "未製のミスリルの斧"
 
-#: src/content_toolitem.cpp:788
+#: src/content_toolitem.cpp:791
 msgid "Unbound Mithril Sword"
 msgstr "未製のミスリルの剣"
 
-#: src/content_toolitem.cpp:802
+#: src/content_toolitem.cpp:805
 msgid "Unbound Mithril Spear"
 msgstr "未製のミスリルの槍"
 
-#: src/content_toolitem.cpp:816
+#: src/content_toolitem.cpp:819
 msgid "Mithril Pick"
 msgstr "ミスリルのピッケル"
 
-#: src/content_toolitem.cpp:831
+#: src/content_toolitem.cpp:834
 msgid "Mithril Shovel"
 msgstr "ミスリルのショベル"
 
-#: src/content_toolitem.cpp:845
+#: src/content_toolitem.cpp:848
 msgid "Mithril Axe"
 msgstr "ミスリルの斧"
 
-#: src/content_toolitem.cpp:859
+#: src/content_toolitem.cpp:862
 msgid "Mithril Sword"
 msgstr "ミスリルの剣"
 
-#: src/content_toolitem.cpp:873
+#: src/content_toolitem.cpp:876
 msgid "Mithril Spear"
 msgstr "ミスリルの槍"
 
-#: src/content_toolitem.cpp:887
+#: src/content_toolitem.cpp:890
 msgid "Mob Spawner"
 msgstr "Mobスポナー"
 
-#: src/game.cpp:209
+#: src/content_toolitem.cpp:909
+#, fuzzy
+msgid "Mithril Key"
+msgstr "ミスリルの斧"
+
+#: src/game.cpp:210
 msgid "Clothes"
 msgstr "衣服"
 
-#: src/game.cpp:210
+#: src/game.cpp:211
 msgid "Hat/Helmet"
 msgstr "帽子やヘルメット"
 
-#: src/game.cpp:212
+#: src/game.cpp:213
 msgid "Jacket"
 msgstr "ジャケット"
 
-#: src/game.cpp:214
+#: src/game.cpp:215
 msgid "Decorative"
 msgstr "装飾"
 
-#: src/game.cpp:216
+#: src/game.cpp:217
 msgid "Shirt"
 msgstr "シャツ"
 
-#: src/game.cpp:218
+#: src/game.cpp:219
 msgid "Belt"
 msgstr "ベルト"
 
-#: src/game.cpp:220
+#: src/game.cpp:221
 msgid "Pants"
 msgstr "パンツ"
 
-#: src/game.cpp:222
+#: src/game.cpp:223
 msgid "Boots"
 msgstr "ブーツ"
 
-#: src/game.cpp:229
+#: src/game.cpp:230
 msgid "Drop to Ground"
 msgstr "アイテムをドロップ"
 
-#: src/game.cpp:231
+#: src/game.cpp:232
 msgid "Change Clothing"
 msgstr "服を変更"
 
-#: src/game.cpp:590
+#: src/game.cpp:591
 msgid "Loading"
 msgstr "読み込み中"
 
-#: src/game.cpp:662
+#: src/game.cpp:663
 msgid "Loading..."
 msgstr "読み込んでいます..."
 
-#: src/game.cpp:671
+#: src/game.cpp:672
 msgid "Creating server..."
 msgstr "サーバーを作成しています..."
 
-#: src/game.cpp:682
+#: src/game.cpp:683
 msgid "Creating client..."
 msgstr "クライアントを作成しています..."
 
-#: src/game.cpp:687
+#: src/game.cpp:688
 msgid "Resolving address..."
 msgstr "アドレスを解決しています..."
 
-#: src/game.cpp:698
+#: src/game.cpp:699
 msgid "Couldn't resolve address"
 msgstr "アドレスを解決できませんでした"
 
-#: src/game.cpp:738
+#: src/game.cpp:739
 #, c-format
 msgid "Connecting to server... (timeout in %d second)"
 msgid_plural "Connecting to server... (timeout in %d seconds)"
 msgstr[0] "サーバーに接続しています..(タイムアウト%d秒)"
 
-#: src/game.cpp:767
+#: src/game.cpp:768
 #, c-format
 msgid "Access denied. Reason: %ls"
 msgstr "アクセスできません。原因:%ls"
 
-#: src/game.cpp:771
+#: src/game.cpp:772
 msgid "Unable to Connect (port already in use?)."
 msgstr "接続できません(ポートが既に使用されている可能性があります)。"
 
-#: src/game.cpp:774
+#: src/game.cpp:775
 msgid "Connection timed out."
 msgstr "接続がタイムアウトしました。"
 
-#: src/game.cpp:927
+#: src/game.cpp:928
 msgid "Access denied. Reason: "
 msgstr "アクセスできません。原因:"
 
-#: src/game.cpp:1161
+#: src/game.cpp:1162
 msgid "free_move disabled"
 msgstr "飛行モードを無効にしました"
 
-#: src/game.cpp:1165
+#: src/game.cpp:1166
 msgid "free_move enabled"
 msgstr "飛行モードを有効にしました"
 
-#: src/game.cpp:1177
+#: src/game.cpp:1178
 #, c-format
 msgid "Saved screenshot to '%s'"
 msgstr "\"%s\"にスクリーンショットを保存しました"
 
-#: src/game.cpp:1189
+#: src/game.cpp:1190
 msgid "HUD shown"
 msgstr "HUDを表示しました"
 
-#: src/game.cpp:1191
+#: src/game.cpp:1192
 msgid "HUD hidden"
 msgstr "HUDを非表示にしました"
 
-#: src/game.cpp:1197
+#: src/game.cpp:1198
 msgid "Chat shown"
 msgstr "チャットを表示しました"
 
-#: src/game.cpp:1199
+#: src/game.cpp:1200
 msgid "Chat hidden"
 msgstr "チャットを非表示にしました"
 
-#: src/game.cpp:1205
+#: src/game.cpp:1206
 msgid "Fog disabled"
 msgstr "霧を非表示にしました"
 
-#: src/game.cpp:1207
+#: src/game.cpp:1208
 msgid "Fog enabled"
 msgstr "霧を表示しました"
 
-#: src/game.cpp:1213
+#: src/game.cpp:1214
 msgid "Camera update disabled"
 msgstr "マップの更新を無効にしました"
 
-#: src/game.cpp:1215
+#: src/game.cpp:1216
 msgid "Camera update enabled"
 msgstr "マップの更新を有効にしました"
 
-#: src/game.cpp:1225
+#: src/game.cpp:1226
 msgid "Debug info shown"
 msgstr "デバッグ情報を表示しました"
 
-#: src/game.cpp:1230
+#: src/game.cpp:1231
 msgid "Debug info and frametime graph hidden"
 msgstr "デバッグ情報とフレーム数を非表示にしました"
 
-#: src/game.cpp:1234
+#: src/game.cpp:1235
 msgid "Frametime graph shown"
 msgstr "フレーム数を表示しました"
 
-#: src/game.cpp:1246
+#: src/game.cpp:1247
 #, c-format
 msgid "Profiler shown (page %d of %d)"
 msgstr "プロファイラを表示しています(ページ %d/%d)"
 
-#: src/game.cpp:1250
+#: src/game.cpp:1251
 msgid "Profiler hidden"
 msgstr "プロファイラーが非表示になりました"
 
-#: src/game.cpp:1258 src/game.cpp:1269
+#: src/game.cpp:1259 src/game.cpp:1270
 #, c-format
 msgid "Minimum viewing range changed to %d"
 msgstr "視野の範囲を%dに変更しました"
 
-#: src/game.cpp:1338
+#: src/game.cpp:1339
 msgid "Enabled full viewing range"
 msgstr "マップをすべて表示しています"
 
-#: src/game.cpp:1342
+#: src/game.cpp:1343
 msgid "Disabled full viewing range"
 msgstr "マップを一部表示しています"
 
-#: src/game.cpp:1995
+#: src/game.cpp:1950
 msgid "Disconnected (Network Timeout)"
 msgstr "切断されました(タイムアウト)"
 
-#: src/game.cpp:2407
+#: src/game.cpp:2382
 msgid "Shutting down..."
 msgstr "終了中..."
 
@@ -3485,236 +3507,291 @@ msgstr "左クリック:まとめて移動、右クリック:一つずつ移動"
 msgid "Write It"
 msgstr "記入する"
 
-#: src/guiMainMenu.cpp:347
+#: src/guiMainMenu.cpp:319
 msgid "Character Creator"
 msgstr "スキン作成"
 
-#: src/guiMainMenu.cpp:353 src/guiMainMenu.cpp:478 src/guiMainMenu.cpp:520
-#: src/guiMainMenu.cpp:631
+#: src/guiMainMenu.cpp:325 src/guiMainMenu.cpp:386 src/guiMainMenu.cpp:428
+#: src/guiMainMenu.cpp:539
 msgid "Single Player"
 msgstr "シングルプレイヤー"
 
-#: src/guiMainMenu.cpp:359 src/guiMainMenu.cpp:410
+#: src/guiMainMenu.cpp:331 src/guiMultiplayerMenu.cpp:161
 msgid "Multi Player"
 msgstr "マルチプレイヤー"
 
-#: src/guiMainMenu.cpp:365 src/guiPauseMenu.cpp:155
+#: src/guiMainMenu.cpp:337 src/guiPauseMenu.cpp:155
 msgid "Settings"
 msgstr "設定"
 
-#: src/guiMainMenu.cpp:371
+#: src/guiMainMenu.cpp:343
 msgid "Credits"
 msgstr "クレジット"
 
-#: src/guiMainMenu.cpp:377
+#: src/guiMainMenu.cpp:349
 msgid "Quit"
 msgstr "終了"
 
-#: src/guiMainMenu.cpp:418
-msgid "Name/Password"
-msgstr "名前とパスワード"
-
-#: src/guiMainMenu.cpp:446
-msgid "Address/Port"
-msgstr "アドレスとポート"
-
-#: src/guiMainMenu.cpp:472
-msgid "Connect"
-msgstr "接続"
-
-#: src/guiMainMenu.cpp:487 src/guiMainMenu.cpp:529 src/guiMainMenu.cpp:640
+#: src/guiMainMenu.cpp:395 src/guiMainMenu.cpp:437 src/guiMainMenu.cpp:548
 msgid "Creative Mode"
 msgstr "クリエイティブモード"
 
-#: src/guiMainMenu.cpp:488 src/guiMainMenu.cpp:530 src/guiMainMenu.cpp:641
+#: src/guiMainMenu.cpp:396 src/guiMainMenu.cpp:438 src/guiMainMenu.cpp:549
 msgid "Adventure Mode"
 msgstr "アドベンチャーモード"
 
-#: src/guiMainMenu.cpp:489 src/guiMainMenu.cpp:531 src/guiMainMenu.cpp:642
+#: src/guiMainMenu.cpp:397 src/guiMainMenu.cpp:439 src/guiMainMenu.cpp:550
 msgid "Survival Mode"
 msgstr "サバイバルモード"
 
-#: src/guiMainMenu.cpp:502 src/guiMainMenu.cpp:655
+#: src/guiMainMenu.cpp:410 src/guiMainMenu.cpp:563
 msgid "Advanced Settings"
 msgstr "詳細設定"
 
-#: src/guiMainMenu.cpp:508 src/guiMainMenu.cpp:550
+#: src/guiMainMenu.cpp:416 src/guiMainMenu.cpp:458
 msgid "Map Options"
 msgstr "マップオプション"
 
-#: src/guiMainMenu.cpp:514 src/guiMainMenu.cpp:625 src/guiMainMenu.cpp:750
+#: src/guiMainMenu.cpp:422 src/guiMainMenu.cpp:533 src/guiMainMenu.cpp:658
 msgid "Start Game"
 msgstr "ゲーム開始"
 
-#: src/guiMainMenu.cpp:544
+#: src/guiMainMenu.cpp:452
 msgid "Hide Advanced Settings"
 msgstr "詳細設定を非表示にする"
 
-#: src/guiMainMenu.cpp:555
+#: src/guiMainMenu.cpp:463
 msgid "Creatures"
 msgstr "生物"
 
-#: src/guiMainMenu.cpp:562
+#: src/guiMainMenu.cpp:470
 msgid "None"
 msgstr "無"
 
-#: src/guiMainMenu.cpp:563
+#: src/guiMainMenu.cpp:471
 msgid "Passive"
 msgstr "安全な生物のみ"
 
-#: src/guiMainMenu.cpp:564
+#: src/guiMainMenu.cpp:472
 msgid "Passive & Aggressive"
 msgstr "安全な生物・攻撃的な生物"
 
-#: src/guiMainMenu.cpp:565
+#: src/guiMainMenu.cpp:473
 msgid "Passive, Aggressive, & Destructive"
 msgstr "安全な生物・危険な生物・破壊的な生物"
 
-#: src/guiMainMenu.cpp:579
+#: src/guiMainMenu.cpp:487
 msgid "Player Damage"
 msgstr "プレイヤーのダメージ"
 
-#: src/guiMainMenu.cpp:584
+#: src/guiMainMenu.cpp:492
 msgid "Suffocation/Drowning"
 msgstr "窒息や溺死"
 
-#: src/guiMainMenu.cpp:589
+#: src/guiMainMenu.cpp:497
 msgid "Hunger"
 msgstr "餓死"
 
-#: src/guiMainMenu.cpp:594
+#: src/guiMainMenu.cpp:502
 msgid "Tool Wear"
 msgstr "道具の消耗"
 
-#: src/guiMainMenu.cpp:599
+#: src/guiMainMenu.cpp:507
 msgid "Dangerous Fire"
 msgstr "危険な炎"
 
-#: src/guiMainMenu.cpp:604
+#: src/guiMainMenu.cpp:512
 msgid "Infinite Inventory"
 msgstr "無限なインベントリ"
 
-#: src/guiMainMenu.cpp:609
+#: src/guiMainMenu.cpp:517
 msgid "Initial Inventory"
 msgstr "通常のインベントリ"
 
-#: src/guiMainMenu.cpp:614
+#: src/guiMainMenu.cpp:522
 msgid "Droppable Inventory"
 msgstr "ドロップ可能なインベントリ"
 
-#: src/guiMainMenu.cpp:619
+#: src/guiMainMenu.cpp:527
 msgid "Death drops Inventory"
 msgstr "死亡時にインベントリをドロップ"
 
-#: src/guiMainMenu.cpp:661
+#: src/guiMainMenu.cpp:569
 msgid "Hide Map Options"
 msgstr "マップオプションを隠す"
 
-#: src/guiMainMenu.cpp:666
+#: src/guiMainMenu.cpp:574
 msgid "Create New Map"
 msgstr "新しいマップを作成"
 
-#: src/guiMainMenu.cpp:672
+#: src/guiMainMenu.cpp:580
 msgid "Warning! Your old map will be deleted!"
 msgstr "警告:古いマップは削除されます！"
 
-#: src/guiMainMenu.cpp:678
+#: src/guiMainMenu.cpp:586
 msgid "Map Type"
 msgstr "マップの種類"
 
-#: src/guiMainMenu.cpp:685
+#: src/guiMainMenu.cpp:593
 msgid "Flat"
 msgstr "フラットマップ"
 
-#: src/guiMainMenu.cpp:686
+#: src/guiMainMenu.cpp:594
 msgid "Flatter"
 msgstr "フラットマップ（バイオームあり）"
 
-#: src/guiMainMenu.cpp:687
+#: src/guiMainMenu.cpp:595
 msgid "Smoother"
 msgstr "スムーサー"
 
-#: src/guiMainMenu.cpp:688
+#: src/guiMainMenu.cpp:596
 msgid "Default"
 msgstr "標準のマップ"
 
-#: src/guiMainMenu.cpp:689
+#: src/guiMainMenu.cpp:597
 msgid "Hilly"
 msgstr "起伏の多いマップ"
 
-#: src/guiMainMenu.cpp:690
+#: src/guiMainMenu.cpp:598
 msgid "Mountains"
 msgstr "山地のマップ"
 
-#: src/guiMainMenu.cpp:691
+#: src/guiMainMenu.cpp:599
 msgid "Crazy"
 msgstr "狂ったマップ"
 
-#: src/guiMainMenu.cpp:692
+#: src/guiMainMenu.cpp:600
 msgid "Crazy Hills"
 msgstr "狂った丘のマップ"
 
-#: src/guiMainMenu.cpp:714
+#: src/guiMainMenu.cpp:622
 msgid "Use Fixed Seed"
 msgstr "シード値を使用"
 
-#: src/guiMainMenu.cpp:720
+#: src/guiMainMenu.cpp:628
 msgid "Map Seed"
 msgstr "Seed値"
 
-#: src/guiMainMenu.cpp:737
+#: src/guiMainMenu.cpp:645
 msgid "Clear Map"
 msgstr "地図を初期化"
 
-#: src/guiMainMenu.cpp:742
+#: src/guiMainMenu.cpp:650
 msgid "Warning! This will delete all construction from your map!"
 msgstr "警告:マップの中身が全て消去されます！"
 
-#: src/guiMainMenu.cpp:760
+#: src/guiMainMenu.cpp:668
 msgid ""
 "Voxelands\n"
 "http://www.voxelands.com/\n"
 "By Lisa 'darkrose' Milne <lisa@ltmnet.com> and contributors."
-msgstr "Voxelands\nhttp://www.voxelands.com/\nLisa 'darkrose' Milne <lisa@ltmnet.com> と貢献者によって開発されています。"
+msgstr ""
+"Voxelands\n"
+"http://www.voxelands.com/\n"
+"Lisa 'darkrose' Milne <lisa@ltmnet.com> と貢献者によって開発されています。"
 
-#: src/guiMainMenu.cpp:767
+#: src/guiMainMenu.cpp:675
 msgid "Programmers"
 msgstr "プログラマ"
 
-#: src/guiMainMenu.cpp:770
+#: src/guiMainMenu.cpp:678
 msgid "Artists and Modellers"
 msgstr "アーティストとモデレーター"
 
-#: src/guiMainMenu.cpp:773
+#: src/guiMainMenu.cpp:681
 msgid "Translators"
 msgstr "翻訳者"
 
-#: src/guiMainMenu.cpp:776
+#: src/guiMainMenu.cpp:684
 msgid "Documentation Writters"
 msgstr "資料の筆者"
 
-#: src/guiMainMenu.cpp:779
+#: src/guiMainMenu.cpp:687
 msgid "Testers, Packagers, and Builders"
 msgstr "テスター、パッケージャー、ビルダー"
 
-#: src/guiMainMenu.cpp:782
+#: src/guiMainMenu.cpp:690
 msgid "Music and Sound Effects Composers"
 msgstr "音楽とサウンドエフェクトの作曲者"
 
-#: src/guiMainMenu.cpp:785
+#: src/guiMainMenu.cpp:693
 msgid "Other Contributers, and Special Thanks"
 msgstr "その他の貢献者、スペシャルサンクス"
 
-#: src/guiMainMenu.cpp:789
+#: src/guiMainMenu.cpp:697
 msgid ""
 "Based on Minetest-C55 by Perttu Ahola <celeron55@gmail.com>\n"
-"and contributors: PilzAdam, Taoki, tango_, kahrl (kaaaaaahrl?), darkrose, matttpt, erlehmann, SpeedProg, JacobF, teddydestodes, marktraceur, Jonathan Neuschafer, thexyz, VanessaE, sfan5... and tens of more random people."
-msgstr "Perttu Ahola <celeron55@gmail.com>によるMinetest-C55をベースに開発されています。\nその開発者: PilzAdam, Taoki, tango_, kahrl (kaaaaaahrl?), darkrose, matttpt, erlehmann, SpeedProg, JacobF, teddydestodes, marktraceur, Jonathan Neuschafer, thexyz, VanessaE, sfan5... と様々な人たち"
+"and contributors: PilzAdam, Taoki, tango_, kahrl (kaaaaaahrl?), darkrose, "
+"matttpt, erlehmann, SpeedProg, JacobF, teddydestodes, marktraceur, Jonathan "
+"Neuschafer, thexyz, VanessaE, sfan5... and tens of more random people."
+msgstr ""
+"Perttu Ahola <celeron55@gmail.com>によるMinetest-C55をベースに開発されていま"
+"す。\n"
+"その開発者: PilzAdam, Taoki, tango_, kahrl (kaaaaaahrl?), darkrose, matttpt, "
+"erlehmann, SpeedProg, JacobF, teddydestodes, marktraceur, Jonathan "
+"Neuschafer, thexyz, VanessaE, sfan5... と様々な人たち"
 
 #: src/guiMessageMenu.cpp:112 src/guiPauseMenu.cpp:143
 msgid "Continue"
 msgstr "再開"
 
+#: src/guiMultiplayerMenu.cpp:135 src/guiSettingsMenu.cpp:277
+msgid "Main Menu"
+msgstr "メインメニュー"
+
+#: src/guiMultiplayerMenu.cpp:142
+msgid "All Servers"
+msgstr ""
+
+#: src/guiMultiplayerMenu.cpp:148
+msgid "Favourite Servers"
+msgstr ""
+
+#: src/guiMultiplayerMenu.cpp:154
+#, fuzzy
+msgid "Custom Connect"
+msgstr "接続"
+
+#: src/guiMultiplayerMenu.cpp:169
+msgid "Custom Connection"
+msgstr ""
+
+#: src/guiMultiplayerMenu.cpp:176
+msgid "Address/Port"
+msgstr "アドレスとポート"
+
+#: src/guiMultiplayerMenu.cpp:201 src/guiMultiplayerMenu.cpp:313
+msgid "Add to Favourites"
+msgstr ""
+
+#: src/guiMultiplayerMenu.cpp:206 src/guiMultiplayerMenu.cpp:320
+msgid "Connect"
+msgstr "接続"
+
+#: src/guiMultiplayerMenu.cpp:213
+msgid "Name/Password"
+msgstr "名前とパスワード"
+
+#: src/guiMultiplayerMenu.cpp:240
+msgid "Join Server"
+msgstr ""
+
+#: src/guiMultiplayerMenu.cpp:262
+msgid "My Favourites"
+msgstr ""
+
+#: src/guiMultiplayerMenu.cpp:265
+msgid "Server List"
+msgstr ""
+
+#: src/guiMultiplayerMenu.cpp:270
+msgid "Get New List"
+msgstr ""
+
+#: src/guiMultiplayerMenu.cpp:307
+msgid "Remove from Favourites"
+msgstr ""
+
 #: src/guiPasswordChange.cpp:105
 msgid "Old Password"
 msgstr "以前のパスワード"
@@ -3755,11 +3832,11 @@ msgstr "前進"
 msgid "Backward"
 msgstr "後退"
 
-#: src/guiSettingsMenu.cpp:72 src/keycode.cpp:234
+#: src/guiSettingsMenu.cpp:72 src/keycode.cpp:263
 msgid "Left"
 msgstr "左"
 
-#: src/guiSettingsMenu.cpp:73 src/keycode.cpp:234
+#: src/guiSettingsMenu.cpp:73 src/keycode.cpp:265
 msgid "Right"
 msgstr "右"
 
@@ -3795,11 +3872,11 @@ msgstr "視野の調節"
 msgid "Toggle Fly"
 msgstr "飛行モード"
 
-#: src/guiSettingsMenu.cpp:82 src/keycode.cpp:234
+#: src/guiSettingsMenu.cpp:82 src/keycode.cpp:264
 msgid "Up"
 msgstr "上キー"
 
-#: src/guiSettingsMenu.cpp:83 src/keycode.cpp:234
+#: src/guiSettingsMenu.cpp:83 src/keycode.cpp:266
 msgid "Down"
 msgstr "下キー"
 
@@ -3843,10 +3920,6 @@ msgstr "次のアイテム"
 msgid "Next Item"
 msgstr "前のアイテム"
 
-#: src/guiSettingsMenu.cpp:277
-msgid "Main Menu"
-msgstr "メインメニュー"
-
 #: src/guiSettingsMenu.cpp:284 src/guiSettingsMenu.cpp:311
 msgid "Controls"
 msgstr "操作"
@@ -3954,362 +4027,576 @@ msgstr "エナジーブースト: %d:%02d"
 msgid "Cold Protection: %d:%02d"
 msgstr "冷気プロテクション: %d:%02d"
 
-#: src/inventory.cpp:230 src/inventory.cpp:352
-msgid "Cookable: Yes"
-msgstr "調理: 可能"
-
-#: src/inventory.cpp:235 src/inventory.cpp:357 src/inventory.cpp:532
-msgid "Fuel Burn Time: "
-msgstr "炉の加熱時間"
-
-#: src/inventory.cpp:321
-msgid "Hunger: "
-msgstr "満腹度:"
-
-#: src/inventory.cpp:327
-msgid "Health: "
-msgstr "体力:"
-
-#: src/inventory.cpp:334
-msgid "Cold Protection: "
-msgstr "冷気プロテクション:"
-
-#: src/inventory.cpp:343
-msgid "Energy Boost: "
-msgstr "エナジーブースト:"
-
-#: src/inventory.cpp:521
-msgid "Strength: "
-msgstr "強さ:"
-
-#: src/inventory.cpp:524
-msgid "Speed: "
-msgstr "速度:"
-
-#: src/inventory.cpp:527
-msgid "Level: "
-msgstr "レベル:"
-
-#: src/inventory.cpp:557
+#: src/inventory.cpp:246 src/inventory.cpp:580
 msgid "Contains: "
 msgstr "要素:"
 
-#: src/inventory.cpp:643
+#: src/inventory.cpp:253 src/inventory.cpp:375
+msgid "Cookable: Yes"
+msgstr "調理: 可能"
+
+#: src/inventory.cpp:258 src/inventory.cpp:380 src/inventory.cpp:555
+msgid "Fuel Burn Time: "
+msgstr "炉の加熱時間"
+
+#: src/inventory.cpp:344
+msgid "Hunger: "
+msgstr "満腹度:"
+
+#: src/inventory.cpp:350
+msgid "Health: "
+msgstr "体力:"
+
+#: src/inventory.cpp:357
+msgid "Cold Protection: "
+msgstr "冷気プロテクション:"
+
+#: src/inventory.cpp:366
+msgid "Energy Boost: "
+msgstr "エナジーブースト:"
+
+#: src/inventory.cpp:544
+msgid "Strength: "
+msgstr "強さ:"
+
+#: src/inventory.cpp:547
+msgid "Speed: "
+msgstr "速度:"
+
+#: src/inventory.cpp:550
+msgid "Level: "
+msgstr "レベル:"
+
+#: src/inventory.cpp:666
 msgid "Armour: "
 msgstr "アーマー:"
 
-#: src/inventory.cpp:649
+#: src/inventory.cpp:672
 msgid "Warmth: "
 msgstr "暖気:"
 
-#: src/inventory.cpp:655
+#: src/inventory.cpp:678
 msgid "Pressure: "
 msgstr "押し:"
 
-#: src/inventory.cpp:661
+#: src/inventory.cpp:684
 msgid "Suffocation: "
 msgstr "窒息:"
 
-#: src/inventory.cpp:667
+#: src/inventory.cpp:690
 msgid "Durability: "
 msgstr "耐久力:"
 
-#: src/inventory.cpp:672
+#: src/inventory.cpp:695
 msgid "Effect Boost: "
 msgstr "エフェクトブースト:"
 
-#: src/keycode.cpp:229
+#: src/keycode.cpp:232
+msgid "-"
+msgstr ""
+
+#: src/keycode.cpp:234
 msgid "Left Button"
 msgstr "左ボタン"
 
-#: src/keycode.cpp:229
-msgid "Middle Button"
-msgstr "中央ボタン"
-
-#: src/keycode.cpp:229
+#: src/keycode.cpp:235
 msgid "Right Button"
 msgstr "右ボタン"
 
-#: src/keycode.cpp:229
+#: src/keycode.cpp:237
+msgid "Middle Button"
+msgstr "中央ボタン"
+
+#: src/keycode.cpp:238
 msgid "X Button 1"
 msgstr "Xボタン1"
 
-#: src/keycode.cpp:230
-msgid "Back"
-msgstr "戻るキー"
-
-#: src/keycode.cpp:230
-msgid "Clear"
-msgstr "クリアキー"
-
-#: src/keycode.cpp:230
-msgid "Return"
-msgstr "Enter"
-
-#: src/keycode.cpp:230
-msgid "Tab"
-msgstr "タブキー"
-
-#: src/keycode.cpp:230
+#: src/keycode.cpp:239
 msgid "X Button 2"
 msgstr "Xボタン2"
 
-#: src/keycode.cpp:231
-msgid "Capital"
-msgstr "CapsLockキー"
+#: src/keycode.cpp:240
+msgid "Back"
+msgstr "戻るキー"
 
-#: src/keycode.cpp:231
-msgid "Control"
-msgstr "コントロールキー"
+#: src/keycode.cpp:241
+msgid "Tab"
+msgstr "タブキー"
 
-#: src/keycode.cpp:231
-msgid "Kana"
-msgstr "かな"
+#: src/keycode.cpp:242
+msgid "Clear"
+msgstr "クリアキー"
 
-#: src/keycode.cpp:231
-msgid "Menu"
-msgstr "メニューキー"
+#: src/keycode.cpp:243
+msgid "Return"
+msgstr "Enter"
 
-#: src/keycode.cpp:231
-msgid "Pause"
-msgstr "ポーズキー"
-
-#: src/keycode.cpp:231
+#: src/keycode.cpp:244
 msgid "Shift"
 msgstr "Shiftキー"
 
-#: src/keycode.cpp:232
-msgid "Convert"
-msgstr "変換キー"
+#: src/keycode.cpp:245
+msgid "Control"
+msgstr "コントロールキー"
 
-#: src/keycode.cpp:232
-msgid "Escape"
-msgstr "エスケープキー"
+#: src/keycode.cpp:246
+msgid "Menu"
+msgstr "メニューキー"
 
-#: src/keycode.cpp:232
-msgid "Final"
-msgstr "ファイナルキー"
+#: src/keycode.cpp:247
+msgid "Pause"
+msgstr "ポーズキー"
 
-#: src/keycode.cpp:232
+#: src/keycode.cpp:248
+msgid "Capital"
+msgstr "CapsLockキー"
+
+#: src/keycode.cpp:249
+msgid "Kana"
+msgstr "かな"
+
+#: src/keycode.cpp:250
 msgid "Junja"
 msgstr "Junjaキー"
 
-#: src/keycode.cpp:232
+#: src/keycode.cpp:251
+msgid "Final"
+msgstr "ファイナルキー"
+
+#: src/keycode.cpp:252
 msgid "Kanji"
 msgstr "漢字キー"
 
-#: src/keycode.cpp:232
+#: src/keycode.cpp:253
+msgid "Escape"
+msgstr "エスケープキー"
+
+#: src/keycode.cpp:254
+msgid "Convert"
+msgstr "変換キー"
+
+#: src/keycode.cpp:255
 msgid "Nonconvert"
 msgstr "無変換キー"
 
-#: src/keycode.cpp:233
+#: src/keycode.cpp:256
 msgid "Accept"
 msgstr "許可キー"
 
-#: src/keycode.cpp:233
-msgid "End"
-msgstr "Endキー"
-
-#: src/keycode.cpp:233
-msgid "Home"
-msgstr "Homeキー"
-
-#: src/keycode.cpp:233
+#: src/keycode.cpp:257
 msgid "Mode Change"
 msgstr "モード変更キー"
 
-#: src/keycode.cpp:233
-msgid "Next"
-msgstr "次キー"
-
-#: src/keycode.cpp:233
-msgid "Prior"
-msgstr "前キー"
-
-#: src/keycode.cpp:233
+#: src/keycode.cpp:258
 msgid "Space"
 msgstr "スペースキー"
 
-#: src/keycode.cpp:234
-msgid "Execute"
-msgstr "実行キー"
+#: src/keycode.cpp:259
+msgid "Prior"
+msgstr "前キー"
 
-#: src/keycode.cpp:234
-msgid "Print"
-msgstr "印刷キー"
+#: src/keycode.cpp:260
+msgid "Next"
+msgstr "次キー"
 
-#: src/keycode.cpp:234
+#: src/keycode.cpp:261
+msgid "End"
+msgstr "Endキー"
+
+#: src/keycode.cpp:262
+msgid "Home"
+msgstr "Homeキー"
+
+#: src/keycode.cpp:267
 msgid "Select"
 msgstr "選択キー"
 
-#: src/keycode.cpp:235
-msgid "Delete"
-msgstr "Deleteキー"
+#: src/keycode.cpp:268
+msgid "Print"
+msgstr "印刷キー"
 
-#: src/keycode.cpp:235
-msgid "Help"
-msgstr "ヘルプキー"
+#: src/keycode.cpp:269
+msgid "Execute"
+msgstr "実行キー"
 
-#: src/keycode.cpp:235
-msgid "Insert"
-msgstr "Insertキー"
-
-#: src/keycode.cpp:235
+#: src/keycode.cpp:270
 msgid "Snapshot"
 msgstr "スナップショットキー"
 
-#: src/keycode.cpp:238
+#: src/keycode.cpp:271
+msgid "Insert"
+msgstr "Insertキー"
+
+#: src/keycode.cpp:272
+msgid "Delete"
+msgstr "Deleteキー"
+
+#: src/keycode.cpp:273
+msgid "Help"
+msgstr "ヘルプキー"
+
+#: src/keycode.cpp:274
+msgid "0"
+msgstr ""
+
+#: src/keycode.cpp:275
+msgid "1"
+msgstr ""
+
+#: src/keycode.cpp:276
+msgid "2"
+msgstr ""
+
+#: src/keycode.cpp:277
+msgid "3"
+msgstr ""
+
+#: src/keycode.cpp:278
+msgid "4"
+msgstr ""
+
+#: src/keycode.cpp:279
+msgid "5"
+msgstr ""
+
+#: src/keycode.cpp:280
+msgid "6"
+msgstr ""
+
+#: src/keycode.cpp:281
+msgid "7"
+msgstr ""
+
+#: src/keycode.cpp:282
+msgid "8"
+msgstr ""
+
+#: src/keycode.cpp:283
+msgid "9"
+msgstr ""
+
+#: src/keycode.cpp:284
+msgid "A"
+msgstr ""
+
+#: src/keycode.cpp:285
+msgid "B"
+msgstr ""
+
+#: src/keycode.cpp:286
+msgid "C"
+msgstr ""
+
+#: src/keycode.cpp:287
+msgid "D"
+msgstr ""
+
+#: src/keycode.cpp:288
+msgid "E"
+msgstr ""
+
+#: src/keycode.cpp:289
+msgid "F"
+msgstr ""
+
+#: src/keycode.cpp:290
+msgid "G"
+msgstr ""
+
+#: src/keycode.cpp:291
+msgid "H"
+msgstr ""
+
+#: src/keycode.cpp:292
+msgid "I"
+msgstr ""
+
+#: src/keycode.cpp:293
+msgid "J"
+msgstr ""
+
+#: src/keycode.cpp:294
+msgid "K"
+msgstr ""
+
+#: src/keycode.cpp:295
+msgid "L"
+msgstr ""
+
+#: src/keycode.cpp:296
+msgid "M"
+msgstr ""
+
+#: src/keycode.cpp:297
+msgid "N"
+msgstr ""
+
+#: src/keycode.cpp:298
+msgid "O"
+msgstr ""
+
+#: src/keycode.cpp:299
+msgid "P"
+msgstr ""
+
+#: src/keycode.cpp:300
+msgid "Q"
+msgstr ""
+
+#: src/keycode.cpp:301
+msgid "R"
+msgstr ""
+
+#: src/keycode.cpp:302
+msgid "S"
+msgstr ""
+
+#: src/keycode.cpp:303
+msgid "T"
+msgstr ""
+
+#: src/keycode.cpp:304
+#, fuzzy
+msgid "U"
+msgstr "上キー"
+
+#: src/keycode.cpp:305
+msgid "V"
+msgstr ""
+
+#: src/keycode.cpp:306
+msgid "W"
+msgstr ""
+
+#: src/keycode.cpp:307
+msgid "X"
+msgstr ""
+
+#: src/keycode.cpp:308
+msgid "Y"
+msgstr ""
+
+#: src/keycode.cpp:309
+msgid "Z"
+msgstr ""
+
+#: src/keycode.cpp:310
 msgid "Left Windows"
 msgstr "左Windowsキー"
 
-#: src/keycode.cpp:239
-msgid "Apps"
-msgstr "アプリキー"
-
-#: src/keycode.cpp:239
-msgid "Numpad 0"
-msgstr "テンキー0"
-
-#: src/keycode.cpp:239
-msgid "Numpad 1"
-msgstr "テンキー1"
-
-#: src/keycode.cpp:239
+#: src/keycode.cpp:311
 msgid "Right Windows"
 msgstr "右Windowsキー"
 
-#: src/keycode.cpp:239
+#: src/keycode.cpp:312
+msgid "Apps"
+msgstr "アプリキー"
+
+#: src/keycode.cpp:313
 msgid "Sleep"
 msgstr "スリープキー"
 
-#: src/keycode.cpp:240
+#: src/keycode.cpp:314
+msgid "Numpad 0"
+msgstr "テンキー0"
+
+#: src/keycode.cpp:315
+msgid "Numpad 1"
+msgstr "テンキー1"
+
+#: src/keycode.cpp:316
 msgid "Numpad 2"
 msgstr "テンキー2"
 
-#: src/keycode.cpp:240
+#: src/keycode.cpp:317
 msgid "Numpad 3"
 msgstr "テンキー3"
 
-#: src/keycode.cpp:240
+#: src/keycode.cpp:318
 msgid "Numpad 4"
 msgstr "テンキー4"
 
-#: src/keycode.cpp:240
+#: src/keycode.cpp:319
 msgid "Numpad 5"
 msgstr "テンキー5"
 
-#: src/keycode.cpp:240
+#: src/keycode.cpp:320
 msgid "Numpad 6"
 msgstr "テンキー6"
 
-#: src/keycode.cpp:240
+#: src/keycode.cpp:321
 msgid "Numpad 7"
 msgstr "テンキー7"
 
-#: src/keycode.cpp:241
-msgid "Numpad *"
-msgstr "テンキー*"
-
-#: src/keycode.cpp:241
-msgid "Numpad +"
-msgstr "テンキー+"
-
-#: src/keycode.cpp:241
-msgid "Numpad -"
-msgstr "テンキー -"
-
-#: src/keycode.cpp:241
-msgid "Numpad /"
-msgstr "テンキー/"
-
-#: src/keycode.cpp:241
+#: src/keycode.cpp:322
 msgid "Numpad 8"
 msgstr "テンキー8"
 
-#: src/keycode.cpp:241
+#: src/keycode.cpp:323
 msgid "Numpad 9"
 msgstr "テンキー9"
 
-#: src/keycode.cpp:245
+#: src/keycode.cpp:324
+msgid "Numpad *"
+msgstr "テンキー*"
+
+#: src/keycode.cpp:325
+msgid "Numpad +"
+msgstr "テンキー+"
+
+#: src/keycode.cpp:326 src/keycode.cpp:329
+msgid "Numpad /"
+msgstr "テンキー/"
+
+#: src/keycode.cpp:327
+msgid "Numpad -"
+msgstr "テンキー -"
+
+#: src/keycode.cpp:328
+#, fuzzy
+msgid "Numpad ."
+msgstr "テンキー0"
+
+#: src/keycode.cpp:330
+msgid "F10"
+msgstr ""
+
+#: src/keycode.cpp:331
+msgid "F11"
+msgstr ""
+
+#: src/keycode.cpp:332
+msgid "F12"
+msgstr ""
+
+#: src/keycode.cpp:333
+msgid "F13"
+msgstr ""
+
+#: src/keycode.cpp:334
+msgid "F14"
+msgstr ""
+
+#: src/keycode.cpp:335
+msgid "F15"
+msgstr ""
+
+#: src/keycode.cpp:336
+msgid "F16"
+msgstr ""
+
+#: src/keycode.cpp:337
+msgid "F17"
+msgstr ""
+
+#: src/keycode.cpp:338
+msgid "F18"
+msgstr ""
+
+#: src/keycode.cpp:339
+msgid "F19"
+msgstr ""
+
+#: src/keycode.cpp:340
+msgid "F20"
+msgstr ""
+
+#: src/keycode.cpp:341
+msgid "F21"
+msgstr ""
+
+#: src/keycode.cpp:342
+msgid "F22"
+msgstr ""
+
+#: src/keycode.cpp:343
+msgid "F23"
+msgstr ""
+
+#: src/keycode.cpp:344
+msgid "F24"
+msgstr ""
+
+#: src/keycode.cpp:345
 msgid "Num Lock"
 msgstr "Num Lockキー"
 
-#: src/keycode.cpp:245
+#: src/keycode.cpp:346
 msgid "Scroll Lock"
 msgstr "スクロールロックキー"
 
-#: src/keycode.cpp:246
+#: src/keycode.cpp:347
 msgid "Left Shift"
 msgstr "左Shiftキー"
 
-#: src/keycode.cpp:246
+#: src/keycode.cpp:348
 msgid "Right Shift"
 msgstr "右Shiftキー"
 
-#: src/keycode.cpp:247
+#: src/keycode.cpp:349
 msgid "Left Control"
 msgstr "左コントロールキー"
 
-#: src/keycode.cpp:247
-msgid "Left Menu"
-msgstr "左メニューキー"
-
-#: src/keycode.cpp:247
+#: src/keycode.cpp:350
 msgid "Right Control"
 msgstr "右コントロールキー"
 
-#: src/keycode.cpp:247
+#: src/keycode.cpp:351
+msgid "Left Menu"
+msgstr "左メニューキー"
+
+#: src/keycode.cpp:352
 msgid "Right Menu"
 msgstr "右メニューキー"
 
-#: src/keycode.cpp:249
-msgid "Comma"
-msgstr ","
-
-#: src/keycode.cpp:249
-msgid "Minus"
-msgstr "-"
-
-#: src/keycode.cpp:249
-msgid "Period"
-msgstr "."
-
-#: src/keycode.cpp:249
+#: src/keycode.cpp:353
 msgid "Plus"
 msgstr "+"
 
-#: src/keycode.cpp:253
+#: src/keycode.cpp:354
+msgid "Comma"
+msgstr ","
+
+#: src/keycode.cpp:355
+msgid "Minus"
+msgstr "-"
+
+#: src/keycode.cpp:356
+msgid "Period"
+msgstr "."
+
+#: src/keycode.cpp:357
 msgid "Attn"
 msgstr "Attnキー"
 
-#: src/keycode.cpp:253
+#: src/keycode.cpp:358
 msgid "CrSel"
 msgstr "CrSelキー"
 
-#: src/keycode.cpp:254
-msgid "Erase OEF"
-msgstr "Erase OEFキー"
-
-#: src/keycode.cpp:254
+#: src/keycode.cpp:359
 msgid "ExSel"
 msgstr "ExSelキー"
 
-#: src/keycode.cpp:254
-msgid "OEM Clear"
-msgstr "OEMクリアキー"
+#: src/keycode.cpp:360
+msgid "Erase OEF"
+msgstr "Erase OEFキー"
 
-#: src/keycode.cpp:254
-msgid "PA1"
-msgstr "PA1キー"
-
-#: src/keycode.cpp:254
+#: src/keycode.cpp:361
 msgid "Play"
 msgstr "プレイキー"
 
-#: src/keycode.cpp:254
+#: src/keycode.cpp:362
 msgid "Zoom"
 msgstr "ズームキー"
 
+#: src/keycode.cpp:363
+msgid "PA1"
+msgstr "PA1キー"
+
+#: src/keycode.cpp:364
+msgid "OEM Clear"
+msgstr "OEMクリアキー"
+
 #: src/main.cpp:1131
 msgid "Setting Up UI"
 msgstr "UIの設定"
@@ -4326,30 +4613,70 @@ msgstr "生物を読み込んでいます..."
 msgid "Setting Up Sound"
 msgstr "音量を設定しています..."
 
-#: src/mapnode.cpp:282
+#: src/mapnode.cpp:285
 msgid "Loading Base MapNodes"
 msgstr "基本的なノードを読み込んでいます..."
 
-#: src/mapnode.cpp:286
+#: src/mapnode.cpp:289
 msgid "Loading Circuit MapNodes"
 msgstr "回路のノードを読み込んでいます..."
 
-#: src/mapnode.cpp:290
+#: src/mapnode.cpp:293
 msgid "Loading Plant MapNodes"
 msgstr "植物のノードを読み込んでいます..."
 
-#: src/mapnode.cpp:294
+#: src/mapnode.cpp:297
 msgid "Loading Farming MapNodes"
 msgstr "農業関連のノードを読み込んでいます..."
 
-#: src/mapnode.cpp:298
+#: src/mapnode.cpp:301
 msgid "Loading Decorative MapNodes"
 msgstr "装飾用ノードを読み込んでいます..."
 
-#: src/mapnode.cpp:302
+#: src/mapnode.cpp:305
 msgid "Loading Interactive MapNodes"
 msgstr "相互作用するノードを読み込んでいます..."
 
-#: src/mapnode.cpp:306
+#: src/mapnode.cpp:309
 msgid "Loading Special MapNodes"
 msgstr "特別なノードを読み込んでいます..."
+
+#: src/mineral.cpp:93
+#, fuzzy
+msgid "Coal"
+msgstr "石炭"
+
+#: src/mineral.cpp:99
+#, fuzzy
+msgid "Iron"
+msgstr "鉄の塊"
+
+#: src/mineral.cpp:106
+#, fuzzy
+msgid "Tin"
+msgstr "細くする"
+
+#: src/mineral.cpp:113
+#, fuzzy
+msgid "Copper"
+msgstr "銅の塊"
+
+#: src/mineral.cpp:121
+#, fuzzy
+msgid "Silver"
+msgstr "銀の塊"
+
+#: src/mineral.cpp:128
+#, fuzzy
+msgid "Gold"
+msgstr "金の塊"
+
+#: src/mineral.cpp:135
+#, fuzzy
+msgid "Quartz"
+msgstr "水晶の欠片"
+
+#: src/mineral.cpp:157
+#, fuzzy
+msgid "Turquoise"
+msgstr "ターコイズ"
diff --git a/po/jbo/voxelands.po b/po/jbo/voxelands.po
index bee53ff..56fe1f2 100644
--- a/po/jbo/voxelands.po
+++ b/po/jbo/voxelands.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Lisa 'darkrose' Milne
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # Wuzzy <almikes@aol.com>, 2015
 # Wuzzy <almikes@aol.com>, 2014-2015
@@ -9,14 +9,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Voxelands\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-10-19 01:55+1000\n"
+"POT-Creation-Date: 2015-12-21 11:27+1000\n"
 "PO-Revision-Date: 2015-10-18 22:16+0000\n"
 "Last-Translator: Wuzzy <almikes@aol.com>\n"
-"Language-Team: Lojban (http://www.transifex.com/voxelands/voxelands/language/jbo/)\n"
+"Language-Team: Lojban (http://www.transifex.com/voxelands/voxelands/language/"
+"jbo/)\n"
+"Language: jbo\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: jbo\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: src/character_creator.cpp:55
@@ -229,9 +230,20 @@ msgstr "lo fanbu'u cutci"
 
 #: src/character_creator.cpp:202
 msgid ""
-"Here you can create your default character, this is how other players will see you in-game. When you join a new server you will start with the clothing you select here. Additional clothing, both protective and decorative, can be crafted in-game.\n"
+"Here you can create your default character, this is how other players will "
+"see you in-game. When you join a new server you will start with the clothing "
+"you select here. Additional clothing, both protective and decorative, can be "
+"crafted in-game.\n"
 "You can return here from the main menu anytime to change your character."
-msgstr ".i vi lo ti sazycimde ku do kakne lo nu finti lo xarpre be do be'o goi xy\n.i xy. ba se viska lo drata kelci ca lo nu kelci\n.i ca lo nu do co'a pilno lo cnino samse'u kei xy. dasni lo taxfu poi do cuxna ke'a\n.i cumki fa lo nu lo seljmina taxfu noi ke'a badgai gi'e jadni ku'o se zbasu kei fe lo nu kelci\n.i cumki fa lo nu do xrukla pe'a lo ti sazycimde le ralju sazycimde tezu'e lo nu gafygau xy."
+msgstr ""
+".i vi lo ti sazycimde ku do kakne lo nu finti lo xarpre be do be'o goi xy\n"
+".i xy. ba se viska lo drata kelci ca lo nu kelci\n"
+".i ca lo nu do co'a pilno lo cnino samse'u kei xy. dasni lo taxfu poi do "
+"cuxna ke'a\n"
+".i cumki fa lo nu lo seljmina taxfu noi ke'a badgai gi'e jadni ku'o se zbasu "
+"kei fe lo nu kelci\n"
+".i cumki fa lo nu do xrukla pe'a lo ti sazycimde le ralju sazycimde tezu'e "
+"lo nu gafygau xy."
 
 #: src/character_creator.cpp:223
 msgid "Create Your Character"
@@ -265,7 +277,7 @@ msgstr "jakmau"
 msgid "Done"
 msgstr "fitytu'i"
 
-#: src/character_creator.cpp:423 src/keycode.cpp:229
+#: src/character_creator.cpp:423 src/keycode.cpp:236
 msgid "Cancel"
 msgstr "fitytoltu'i"
 
@@ -1117,7 +1129,7 @@ msgstr "lo fagri rokci"
 msgid "Steel Ingot"
 msgstr "lo gasta manfybli"
 
-#: src/content_craftitem.cpp:225 src/content_mapnode.cpp:710
+#: src/content_craftitem.cpp:225 src/content_mapnode.cpp:723
 msgid "Brick"
 msgstr "lo kitybli"
 
@@ -1545,11 +1557,11 @@ msgstr ""
 msgid "Unbound Mithril"
 msgstr "lo narjorne jimrmifrile"
 
-#: src/content_craftitem.cpp:1516
+#: src/content_craftitem.cpp:1516 src/mineral.cpp:142
 msgid "Mithril"
 msgstr "lo jimrmifrile"
 
-#: src/content_craftitem.cpp:1525
+#: src/content_craftitem.cpp:1525 src/mineral.cpp:149
 msgid "Ruby"
 msgstr "lo zirxu'ejme"
 
@@ -1557,15 +1569,15 @@ msgstr "lo zirxu'ejme"
 msgid "Turquiose"
 msgstr "lo cicnykunra"
 
-#: src/content_craftitem.cpp:1541
+#: src/content_craftitem.cpp:1541 src/mineral.cpp:165
 msgid "Amethyst"
 msgstr "lo amtisti"
 
-#: src/content_craftitem.cpp:1549
+#: src/content_craftitem.cpp:1549 src/mineral.cpp:173
 msgid "Sapphire"
 msgstr ""
 
-#: src/content_craftitem.cpp:1557
+#: src/content_craftitem.cpp:1557 src/mineral.cpp:181
 msgid "Sunstone"
 msgstr ""
 
@@ -1577,392 +1589,396 @@ msgstr "lo rokci"
 msgid "Limestone"
 msgstr ""
 
-#: src/content_mapnode.cpp:219
+#: src/content_mapnode.cpp:221
+msgid "Marble"
+msgstr ""
+
+#: src/content_mapnode.cpp:232
 msgid "Rock"
 msgstr ""
 
-#: src/content_mapnode.cpp:241
+#: src/content_mapnode.cpp:254
 msgid "Ice"
 msgstr "lo bisli"
 
-#: src/content_mapnode.cpp:257
+#: src/content_mapnode.cpp:270
 msgid "Coal Block"
 msgstr "lo kolme bliku"
 
-#: src/content_mapnode.cpp:274
+#: src/content_mapnode.cpp:287
 msgid "Charcoal Block"
 msgstr "lo fagytabno bliku"
 
-#: src/content_mapnode.cpp:291
+#: src/content_mapnode.cpp:304
 msgid "Stone Brick"
 msgstr "lo morna rokci"
 
-#: src/content_mapnode.cpp:305
+#: src/content_mapnode.cpp:318
 msgid "Stone Block"
 msgstr "lo rokci bliku"
 
-#: src/content_mapnode.cpp:319
+#: src/content_mapnode.cpp:332
 msgid "Rough Stone Brick"
 msgstr "lo rufsu ke morna rokci"
 
-#: src/content_mapnode.cpp:336
+#: src/content_mapnode.cpp:349
 msgid "Rough Stone Block"
 msgstr "lo rufsu ke rokci bliku"
 
-#: src/content_mapnode.cpp:352 src/content_mapnode.cpp:385
-#: src/content_mapnode.cpp:399 src/content_mapnode.cpp:432
+#: src/content_mapnode.cpp:365 src/content_mapnode.cpp:398
+#: src/content_mapnode.cpp:412 src/content_mapnode.cpp:445
 msgid "Grass"
 msgstr "lo srasu"
 
-#: src/content_mapnode.cpp:370 src/content_mapnode.cpp:417
+#: src/content_mapnode.cpp:383 src/content_mapnode.cpp:430
 msgid "Growing Grass"
 msgstr "lo banro srasu"
 
-#: src/content_mapnode.cpp:446
+#: src/content_mapnode.cpp:459
 msgid "Muddy Snow"
 msgstr "lo derpesxu snime"
 
-#: src/content_mapnode.cpp:462
+#: src/content_mapnode.cpp:475
 msgid "Mud"
 msgstr "lo derpesxu"
 
-#: src/content_mapnode.cpp:478
+#: src/content_mapnode.cpp:491
 msgid "Ash Block"
 msgstr "lo fagyfesti bliku"
 
-#: src/content_mapnode.cpp:493
+#: src/content_mapnode.cpp:506
 msgid "Sand"
 msgstr "lo canre"
 
-#: src/content_mapnode.cpp:512
+#: src/content_mapnode.cpp:525
 msgid "Gravel"
 msgstr "lo cmaro'i"
 
-#: src/content_mapnode.cpp:529
+#: src/content_mapnode.cpp:542
 msgid "Sand Stone"
 msgstr "lo canro'i"
 
-#: src/content_mapnode.cpp:544
+#: src/content_mapnode.cpp:557
 msgid "Sand Stone Bricks"
 msgstr "lo morna canro'i"
 
-#: src/content_mapnode.cpp:559
+#: src/content_mapnode.cpp:572
 msgid "Sand Stone Blocks"
 msgstr "lo canro'i bliku"
 
-#: src/content_mapnode.cpp:574
+#: src/content_mapnode.cpp:587
 msgid "Clay"
 msgstr "lo kliti"
 
-#: src/content_mapnode.cpp:591
+#: src/content_mapnode.cpp:604
 msgid "Blue Clay"
 msgstr "lo blanu kliti"
 
-#: src/content_mapnode.cpp:608
+#: src/content_mapnode.cpp:621
 msgid "Green Clay"
 msgstr "lo crino kliti"
 
-#: src/content_mapnode.cpp:625
+#: src/content_mapnode.cpp:638
 msgid "Orange Clay"
 msgstr "lo narju kliti"
 
-#: src/content_mapnode.cpp:642
+#: src/content_mapnode.cpp:655
 msgid "Purple Clay"
 msgstr "lo zirpu kliti"
 
-#: src/content_mapnode.cpp:659
+#: src/content_mapnode.cpp:672
 msgid "Red Clay"
 msgstr "lo xunre kliti"
 
-#: src/content_mapnode.cpp:676
+#: src/content_mapnode.cpp:689
 msgid "Yellow Clay"
 msgstr "lo pelxu kliti"
 
-#: src/content_mapnode.cpp:693
+#: src/content_mapnode.cpp:706
 msgid "Black Clay"
 msgstr "lo xekri kliti"
 
-#: src/content_mapnode.cpp:729
+#: src/content_mapnode.cpp:742
 msgid "Terracotta"
 msgstr "lo stakrterakota"
 
-#: src/content_mapnode.cpp:741
+#: src/content_mapnode.cpp:754
 msgid "Terracotta Brick"
 msgstr "lo morna stakrterakota"
 
-#: src/content_mapnode.cpp:755
+#: src/content_mapnode.cpp:768
 msgid "Terracotta Block"
 msgstr "lo stakrterakota bliku"
 
-#: src/content_mapnode.cpp:769
+#: src/content_mapnode.cpp:782
 msgid "Terracotta Tile"
 msgstr "lo stakrterakota tapla"
 
-#: src/content_mapnode.cpp:789
+#: src/content_mapnode.cpp:802
 msgid "Glass"
 msgstr "lo blaci"
 
-#: src/content_mapnode.cpp:809
+#: src/content_mapnode.cpp:822
 msgid "Blue Glass"
 msgstr "lo blanu blaci"
 
-#: src/content_mapnode.cpp:831
+#: src/content_mapnode.cpp:844
 msgid "Green Glass"
 msgstr "lo crino blaci"
 
-#: src/content_mapnode.cpp:853
+#: src/content_mapnode.cpp:866
 msgid "Orange Glass"
 msgstr "lo narju blaci"
 
-#: src/content_mapnode.cpp:875
+#: src/content_mapnode.cpp:888
 msgid "Purple Glass"
 msgstr "lo zirpu blaci"
 
-#: src/content_mapnode.cpp:897
+#: src/content_mapnode.cpp:910
 msgid "Red Glass"
 msgstr "lo xunre blaci"
 
-#: src/content_mapnode.cpp:919
+#: src/content_mapnode.cpp:932
 msgid "Yellow Glass"
 msgstr "lo pelxu blaci"
 
-#: src/content_mapnode.cpp:941
+#: src/content_mapnode.cpp:954
 msgid "Black Glass"
 msgstr "lo xekri blaci"
 
-#: src/content_mapnode.cpp:963
+#: src/content_mapnode.cpp:976
 msgid "Glass Pane"
 msgstr "lo blaci plita"
 
-#: src/content_mapnode.cpp:997
+#: src/content_mapnode.cpp:1010
 msgid "Blue Glass Pane"
 msgstr "lo blanu ke blaci plita"
 
-#: src/content_mapnode.cpp:1032
+#: src/content_mapnode.cpp:1045
 msgid "Green Glass Pane"
 msgstr "lo crino ke blaci plita"
 
-#: src/content_mapnode.cpp:1067
+#: src/content_mapnode.cpp:1080
 msgid "Orange Glass Pane"
 msgstr "lo narju ke blaci plita"
 
-#: src/content_mapnode.cpp:1102
+#: src/content_mapnode.cpp:1115
 msgid "Purple Glass Pane"
 msgstr "lo zirpu ke blaci plita"
 
-#: src/content_mapnode.cpp:1137
+#: src/content_mapnode.cpp:1150
 msgid "Red Glass Pane"
 msgstr "lo xunre ke blaci plita"
 
-#: src/content_mapnode.cpp:1172
+#: src/content_mapnode.cpp:1185
 msgid "Yellow Glass Pane"
 msgstr "lo pelxu ke blaci plita"
 
-#: src/content_mapnode.cpp:1207
+#: src/content_mapnode.cpp:1220
 msgid "Black Glass Pane"
 msgstr "lo xekri ke blaci plita"
 
-#: src/content_mapnode.cpp:1242 src/content_mapnode_farm.cpp:333
+#: src/content_mapnode.cpp:1255 src/content_mapnode_farm.cpp:333
 msgid "Glass Light"
 msgstr "lo blaci tergu'i"
 
-#: src/content_mapnode.cpp:1265
+#: src/content_mapnode.cpp:1278
 msgid "Wood"
 msgstr "lo mudri"
 
-#: src/content_mapnode.cpp:1291
+#: src/content_mapnode.cpp:1304
 msgid "Jungle Wood"
 msgstr "lo glatimdemricfoi mudri"
 
-#: src/content_mapnode.cpp:1316
+#: src/content_mapnode.cpp:1329
 msgid "Pine"
 msgstr "lo ckunu mudri"
 
-#: src/content_mapnode.cpp:1341
+#: src/content_mapnode.cpp:1354
 msgid "Sponge"
 msgstr "lo panje"
 
-#: src/content_mapnode.cpp:1356
+#: src/content_mapnode.cpp:1369
 msgid "Waterlogged Sponge"
 msgstr "lo cilmo panje"
 
-#: src/content_mapnode.cpp:1371
+#: src/content_mapnode.cpp:1384
 msgid "Hay Bale"
 msgstr "lo sudysrasu bliku"
 
-#: src/content_mapnode.cpp:1388
+#: src/content_mapnode.cpp:1401
 msgid "Raw Apple Pie"
 msgstr "lo na'e seljukpa ke plise titnanba"
 
-#: src/content_mapnode.cpp:1417
+#: src/content_mapnode.cpp:1430
 msgid "Apple Pie"
 msgstr "lo plise titnanba"
 
-#: src/content_mapnode.cpp:1512
+#: src/content_mapnode.cpp:1525
 msgid "Raw Pumpkin Pie"
 msgstr "lo na'e seljukpa ke guzmrkukurbita titnanba"
 
-#: src/content_mapnode.cpp:1541
+#: src/content_mapnode.cpp:1554
 msgid "Pumpkin Pie"
 msgstr "lo guzmrkukurbita titnanba"
 
-#: src/content_mapnode.cpp:1636 src/content_mapnode.cpp:1715
+#: src/content_mapnode.cpp:1649 src/content_mapnode.cpp:1728
 msgid "Snow"
 msgstr "lo snime"
 
-#: src/content_mapnode.cpp:1652
+#: src/content_mapnode.cpp:1665
 msgid "Snowman"
 msgstr "lo remkemsi'exra"
 
-#: src/content_mapnode.cpp:1738 src/content_mapnode_farm.cpp:445
+#: src/content_mapnode.cpp:1752 src/content_mapnode_farm.cpp:445
 msgid "Cotton"
 msgstr "lo mapni"
 
-#: src/content_mapnode.cpp:1769
+#: src/content_mapnode.cpp:1783
 msgid "Blue Cotton"
 msgstr "lo blanu mapni"
 
-#: src/content_mapnode.cpp:1786
+#: src/content_mapnode.cpp:1800
 msgid "Green Cotton"
 msgstr "lo crino mapni"
 
-#: src/content_mapnode.cpp:1803
+#: src/content_mapnode.cpp:1817
 msgid "Orange Cotton"
 msgstr "lo narju mapni"
 
-#: src/content_mapnode.cpp:1820
+#: src/content_mapnode.cpp:1834
 msgid "Purple Cotton"
 msgstr "lo zirpu mapni"
 
-#: src/content_mapnode.cpp:1837
+#: src/content_mapnode.cpp:1851
 msgid "Red Cotton"
 msgstr "lo xunre mapni"
 
-#: src/content_mapnode.cpp:1854
+#: src/content_mapnode.cpp:1868
 msgid "Yellow Cotton"
 msgstr "lo pelxu mapni"
 
-#: src/content_mapnode.cpp:1871
+#: src/content_mapnode.cpp:1885
 msgid "Black Cotton"
 msgstr "lo xekri mapni"
 
-#: src/content_mapnode.cpp:1888
+#: src/content_mapnode.cpp:1902
 msgid "Carpet"
 msgstr "lo buklolgai"
 
-#: src/content_mapnode.cpp:1911
+#: src/content_mapnode.cpp:1925
 msgid "Blue Carpet"
 msgstr "lo blanu buklolgai"
 
-#: src/content_mapnode.cpp:1935
+#: src/content_mapnode.cpp:1949
 msgid "Green Carpet"
 msgstr "lo crino buklolgai"
 
-#: src/content_mapnode.cpp:1959
+#: src/content_mapnode.cpp:1973
 msgid "Orange Carpet"
 msgstr "lo narju buklolgai"
 
-#: src/content_mapnode.cpp:1983
+#: src/content_mapnode.cpp:1997
 msgid "Purple Carpet"
 msgstr "lo zirpu buklolgai"
 
-#: src/content_mapnode.cpp:2007
+#: src/content_mapnode.cpp:2021
 msgid "Red Carpet"
 msgstr "lo xunre buklolgai"
 
-#: src/content_mapnode.cpp:2031
+#: src/content_mapnode.cpp:2045
 msgid "Yellow Carpet"
 msgstr "lo pelxu buklolgai"
 
-#: src/content_mapnode.cpp:2055
+#: src/content_mapnode.cpp:2069
 msgid "Black Carpet"
 msgstr "lo xekri buklolgai"
 
-#: src/content_mapnode.cpp:2079
+#: src/content_mapnode.cpp:2093
 msgid "Air"
 msgstr "lo vacri"
 
-#: src/content_mapnode.cpp:2095
+#: src/content_mapnode.cpp:2109
 msgid "Vacuum"
 msgstr "lo maisru"
 
-#: src/content_mapnode.cpp:2112 src/content_mapnode.cpp:2142
+#: src/content_mapnode.cpp:2126 src/content_mapnode.cpp:2156
 msgid "Water"
 msgstr "lo djacu"
 
-#: src/content_mapnode.cpp:2172 src/content_mapnode.cpp:2200
+#: src/content_mapnode.cpp:2186 src/content_mapnode.cpp:2214
 msgid "Lava"
 msgstr "lo likro'i"
 
-#: src/content_mapnode.cpp:2231
+#: src/content_mapnode.cpp:2245
 msgid "Rough Stone"
 msgstr "lo rufsu rokci"
 
-#: src/content_mapnode.cpp:2248
+#: src/content_mapnode.cpp:2262
 msgid "Cobble Stone"
 msgstr "lo lolro'iboi"
 
-#: src/content_mapnode.cpp:2264
+#: src/content_mapnode.cpp:2278
 msgid "Mossy Cobble Stone"
 msgstr "lo clika lolro'iboi"
 
-#: src/content_mapnode.cpp:2277
+#: src/content_mapnode.cpp:2291
 msgid "Steel Block"
 msgstr "lo gasta bliku"
 
-#: src/content_mapnode.cpp:2294
+#: src/content_mapnode.cpp:2308
 msgid "Mithril Block"
 msgstr "lo jimrmifrile bliku"
 
-#: src/content_mapnode.cpp:2310
+#: src/content_mapnode.cpp:2324
 msgid "Stone Knob"
 msgstr "lo rokci ke jadni batke"
 
-#: src/content_mapnode.cpp:2311
+#: src/content_mapnode.cpp:2325
 msgid "Rough Stone Knob"
 msgstr "lo rufsu rokci ke jadni batke"
 
-#: src/content_mapnode.cpp:2312
+#: src/content_mapnode.cpp:2326
 msgid "Sandstone Knob"
 msgstr "lo canro'i ke jadni batke"
 
-#: src/content_mapnode.cpp:2313
+#: src/content_mapnode.cpp:2327
 msgid "Wooden Knob"
 msgstr "lo mudri ke jadni batke"
 
-#: src/content_mapnode.cpp:2314
+#: src/content_mapnode.cpp:2328
 msgid "Junglewood Knob"
 msgstr "lo glatimdemricfoi mudri ke jadni batke"
 
-#: src/content_mapnode.cpp:2315
+#: src/content_mapnode.cpp:2329
 msgid "Pine Knob"
 msgstr "lo ckunu ke jadni batke"
 
-#: src/content_mapnode.cpp:2319
+#: src/content_mapnode.cpp:2333
 msgid "Copper Block"
 msgstr "lo tunka bliku"
 
-#: src/content_mapnode.cpp:2336
+#: src/content_mapnode.cpp:2350
 msgid "Gold Block"
 msgstr "lo solji bliku"
 
-#: src/content_mapnode.cpp:2353
+#: src/content_mapnode.cpp:2367
 msgid "Silver Block"
 msgstr "lo rijno bliku"
 
-#: src/content_mapnode.cpp:2370
+#: src/content_mapnode.cpp:2384
 msgid "Tin Block"
 msgstr "lo tinci bliku"
 
-#: src/content_mapnode.cpp:2387
+#: src/content_mapnode.cpp:2401
 msgid "Quartz Block"
 msgstr "lo kunrkuartse bliku"
 
-#: src/content_mapnode.cpp:2404
+#: src/content_mapnode.cpp:2418
 msgid "Stone Tiles"
 msgstr "lo rokci tapla"
 
-#: src/content_mapnode.cpp:2426
+#: src/content_mapnode.cpp:2440
 msgid "Wood Tiles"
 msgstr "lo mudri tapla"
 
@@ -2010,29 +2026,29 @@ msgstr "lo jifkemlojvro"
 msgid "Repeater"
 msgstr "lo dicyba'ogaumi'i"
 
-#: src/content_mapnode_circuit.cpp:369 src/content_mapnode_circuit.cpp:393
+#: src/content_mapnode_circuit.cpp:369 src/content_mapnode_circuit.cpp:390
 msgid "Electric Lamp"
 msgstr "lo dictergu'i"
 
-#: src/content_mapnode_circuit.cpp:427 src/content_mapnode_circuit.cpp:462
-#: src/content_mapnode_circuit.cpp:516 src/content_mapnode_circuit.cpp:537
-#: src/content_mapnode_circuit.cpp:582 src/content_mapnode_circuit.cpp:603
+#: src/content_mapnode_circuit.cpp:424 src/content_mapnode_circuit.cpp:459
+#: src/content_mapnode_circuit.cpp:513 src/content_mapnode_circuit.cpp:534
+#: src/content_mapnode_circuit.cpp:579 src/content_mapnode_circuit.cpp:600
 msgid "Piston"
 msgstr "lo catke bliku"
 
-#: src/content_mapnode_circuit.cpp:489 src/content_mapnode_circuit.cpp:560
-#: src/content_mapnode_circuit.cpp:626
+#: src/content_mapnode_circuit.cpp:486 src/content_mapnode_circuit.cpp:557
+#: src/content_mapnode_circuit.cpp:623
 msgid "Piston Arm"
 msgstr "lo catke bliku birka pe'a"
 
-#: src/content_mapnode_circuit.cpp:648 src/content_mapnode_circuit.cpp:676
-#: src/content_mapnode_circuit.cpp:730 src/content_mapnode_circuit.cpp:751
-#: src/content_mapnode_circuit.cpp:796 src/content_mapnode_circuit.cpp:817
+#: src/content_mapnode_circuit.cpp:645 src/content_mapnode_circuit.cpp:673
+#: src/content_mapnode_circuit.cpp:727 src/content_mapnode_circuit.cpp:748
+#: src/content_mapnode_circuit.cpp:793 src/content_mapnode_circuit.cpp:814
 msgid "Sticky Piston"
 msgstr "lo snipa ke catke bliku"
 
-#: src/content_mapnode_circuit.cpp:703 src/content_mapnode_circuit.cpp:774
-#: src/content_mapnode_circuit.cpp:840
+#: src/content_mapnode_circuit.cpp:700 src/content_mapnode_circuit.cpp:771
+#: src/content_mapnode_circuit.cpp:837
 msgid "Sticky Piston Arm"
 msgstr "lo snipa ke catke bliku ke'e birka pe'a"
 
@@ -2172,7 +2188,7 @@ msgstr "lo vanjba"
 msgid "Trellis Grape"
 msgstr "lo spatsina vanjba"
 
-#: src/content_mapnode_farm.cpp:493 src/content_mapnode_farm.cpp:512
+#: src/content_mapnode_farm.cpp:494 src/content_mapnode_farm.cpp:513
 msgid "Dead Vine"
 msgstr "lo morsi skospa"
 
@@ -2188,131 +2204,137 @@ msgstr "lo glatimdemricfoi ckukajna"
 msgid "Pine Book Shelf"
 msgstr "lo ckunu ckukajna"
 
-#: src/content_mapnode_furniture.cpp:150 src/content_mapnode_furniture.cpp:169
-#: src/content_mapnode_furniture.cpp:188 src/content_mapnode_furniture.cpp:207
-#: src/content_mapnode_furniture.cpp:226 src/content_mapnode_furniture.cpp:245
+#: src/content_mapnode_furniture.cpp:150 src/content_mapnode_furniture.cpp:170
+#: src/content_mapnode_furniture.cpp:190 src/content_mapnode_furniture.cpp:210
+#: src/content_mapnode_furniture.cpp:230 src/content_mapnode_furniture.cpp:250
 msgid "Couch"
 msgstr "lo sfofa"
 
-#: src/content_mapnode_furniture.cpp:274 src/content_mapnode_furniture.cpp:293
-#: src/content_mapnode_furniture.cpp:312 src/content_mapnode_furniture.cpp:331
-#: src/content_mapnode_furniture.cpp:350 src/content_mapnode_furniture.cpp:369
+#: src/content_mapnode_furniture.cpp:280 src/content_mapnode_furniture.cpp:300
+#: src/content_mapnode_furniture.cpp:320 src/content_mapnode_furniture.cpp:340
+#: src/content_mapnode_furniture.cpp:360 src/content_mapnode_furniture.cpp:380
 msgid "Blue Couch"
 msgstr "lo blanu sfofa"
 
-#: src/content_mapnode_furniture.cpp:392 src/content_mapnode_furniture.cpp:411
-#: src/content_mapnode_furniture.cpp:430 src/content_mapnode_furniture.cpp:449
-#: src/content_mapnode_furniture.cpp:468 src/content_mapnode_furniture.cpp:487
+#: src/content_mapnode_furniture.cpp:404 src/content_mapnode_furniture.cpp:424
+#: src/content_mapnode_furniture.cpp:444 src/content_mapnode_furniture.cpp:464
+#: src/content_mapnode_furniture.cpp:484 src/content_mapnode_furniture.cpp:504
 msgid "Green Couch"
 msgstr "lo crino sfofa"
 
-#: src/content_mapnode_furniture.cpp:510 src/content_mapnode_furniture.cpp:529
-#: src/content_mapnode_furniture.cpp:548 src/content_mapnode_furniture.cpp:567
-#: src/content_mapnode_furniture.cpp:586 src/content_mapnode_furniture.cpp:605
+#: src/content_mapnode_furniture.cpp:528 src/content_mapnode_furniture.cpp:548
+#: src/content_mapnode_furniture.cpp:568 src/content_mapnode_furniture.cpp:588
+#: src/content_mapnode_furniture.cpp:608 src/content_mapnode_furniture.cpp:628
 msgid "Orange Couch"
 msgstr "lo narju sfofa"
 
-#: src/content_mapnode_furniture.cpp:628 src/content_mapnode_furniture.cpp:647
-#: src/content_mapnode_furniture.cpp:666 src/content_mapnode_furniture.cpp:685
-#: src/content_mapnode_furniture.cpp:704 src/content_mapnode_furniture.cpp:723
+#: src/content_mapnode_furniture.cpp:652 src/content_mapnode_furniture.cpp:672
+#: src/content_mapnode_furniture.cpp:692 src/content_mapnode_furniture.cpp:712
+#: src/content_mapnode_furniture.cpp:732 src/content_mapnode_furniture.cpp:752
 msgid "Purple Couch"
 msgstr "lo zirpu sfofa"
 
-#: src/content_mapnode_furniture.cpp:746 src/content_mapnode_furniture.cpp:765
-#: src/content_mapnode_furniture.cpp:784 src/content_mapnode_furniture.cpp:803
-#: src/content_mapnode_furniture.cpp:822 src/content_mapnode_furniture.cpp:841
+#: src/content_mapnode_furniture.cpp:776 src/content_mapnode_furniture.cpp:796
+#: src/content_mapnode_furniture.cpp:816 src/content_mapnode_furniture.cpp:836
+#: src/content_mapnode_furniture.cpp:856 src/content_mapnode_furniture.cpp:876
 msgid "Red Couch"
 msgstr "lo xunre sfofa"
 
-#: src/content_mapnode_furniture.cpp:864 src/content_mapnode_furniture.cpp:883
-#: src/content_mapnode_furniture.cpp:902 src/content_mapnode_furniture.cpp:921
-#: src/content_mapnode_furniture.cpp:940 src/content_mapnode_furniture.cpp:959
+#: src/content_mapnode_furniture.cpp:900 src/content_mapnode_furniture.cpp:920
+#: src/content_mapnode_furniture.cpp:940 src/content_mapnode_furniture.cpp:960
+#: src/content_mapnode_furniture.cpp:980
+#: src/content_mapnode_furniture.cpp:1000
 msgid "Yellow Couch"
 msgstr "lo pelxu sfofa"
 
-#: src/content_mapnode_furniture.cpp:982
-#: src/content_mapnode_furniture.cpp:1001
-#: src/content_mapnode_furniture.cpp:1020
-#: src/content_mapnode_furniture.cpp:1039
-#: src/content_mapnode_furniture.cpp:1058
-#: src/content_mapnode_furniture.cpp:1077
+#: src/content_mapnode_furniture.cpp:1024
+#: src/content_mapnode_furniture.cpp:1044
+#: src/content_mapnode_furniture.cpp:1064
+#: src/content_mapnode_furniture.cpp:1084
+#: src/content_mapnode_furniture.cpp:1104
+#: src/content_mapnode_furniture.cpp:1124
 msgid "Black Couch"
 msgstr "lo xekri sfofa"
 
-#: src/content_mapnode_furniture.cpp:1100
+#: src/content_mapnode_furniture.cpp:1148
+#: src/content_mapnode_furniture.cpp:1182
+#: src/content_mapnode_furniture.cpp:1206
+#: src/content_mapnode_furniture.cpp:1230
+#: src/content_mapnode_furniture.cpp:1254
+#: src/content_mapnode_furniture.cpp:1278
 msgid "Chair"
 msgstr "lo stizu"
 
-#: src/content_mapnode_furniture.cpp:1149
+#: src/content_mapnode_furniture.cpp:1302
 msgid "Table"
 msgstr "lo jubme"
 
-#: src/content_mapnode_furniture.cpp:1206
-#: src/content_mapnode_furniture.cpp:1239
+#: src/content_mapnode_furniture.cpp:1333
+#: src/content_mapnode_furniture.cpp:1366
 msgid "Bed"
 msgstr "lo ckana"
 
-#: src/content_mapnode_furniture.cpp:1267
-#: src/content_mapnode_furniture.cpp:1300
+#: src/content_mapnode_furniture.cpp:1394
+#: src/content_mapnode_furniture.cpp:1427
 msgid "Blue Bed"
 msgstr "lo blanu ckana"
 
-#: src/content_mapnode_furniture.cpp:1328
-#: src/content_mapnode_furniture.cpp:1361
+#: src/content_mapnode_furniture.cpp:1455
+#: src/content_mapnode_furniture.cpp:1488
 msgid "Green Bed"
 msgstr "lo crino ckana"
 
-#: src/content_mapnode_furniture.cpp:1389
-#: src/content_mapnode_furniture.cpp:1422
+#: src/content_mapnode_furniture.cpp:1516
+#: src/content_mapnode_furniture.cpp:1549
 msgid "Orange Bed"
 msgstr "lo narju ckana"
 
-#: src/content_mapnode_furniture.cpp:1450
-#: src/content_mapnode_furniture.cpp:1483
+#: src/content_mapnode_furniture.cpp:1577
+#: src/content_mapnode_furniture.cpp:1610
 msgid "Purple Bed"
 msgstr "lo zirpu ckana"
 
-#: src/content_mapnode_furniture.cpp:1511
-#: src/content_mapnode_furniture.cpp:1544
+#: src/content_mapnode_furniture.cpp:1638
+#: src/content_mapnode_furniture.cpp:1671
 msgid "Red Bed"
 msgstr "lo xunre ckana"
 
-#: src/content_mapnode_furniture.cpp:1572
-#: src/content_mapnode_furniture.cpp:1605
+#: src/content_mapnode_furniture.cpp:1699
+#: src/content_mapnode_furniture.cpp:1732
 msgid "Yellow Bed"
 msgstr "lo pelxu ckana"
 
-#: src/content_mapnode_furniture.cpp:1633
-#: src/content_mapnode_furniture.cpp:1666
+#: src/content_mapnode_furniture.cpp:1760
+#: src/content_mapnode_furniture.cpp:1793
 msgid "Black Bed"
 msgstr "lo xekri ckana"
 
-#: src/content_mapnode_furniture.cpp:1694
-#: src/content_mapnode_furniture.cpp:1729
+#: src/content_mapnode_furniture.cpp:1821
+#: src/content_mapnode_furniture.cpp:1856
 msgid "Camp Bed"
 msgstr ""
 
-#: src/content_mapnode_furniture.cpp:1753
+#: src/content_mapnode_furniture.cpp:1880
 msgid "Colorful Painting"
 msgstr "lo sorska pixra"
 
-#: src/content_mapnode_furniture.cpp:1788
+#: src/content_mapnode_furniture.cpp:1915
 msgid "Red Rose Painting"
 msgstr "lo pixra be lo xunre rozgu"
 
-#: src/content_mapnode_furniture.cpp:1823
+#: src/content_mapnode_furniture.cpp:1950
 msgid "Field Painting"
 msgstr "lo pixra be lo foldi"
 
-#: src/content_mapnode_furniture.cpp:1858
+#: src/content_mapnode_furniture.cpp:1985
 msgid "Blue Flower Painting"
 msgstr "lo pixra be lo blanu xrula"
 
-#: src/content_mapnode_furniture.cpp:1893
+#: src/content_mapnode_furniture.cpp:2020
 msgid "Painting Canvas"
 msgstr "lo pixra fanbu'u"
 
-#: src/content_mapnode_furniture.cpp:1931
+#: src/content_mapnode_furniture.cpp:2058
 msgid "Clock"
 msgstr "lo junla"
 
@@ -2632,7 +2654,7 @@ msgid "Decraft Book"
 msgstr "lo to'e selzba cukta"
 
 #: src/content_mapnode_special.cpp:753 src/content_mapnode_special.cpp:948
-#: src/content_nodemeta.cpp:2693
+#: src/content_nodemeta.cpp:2694
 msgid "Diary"
 msgstr "lo sivykarni"
 
@@ -2682,11 +2704,11 @@ msgstr "lo sinxa"
 msgid "Locking Sign"
 msgstr "lo selstela sinxa"
 
-#: src/content_mapnode_special.cpp:1286 src/content_nodemeta.cpp:500
+#: src/content_mapnode_special.cpp:1286 src/content_nodemeta.cpp:501
 msgid "Chest"
 msgstr "lo gairvau"
 
-#: src/content_mapnode_special.cpp:1310 src/content_nodemeta.cpp:775
+#: src/content_mapnode_special.cpp:1310 src/content_nodemeta.cpp:776
 msgid "Creative Chest"
 msgstr "lo finkai gairvau"
 
@@ -2806,7 +2828,7 @@ msgstr "lo bakfu"
 msgid "Cauldron"
 msgstr "lo brapatxu"
 
-#: src/content_mapnode_special.cpp:2082 src/content_nodemeta.cpp:3312
+#: src/content_mapnode_special.cpp:2082 src/content_nodemeta.cpp:3313
 msgid "Forge"
 msgstr ""
 
@@ -2910,563 +2932,580 @@ msgstr ""
 msgid "Ginger Kitten"
 msgstr ""
 
-#: src/content_nodemeta.cpp:75 src/content_nodemeta.cpp:138
-#: src/content_nodemeta.cpp:2677 src/content_nodemeta.cpp:2776
+#: src/content_nodemeta.cpp:76 src/content_nodemeta.cpp:139
+#: src/content_nodemeta.cpp:2678 src/content_nodemeta.cpp:2777
 msgid "Save"
 msgstr "rejgau"
 
-#: src/content_nodemeta.cpp:185
+#: src/content_nodemeta.cpp:186
 #, c-format
 msgid "%s's Home Flag"
 msgstr "lo zdani lanci po la'o gy.%s.gy."
 
-#: src/content_nodemeta.cpp:269 src/content_nodemeta.cpp:282
-#: src/content_nodemeta.cpp:436 src/content_nodemeta.cpp:449
+#: src/content_nodemeta.cpp:270 src/content_nodemeta.cpp:283
+#: src/content_nodemeta.cpp:437 src/content_nodemeta.cpp:450
 msgid "You can't sleep yet."
 msgstr ".i do na ca kakne lo nu sipna"
 
-#: src/content_nodemeta.cpp:273 src/content_nodemeta.cpp:440
+#: src/content_nodemeta.cpp:274 src/content_nodemeta.cpp:441
 msgid "Go to sleep"
 msgstr ""
 
-#: src/content_nodemeta.cpp:278 src/content_nodemeta.cpp:445
+#: src/content_nodemeta.cpp:279 src/content_nodemeta.cpp:446
 msgid "Someone else is sleeping here."
 msgstr ""
 
-#: src/content_nodemeta.cpp:286 src/content_nodemeta.cpp:453
+#: src/content_nodemeta.cpp:287 src/content_nodemeta.cpp:454
 msgid "Get out of bed"
 msgstr ""
 
-#: src/content_nodemeta.cpp:432
+#: src/content_nodemeta.cpp:433
 msgid "This bed is too uncomfortable to sleep in."
 msgstr ""
 
-#: src/content_nodemeta.cpp:573
+#: src/content_nodemeta.cpp:574
 #, c-format
 msgid "Locking Chest owned by '%s'"
 msgstr "lo selstela gairvau poi ponse la'o gy.%s.gy."
 
-#: src/content_nodemeta.cpp:647
+#: src/content_nodemeta.cpp:648
 #, c-format
 msgid "Safe owned by '%s'"
 msgstr ".i ti badvau .i ri ponse la'o cmene.%s.cmene"
 
-#: src/content_nodemeta.cpp:816 src/content_nodemeta.cpp:1870
-#: src/content_nodemeta.cpp:2157 src/content_nodemeta.cpp:2349
-#: src/content_nodemeta.cpp:2563
+#: src/content_nodemeta.cpp:817 src/content_nodemeta.cpp:1871
+#: src/content_nodemeta.cpp:2158 src/content_nodemeta.cpp:2350
+#: src/content_nodemeta.cpp:2564
 #, c-format
 msgid "Page %d of %d"
 msgstr "%d moi le'i papri poi ke'a %d mei"
 
-#: src/content_nodemeta.cpp:820 src/content_nodemeta.cpp:1898
-#: src/content_nodemeta.cpp:2176 src/content_nodemeta.cpp:2358
-#: src/content_nodemeta.cpp:2579
+#: src/content_nodemeta.cpp:821 src/content_nodemeta.cpp:1899
+#: src/content_nodemeta.cpp:2177 src/content_nodemeta.cpp:2359
+#: src/content_nodemeta.cpp:2580
 msgid "<< Previous Page"
 msgstr "lidne"
 
-#: src/content_nodemeta.cpp:826 src/content_nodemeta.cpp:1904
-#: src/content_nodemeta.cpp:2182 src/content_nodemeta.cpp:2364
-#: src/content_nodemeta.cpp:2585
+#: src/content_nodemeta.cpp:827 src/content_nodemeta.cpp:1905
+#: src/content_nodemeta.cpp:2183 src/content_nodemeta.cpp:2365
+#: src/content_nodemeta.cpp:2586
 msgid "Next Page >>"
 msgstr "selyli'e"
 
-#: src/content_nodemeta.cpp:869
+#: src/content_nodemeta.cpp:870
 #, c-format
 msgid "Border Stone owned by '%s'"
 msgstr ".i ti jimte rokci .i ri se ponse la'o cmene.%s.cmene"
 
-#: src/content_nodemeta.cpp:944
+#: src/content_nodemeta.cpp:945
 msgid "Furnace is overloaded"
 msgstr ".i lo ti toknu cu dukse lo ka mulno"
 
-#: src/content_nodemeta.cpp:945
+#: src/content_nodemeta.cpp:946
 msgid "Furnace is out of fuel"
 msgstr ".i lo ti toknu cu kunti lo livla"
 
-#: src/content_nodemeta.cpp:947
+#: src/content_nodemeta.cpp:948
 msgid "Furnace is inactive"
 msgstr ".i lo toknu cu cando"
 
-#: src/content_nodemeta.cpp:950
+#: src/content_nodemeta.cpp:951
 msgid "Furnace is active"
 msgstr ".i lo toknu cu tolcando"
 
-#: src/content_nodemeta.cpp:1209
+#: src/content_nodemeta.cpp:1210
 msgid "Locking Furnace is overloaded"
 msgstr ".i lo ti toknu cu dukse lo ka mulno"
 
-#: src/content_nodemeta.cpp:1210
+#: src/content_nodemeta.cpp:1211
 msgid "Locking Furnace is out of fuel"
 msgstr ".i lo ti toknu cu kunti lo livla"
 
-#: src/content_nodemeta.cpp:1212
+#: src/content_nodemeta.cpp:1213
 msgid "Locking Furnace is inactive"
 msgstr "lo selstela toknu cu cando"
 
-#: src/content_nodemeta.cpp:1215
+#: src/content_nodemeta.cpp:1216
 msgid "Locking Furnace is active"
 msgstr "lo selstela toknu cu tolcando"
 
-#: src/content_nodemeta.cpp:1470
+#: src/content_nodemeta.cpp:1471
 msgid "Armed Explosive: about to detonate"
 msgstr ".i lo ti jbama cu bazi spoja"
 
-#: src/content_nodemeta.cpp:1473
+#: src/content_nodemeta.cpp:1474
 #, c-format
 msgid "Armed Explosive: %d second till detonation"
 msgid_plural "Armed Explosive: %d seconds till detonation"
 msgstr[0] ".i ti pojbre jbama .i ri spoja bazi lo snidu be li %d"
 msgstr[1] ".i ti pojbre jbama .i ri spoja bazi lo snidu be li %d"
 
-#: src/content_nodemeta.cpp:1534 src/content_nodemeta.cpp:1539
+#: src/content_nodemeta.cpp:1535 src/content_nodemeta.cpp:1540
 msgid "Incinerator is active"
 msgstr ".i lo festoknu cu tolcando"
 
-#: src/content_nodemeta.cpp:1541
+#: src/content_nodemeta.cpp:1542
 msgid "Incinerator is inactive"
 msgstr ".i lo festoknu cu cando"
 
-#: src/content_nodemeta.cpp:1633
+#: src/content_nodemeta.cpp:1634
 msgid "Add fuel, then punch to incinerate wielded item"
 msgstr "ko setca lo livla .ijebabo ko darxi tezu'e lo nu jelgau lo jgari dacti"
 
-#: src/content_nodemeta.cpp:1874 src/content_nodemeta.cpp:2162
+#: src/content_nodemeta.cpp:1875 src/content_nodemeta.cpp:2163
 msgid "Add item here to see recipe"
 msgstr "ko setca lo dacti ti tezu'e lonu za'e jarcygau fe tu'a le te jukpa"
 
-#: src/content_nodemeta.cpp:1879 src/content_nodemeta.cpp:2167
+#: src/content_nodemeta.cpp:1880 src/content_nodemeta.cpp:2168
 #, c-format
 msgid "Recipe %d of %d"
 msgstr "%d moi le'i te jukpa poi ke'a %d mei"
 
-#: src/content_nodemeta.cpp:1888
+#: src/content_nodemeta.cpp:1889
 msgid "Gives"
 msgstr "lo selzba"
 
-#: src/content_nodemeta.cpp:2353
+#: src/content_nodemeta.cpp:2354
 msgid "Add item here to see cook result"
 msgstr "ko setca lo dacti ti tezu'e lonu jarcygau fe tu'a lo se jukpa"
 
-#: src/content_nodemeta.cpp:2567
+#: src/content_nodemeta.cpp:2568
 msgid "Add item here to see dig result"
 msgstr "ko setca lo dacti ti tezu'e lonu jarcygau fe tu'a lo se kakpa"
 
-#: src/content_nodemeta.cpp:2571
+#: src/content_nodemeta.cpp:2572
 msgid "Dig Result"
 msgstr "lo selkakpa"
 
-#: src/content_nodemeta.cpp:2575
+#: src/content_nodemeta.cpp:2576
 msgid "Random Drop"
 msgstr "lo cunso selkakpa"
 
-#: src/content_nodemeta.cpp:2667 src/content_nodemeta.cpp:2766
+#: src/content_nodemeta.cpp:2668 src/content_nodemeta.cpp:2767
 msgid "Title"
 msgstr "lo cmene"
 
-#: src/content_nodemeta.cpp:2672 src/content_nodemeta.cpp:2771
+#: src/content_nodemeta.cpp:2673 src/content_nodemeta.cpp:2772
 msgid "Content"
 msgstr "lo se vasru"
 
-#: src/content_nodemeta.cpp:3127
+#: src/content_nodemeta.cpp:3128
 msgid "Cauldron is active"
 msgstr ".i lo brapatxu cu tolcando"
 
-#: src/content_nodemeta.cpp:3130
+#: src/content_nodemeta.cpp:3131
 msgid "Cauldron is hot"
 msgstr ".i lo brapatxu cu glare"
 
-#: src/content_nodemeta.cpp:3132
+#: src/content_nodemeta.cpp:3133
 msgid "Cauldron is cool"
 msgstr ".i lo brapatxu cu lenku"
 
-#: src/content_nodemeta.cpp:3134
+#: src/content_nodemeta.cpp:3135
 msgid "Cauldron is empty"
 msgstr ".i lo brapatxu cu kunti"
 
-#: src/content_nodemeta.cpp:3138
+#: src/content_nodemeta.cpp:3139
 msgid "Cauldron is inactive"
 msgstr ".i lo brapatxu cu cando"
 
-#: src/content_nodemeta.cpp:3139
+#: src/content_nodemeta.cpp:3140
 msgid "Cauldron is out of fuel"
 msgstr ".i lo brapatxu cu kunti loi livla"
 
-#: src/content_nodemeta.cpp:3218
+#: src/content_nodemeta.cpp:3219
 msgid "Add fuel, then punch to add or remove water"
-msgstr "ko setca lo livla .ijebabo ko darxi tezu'e lo nu jmina gi'a vimcu loi djacu"
+msgstr ""
+"ko setca lo livla .ijebabo ko darxi tezu'e lo nu jmina gi'a vimcu loi djacu"
 
-#: src/content_nodemeta.cpp:3484
+#: src/content_nodemeta.cpp:3487
 msgid "Show Enchanting"
 msgstr ""
 
-#: src/content_nodemeta.cpp:3491 src/game.cpp:208
+#: src/content_nodemeta.cpp:3494 src/game.cpp:209
 msgid "Show Crafting"
 msgstr "jarco le zbasu"
 
-#: src/content_toolitem.cpp:213
+#: src/content_toolitem.cpp:216
 msgid "Small Stone Pick"
 msgstr "lo cmalu ke rokci velkakpymru"
 
-#: src/content_toolitem.cpp:236
+#: src/content_toolitem.cpp:239
 msgid "Stone Pick"
 msgstr "lo rokci velkakpymru"
 
-#: src/content_toolitem.cpp:250
+#: src/content_toolitem.cpp:253
 msgid "Flint Pick"
 msgstr "lo fagri rokci velkakpymru"
 
-#: src/content_toolitem.cpp:264
+#: src/content_toolitem.cpp:267
 msgid "Steel Pick"
 msgstr "lo gasta velkakpymru"
 
-#: src/content_toolitem.cpp:278
+#: src/content_toolitem.cpp:281
 msgid "Creative Pick"
 msgstr "lo finkai velkakpymru"
 
-#: src/content_toolitem.cpp:292
+#: src/content_toolitem.cpp:295
 msgid "Stone Trowel"
 msgstr ""
 
-#: src/content_toolitem.cpp:306
+#: src/content_toolitem.cpp:309
 msgid "Stone Shovel"
 msgstr "lo rokci canpa"
 
-#: src/content_toolitem.cpp:320
+#: src/content_toolitem.cpp:323
 msgid "Flint Shovel"
 msgstr "lo fagri rokci canpa"
 
-#: src/content_toolitem.cpp:334
+#: src/content_toolitem.cpp:337
 msgid "Steel Shovel"
 msgstr "lo gasta canpa"
 
-#: src/content_toolitem.cpp:348
+#: src/content_toolitem.cpp:351
 msgid "Small Stone Axe"
 msgstr "lo cmalue ke rokci ka'amru"
 
-#: src/content_toolitem.cpp:369
+#: src/content_toolitem.cpp:372
 msgid "Stone Axe"
 msgstr "lo rokci ka'amru"
 
-#: src/content_toolitem.cpp:383
+#: src/content_toolitem.cpp:386
 msgid "Flint Axe"
 msgstr "lo fagri rokci ka'amru"
 
-#: src/content_toolitem.cpp:397
+#: src/content_toolitem.cpp:400
 msgid "Steel Axe"
 msgstr "lo gasta ka'amru"
 
-#: src/content_toolitem.cpp:411
+#: src/content_toolitem.cpp:414
 msgid "Wooden Club"
 msgstr "lo mudri xacyga'a"
 
-#: src/content_toolitem.cpp:426
+#: src/content_toolitem.cpp:429
 msgid "Stone Sword"
 msgstr "lo rokci cladakyxa'i"
 
-#: src/content_toolitem.cpp:440
+#: src/content_toolitem.cpp:443
 msgid "Steel Sword"
 msgstr "lo gasta cladakyxa'i"
 
-#: src/content_toolitem.cpp:454
+#: src/content_toolitem.cpp:457
 msgid "Flint Shears"
 msgstr "lo fagri rokci jinci"
 
-#: src/content_toolitem.cpp:468
+#: src/content_toolitem.cpp:471
 msgid "Steel Shears"
 msgstr "lo gasta jinci"
 
-#: src/content_toolitem.cpp:482
+#: src/content_toolitem.cpp:485
 msgid "Wooden Bucket"
 msgstr "lo mudri baktu"
 
-#: src/content_toolitem.cpp:499
+#: src/content_toolitem.cpp:502
 msgid "Tin Bucket"
 msgstr "lo tinci baktu"
 
-#: src/content_toolitem.cpp:515
+#: src/content_toolitem.cpp:518
 msgid "Wooden Bucket of Water"
 msgstr "lo mudri baktu be loi djacu"
 
-#: src/content_toolitem.cpp:526
+#: src/content_toolitem.cpp:529
 msgid "Tin Bucket of Water"
 msgstr "lo tinci baktu be loi djacu"
 
-#: src/content_toolitem.cpp:537
+#: src/content_toolitem.cpp:540
 msgid "Steel Bucket"
 msgstr "lo gasta baktu"
 
-#: src/content_toolitem.cpp:552
+#: src/content_toolitem.cpp:555
 msgid "Steel Bucket of Water"
 msgstr "lo gasta baktu be loi djacu"
 
-#: src/content_toolitem.cpp:563
+#: src/content_toolitem.cpp:566
 msgid "Steel Bucket of Lava"
 msgstr "lo gasta baktu be loi likro'i"
 
-#: src/content_toolitem.cpp:575
+#: src/content_toolitem.cpp:578
 msgid "Fire Starter"
 msgstr "lo jelca tutci"
 
-#: src/content_toolitem.cpp:589
+#: src/content_toolitem.cpp:592
 msgid "Crowbar"
 msgstr "lo cfinyvra"
 
-#: src/content_toolitem.cpp:602
+#: src/content_toolitem.cpp:605
 msgid "Key"
 msgstr "lo ckiku"
 
-#: src/content_toolitem.cpp:614
+#: src/content_toolitem.cpp:617
 msgid "Stone Spear"
 msgstr "lo rokci kilga'axa'i"
 
-#: src/content_toolitem.cpp:628
+#: src/content_toolitem.cpp:631
 msgid "Flint Spear"
 msgstr "lo fagri rokci kilga'axa'i"
 
-#: src/content_toolitem.cpp:642
+#: src/content_toolitem.cpp:645
 msgid "Steel Spear"
 msgstr "lo gasta kilga'axa'i"
 
-#: src/content_toolitem.cpp:656
+#: src/content_toolitem.cpp:659
 msgid "Bow"
 msgstr "lo skogarce'a"
 
-#: src/content_toolitem.cpp:676
+#: src/content_toolitem.cpp:679
 msgid "Raw Mithril Pick"
 msgstr ""
 
-#: src/content_toolitem.cpp:690
+#: src/content_toolitem.cpp:693
 msgid "Raw Mithril Shovel"
 msgstr ""
 
-#: src/content_toolitem.cpp:704
+#: src/content_toolitem.cpp:707
 msgid "Raw Mithril Axe"
 msgstr ""
 
-#: src/content_toolitem.cpp:718
+#: src/content_toolitem.cpp:721
 msgid "Raw Mithril Sword"
 msgstr ""
 
-#: src/content_toolitem.cpp:732
+#: src/content_toolitem.cpp:735
 msgid "Raw Mithril Spear"
 msgstr ""
 
-#: src/content_toolitem.cpp:746
+#: src/content_toolitem.cpp:749
 msgid "Unbound Mithril Pick"
 msgstr "lo narjorne jimrmifrile velkakpymru"
 
-#: src/content_toolitem.cpp:760
+#: src/content_toolitem.cpp:763
 msgid "Unbound Mithril Shovel"
 msgstr "lo narjorne jimrmifrile canpa"
 
-#: src/content_toolitem.cpp:774
+#: src/content_toolitem.cpp:777
 msgid "Unbound Mithril Axe"
 msgstr "lo narjorne jimrmifrile ka'amru"
 
-#: src/content_toolitem.cpp:788
+#: src/content_toolitem.cpp:791
 msgid "Unbound Mithril Sword"
 msgstr "lo narjorne jimrmifrile cladakyxa'i"
 
-#: src/content_toolitem.cpp:802
+#: src/content_toolitem.cpp:805
 msgid "Unbound Mithril Spear"
 msgstr "lo narjorne jimrmifrilie kilga'axa'i"
 
-#: src/content_toolitem.cpp:816
+#: src/content_toolitem.cpp:819
 msgid "Mithril Pick"
 msgstr "lo jimrmifrile velkakpymru"
 
-#: src/content_toolitem.cpp:831
+#: src/content_toolitem.cpp:834
 msgid "Mithril Shovel"
 msgstr "lo jimrmifrile canpa"
 
-#: src/content_toolitem.cpp:845
+#: src/content_toolitem.cpp:848
 msgid "Mithril Axe"
 msgstr "lo jimrmifrile ka'amru"
 
-#: src/content_toolitem.cpp:859
+#: src/content_toolitem.cpp:862
 msgid "Mithril Sword"
 msgstr "lo jimrmifrile cladakyxa'i"
 
-#: src/content_toolitem.cpp:873
+#: src/content_toolitem.cpp:876
 msgid "Mithril Spear"
 msgstr "lo jimrmifrilie kilga'axa'i"
 
-#: src/content_toolitem.cpp:887
+#: src/content_toolitem.cpp:890
 msgid "Mob Spawner"
 msgstr ""
 
-#: src/game.cpp:209
+#: src/content_toolitem.cpp:909
+#, fuzzy
+msgid "Mithril Key"
+msgstr "lo jimrmifrile ka'amru"
+
+#: src/game.cpp:210
 msgid "Clothes"
 msgstr "lo bukpu"
 
-#: src/game.cpp:210
+#: src/game.cpp:211
 msgid "Hat/Helmet"
 msgstr "lo mapku"
 
-#: src/game.cpp:212
+#: src/game.cpp:213
 msgid "Jacket"
 msgstr "lo kosta"
 
-#: src/game.cpp:214
+#: src/game.cpp:215
 msgid "Decorative"
 msgstr "lo jadni"
 
-#: src/game.cpp:216
+#: src/game.cpp:217
 msgid "Shirt"
 msgstr "lo creka"
 
-#: src/game.cpp:218
+#: src/game.cpp:219
 msgid "Belt"
 msgstr "lo karli"
 
-#: src/game.cpp:220
+#: src/game.cpp:221
 msgid "Pants"
 msgstr "lo palku"
 
-#: src/game.cpp:222
+#: src/game.cpp:223
 msgid "Boots"
 msgstr "lo cutci"
 
-#: src/game.cpp:229
+#: src/game.cpp:230
 msgid "Drop to Ground"
 msgstr "lo nu falcru lo loldi"
 
-#: src/game.cpp:231
+#: src/game.cpp:232
 msgid "Change Clothing"
 msgstr "taxfu gafygau"
 
-#: src/game.cpp:590
+#: src/game.cpp:591
 msgid "Loading"
 msgstr ".i ca'o samymo'i"
 
-#: src/game.cpp:662
+#: src/game.cpp:663
 msgid "Loading..."
 msgstr ".i ca'o samymo'i"
 
-#: src/game.cpp:671
+#: src/game.cpp:672
 msgid "Creating server..."
 msgstr ".i lo samtcise'u cu se zbasu"
 
-#: src/game.cpp:682
+#: src/game.cpp:683
 msgid "Creating client..."
 msgstr ".i lo samtciselse'u cu se zbasu"
 
-#: src/game.cpp:687
+#: src/game.cpp:688
 msgid "Resolving address..."
 msgstr ".i ca'o troci lo nu facki lo samjudri"
 
-#: src/game.cpp:698
+#: src/game.cpp:699
 msgid "Couldn't resolve address"
 msgstr ".i na kakne lo nu facki lo samjudri"
 
-#: src/game.cpp:738
+#: src/game.cpp:739
 #, c-format
 msgid "Connecting to server... (timeout in %d second)"
 msgid_plural "Connecting to server... (timeout in %d seconds)"
-msgstr[0] ".i ca'o troci lo za'i samjo'e lo samse'u to da'i co'urdenpa za lo snidu be li %d toi"
-msgstr[1] ".i ca'o troci lo za'i samjo'e lo samse'u to da'i co'urdenpa za lo snidu be li %d toi"
+msgstr[0] ""
+".i ca'o troci lo za'i samjo'e lo samse'u to da'i co'urdenpa za lo snidu be "
+"li %d toi"
+msgstr[1] ""
+".i ca'o troci lo za'i samjo'e lo samse'u to da'i co'urdenpa za lo snidu be "
+"li %d toi"
 
-#: src/game.cpp:767
+#: src/game.cpp:768
 #, c-format
 msgid "Access denied. Reason: %ls"
 msgstr ".i na curmi le nu do vitke .iki'ubo me zoi gy.%ls.gy."
 
-#: src/game.cpp:771
+#: src/game.cpp:772
 msgid "Unable to Connect (port already in use?)."
-msgstr ".i na kakne fe lo nu co'a samjo'e to paunai xu lo judrnporte ca'o se pilno toi"
+msgstr ""
+".i na kakne fe lo nu co'a samjo'e to paunai xu lo judrnporte ca'o se pilno "
+"toi"
 
-#: src/game.cpp:774
+#: src/game.cpp:775
 msgid "Connection timed out."
 msgstr ".i lo pu'u troci lo za'i samjo'e cu pu se co'urde'a"
 
-#: src/game.cpp:927
+#: src/game.cpp:928
 msgid "Access denied. Reason: "
 msgstr ".i na curmi le nu do vitke .iki'ubo"
 
-#: src/game.cpp:1161
+#: src/game.cpp:1162
 msgid "free_move disabled"
 msgstr ".i lo me la'o gy.free_move.gy. selpli"
 
-#: src/game.cpp:1165
+#: src/game.cpp:1166
 msgid "free_move enabled"
 msgstr ".i lo me la'o gy.free_move.gy. na selpli"
 
-#: src/game.cpp:1177
+#: src/game.cpp:1178
 #, c-format
 msgid "Saved screenshot to '%s'"
 msgstr ".i lo vidnyxra cu pu se rejgau fi'o samjudri fe'u zoi gy.%s.gy."
 
-#: src/game.cpp:1189
+#: src/game.cpp:1190
 msgid "HUD shown"
 msgstr ".i tu'a lo crakemsazycimde cu se jarco"
 
-#: src/game.cpp:1191
+#: src/game.cpp:1192
 msgid "HUD hidden"
 msgstr ".i tu'a lo crakemsazycimde cu to'e se jarco"
 
-#: src/game.cpp:1197
+#: src/game.cpp:1198
 msgid "Chat shown"
 msgstr ".i tu'a to samta'a notci cu se jarco"
 
-#: src/game.cpp:1199
+#: src/game.cpp:1200
 msgid "Chat hidden"
 msgstr ".i tu'a to samta'a notci cu to'e se jarco"
 
-#: src/game.cpp:1205
+#: src/game.cpp:1206
 msgid "Fog disabled"
 msgstr ".i lo bumru cu na selpli"
 
-#: src/game.cpp:1207
+#: src/game.cpp:1208
 msgid "Fog enabled"
 msgstr ".i lo bumru cu selpli"
 
-#: src/game.cpp:1213
+#: src/game.cpp:1214
 msgid "Camera update disabled"
 msgstr ".i le nu kacma nu ningau cu na selpli"
 
-#: src/game.cpp:1215
+#: src/game.cpp:1216
 msgid "Camera update enabled"
 msgstr ".i le nu kacma nu ningau cu selpli"
 
-#: src/game.cpp:1225
+#: src/game.cpp:1226
 msgid "Debug info shown"
 msgstr ".i le si'o samcfisisku kei datni cu jarco"
 
-#: src/game.cpp:1230
+#: src/game.cpp:1231
 msgid "Debug info and frametime graph hidden"
-msgstr ".i le si'o samcfisisku kei datni .e lo me la'o gy.frametime.gy. cartu cu jarco"
+msgstr ""
+".i le si'o samcfisisku kei datni .e lo me la'o gy.frametime.gy. cartu cu "
+"jarco"
 
-#: src/game.cpp:1234
+#: src/game.cpp:1235
 msgid "Frametime graph shown"
 msgstr ".i lo me la'o gy.frametime.gy. cartu cu jarco"
 
-#: src/game.cpp:1246
+#: src/game.cpp:1247
 #, c-format
 msgid "Profiler shown (page %d of %d)"
-msgstr ".i lo me la'o gy.profiler.gy. cu jarco to %d moi le'i papri poi ke'a %d mei toi"
+msgstr ""
+".i lo me la'o gy.profiler.gy. cu jarco to %d moi le'i papri poi ke'a %d mei "
+"toi"
 
-#: src/game.cpp:1250
+#: src/game.cpp:1251
 msgid "Profiler hidden"
 msgstr ".i lo me la'o gy.profiler.gy. toljarco"
 
-#: src/game.cpp:1258 src/game.cpp:1269
+#: src/game.cpp:1259 src/game.cpp:1270
 #, c-format
 msgid "Minimum viewing range changed to %d"
-msgstr ".i lo nacmecrai ke ni jvinu se kuspe pu se galfi fi tu'a lo gutci be li %d"
+msgstr ""
+".i lo nacmecrai ke ni jvinu se kuspe pu se galfi fi tu'a lo gutci be li %d"
 
-#: src/game.cpp:1338
+#: src/game.cpp:1339
 msgid "Enabled full viewing range"
 msgstr ".i le mulnu ke jvinu se kuspe cu selpli"
 
-#: src/game.cpp:1342
+#: src/game.cpp:1343
 msgid "Disabled full viewing range"
 msgstr ".i le mulnu ke jvinu se kuspe cu na selpli"
 
-#: src/game.cpp:1995
+#: src/game.cpp:1950
 msgid "Disconnected (Network Timeout)"
 msgstr ".i narsamjo'e to samseltcana co'urdenpa toi"
 
-#: src/game.cpp:2407
+#: src/game.cpp:2382
 msgid "Shutting down..."
 msgstr ".i ca ca'a tolcfagau"
 
@@ -3480,242 +3519,306 @@ msgstr "gasnu lo nu mi tolcanci"
 
 #: src/guiFormSpecMenu.cpp:436
 msgid "Left click: Move all items, Right click: Move single item"
-msgstr "da'i iklki fe lo zulselpevysmacu lo nu muvdu lo ro dacti .i da'i iklki fe lo prityselpevysmacu lo nu muvdu lo pa dacti"
+msgstr ""
+"da'i iklki fe lo zulselpevysmacu lo nu muvdu lo ro dacti .i da'i iklki fe lo "
+"prityselpevysmacu lo nu muvdu lo pa dacti"
 
 #: src/guiFormSpecMenu.cpp:458
 msgid "Write It"
 msgstr "ko ciska"
 
-#: src/guiMainMenu.cpp:347
+#: src/guiMainMenu.cpp:319
 msgid "Character Creator"
 msgstr "finti lo xarpre"
 
-#: src/guiMainMenu.cpp:353 src/guiMainMenu.cpp:478 src/guiMainMenu.cpp:520
-#: src/guiMainMenu.cpp:631
+#: src/guiMainMenu.cpp:325 src/guiMainMenu.cpp:386 src/guiMainMenu.cpp:428
+#: src/guiMainMenu.cpp:539
 msgid "Single Player"
 msgstr "pa kelci"
 
-#: src/guiMainMenu.cpp:359 src/guiMainMenu.cpp:410
+#: src/guiMainMenu.cpp:331 src/guiMultiplayerMenu.cpp:161
 msgid "Multi Player"
 msgstr "su'o re kelci"
 
-#: src/guiMainMenu.cpp:365 src/guiPauseMenu.cpp:155
+#: src/guiMainMenu.cpp:337 src/guiPauseMenu.cpp:155
 msgid "Settings"
 msgstr "lo tikygau sazycimde"
 
-#: src/guiMainMenu.cpp:371
+#: src/guiMainMenu.cpp:343
 msgid "Credits"
 msgstr "lo finti liste"
 
-#: src/guiMainMenu.cpp:377
+#: src/guiMainMenu.cpp:349
 msgid "Quit"
 msgstr "tolcfagau"
 
-#: src/guiMainMenu.cpp:418
-msgid "Name/Password"
-msgstr "lo cmene .e lo lerpoijaspu"
-
-#: src/guiMainMenu.cpp:446
-msgid "Address/Port"
-msgstr "lo samjudri jo'u judrnporte"
-
-#: src/guiMainMenu.cpp:472
-msgid "Connect"
-msgstr "samjongau"
-
-#: src/guiMainMenu.cpp:487 src/guiMainMenu.cpp:529 src/guiMainMenu.cpp:640
+#: src/guiMainMenu.cpp:395 src/guiMainMenu.cpp:437 src/guiMainMenu.cpp:548
 msgid "Creative Mode"
 msgstr "le nu finti kelci"
 
-#: src/guiMainMenu.cpp:488 src/guiMainMenu.cpp:530 src/guiMainMenu.cpp:641
+#: src/guiMainMenu.cpp:396 src/guiMainMenu.cpp:438 src/guiMainMenu.cpp:549
 msgid "Adventure Mode"
 msgstr "le nu ckape kelci"
 
-#: src/guiMainMenu.cpp:489 src/guiMainMenu.cpp:531 src/guiMainMenu.cpp:642
+#: src/guiMainMenu.cpp:397 src/guiMainMenu.cpp:439 src/guiMainMenu.cpp:550
 msgid "Survival Mode"
 msgstr "le nu rivbi kelci"
 
-#: src/guiMainMenu.cpp:502 src/guiMainMenu.cpp:655
+#: src/guiMainMenu.cpp:410 src/guiMainMenu.cpp:563
 msgid "Advanced Settings"
 msgstr "jarco le pluja ke tikygau sazycimde"
 
-#: src/guiMainMenu.cpp:508 src/guiMainMenu.cpp:550
+#: src/guiMainMenu.cpp:416 src/guiMainMenu.cpp:458
 msgid "Map Options"
 msgstr "jarco le munje tikygau ke sazycimde"
 
-#: src/guiMainMenu.cpp:514 src/guiMainMenu.cpp:625 src/guiMainMenu.cpp:750
+#: src/guiMainMenu.cpp:422 src/guiMainMenu.cpp:533 src/guiMainMenu.cpp:658
 msgid "Start Game"
 msgstr "cfari fa lo nu kelci"
 
-#: src/guiMainMenu.cpp:544
+#: src/guiMainMenu.cpp:452
 msgid "Hide Advanced Settings"
 msgstr "toljarco le pluja ke tikygau sazycimde"
 
-#: src/guiMainMenu.cpp:555
+#: src/guiMainMenu.cpp:463
 msgid "Creatures"
 msgstr "lo danlu"
 
-#: src/guiMainMenu.cpp:562
+#: src/guiMainMenu.cpp:470
 msgid "None"
 msgstr "noda"
 
-#: src/guiMainMenu.cpp:563
+#: src/guiMainMenu.cpp:471
 msgid "Passive"
 msgstr "lo ka cando"
 
-#: src/guiMainMenu.cpp:564
+#: src/guiMainMenu.cpp:472
 msgid "Passive & Aggressive"
 msgstr "lo ka cando .e lo ka gunta"
 
-#: src/guiMainMenu.cpp:565
+#: src/guiMainMenu.cpp:473
 msgid "Passive, Aggressive, & Destructive"
 msgstr "lo ka cando .e lo ka gunta .e lo ka spogau"
 
-#: src/guiMainMenu.cpp:579
+#: src/guiMainMenu.cpp:487
 msgid "Player Damage"
 msgstr "lo kelci selxai"
 
-#: src/guiMainMenu.cpp:584
+#: src/guiMainMenu.cpp:492
 msgid "Suffocation/Drowning"
 msgstr "le nu dirva'u gi'e jaurvasmro"
 
-#: src/guiMainMenu.cpp:589
+#: src/guiMainMenu.cpp:497
 msgid "Hunger"
 msgstr "lo si'o xagji"
 
-#: src/guiMainMenu.cpp:594
+#: src/guiMainMenu.cpp:502
 msgid "Tool Wear"
 msgstr "lo tutci ke pilno selxai"
 
-#: src/guiMainMenu.cpp:599
+#: src/guiMainMenu.cpp:507
 msgid "Dangerous Fire"
 msgstr "lo ckape fagri"
 
-#: src/guiMainMenu.cpp:604
+#: src/guiMainMenu.cpp:512
 msgid "Infinite Inventory"
 msgstr "cimni dacti"
 
-#: src/guiMainMenu.cpp:609
+#: src/guiMainMenu.cpp:517
 msgid "Initial Inventory"
 msgstr "dunda lo so'o dacti ca lo cfari"
 
-#: src/guiMainMenu.cpp:614
+#: src/guiMainMenu.cpp:522
 msgid "Droppable Inventory"
 msgstr "lo nu falcru lo dacti cu cumki"
 
-#: src/guiMainMenu.cpp:619
+#: src/guiMainMenu.cpp:527
 msgid "Death drops Inventory"
 msgstr ""
 
-#: src/guiMainMenu.cpp:661
+#: src/guiMainMenu.cpp:569
 msgid "Hide Map Options"
 msgstr "toljarco le munje tikygau ke sazycimde"
 
-#: src/guiMainMenu.cpp:666
+#: src/guiMainMenu.cpp:574
 msgid "Create New Map"
 msgstr "zbasu lo cnino munje"
 
-#: src/guiMainMenu.cpp:672
+#: src/guiMainMenu.cpp:580
 msgid "Warning! Your old map will be deleted!"
 msgstr ".e'unai da'i lo do tolci'o munje cu ba vimcu"
 
-#: src/guiMainMenu.cpp:678
+#: src/guiMainMenu.cpp:586
 msgid "Map Type"
 msgstr "ma munje klesi"
 
-#: src/guiMainMenu.cpp:685
+#: src/guiMainMenu.cpp:593
 msgid "Flat"
 msgstr "lo pinta"
 
-#: src/guiMainMenu.cpp:686
+#: src/guiMainMenu.cpp:594
 msgid "Flatter"
 msgstr "lo zmadu be lo ka pinta"
 
-#: src/guiMainMenu.cpp:687
+#: src/guiMainMenu.cpp:595
 msgid "Smoother"
 msgstr "lo zmadu be lo ka xutla"
 
-#: src/guiMainMenu.cpp:688
+#: src/guiMainMenu.cpp:596
 msgid "Default"
 msgstr "lo fadni"
 
-#: src/guiMainMenu.cpp:689
+#: src/guiMainMenu.cpp:597
 msgid "Hilly"
 msgstr "lo cmama'a"
 
-#: src/guiMainMenu.cpp:690
+#: src/guiMainMenu.cpp:598
 msgid "Mountains"
 msgstr "lo cmana"
 
-#: src/guiMainMenu.cpp:691
+#: src/guiMainMenu.cpp:599
 msgid "Crazy"
 msgstr "lo fenki"
 
-#: src/guiMainMenu.cpp:692
+#: src/guiMainMenu.cpp:600
 msgid "Crazy Hills"
 msgstr "lo fenki cmama'a"
 
-#: src/guiMainMenu.cpp:714
+#: src/guiMainMenu.cpp:622
 msgid "Use Fixed Seed"
 msgstr "pilno le stodi ke cunso namcu"
 
-#: src/guiMainMenu.cpp:720
+#: src/guiMainMenu.cpp:628
 msgid "Map Seed"
 msgstr "le munje ke cunso namcu"
 
-#: src/guiMainMenu.cpp:737
+#: src/guiMainMenu.cpp:645
 msgid "Clear Map"
 msgstr "kuntygau lo munje"
 
-#: src/guiMainMenu.cpp:742
+#: src/guiMainMenu.cpp:650
 msgid "Warning! This will delete all construction from your map!"
-msgstr ".e'unai .i ganai da'i tu'a do ranji gi ju'o lo ro dilnu pe do cu ba se vimcu fi lo munje pe do"
+msgstr ""
+".e'unai .i ganai da'i tu'a do ranji gi ju'o lo ro dilnu pe do cu ba se vimcu "
+"fi lo munje pe do"
 
-#: src/guiMainMenu.cpp:760
+#: src/guiMainMenu.cpp:668
 msgid ""
 "Voxelands\n"
 "http://www.voxelands.com/\n"
 "By Lisa 'darkrose' Milne <lisa@ltmnet.com> and contributors."
-msgstr ".i la'o gy.Voxelands.gy.\nnoi ke'a se urli zoi gy.http://www.voxeland.com/.gy. nu'o\nse finti la'o gy.Lisa Milne.gy. nu'o la'o gy.darkrose.gy. to zoi gy.lisa@ltmnet.com.gy. co'e toi .e lo sidju"
+msgstr ""
+".i la'o gy.Voxelands.gy.\n"
+"noi ke'a se urli zoi gy.http://www.voxeland.com/.gy. nu'o\n"
+"se finti la'o gy.Lisa Milne.gy. nu'o la'o gy.darkrose.gy. to zoi gy."
+"lisa@ltmnet.com.gy. co'e toi .e lo sidju"
 
-#: src/guiMainMenu.cpp:767
+#: src/guiMainMenu.cpp:675
 msgid "Programmers"
 msgstr ""
 
-#: src/guiMainMenu.cpp:770
+#: src/guiMainMenu.cpp:678
 msgid "Artists and Modellers"
 msgstr ""
 
-#: src/guiMainMenu.cpp:773
+#: src/guiMainMenu.cpp:681
 msgid "Translators"
 msgstr "lo fanva"
 
-#: src/guiMainMenu.cpp:776
+#: src/guiMainMenu.cpp:684
 msgid "Documentation Writters"
 msgstr ""
 
-#: src/guiMainMenu.cpp:779
+#: src/guiMainMenu.cpp:687
 msgid "Testers, Packagers, and Builders"
 msgstr ""
 
-#: src/guiMainMenu.cpp:782
+#: src/guiMainMenu.cpp:690
 msgid "Music and Sound Effects Composers"
 msgstr "lo zgifi'i .e le sance finti"
 
-#: src/guiMainMenu.cpp:785
+#: src/guiMainMenu.cpp:693
 msgid "Other Contributers, and Special Thanks"
 msgstr "lo drata je se ckire sidju"
 
-#: src/guiMainMenu.cpp:789
+#: src/guiMainMenu.cpp:697
 msgid ""
 "Based on Minetest-C55 by Perttu Ahola <celeron55@gmail.com>\n"
-"and contributors: PilzAdam, Taoki, tango_, kahrl (kaaaaaahrl?), darkrose, matttpt, erlehmann, SpeedProg, JacobF, teddydestodes, marktraceur, Jonathan Neuschafer, thexyz, VanessaE, sfan5... and tens of more random people."
-msgstr ".i finti fu la'o gy.Minetest-C55.gy.\npoi ke'a selfi'i la'o gy.Perttu Ahola.gy. to zoi gy.celeron55@gmail.com.gy. co'e toi\n.e lo sidju po'u la'o gy.PilzAdam.gy. .e la'o gy.Taoki.gy. .e la'o gy.tango_.gy. .e la'o gy.kahrl.gy. .e la'o gy.darkrose.gy. .e la'o gy.matttpt.gy. .e la'o gy.erlehmann.gy. .e la'o gy.SpeedProg.gy. .e la'o gy. JacobF.gy. .e la'o dy.teddydestodes.dy. .e la'o gy.marktraceur.gy. .e la'o dy.Jonathan Neuschafer.dy. .e la'o gy.thexyz.gy. .e la'o gy.VanessaE.gy. .e la'o gy.sfan5.gy. .e lo mutce cunso drata prenu"
+"and contributors: PilzAdam, Taoki, tango_, kahrl (kaaaaaahrl?), darkrose, "
+"matttpt, erlehmann, SpeedProg, JacobF, teddydestodes, marktraceur, Jonathan "
+"Neuschafer, thexyz, VanessaE, sfan5... and tens of more random people."
+msgstr ""
+".i finti fu la'o gy.Minetest-C55.gy.\n"
+"poi ke'a selfi'i la'o gy.Perttu Ahola.gy. to zoi gy.celeron55@gmail.com.gy. "
+"co'e toi\n"
+".e lo sidju po'u la'o gy.PilzAdam.gy. .e la'o gy.Taoki.gy. .e la'o gy.tango_."
+"gy. .e la'o gy.kahrl.gy. .e la'o gy.darkrose.gy. .e la'o gy.matttpt.gy. .e "
+"la'o gy.erlehmann.gy. .e la'o gy.SpeedProg.gy. .e la'o gy. JacobF.gy. .e "
+"la'o dy.teddydestodes.dy. .e la'o gy.marktraceur.gy. .e la'o dy.Jonathan "
+"Neuschafer.dy. .e la'o gy.thexyz.gy. .e la'o gy.VanessaE.gy. .e la'o gy."
+"sfan5.gy. .e lo mutce cunso drata prenu"
 
 #: src/guiMessageMenu.cpp:112 src/guiPauseMenu.cpp:143
 msgid "Continue"
 msgstr "ranji"
 
+#: src/guiMultiplayerMenu.cpp:135 src/guiSettingsMenu.cpp:277
+msgid "Main Menu"
+msgstr "ralju sazycimde"
+
+#: src/guiMultiplayerMenu.cpp:142
+msgid "All Servers"
+msgstr ""
+
+#: src/guiMultiplayerMenu.cpp:148
+msgid "Favourite Servers"
+msgstr ""
+
+#: src/guiMultiplayerMenu.cpp:154
+#, fuzzy
+msgid "Custom Connect"
+msgstr "samjongau"
+
+#: src/guiMultiplayerMenu.cpp:169
+msgid "Custom Connection"
+msgstr ""
+
+#: src/guiMultiplayerMenu.cpp:176
+msgid "Address/Port"
+msgstr "lo samjudri jo'u judrnporte"
+
+#: src/guiMultiplayerMenu.cpp:201 src/guiMultiplayerMenu.cpp:313
+msgid "Add to Favourites"
+msgstr ""
+
+#: src/guiMultiplayerMenu.cpp:206 src/guiMultiplayerMenu.cpp:320
+msgid "Connect"
+msgstr "samjongau"
+
+#: src/guiMultiplayerMenu.cpp:213
+msgid "Name/Password"
+msgstr "lo cmene .e lo lerpoijaspu"
+
+#: src/guiMultiplayerMenu.cpp:240
+msgid "Join Server"
+msgstr ""
+
+#: src/guiMultiplayerMenu.cpp:262
+msgid "My Favourites"
+msgstr ""
+
+#: src/guiMultiplayerMenu.cpp:265
+msgid "Server List"
+msgstr ""
+
+#: src/guiMultiplayerMenu.cpp:270
+msgid "Get New List"
+msgstr ""
+
+#: src/guiMultiplayerMenu.cpp:307
+msgid "Remove from Favourites"
+msgstr ""
+
 #: src/guiPasswordChange.cpp:105
 msgid "Old Password"
 msgstr "lo slabu lerpoijaspu"
@@ -3756,11 +3859,11 @@ msgstr "za'i ca'u muvdu"
 msgid "Backward"
 msgstr "za'i ti'a muvdu"
 
-#: src/guiSettingsMenu.cpp:72 src/keycode.cpp:234
+#: src/guiSettingsMenu.cpp:72 src/keycode.cpp:263
 msgid "Left"
 msgstr "za'i zu'e muvdu"
 
-#: src/guiSettingsMenu.cpp:73 src/keycode.cpp:234
+#: src/guiSettingsMenu.cpp:73 src/keycode.cpp:265
 msgid "Right"
 msgstr "za'i ri'u muvdu"
 
@@ -3796,11 +3899,11 @@ msgstr "mu'e cuxna fi le'i se kuspe"
 msgid "Toggle Fly"
 msgstr "mu'e co'a jonai mo'u vofli"
 
-#: src/guiSettingsMenu.cpp:82 src/keycode.cpp:234
+#: src/guiSettingsMenu.cpp:82 src/keycode.cpp:264
 msgid "Up"
 msgstr "za'i ga'u muvdu"
 
-#: src/guiSettingsMenu.cpp:83 src/keycode.cpp:234
+#: src/guiSettingsMenu.cpp:83 src/keycode.cpp:266
 msgid "Down"
 msgstr "za'i ni'a muvdu"
 
@@ -3844,10 +3947,6 @@ msgstr "selyli'e dacti"
 msgid "Next Item"
 msgstr "lidne dacti"
 
-#: src/guiSettingsMenu.cpp:277
-msgid "Main Menu"
-msgstr "ralju sazycimde"
-
 #: src/guiSettingsMenu.cpp:284 src/guiSettingsMenu.cpp:311
 msgid "Controls"
 msgstr "le te batke"
@@ -3955,362 +4054,575 @@ msgstr ""
 msgid "Cold Protection: %d:%02d"
 msgstr ""
 
-#: src/inventory.cpp:230 src/inventory.cpp:352
-msgid "Cookable: Yes"
-msgstr ""
-
-#: src/inventory.cpp:235 src/inventory.cpp:357 src/inventory.cpp:532
-msgid "Fuel Burn Time: "
-msgstr ""
-
-#: src/inventory.cpp:321
-msgid "Hunger: "
-msgstr ""
-
-#: src/inventory.cpp:327
-msgid "Health: "
-msgstr ""
-
-#: src/inventory.cpp:334
-msgid "Cold Protection: "
-msgstr ""
-
-#: src/inventory.cpp:343
-msgid "Energy Boost: "
-msgstr ""
-
-#: src/inventory.cpp:521
-msgid "Strength: "
-msgstr ""
-
-#: src/inventory.cpp:524
-msgid "Speed: "
-msgstr ""
-
-#: src/inventory.cpp:527
-msgid "Level: "
-msgstr ""
-
-#: src/inventory.cpp:557
+#: src/inventory.cpp:246 src/inventory.cpp:580
 msgid "Contains: "
 msgstr ""
 
-#: src/inventory.cpp:643
+#: src/inventory.cpp:253 src/inventory.cpp:375
+msgid "Cookable: Yes"
+msgstr ""
+
+#: src/inventory.cpp:258 src/inventory.cpp:380 src/inventory.cpp:555
+msgid "Fuel Burn Time: "
+msgstr ""
+
+#: src/inventory.cpp:344
+msgid "Hunger: "
+msgstr ""
+
+#: src/inventory.cpp:350
+msgid "Health: "
+msgstr ""
+
+#: src/inventory.cpp:357
+msgid "Cold Protection: "
+msgstr ""
+
+#: src/inventory.cpp:366
+msgid "Energy Boost: "
+msgstr ""
+
+#: src/inventory.cpp:544
+msgid "Strength: "
+msgstr ""
+
+#: src/inventory.cpp:547
+msgid "Speed: "
+msgstr ""
+
+#: src/inventory.cpp:550
+msgid "Level: "
+msgstr ""
+
+#: src/inventory.cpp:666
 msgid "Armour: "
 msgstr ""
 
-#: src/inventory.cpp:649
+#: src/inventory.cpp:672
 msgid "Warmth: "
 msgstr ""
 
-#: src/inventory.cpp:655
+#: src/inventory.cpp:678
 msgid "Pressure: "
 msgstr ""
 
-#: src/inventory.cpp:661
+#: src/inventory.cpp:684
 msgid "Suffocation: "
 msgstr ""
 
-#: src/inventory.cpp:667
+#: src/inventory.cpp:690
 msgid "Durability: "
 msgstr ""
 
-#: src/inventory.cpp:672
+#: src/inventory.cpp:695
 msgid "Effect Boost: "
 msgstr ""
 
-#: src/keycode.cpp:229
+#: src/keycode.cpp:232
+msgid "-"
+msgstr ""
+
+#: src/keycode.cpp:234
 msgid "Left Button"
 msgstr "lo zulselpevysmacu"
 
-#: src/keycode.cpp:229
-msgid "Middle Button"
-msgstr "lo mijyselpevysmacu"
-
-#: src/keycode.cpp:229
+#: src/keycode.cpp:235
 msgid "Right Button"
 msgstr "lo prityselpevysmacu"
 
-#: src/keycode.cpp:229
+#: src/keycode.cpp:237
+msgid "Middle Button"
+msgstr "lo mijyselpevysmacu"
+
+#: src/keycode.cpp:238
 msgid "X Button 1"
 msgstr "la'o gy.X Button 1.gy."
 
-#: src/keycode.cpp:230
-msgid "Back"
-msgstr ""
-
-#: src/keycode.cpp:230
-msgid "Clear"
-msgstr ""
-
-#: src/keycode.cpp:230
-msgid "Return"
-msgstr ""
-
-#: src/keycode.cpp:230
-msgid "Tab"
-msgstr ""
-
-#: src/keycode.cpp:230
+#: src/keycode.cpp:239
 msgid "X Button 2"
 msgstr "la'o gy.X Button 2.gy."
 
-#: src/keycode.cpp:231
-msgid "Capital"
+#: src/keycode.cpp:240
+msgid "Back"
 msgstr ""
 
-#: src/keycode.cpp:231
-msgid "Control"
+#: src/keycode.cpp:241
+msgid "Tab"
 msgstr ""
 
-#: src/keycode.cpp:231
-msgid "Kana"
+#: src/keycode.cpp:242
+msgid "Clear"
 msgstr ""
 
-#: src/keycode.cpp:231
-msgid "Menu"
+#: src/keycode.cpp:243
+msgid "Return"
 msgstr ""
 
-#: src/keycode.cpp:231
-msgid "Pause"
-msgstr ""
-
-#: src/keycode.cpp:231
+#: src/keycode.cpp:244
 msgid "Shift"
 msgstr ""
 
-#: src/keycode.cpp:232
-msgid "Convert"
+#: src/keycode.cpp:245
+msgid "Control"
 msgstr ""
 
-#: src/keycode.cpp:232
-msgid "Escape"
+#: src/keycode.cpp:246
+msgid "Menu"
 msgstr ""
 
-#: src/keycode.cpp:232
-msgid "Final"
+#: src/keycode.cpp:247
+msgid "Pause"
 msgstr ""
 
-#: src/keycode.cpp:232
+#: src/keycode.cpp:248
+msgid "Capital"
+msgstr ""
+
+#: src/keycode.cpp:249
+msgid "Kana"
+msgstr ""
+
+#: src/keycode.cpp:250
 msgid "Junja"
 msgstr ""
 
-#: src/keycode.cpp:232
+#: src/keycode.cpp:251
+msgid "Final"
+msgstr ""
+
+#: src/keycode.cpp:252
 msgid "Kanji"
 msgstr ""
 
-#: src/keycode.cpp:232
+#: src/keycode.cpp:253
+msgid "Escape"
+msgstr ""
+
+#: src/keycode.cpp:254
+msgid "Convert"
+msgstr ""
+
+#: src/keycode.cpp:255
 msgid "Nonconvert"
 msgstr ""
 
-#: src/keycode.cpp:233
+#: src/keycode.cpp:256
 msgid "Accept"
 msgstr ""
 
-#: src/keycode.cpp:233
-msgid "End"
-msgstr ""
-
-#: src/keycode.cpp:233
-msgid "Home"
-msgstr ""
-
-#: src/keycode.cpp:233
+#: src/keycode.cpp:257
 msgid "Mode Change"
 msgstr "la'o gy.Mode Change.gy"
 
-#: src/keycode.cpp:233
-msgid "Next"
-msgstr ""
-
-#: src/keycode.cpp:233
-msgid "Prior"
-msgstr ""
-
-#: src/keycode.cpp:233
+#: src/keycode.cpp:258
 msgid "Space"
 msgstr ""
 
-#: src/keycode.cpp:234
-msgid "Execute"
+#: src/keycode.cpp:259
+msgid "Prior"
 msgstr ""
 
-#: src/keycode.cpp:234
-msgid "Print"
+#: src/keycode.cpp:260
+msgid "Next"
 msgstr ""
 
-#: src/keycode.cpp:234
+#: src/keycode.cpp:261
+msgid "End"
+msgstr ""
+
+#: src/keycode.cpp:262
+msgid "Home"
+msgstr ""
+
+#: src/keycode.cpp:267
 msgid "Select"
 msgstr ""
 
-#: src/keycode.cpp:235
-msgid "Delete"
+#: src/keycode.cpp:268
+msgid "Print"
 msgstr ""
 
-#: src/keycode.cpp:235
-msgid "Help"
+#: src/keycode.cpp:269
+msgid "Execute"
 msgstr ""
 
-#: src/keycode.cpp:235
-msgid "Insert"
-msgstr ""
-
-#: src/keycode.cpp:235
+#: src/keycode.cpp:270
 msgid "Snapshot"
 msgstr ""
 
-#: src/keycode.cpp:238
+#: src/keycode.cpp:271
+msgid "Insert"
+msgstr ""
+
+#: src/keycode.cpp:272
+msgid "Delete"
+msgstr ""
+
+#: src/keycode.cpp:273
+msgid "Help"
+msgstr ""
+
+#: src/keycode.cpp:274
+msgid "0"
+msgstr ""
+
+#: src/keycode.cpp:275
+msgid "1"
+msgstr ""
+
+#: src/keycode.cpp:276
+msgid "2"
+msgstr ""
+
+#: src/keycode.cpp:277
+msgid "3"
+msgstr ""
+
+#: src/keycode.cpp:278
+msgid "4"
+msgstr ""
+
+#: src/keycode.cpp:279
+msgid "5"
+msgstr ""
+
+#: src/keycode.cpp:280
+msgid "6"
+msgstr ""
+
+#: src/keycode.cpp:281
+msgid "7"
+msgstr ""
+
+#: src/keycode.cpp:282
+msgid "8"
+msgstr ""
+
+#: src/keycode.cpp:283
+msgid "9"
+msgstr ""
+
+#: src/keycode.cpp:284
+msgid "A"
+msgstr ""
+
+#: src/keycode.cpp:285
+msgid "B"
+msgstr ""
+
+#: src/keycode.cpp:286
+msgid "C"
+msgstr ""
+
+#: src/keycode.cpp:287
+msgid "D"
+msgstr ""
+
+#: src/keycode.cpp:288
+msgid "E"
+msgstr ""
+
+#: src/keycode.cpp:289
+msgid "F"
+msgstr ""
+
+#: src/keycode.cpp:290
+msgid "G"
+msgstr ""
+
+#: src/keycode.cpp:291
+msgid "H"
+msgstr ""
+
+#: src/keycode.cpp:292
+msgid "I"
+msgstr ""
+
+#: src/keycode.cpp:293
+msgid "J"
+msgstr ""
+
+#: src/keycode.cpp:294
+msgid "K"
+msgstr ""
+
+#: src/keycode.cpp:295
+msgid "L"
+msgstr ""
+
+#: src/keycode.cpp:296
+msgid "M"
+msgstr ""
+
+#: src/keycode.cpp:297
+msgid "N"
+msgstr ""
+
+#: src/keycode.cpp:298
+msgid "O"
+msgstr ""
+
+#: src/keycode.cpp:299
+msgid "P"
+msgstr ""
+
+#: src/keycode.cpp:300
+msgid "Q"
+msgstr ""
+
+#: src/keycode.cpp:301
+msgid "R"
+msgstr ""
+
+#: src/keycode.cpp:302
+msgid "S"
+msgstr ""
+
+#: src/keycode.cpp:303
+msgid "T"
+msgstr ""
+
+#: src/keycode.cpp:304
+#, fuzzy
+msgid "U"
+msgstr "za'i ga'u muvdu"
+
+#: src/keycode.cpp:305
+msgid "V"
+msgstr ""
+
+#: src/keycode.cpp:306
+msgid "W"
+msgstr ""
+
+#: src/keycode.cpp:307
+msgid "X"
+msgstr ""
+
+#: src/keycode.cpp:308
+msgid "Y"
+msgstr ""
+
+#: src/keycode.cpp:309
+msgid "Z"
+msgstr ""
+
+#: src/keycode.cpp:310
 msgid "Left Windows"
 msgstr ""
 
-#: src/keycode.cpp:239
-msgid "Apps"
-msgstr ""
-
-#: src/keycode.cpp:239
-msgid "Numpad 0"
-msgstr ""
-
-#: src/keycode.cpp:239
-msgid "Numpad 1"
-msgstr ""
-
-#: src/keycode.cpp:239
+#: src/keycode.cpp:311
 msgid "Right Windows"
 msgstr ""
 
-#: src/keycode.cpp:239
+#: src/keycode.cpp:312
+msgid "Apps"
+msgstr ""
+
+#: src/keycode.cpp:313
 msgid "Sleep"
 msgstr ""
 
-#: src/keycode.cpp:240
+#: src/keycode.cpp:314
+msgid "Numpad 0"
+msgstr ""
+
+#: src/keycode.cpp:315
+msgid "Numpad 1"
+msgstr ""
+
+#: src/keycode.cpp:316
 msgid "Numpad 2"
 msgstr ""
 
-#: src/keycode.cpp:240
+#: src/keycode.cpp:317
 msgid "Numpad 3"
 msgstr ""
 
-#: src/keycode.cpp:240
+#: src/keycode.cpp:318
 msgid "Numpad 4"
 msgstr ""
 
-#: src/keycode.cpp:240
+#: src/keycode.cpp:319
 msgid "Numpad 5"
 msgstr ""
 
-#: src/keycode.cpp:240
+#: src/keycode.cpp:320
 msgid "Numpad 6"
 msgstr ""
 
-#: src/keycode.cpp:240
+#: src/keycode.cpp:321
 msgid "Numpad 7"
 msgstr ""
 
-#: src/keycode.cpp:241
-msgid "Numpad *"
-msgstr ""
-
-#: src/keycode.cpp:241
-msgid "Numpad +"
-msgstr ""
-
-#: src/keycode.cpp:241
-msgid "Numpad -"
-msgstr ""
-
-#: src/keycode.cpp:241
-msgid "Numpad /"
-msgstr ""
-
-#: src/keycode.cpp:241
+#: src/keycode.cpp:322
 msgid "Numpad 8"
 msgstr ""
 
-#: src/keycode.cpp:241
+#: src/keycode.cpp:323
 msgid "Numpad 9"
 msgstr ""
 
-#: src/keycode.cpp:245
+#: src/keycode.cpp:324
+msgid "Numpad *"
+msgstr ""
+
+#: src/keycode.cpp:325
+msgid "Numpad +"
+msgstr ""
+
+#: src/keycode.cpp:326 src/keycode.cpp:329
+msgid "Numpad /"
+msgstr ""
+
+#: src/keycode.cpp:327
+msgid "Numpad -"
+msgstr ""
+
+#: src/keycode.cpp:328
+msgid "Numpad ."
+msgstr ""
+
+#: src/keycode.cpp:330
+msgid "F10"
+msgstr ""
+
+#: src/keycode.cpp:331
+msgid "F11"
+msgstr ""
+
+#: src/keycode.cpp:332
+msgid "F12"
+msgstr ""
+
+#: src/keycode.cpp:333
+msgid "F13"
+msgstr ""
+
+#: src/keycode.cpp:334
+msgid "F14"
+msgstr ""
+
+#: src/keycode.cpp:335
+msgid "F15"
+msgstr ""
+
+#: src/keycode.cpp:336
+msgid "F16"
+msgstr ""
+
+#: src/keycode.cpp:337
+msgid "F17"
+msgstr ""
+
+#: src/keycode.cpp:338
+msgid "F18"
+msgstr ""
+
+#: src/keycode.cpp:339
+msgid "F19"
+msgstr ""
+
+#: src/keycode.cpp:340
+msgid "F20"
+msgstr ""
+
+#: src/keycode.cpp:341
+msgid "F21"
+msgstr ""
+
+#: src/keycode.cpp:342
+msgid "F22"
+msgstr ""
+
+#: src/keycode.cpp:343
+msgid "F23"
+msgstr ""
+
+#: src/keycode.cpp:344
+msgid "F24"
+msgstr ""
+
+#: src/keycode.cpp:345
 msgid "Num Lock"
 msgstr ""
 
-#: src/keycode.cpp:245
+#: src/keycode.cpp:346
 msgid "Scroll Lock"
 msgstr ""
 
-#: src/keycode.cpp:246
+#: src/keycode.cpp:347
 msgid "Left Shift"
 msgstr ""
 
-#: src/keycode.cpp:246
+#: src/keycode.cpp:348
 msgid "Right Shift"
 msgstr ""
 
-#: src/keycode.cpp:247
+#: src/keycode.cpp:349
 msgid "Left Control"
 msgstr ""
 
-#: src/keycode.cpp:247
-msgid "Left Menu"
-msgstr ""
-
-#: src/keycode.cpp:247
+#: src/keycode.cpp:350
 msgid "Right Control"
 msgstr ""
 
-#: src/keycode.cpp:247
+#: src/keycode.cpp:351
+msgid "Left Menu"
+msgstr ""
+
+#: src/keycode.cpp:352
 msgid "Right Menu"
 msgstr ""
 
-#: src/keycode.cpp:249
-msgid "Comma"
-msgstr "slaka bu"
-
-#: src/keycode.cpp:249
-msgid "Minus"
-msgstr "vu'u bu"
-
-#: src/keycode.cpp:249
-msgid "Period"
-msgstr "denpa bu"
-
-#: src/keycode.cpp:249
+#: src/keycode.cpp:353
 msgid "Plus"
 msgstr "su'i bu"
 
-#: src/keycode.cpp:253
+#: src/keycode.cpp:354
+msgid "Comma"
+msgstr "slaka bu"
+
+#: src/keycode.cpp:355
+msgid "Minus"
+msgstr "vu'u bu"
+
+#: src/keycode.cpp:356
+msgid "Period"
+msgstr "denpa bu"
+
+#: src/keycode.cpp:357
 msgid "Attn"
 msgstr "la'o gy.Attn.gy."
 
-#: src/keycode.cpp:253
+#: src/keycode.cpp:358
 msgid "CrSel"
 msgstr "la'o gy.CrSel.gy."
 
-#: src/keycode.cpp:254
-msgid "Erase OEF"
-msgstr "la'o gy.Erase OEF.gy."
-
-#: src/keycode.cpp:254
+#: src/keycode.cpp:359
 msgid "ExSel"
 msgstr "la'o gy.ExSel.gy."
 
-#: src/keycode.cpp:254
-msgid "OEM Clear"
-msgstr "la'o gy.OEM Clear.gy."
+#: src/keycode.cpp:360
+msgid "Erase OEF"
+msgstr "la'o gy.Erase OEF.gy."
 
-#: src/keycode.cpp:254
-msgid "PA1"
-msgstr "la'o gy.PA1.gy."
-
-#: src/keycode.cpp:254
+#: src/keycode.cpp:361
 msgid "Play"
 msgstr ""
 
-#: src/keycode.cpp:254
+#: src/keycode.cpp:362
 msgid "Zoom"
 msgstr ""
 
+#: src/keycode.cpp:363
+msgid "PA1"
+msgstr "la'o gy.PA1.gy."
+
+#: src/keycode.cpp:364
+msgid "OEM Clear"
+msgstr "la'o gy.OEM Clear.gy."
+
 #: src/main.cpp:1131
 msgid "Setting Up UI"
 msgstr ".i bregau lo sazycimde"
@@ -4327,30 +4639,70 @@ msgstr ".i ca'o samymo'i le danlu"
 msgid "Setting Up Sound"
 msgstr ".i bregau lo sance"
 
-#: src/mapnode.cpp:282
+#: src/mapnode.cpp:285
 msgid "Loading Base MapNodes"
 msgstr ".i ca'o samymo'i lo jicmu me la'o gy.MapNodes.gy."
 
-#: src/mapnode.cpp:286
+#: src/mapnode.cpp:289
 msgid "Loading Circuit MapNodes"
 msgstr ".i ca'o samymo'i lo dikca me la'o gy.MapNodes.gy."
 
-#: src/mapnode.cpp:290
+#: src/mapnode.cpp:293
 msgid "Loading Plant MapNodes"
 msgstr ".i ca'o samymo'i lo spati me la'o gy.MapNodes.gy."
 
-#: src/mapnode.cpp:294
+#: src/mapnode.cpp:297
 msgid "Loading Farming MapNodes"
 msgstr ".i ca'o samymo'i lo cange me la'o gy.MapNodes.gy."
 
-#: src/mapnode.cpp:298
+#: src/mapnode.cpp:301
 msgid "Loading Decorative MapNodes"
 msgstr ".i ca'o samymo'i lo jadni me la'o gy.MapNodes.gy."
 
-#: src/mapnode.cpp:302
+#: src/mapnode.cpp:305
 msgid "Loading Interactive MapNodes"
 msgstr ".i ca'o samymo'i le se pilno kakne me la'o gy.MapNodes.gy."
 
-#: src/mapnode.cpp:306
+#: src/mapnode.cpp:309
 msgid "Loading Special MapNodes"
 msgstr ".i ca'o samymo'i lo rirci me la'o gy.MapNodes.gy."
+
+#: src/mineral.cpp:93
+#, fuzzy
+msgid "Coal"
+msgstr "lo kolme bakfu"
+
+#: src/mineral.cpp:99
+#, fuzzy
+msgid "Iron"
+msgstr "lo tirse bakfu"
+
+#: src/mineral.cpp:106
+#, fuzzy
+msgid "Tin"
+msgstr "jakmau"
+
+#: src/mineral.cpp:113
+#, fuzzy
+msgid "Copper"
+msgstr "lo tunka bakfu"
+
+#: src/mineral.cpp:121
+#, fuzzy
+msgid "Silver"
+msgstr "lo rijno bakfu"
+
+#: src/mineral.cpp:128
+#, fuzzy
+msgid "Gold"
+msgstr "lo solji bakfu"
+
+#: src/mineral.cpp:135
+#, fuzzy
+msgid "Quartz"
+msgstr "lo kunrkuartse purmo"
+
+#: src/mineral.cpp:157
+#, fuzzy
+msgid "Turquoise"
+msgstr "lo cicnykunra"
diff --git a/po/nl/voxelands.po b/po/nl/voxelands.po
index 22f8581..25b3503 100644
--- a/po/nl/voxelands.po
+++ b/po/nl/voxelands.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Lisa 'darkrose' Milne
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # Jay <joeyxtreme@hotmail.nl>, 2014
 # NOH <neinmeinleben@outlook.com>, 2015
@@ -9,14 +9,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Voxelands\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-10-19 01:55+1000\n"
+"POT-Creation-Date: 2015-12-21 11:27+1000\n"
 "PO-Revision-Date: 2015-10-18 16:24+0000\n"
 "Last-Translator: NOH <neinmeinleben@outlook.com>\n"
-"Language-Team: Dutch (Netherlands) (http://www.transifex.com/voxelands/voxelands/language/nl_NL/)\n"
+"Language-Team: Dutch (Netherlands) (http://www.transifex.com/voxelands/"
+"voxelands/language/nl_NL/)\n"
+"Language: nl_NL\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: nl_NL\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: src/character_creator.cpp:55
@@ -229,9 +230,17 @@ msgstr "Canvas Schoenen"
 
 #: src/character_creator.cpp:202
 msgid ""
-"Here you can create your default character, this is how other players will see you in-game. When you join a new server you will start with the clothing you select here. Additional clothing, both protective and decorative, can be crafted in-game.\n"
+"Here you can create your default character, this is how other players will "
+"see you in-game. When you join a new server you will start with the clothing "
+"you select here. Additional clothing, both protective and decorative, can be "
+"crafted in-game.\n"
 "You can return here from the main menu anytime to change your character."
-msgstr "Hier kun je jouw personage aanmaken, zo zien de andere spelers jouw personage in het spel. Als je naar een nieuwe server gaat dan start je met de kleding die je daar hebt selecteerd. Aanvullende kleding, zowel beschermend als decoratief, kun je in het spel maken. Je kunt hier altijd terugkeren via het hoofdmenu om jouw personage te veranderen."
+msgstr ""
+"Hier kun je jouw personage aanmaken, zo zien de andere spelers jouw "
+"personage in het spel. Als je naar een nieuwe server gaat dan start je met "
+"de kleding die je daar hebt selecteerd. Aanvullende kleding, zowel "
+"beschermend als decoratief, kun je in het spel maken. Je kunt hier altijd "
+"terugkeren via het hoofdmenu om jouw personage te veranderen."
 
 #: src/character_creator.cpp:223
 msgid "Create Your Character"
@@ -265,7 +274,7 @@ msgstr "Dunner"
 msgid "Done"
 msgstr "Klaar"
 
-#: src/character_creator.cpp:423 src/keycode.cpp:229
+#: src/character_creator.cpp:423 src/keycode.cpp:236
 msgid "Cancel"
 msgstr "Annuleren"
 
@@ -1117,7 +1126,7 @@ msgstr "Vuursteen"
 msgid "Steel Ingot"
 msgstr "Ijzerstaaf"
 
-#: src/content_craftitem.cpp:225 src/content_mapnode.cpp:710
+#: src/content_craftitem.cpp:225 src/content_mapnode.cpp:723
 msgid "Brick"
 msgstr "Baksteen"
 
@@ -1545,11 +1554,11 @@ msgstr "Ruwe Mithril"
 msgid "Unbound Mithril"
 msgstr "Ongebonden Mithril"
 
-#: src/content_craftitem.cpp:1516
+#: src/content_craftitem.cpp:1516 src/mineral.cpp:142
 msgid "Mithril"
 msgstr "Mithril"
 
-#: src/content_craftitem.cpp:1525
+#: src/content_craftitem.cpp:1525 src/mineral.cpp:149
 msgid "Ruby"
 msgstr "Robijn"
 
@@ -1557,15 +1566,15 @@ msgstr "Robijn"
 msgid "Turquiose"
 msgstr "Turkoois"
 
-#: src/content_craftitem.cpp:1541
+#: src/content_craftitem.cpp:1541 src/mineral.cpp:165
 msgid "Amethyst"
 msgstr "Amethist"
 
-#: src/content_craftitem.cpp:1549
+#: src/content_craftitem.cpp:1549 src/mineral.cpp:173
 msgid "Sapphire"
 msgstr "Saffier"
 
-#: src/content_craftitem.cpp:1557
+#: src/content_craftitem.cpp:1557 src/mineral.cpp:181
 msgid "Sunstone"
 msgstr "Zonnesteen"
 
@@ -1577,392 +1586,396 @@ msgstr "Steen"
 msgid "Limestone"
 msgstr "Kalksteen"
 
-#: src/content_mapnode.cpp:219
+#: src/content_mapnode.cpp:221
+msgid "Marble"
+msgstr ""
+
+#: src/content_mapnode.cpp:232
 msgid "Rock"
 msgstr "Rots"
 
-#: src/content_mapnode.cpp:241
+#: src/content_mapnode.cpp:254
 msgid "Ice"
 msgstr "Ijs"
 
-#: src/content_mapnode.cpp:257
+#: src/content_mapnode.cpp:270
 msgid "Coal Block"
 msgstr "Steenkool Blok"
 
-#: src/content_mapnode.cpp:274
+#: src/content_mapnode.cpp:287
 msgid "Charcoal Block"
 msgstr "Houtskool Blok"
 
-#: src/content_mapnode.cpp:291
+#: src/content_mapnode.cpp:304
 msgid "Stone Brick"
 msgstr "Baksteen"
 
-#: src/content_mapnode.cpp:305
+#: src/content_mapnode.cpp:318
 msgid "Stone Block"
 msgstr "Steen Blok"
 
-#: src/content_mapnode.cpp:319
+#: src/content_mapnode.cpp:332
 msgid "Rough Stone Brick"
 msgstr "Ruwe Baksteen"
 
-#: src/content_mapnode.cpp:336
+#: src/content_mapnode.cpp:349
 msgid "Rough Stone Block"
 msgstr "Ruwe Steen Blok"
 
-#: src/content_mapnode.cpp:352 src/content_mapnode.cpp:385
-#: src/content_mapnode.cpp:399 src/content_mapnode.cpp:432
+#: src/content_mapnode.cpp:365 src/content_mapnode.cpp:398
+#: src/content_mapnode.cpp:412 src/content_mapnode.cpp:445
 msgid "Grass"
 msgstr "Gras"
 
-#: src/content_mapnode.cpp:370 src/content_mapnode.cpp:417
+#: src/content_mapnode.cpp:383 src/content_mapnode.cpp:430
 msgid "Growing Grass"
 msgstr "Groeiende Gras"
 
-#: src/content_mapnode.cpp:446
+#: src/content_mapnode.cpp:459
 msgid "Muddy Snow"
 msgstr "Modderige Sneeuw"
 
-#: src/content_mapnode.cpp:462
+#: src/content_mapnode.cpp:475
 msgid "Mud"
 msgstr "Modder"
 
-#: src/content_mapnode.cpp:478
+#: src/content_mapnode.cpp:491
 msgid "Ash Block"
 msgstr "As Blok"
 
-#: src/content_mapnode.cpp:493
+#: src/content_mapnode.cpp:506
 msgid "Sand"
 msgstr "Zand"
 
-#: src/content_mapnode.cpp:512
+#: src/content_mapnode.cpp:525
 msgid "Gravel"
 msgstr "Grind"
 
-#: src/content_mapnode.cpp:529
+#: src/content_mapnode.cpp:542
 msgid "Sand Stone"
 msgstr "Zandsteen"
 
-#: src/content_mapnode.cpp:544
+#: src/content_mapnode.cpp:557
 msgid "Sand Stone Bricks"
 msgstr "Zandbaksteen"
 
-#: src/content_mapnode.cpp:559
+#: src/content_mapnode.cpp:572
 msgid "Sand Stone Blocks"
 msgstr "Zandsteen Blok"
 
-#: src/content_mapnode.cpp:574
+#: src/content_mapnode.cpp:587
 msgid "Clay"
 msgstr "Klei"
 
-#: src/content_mapnode.cpp:591
+#: src/content_mapnode.cpp:604
 msgid "Blue Clay"
 msgstr "Blauwe Klei"
 
-#: src/content_mapnode.cpp:608
+#: src/content_mapnode.cpp:621
 msgid "Green Clay"
 msgstr "Groene Klei"
 
-#: src/content_mapnode.cpp:625
+#: src/content_mapnode.cpp:638
 msgid "Orange Clay"
 msgstr "Oranje Klei"
 
-#: src/content_mapnode.cpp:642
+#: src/content_mapnode.cpp:655
 msgid "Purple Clay"
 msgstr "Paarse Klei"
 
-#: src/content_mapnode.cpp:659
+#: src/content_mapnode.cpp:672
 msgid "Red Clay"
 msgstr "Rode Klei"
 
-#: src/content_mapnode.cpp:676
+#: src/content_mapnode.cpp:689
 msgid "Yellow Clay"
 msgstr "Gele Klei"
 
-#: src/content_mapnode.cpp:693
+#: src/content_mapnode.cpp:706
 msgid "Black Clay"
 msgstr "Zwarte Klei"
 
-#: src/content_mapnode.cpp:729
+#: src/content_mapnode.cpp:742
 msgid "Terracotta"
 msgstr "Teracotta"
 
-#: src/content_mapnode.cpp:741
+#: src/content_mapnode.cpp:754
 msgid "Terracotta Brick"
 msgstr "Teracotta Baksteen"
 
-#: src/content_mapnode.cpp:755
+#: src/content_mapnode.cpp:768
 msgid "Terracotta Block"
 msgstr "Teracotta Blok"
 
-#: src/content_mapnode.cpp:769
+#: src/content_mapnode.cpp:782
 msgid "Terracotta Tile"
 msgstr "Teracotta Tegel"
 
-#: src/content_mapnode.cpp:789
+#: src/content_mapnode.cpp:802
 msgid "Glass"
 msgstr "Glas"
 
-#: src/content_mapnode.cpp:809
+#: src/content_mapnode.cpp:822
 msgid "Blue Glass"
 msgstr "Blauw Glas"
 
-#: src/content_mapnode.cpp:831
+#: src/content_mapnode.cpp:844
 msgid "Green Glass"
 msgstr "Groen Glas"
 
-#: src/content_mapnode.cpp:853
+#: src/content_mapnode.cpp:866
 msgid "Orange Glass"
 msgstr "Oranje Glas"
 
-#: src/content_mapnode.cpp:875
+#: src/content_mapnode.cpp:888
 msgid "Purple Glass"
 msgstr "Paars Glas"
 
-#: src/content_mapnode.cpp:897
+#: src/content_mapnode.cpp:910
 msgid "Red Glass"
 msgstr "Rood Glas"
 
-#: src/content_mapnode.cpp:919
+#: src/content_mapnode.cpp:932
 msgid "Yellow Glass"
 msgstr "Geel Glas"
 
-#: src/content_mapnode.cpp:941
+#: src/content_mapnode.cpp:954
 msgid "Black Glass"
 msgstr "Zwart Glas"
 
-#: src/content_mapnode.cpp:963
+#: src/content_mapnode.cpp:976
 msgid "Glass Pane"
 msgstr "Glazen Ruit"
 
-#: src/content_mapnode.cpp:997
+#: src/content_mapnode.cpp:1010
 msgid "Blue Glass Pane"
 msgstr "Blauwe Glazen Ruit"
 
-#: src/content_mapnode.cpp:1032
+#: src/content_mapnode.cpp:1045
 msgid "Green Glass Pane"
 msgstr "Groene Glazen Ruit"
 
-#: src/content_mapnode.cpp:1067
+#: src/content_mapnode.cpp:1080
 msgid "Orange Glass Pane"
 msgstr "Oranje Glazen Ruit"
 
-#: src/content_mapnode.cpp:1102
+#: src/content_mapnode.cpp:1115
 msgid "Purple Glass Pane"
 msgstr "Paarse Glazen Ruit"
 
-#: src/content_mapnode.cpp:1137
+#: src/content_mapnode.cpp:1150
 msgid "Red Glass Pane"
 msgstr "Rode Glazen Ruit"
 
-#: src/content_mapnode.cpp:1172
+#: src/content_mapnode.cpp:1185
 msgid "Yellow Glass Pane"
 msgstr "Gele Glazen Ruit"
 
-#: src/content_mapnode.cpp:1207
+#: src/content_mapnode.cpp:1220
 msgid "Black Glass Pane"
 msgstr "Zwarte Glazen Ruit"
 
-#: src/content_mapnode.cpp:1242 src/content_mapnode_farm.cpp:333
+#: src/content_mapnode.cpp:1255 src/content_mapnode_farm.cpp:333
 msgid "Glass Light"
 msgstr "Glazen Lamp"
 
-#: src/content_mapnode.cpp:1265
+#: src/content_mapnode.cpp:1278
 msgid "Wood"
 msgstr "Hout"
 
-#: src/content_mapnode.cpp:1291
+#: src/content_mapnode.cpp:1304
 msgid "Jungle Wood"
 msgstr "Junglehout"
 
-#: src/content_mapnode.cpp:1316
+#: src/content_mapnode.cpp:1329
 msgid "Pine"
 msgstr "Dennenhout"
 
-#: src/content_mapnode.cpp:1341
+#: src/content_mapnode.cpp:1354
 msgid "Sponge"
 msgstr "Spons"
 
-#: src/content_mapnode.cpp:1356
+#: src/content_mapnode.cpp:1369
 msgid "Waterlogged Sponge"
 msgstr "Volgezogen Spons"
 
-#: src/content_mapnode.cpp:1371
+#: src/content_mapnode.cpp:1384
 msgid "Hay Bale"
 msgstr "Hooibaal"
 
-#: src/content_mapnode.cpp:1388
+#: src/content_mapnode.cpp:1401
 msgid "Raw Apple Pie"
 msgstr "Rauwe Appeltaart"
 
-#: src/content_mapnode.cpp:1417
+#: src/content_mapnode.cpp:1430
 msgid "Apple Pie"
 msgstr "Appeltaart"
 
-#: src/content_mapnode.cpp:1512
+#: src/content_mapnode.cpp:1525
 msgid "Raw Pumpkin Pie"
 msgstr "Rauwe Pompoentaart"
 
-#: src/content_mapnode.cpp:1541
+#: src/content_mapnode.cpp:1554
 msgid "Pumpkin Pie"
 msgstr "Pompoentaart"
 
-#: src/content_mapnode.cpp:1636 src/content_mapnode.cpp:1715
+#: src/content_mapnode.cpp:1649 src/content_mapnode.cpp:1728
 msgid "Snow"
 msgstr "Sneeuw"
 
-#: src/content_mapnode.cpp:1652
+#: src/content_mapnode.cpp:1665
 msgid "Snowman"
 msgstr "Sneeuwpop"
 
-#: src/content_mapnode.cpp:1738 src/content_mapnode_farm.cpp:445
+#: src/content_mapnode.cpp:1752 src/content_mapnode_farm.cpp:445
 msgid "Cotton"
 msgstr "Katoen"
 
-#: src/content_mapnode.cpp:1769
+#: src/content_mapnode.cpp:1783
 msgid "Blue Cotton"
 msgstr "Blauw Katoen"
 
-#: src/content_mapnode.cpp:1786
+#: src/content_mapnode.cpp:1800
 msgid "Green Cotton"
 msgstr "Groen Katoen"
 
-#: src/content_mapnode.cpp:1803
+#: src/content_mapnode.cpp:1817
 msgid "Orange Cotton"
 msgstr "Oranje Katoen"
 
-#: src/content_mapnode.cpp:1820
+#: src/content_mapnode.cpp:1834
 msgid "Purple Cotton"
 msgstr "Paars Katoen"
 
-#: src/content_mapnode.cpp:1837
+#: src/content_mapnode.cpp:1851
 msgid "Red Cotton"
 msgstr "Rood Katoen"
 
-#: src/content_mapnode.cpp:1854
+#: src/content_mapnode.cpp:1868
 msgid "Yellow Cotton"
 msgstr "Geel Katoen"
 
-#: src/content_mapnode.cpp:1871
+#: src/content_mapnode.cpp:1885
 msgid "Black Cotton"
 msgstr "Zwart Katoen"
 
-#: src/content_mapnode.cpp:1888
+#: src/content_mapnode.cpp:1902
 msgid "Carpet"
 msgstr "Tapijt"
 
-#: src/content_mapnode.cpp:1911
+#: src/content_mapnode.cpp:1925
 msgid "Blue Carpet"
 msgstr "Blauw Tapijt"
 
-#: src/content_mapnode.cpp:1935
+#: src/content_mapnode.cpp:1949
 msgid "Green Carpet"
 msgstr "Groen Tapijt"
 
-#: src/content_mapnode.cpp:1959
+#: src/content_mapnode.cpp:1973
 msgid "Orange Carpet"
 msgstr "Oranje Tapijt"
 
-#: src/content_mapnode.cpp:1983
+#: src/content_mapnode.cpp:1997
 msgid "Purple Carpet"
 msgstr "Paars Tapijt"
 
-#: src/content_mapnode.cpp:2007
+#: src/content_mapnode.cpp:2021
 msgid "Red Carpet"
 msgstr "Rood Tapijt"
 
-#: src/content_mapnode.cpp:2031
+#: src/content_mapnode.cpp:2045
 msgid "Yellow Carpet"
 msgstr "Geel Tapijt"
 
-#: src/content_mapnode.cpp:2055
+#: src/content_mapnode.cpp:2069
 msgid "Black Carpet"
 msgstr "Zwart Tapijt"
 
-#: src/content_mapnode.cpp:2079
+#: src/content_mapnode.cpp:2093
 msgid "Air"
 msgstr "Lucht"
 
-#: src/content_mapnode.cpp:2095
+#: src/content_mapnode.cpp:2109
 msgid "Vacuum"
 msgstr "Vacuüm"
 
-#: src/content_mapnode.cpp:2112 src/content_mapnode.cpp:2142
+#: src/content_mapnode.cpp:2126 src/content_mapnode.cpp:2156
 msgid "Water"
 msgstr "Water"
 
-#: src/content_mapnode.cpp:2172 src/content_mapnode.cpp:2200
+#: src/content_mapnode.cpp:2186 src/content_mapnode.cpp:2214
 msgid "Lava"
 msgstr "Lava"
 
-#: src/content_mapnode.cpp:2231
+#: src/content_mapnode.cpp:2245
 msgid "Rough Stone"
 msgstr "Ruwe Steen"
 
-#: src/content_mapnode.cpp:2248
+#: src/content_mapnode.cpp:2262
 msgid "Cobble Stone"
 msgstr "Keisteen"
 
-#: src/content_mapnode.cpp:2264
+#: src/content_mapnode.cpp:2278
 msgid "Mossy Cobble Stone"
 msgstr "Mossig Keisteen"
 
-#: src/content_mapnode.cpp:2277
+#: src/content_mapnode.cpp:2291
 msgid "Steel Block"
 msgstr "Staal Blok"
 
-#: src/content_mapnode.cpp:2294
+#: src/content_mapnode.cpp:2308
 msgid "Mithril Block"
 msgstr "Mithril Blok"
 
-#: src/content_mapnode.cpp:2310
+#: src/content_mapnode.cpp:2324
 msgid "Stone Knob"
 msgstr "Stenen Draaiknop"
 
-#: src/content_mapnode.cpp:2311
+#: src/content_mapnode.cpp:2325
 msgid "Rough Stone Knob"
 msgstr "Ruwe Stenen Draaiknop"
 
-#: src/content_mapnode.cpp:2312
+#: src/content_mapnode.cpp:2326
 msgid "Sandstone Knob"
 msgstr "Zandstenen Draaiknop"
 
-#: src/content_mapnode.cpp:2313
+#: src/content_mapnode.cpp:2327
 msgid "Wooden Knob"
 msgstr "Houten Draaiknop"
 
-#: src/content_mapnode.cpp:2314
+#: src/content_mapnode.cpp:2328
 msgid "Junglewood Knob"
 msgstr "Junglehouten Draaiknop"
 
-#: src/content_mapnode.cpp:2315
+#: src/content_mapnode.cpp:2329
 msgid "Pine Knob"
 msgstr "Grenen Draaiknop"
 
-#: src/content_mapnode.cpp:2319
+#: src/content_mapnode.cpp:2333
 msgid "Copper Block"
 msgstr "Koper Blok"
 
-#: src/content_mapnode.cpp:2336
+#: src/content_mapnode.cpp:2350
 msgid "Gold Block"
 msgstr "Goud Blok"
 
-#: src/content_mapnode.cpp:2353
+#: src/content_mapnode.cpp:2367
 msgid "Silver Block"
 msgstr "Zilver Blok"
 
-#: src/content_mapnode.cpp:2370
+#: src/content_mapnode.cpp:2384
 msgid "Tin Block"
 msgstr "Tin Blok"
 
-#: src/content_mapnode.cpp:2387
+#: src/content_mapnode.cpp:2401
 msgid "Quartz Block"
 msgstr "Kwarts Blok"
 
-#: src/content_mapnode.cpp:2404
+#: src/content_mapnode.cpp:2418
 msgid "Stone Tiles"
 msgstr "Steen Tegel"
 
-#: src/content_mapnode.cpp:2426
+#: src/content_mapnode.cpp:2440
 msgid "Wood Tiles"
 msgstr "Hout Tegel"
 
@@ -2010,29 +2023,29 @@ msgstr "Niet-Poort"
 msgid "Repeater"
 msgstr "Herhaler"
 
-#: src/content_mapnode_circuit.cpp:369 src/content_mapnode_circuit.cpp:393
+#: src/content_mapnode_circuit.cpp:369 src/content_mapnode_circuit.cpp:390
 msgid "Electric Lamp"
 msgstr "Elektrische Lamp"
 
-#: src/content_mapnode_circuit.cpp:427 src/content_mapnode_circuit.cpp:462
-#: src/content_mapnode_circuit.cpp:516 src/content_mapnode_circuit.cpp:537
-#: src/content_mapnode_circuit.cpp:582 src/content_mapnode_circuit.cpp:603
+#: src/content_mapnode_circuit.cpp:424 src/content_mapnode_circuit.cpp:459
+#: src/content_mapnode_circuit.cpp:513 src/content_mapnode_circuit.cpp:534
+#: src/content_mapnode_circuit.cpp:579 src/content_mapnode_circuit.cpp:600
 msgid "Piston"
 msgstr "Duwmachine"
 
-#: src/content_mapnode_circuit.cpp:489 src/content_mapnode_circuit.cpp:560
-#: src/content_mapnode_circuit.cpp:626
+#: src/content_mapnode_circuit.cpp:486 src/content_mapnode_circuit.cpp:557
+#: src/content_mapnode_circuit.cpp:623
 msgid "Piston Arm"
 msgstr "Duwmachine Arm"
 
-#: src/content_mapnode_circuit.cpp:648 src/content_mapnode_circuit.cpp:676
-#: src/content_mapnode_circuit.cpp:730 src/content_mapnode_circuit.cpp:751
-#: src/content_mapnode_circuit.cpp:796 src/content_mapnode_circuit.cpp:817
+#: src/content_mapnode_circuit.cpp:645 src/content_mapnode_circuit.cpp:673
+#: src/content_mapnode_circuit.cpp:727 src/content_mapnode_circuit.cpp:748
+#: src/content_mapnode_circuit.cpp:793 src/content_mapnode_circuit.cpp:814
 msgid "Sticky Piston"
 msgstr "Kleverige Duwmachine"
 
-#: src/content_mapnode_circuit.cpp:703 src/content_mapnode_circuit.cpp:774
-#: src/content_mapnode_circuit.cpp:840
+#: src/content_mapnode_circuit.cpp:700 src/content_mapnode_circuit.cpp:771
+#: src/content_mapnode_circuit.cpp:837
 msgid "Sticky Piston Arm"
 msgstr "Kleverige Duwmachine Arm"
 
@@ -2172,7 +2185,7 @@ msgstr "Druif"
 msgid "Trellis Grape"
 msgstr "Druiven Traliewerk"
 
-#: src/content_mapnode_farm.cpp:493 src/content_mapnode_farm.cpp:512
+#: src/content_mapnode_farm.cpp:494 src/content_mapnode_farm.cpp:513
 msgid "Dead Vine"
 msgstr "Dode Liaan"
 
@@ -2188,131 +2201,137 @@ msgstr "Junglehouten Boekenkast"
 msgid "Pine Book Shelf"
 msgstr "Grenen Boekenkast"
 
-#: src/content_mapnode_furniture.cpp:150 src/content_mapnode_furniture.cpp:169
-#: src/content_mapnode_furniture.cpp:188 src/content_mapnode_furniture.cpp:207
-#: src/content_mapnode_furniture.cpp:226 src/content_mapnode_furniture.cpp:245
+#: src/content_mapnode_furniture.cpp:150 src/content_mapnode_furniture.cpp:170
+#: src/content_mapnode_furniture.cpp:190 src/content_mapnode_furniture.cpp:210
+#: src/content_mapnode_furniture.cpp:230 src/content_mapnode_furniture.cpp:250
 msgid "Couch"
 msgstr "Bank"
 
-#: src/content_mapnode_furniture.cpp:274 src/content_mapnode_furniture.cpp:293
-#: src/content_mapnode_furniture.cpp:312 src/content_mapnode_furniture.cpp:331
-#: src/content_mapnode_furniture.cpp:350 src/content_mapnode_furniture.cpp:369
+#: src/content_mapnode_furniture.cpp:280 src/content_mapnode_furniture.cpp:300
+#: src/content_mapnode_furniture.cpp:320 src/content_mapnode_furniture.cpp:340
+#: src/content_mapnode_furniture.cpp:360 src/content_mapnode_furniture.cpp:380
 msgid "Blue Couch"
 msgstr "Blauwe Bank"
 
-#: src/content_mapnode_furniture.cpp:392 src/content_mapnode_furniture.cpp:411
-#: src/content_mapnode_furniture.cpp:430 src/content_mapnode_furniture.cpp:449
-#: src/content_mapnode_furniture.cpp:468 src/content_mapnode_furniture.cpp:487
+#: src/content_mapnode_furniture.cpp:404 src/content_mapnode_furniture.cpp:424
+#: src/content_mapnode_furniture.cpp:444 src/content_mapnode_furniture.cpp:464
+#: src/content_mapnode_furniture.cpp:484 src/content_mapnode_furniture.cpp:504
 msgid "Green Couch"
 msgstr "Groene Bank"
 
-#: src/content_mapnode_furniture.cpp:510 src/content_mapnode_furniture.cpp:529
-#: src/content_mapnode_furniture.cpp:548 src/content_mapnode_furniture.cpp:567
-#: src/content_mapnode_furniture.cpp:586 src/content_mapnode_furniture.cpp:605
+#: src/content_mapnode_furniture.cpp:528 src/content_mapnode_furniture.cpp:548
+#: src/content_mapnode_furniture.cpp:568 src/content_mapnode_furniture.cpp:588
+#: src/content_mapnode_furniture.cpp:608 src/content_mapnode_furniture.cpp:628
 msgid "Orange Couch"
 msgstr "Oranje Bank"
 
-#: src/content_mapnode_furniture.cpp:628 src/content_mapnode_furniture.cpp:647
-#: src/content_mapnode_furniture.cpp:666 src/content_mapnode_furniture.cpp:685
-#: src/content_mapnode_furniture.cpp:704 src/content_mapnode_furniture.cpp:723
+#: src/content_mapnode_furniture.cpp:652 src/content_mapnode_furniture.cpp:672
+#: src/content_mapnode_furniture.cpp:692 src/content_mapnode_furniture.cpp:712
+#: src/content_mapnode_furniture.cpp:732 src/content_mapnode_furniture.cpp:752
 msgid "Purple Couch"
 msgstr "Paarse Bank"
 
-#: src/content_mapnode_furniture.cpp:746 src/content_mapnode_furniture.cpp:765
-#: src/content_mapnode_furniture.cpp:784 src/content_mapnode_furniture.cpp:803
-#: src/content_mapnode_furniture.cpp:822 src/content_mapnode_furniture.cpp:841
+#: src/content_mapnode_furniture.cpp:776 src/content_mapnode_furniture.cpp:796
+#: src/content_mapnode_furniture.cpp:816 src/content_mapnode_furniture.cpp:836
+#: src/content_mapnode_furniture.cpp:856 src/content_mapnode_furniture.cpp:876
 msgid "Red Couch"
 msgstr "Rode Bank"
 
-#: src/content_mapnode_furniture.cpp:864 src/content_mapnode_furniture.cpp:883
-#: src/content_mapnode_furniture.cpp:902 src/content_mapnode_furniture.cpp:921
-#: src/content_mapnode_furniture.cpp:940 src/content_mapnode_furniture.cpp:959
+#: src/content_mapnode_furniture.cpp:900 src/content_mapnode_furniture.cpp:920
+#: src/content_mapnode_furniture.cpp:940 src/content_mapnode_furniture.cpp:960
+#: src/content_mapnode_furniture.cpp:980
+#: src/content_mapnode_furniture.cpp:1000
 msgid "Yellow Couch"
 msgstr "Gele Bank"
 
-#: src/content_mapnode_furniture.cpp:982
-#: src/content_mapnode_furniture.cpp:1001
-#: src/content_mapnode_furniture.cpp:1020
-#: src/content_mapnode_furniture.cpp:1039
-#: src/content_mapnode_furniture.cpp:1058
-#: src/content_mapnode_furniture.cpp:1077
+#: src/content_mapnode_furniture.cpp:1024
+#: src/content_mapnode_furniture.cpp:1044
+#: src/content_mapnode_furniture.cpp:1064
+#: src/content_mapnode_furniture.cpp:1084
+#: src/content_mapnode_furniture.cpp:1104
+#: src/content_mapnode_furniture.cpp:1124
 msgid "Black Couch"
 msgstr "Zwarte Bank"
 
-#: src/content_mapnode_furniture.cpp:1100
+#: src/content_mapnode_furniture.cpp:1148
+#: src/content_mapnode_furniture.cpp:1182
+#: src/content_mapnode_furniture.cpp:1206
+#: src/content_mapnode_furniture.cpp:1230
+#: src/content_mapnode_furniture.cpp:1254
+#: src/content_mapnode_furniture.cpp:1278
 msgid "Chair"
 msgstr "Stoel"
 
-#: src/content_mapnode_furniture.cpp:1149
+#: src/content_mapnode_furniture.cpp:1302
 msgid "Table"
 msgstr "Tafel"
 
-#: src/content_mapnode_furniture.cpp:1206
-#: src/content_mapnode_furniture.cpp:1239
+#: src/content_mapnode_furniture.cpp:1333
+#: src/content_mapnode_furniture.cpp:1366
 msgid "Bed"
 msgstr "Bed"
 
-#: src/content_mapnode_furniture.cpp:1267
-#: src/content_mapnode_furniture.cpp:1300
+#: src/content_mapnode_furniture.cpp:1394
+#: src/content_mapnode_furniture.cpp:1427
 msgid "Blue Bed"
 msgstr "Blauwe Bed"
 
-#: src/content_mapnode_furniture.cpp:1328
-#: src/content_mapnode_furniture.cpp:1361
+#: src/content_mapnode_furniture.cpp:1455
+#: src/content_mapnode_furniture.cpp:1488
 msgid "Green Bed"
 msgstr "Groene Bed"
 
-#: src/content_mapnode_furniture.cpp:1389
-#: src/content_mapnode_furniture.cpp:1422
+#: src/content_mapnode_furniture.cpp:1516
+#: src/content_mapnode_furniture.cpp:1549
 msgid "Orange Bed"
 msgstr "Oranje Bed"
 
-#: src/content_mapnode_furniture.cpp:1450
-#: src/content_mapnode_furniture.cpp:1483
+#: src/content_mapnode_furniture.cpp:1577
+#: src/content_mapnode_furniture.cpp:1610
 msgid "Purple Bed"
 msgstr "Paarse Bed"
 
-#: src/content_mapnode_furniture.cpp:1511
-#: src/content_mapnode_furniture.cpp:1544
+#: src/content_mapnode_furniture.cpp:1638
+#: src/content_mapnode_furniture.cpp:1671
 msgid "Red Bed"
 msgstr "Rode Bed"
 
-#: src/content_mapnode_furniture.cpp:1572
-#: src/content_mapnode_furniture.cpp:1605
+#: src/content_mapnode_furniture.cpp:1699
+#: src/content_mapnode_furniture.cpp:1732
 msgid "Yellow Bed"
 msgstr "Gele Bed"
 
-#: src/content_mapnode_furniture.cpp:1633
-#: src/content_mapnode_furniture.cpp:1666
+#: src/content_mapnode_furniture.cpp:1760
+#: src/content_mapnode_furniture.cpp:1793
 msgid "Black Bed"
 msgstr "Zwarte Bed"
 
-#: src/content_mapnode_furniture.cpp:1694
-#: src/content_mapnode_furniture.cpp:1729
+#: src/content_mapnode_furniture.cpp:1821
+#: src/content_mapnode_furniture.cpp:1856
 msgid "Camp Bed"
 msgstr "Kamp Bed"
 
-#: src/content_mapnode_furniture.cpp:1753
+#: src/content_mapnode_furniture.cpp:1880
 msgid "Colorful Painting"
 msgstr "Kleurrijke Schilderij"
 
-#: src/content_mapnode_furniture.cpp:1788
+#: src/content_mapnode_furniture.cpp:1915
 msgid "Red Rose Painting"
 msgstr "Rode Roos Schilderij"
 
-#: src/content_mapnode_furniture.cpp:1823
+#: src/content_mapnode_furniture.cpp:1950
 msgid "Field Painting"
 msgstr "Veld Schilderij"
 
-#: src/content_mapnode_furniture.cpp:1858
+#: src/content_mapnode_furniture.cpp:1985
 msgid "Blue Flower Painting"
 msgstr "Blauwe Bloem Schilderij"
 
-#: src/content_mapnode_furniture.cpp:1893
+#: src/content_mapnode_furniture.cpp:2020
 msgid "Painting Canvas"
 msgstr "Schilderdoek"
 
-#: src/content_mapnode_furniture.cpp:1931
+#: src/content_mapnode_furniture.cpp:2058
 msgid "Clock"
 msgstr "Klok"
 
@@ -2632,7 +2651,7 @@ msgid "Decraft Book"
 msgstr "Decraft Boek"
 
 #: src/content_mapnode_special.cpp:753 src/content_mapnode_special.cpp:948
-#: src/content_nodemeta.cpp:2693
+#: src/content_nodemeta.cpp:2694
 msgid "Diary"
 msgstr "Dagboek"
 
@@ -2682,11 +2701,11 @@ msgstr "Bord"
 msgid "Locking Sign"
 msgstr "Vergrendelde Bord"
 
-#: src/content_mapnode_special.cpp:1286 src/content_nodemeta.cpp:500
+#: src/content_mapnode_special.cpp:1286 src/content_nodemeta.cpp:501
 msgid "Chest"
 msgstr "Schatkist"
 
-#: src/content_mapnode_special.cpp:1310 src/content_nodemeta.cpp:775
+#: src/content_mapnode_special.cpp:1310 src/content_nodemeta.cpp:776
 msgid "Creative Chest"
 msgstr "Creatieve Schatkist"
 
@@ -2806,7 +2825,7 @@ msgstr "Perceel"
 msgid "Cauldron"
 msgstr "Ketel"
 
-#: src/content_mapnode_special.cpp:2082 src/content_nodemeta.cpp:3312
+#: src/content_mapnode_special.cpp:2082 src/content_nodemeta.cpp:3313
 msgid "Forge"
 msgstr "Smeden"
 
@@ -2910,563 +2929,571 @@ msgstr "Siamese Kitten"
 msgid "Ginger Kitten"
 msgstr "Gember Kitten"
 
-#: src/content_nodemeta.cpp:75 src/content_nodemeta.cpp:138
-#: src/content_nodemeta.cpp:2677 src/content_nodemeta.cpp:2776
+#: src/content_nodemeta.cpp:76 src/content_nodemeta.cpp:139
+#: src/content_nodemeta.cpp:2678 src/content_nodemeta.cpp:2777
 msgid "Save"
 msgstr "Opslaan"
 
-#: src/content_nodemeta.cpp:185
+#: src/content_nodemeta.cpp:186
 #, c-format
 msgid "%s's Home Flag"
 msgstr "%s's Thuis Vlag"
 
-#: src/content_nodemeta.cpp:269 src/content_nodemeta.cpp:282
-#: src/content_nodemeta.cpp:436 src/content_nodemeta.cpp:449
+#: src/content_nodemeta.cpp:270 src/content_nodemeta.cpp:283
+#: src/content_nodemeta.cpp:437 src/content_nodemeta.cpp:450
 msgid "You can't sleep yet."
 msgstr "Je kunt nog niet slapen."
 
-#: src/content_nodemeta.cpp:273 src/content_nodemeta.cpp:440
+#: src/content_nodemeta.cpp:274 src/content_nodemeta.cpp:441
 msgid "Go to sleep"
 msgstr "Go slapen"
 
-#: src/content_nodemeta.cpp:278 src/content_nodemeta.cpp:445
+#: src/content_nodemeta.cpp:279 src/content_nodemeta.cpp:446
 msgid "Someone else is sleeping here."
 msgstr "Iemand anders is hier aan het slapen."
 
-#: src/content_nodemeta.cpp:286 src/content_nodemeta.cpp:453
+#: src/content_nodemeta.cpp:287 src/content_nodemeta.cpp:454
 msgid "Get out of bed"
 msgstr "Ga uit bed"
 
-#: src/content_nodemeta.cpp:432
+#: src/content_nodemeta.cpp:433
 msgid "This bed is too uncomfortable to sleep in."
 msgstr "Dit bed is to oncomfortabel om in the slapen."
 
-#: src/content_nodemeta.cpp:573
+#: src/content_nodemeta.cpp:574
 #, c-format
 msgid "Locking Chest owned by '%s'"
 msgstr "Vergendelde Schatkist in bezit van '%s'"
 
-#: src/content_nodemeta.cpp:647
+#: src/content_nodemeta.cpp:648
 #, c-format
 msgid "Safe owned by '%s'"
 msgstr "Kluis in bezit van '%s'"
 
-#: src/content_nodemeta.cpp:816 src/content_nodemeta.cpp:1870
-#: src/content_nodemeta.cpp:2157 src/content_nodemeta.cpp:2349
-#: src/content_nodemeta.cpp:2563
+#: src/content_nodemeta.cpp:817 src/content_nodemeta.cpp:1871
+#: src/content_nodemeta.cpp:2158 src/content_nodemeta.cpp:2350
+#: src/content_nodemeta.cpp:2564
 #, c-format
 msgid "Page %d of %d"
 msgstr "Pagina %d van %d"
 
-#: src/content_nodemeta.cpp:820 src/content_nodemeta.cpp:1898
-#: src/content_nodemeta.cpp:2176 src/content_nodemeta.cpp:2358
-#: src/content_nodemeta.cpp:2579
+#: src/content_nodemeta.cpp:821 src/content_nodemeta.cpp:1899
+#: src/content_nodemeta.cpp:2177 src/content_nodemeta.cpp:2359
+#: src/content_nodemeta.cpp:2580
 msgid "<< Previous Page"
 msgstr "<< Vorige Pagina"
 
-#: src/content_nodemeta.cpp:826 src/content_nodemeta.cpp:1904
-#: src/content_nodemeta.cpp:2182 src/content_nodemeta.cpp:2364
-#: src/content_nodemeta.cpp:2585
+#: src/content_nodemeta.cpp:827 src/content_nodemeta.cpp:1905
+#: src/content_nodemeta.cpp:2183 src/content_nodemeta.cpp:2365
+#: src/content_nodemeta.cpp:2586
 msgid "Next Page >>"
 msgstr "Volgende Pagina >>"
 
-#: src/content_nodemeta.cpp:869
+#: src/content_nodemeta.cpp:870
 #, c-format
 msgid "Border Stone owned by '%s'"
 msgstr "Grenssteen in eigendom van '%s'"
 
-#: src/content_nodemeta.cpp:944
+#: src/content_nodemeta.cpp:945
 msgid "Furnace is overloaded"
 msgstr "De Oven is overbeladen"
 
-#: src/content_nodemeta.cpp:945
+#: src/content_nodemeta.cpp:946
 msgid "Furnace is out of fuel"
 msgstr "De oven heeft geen brandstof meer"
 
-#: src/content_nodemeta.cpp:947
+#: src/content_nodemeta.cpp:948
 msgid "Furnace is inactive"
 msgstr "De oven is inactief"
 
-#: src/content_nodemeta.cpp:950
+#: src/content_nodemeta.cpp:951
 msgid "Furnace is active"
 msgstr "De Oven is actief"
 
-#: src/content_nodemeta.cpp:1209
+#: src/content_nodemeta.cpp:1210
 msgid "Locking Furnace is overloaded"
 msgstr "De Vergrendelde Oven is overbeladen"
 
-#: src/content_nodemeta.cpp:1210
+#: src/content_nodemeta.cpp:1211
 msgid "Locking Furnace is out of fuel"
 msgstr "De Vergrendelde Oven heeft geen brandstof meer"
 
-#: src/content_nodemeta.cpp:1212
+#: src/content_nodemeta.cpp:1213
 msgid "Locking Furnace is inactive"
 msgstr "De Vergrendelde Oven is inactief"
 
-#: src/content_nodemeta.cpp:1215
+#: src/content_nodemeta.cpp:1216
 msgid "Locking Furnace is active"
 msgstr "De Vergrendelde Oven is actief"
 
-#: src/content_nodemeta.cpp:1470
+#: src/content_nodemeta.cpp:1471
 msgid "Armed Explosive: about to detonate"
 msgstr "Gewapende Explosief: Gaat bijna ontploffen"
 
-#: src/content_nodemeta.cpp:1473
+#: src/content_nodemeta.cpp:1474
 #, c-format
 msgid "Armed Explosive: %d second till detonation"
 msgid_plural "Armed Explosive: %d seconds till detonation"
 msgstr[0] "Gewapend Explosief: %d seconde te gaan tot ontploffing"
 msgstr[1] "Gewapend Explosief: %d seconden te gaan tot ontploffing"
 
-#: src/content_nodemeta.cpp:1534 src/content_nodemeta.cpp:1539
+#: src/content_nodemeta.cpp:1535 src/content_nodemeta.cpp:1540
 msgid "Incinerator is active"
 msgstr "De verbrandingsoven is actief"
 
-#: src/content_nodemeta.cpp:1541
+#: src/content_nodemeta.cpp:1542
 msgid "Incinerator is inactive"
 msgstr "De verbrandingsoven is inactief"
 
-#: src/content_nodemeta.cpp:1633
+#: src/content_nodemeta.cpp:1634
 msgid "Add fuel, then punch to incinerate wielded item"
-msgstr "Brandstof toevoegen en dan het voorwerp stoten om het te laten verbranden"
+msgstr ""
+"Brandstof toevoegen en dan het voorwerp stoten om het te laten verbranden"
 
-#: src/content_nodemeta.cpp:1874 src/content_nodemeta.cpp:2162
+#: src/content_nodemeta.cpp:1875 src/content_nodemeta.cpp:2163
 msgid "Add item here to see recipe"
 msgstr "Item hier toevoegen om het recept te zien"
 
-#: src/content_nodemeta.cpp:1879 src/content_nodemeta.cpp:2167
+#: src/content_nodemeta.cpp:1880 src/content_nodemeta.cpp:2168
 #, c-format
 msgid "Recipe %d of %d"
 msgstr "Recept %d van %d"
 
-#: src/content_nodemeta.cpp:1888
+#: src/content_nodemeta.cpp:1889
 msgid "Gives"
 msgstr "Geeft"
 
-#: src/content_nodemeta.cpp:2353
+#: src/content_nodemeta.cpp:2354
 msgid "Add item here to see cook result"
 msgstr "Item hier toevoegen om het kook resultaat zien"
 
-#: src/content_nodemeta.cpp:2567
+#: src/content_nodemeta.cpp:2568
 msgid "Add item here to see dig result"
 msgstr "Item hier toevoegen om het graaf resultaat te zien"
 
-#: src/content_nodemeta.cpp:2571
+#: src/content_nodemeta.cpp:2572
 msgid "Dig Result"
 msgstr "Graaf Resultaat"
 
-#: src/content_nodemeta.cpp:2575
+#: src/content_nodemeta.cpp:2576
 msgid "Random Drop"
 msgstr "Willekeurige Drop"
 
-#: src/content_nodemeta.cpp:2667 src/content_nodemeta.cpp:2766
+#: src/content_nodemeta.cpp:2668 src/content_nodemeta.cpp:2767
 msgid "Title"
 msgstr "Titel"
 
-#: src/content_nodemeta.cpp:2672 src/content_nodemeta.cpp:2771
+#: src/content_nodemeta.cpp:2673 src/content_nodemeta.cpp:2772
 msgid "Content"
 msgstr "Inhoud"
 
-#: src/content_nodemeta.cpp:3127
+#: src/content_nodemeta.cpp:3128
 msgid "Cauldron is active"
 msgstr "De Ketel is Actief"
 
-#: src/content_nodemeta.cpp:3130
+#: src/content_nodemeta.cpp:3131
 msgid "Cauldron is hot"
 msgstr "De Ketel is Heet"
 
-#: src/content_nodemeta.cpp:3132
+#: src/content_nodemeta.cpp:3133
 msgid "Cauldron is cool"
 msgstr "De Ketel is Koud"
 
-#: src/content_nodemeta.cpp:3134
+#: src/content_nodemeta.cpp:3135
 msgid "Cauldron is empty"
 msgstr "De Ketel is Leeg"
 
-#: src/content_nodemeta.cpp:3138
+#: src/content_nodemeta.cpp:3139
 msgid "Cauldron is inactive"
 msgstr "De Ketel is Inactief"
 
-#: src/content_nodemeta.cpp:3139
+#: src/content_nodemeta.cpp:3140
 msgid "Cauldron is out of fuel"
 msgstr "De Ketel heeft geen brondstof meer"
 
-#: src/content_nodemeta.cpp:3218
+#: src/content_nodemeta.cpp:3219
 msgid "Add fuel, then punch to add or remove water"
-msgstr "Brandstof toevoegen en dan het voorwerp stoten om water toe te voegen of te verwijderen"
+msgstr ""
+"Brandstof toevoegen en dan het voorwerp stoten om water toe te voegen of te "
+"verwijderen"
 
-#: src/content_nodemeta.cpp:3484
+#: src/content_nodemeta.cpp:3487
 msgid "Show Enchanting"
 msgstr "Laat Enchanting zien"
 
-#: src/content_nodemeta.cpp:3491 src/game.cpp:208
+#: src/content_nodemeta.cpp:3494 src/game.cpp:209
 msgid "Show Crafting"
 msgstr "Laat Crafting zien"
 
-#: src/content_toolitem.cpp:213
+#: src/content_toolitem.cpp:216
 msgid "Small Stone Pick"
 msgstr "Kleine Stenen Houweel"
 
-#: src/content_toolitem.cpp:236
+#: src/content_toolitem.cpp:239
 msgid "Stone Pick"
 msgstr "Stenen Houweel"
 
-#: src/content_toolitem.cpp:250
+#: src/content_toolitem.cpp:253
 msgid "Flint Pick"
 msgstr "Vuurstenen Houweel"
 
-#: src/content_toolitem.cpp:264
+#: src/content_toolitem.cpp:267
 msgid "Steel Pick"
 msgstr "Stalen Houweel"
 
-#: src/content_toolitem.cpp:278
+#: src/content_toolitem.cpp:281
 msgid "Creative Pick"
 msgstr "Creatieve Houweel"
 
-#: src/content_toolitem.cpp:292
+#: src/content_toolitem.cpp:295
 msgid "Stone Trowel"
 msgstr "Stenen Troffel"
 
-#: src/content_toolitem.cpp:306
+#: src/content_toolitem.cpp:309
 msgid "Stone Shovel"
 msgstr "Stenen Schep"
 
-#: src/content_toolitem.cpp:320
+#: src/content_toolitem.cpp:323
 msgid "Flint Shovel"
 msgstr "Vuurstenen Schep"
 
-#: src/content_toolitem.cpp:334
+#: src/content_toolitem.cpp:337
 msgid "Steel Shovel"
 msgstr "Stalen Schep"
 
-#: src/content_toolitem.cpp:348
+#: src/content_toolitem.cpp:351
 msgid "Small Stone Axe"
 msgstr "Kleine Stenen Bijl"
 
-#: src/content_toolitem.cpp:369
+#: src/content_toolitem.cpp:372
 msgid "Stone Axe"
 msgstr "Stalen Bijl"
 
-#: src/content_toolitem.cpp:383
+#: src/content_toolitem.cpp:386
 msgid "Flint Axe"
 msgstr "Vuurstenen Bijl"
 
-#: src/content_toolitem.cpp:397
+#: src/content_toolitem.cpp:400
 msgid "Steel Axe"
 msgstr "Stalen Bijl"
 
-#: src/content_toolitem.cpp:411
+#: src/content_toolitem.cpp:414
 msgid "Wooden Club"
 msgstr "Houten Club"
 
-#: src/content_toolitem.cpp:426
+#: src/content_toolitem.cpp:429
 msgid "Stone Sword"
 msgstr "Stenen Zwaard"
 
-#: src/content_toolitem.cpp:440
+#: src/content_toolitem.cpp:443
 msgid "Steel Sword"
 msgstr "Stalen Zwaard"
 
-#: src/content_toolitem.cpp:454
+#: src/content_toolitem.cpp:457
 msgid "Flint Shears"
 msgstr "Vuurstenen Zwaard"
 
-#: src/content_toolitem.cpp:468
+#: src/content_toolitem.cpp:471
 msgid "Steel Shears"
 msgstr "Stalen Schaar"
 
-#: src/content_toolitem.cpp:482
+#: src/content_toolitem.cpp:485
 msgid "Wooden Bucket"
 msgstr "Houten Emmer"
 
-#: src/content_toolitem.cpp:499
+#: src/content_toolitem.cpp:502
 msgid "Tin Bucket"
 msgstr "Tinnen Emmer"
 
-#: src/content_toolitem.cpp:515
+#: src/content_toolitem.cpp:518
 msgid "Wooden Bucket of Water"
 msgstr "Houten Emmer met Water"
 
-#: src/content_toolitem.cpp:526
+#: src/content_toolitem.cpp:529
 msgid "Tin Bucket of Water"
 msgstr "Tinnen Emmer met Water"
 
-#: src/content_toolitem.cpp:537
+#: src/content_toolitem.cpp:540
 msgid "Steel Bucket"
 msgstr "Stalen Emmer"
 
-#: src/content_toolitem.cpp:552
+#: src/content_toolitem.cpp:555
 msgid "Steel Bucket of Water"
 msgstr "Stalen Emmer met Water"
 
-#: src/content_toolitem.cpp:563
+#: src/content_toolitem.cpp:566
 msgid "Steel Bucket of Lava"
 msgstr "Stalen Emmer met Lava"
 
-#: src/content_toolitem.cpp:575
+#: src/content_toolitem.cpp:578
 msgid "Fire Starter"
 msgstr "Aansteker"
 
-#: src/content_toolitem.cpp:589
+#: src/content_toolitem.cpp:592
 msgid "Crowbar"
 msgstr "Breekijzer"
 
-#: src/content_toolitem.cpp:602
+#: src/content_toolitem.cpp:605
 msgid "Key"
 msgstr "Sleutel"
 
-#: src/content_toolitem.cpp:614
+#: src/content_toolitem.cpp:617
 msgid "Stone Spear"
 msgstr "Stenen Speer"
 
-#: src/content_toolitem.cpp:628
+#: src/content_toolitem.cpp:631
 msgid "Flint Spear"
 msgstr "Vuurstenen Speer"
 
-#: src/content_toolitem.cpp:642
+#: src/content_toolitem.cpp:645
 msgid "Steel Spear"
 msgstr "Stalen Speer"
 
-#: src/content_toolitem.cpp:656
+#: src/content_toolitem.cpp:659
 msgid "Bow"
 msgstr "Boog"
 
-#: src/content_toolitem.cpp:676
+#: src/content_toolitem.cpp:679
 msgid "Raw Mithril Pick"
 msgstr "Ruwe Mithril Houweel"
 
-#: src/content_toolitem.cpp:690
+#: src/content_toolitem.cpp:693
 msgid "Raw Mithril Shovel"
 msgstr "Ruwe Mithril Schep"
 
-#: src/content_toolitem.cpp:704
+#: src/content_toolitem.cpp:707
 msgid "Raw Mithril Axe"
 msgstr "Ruwe Mithril Bijl"
 
-#: src/content_toolitem.cpp:718
+#: src/content_toolitem.cpp:721
 msgid "Raw Mithril Sword"
 msgstr "Ruwe Mithril Zwaard"
 
-#: src/content_toolitem.cpp:732
+#: src/content_toolitem.cpp:735
 msgid "Raw Mithril Spear"
 msgstr "Ruwe Mithril Speer"
 
-#: src/content_toolitem.cpp:746
+#: src/content_toolitem.cpp:749
 msgid "Unbound Mithril Pick"
 msgstr "Ongebonden Mithril Houweel"
 
-#: src/content_toolitem.cpp:760
+#: src/content_toolitem.cpp:763
 msgid "Unbound Mithril Shovel"
 msgstr "Ongebonden Mithril Schep"
 
-#: src/content_toolitem.cpp:774
+#: src/content_toolitem.cpp:777
 msgid "Unbound Mithril Axe"
 msgstr "Ongebonden Mithril Bijl"
 
-#: src/content_toolitem.cpp:788
+#: src/content_toolitem.cpp:791
 msgid "Unbound Mithril Sword"
 msgstr "Ongebonden Mithril Zwaard"
 
-#: src/content_toolitem.cpp:802
+#: src/content_toolitem.cpp:805
 msgid "Unbound Mithril Spear"
 msgstr "Ongebonden Mithril Speer"
 
-#: src/content_toolitem.cpp:816
+#: src/content_toolitem.cpp:819
 msgid "Mithril Pick"
 msgstr "Mithril Houweel"
 
-#: src/content_toolitem.cpp:831
+#: src/content_toolitem.cpp:834
 msgid "Mithril Shovel"
 msgstr "Mithril Schep"
 
-#: src/content_toolitem.cpp:845
+#: src/content_toolitem.cpp:848
 msgid "Mithril Axe"
 msgstr "Mithril Bijl"
 
-#: src/content_toolitem.cpp:859
+#: src/content_toolitem.cpp:862
 msgid "Mithril Sword"
 msgstr "Mithril Zwaard"
 
-#: src/content_toolitem.cpp:873
+#: src/content_toolitem.cpp:876
 msgid "Mithril Spear"
 msgstr "Mithril Speer"
 
-#: src/content_toolitem.cpp:887
+#: src/content_toolitem.cpp:890
 msgid "Mob Spawner"
 msgstr "Mob Spawner"
 
-#: src/game.cpp:209
+#: src/content_toolitem.cpp:909
+#, fuzzy
+msgid "Mithril Key"
+msgstr "Mithril Bijl"
+
+#: src/game.cpp:210
 msgid "Clothes"
 msgstr "Kleren"
 
-#: src/game.cpp:210
+#: src/game.cpp:211
 msgid "Hat/Helmet"
 msgstr "Hoed/Helm"
 
-#: src/game.cpp:212
+#: src/game.cpp:213
 msgid "Jacket"
 msgstr "Jas"
 
-#: src/game.cpp:214
+#: src/game.cpp:215
 msgid "Decorative"
 msgstr "Decoratief"
 
-#: src/game.cpp:216
+#: src/game.cpp:217
 msgid "Shirt"
 msgstr "Shirt"
 
-#: src/game.cpp:218
+#: src/game.cpp:219
 msgid "Belt"
 msgstr "Riem"
 
-#: src/game.cpp:220
+#: src/game.cpp:221
 msgid "Pants"
 msgstr "Broek"
 
-#: src/game.cpp:222
+#: src/game.cpp:223
 msgid "Boots"
 msgstr "Laarzen"
 
-#: src/game.cpp:229
+#: src/game.cpp:230
 msgid "Drop to Ground"
 msgstr "Laten Vallen"
 
-#: src/game.cpp:231
+#: src/game.cpp:232
 msgid "Change Clothing"
 msgstr "Verander kleding"
 
-#: src/game.cpp:590
+#: src/game.cpp:591
 msgid "Loading"
 msgstr "Laden"
 
-#: src/game.cpp:662
+#: src/game.cpp:663
 msgid "Loading..."
 msgstr "Laden..."
 
-#: src/game.cpp:671
+#: src/game.cpp:672
 msgid "Creating server..."
 msgstr "Server Creeëren"
 
-#: src/game.cpp:682
+#: src/game.cpp:683
 msgid "Creating client..."
 msgstr "Client Creeëren"
 
-#: src/game.cpp:687
+#: src/game.cpp:688
 msgid "Resolving address..."
 msgstr "Adres vinden..."
 
-#: src/game.cpp:698
+#: src/game.cpp:699
 msgid "Couldn't resolve address"
 msgstr "Kon het opgegeven adres niet vinden."
 
-#: src/game.cpp:738
+#: src/game.cpp:739
 #, c-format
 msgid "Connecting to server... (timeout in %d second)"
 msgid_plural "Connecting to server... (timeout in %d seconds)"
 msgstr[0] "Verbinding maken met de server... (timeout in %d seconde)"
 msgstr[1] "Verbinding maken met de server... (timeout in %d seconden)"
 
-#: src/game.cpp:767
+#: src/game.cpp:768
 #, c-format
 msgid "Access denied. Reason: %ls"
 msgstr "Toegang geweigerd. Reden: %ls"
 
-#: src/game.cpp:771
+#: src/game.cpp:772
 msgid "Unable to Connect (port already in use?)."
 msgstr "Kan geen verbinding maken (port is al in gebruik?)."
 
-#: src/game.cpp:774
+#: src/game.cpp:775
 msgid "Connection timed out."
 msgstr "Connectie time-out."
 
-#: src/game.cpp:927
+#: src/game.cpp:928
 msgid "Access denied. Reason: "
 msgstr "Toegang geweigerd. Reden:"
 
-#: src/game.cpp:1161
+#: src/game.cpp:1162
 msgid "free_move disabled"
 msgstr "vrij_bewegen uit"
 
-#: src/game.cpp:1165
+#: src/game.cpp:1166
 msgid "free_move enabled"
 msgstr "vrij_bewegen aan"
 
-#: src/game.cpp:1177
+#: src/game.cpp:1178
 #, c-format
 msgid "Saved screenshot to '%s'"
 msgstr "Screenshot opgeslagen naar '%s'"
 
-#: src/game.cpp:1189
+#: src/game.cpp:1190
 msgid "HUD shown"
 msgstr "HUD laten zien"
 
-#: src/game.cpp:1191
+#: src/game.cpp:1192
 msgid "HUD hidden"
 msgstr "HUD verbergen"
 
-#: src/game.cpp:1197
+#: src/game.cpp:1198
 msgid "Chat shown"
 msgstr "Chat zichtbaar"
 
-#: src/game.cpp:1199
+#: src/game.cpp:1200
 msgid "Chat hidden"
 msgstr "Chat onzichtbaar"
 
-#: src/game.cpp:1205
+#: src/game.cpp:1206
 msgid "Fog disabled"
 msgstr "Mist uit"
 
-#: src/game.cpp:1207
+#: src/game.cpp:1208
 msgid "Fog enabled"
 msgstr "Mist aan"
 
-#: src/game.cpp:1213
+#: src/game.cpp:1214
 msgid "Camera update disabled"
 msgstr "Camera update uit"
 
-#: src/game.cpp:1215
+#: src/game.cpp:1216
 msgid "Camera update enabled"
 msgstr "Camera update aan"
 
-#: src/game.cpp:1225
+#: src/game.cpp:1226
 msgid "Debug info shown"
 msgstr "Debug info zichtbaar"
 
-#: src/game.cpp:1230
+#: src/game.cpp:1231
 msgid "Debug info and frametime graph hidden"
 msgstr "Debug info en frametijd grafiek zijn verborgen"
 
-#: src/game.cpp:1234
+#: src/game.cpp:1235
 msgid "Frametime graph shown"
 msgstr "Frametijd grafiek laten zien"
 
-#: src/game.cpp:1246
+#: src/game.cpp:1247
 #, c-format
 msgid "Profiler shown (page %d of %d)"
 msgstr "Profiler laten zien (pagina %d van %d)"
 
-#: src/game.cpp:1250
+#: src/game.cpp:1251
 msgid "Profiler hidden"
 msgstr "Profiel verbergen"
 
-#: src/game.cpp:1258 src/game.cpp:1269
+#: src/game.cpp:1259 src/game.cpp:1270
 #, c-format
 msgid "Minimum viewing range changed to %d"
 msgstr "Minimale Gezichtsveld is veranderd naar %d"
 
-#: src/game.cpp:1338
+#: src/game.cpp:1339
 msgid "Enabled full viewing range"
 msgstr "Volledige Gezichtsveld Aanzetten"
 
-#: src/game.cpp:1342
+#: src/game.cpp:1343
 msgid "Disabled full viewing range"
 msgstr "Volledige Gezichtsveld Uitzetten"
 
-#: src/game.cpp:1995
+#: src/game.cpp:1950
 msgid "Disconnected (Network Timeout)"
 msgstr "Verbinding Verbroken (Netwerk Time-out)"
 
-#: src/game.cpp:2407
+#: src/game.cpp:2382
 msgid "Shutting down..."
 msgstr "Uitschakelen..."
 
@@ -3480,242 +3507,298 @@ msgstr "Respawn"
 
 #: src/guiFormSpecMenu.cpp:436
 msgid "Left click: Move all items, Right click: Move single item"
-msgstr "Linker knop: Alle items verplaatsen, Rechter knop: Enkele item verplaatsen"
+msgstr ""
+"Linker knop: Alle items verplaatsen, Rechter knop: Enkele item verplaatsen"
 
 #: src/guiFormSpecMenu.cpp:458
 msgid "Write It"
 msgstr "Schrijven"
 
-#: src/guiMainMenu.cpp:347
+#: src/guiMainMenu.cpp:319
 msgid "Character Creator"
 msgstr "Personage Maker"
 
-#: src/guiMainMenu.cpp:353 src/guiMainMenu.cpp:478 src/guiMainMenu.cpp:520
-#: src/guiMainMenu.cpp:631
+#: src/guiMainMenu.cpp:325 src/guiMainMenu.cpp:386 src/guiMainMenu.cpp:428
+#: src/guiMainMenu.cpp:539
 msgid "Single Player"
 msgstr "Single Player"
 
-#: src/guiMainMenu.cpp:359 src/guiMainMenu.cpp:410
+#: src/guiMainMenu.cpp:331 src/guiMultiplayerMenu.cpp:161
 msgid "Multi Player"
 msgstr "Multi PLayer"
 
-#: src/guiMainMenu.cpp:365 src/guiPauseMenu.cpp:155
+#: src/guiMainMenu.cpp:337 src/guiPauseMenu.cpp:155
 msgid "Settings"
 msgstr "Opties"
 
-#: src/guiMainMenu.cpp:371
+#: src/guiMainMenu.cpp:343
 msgid "Credits"
 msgstr "Credits"
 
-#: src/guiMainMenu.cpp:377
+#: src/guiMainMenu.cpp:349
 msgid "Quit"
 msgstr "Verlaten"
 
-#: src/guiMainMenu.cpp:418
-msgid "Name/Password"
-msgstr "Naam/Wachtwoord"
-
-#: src/guiMainMenu.cpp:446
-msgid "Address/Port"
-msgstr "Adres?Port"
-
-#: src/guiMainMenu.cpp:472
-msgid "Connect"
-msgstr "Verbinden"
-
-#: src/guiMainMenu.cpp:487 src/guiMainMenu.cpp:529 src/guiMainMenu.cpp:640
+#: src/guiMainMenu.cpp:395 src/guiMainMenu.cpp:437 src/guiMainMenu.cpp:548
 msgid "Creative Mode"
 msgstr "Creatieve Modus"
 
-#: src/guiMainMenu.cpp:488 src/guiMainMenu.cpp:530 src/guiMainMenu.cpp:641
+#: src/guiMainMenu.cpp:396 src/guiMainMenu.cpp:438 src/guiMainMenu.cpp:549
 msgid "Adventure Mode"
 msgstr "Avontuur Modus"
 
-#: src/guiMainMenu.cpp:489 src/guiMainMenu.cpp:531 src/guiMainMenu.cpp:642
+#: src/guiMainMenu.cpp:397 src/guiMainMenu.cpp:439 src/guiMainMenu.cpp:550
 msgid "Survival Mode"
 msgstr "Survival Modus"
 
-#: src/guiMainMenu.cpp:502 src/guiMainMenu.cpp:655
+#: src/guiMainMenu.cpp:410 src/guiMainMenu.cpp:563
 msgid "Advanced Settings"
 msgstr "Geavanceerde Opties"
 
-#: src/guiMainMenu.cpp:508 src/guiMainMenu.cpp:550
+#: src/guiMainMenu.cpp:416 src/guiMainMenu.cpp:458
 msgid "Map Options"
 msgstr "Map Opties"
 
-#: src/guiMainMenu.cpp:514 src/guiMainMenu.cpp:625 src/guiMainMenu.cpp:750
+#: src/guiMainMenu.cpp:422 src/guiMainMenu.cpp:533 src/guiMainMenu.cpp:658
 msgid "Start Game"
 msgstr "Start Spel"
 
-#: src/guiMainMenu.cpp:544
+#: src/guiMainMenu.cpp:452
 msgid "Hide Advanced Settings"
 msgstr "Geavanceerde Instellingen Verbergen"
 
-#: src/guiMainMenu.cpp:555
+#: src/guiMainMenu.cpp:463
 msgid "Creatures"
 msgstr "Wezens"
 
-#: src/guiMainMenu.cpp:562
+#: src/guiMainMenu.cpp:470
 msgid "None"
 msgstr "Geen"
 
-#: src/guiMainMenu.cpp:563
+#: src/guiMainMenu.cpp:471
 msgid "Passive"
 msgstr "Passief"
 
-#: src/guiMainMenu.cpp:564
+#: src/guiMainMenu.cpp:472
 msgid "Passive & Aggressive"
 msgstr "Passief & Aggressief"
 
-#: src/guiMainMenu.cpp:565
+#: src/guiMainMenu.cpp:473
 msgid "Passive, Aggressive, & Destructive"
 msgstr "Passied, Aggressief, & Destructief"
 
-#: src/guiMainMenu.cpp:579
+#: src/guiMainMenu.cpp:487
 msgid "Player Damage"
 msgstr "Speler Schade"
 
-#: src/guiMainMenu.cpp:584
+#: src/guiMainMenu.cpp:492
 msgid "Suffocation/Drowning"
 msgstr "Verstikking/Verdrinking"
 
-#: src/guiMainMenu.cpp:589
+#: src/guiMainMenu.cpp:497
 msgid "Hunger"
 msgstr "Honger"
 
-#: src/guiMainMenu.cpp:594
+#: src/guiMainMenu.cpp:502
 msgid "Tool Wear"
 msgstr "Gereedschap Slijtage"
 
-#: src/guiMainMenu.cpp:599
+#: src/guiMainMenu.cpp:507
 msgid "Dangerous Fire"
 msgstr "Gevaarlijke Brand"
 
-#: src/guiMainMenu.cpp:604
+#: src/guiMainMenu.cpp:512
 msgid "Infinite Inventory"
 msgstr "Oneindige Inventaris"
 
-#: src/guiMainMenu.cpp:609
+#: src/guiMainMenu.cpp:517
 msgid "Initial Inventory"
 msgstr "Aanvankelijke Inventaris"
 
-#: src/guiMainMenu.cpp:614
+#: src/guiMainMenu.cpp:522
 msgid "Droppable Inventory"
 msgstr "Inventaris die je kunt laten droppen"
 
-#: src/guiMainMenu.cpp:619
+#: src/guiMainMenu.cpp:527
 msgid "Death drops Inventory"
 msgstr "Inventaris dropt als je dood gaat"
 
-#: src/guiMainMenu.cpp:661
+#: src/guiMainMenu.cpp:569
 msgid "Hide Map Options"
 msgstr "Map Opties Verbergen"
 
-#: src/guiMainMenu.cpp:666
+#: src/guiMainMenu.cpp:574
 msgid "Create New Map"
 msgstr "Nieuwe Wereld Creeëren"
 
-#: src/guiMainMenu.cpp:672
+#: src/guiMainMenu.cpp:580
 msgid "Warning! Your old map will be deleted!"
 msgstr "Waarschuwing! Je oude wereld wordt verwijderd!"
 
-#: src/guiMainMenu.cpp:678
+#: src/guiMainMenu.cpp:586
 msgid "Map Type"
 msgstr "Map Type"
 
-#: src/guiMainMenu.cpp:685
+#: src/guiMainMenu.cpp:593
 msgid "Flat"
 msgstr "Vlak"
 
-#: src/guiMainMenu.cpp:686
+#: src/guiMainMenu.cpp:594
 msgid "Flatter"
 msgstr "Vlakker"
 
-#: src/guiMainMenu.cpp:687
+#: src/guiMainMenu.cpp:595
 msgid "Smoother"
 msgstr "Gladder"
 
-#: src/guiMainMenu.cpp:688
+#: src/guiMainMenu.cpp:596
 msgid "Default"
 msgstr "Standaard"
 
-#: src/guiMainMenu.cpp:689
+#: src/guiMainMenu.cpp:597
 msgid "Hilly"
 msgstr "Heuvelachtig"
 
-#: src/guiMainMenu.cpp:690
+#: src/guiMainMenu.cpp:598
 msgid "Mountains"
 msgstr "Bergen"
 
-#: src/guiMainMenu.cpp:691
+#: src/guiMainMenu.cpp:599
 msgid "Crazy"
 msgstr "Gek"
 
-#: src/guiMainMenu.cpp:692
+#: src/guiMainMenu.cpp:600
 msgid "Crazy Hills"
 msgstr "Gekke Heuvels"
 
-#: src/guiMainMenu.cpp:714
+#: src/guiMainMenu.cpp:622
 msgid "Use Fixed Seed"
 msgstr "Gebruik Vaste Startwaarde"
 
-#: src/guiMainMenu.cpp:720
+#: src/guiMainMenu.cpp:628
 msgid "Map Seed"
 msgstr "Map Startwaarde"
 
-#: src/guiMainMenu.cpp:737
+#: src/guiMainMenu.cpp:645
 msgid "Clear Map"
 msgstr "Map Wissen"
 
-#: src/guiMainMenu.cpp:742
+#: src/guiMainMenu.cpp:650
 msgid "Warning! This will delete all construction from your map!"
 msgstr "Waarschuwing! Dit zal alle gebouwen van jouw kaart verwijderen!"
 
-#: src/guiMainMenu.cpp:760
+#: src/guiMainMenu.cpp:668
 msgid ""
 "Voxelands\n"
 "http://www.voxelands.com/\n"
 "By Lisa 'darkrose' Milne <lisa@ltmnet.com> and contributors."
-msgstr "Voxelands\nhttp://www.voxelands.com/\nGemaakt door Lisa 'darkrose' Milne <lisa@ltmnet.com> en door bijdragers."
+msgstr ""
+"Voxelands\n"
+"http://www.voxelands.com/\n"
+"Gemaakt door Lisa 'darkrose' Milne <lisa@ltmnet.com> en door bijdragers."
 
-#: src/guiMainMenu.cpp:767
+#: src/guiMainMenu.cpp:675
 msgid "Programmers"
 msgstr "Programmeurs"
 
-#: src/guiMainMenu.cpp:770
+#: src/guiMainMenu.cpp:678
 msgid "Artists and Modellers"
 msgstr "Artiesten en Modellers"
 
-#: src/guiMainMenu.cpp:773
+#: src/guiMainMenu.cpp:681
 msgid "Translators"
 msgstr "Vertalers"
 
-#: src/guiMainMenu.cpp:776
+#: src/guiMainMenu.cpp:684
 msgid "Documentation Writters"
 msgstr "Documentatie Schrijvers"
 
-#: src/guiMainMenu.cpp:779
+#: src/guiMainMenu.cpp:687
 msgid "Testers, Packagers, and Builders"
 msgstr "Testers, Packagers en Builders"
 
-#: src/guiMainMenu.cpp:782
+#: src/guiMainMenu.cpp:690
 msgid "Music and Sound Effects Composers"
 msgstr "Muziek en Geluidseffecten Composers"
 
-#: src/guiMainMenu.cpp:785
+#: src/guiMainMenu.cpp:693
 msgid "Other Contributers, and Special Thanks"
 msgstr "Andere Bijdragers en Speciale Dank aan"
 
-#: src/guiMainMenu.cpp:789
+#: src/guiMainMenu.cpp:697
 msgid ""
 "Based on Minetest-C55 by Perttu Ahola <celeron55@gmail.com>\n"
-"and contributors: PilzAdam, Taoki, tango_, kahrl (kaaaaaahrl?), darkrose, matttpt, erlehmann, SpeedProg, JacobF, teddydestodes, marktraceur, Jonathan Neuschafer, thexyz, VanessaE, sfan5... and tens of more random people."
-msgstr "Gebaseerd op Minetest-C55 door Perttu Ahola <celeron55@gmail.com>\n en de volgende bijdragers: PilzAdam, Taoki, tango_, kahrl (kaaaaaahrl?), darkrose, matttpt, erlehmann, SpeedProg, JacobF, teddydestodes, marktraceur, Jonathan Neuschafer, thexyz, VanessaE, sfan5... en nog tientalle andere personen."
+"and contributors: PilzAdam, Taoki, tango_, kahrl (kaaaaaahrl?), darkrose, "
+"matttpt, erlehmann, SpeedProg, JacobF, teddydestodes, marktraceur, Jonathan "
+"Neuschafer, thexyz, VanessaE, sfan5... and tens of more random people."
+msgstr ""
+"Gebaseerd op Minetest-C55 door Perttu Ahola <celeron55@gmail.com>\n"
+" en de volgende bijdragers: PilzAdam, Taoki, tango_, kahrl (kaaaaaahrl?), "
+"darkrose, matttpt, erlehmann, SpeedProg, JacobF, teddydestodes, marktraceur, "
+"Jonathan Neuschafer, thexyz, VanessaE, sfan5... en nog tientalle andere "
+"personen."
 
 #: src/guiMessageMenu.cpp:112 src/guiPauseMenu.cpp:143
 msgid "Continue"
 msgstr "Doorgaan"
 
+#: src/guiMultiplayerMenu.cpp:135 src/guiSettingsMenu.cpp:277
+msgid "Main Menu"
+msgstr "Hoofd Menu"
+
+#: src/guiMultiplayerMenu.cpp:142
+msgid "All Servers"
+msgstr ""
+
+#: src/guiMultiplayerMenu.cpp:148
+msgid "Favourite Servers"
+msgstr ""
+
+#: src/guiMultiplayerMenu.cpp:154
+#, fuzzy
+msgid "Custom Connect"
+msgstr "Verbinden"
+
+#: src/guiMultiplayerMenu.cpp:169
+msgid "Custom Connection"
+msgstr ""
+
+#: src/guiMultiplayerMenu.cpp:176
+msgid "Address/Port"
+msgstr "Adres?Port"
+
+#: src/guiMultiplayerMenu.cpp:201 src/guiMultiplayerMenu.cpp:313
+msgid "Add to Favourites"
+msgstr ""
+
+#: src/guiMultiplayerMenu.cpp:206 src/guiMultiplayerMenu.cpp:320
+msgid "Connect"
+msgstr "Verbinden"
+
+#: src/guiMultiplayerMenu.cpp:213
+msgid "Name/Password"
+msgstr "Naam/Wachtwoord"
+
+#: src/guiMultiplayerMenu.cpp:240
+msgid "Join Server"
+msgstr ""
+
+#: src/guiMultiplayerMenu.cpp:262
+msgid "My Favourites"
+msgstr ""
+
+#: src/guiMultiplayerMenu.cpp:265
+msgid "Server List"
+msgstr ""
+
+#: src/guiMultiplayerMenu.cpp:270
+msgid "Get New List"
+msgstr ""
+
+#: src/guiMultiplayerMenu.cpp:307
+msgid "Remove from Favourites"
+msgstr ""
+
 #: src/guiPasswordChange.cpp:105
 msgid "Old Password"
 msgstr "Oud Wachtwoord"
@@ -3756,11 +3839,11 @@ msgstr "Voorwaarts"
 msgid "Backward"
 msgstr "Achteruit"
 
-#: src/guiSettingsMenu.cpp:72 src/keycode.cpp:234
+#: src/guiSettingsMenu.cpp:72 src/keycode.cpp:263
 msgid "Left"
 msgstr "Links"
 
-#: src/guiSettingsMenu.cpp:73 src/keycode.cpp:234
+#: src/guiSettingsMenu.cpp:73 src/keycode.cpp:265
 msgid "Right"
 msgstr "Rechts"
 
@@ -3796,11 +3879,11 @@ msgstr "Bereik Selecteren"
 msgid "Toggle Fly"
 msgstr "Zet Vliegen aan/uit"
 
-#: src/guiSettingsMenu.cpp:82 src/keycode.cpp:234
+#: src/guiSettingsMenu.cpp:82 src/keycode.cpp:264
 msgid "Up"
 msgstr "Omhoog"
 
-#: src/guiSettingsMenu.cpp:83 src/keycode.cpp:234
+#: src/guiSettingsMenu.cpp:83 src/keycode.cpp:266
 msgid "Down"
 msgstr "Omlaag"
 
@@ -3844,10 +3927,6 @@ msgstr "Vorige Item"
 msgid "Next Item"
 msgstr "Volgende Item"
 
-#: src/guiSettingsMenu.cpp:277
-msgid "Main Menu"
-msgstr "Hoofd Menu"
-
 #: src/guiSettingsMenu.cpp:284 src/guiSettingsMenu.cpp:311
 msgid "Controls"
 msgstr "Controls"
@@ -3955,362 +4034,576 @@ msgstr "Energie Boost: %d:%02d"
 msgid "Cold Protection: %d:%02d"
 msgstr "Vries Bescherming: %d:%02d"
 
-#: src/inventory.cpp:230 src/inventory.cpp:352
-msgid "Cookable: Yes"
-msgstr "Kun je koken: Ja"
-
-#: src/inventory.cpp:235 src/inventory.cpp:357 src/inventory.cpp:532
-msgid "Fuel Burn Time: "
-msgstr "Brandstofverbruik tijd:"
-
-#: src/inventory.cpp:321
-msgid "Hunger: "
-msgstr "Honger:"
-
-#: src/inventory.cpp:327
-msgid "Health: "
-msgstr "Gezondheid:"
-
-#: src/inventory.cpp:334
-msgid "Cold Protection: "
-msgstr "Vries Bescherming:"
-
-#: src/inventory.cpp:343
-msgid "Energy Boost: "
-msgstr "Energie Boost:"
-
-#: src/inventory.cpp:521
-msgid "Strength: "
-msgstr "Kracht:"
-
-#: src/inventory.cpp:524
-msgid "Speed: "
-msgstr "Snelheid:"
-
-#: src/inventory.cpp:527
-msgid "Level: "
-msgstr "Level:"
-
-#: src/inventory.cpp:557
+#: src/inventory.cpp:246 src/inventory.cpp:580
 msgid "Contains: "
 msgstr "Bevat:"
 
-#: src/inventory.cpp:643
+#: src/inventory.cpp:253 src/inventory.cpp:375
+msgid "Cookable: Yes"
+msgstr "Kun je koken: Ja"
+
+#: src/inventory.cpp:258 src/inventory.cpp:380 src/inventory.cpp:555
+msgid "Fuel Burn Time: "
+msgstr "Brandstofverbruik tijd:"
+
+#: src/inventory.cpp:344
+msgid "Hunger: "
+msgstr "Honger:"
+
+#: src/inventory.cpp:350
+msgid "Health: "
+msgstr "Gezondheid:"
+
+#: src/inventory.cpp:357
+msgid "Cold Protection: "
+msgstr "Vries Bescherming:"
+
+#: src/inventory.cpp:366
+msgid "Energy Boost: "
+msgstr "Energie Boost:"
+
+#: src/inventory.cpp:544
+msgid "Strength: "
+msgstr "Kracht:"
+
+#: src/inventory.cpp:547
+msgid "Speed: "
+msgstr "Snelheid:"
+
+#: src/inventory.cpp:550
+msgid "Level: "
+msgstr "Level:"
+
+#: src/inventory.cpp:666
 msgid "Armour: "
 msgstr "Harnas:"
 
-#: src/inventory.cpp:649
+#: src/inventory.cpp:672
 msgid "Warmth: "
 msgstr "Warmte:"
 
-#: src/inventory.cpp:655
+#: src/inventory.cpp:678
 msgid "Pressure: "
 msgstr "Druk:"
 
-#: src/inventory.cpp:661
+#: src/inventory.cpp:684
 msgid "Suffocation: "
 msgstr "Verstikking:"
 
-#: src/inventory.cpp:667
+#: src/inventory.cpp:690
 msgid "Durability: "
 msgstr "Duurzaamheid:"
 
-#: src/inventory.cpp:672
+#: src/inventory.cpp:695
 msgid "Effect Boost: "
 msgstr "Effect Boost:"
 
-#: src/keycode.cpp:229
+#: src/keycode.cpp:232
+msgid "-"
+msgstr ""
+
+#: src/keycode.cpp:234
 msgid "Left Button"
 msgstr "Linker Toets"
 
-#: src/keycode.cpp:229
-msgid "Middle Button"
-msgstr "Middelste Knop"
-
-#: src/keycode.cpp:229
+#: src/keycode.cpp:235
 msgid "Right Button"
 msgstr "Rechter Toets"
 
-#: src/keycode.cpp:229
+#: src/keycode.cpp:237
+msgid "Middle Button"
+msgstr "Middelste Knop"
+
+#: src/keycode.cpp:238
 msgid "X Button 1"
 msgstr "X Knop 1"
 
-#: src/keycode.cpp:230
-msgid "Back"
-msgstr "Terug"
-
-#: src/keycode.cpp:230
-msgid "Clear"
-msgstr "Wis"
-
-#: src/keycode.cpp:230
-msgid "Return"
-msgstr "Terugkeer"
-
-#: src/keycode.cpp:230
-msgid "Tab"
-msgstr "Tab"
-
-#: src/keycode.cpp:230
+#: src/keycode.cpp:239
 msgid "X Button 2"
 msgstr "X Knop 2"
 
-#: src/keycode.cpp:231
-msgid "Capital"
-msgstr "Capital"
+#: src/keycode.cpp:240
+msgid "Back"
+msgstr "Terug"
 
-#: src/keycode.cpp:231
-msgid "Control"
-msgstr "Control"
+#: src/keycode.cpp:241
+msgid "Tab"
+msgstr "Tab"
 
-#: src/keycode.cpp:231
-msgid "Kana"
-msgstr "Kana"
+#: src/keycode.cpp:242
+msgid "Clear"
+msgstr "Wis"
 
-#: src/keycode.cpp:231
-msgid "Menu"
-msgstr "Menu"
+#: src/keycode.cpp:243
+msgid "Return"
+msgstr "Terugkeer"
 
-#: src/keycode.cpp:231
-msgid "Pause"
-msgstr "Pauze"
-
-#: src/keycode.cpp:231
+#: src/keycode.cpp:244
 msgid "Shift"
 msgstr "Shift"
 
-#: src/keycode.cpp:232
-msgid "Convert"
-msgstr "Convert"
+#: src/keycode.cpp:245
+msgid "Control"
+msgstr "Control"
 
-#: src/keycode.cpp:232
-msgid "Escape"
-msgstr "Escape"
+#: src/keycode.cpp:246
+msgid "Menu"
+msgstr "Menu"
 
-#: src/keycode.cpp:232
-msgid "Final"
-msgstr "Finale"
+#: src/keycode.cpp:247
+msgid "Pause"
+msgstr "Pauze"
 
-#: src/keycode.cpp:232
+#: src/keycode.cpp:248
+msgid "Capital"
+msgstr "Capital"
+
+#: src/keycode.cpp:249
+msgid "Kana"
+msgstr "Kana"
+
+#: src/keycode.cpp:250
 msgid "Junja"
 msgstr "Junja"
 
-#: src/keycode.cpp:232
+#: src/keycode.cpp:251
+msgid "Final"
+msgstr "Finale"
+
+#: src/keycode.cpp:252
 msgid "Kanji"
 msgstr "Kanji"
 
-#: src/keycode.cpp:232
+#: src/keycode.cpp:253
+msgid "Escape"
+msgstr "Escape"
+
+#: src/keycode.cpp:254
+msgid "Convert"
+msgstr "Convert"
+
+#: src/keycode.cpp:255
 msgid "Nonconvert"
 msgstr "Nonconvert"
 
-#: src/keycode.cpp:233
+#: src/keycode.cpp:256
 msgid "Accept"
 msgstr "Accepteren"
 
-#: src/keycode.cpp:233
-msgid "End"
-msgstr "End"
-
-#: src/keycode.cpp:233
-msgid "Home"
-msgstr "Home"
-
-#: src/keycode.cpp:233
+#: src/keycode.cpp:257
 msgid "Mode Change"
 msgstr "Modus Veranderen"
 
-#: src/keycode.cpp:233
-msgid "Next"
-msgstr "Volgende"
-
-#: src/keycode.cpp:233
-msgid "Prior"
-msgstr "Vorige"
-
-#: src/keycode.cpp:233
+#: src/keycode.cpp:258
 msgid "Space"
 msgstr "Spatie"
 
-#: src/keycode.cpp:234
-msgid "Execute"
-msgstr "Uitvoeren"
+#: src/keycode.cpp:259
+msgid "Prior"
+msgstr "Vorige"
 
-#: src/keycode.cpp:234
-msgid "Print"
-msgstr "Print"
+#: src/keycode.cpp:260
+msgid "Next"
+msgstr "Volgende"
 
-#: src/keycode.cpp:234
+#: src/keycode.cpp:261
+msgid "End"
+msgstr "End"
+
+#: src/keycode.cpp:262
+msgid "Home"
+msgstr "Home"
+
+#: src/keycode.cpp:267
 msgid "Select"
 msgstr "Selecteren"
 
-#: src/keycode.cpp:235
-msgid "Delete"
-msgstr "Delete"
+#: src/keycode.cpp:268
+msgid "Print"
+msgstr "Print"
 
-#: src/keycode.cpp:235
-msgid "Help"
-msgstr "Help"
+#: src/keycode.cpp:269
+msgid "Execute"
+msgstr "Uitvoeren"
 
-#: src/keycode.cpp:235
-msgid "Insert"
-msgstr "Insert"
-
-#: src/keycode.cpp:235
+#: src/keycode.cpp:270
 msgid "Snapshot"
 msgstr "Momentopname"
 
-#: src/keycode.cpp:238
+#: src/keycode.cpp:271
+msgid "Insert"
+msgstr "Insert"
+
+#: src/keycode.cpp:272
+msgid "Delete"
+msgstr "Delete"
+
+#: src/keycode.cpp:273
+msgid "Help"
+msgstr "Help"
+
+#: src/keycode.cpp:274
+msgid "0"
+msgstr ""
+
+#: src/keycode.cpp:275
+msgid "1"
+msgstr ""
+
+#: src/keycode.cpp:276
+msgid "2"
+msgstr ""
+
+#: src/keycode.cpp:277
+msgid "3"
+msgstr ""
+
+#: src/keycode.cpp:278
+msgid "4"
+msgstr ""
+
+#: src/keycode.cpp:279
+msgid "5"
+msgstr ""
+
+#: src/keycode.cpp:280
+msgid "6"
+msgstr ""
+
+#: src/keycode.cpp:281
+msgid "7"
+msgstr ""
+
+#: src/keycode.cpp:282
+msgid "8"
+msgstr ""
+
+#: src/keycode.cpp:283
+msgid "9"
+msgstr ""
+
+#: src/keycode.cpp:284
+msgid "A"
+msgstr ""
+
+#: src/keycode.cpp:285
+msgid "B"
+msgstr ""
+
+#: src/keycode.cpp:286
+msgid "C"
+msgstr ""
+
+#: src/keycode.cpp:287
+msgid "D"
+msgstr ""
+
+#: src/keycode.cpp:288
+msgid "E"
+msgstr ""
+
+#: src/keycode.cpp:289
+msgid "F"
+msgstr ""
+
+#: src/keycode.cpp:290
+msgid "G"
+msgstr ""
+
+#: src/keycode.cpp:291
+msgid "H"
+msgstr ""
+
+#: src/keycode.cpp:292
+msgid "I"
+msgstr ""
+
+#: src/keycode.cpp:293
+msgid "J"
+msgstr ""
+
+#: src/keycode.cpp:294
+msgid "K"
+msgstr ""
+
+#: src/keycode.cpp:295
+msgid "L"
+msgstr ""
+
+#: src/keycode.cpp:296
+msgid "M"
+msgstr ""
+
+#: src/keycode.cpp:297
+msgid "N"
+msgstr ""
+
+#: src/keycode.cpp:298
+msgid "O"
+msgstr ""
+
+#: src/keycode.cpp:299
+msgid "P"
+msgstr ""
+
+#: src/keycode.cpp:300
+msgid "Q"
+msgstr ""
+
+#: src/keycode.cpp:301
+msgid "R"
+msgstr ""
+
+#: src/keycode.cpp:302
+msgid "S"
+msgstr ""
+
+#: src/keycode.cpp:303
+msgid "T"
+msgstr ""
+
+#: src/keycode.cpp:304
+#, fuzzy
+msgid "U"
+msgstr "Omhoog"
+
+#: src/keycode.cpp:305
+msgid "V"
+msgstr ""
+
+#: src/keycode.cpp:306
+msgid "W"
+msgstr ""
+
+#: src/keycode.cpp:307
+msgid "X"
+msgstr ""
+
+#: src/keycode.cpp:308
+msgid "Y"
+msgstr ""
+
+#: src/keycode.cpp:309
+msgid "Z"
+msgstr ""
+
+#: src/keycode.cpp:310
 msgid "Left Windows"
 msgstr "Linker Venster"
 
-#: src/keycode.cpp:239
-msgid "Apps"
-msgstr "Apps"
-
-#: src/keycode.cpp:239
-msgid "Numpad 0"
-msgstr "Numpad 0"
-
-#: src/keycode.cpp:239
-msgid "Numpad 1"
-msgstr "Numpad 1"
-
-#: src/keycode.cpp:239
+#: src/keycode.cpp:311
 msgid "Right Windows"
 msgstr "Rechter Venster"
 
-#: src/keycode.cpp:239
+#: src/keycode.cpp:312
+msgid "Apps"
+msgstr "Apps"
+
+#: src/keycode.cpp:313
 msgid "Sleep"
 msgstr "Slaap"
 
-#: src/keycode.cpp:240
+#: src/keycode.cpp:314
+msgid "Numpad 0"
+msgstr "Numpad 0"
+
+#: src/keycode.cpp:315
+msgid "Numpad 1"
+msgstr "Numpad 1"
+
+#: src/keycode.cpp:316
 msgid "Numpad 2"
 msgstr "Numpad 2"
 
-#: src/keycode.cpp:240
+#: src/keycode.cpp:317
 msgid "Numpad 3"
 msgstr "Numpad 3"
 
-#: src/keycode.cpp:240
+#: src/keycode.cpp:318
 msgid "Numpad 4"
 msgstr "Numpad 4"
 
-#: src/keycode.cpp:240
+#: src/keycode.cpp:319
 msgid "Numpad 5"
 msgstr "Numpad 5"
 
-#: src/keycode.cpp:240
+#: src/keycode.cpp:320
 msgid "Numpad 6"
 msgstr "Numpad 6"
 
-#: src/keycode.cpp:240
+#: src/keycode.cpp:321
 msgid "Numpad 7"
 msgstr "Numpad 7"
 
-#: src/keycode.cpp:241
-msgid "Numpad *"
-msgstr "Numpad *"
-
-#: src/keycode.cpp:241
-msgid "Numpad +"
-msgstr "Numpad +"
-
-#: src/keycode.cpp:241
-msgid "Numpad -"
-msgstr "Numpad -"
-
-#: src/keycode.cpp:241
-msgid "Numpad /"
-msgstr "Numpad /"
-
-#: src/keycode.cpp:241
+#: src/keycode.cpp:322
 msgid "Numpad 8"
 msgstr "Numpad 8"
 
-#: src/keycode.cpp:241
+#: src/keycode.cpp:323
 msgid "Numpad 9"
 msgstr "Numpad 9"
 
-#: src/keycode.cpp:245
+#: src/keycode.cpp:324
+msgid "Numpad *"
+msgstr "Numpad *"
+
+#: src/keycode.cpp:325
+msgid "Numpad +"
+msgstr "Numpad +"
+
+#: src/keycode.cpp:326 src/keycode.cpp:329
+msgid "Numpad /"
+msgstr "Numpad /"
+
+#: src/keycode.cpp:327
+msgid "Numpad -"
+msgstr "Numpad -"
+
+#: src/keycode.cpp:328
+#, fuzzy
+msgid "Numpad ."
+msgstr "Numpad 0"
+
+#: src/keycode.cpp:330
+msgid "F10"
+msgstr ""
+
+#: src/keycode.cpp:331
+msgid "F11"
+msgstr ""
+
+#: src/keycode.cpp:332
+msgid "F12"
+msgstr ""
+
+#: src/keycode.cpp:333
+msgid "F13"
+msgstr ""
+
+#: src/keycode.cpp:334
+msgid "F14"
+msgstr ""
+
+#: src/keycode.cpp:335
+msgid "F15"
+msgstr ""
+
+#: src/keycode.cpp:336
+msgid "F16"
+msgstr ""
+
+#: src/keycode.cpp:337
+msgid "F17"
+msgstr ""
+
+#: src/keycode.cpp:338
+msgid "F18"
+msgstr ""
+
+#: src/keycode.cpp:339
+msgid "F19"
+msgstr ""
+
+#: src/keycode.cpp:340
+msgid "F20"
+msgstr ""
+
+#: src/keycode.cpp:341
+msgid "F21"
+msgstr ""
+
+#: src/keycode.cpp:342
+msgid "F22"
+msgstr ""
+
+#: src/keycode.cpp:343
+msgid "F23"
+msgstr ""
+
+#: src/keycode.cpp:344
+msgid "F24"
+msgstr ""
+
+#: src/keycode.cpp:345
 msgid "Num Lock"
 msgstr "Num Lock"
 
-#: src/keycode.cpp:245
+#: src/keycode.cpp:346
 msgid "Scroll Lock"
 msgstr "Scroll Lock"
 
-#: src/keycode.cpp:246
+#: src/keycode.cpp:347
 msgid "Left Shift"
 msgstr "Linker Shift"
 
-#: src/keycode.cpp:246
+#: src/keycode.cpp:348
 msgid "Right Shift"
 msgstr "Rechter Shift"
 
-#: src/keycode.cpp:247
+#: src/keycode.cpp:349
 msgid "Left Control"
 msgstr "Linker Control"
 
-#: src/keycode.cpp:247
-msgid "Left Menu"
-msgstr "Linker Menu"
-
-#: src/keycode.cpp:247
+#: src/keycode.cpp:350
 msgid "Right Control"
 msgstr "Rechter Control"
 
-#: src/keycode.cpp:247
+#: src/keycode.cpp:351
+msgid "Left Menu"
+msgstr "Linker Menu"
+
+#: src/keycode.cpp:352
 msgid "Right Menu"
 msgstr "Rechter Menu"
 
-#: src/keycode.cpp:249
-msgid "Comma"
-msgstr "Komma"
-
-#: src/keycode.cpp:249
-msgid "Minus"
-msgstr "Minus"
-
-#: src/keycode.cpp:249
-msgid "Period"
-msgstr "Punt"
-
-#: src/keycode.cpp:249
+#: src/keycode.cpp:353
 msgid "Plus"
 msgstr "Plus"
 
-#: src/keycode.cpp:253
+#: src/keycode.cpp:354
+msgid "Comma"
+msgstr "Komma"
+
+#: src/keycode.cpp:355
+msgid "Minus"
+msgstr "Minus"
+
+#: src/keycode.cpp:356
+msgid "Period"
+msgstr "Punt"
+
+#: src/keycode.cpp:357
 msgid "Attn"
 msgstr "Attn"
 
-#: src/keycode.cpp:253
+#: src/keycode.cpp:358
 msgid "CrSel"
 msgstr "CrSel"
 
-#: src/keycode.cpp:254
-msgid "Erase OEF"
-msgstr "Clear OEF"
-
-#: src/keycode.cpp:254
+#: src/keycode.cpp:359
 msgid "ExSel"
 msgstr "ExSel"
 
-#: src/keycode.cpp:254
-msgid "OEM Clear"
-msgstr "OEM Clear"
+#: src/keycode.cpp:360
+msgid "Erase OEF"
+msgstr "Clear OEF"
 
-#: src/keycode.cpp:254
-msgid "PA1"
-msgstr "PA1"
-
-#: src/keycode.cpp:254
+#: src/keycode.cpp:361
 msgid "Play"
 msgstr "Speel"
 
-#: src/keycode.cpp:254
+#: src/keycode.cpp:362
 msgid "Zoom"
 msgstr "Zoom"
 
+#: src/keycode.cpp:363
+msgid "PA1"
+msgstr "PA1"
+
+#: src/keycode.cpp:364
+msgid "OEM Clear"
+msgstr "OEM Clear"
+
 #: src/main.cpp:1131
 msgid "Setting Up UI"
 msgstr "UI Opstellen"
@@ -4327,30 +4620,70 @@ msgstr "Bezig met het laden van Wezens"
 msgid "Setting Up Sound"
 msgstr "Geluid Opstellen"
 
-#: src/mapnode.cpp:282
+#: src/mapnode.cpp:285
 msgid "Loading Base MapNodes"
 msgstr "Basis MapNodes Laden"
 
-#: src/mapnode.cpp:286
+#: src/mapnode.cpp:289
 msgid "Loading Circuit MapNodes"
 msgstr "Circuit MapNodes Laten"
 
-#: src/mapnode.cpp:290
+#: src/mapnode.cpp:293
 msgid "Loading Plant MapNodes"
 msgstr "Plant MapNodes Laden"
 
-#: src/mapnode.cpp:294
+#: src/mapnode.cpp:297
 msgid "Loading Farming MapNodes"
 msgstr "Landbouw MapNodes Laden"
 
-#: src/mapnode.cpp:298
+#: src/mapnode.cpp:301
 msgid "Loading Decorative MapNodes"
 msgstr "Decoratieve MapNodes Laden"
 
-#: src/mapnode.cpp:302
+#: src/mapnode.cpp:305
 msgid "Loading Interactive MapNodes"
 msgstr "Interactieve MapNodes Laden"
 
-#: src/mapnode.cpp:306
+#: src/mapnode.cpp:309
 msgid "Loading Special MapNodes"
 msgstr "Speciale MapNodes Laden"
+
+#: src/mineral.cpp:93
+#, fuzzy
+msgid "Coal"
+msgstr "Steenkool Klomp"
+
+#: src/mineral.cpp:99
+#, fuzzy
+msgid "Iron"
+msgstr "Ijzer Klomp"
+
+#: src/mineral.cpp:106
+#, fuzzy
+msgid "Tin"
+msgstr "Dunner"
+
+#: src/mineral.cpp:113
+#, fuzzy
+msgid "Copper"
+msgstr "Koper Klomp"
+
+#: src/mineral.cpp:121
+#, fuzzy
+msgid "Silver"
+msgstr "Zilver Klomp"
+
+#: src/mineral.cpp:128
+#, fuzzy
+msgid "Gold"
+msgstr "Goud Klomp"
+
+#: src/mineral.cpp:135
+#, fuzzy
+msgid "Quartz"
+msgstr "Kwarts Stof"
+
+#: src/mineral.cpp:157
+#, fuzzy
+msgid "Turquoise"
+msgstr "Turkoois"
diff --git a/po/pl/voxelands.po b/po/pl/voxelands.po
index 1466550..d2d3436 100644
--- a/po/pl/voxelands.po
+++ b/po/pl/voxelands.po
@@ -1,22 +1,24 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Lisa 'darkrose' Milne
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # Robert Wolniak <robert.wolniak@gmail.com>, 2014-2015
 msgid ""
 msgstr ""
 "Project-Id-Version: Voxelands\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-10-19 01:55+1000\n"
+"POT-Creation-Date: 2015-12-21 11:27+1000\n"
 "PO-Revision-Date: 2015-10-18 15:56+0000\n"
 "Last-Translator: Lisa 'darkrose' Milne <lisa@ltmnet.com>\n"
-"Language-Team: Polish (http://www.transifex.com/voxelands/voxelands/language/pl/)\n"
+"Language-Team: Polish (http://www.transifex.com/voxelands/voxelands/language/"
+"pl/)\n"
+"Language: pl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: pl\n"
-"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2);\n"
 
 #: src/character_creator.cpp:55
 msgid "White Skin"
@@ -228,9 +230,17 @@ msgstr "Buty Z Materiału"
 
 #: src/character_creator.cpp:202
 msgid ""
-"Here you can create your default character, this is how other players will see you in-game. When you join a new server you will start with the clothing you select here. Additional clothing, both protective and decorative, can be crafted in-game.\n"
+"Here you can create your default character, this is how other players will "
+"see you in-game. When you join a new server you will start with the clothing "
+"you select here. Additional clothing, both protective and decorative, can be "
+"crafted in-game.\n"
 "You can return here from the main menu anytime to change your character."
-msgstr "W tym okienku możesz stworzyć swoją domyślną postać tak, jak będzie widziana przez innych graczy. Po dołączeniu do dowolnego serwera, twoja postać będzie ubrana tak samo jak tutaj. Pozostałe ubrania, tak obronne jak i ozdobne, można stworzyć podczas gry.\nMożesz tu wrócić w dowolnym momencie z poziomu Menu Głównego."
+msgstr ""
+"W tym okienku możesz stworzyć swoją domyślną postać tak, jak będzie widziana "
+"przez innych graczy. Po dołączeniu do dowolnego serwera, twoja postać będzie "
+"ubrana tak samo jak tutaj. Pozostałe ubrania, tak obronne jak i ozdobne, "
+"można stworzyć podczas gry.\n"
+"Możesz tu wrócić w dowolnym momencie z poziomu Menu Głównego."
 
 #: src/character_creator.cpp:223
 msgid "Create Your Character"
@@ -264,7 +274,7 @@ msgstr "Szczuplejszy/a"
 msgid "Done"
 msgstr "Gotowe"
 
-#: src/character_creator.cpp:423 src/keycode.cpp:229
+#: src/character_creator.cpp:423 src/keycode.cpp:236
 msgid "Cancel"
 msgstr "Anuluj"
 
@@ -1116,7 +1126,7 @@ msgstr "Krzemień"
 msgid "Steel Ingot"
 msgstr "Sztabka Stali"
 
-#: src/content_craftitem.cpp:225 src/content_mapnode.cpp:710
+#: src/content_craftitem.cpp:225 src/content_mapnode.cpp:723
 msgid "Brick"
 msgstr "Cegła"
 
@@ -1544,11 +1554,11 @@ msgstr ""
 msgid "Unbound Mithril"
 msgstr ""
 
-#: src/content_craftitem.cpp:1516
+#: src/content_craftitem.cpp:1516 src/mineral.cpp:142
 msgid "Mithril"
 msgstr ""
 
-#: src/content_craftitem.cpp:1525
+#: src/content_craftitem.cpp:1525 src/mineral.cpp:149
 msgid "Ruby"
 msgstr ""
 
@@ -1556,15 +1566,15 @@ msgstr ""
 msgid "Turquiose"
 msgstr ""
 
-#: src/content_craftitem.cpp:1541
+#: src/content_craftitem.cpp:1541 src/mineral.cpp:165
 msgid "Amethyst"
 msgstr ""
 
-#: src/content_craftitem.cpp:1549
+#: src/content_craftitem.cpp:1549 src/mineral.cpp:173
 msgid "Sapphire"
 msgstr ""
 
-#: src/content_craftitem.cpp:1557
+#: src/content_craftitem.cpp:1557 src/mineral.cpp:181
 msgid "Sunstone"
 msgstr ""
 
@@ -1576,392 +1586,396 @@ msgstr "Kamień"
 msgid "Limestone"
 msgstr ""
 
-#: src/content_mapnode.cpp:219
+#: src/content_mapnode.cpp:221
+msgid "Marble"
+msgstr ""
+
+#: src/content_mapnode.cpp:232
 msgid "Rock"
 msgstr ""
 
-#: src/content_mapnode.cpp:241
+#: src/content_mapnode.cpp:254
 msgid "Ice"
 msgstr "Lód"
 
-#: src/content_mapnode.cpp:257
+#: src/content_mapnode.cpp:270
 msgid "Coal Block"
 msgstr "Blok Węgla"
 
-#: src/content_mapnode.cpp:274
+#: src/content_mapnode.cpp:287
 msgid "Charcoal Block"
 msgstr "Blok Węgla Drzewnego"
 
-#: src/content_mapnode.cpp:291
+#: src/content_mapnode.cpp:304
 msgid "Stone Brick"
 msgstr "Kamienna Cegła"
 
-#: src/content_mapnode.cpp:305
+#: src/content_mapnode.cpp:318
 msgid "Stone Block"
 msgstr "Blok Z Kamienia"
 
-#: src/content_mapnode.cpp:319
+#: src/content_mapnode.cpp:332
 msgid "Rough Stone Brick"
 msgstr "Nieobrobiona Kamienna Cegła"
 
-#: src/content_mapnode.cpp:336
+#: src/content_mapnode.cpp:349
 msgid "Rough Stone Block"
 msgstr "Nieobrobiony Blok Z Kamienia"
 
-#: src/content_mapnode.cpp:352 src/content_mapnode.cpp:385
-#: src/content_mapnode.cpp:399 src/content_mapnode.cpp:432
+#: src/content_mapnode.cpp:365 src/content_mapnode.cpp:398
+#: src/content_mapnode.cpp:412 src/content_mapnode.cpp:445
 msgid "Grass"
 msgstr "Trawa"
 
-#: src/content_mapnode.cpp:370 src/content_mapnode.cpp:417
+#: src/content_mapnode.cpp:383 src/content_mapnode.cpp:430
 msgid "Growing Grass"
 msgstr ""
 
-#: src/content_mapnode.cpp:446
+#: src/content_mapnode.cpp:459
 msgid "Muddy Snow"
 msgstr "Błotnisty Śnieg"
 
-#: src/content_mapnode.cpp:462
+#: src/content_mapnode.cpp:475
 msgid "Mud"
 msgstr "Błoto"
 
-#: src/content_mapnode.cpp:478
+#: src/content_mapnode.cpp:491
 msgid "Ash Block"
 msgstr "Blok Pyłu"
 
-#: src/content_mapnode.cpp:493
+#: src/content_mapnode.cpp:506
 msgid "Sand"
 msgstr "Piasek"
 
-#: src/content_mapnode.cpp:512
+#: src/content_mapnode.cpp:525
 msgid "Gravel"
 msgstr "Żwir"
 
-#: src/content_mapnode.cpp:529
+#: src/content_mapnode.cpp:542
 msgid "Sand Stone"
 msgstr "Piaskowiec"
 
-#: src/content_mapnode.cpp:544
+#: src/content_mapnode.cpp:557
 msgid "Sand Stone Bricks"
 msgstr "Cegła Z Piaskowca"
 
-#: src/content_mapnode.cpp:559
+#: src/content_mapnode.cpp:572
 msgid "Sand Stone Blocks"
 msgstr "Blok Piaskowca"
 
-#: src/content_mapnode.cpp:574
+#: src/content_mapnode.cpp:587
 msgid "Clay"
 msgstr "Glina"
 
-#: src/content_mapnode.cpp:591
+#: src/content_mapnode.cpp:604
 msgid "Blue Clay"
 msgstr "Niebieska Glina"
 
-#: src/content_mapnode.cpp:608
+#: src/content_mapnode.cpp:621
 msgid "Green Clay"
 msgstr "Zielona Glina"
 
-#: src/content_mapnode.cpp:625
+#: src/content_mapnode.cpp:638
 msgid "Orange Clay"
 msgstr "Pomarańczowa Glina"
 
-#: src/content_mapnode.cpp:642
+#: src/content_mapnode.cpp:655
 msgid "Purple Clay"
 msgstr "Fioletowa Glina"
 
-#: src/content_mapnode.cpp:659
+#: src/content_mapnode.cpp:672
 msgid "Red Clay"
 msgstr "Czerwona Glina"
 
-#: src/content_mapnode.cpp:676
+#: src/content_mapnode.cpp:689
 msgid "Yellow Clay"
 msgstr "Żółta Glina"
 
-#: src/content_mapnode.cpp:693
+#: src/content_mapnode.cpp:706
 msgid "Black Clay"
 msgstr "Czarna Glina"
 
-#: src/content_mapnode.cpp:729
+#: src/content_mapnode.cpp:742
 msgid "Terracotta"
 msgstr "Terakota"
 
-#: src/content_mapnode.cpp:741
+#: src/content_mapnode.cpp:754
 msgid "Terracotta Brick"
 msgstr "Cegła Terakoty"
 
-#: src/content_mapnode.cpp:755
+#: src/content_mapnode.cpp:768
 msgid "Terracotta Block"
 msgstr "Blok Terakoty"
 
-#: src/content_mapnode.cpp:769
+#: src/content_mapnode.cpp:782
 msgid "Terracotta Tile"
 msgstr "Dachówka Z Terakoty"
 
-#: src/content_mapnode.cpp:789
+#: src/content_mapnode.cpp:802
 msgid "Glass"
 msgstr "Szkło"
 
-#: src/content_mapnode.cpp:809
+#: src/content_mapnode.cpp:822
 msgid "Blue Glass"
 msgstr "Niebieskie Szkło"
 
-#: src/content_mapnode.cpp:831
+#: src/content_mapnode.cpp:844
 msgid "Green Glass"
 msgstr "Zielone Szkło"
 
-#: src/content_mapnode.cpp:853
+#: src/content_mapnode.cpp:866
 msgid "Orange Glass"
 msgstr "Pomarańczowe Szkło"
 
-#: src/content_mapnode.cpp:875
+#: src/content_mapnode.cpp:888
 msgid "Purple Glass"
 msgstr "Fioletowe Szkło"
 
-#: src/content_mapnode.cpp:897
+#: src/content_mapnode.cpp:910
 msgid "Red Glass"
 msgstr "Czerwone Szkło"
 
-#: src/content_mapnode.cpp:919
+#: src/content_mapnode.cpp:932
 msgid "Yellow Glass"
 msgstr "Żółte Szkło"
 
-#: src/content_mapnode.cpp:941
+#: src/content_mapnode.cpp:954
 msgid "Black Glass"
 msgstr "Czarne Szkło"
 
-#: src/content_mapnode.cpp:963
+#: src/content_mapnode.cpp:976
 msgid "Glass Pane"
 msgstr "Szyba"
 
-#: src/content_mapnode.cpp:997
+#: src/content_mapnode.cpp:1010
 msgid "Blue Glass Pane"
 msgstr "Niebieska Szyba"
 
-#: src/content_mapnode.cpp:1032
+#: src/content_mapnode.cpp:1045
 msgid "Green Glass Pane"
 msgstr "Zielona Szyba"
 
-#: src/content_mapnode.cpp:1067
+#: src/content_mapnode.cpp:1080
 msgid "Orange Glass Pane"
 msgstr "Pomarańczowa Szyba"
 
-#: src/content_mapnode.cpp:1102
+#: src/content_mapnode.cpp:1115
 msgid "Purple Glass Pane"
 msgstr "Fioletowa Szyba"
 
-#: src/content_mapnode.cpp:1137
+#: src/content_mapnode.cpp:1150
 msgid "Red Glass Pane"
 msgstr "Czerwona Szyba"
 
-#: src/content_mapnode.cpp:1172
+#: src/content_mapnode.cpp:1185
 msgid "Yellow Glass Pane"
 msgstr "Żółta Szyba"
 
-#: src/content_mapnode.cpp:1207
+#: src/content_mapnode.cpp:1220
 msgid "Black Glass Pane"
 msgstr "Czarna Szyba"
 
-#: src/content_mapnode.cpp:1242 src/content_mapnode_farm.cpp:333
+#: src/content_mapnode.cpp:1255 src/content_mapnode_farm.cpp:333
 msgid "Glass Light"
 msgstr "Szklany Klosz"
 
-#: src/content_mapnode.cpp:1265
+#: src/content_mapnode.cpp:1278
 msgid "Wood"
 msgstr "Drewno"
 
-#: src/content_mapnode.cpp:1291
+#: src/content_mapnode.cpp:1304
 msgid "Jungle Wood"
 msgstr "Drewno Dżunglowe"
 
-#: src/content_mapnode.cpp:1316
+#: src/content_mapnode.cpp:1329
 msgid "Pine"
 msgstr "Sosna"
 
-#: src/content_mapnode.cpp:1341
+#: src/content_mapnode.cpp:1354
 msgid "Sponge"
 msgstr "Gąbka"
 
-#: src/content_mapnode.cpp:1356
+#: src/content_mapnode.cpp:1369
 msgid "Waterlogged Sponge"
 msgstr "Nasiąknięta Gąbka"
 
-#: src/content_mapnode.cpp:1371
+#: src/content_mapnode.cpp:1384
 msgid "Hay Bale"
 msgstr "Snop Siana"
 
-#: src/content_mapnode.cpp:1388
+#: src/content_mapnode.cpp:1401
 msgid "Raw Apple Pie"
 msgstr "Surowy Jabłecznik"
 
-#: src/content_mapnode.cpp:1417
+#: src/content_mapnode.cpp:1430
 msgid "Apple Pie"
 msgstr "Jabłecznik"
 
-#: src/content_mapnode.cpp:1512
+#: src/content_mapnode.cpp:1525
 msgid "Raw Pumpkin Pie"
 msgstr "Surowe Ciasto Dyniowe"
 
-#: src/content_mapnode.cpp:1541
+#: src/content_mapnode.cpp:1554
 msgid "Pumpkin Pie"
 msgstr "Ciasto Dyniowe"
 
-#: src/content_mapnode.cpp:1636 src/content_mapnode.cpp:1715
+#: src/content_mapnode.cpp:1649 src/content_mapnode.cpp:1728
 msgid "Snow"
 msgstr "Śnieg"
 
-#: src/content_mapnode.cpp:1652
+#: src/content_mapnode.cpp:1665
 msgid "Snowman"
 msgstr "Bałwan"
 
-#: src/content_mapnode.cpp:1738 src/content_mapnode_farm.cpp:445
+#: src/content_mapnode.cpp:1752 src/content_mapnode_farm.cpp:445
 msgid "Cotton"
 msgstr "Bawełna"
 
-#: src/content_mapnode.cpp:1769
+#: src/content_mapnode.cpp:1783
 msgid "Blue Cotton"
 msgstr "Niebieska Bawełna"
 
-#: src/content_mapnode.cpp:1786
+#: src/content_mapnode.cpp:1800
 msgid "Green Cotton"
 msgstr "Zielona Bawełna"
 
-#: src/content_mapnode.cpp:1803
+#: src/content_mapnode.cpp:1817
 msgid "Orange Cotton"
 msgstr "Pomarańczowa Bawełna"
 
-#: src/content_mapnode.cpp:1820
+#: src/content_mapnode.cpp:1834
 msgid "Purple Cotton"
 msgstr "Fioletowa Bawełna"
 
-#: src/content_mapnode.cpp:1837
+#: src/content_mapnode.cpp:1851
 msgid "Red Cotton"
 msgstr "Czerwona Bawełna"
 
-#: src/content_mapnode.cpp:1854
+#: src/content_mapnode.cpp:1868
 msgid "Yellow Cotton"
 msgstr "Żółta Bawełna"
 
-#: src/content_mapnode.cpp:1871
+#: src/content_mapnode.cpp:1885
 msgid "Black Cotton"
 msgstr "Czarna Bawełna"
 
-#: src/content_mapnode.cpp:1888
+#: src/content_mapnode.cpp:1902
 msgid "Carpet"
 msgstr "Dywan"
 
-#: src/content_mapnode.cpp:1911
+#: src/content_mapnode.cpp:1925
 msgid "Blue Carpet"
 msgstr "Niebieski Dywan"
 
-#: src/content_mapnode.cpp:1935
+#: src/content_mapnode.cpp:1949
 msgid "Green Carpet"
 msgstr "Zielony Dywan"
 
-#: src/content_mapnode.cpp:1959
+#: src/content_mapnode.cpp:1973
 msgid "Orange Carpet"
 msgstr "Pomarańczowy Dywan"
 
-#: src/content_mapnode.cpp:1983
+#: src/content_mapnode.cpp:1997
 msgid "Purple Carpet"
 msgstr "Fioletowy Dywan"
 
-#: src/content_mapnode.cpp:2007
+#: src/content_mapnode.cpp:2021
 msgid "Red Carpet"
 msgstr "Czerwony Dywan"
 
-#: src/content_mapnode.cpp:2031
+#: src/content_mapnode.cpp:2045
 msgid "Yellow Carpet"
 msgstr "Żółty Dywan"
 
-#: src/content_mapnode.cpp:2055
+#: src/content_mapnode.cpp:2069
 msgid "Black Carpet"
 msgstr "Czarny Dywan"
 
-#: src/content_mapnode.cpp:2079
+#: src/content_mapnode.cpp:2093
 msgid "Air"
 msgstr "Powietrze"
 
-#: src/content_mapnode.cpp:2095
+#: src/content_mapnode.cpp:2109
 msgid "Vacuum"
 msgstr ""
 
-#: src/content_mapnode.cpp:2112 src/content_mapnode.cpp:2142
+#: src/content_mapnode.cpp:2126 src/content_mapnode.cpp:2156
 msgid "Water"
 msgstr "Woda"
 
-#: src/content_mapnode.cpp:2172 src/content_mapnode.cpp:2200
+#: src/content_mapnode.cpp:2186 src/content_mapnode.cpp:2214
 msgid "Lava"
 msgstr "Lawa"
 
-#: src/content_mapnode.cpp:2231
+#: src/content_mapnode.cpp:2245
 msgid "Rough Stone"
 msgstr "Nieobrobiony Kamień"
 
-#: src/content_mapnode.cpp:2248
+#: src/content_mapnode.cpp:2262
 msgid "Cobble Stone"
 msgstr "Brukowiec"
 
-#: src/content_mapnode.cpp:2264
+#: src/content_mapnode.cpp:2278
 msgid "Mossy Cobble Stone"
 msgstr "Omszały Brukowiec"
 
-#: src/content_mapnode.cpp:2277
+#: src/content_mapnode.cpp:2291
 msgid "Steel Block"
 msgstr "Blok Ze Stali"
 
-#: src/content_mapnode.cpp:2294
+#: src/content_mapnode.cpp:2308
 msgid "Mithril Block"
 msgstr ""
 
-#: src/content_mapnode.cpp:2310
+#: src/content_mapnode.cpp:2324
 msgid "Stone Knob"
 msgstr "Kamienna Gałka"
 
-#: src/content_mapnode.cpp:2311
+#: src/content_mapnode.cpp:2325
 msgid "Rough Stone Knob"
 msgstr "Nieobrobiona Kamienna Gałka"
 
-#: src/content_mapnode.cpp:2312
+#: src/content_mapnode.cpp:2326
 msgid "Sandstone Knob"
 msgstr "Gałka Z Piaskowca"
 
-#: src/content_mapnode.cpp:2313
+#: src/content_mapnode.cpp:2327
 msgid "Wooden Knob"
 msgstr "Drewniana Gałka"
 
-#: src/content_mapnode.cpp:2314
+#: src/content_mapnode.cpp:2328
 msgid "Junglewood Knob"
 msgstr "Gałka Z Drewna Dżunglowego"
 
-#: src/content_mapnode.cpp:2315
+#: src/content_mapnode.cpp:2329
 msgid "Pine Knob"
 msgstr "Gałka Z Drzewa Iglastego"
 
-#: src/content_mapnode.cpp:2319
+#: src/content_mapnode.cpp:2333
 msgid "Copper Block"
 msgstr "Blok Z Miedzi"
 
-#: src/content_mapnode.cpp:2336
+#: src/content_mapnode.cpp:2350
 msgid "Gold Block"
 msgstr "Blok Ze Złota"
 
-#: src/content_mapnode.cpp:2353
+#: src/content_mapnode.cpp:2367
 msgid "Silver Block"
 msgstr "Blok Ze Srebra"
 
-#: src/content_mapnode.cpp:2370
+#: src/content_mapnode.cpp:2384
 msgid "Tin Block"
 msgstr "Blok Z Cyny"
 
-#: src/content_mapnode.cpp:2387
+#: src/content_mapnode.cpp:2401
 msgid "Quartz Block"
 msgstr "Blok Kwarcu"
 
-#: src/content_mapnode.cpp:2404
+#: src/content_mapnode.cpp:2418
 msgid "Stone Tiles"
 msgstr ""
 
-#: src/content_mapnode.cpp:2426
+#: src/content_mapnode.cpp:2440
 msgid "Wood Tiles"
 msgstr ""
 
@@ -2009,29 +2023,29 @@ msgstr "Bramka NOT"
 msgid "Repeater"
 msgstr "Przekaźnik"
 
-#: src/content_mapnode_circuit.cpp:369 src/content_mapnode_circuit.cpp:393
+#: src/content_mapnode_circuit.cpp:369 src/content_mapnode_circuit.cpp:390
 msgid "Electric Lamp"
 msgstr "Lampa Elektryczna"
 
-#: src/content_mapnode_circuit.cpp:427 src/content_mapnode_circuit.cpp:462
-#: src/content_mapnode_circuit.cpp:516 src/content_mapnode_circuit.cpp:537
-#: src/content_mapnode_circuit.cpp:582 src/content_mapnode_circuit.cpp:603
+#: src/content_mapnode_circuit.cpp:424 src/content_mapnode_circuit.cpp:459
+#: src/content_mapnode_circuit.cpp:513 src/content_mapnode_circuit.cpp:534
+#: src/content_mapnode_circuit.cpp:579 src/content_mapnode_circuit.cpp:600
 msgid "Piston"
 msgstr "Tłok"
 
-#: src/content_mapnode_circuit.cpp:489 src/content_mapnode_circuit.cpp:560
-#: src/content_mapnode_circuit.cpp:626
+#: src/content_mapnode_circuit.cpp:486 src/content_mapnode_circuit.cpp:557
+#: src/content_mapnode_circuit.cpp:623
 msgid "Piston Arm"
 msgstr "Ramię Tłoku"
 
-#: src/content_mapnode_circuit.cpp:648 src/content_mapnode_circuit.cpp:676
-#: src/content_mapnode_circuit.cpp:730 src/content_mapnode_circuit.cpp:751
-#: src/content_mapnode_circuit.cpp:796 src/content_mapnode_circuit.cpp:817
+#: src/content_mapnode_circuit.cpp:645 src/content_mapnode_circuit.cpp:673
+#: src/content_mapnode_circuit.cpp:727 src/content_mapnode_circuit.cpp:748
+#: src/content_mapnode_circuit.cpp:793 src/content_mapnode_circuit.cpp:814
 msgid "Sticky Piston"
 msgstr "Kleisty Tłok"
 
-#: src/content_mapnode_circuit.cpp:703 src/content_mapnode_circuit.cpp:774
-#: src/content_mapnode_circuit.cpp:840
+#: src/content_mapnode_circuit.cpp:700 src/content_mapnode_circuit.cpp:771
+#: src/content_mapnode_circuit.cpp:837
 msgid "Sticky Piston Arm"
 msgstr "Ramię Kleistego Tłoku"
 
@@ -2171,7 +2185,7 @@ msgstr "Winogrona"
 msgid "Trellis Grape"
 msgstr ""
 
-#: src/content_mapnode_farm.cpp:493 src/content_mapnode_farm.cpp:512
+#: src/content_mapnode_farm.cpp:494 src/content_mapnode_farm.cpp:513
 msgid "Dead Vine"
 msgstr "Obumarła Winorośl"
 
@@ -2187,131 +2201,137 @@ msgstr ""
 msgid "Pine Book Shelf"
 msgstr ""
 
-#: src/content_mapnode_furniture.cpp:150 src/content_mapnode_furniture.cpp:169
-#: src/content_mapnode_furniture.cpp:188 src/content_mapnode_furniture.cpp:207
-#: src/content_mapnode_furniture.cpp:226 src/content_mapnode_furniture.cpp:245
+#: src/content_mapnode_furniture.cpp:150 src/content_mapnode_furniture.cpp:170
+#: src/content_mapnode_furniture.cpp:190 src/content_mapnode_furniture.cpp:210
+#: src/content_mapnode_furniture.cpp:230 src/content_mapnode_furniture.cpp:250
 msgid "Couch"
 msgstr "Kanapa"
 
-#: src/content_mapnode_furniture.cpp:274 src/content_mapnode_furniture.cpp:293
-#: src/content_mapnode_furniture.cpp:312 src/content_mapnode_furniture.cpp:331
-#: src/content_mapnode_furniture.cpp:350 src/content_mapnode_furniture.cpp:369
+#: src/content_mapnode_furniture.cpp:280 src/content_mapnode_furniture.cpp:300
+#: src/content_mapnode_furniture.cpp:320 src/content_mapnode_furniture.cpp:340
+#: src/content_mapnode_furniture.cpp:360 src/content_mapnode_furniture.cpp:380
 msgid "Blue Couch"
 msgstr "Niebieska Kanapa"
 
-#: src/content_mapnode_furniture.cpp:392 src/content_mapnode_furniture.cpp:411
-#: src/content_mapnode_furniture.cpp:430 src/content_mapnode_furniture.cpp:449
-#: src/content_mapnode_furniture.cpp:468 src/content_mapnode_furniture.cpp:487
+#: src/content_mapnode_furniture.cpp:404 src/content_mapnode_furniture.cpp:424
+#: src/content_mapnode_furniture.cpp:444 src/content_mapnode_furniture.cpp:464
+#: src/content_mapnode_furniture.cpp:484 src/content_mapnode_furniture.cpp:504
 msgid "Green Couch"
 msgstr "Zielona Kanapa"
 
-#: src/content_mapnode_furniture.cpp:510 src/content_mapnode_furniture.cpp:529
-#: src/content_mapnode_furniture.cpp:548 src/content_mapnode_furniture.cpp:567
-#: src/content_mapnode_furniture.cpp:586 src/content_mapnode_furniture.cpp:605
+#: src/content_mapnode_furniture.cpp:528 src/content_mapnode_furniture.cpp:548
+#: src/content_mapnode_furniture.cpp:568 src/content_mapnode_furniture.cpp:588
+#: src/content_mapnode_furniture.cpp:608 src/content_mapnode_furniture.cpp:628
 msgid "Orange Couch"
 msgstr "Pomarańczowa Kanapa"
 
-#: src/content_mapnode_furniture.cpp:628 src/content_mapnode_furniture.cpp:647
-#: src/content_mapnode_furniture.cpp:666 src/content_mapnode_furniture.cpp:685
-#: src/content_mapnode_furniture.cpp:704 src/content_mapnode_furniture.cpp:723
+#: src/content_mapnode_furniture.cpp:652 src/content_mapnode_furniture.cpp:672
+#: src/content_mapnode_furniture.cpp:692 src/content_mapnode_furniture.cpp:712
+#: src/content_mapnode_furniture.cpp:732 src/content_mapnode_furniture.cpp:752
 msgid "Purple Couch"
 msgstr "Fioletowa Kanapa"
 
-#: src/content_mapnode_furniture.cpp:746 src/content_mapnode_furniture.cpp:765
-#: src/content_mapnode_furniture.cpp:784 src/content_mapnode_furniture.cpp:803
-#: src/content_mapnode_furniture.cpp:822 src/content_mapnode_furniture.cpp:841
+#: src/content_mapnode_furniture.cpp:776 src/content_mapnode_furniture.cpp:796
+#: src/content_mapnode_furniture.cpp:816 src/content_mapnode_furniture.cpp:836
+#: src/content_mapnode_furniture.cpp:856 src/content_mapnode_furniture.cpp:876
 msgid "Red Couch"
 msgstr "Czerwona Kanapa"
 
-#: src/content_mapnode_furniture.cpp:864 src/content_mapnode_furniture.cpp:883
-#: src/content_mapnode_furniture.cpp:902 src/content_mapnode_furniture.cpp:921
-#: src/content_mapnode_furniture.cpp:940 src/content_mapnode_furniture.cpp:959
+#: src/content_mapnode_furniture.cpp:900 src/content_mapnode_furniture.cpp:920
+#: src/content_mapnode_furniture.cpp:940 src/content_mapnode_furniture.cpp:960
+#: src/content_mapnode_furniture.cpp:980
+#: src/content_mapnode_furniture.cpp:1000
 msgid "Yellow Couch"
 msgstr "Żółta Kanapa"
 
-#: src/content_mapnode_furniture.cpp:982
-#: src/content_mapnode_furniture.cpp:1001
-#: src/content_mapnode_furniture.cpp:1020
-#: src/content_mapnode_furniture.cpp:1039
-#: src/content_mapnode_furniture.cpp:1058
-#: src/content_mapnode_furniture.cpp:1077
+#: src/content_mapnode_furniture.cpp:1024
+#: src/content_mapnode_furniture.cpp:1044
+#: src/content_mapnode_furniture.cpp:1064
+#: src/content_mapnode_furniture.cpp:1084
+#: src/content_mapnode_furniture.cpp:1104
+#: src/content_mapnode_furniture.cpp:1124
 msgid "Black Couch"
 msgstr "Czarna Kanapa"
 
-#: src/content_mapnode_furniture.cpp:1100
+#: src/content_mapnode_furniture.cpp:1148
+#: src/content_mapnode_furniture.cpp:1182
+#: src/content_mapnode_furniture.cpp:1206
+#: src/content_mapnode_furniture.cpp:1230
+#: src/content_mapnode_furniture.cpp:1254
+#: src/content_mapnode_furniture.cpp:1278
 msgid "Chair"
 msgstr "Krzesło"
 
-#: src/content_mapnode_furniture.cpp:1149
+#: src/content_mapnode_furniture.cpp:1302
 msgid "Table"
 msgstr "Stół"
 
-#: src/content_mapnode_furniture.cpp:1206
-#: src/content_mapnode_furniture.cpp:1239
+#: src/content_mapnode_furniture.cpp:1333
+#: src/content_mapnode_furniture.cpp:1366
 msgid "Bed"
 msgstr "Łóżko"
 
-#: src/content_mapnode_furniture.cpp:1267
-#: src/content_mapnode_furniture.cpp:1300
+#: src/content_mapnode_furniture.cpp:1394
+#: src/content_mapnode_furniture.cpp:1427
 msgid "Blue Bed"
 msgstr "Niebieskie Łóżko"
 
-#: src/content_mapnode_furniture.cpp:1328
-#: src/content_mapnode_furniture.cpp:1361
+#: src/content_mapnode_furniture.cpp:1455
+#: src/content_mapnode_furniture.cpp:1488
 msgid "Green Bed"
 msgstr "Zielone Łóżko"
 
-#: src/content_mapnode_furniture.cpp:1389
-#: src/content_mapnode_furniture.cpp:1422
+#: src/content_mapnode_furniture.cpp:1516
+#: src/content_mapnode_furniture.cpp:1549
 msgid "Orange Bed"
 msgstr "Pomarańczowe Łóżko"
 
-#: src/content_mapnode_furniture.cpp:1450
-#: src/content_mapnode_furniture.cpp:1483
+#: src/content_mapnode_furniture.cpp:1577
+#: src/content_mapnode_furniture.cpp:1610
 msgid "Purple Bed"
 msgstr "Fioletowe Łóżko"
 
-#: src/content_mapnode_furniture.cpp:1511
-#: src/content_mapnode_furniture.cpp:1544
+#: src/content_mapnode_furniture.cpp:1638
+#: src/content_mapnode_furniture.cpp:1671
 msgid "Red Bed"
 msgstr "Czerwone Łóżko"
 
-#: src/content_mapnode_furniture.cpp:1572
-#: src/content_mapnode_furniture.cpp:1605
+#: src/content_mapnode_furniture.cpp:1699
+#: src/content_mapnode_furniture.cpp:1732
 msgid "Yellow Bed"
 msgstr "Żółte Łóżko"
 
-#: src/content_mapnode_furniture.cpp:1633
-#: src/content_mapnode_furniture.cpp:1666
+#: src/content_mapnode_furniture.cpp:1760
+#: src/content_mapnode_furniture.cpp:1793
 msgid "Black Bed"
 msgstr "Czarne Łóżko"
 
-#: src/content_mapnode_furniture.cpp:1694
-#: src/content_mapnode_furniture.cpp:1729
+#: src/content_mapnode_furniture.cpp:1821
+#: src/content_mapnode_furniture.cpp:1856
 msgid "Camp Bed"
 msgstr ""
 
-#: src/content_mapnode_furniture.cpp:1753
+#: src/content_mapnode_furniture.cpp:1880
 msgid "Colorful Painting"
 msgstr "Kolorowe Malowidło"
 
-#: src/content_mapnode_furniture.cpp:1788
+#: src/content_mapnode_furniture.cpp:1915
 msgid "Red Rose Painting"
 msgstr "Malowidło Z Czerwonymi Różami"
 
-#: src/content_mapnode_furniture.cpp:1823
+#: src/content_mapnode_furniture.cpp:1950
 msgid "Field Painting"
 msgstr "Malowidło Z Polem"
 
-#: src/content_mapnode_furniture.cpp:1858
+#: src/content_mapnode_furniture.cpp:1985
 msgid "Blue Flower Painting"
 msgstr "Malowidło Z Niebieskimi Kwiatami"
 
-#: src/content_mapnode_furniture.cpp:1893
+#: src/content_mapnode_furniture.cpp:2020
 msgid "Painting Canvas"
 msgstr "Obraz Na Płótnie"
 
-#: src/content_mapnode_furniture.cpp:1931
+#: src/content_mapnode_furniture.cpp:2058
 msgid "Clock"
 msgstr "Zegar"
 
@@ -2631,7 +2651,7 @@ msgid "Decraft Book"
 msgstr "Książka Odzysku"
 
 #: src/content_mapnode_special.cpp:753 src/content_mapnode_special.cpp:948
-#: src/content_nodemeta.cpp:2693
+#: src/content_nodemeta.cpp:2694
 msgid "Diary"
 msgstr "Dziennik"
 
@@ -2681,11 +2701,11 @@ msgstr "Znak"
 msgid "Locking Sign"
 msgstr "Znak Blokady"
 
-#: src/content_mapnode_special.cpp:1286 src/content_nodemeta.cpp:500
+#: src/content_mapnode_special.cpp:1286 src/content_nodemeta.cpp:501
 msgid "Chest"
 msgstr "Kufer"
 
-#: src/content_mapnode_special.cpp:1310 src/content_nodemeta.cpp:775
+#: src/content_mapnode_special.cpp:1310 src/content_nodemeta.cpp:776
 msgid "Creative Chest"
 msgstr "Kufer Kreatywny"
 
@@ -2805,7 +2825,7 @@ msgstr ""
 msgid "Cauldron"
 msgstr ""
 
-#: src/content_mapnode_special.cpp:2082 src/content_nodemeta.cpp:3312
+#: src/content_mapnode_special.cpp:2082 src/content_nodemeta.cpp:3313
 msgid "Forge"
 msgstr ""
 
@@ -2909,108 +2929,108 @@ msgstr ""
 msgid "Ginger Kitten"
 msgstr ""
 
-#: src/content_nodemeta.cpp:75 src/content_nodemeta.cpp:138
-#: src/content_nodemeta.cpp:2677 src/content_nodemeta.cpp:2776
+#: src/content_nodemeta.cpp:76 src/content_nodemeta.cpp:139
+#: src/content_nodemeta.cpp:2678 src/content_nodemeta.cpp:2777
 msgid "Save"
 msgstr "Zapis"
 
-#: src/content_nodemeta.cpp:185
+#: src/content_nodemeta.cpp:186
 #, c-format
 msgid "%s's Home Flag"
 msgstr ""
 
-#: src/content_nodemeta.cpp:269 src/content_nodemeta.cpp:282
-#: src/content_nodemeta.cpp:436 src/content_nodemeta.cpp:449
+#: src/content_nodemeta.cpp:270 src/content_nodemeta.cpp:283
+#: src/content_nodemeta.cpp:437 src/content_nodemeta.cpp:450
 msgid "You can't sleep yet."
 msgstr ""
 
-#: src/content_nodemeta.cpp:273 src/content_nodemeta.cpp:440
+#: src/content_nodemeta.cpp:274 src/content_nodemeta.cpp:441
 msgid "Go to sleep"
 msgstr ""
 
-#: src/content_nodemeta.cpp:278 src/content_nodemeta.cpp:445
+#: src/content_nodemeta.cpp:279 src/content_nodemeta.cpp:446
 msgid "Someone else is sleeping here."
 msgstr ""
 
-#: src/content_nodemeta.cpp:286 src/content_nodemeta.cpp:453
+#: src/content_nodemeta.cpp:287 src/content_nodemeta.cpp:454
 msgid "Get out of bed"
 msgstr ""
 
-#: src/content_nodemeta.cpp:432
+#: src/content_nodemeta.cpp:433
 msgid "This bed is too uncomfortable to sleep in."
 msgstr ""
 
-#: src/content_nodemeta.cpp:573
+#: src/content_nodemeta.cpp:574
 #, c-format
 msgid "Locking Chest owned by '%s'"
 msgstr ""
 
-#: src/content_nodemeta.cpp:647
+#: src/content_nodemeta.cpp:648
 #, c-format
 msgid "Safe owned by '%s'"
 msgstr ""
 
-#: src/content_nodemeta.cpp:816 src/content_nodemeta.cpp:1870
-#: src/content_nodemeta.cpp:2157 src/content_nodemeta.cpp:2349
-#: src/content_nodemeta.cpp:2563
+#: src/content_nodemeta.cpp:817 src/content_nodemeta.cpp:1871
+#: src/content_nodemeta.cpp:2158 src/content_nodemeta.cpp:2350
+#: src/content_nodemeta.cpp:2564
 #, c-format
 msgid "Page %d of %d"
 msgstr ""
 
-#: src/content_nodemeta.cpp:820 src/content_nodemeta.cpp:1898
-#: src/content_nodemeta.cpp:2176 src/content_nodemeta.cpp:2358
-#: src/content_nodemeta.cpp:2579
+#: src/content_nodemeta.cpp:821 src/content_nodemeta.cpp:1899
+#: src/content_nodemeta.cpp:2177 src/content_nodemeta.cpp:2359
+#: src/content_nodemeta.cpp:2580
 msgid "<< Previous Page"
 msgstr ""
 
-#: src/content_nodemeta.cpp:826 src/content_nodemeta.cpp:1904
-#: src/content_nodemeta.cpp:2182 src/content_nodemeta.cpp:2364
-#: src/content_nodemeta.cpp:2585
+#: src/content_nodemeta.cpp:827 src/content_nodemeta.cpp:1905
+#: src/content_nodemeta.cpp:2183 src/content_nodemeta.cpp:2365
+#: src/content_nodemeta.cpp:2586
 msgid "Next Page >>"
 msgstr ""
 
-#: src/content_nodemeta.cpp:869
+#: src/content_nodemeta.cpp:870
 #, c-format
 msgid "Border Stone owned by '%s'"
 msgstr ""
 
-#: src/content_nodemeta.cpp:944
+#: src/content_nodemeta.cpp:945
 msgid "Furnace is overloaded"
 msgstr ""
 
-#: src/content_nodemeta.cpp:945
+#: src/content_nodemeta.cpp:946
 msgid "Furnace is out of fuel"
 msgstr ""
 
-#: src/content_nodemeta.cpp:947
+#: src/content_nodemeta.cpp:948
 msgid "Furnace is inactive"
 msgstr ""
 
-#: src/content_nodemeta.cpp:950
+#: src/content_nodemeta.cpp:951
 msgid "Furnace is active"
 msgstr ""
 
-#: src/content_nodemeta.cpp:1209
+#: src/content_nodemeta.cpp:1210
 msgid "Locking Furnace is overloaded"
 msgstr ""
 
-#: src/content_nodemeta.cpp:1210
+#: src/content_nodemeta.cpp:1211
 msgid "Locking Furnace is out of fuel"
 msgstr ""
 
-#: src/content_nodemeta.cpp:1212
+#: src/content_nodemeta.cpp:1213
 msgid "Locking Furnace is inactive"
 msgstr ""
 
-#: src/content_nodemeta.cpp:1215
+#: src/content_nodemeta.cpp:1216
 msgid "Locking Furnace is active"
 msgstr ""
 
-#: src/content_nodemeta.cpp:1470
+#: src/content_nodemeta.cpp:1471
 msgid "Armed Explosive: about to detonate"
 msgstr ""
 
-#: src/content_nodemeta.cpp:1473
+#: src/content_nodemeta.cpp:1474
 #, c-format
 msgid "Armed Explosive: %d second till detonation"
 msgid_plural "Armed Explosive: %d seconds till detonation"
@@ -3018,348 +3038,352 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: src/content_nodemeta.cpp:1534 src/content_nodemeta.cpp:1539
+#: src/content_nodemeta.cpp:1535 src/content_nodemeta.cpp:1540
 msgid "Incinerator is active"
 msgstr ""
 
-#: src/content_nodemeta.cpp:1541
+#: src/content_nodemeta.cpp:1542
 msgid "Incinerator is inactive"
 msgstr ""
 
-#: src/content_nodemeta.cpp:1633
+#: src/content_nodemeta.cpp:1634
 msgid "Add fuel, then punch to incinerate wielded item"
 msgstr ""
 
-#: src/content_nodemeta.cpp:1874 src/content_nodemeta.cpp:2162
+#: src/content_nodemeta.cpp:1875 src/content_nodemeta.cpp:2163
 msgid "Add item here to see recipe"
 msgstr ""
 
-#: src/content_nodemeta.cpp:1879 src/content_nodemeta.cpp:2167
+#: src/content_nodemeta.cpp:1880 src/content_nodemeta.cpp:2168
 #, c-format
 msgid "Recipe %d of %d"
 msgstr ""
 
-#: src/content_nodemeta.cpp:1888
+#: src/content_nodemeta.cpp:1889
 msgid "Gives"
 msgstr ""
 
-#: src/content_nodemeta.cpp:2353
+#: src/content_nodemeta.cpp:2354
 msgid "Add item here to see cook result"
 msgstr ""
 
-#: src/content_nodemeta.cpp:2567
+#: src/content_nodemeta.cpp:2568
 msgid "Add item here to see dig result"
 msgstr ""
 
-#: src/content_nodemeta.cpp:2571
+#: src/content_nodemeta.cpp:2572
 msgid "Dig Result"
 msgstr ""
 
-#: src/content_nodemeta.cpp:2575
+#: src/content_nodemeta.cpp:2576
 msgid "Random Drop"
 msgstr ""
 
-#: src/content_nodemeta.cpp:2667 src/content_nodemeta.cpp:2766
+#: src/content_nodemeta.cpp:2668 src/content_nodemeta.cpp:2767
 msgid "Title"
 msgstr "Tytuł"
 
-#: src/content_nodemeta.cpp:2672 src/content_nodemeta.cpp:2771
+#: src/content_nodemeta.cpp:2673 src/content_nodemeta.cpp:2772
 msgid "Content"
 msgstr "Zawartość"
 
-#: src/content_nodemeta.cpp:3127
+#: src/content_nodemeta.cpp:3128
 msgid "Cauldron is active"
 msgstr ""
 
-#: src/content_nodemeta.cpp:3130
+#: src/content_nodemeta.cpp:3131
 msgid "Cauldron is hot"
 msgstr ""
 
-#: src/content_nodemeta.cpp:3132
+#: src/content_nodemeta.cpp:3133
 msgid "Cauldron is cool"
 msgstr ""
 
-#: src/content_nodemeta.cpp:3134
+#: src/content_nodemeta.cpp:3135
 msgid "Cauldron is empty"
 msgstr ""
 
-#: src/content_nodemeta.cpp:3138
+#: src/content_nodemeta.cpp:3139
 msgid "Cauldron is inactive"
 msgstr ""
 
-#: src/content_nodemeta.cpp:3139
+#: src/content_nodemeta.cpp:3140
 msgid "Cauldron is out of fuel"
 msgstr ""
 
-#: src/content_nodemeta.cpp:3218
+#: src/content_nodemeta.cpp:3219
 msgid "Add fuel, then punch to add or remove water"
 msgstr ""
 
-#: src/content_nodemeta.cpp:3484
+#: src/content_nodemeta.cpp:3487
 msgid "Show Enchanting"
 msgstr ""
 
-#: src/content_nodemeta.cpp:3491 src/game.cpp:208
+#: src/content_nodemeta.cpp:3494 src/game.cpp:209
 msgid "Show Crafting"
 msgstr "Pokaż Okno Wytwarzania"
 
-#: src/content_toolitem.cpp:213
+#: src/content_toolitem.cpp:216
 msgid "Small Stone Pick"
 msgstr ""
 
-#: src/content_toolitem.cpp:236
+#: src/content_toolitem.cpp:239
 msgid "Stone Pick"
 msgstr "Kamienny Kilof"
 
-#: src/content_toolitem.cpp:250
+#: src/content_toolitem.cpp:253
 msgid "Flint Pick"
 msgstr "Krzemienny Kilof"
 
-#: src/content_toolitem.cpp:264
+#: src/content_toolitem.cpp:267
 msgid "Steel Pick"
 msgstr "Stalowy Kilof"
 
-#: src/content_toolitem.cpp:278
+#: src/content_toolitem.cpp:281
 msgid "Creative Pick"
 msgstr ""
 
-#: src/content_toolitem.cpp:292
+#: src/content_toolitem.cpp:295
 msgid "Stone Trowel"
 msgstr ""
 
-#: src/content_toolitem.cpp:306
+#: src/content_toolitem.cpp:309
 msgid "Stone Shovel"
 msgstr "Kamienna Łopata"
 
-#: src/content_toolitem.cpp:320
+#: src/content_toolitem.cpp:323
 msgid "Flint Shovel"
 msgstr "Krzemienna Łopata"
 
-#: src/content_toolitem.cpp:334
+#: src/content_toolitem.cpp:337
 msgid "Steel Shovel"
 msgstr "Stalowa Łopata"
 
-#: src/content_toolitem.cpp:348
+#: src/content_toolitem.cpp:351
 msgid "Small Stone Axe"
 msgstr ""
 
-#: src/content_toolitem.cpp:369
+#: src/content_toolitem.cpp:372
 msgid "Stone Axe"
 msgstr "Kamienna Siekiera"
 
-#: src/content_toolitem.cpp:383
+#: src/content_toolitem.cpp:386
 msgid "Flint Axe"
 msgstr "Krzemienna Siekiera"
 
-#: src/content_toolitem.cpp:397
+#: src/content_toolitem.cpp:400
 msgid "Steel Axe"
 msgstr "Stalowa Siekiera"
 
-#: src/content_toolitem.cpp:411
+#: src/content_toolitem.cpp:414
 msgid "Wooden Club"
 msgstr ""
 
-#: src/content_toolitem.cpp:426
+#: src/content_toolitem.cpp:429
 msgid "Stone Sword"
 msgstr "Kamienny Miecz"
 
-#: src/content_toolitem.cpp:440
+#: src/content_toolitem.cpp:443
 msgid "Steel Sword"
 msgstr "Stalowy Miecz"
 
-#: src/content_toolitem.cpp:454
+#: src/content_toolitem.cpp:457
 msgid "Flint Shears"
 msgstr "Krzemienne Nożyce"
 
-#: src/content_toolitem.cpp:468
+#: src/content_toolitem.cpp:471
 msgid "Steel Shears"
 msgstr "Stalowe Nożyce"
 
-#: src/content_toolitem.cpp:482
+#: src/content_toolitem.cpp:485
 msgid "Wooden Bucket"
 msgstr "Drewniane Wiadro"
 
-#: src/content_toolitem.cpp:499
+#: src/content_toolitem.cpp:502
 msgid "Tin Bucket"
 msgstr "Cynowe Wiadro"
 
-#: src/content_toolitem.cpp:515
+#: src/content_toolitem.cpp:518
 msgid "Wooden Bucket of Water"
 msgstr "Drewniane Wiadro Z Wodą"
 
-#: src/content_toolitem.cpp:526
+#: src/content_toolitem.cpp:529
 msgid "Tin Bucket of Water"
 msgstr "Cynowe Wiadro Z Wodą"
 
-#: src/content_toolitem.cpp:537
+#: src/content_toolitem.cpp:540
 msgid "Steel Bucket"
 msgstr "Stalowe Wiadro"
 
-#: src/content_toolitem.cpp:552
+#: src/content_toolitem.cpp:555
 msgid "Steel Bucket of Water"
 msgstr "Stalowe Wiadro Z Wodą"
 
-#: src/content_toolitem.cpp:563
+#: src/content_toolitem.cpp:566
 msgid "Steel Bucket of Lava"
 msgstr "Stalowe Wiadro Z Lawą"
 
-#: src/content_toolitem.cpp:575
+#: src/content_toolitem.cpp:578
 msgid "Fire Starter"
 msgstr "Podpałka"
 
-#: src/content_toolitem.cpp:589
+#: src/content_toolitem.cpp:592
 msgid "Crowbar"
 msgstr "Łom"
 
-#: src/content_toolitem.cpp:602
+#: src/content_toolitem.cpp:605
 msgid "Key"
 msgstr "Klucz"
 
-#: src/content_toolitem.cpp:614
+#: src/content_toolitem.cpp:617
 msgid "Stone Spear"
 msgstr "Kamienna Włócznia"
 
-#: src/content_toolitem.cpp:628
+#: src/content_toolitem.cpp:631
 msgid "Flint Spear"
 msgstr "Krzemienna Włócznia"
 
-#: src/content_toolitem.cpp:642
+#: src/content_toolitem.cpp:645
 msgid "Steel Spear"
 msgstr "Stalowa Włócznia"
 
-#: src/content_toolitem.cpp:656
+#: src/content_toolitem.cpp:659
 msgid "Bow"
 msgstr "Łuk"
 
-#: src/content_toolitem.cpp:676
+#: src/content_toolitem.cpp:679
 msgid "Raw Mithril Pick"
 msgstr ""
 
-#: src/content_toolitem.cpp:690
+#: src/content_toolitem.cpp:693
 msgid "Raw Mithril Shovel"
 msgstr ""
 
-#: src/content_toolitem.cpp:704
+#: src/content_toolitem.cpp:707
 msgid "Raw Mithril Axe"
 msgstr ""
 
-#: src/content_toolitem.cpp:718
+#: src/content_toolitem.cpp:721
 msgid "Raw Mithril Sword"
 msgstr ""
 
-#: src/content_toolitem.cpp:732
+#: src/content_toolitem.cpp:735
 msgid "Raw Mithril Spear"
 msgstr ""
 
-#: src/content_toolitem.cpp:746
+#: src/content_toolitem.cpp:749
 msgid "Unbound Mithril Pick"
 msgstr ""
 
-#: src/content_toolitem.cpp:760
+#: src/content_toolitem.cpp:763
 msgid "Unbound Mithril Shovel"
 msgstr ""
 
-#: src/content_toolitem.cpp:774
+#: src/content_toolitem.cpp:777
 msgid "Unbound Mithril Axe"
 msgstr ""
 
-#: src/content_toolitem.cpp:788
+#: src/content_toolitem.cpp:791
 msgid "Unbound Mithril Sword"
 msgstr ""
 
-#: src/content_toolitem.cpp:802
+#: src/content_toolitem.cpp:805
 msgid "Unbound Mithril Spear"
 msgstr ""
 
-#: src/content_toolitem.cpp:816
+#: src/content_toolitem.cpp:819
 msgid "Mithril Pick"
 msgstr ""
 
-#: src/content_toolitem.cpp:831
+#: src/content_toolitem.cpp:834
 msgid "Mithril Shovel"
 msgstr ""
 
-#: src/content_toolitem.cpp:845
+#: src/content_toolitem.cpp:848
 msgid "Mithril Axe"
 msgstr ""
 
-#: src/content_toolitem.cpp:859
+#: src/content_toolitem.cpp:862
 msgid "Mithril Sword"
 msgstr ""
 
-#: src/content_toolitem.cpp:873
+#: src/content_toolitem.cpp:876
 msgid "Mithril Spear"
 msgstr ""
 
-#: src/content_toolitem.cpp:887
+#: src/content_toolitem.cpp:890
 msgid "Mob Spawner"
 msgstr ""
 
-#: src/game.cpp:209
+#: src/content_toolitem.cpp:909
+msgid "Mithril Key"
+msgstr ""
+
+#: src/game.cpp:210
 msgid "Clothes"
 msgstr "Ubrania"
 
-#: src/game.cpp:210
+#: src/game.cpp:211
 msgid "Hat/Helmet"
 msgstr "Czapka/Hełm"
 
-#: src/game.cpp:212
+#: src/game.cpp:213
 msgid "Jacket"
 msgstr "Kurtka"
 
-#: src/game.cpp:214
+#: src/game.cpp:215
 msgid "Decorative"
 msgstr "Dekoracje"
 
-#: src/game.cpp:216
+#: src/game.cpp:217
 msgid "Shirt"
 msgstr "Koszula"
 
-#: src/game.cpp:218
+#: src/game.cpp:219
 msgid "Belt"
 msgstr "Pasek"
 
-#: src/game.cpp:220
+#: src/game.cpp:221
 msgid "Pants"
 msgstr "Spodnie"
 
-#: src/game.cpp:222
+#: src/game.cpp:223
 msgid "Boots"
 msgstr "Buty"
 
-#: src/game.cpp:229
+#: src/game.cpp:230
 msgid "Drop to Ground"
 msgstr "Wyrzuć na Ziemię"
 
-#: src/game.cpp:231
+#: src/game.cpp:232
 msgid "Change Clothing"
 msgstr "Zmień Ubranie"
 
-#: src/game.cpp:590
+#: src/game.cpp:591
 msgid "Loading"
 msgstr "Wczytywanie"
 
-#: src/game.cpp:662
+#: src/game.cpp:663
 msgid "Loading..."
 msgstr "Wczytywanie..."
 
-#: src/game.cpp:671
+#: src/game.cpp:672
 msgid "Creating server..."
 msgstr "Tworzenie serwera..."
 
-#: src/game.cpp:682
+#: src/game.cpp:683
 msgid "Creating client..."
 msgstr "Tworzenie klienta..."
 
-#: src/game.cpp:687
+#: src/game.cpp:688
 msgid "Resolving address..."
 msgstr "Rozwiązywanie adresu..."
 
-#: src/game.cpp:698
+#: src/game.cpp:699
 msgid "Couldn't resolve address"
 msgstr "Nie można rozwinąć adresu"
 
-#: src/game.cpp:738
+#: src/game.cpp:739
 #, c-format
 msgid "Connecting to server... (timeout in %d second)"
 msgid_plural "Connecting to server... (timeout in %d seconds)"
@@ -3367,107 +3391,107 @@ msgstr[0] "Łączenie z serwerem... (koniec czasu połączenia za %d sekundę)"
 msgstr[1] "Łączenie z serwerem... (koniec czasu połączenia za %d sekund)"
 msgstr[2] "Łączenie z serwerem... (koniec czasu połączenia za %d sekund)"
 
-#: src/game.cpp:767
+#: src/game.cpp:768
 #, c-format
 msgid "Access denied. Reason: %ls"
 msgstr "Odmowa dostępu. Powód: %ls"
 
-#: src/game.cpp:771
+#: src/game.cpp:772
 msgid "Unable to Connect (port already in use?)."
 msgstr "Nie można się połączyć (port już zajęty?)"
 
-#: src/game.cpp:774
+#: src/game.cpp:775
 msgid "Connection timed out."
 msgstr "Koniec czasu połączenia"
 
-#: src/game.cpp:927
+#: src/game.cpp:928
 msgid "Access denied. Reason: "
 msgstr "Odmowa dostępu. Powód:"
 
-#: src/game.cpp:1161
+#: src/game.cpp:1162
 msgid "free_move disabled"
 msgstr ""
 
-#: src/game.cpp:1165
+#: src/game.cpp:1166
 msgid "free_move enabled"
 msgstr ""
 
-#: src/game.cpp:1177
+#: src/game.cpp:1178
 #, c-format
 msgid "Saved screenshot to '%s'"
 msgstr "Zapisano zrzut ekranu do '%s'"
 
-#: src/game.cpp:1189
+#: src/game.cpp:1190
 msgid "HUD shown"
 msgstr "Interfejs HUD pokazany"
 
-#: src/game.cpp:1191
+#: src/game.cpp:1192
 msgid "HUD hidden"
 msgstr "Interfejs HUD ukryty"
 
-#: src/game.cpp:1197
+#: src/game.cpp:1198
 msgid "Chat shown"
 msgstr "Okno czatu pokazane"
 
-#: src/game.cpp:1199
+#: src/game.cpp:1200
 msgid "Chat hidden"
 msgstr "Okno czatu ukryte"
 
-#: src/game.cpp:1205
+#: src/game.cpp:1206
 msgid "Fog disabled"
 msgstr "Mgła wyłączona"
 
-#: src/game.cpp:1207
+#: src/game.cpp:1208
 msgid "Fog enabled"
 msgstr "Mgła włączona"
 
-#: src/game.cpp:1213
+#: src/game.cpp:1214
 msgid "Camera update disabled"
 msgstr ""
 
-#: src/game.cpp:1215
+#: src/game.cpp:1216
 msgid "Camera update enabled"
 msgstr ""
 
-#: src/game.cpp:1225
+#: src/game.cpp:1226
 msgid "Debug info shown"
 msgstr "Debug pokazany"
 
-#: src/game.cpp:1230
+#: src/game.cpp:1231
 msgid "Debug info and frametime graph hidden"
 msgstr "Debug oraz wykres klatek ukryty"
 
-#: src/game.cpp:1234
+#: src/game.cpp:1235
 msgid "Frametime graph shown"
 msgstr "Wykres klatek pokazany"
 
-#: src/game.cpp:1246
+#: src/game.cpp:1247
 #, c-format
 msgid "Profiler shown (page %d of %d)"
 msgstr "Profiler pokazany (strona %d z %d)"
 
-#: src/game.cpp:1250
+#: src/game.cpp:1251
 msgid "Profiler hidden"
 msgstr "Profiler ukryty"
 
-#: src/game.cpp:1258 src/game.cpp:1269
+#: src/game.cpp:1259 src/game.cpp:1270
 #, c-format
 msgid "Minimum viewing range changed to %d"
 msgstr "Minimalny zasięg widoczności zmieniony na %d"
 
-#: src/game.cpp:1338
+#: src/game.cpp:1339
 msgid "Enabled full viewing range"
 msgstr "Włącz pełny zasięg widoczności"
 
-#: src/game.cpp:1342
+#: src/game.cpp:1343
 msgid "Disabled full viewing range"
 msgstr "Wyłącz pełny zasięg widoczności"
 
-#: src/game.cpp:1995
+#: src/game.cpp:1950
 msgid "Disconnected (Network Timeout)"
 msgstr "Rozłączono z serwera (Brak Odpowiedzi Sieci)"
 
-#: src/game.cpp:2407
+#: src/game.cpp:2382
 msgid "Shutting down..."
 msgstr "Wyłączanie..."
 
@@ -3481,242 +3505,291 @@ msgstr "Odradzanie się"
 
 #: src/guiFormSpecMenu.cpp:436
 msgid "Left click: Move all items, Right click: Move single item"
-msgstr "Kliknięcie lewym przyciskiem myszy: Przenieś wszystkie przedmioty, Kliknięcie prawym przyciskiem myszy: Przenieś pojedynczy przedmiot"
+msgstr ""
+"Kliknięcie lewym przyciskiem myszy: Przenieś wszystkie przedmioty, "
+"Kliknięcie prawym przyciskiem myszy: Przenieś pojedynczy przedmiot"
 
 #: src/guiFormSpecMenu.cpp:458
 msgid "Write It"
 msgstr "Napisz"
 
-#: src/guiMainMenu.cpp:347
+#: src/guiMainMenu.cpp:319
 msgid "Character Creator"
 msgstr "Tworzenie Postaci"
 
-#: src/guiMainMenu.cpp:353 src/guiMainMenu.cpp:478 src/guiMainMenu.cpp:520
-#: src/guiMainMenu.cpp:631
+#: src/guiMainMenu.cpp:325 src/guiMainMenu.cpp:386 src/guiMainMenu.cpp:428
+#: src/guiMainMenu.cpp:539
 msgid "Single Player"
 msgstr "Gra jednoosobowa"
 
-#: src/guiMainMenu.cpp:359 src/guiMainMenu.cpp:410
+#: src/guiMainMenu.cpp:331 src/guiMultiplayerMenu.cpp:161
 msgid "Multi Player"
 msgstr "Tryb dla wielu graczy"
 
-#: src/guiMainMenu.cpp:365 src/guiPauseMenu.cpp:155
+#: src/guiMainMenu.cpp:337 src/guiPauseMenu.cpp:155
 msgid "Settings"
 msgstr "Opcje"
 
-#: src/guiMainMenu.cpp:371
+#: src/guiMainMenu.cpp:343
 msgid "Credits"
 msgstr "Twórcy"
 
-#: src/guiMainMenu.cpp:377
+#: src/guiMainMenu.cpp:349
 msgid "Quit"
 msgstr "Zamknij"
 
-#: src/guiMainMenu.cpp:418
-msgid "Name/Password"
-msgstr "Nazwa/Hasło"
-
-#: src/guiMainMenu.cpp:446
-msgid "Address/Port"
-msgstr "Adres/Port"
-
-#: src/guiMainMenu.cpp:472
-msgid "Connect"
-msgstr "Połącz"
-
-#: src/guiMainMenu.cpp:487 src/guiMainMenu.cpp:529 src/guiMainMenu.cpp:640
+#: src/guiMainMenu.cpp:395 src/guiMainMenu.cpp:437 src/guiMainMenu.cpp:548
 msgid "Creative Mode"
 msgstr "Tryb Kreatywny"
 
-#: src/guiMainMenu.cpp:488 src/guiMainMenu.cpp:530 src/guiMainMenu.cpp:641
+#: src/guiMainMenu.cpp:396 src/guiMainMenu.cpp:438 src/guiMainMenu.cpp:549
 msgid "Adventure Mode"
 msgstr "Tryb Przygodowy"
 
-#: src/guiMainMenu.cpp:489 src/guiMainMenu.cpp:531 src/guiMainMenu.cpp:642
+#: src/guiMainMenu.cpp:397 src/guiMainMenu.cpp:439 src/guiMainMenu.cpp:550
 msgid "Survival Mode"
 msgstr "Tryb Przetrwania"
 
-#: src/guiMainMenu.cpp:502 src/guiMainMenu.cpp:655
+#: src/guiMainMenu.cpp:410 src/guiMainMenu.cpp:563
 msgid "Advanced Settings"
 msgstr "Ustawienia Zaawansowane"
 
-#: src/guiMainMenu.cpp:508 src/guiMainMenu.cpp:550
+#: src/guiMainMenu.cpp:416 src/guiMainMenu.cpp:458
 msgid "Map Options"
 msgstr "Ustawienia Mapy"
 
-#: src/guiMainMenu.cpp:514 src/guiMainMenu.cpp:625 src/guiMainMenu.cpp:750
+#: src/guiMainMenu.cpp:422 src/guiMainMenu.cpp:533 src/guiMainMenu.cpp:658
 msgid "Start Game"
 msgstr "Rozpocznij Grę"
 
-#: src/guiMainMenu.cpp:544
+#: src/guiMainMenu.cpp:452
 msgid "Hide Advanced Settings"
 msgstr "Ukryj Opcje Zaawansowane"
 
-#: src/guiMainMenu.cpp:555
+#: src/guiMainMenu.cpp:463
 msgid "Creatures"
 msgstr "Stworzenia"
 
-#: src/guiMainMenu.cpp:562
+#: src/guiMainMenu.cpp:470
 msgid "None"
 msgstr ""
 
-#: src/guiMainMenu.cpp:563
+#: src/guiMainMenu.cpp:471
 msgid "Passive"
 msgstr "Bierny"
 
-#: src/guiMainMenu.cpp:564
+#: src/guiMainMenu.cpp:472
 msgid "Passive & Aggressive"
 msgstr "Bierny i Agresywny"
 
-#: src/guiMainMenu.cpp:565
+#: src/guiMainMenu.cpp:473
 msgid "Passive, Aggressive, & Destructive"
 msgstr "Pasywne, Agresywne i Destrukcyjne"
 
-#: src/guiMainMenu.cpp:579
+#: src/guiMainMenu.cpp:487
 msgid "Player Damage"
 msgstr "Obrażenia Gracza"
 
-#: src/guiMainMenu.cpp:584
+#: src/guiMainMenu.cpp:492
 msgid "Suffocation/Drowning"
 msgstr "Duszenie się/Tonięcie"
 
-#: src/guiMainMenu.cpp:589
+#: src/guiMainMenu.cpp:497
 msgid "Hunger"
 msgstr "Głód"
 
-#: src/guiMainMenu.cpp:594
+#: src/guiMainMenu.cpp:502
 msgid "Tool Wear"
 msgstr "Trzymanie Narzędzi"
 
-#: src/guiMainMenu.cpp:599
+#: src/guiMainMenu.cpp:507
 msgid "Dangerous Fire"
 msgstr ""
 
-#: src/guiMainMenu.cpp:604
+#: src/guiMainMenu.cpp:512
 msgid "Infinite Inventory"
 msgstr "Nieskończony Inwentarz"
 
-#: src/guiMainMenu.cpp:609
+#: src/guiMainMenu.cpp:517
 msgid "Initial Inventory"
 msgstr "Początkowy Inwentarz"
 
-#: src/guiMainMenu.cpp:614
+#: src/guiMainMenu.cpp:522
 msgid "Droppable Inventory"
 msgstr "Możliwy do wyrzucenia Inwentarz"
 
-#: src/guiMainMenu.cpp:619
+#: src/guiMainMenu.cpp:527
 msgid "Death drops Inventory"
 msgstr ""
 
-#: src/guiMainMenu.cpp:661
+#: src/guiMainMenu.cpp:569
 msgid "Hide Map Options"
 msgstr "Ukryj Opcje Mapy"
 
-#: src/guiMainMenu.cpp:666
+#: src/guiMainMenu.cpp:574
 msgid "Create New Map"
 msgstr "Stwórz Nową Mapę"
 
-#: src/guiMainMenu.cpp:672
+#: src/guiMainMenu.cpp:580
 msgid "Warning! Your old map will be deleted!"
 msgstr "Uwaga! Stara mapa zostanie usunięta!"
 
-#: src/guiMainMenu.cpp:678
+#: src/guiMainMenu.cpp:586
 msgid "Map Type"
 msgstr "Rodzaj Mapy"
 
-#: src/guiMainMenu.cpp:685
+#: src/guiMainMenu.cpp:593
 msgid "Flat"
 msgstr "Płaska"
 
-#: src/guiMainMenu.cpp:686
+#: src/guiMainMenu.cpp:594
 msgid "Flatter"
 msgstr "Jeszcze Bardziej Płaska"
 
-#: src/guiMainMenu.cpp:687
+#: src/guiMainMenu.cpp:595
 msgid "Smoother"
 msgstr "Gładsza"
 
-#: src/guiMainMenu.cpp:688
+#: src/guiMainMenu.cpp:596
 msgid "Default"
 msgstr "Domyślne"
 
-#: src/guiMainMenu.cpp:689
+#: src/guiMainMenu.cpp:597
 msgid "Hilly"
 msgstr "Pagórzaste"
 
-#: src/guiMainMenu.cpp:690
+#: src/guiMainMenu.cpp:598
 msgid "Mountains"
 msgstr "Góry"
 
-#: src/guiMainMenu.cpp:691
+#: src/guiMainMenu.cpp:599
 msgid "Crazy"
 msgstr "Szalone"
 
-#: src/guiMainMenu.cpp:692
+#: src/guiMainMenu.cpp:600
 msgid "Crazy Hills"
 msgstr "Szalone Wzgórza"
 
-#: src/guiMainMenu.cpp:714
+#: src/guiMainMenu.cpp:622
 msgid "Use Fixed Seed"
 msgstr "Użyj Naprawionych Seed'ów"
 
-#: src/guiMainMenu.cpp:720
+#: src/guiMainMenu.cpp:628
 msgid "Map Seed"
 msgstr "Seed Mapy"
 
-#: src/guiMainMenu.cpp:737
+#: src/guiMainMenu.cpp:645
 msgid "Clear Map"
 msgstr "Wyczyść Mapę"
 
-#: src/guiMainMenu.cpp:742
+#: src/guiMainMenu.cpp:650
 msgid "Warning! This will delete all construction from your map!"
 msgstr "Uwaga! Ta opcja usunie wszystkie budowle z twojej mapy!"
 
-#: src/guiMainMenu.cpp:760
+#: src/guiMainMenu.cpp:668
 msgid ""
 "Voxelands\n"
 "http://www.voxelands.com/\n"
 "By Lisa 'darkrose' Milne <lisa@ltmnet.com> and contributors."
 msgstr ""
 
-#: src/guiMainMenu.cpp:767
+#: src/guiMainMenu.cpp:675
 msgid "Programmers"
 msgstr ""
 
-#: src/guiMainMenu.cpp:770
+#: src/guiMainMenu.cpp:678
 msgid "Artists and Modellers"
 msgstr ""
 
-#: src/guiMainMenu.cpp:773
+#: src/guiMainMenu.cpp:681
 msgid "Translators"
 msgstr ""
 
-#: src/guiMainMenu.cpp:776
+#: src/guiMainMenu.cpp:684
 msgid "Documentation Writters"
 msgstr ""
 
-#: src/guiMainMenu.cpp:779
+#: src/guiMainMenu.cpp:687
 msgid "Testers, Packagers, and Builders"
 msgstr ""
 
-#: src/guiMainMenu.cpp:782
+#: src/guiMainMenu.cpp:690
 msgid "Music and Sound Effects Composers"
 msgstr ""
 
-#: src/guiMainMenu.cpp:785
+#: src/guiMainMenu.cpp:693
 msgid "Other Contributers, and Special Thanks"
 msgstr ""
 
-#: src/guiMainMenu.cpp:789
+#: src/guiMainMenu.cpp:697
 msgid ""
 "Based on Minetest-C55 by Perttu Ahola <celeron55@gmail.com>\n"
-"and contributors: PilzAdam, Taoki, tango_, kahrl (kaaaaaahrl?), darkrose, matttpt, erlehmann, SpeedProg, JacobF, teddydestodes, marktraceur, Jonathan Neuschafer, thexyz, VanessaE, sfan5... and tens of more random people."
+"and contributors: PilzAdam, Taoki, tango_, kahrl (kaaaaaahrl?), darkrose, "
+"matttpt, erlehmann, SpeedProg, JacobF, teddydestodes, marktraceur, Jonathan "
+"Neuschafer, thexyz, VanessaE, sfan5... and tens of more random people."
 msgstr ""
 
 #: src/guiMessageMenu.cpp:112 src/guiPauseMenu.cpp:143
 msgid "Continue"
 msgstr "Kontynuuj"
 
+#: src/guiMultiplayerMenu.cpp:135 src/guiSettingsMenu.cpp:277
+msgid "Main Menu"
+msgstr ""
+
+#: src/guiMultiplayerMenu.cpp:142
+msgid "All Servers"
+msgstr ""
+
+#: src/guiMultiplayerMenu.cpp:148
+msgid "Favourite Servers"
+msgstr ""
+
+#: src/guiMultiplayerMenu.cpp:154
+#, fuzzy
+msgid "Custom Connect"
+msgstr "Połącz"
+
+#: src/guiMultiplayerMenu.cpp:169
+msgid "Custom Connection"
+msgstr ""
+
+#: src/guiMultiplayerMenu.cpp:176
+msgid "Address/Port"
+msgstr "Adres/Port"
+
+#: src/guiMultiplayerMenu.cpp:201 src/guiMultiplayerMenu.cpp:313
+msgid "Add to Favourites"
+msgstr ""
+
+#: src/guiMultiplayerMenu.cpp:206 src/guiMultiplayerMenu.cpp:320
+msgid "Connect"
+msgstr "Połącz"
+
+#: src/guiMultiplayerMenu.cpp:213
+msgid "Name/Password"
+msgstr "Nazwa/Hasło"
+
+#: src/guiMultiplayerMenu.cpp:240
+msgid "Join Server"
+msgstr ""
+
+#: src/guiMultiplayerMenu.cpp:262
+msgid "My Favourites"
+msgstr ""
+
+#: src/guiMultiplayerMenu.cpp:265
+msgid "Server List"
+msgstr ""
+
+#: src/guiMultiplayerMenu.cpp:270
+msgid "Get New List"
+msgstr ""
+
+#: src/guiMultiplayerMenu.cpp:307
+msgid "Remove from Favourites"
+msgstr ""
+
 #: src/guiPasswordChange.cpp:105
 msgid "Old Password"
 msgstr "Stare Hasło"
@@ -3757,11 +3830,11 @@ msgstr "Naprzód"
 msgid "Backward"
 msgstr "Do tyłu"
 
-#: src/guiSettingsMenu.cpp:72 src/keycode.cpp:234
+#: src/guiSettingsMenu.cpp:72 src/keycode.cpp:263
 msgid "Left"
 msgstr "Lewo"
 
-#: src/guiSettingsMenu.cpp:73 src/keycode.cpp:234
+#: src/guiSettingsMenu.cpp:73 src/keycode.cpp:265
 msgid "Right"
 msgstr "Prawo"
 
@@ -3797,11 +3870,11 @@ msgstr ""
 msgid "Toggle Fly"
 msgstr ""
 
-#: src/guiSettingsMenu.cpp:82 src/keycode.cpp:234
+#: src/guiSettingsMenu.cpp:82 src/keycode.cpp:264
 msgid "Up"
 msgstr "Góra"
 
-#: src/guiSettingsMenu.cpp:83 src/keycode.cpp:234
+#: src/guiSettingsMenu.cpp:83 src/keycode.cpp:266
 msgid "Down"
 msgstr "Dół"
 
@@ -3845,10 +3918,6 @@ msgstr ""
 msgid "Next Item"
 msgstr ""
 
-#: src/guiSettingsMenu.cpp:277
-msgid "Main Menu"
-msgstr ""
-
 #: src/guiSettingsMenu.cpp:284 src/guiSettingsMenu.cpp:311
 msgid "Controls"
 msgstr "Sterowanie"
@@ -3956,362 +4025,576 @@ msgstr ""
 msgid "Cold Protection: %d:%02d"
 msgstr ""
 
-#: src/inventory.cpp:230 src/inventory.cpp:352
-msgid "Cookable: Yes"
-msgstr ""
-
-#: src/inventory.cpp:235 src/inventory.cpp:357 src/inventory.cpp:532
-msgid "Fuel Burn Time: "
-msgstr ""
-
-#: src/inventory.cpp:321
-msgid "Hunger: "
-msgstr ""
-
-#: src/inventory.cpp:327
-msgid "Health: "
-msgstr ""
-
-#: src/inventory.cpp:334
-msgid "Cold Protection: "
-msgstr ""
-
-#: src/inventory.cpp:343
-msgid "Energy Boost: "
-msgstr ""
-
-#: src/inventory.cpp:521
-msgid "Strength: "
-msgstr ""
-
-#: src/inventory.cpp:524
-msgid "Speed: "
-msgstr ""
-
-#: src/inventory.cpp:527
-msgid "Level: "
-msgstr ""
-
-#: src/inventory.cpp:557
+#: src/inventory.cpp:246 src/inventory.cpp:580
 msgid "Contains: "
 msgstr ""
 
-#: src/inventory.cpp:643
+#: src/inventory.cpp:253 src/inventory.cpp:375
+msgid "Cookable: Yes"
+msgstr ""
+
+#: src/inventory.cpp:258 src/inventory.cpp:380 src/inventory.cpp:555
+msgid "Fuel Burn Time: "
+msgstr ""
+
+#: src/inventory.cpp:344
+msgid "Hunger: "
+msgstr ""
+
+#: src/inventory.cpp:350
+msgid "Health: "
+msgstr ""
+
+#: src/inventory.cpp:357
+msgid "Cold Protection: "
+msgstr ""
+
+#: src/inventory.cpp:366
+msgid "Energy Boost: "
+msgstr ""
+
+#: src/inventory.cpp:544
+msgid "Strength: "
+msgstr ""
+
+#: src/inventory.cpp:547
+msgid "Speed: "
+msgstr ""
+
+#: src/inventory.cpp:550
+msgid "Level: "
+msgstr ""
+
+#: src/inventory.cpp:666
 msgid "Armour: "
 msgstr ""
 
-#: src/inventory.cpp:649
+#: src/inventory.cpp:672
 msgid "Warmth: "
 msgstr ""
 
-#: src/inventory.cpp:655
+#: src/inventory.cpp:678
 msgid "Pressure: "
 msgstr ""
 
-#: src/inventory.cpp:661
+#: src/inventory.cpp:684
 msgid "Suffocation: "
 msgstr ""
 
-#: src/inventory.cpp:667
+#: src/inventory.cpp:690
 msgid "Durability: "
 msgstr ""
 
-#: src/inventory.cpp:672
+#: src/inventory.cpp:695
 msgid "Effect Boost: "
 msgstr ""
 
-#: src/keycode.cpp:229
+#: src/keycode.cpp:232
+msgid "-"
+msgstr ""
+
+#: src/keycode.cpp:234
 msgid "Left Button"
 msgstr "Lewy Przycisk Myszy"
 
-#: src/keycode.cpp:229
-msgid "Middle Button"
-msgstr "Środkowy Przycisk Myszy"
-
-#: src/keycode.cpp:229
+#: src/keycode.cpp:235
 msgid "Right Button"
 msgstr "Prawy Przycisk Myszy"
 
-#: src/keycode.cpp:229
+#: src/keycode.cpp:237
+msgid "Middle Button"
+msgstr "Środkowy Przycisk Myszy"
+
+#: src/keycode.cpp:238
 msgid "X Button 1"
 msgstr "X Button 1"
 
-#: src/keycode.cpp:230
-msgid "Back"
-msgstr "Cofnij"
-
-#: src/keycode.cpp:230
-msgid "Clear"
-msgstr "Wyczyść"
-
-#: src/keycode.cpp:230
-msgid "Return"
-msgstr "Cofnij"
-
-#: src/keycode.cpp:230
-msgid "Tab"
-msgstr "Tabulator"
-
-#: src/keycode.cpp:230
+#: src/keycode.cpp:239
 msgid "X Button 2"
 msgstr "X Button 2"
 
-#: src/keycode.cpp:231
-msgid "Capital"
-msgstr "Stolica"
+#: src/keycode.cpp:240
+msgid "Back"
+msgstr "Cofnij"
 
-#: src/keycode.cpp:231
-msgid "Control"
-msgstr "Control"
+#: src/keycode.cpp:241
+msgid "Tab"
+msgstr "Tabulator"
 
-#: src/keycode.cpp:231
-msgid "Kana"
-msgstr "Kana"
+#: src/keycode.cpp:242
+msgid "Clear"
+msgstr "Wyczyść"
 
-#: src/keycode.cpp:231
-msgid "Menu"
-msgstr "Menu"
+#: src/keycode.cpp:243
+msgid "Return"
+msgstr "Cofnij"
 
-#: src/keycode.cpp:231
-msgid "Pause"
-msgstr "Pauza"
-
-#: src/keycode.cpp:231
+#: src/keycode.cpp:244
 msgid "Shift"
 msgstr "Shift"
 
-#: src/keycode.cpp:232
-msgid "Convert"
-msgstr "Konwertuj"
+#: src/keycode.cpp:245
+msgid "Control"
+msgstr "Control"
 
-#: src/keycode.cpp:232
-msgid "Escape"
-msgstr "Escape"
+#: src/keycode.cpp:246
+msgid "Menu"
+msgstr "Menu"
 
-#: src/keycode.cpp:232
-msgid "Final"
-msgstr "Końcowe"
+#: src/keycode.cpp:247
+msgid "Pause"
+msgstr "Pauza"
 
-#: src/keycode.cpp:232
+#: src/keycode.cpp:248
+msgid "Capital"
+msgstr "Stolica"
+
+#: src/keycode.cpp:249
+msgid "Kana"
+msgstr "Kana"
+
+#: src/keycode.cpp:250
 msgid "Junja"
 msgstr "Junja"
 
-#: src/keycode.cpp:232
+#: src/keycode.cpp:251
+msgid "Final"
+msgstr "Końcowe"
+
+#: src/keycode.cpp:252
 msgid "Kanji"
 msgstr "Kanji"
 
-#: src/keycode.cpp:232
+#: src/keycode.cpp:253
+msgid "Escape"
+msgstr "Escape"
+
+#: src/keycode.cpp:254
+msgid "Convert"
+msgstr "Konwertuj"
+
+#: src/keycode.cpp:255
 msgid "Nonconvert"
 msgstr "Nonconvert"
 
-#: src/keycode.cpp:233
+#: src/keycode.cpp:256
 msgid "Accept"
 msgstr "Zaakceptuj"
 
-#: src/keycode.cpp:233
-msgid "End"
-msgstr "End"
-
-#: src/keycode.cpp:233
-msgid "Home"
-msgstr "Home"
-
-#: src/keycode.cpp:233
+#: src/keycode.cpp:257
 msgid "Mode Change"
 msgstr "Zmiana Trybu"
 
-#: src/keycode.cpp:233
-msgid "Next"
-msgstr "Dalej"
-
-#: src/keycode.cpp:233
-msgid "Prior"
-msgstr "Prior"
-
-#: src/keycode.cpp:233
+#: src/keycode.cpp:258
 msgid "Space"
 msgstr "Spacja"
 
-#: src/keycode.cpp:234
-msgid "Execute"
-msgstr "Wykonaj"
+#: src/keycode.cpp:259
+msgid "Prior"
+msgstr "Prior"
 
-#: src/keycode.cpp:234
-msgid "Print"
-msgstr "Drukuj"
+#: src/keycode.cpp:260
+msgid "Next"
+msgstr "Dalej"
 
-#: src/keycode.cpp:234
+#: src/keycode.cpp:261
+msgid "End"
+msgstr "End"
+
+#: src/keycode.cpp:262
+msgid "Home"
+msgstr "Home"
+
+#: src/keycode.cpp:267
 msgid "Select"
 msgstr "Wybierz"
 
-#: src/keycode.cpp:235
-msgid "Delete"
-msgstr "Delete"
+#: src/keycode.cpp:268
+msgid "Print"
+msgstr "Drukuj"
 
-#: src/keycode.cpp:235
-msgid "Help"
-msgstr "Pomoc"
+#: src/keycode.cpp:269
+msgid "Execute"
+msgstr "Wykonaj"
 
-#: src/keycode.cpp:235
-msgid "Insert"
-msgstr "Wpisz"
-
-#: src/keycode.cpp:235
+#: src/keycode.cpp:270
 msgid "Snapshot"
 msgstr "Snapshot"
 
-#: src/keycode.cpp:238
+#: src/keycode.cpp:271
+msgid "Insert"
+msgstr "Wpisz"
+
+#: src/keycode.cpp:272
+msgid "Delete"
+msgstr "Delete"
+
+#: src/keycode.cpp:273
+msgid "Help"
+msgstr "Pomoc"
+
+#: src/keycode.cpp:274
+msgid "0"
+msgstr ""
+
+#: src/keycode.cpp:275
+msgid "1"
+msgstr ""
+
+#: src/keycode.cpp:276
+msgid "2"
+msgstr ""
+
+#: src/keycode.cpp:277
+msgid "3"
+msgstr ""
+
+#: src/keycode.cpp:278
+msgid "4"
+msgstr ""
+
+#: src/keycode.cpp:279
+msgid "5"
+msgstr ""
+
+#: src/keycode.cpp:280
+msgid "6"
+msgstr ""
+
+#: src/keycode.cpp:281
+msgid "7"
+msgstr ""
+
+#: src/keycode.cpp:282
+msgid "8"
+msgstr ""
+
+#: src/keycode.cpp:283
+msgid "9"
+msgstr ""
+
+#: src/keycode.cpp:284
+msgid "A"
+msgstr ""
+
+#: src/keycode.cpp:285
+msgid "B"
+msgstr ""
+
+#: src/keycode.cpp:286
+msgid "C"
+msgstr ""
+
+#: src/keycode.cpp:287
+msgid "D"
+msgstr ""
+
+#: src/keycode.cpp:288
+msgid "E"
+msgstr ""
+
+#: src/keycode.cpp:289
+msgid "F"
+msgstr ""
+
+#: src/keycode.cpp:290
+msgid "G"
+msgstr ""
+
+#: src/keycode.cpp:291
+msgid "H"
+msgstr ""
+
+#: src/keycode.cpp:292
+msgid "I"
+msgstr ""
+
+#: src/keycode.cpp:293
+msgid "J"
+msgstr ""
+
+#: src/keycode.cpp:294
+msgid "K"
+msgstr ""
+
+#: src/keycode.cpp:295
+msgid "L"
+msgstr ""
+
+#: src/keycode.cpp:296
+msgid "M"
+msgstr ""
+
+#: src/keycode.cpp:297
+msgid "N"
+msgstr ""
+
+#: src/keycode.cpp:298
+msgid "O"
+msgstr ""
+
+#: src/keycode.cpp:299
+msgid "P"
+msgstr ""
+
+#: src/keycode.cpp:300
+msgid "Q"
+msgstr ""
+
+#: src/keycode.cpp:301
+msgid "R"
+msgstr ""
+
+#: src/keycode.cpp:302
+msgid "S"
+msgstr ""
+
+#: src/keycode.cpp:303
+msgid "T"
+msgstr ""
+
+#: src/keycode.cpp:304
+#, fuzzy
+msgid "U"
+msgstr "Góra"
+
+#: src/keycode.cpp:305
+msgid "V"
+msgstr ""
+
+#: src/keycode.cpp:306
+msgid "W"
+msgstr ""
+
+#: src/keycode.cpp:307
+msgid "X"
+msgstr ""
+
+#: src/keycode.cpp:308
+msgid "Y"
+msgstr ""
+
+#: src/keycode.cpp:309
+msgid "Z"
+msgstr ""
+
+#: src/keycode.cpp:310
 msgid "Left Windows"
 msgstr "Lewe okienko Windows"
 
-#: src/keycode.cpp:239
-msgid "Apps"
-msgstr "Aplikacje"
-
-#: src/keycode.cpp:239
-msgid "Numpad 0"
-msgstr "Kl. num. 0"
-
-#: src/keycode.cpp:239
-msgid "Numpad 1"
-msgstr "Kl. num. 1"
-
-#: src/keycode.cpp:239
+#: src/keycode.cpp:311
 msgid "Right Windows"
 msgstr "Prawe okienko Windows"
 
-#: src/keycode.cpp:239
+#: src/keycode.cpp:312
+msgid "Apps"
+msgstr "Aplikacje"
+
+#: src/keycode.cpp:313
 msgid "Sleep"
 msgstr "Uśpij"
 
-#: src/keycode.cpp:240
+#: src/keycode.cpp:314
+msgid "Numpad 0"
+msgstr "Kl. num. 0"
+
+#: src/keycode.cpp:315
+msgid "Numpad 1"
+msgstr "Kl. num. 1"
+
+#: src/keycode.cpp:316
 msgid "Numpad 2"
 msgstr "Kl. num. 2"
 
-#: src/keycode.cpp:240
+#: src/keycode.cpp:317
 msgid "Numpad 3"
 msgstr "Kl. num. 3"
 
-#: src/keycode.cpp:240
+#: src/keycode.cpp:318
 msgid "Numpad 4"
 msgstr "Kl. num. 4"
 
-#: src/keycode.cpp:240
+#: src/keycode.cpp:319
 msgid "Numpad 5"
 msgstr "Kl. num. 5"
 
-#: src/keycode.cpp:240
+#: src/keycode.cpp:320
 msgid "Numpad 6"
 msgstr "Kl. num. 6"
 
-#: src/keycode.cpp:240
+#: src/keycode.cpp:321
 msgid "Numpad 7"
 msgstr "Kl. num. 7"
 
-#: src/keycode.cpp:241
-msgid "Numpad *"
-msgstr "Kl. num. *"
-
-#: src/keycode.cpp:241
-msgid "Numpad +"
-msgstr "Kl. num. +"
-
-#: src/keycode.cpp:241
-msgid "Numpad -"
-msgstr "Kl. num. -"
-
-#: src/keycode.cpp:241
-msgid "Numpad /"
-msgstr "Kl. num. /"
-
-#: src/keycode.cpp:241
+#: src/keycode.cpp:322
 msgid "Numpad 8"
 msgstr "Kl. num. 8"
 
-#: src/keycode.cpp:241
+#: src/keycode.cpp:323
 msgid "Numpad 9"
 msgstr "Kl. num. 9"
 
-#: src/keycode.cpp:245
+#: src/keycode.cpp:324
+msgid "Numpad *"
+msgstr "Kl. num. *"
+
+#: src/keycode.cpp:325
+msgid "Numpad +"
+msgstr "Kl. num. +"
+
+#: src/keycode.cpp:326 src/keycode.cpp:329
+msgid "Numpad /"
+msgstr "Kl. num. /"
+
+#: src/keycode.cpp:327
+msgid "Numpad -"
+msgstr "Kl. num. -"
+
+#: src/keycode.cpp:328
+#, fuzzy
+msgid "Numpad ."
+msgstr "Kl. num. 0"
+
+#: src/keycode.cpp:330
+msgid "F10"
+msgstr ""
+
+#: src/keycode.cpp:331
+msgid "F11"
+msgstr ""
+
+#: src/keycode.cpp:332
+msgid "F12"
+msgstr ""
+
+#: src/keycode.cpp:333
+msgid "F13"
+msgstr ""
+
+#: src/keycode.cpp:334
+msgid "F14"
+msgstr ""
+
+#: src/keycode.cpp:335
+msgid "F15"
+msgstr ""
+
+#: src/keycode.cpp:336
+msgid "F16"
+msgstr ""
+
+#: src/keycode.cpp:337
+msgid "F17"
+msgstr ""
+
+#: src/keycode.cpp:338
+msgid "F18"
+msgstr ""
+
+#: src/keycode.cpp:339
+msgid "F19"
+msgstr ""
+
+#: src/keycode.cpp:340
+msgid "F20"
+msgstr ""
+
+#: src/keycode.cpp:341
+msgid "F21"
+msgstr ""
+
+#: src/keycode.cpp:342
+msgid "F22"
+msgstr ""
+
+#: src/keycode.cpp:343
+msgid "F23"
+msgstr ""
+
+#: src/keycode.cpp:344
+msgid "F24"
+msgstr ""
+
+#: src/keycode.cpp:345
 msgid "Num Lock"
 msgstr "Num Lock"
 
-#: src/keycode.cpp:245
+#: src/keycode.cpp:346
 msgid "Scroll Lock"
 msgstr "Scroll Lock"
 
-#: src/keycode.cpp:246
+#: src/keycode.cpp:347
 msgid "Left Shift"
 msgstr "Lewy Shift"
 
-#: src/keycode.cpp:246
+#: src/keycode.cpp:348
 msgid "Right Shift"
 msgstr "Prawy Shift"
 
-#: src/keycode.cpp:247
+#: src/keycode.cpp:349
 msgid "Left Control"
 msgstr "Lewy Control"
 
-#: src/keycode.cpp:247
-msgid "Left Menu"
-msgstr "Lewe Menu"
-
-#: src/keycode.cpp:247
+#: src/keycode.cpp:350
 msgid "Right Control"
 msgstr "Prawy Control"
 
-#: src/keycode.cpp:247
+#: src/keycode.cpp:351
+msgid "Left Menu"
+msgstr "Lewe Menu"
+
+#: src/keycode.cpp:352
 msgid "Right Menu"
 msgstr "Prawe Menu"
 
-#: src/keycode.cpp:249
-msgid "Comma"
-msgstr "Przecinek"
-
-#: src/keycode.cpp:249
-msgid "Minus"
-msgstr "Minus"
-
-#: src/keycode.cpp:249
-msgid "Period"
-msgstr "Okres"
-
-#: src/keycode.cpp:249
+#: src/keycode.cpp:353
 msgid "Plus"
 msgstr "Plus"
 
-#: src/keycode.cpp:253
+#: src/keycode.cpp:354
+msgid "Comma"
+msgstr "Przecinek"
+
+#: src/keycode.cpp:355
+msgid "Minus"
+msgstr "Minus"
+
+#: src/keycode.cpp:356
+msgid "Period"
+msgstr "Okres"
+
+#: src/keycode.cpp:357
 msgid "Attn"
 msgstr "Attn"
 
-#: src/keycode.cpp:253
+#: src/keycode.cpp:358
 msgid "CrSel"
 msgstr "CrSel"
 
-#: src/keycode.cpp:254
-msgid "Erase OEF"
-msgstr "Wyczyść OEF"
-
-#: src/keycode.cpp:254
+#: src/keycode.cpp:359
 msgid "ExSel"
 msgstr "ExSel"
 
-#: src/keycode.cpp:254
-msgid "OEM Clear"
-msgstr "OEM Clear"
+#: src/keycode.cpp:360
+msgid "Erase OEF"
+msgstr "Wyczyść OEF"
 
-#: src/keycode.cpp:254
-msgid "PA1"
-msgstr "PA1"
-
-#: src/keycode.cpp:254
+#: src/keycode.cpp:361
 msgid "Play"
 msgstr "Graj"
 
-#: src/keycode.cpp:254
+#: src/keycode.cpp:362
 msgid "Zoom"
 msgstr "Przybliżenie"
 
+#: src/keycode.cpp:363
+msgid "PA1"
+msgstr "PA1"
+
+#: src/keycode.cpp:364
+msgid "OEM Clear"
+msgstr "OEM Clear"
+
 #: src/main.cpp:1131
 msgid "Setting Up UI"
 msgstr "Ustawianie Interfejsu"
@@ -4328,30 +4611,69 @@ msgstr "Wczytywanie Stworzeń"
 msgid "Setting Up Sound"
 msgstr "Ustawienia Dźwięku"
 
-#: src/mapnode.cpp:282
+#: src/mapnode.cpp:285
 msgid "Loading Base MapNodes"
 msgstr "Wczytywanie Podstawowych Węzłów"
 
-#: src/mapnode.cpp:286
+#: src/mapnode.cpp:289
 msgid "Loading Circuit MapNodes"
 msgstr "Wczytywanie Węzłów Obwodów"
 
-#: src/mapnode.cpp:290
+#: src/mapnode.cpp:293
 msgid "Loading Plant MapNodes"
 msgstr "Wczytywanie Węzłów Roślinności"
 
-#: src/mapnode.cpp:294
+#: src/mapnode.cpp:297
 msgid "Loading Farming MapNodes"
 msgstr "Wczytywanie Węzłów Rolnictwa"
 
-#: src/mapnode.cpp:298
+#: src/mapnode.cpp:301
 msgid "Loading Decorative MapNodes"
 msgstr "Wczytywanie Węzłów Dekoracji"
 
-#: src/mapnode.cpp:302
+#: src/mapnode.cpp:305
 msgid "Loading Interactive MapNodes"
 msgstr "Wczytywanie Węzłów Interakcji"
 
-#: src/mapnode.cpp:306
+#: src/mapnode.cpp:309
 msgid "Loading Special MapNodes"
 msgstr "Wczytywanie Węzłów Specjalnych"
+
+#: src/mineral.cpp:93
+#, fuzzy
+msgid "Coal"
+msgstr "Bryła Węgla Kamiennego"
+
+#: src/mineral.cpp:99
+#, fuzzy
+msgid "Iron"
+msgstr "Bryła Żelaza"
+
+#: src/mineral.cpp:106
+#, fuzzy
+msgid "Tin"
+msgstr "Szczuplejszy/a"
+
+#: src/mineral.cpp:113
+#, fuzzy
+msgid "Copper"
+msgstr "Bryła Miedzi"
+
+#: src/mineral.cpp:121
+#, fuzzy
+msgid "Silver"
+msgstr "Bryła Srebra"
+
+#: src/mineral.cpp:128
+#, fuzzy
+msgid "Gold"
+msgstr "Bryła Złota"
+
+#: src/mineral.cpp:135
+#, fuzzy
+msgid "Quartz"
+msgstr "Proszek Kwarcowy"
+
+#: src/mineral.cpp:157
+msgid "Turquoise"
+msgstr ""
diff --git a/po/pt_BR/voxelands.po b/po/pt_BR/voxelands.po
index 67dc310..e52f032 100644
--- a/po/pt_BR/voxelands.po
+++ b/po/pt_BR/voxelands.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Lisa 'darkrose' Milne
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # Juliana Alves de Sousa Rampi <juas2012@hotmail.com>, 2015
 # Lorram Lomeu de Souza Rampi <lorrampi@gmail.com>, 2015
@@ -9,14 +9,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Voxelands\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-10-19 01:55+1000\n"
+"POT-Creation-Date: 2015-12-21 11:27+1000\n"
 "PO-Revision-Date: 2015-10-18 21:11+0000\n"
 "Last-Translator: Lorram Lomeu de Souza Rampi <lorrampi@gmail.com>\n"
-"Language-Team: Portuguese (Brazil) (http://www.transifex.com/voxelands/voxelands/language/pt_BR/)\n"
+"Language-Team: Portuguese (Brazil) (http://www.transifex.com/voxelands/"
+"voxelands/language/pt_BR/)\n"
+"Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: src/character_creator.cpp:55
@@ -229,9 +230,18 @@ msgstr "Sapatos de Lona"
 
 #: src/character_creator.cpp:202
 msgid ""
-"Here you can create your default character, this is how other players will see you in-game. When you join a new server you will start with the clothing you select here. Additional clothing, both protective and decorative, can be crafted in-game.\n"
+"Here you can create your default character, this is how other players will "
+"see you in-game. When you join a new server you will start with the clothing "
+"you select here. Additional clothing, both protective and decorative, can be "
+"crafted in-game.\n"
 "You can return here from the main menu anytime to change your character."
-msgstr "Aqui você pode criar seu personagem padrão, esta é a forma como os outros jogadores vão vê-lo no jogo. Quando você entra em um novo servidor você vai começar com a roupa que você selecionar aqui. Roupas adicionais, ambas de proteção e decorativas, podem ser trabalhadas no jogo.\nVocê pode voltar aqui a qualquer hora através do menu principal para alterar o seu personagem."
+msgstr ""
+"Aqui você pode criar seu personagem padrão, esta é a forma como os outros "
+"jogadores vão vê-lo no jogo. Quando você entra em um novo servidor você vai "
+"começar com a roupa que você selecionar aqui. Roupas adicionais, ambas de "
+"proteção e decorativas, podem ser trabalhadas no jogo.\n"
+"Você pode voltar aqui a qualquer hora através do menu principal para alterar "
+"o seu personagem."
 
 #: src/character_creator.cpp:223
 msgid "Create Your Character"
@@ -265,7 +275,7 @@ msgstr "Mais Fino"
 msgid "Done"
 msgstr "Feito"
 
-#: src/character_creator.cpp:423 src/keycode.cpp:229
+#: src/character_creator.cpp:423 src/keycode.cpp:236
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -1117,7 +1127,7 @@ msgstr "Pederneira"
 msgid "Steel Ingot"
 msgstr "Barra de Aço"
 
-#: src/content_craftitem.cpp:225 src/content_mapnode.cpp:710
+#: src/content_craftitem.cpp:225 src/content_mapnode.cpp:723
 msgid "Brick"
 msgstr "Tijolo"
 
@@ -1545,11 +1555,11 @@ msgstr "Mithril Bruto"
 msgid "Unbound Mithril"
 msgstr "Mithril não ligada"
 
-#: src/content_craftitem.cpp:1516
+#: src/content_craftitem.cpp:1516 src/mineral.cpp:142
 msgid "Mithril"
 msgstr "Mithril"
 
-#: src/content_craftitem.cpp:1525
+#: src/content_craftitem.cpp:1525 src/mineral.cpp:149
 msgid "Ruby"
 msgstr "Rubi"
 
@@ -1557,15 +1567,15 @@ msgstr "Rubi"
 msgid "Turquiose"
 msgstr "Turqueza"
 
-#: src/content_craftitem.cpp:1541
+#: src/content_craftitem.cpp:1541 src/mineral.cpp:165
 msgid "Amethyst"
 msgstr "Ametista"
 
-#: src/content_craftitem.cpp:1549
+#: src/content_craftitem.cpp:1549 src/mineral.cpp:173
 msgid "Sapphire"
 msgstr "Safira"
 
-#: src/content_craftitem.cpp:1557
+#: src/content_craftitem.cpp:1557 src/mineral.cpp:181
 msgid "Sunstone"
 msgstr "Pedra do Sol"
 
@@ -1577,392 +1587,396 @@ msgstr "Pedra"
 msgid "Limestone"
 msgstr "Calcário"
 
-#: src/content_mapnode.cpp:219
+#: src/content_mapnode.cpp:221
+msgid "Marble"
+msgstr ""
+
+#: src/content_mapnode.cpp:232
 msgid "Rock"
 msgstr "Pedra"
 
-#: src/content_mapnode.cpp:241
+#: src/content_mapnode.cpp:254
 msgid "Ice"
 msgstr "Gelo"
 
-#: src/content_mapnode.cpp:257
+#: src/content_mapnode.cpp:270
 msgid "Coal Block"
 msgstr "Bloco de Carvão"
 
-#: src/content_mapnode.cpp:274
+#: src/content_mapnode.cpp:287
 msgid "Charcoal Block"
 msgstr "Bloco de Carvão Vegetal"
 
-#: src/content_mapnode.cpp:291
+#: src/content_mapnode.cpp:304
 msgid "Stone Brick"
 msgstr "Tijolo de Pedra"
 
-#: src/content_mapnode.cpp:305
+#: src/content_mapnode.cpp:318
 msgid "Stone Block"
 msgstr "Bloco de Pedra"
 
-#: src/content_mapnode.cpp:319
+#: src/content_mapnode.cpp:332
 msgid "Rough Stone Brick"
 msgstr "Tijolo de Pedra Áspera"
 
-#: src/content_mapnode.cpp:336
+#: src/content_mapnode.cpp:349
 msgid "Rough Stone Block"
 msgstr "Bloco de Pedra Áspera"
 
-#: src/content_mapnode.cpp:352 src/content_mapnode.cpp:385
-#: src/content_mapnode.cpp:399 src/content_mapnode.cpp:432
+#: src/content_mapnode.cpp:365 src/content_mapnode.cpp:398
+#: src/content_mapnode.cpp:412 src/content_mapnode.cpp:445
 msgid "Grass"
 msgstr "Grama"
 
-#: src/content_mapnode.cpp:370 src/content_mapnode.cpp:417
+#: src/content_mapnode.cpp:383 src/content_mapnode.cpp:430
 msgid "Growing Grass"
 msgstr "Grama Crescendo"
 
-#: src/content_mapnode.cpp:446
+#: src/content_mapnode.cpp:459
 msgid "Muddy Snow"
 msgstr "Neve Lamacenta"
 
-#: src/content_mapnode.cpp:462
+#: src/content_mapnode.cpp:475
 msgid "Mud"
 msgstr "Lama"
 
-#: src/content_mapnode.cpp:478
+#: src/content_mapnode.cpp:491
 msgid "Ash Block"
 msgstr "Bloco de Cinza"
 
-#: src/content_mapnode.cpp:493
+#: src/content_mapnode.cpp:506
 msgid "Sand"
 msgstr "Areia"
 
-#: src/content_mapnode.cpp:512
+#: src/content_mapnode.cpp:525
 msgid "Gravel"
 msgstr "Cascalho"
 
-#: src/content_mapnode.cpp:529
+#: src/content_mapnode.cpp:542
 msgid "Sand Stone"
 msgstr "Arenito"
 
-#: src/content_mapnode.cpp:544
+#: src/content_mapnode.cpp:557
 msgid "Sand Stone Bricks"
 msgstr "Tijolos de Arenito"
 
-#: src/content_mapnode.cpp:559
+#: src/content_mapnode.cpp:572
 msgid "Sand Stone Blocks"
 msgstr "Blocos de Arenito"
 
-#: src/content_mapnode.cpp:574
+#: src/content_mapnode.cpp:587
 msgid "Clay"
 msgstr "Argila"
 
-#: src/content_mapnode.cpp:591
+#: src/content_mapnode.cpp:604
 msgid "Blue Clay"
 msgstr "Argila Azul"
 
-#: src/content_mapnode.cpp:608
+#: src/content_mapnode.cpp:621
 msgid "Green Clay"
 msgstr "Argila Verde"
 
-#: src/content_mapnode.cpp:625
+#: src/content_mapnode.cpp:638
 msgid "Orange Clay"
 msgstr "Argila Laranja"
 
-#: src/content_mapnode.cpp:642
+#: src/content_mapnode.cpp:655
 msgid "Purple Clay"
 msgstr "Argila Roxa"
 
-#: src/content_mapnode.cpp:659
+#: src/content_mapnode.cpp:672
 msgid "Red Clay"
 msgstr "Argila Vermelha"
 
-#: src/content_mapnode.cpp:676
+#: src/content_mapnode.cpp:689
 msgid "Yellow Clay"
 msgstr "Argila Amarela"
 
-#: src/content_mapnode.cpp:693
+#: src/content_mapnode.cpp:706
 msgid "Black Clay"
 msgstr "Argila Preta"
 
-#: src/content_mapnode.cpp:729
+#: src/content_mapnode.cpp:742
 msgid "Terracotta"
 msgstr "Terracotta"
 
-#: src/content_mapnode.cpp:741
+#: src/content_mapnode.cpp:754
 msgid "Terracotta Brick"
 msgstr "Tijolo de Terracotta"
 
-#: src/content_mapnode.cpp:755
+#: src/content_mapnode.cpp:768
 msgid "Terracotta Block"
 msgstr "Bloco de Terracotta"
 
-#: src/content_mapnode.cpp:769
+#: src/content_mapnode.cpp:782
 msgid "Terracotta Tile"
 msgstr "Azulejo de Terracotta"
 
-#: src/content_mapnode.cpp:789
+#: src/content_mapnode.cpp:802
 msgid "Glass"
 msgstr "Vidro"
 
-#: src/content_mapnode.cpp:809
+#: src/content_mapnode.cpp:822
 msgid "Blue Glass"
 msgstr "Vidro Azul"
 
-#: src/content_mapnode.cpp:831
+#: src/content_mapnode.cpp:844
 msgid "Green Glass"
 msgstr "Vidro Verde"
 
-#: src/content_mapnode.cpp:853
+#: src/content_mapnode.cpp:866
 msgid "Orange Glass"
 msgstr "Vidro Laranja"
 
-#: src/content_mapnode.cpp:875
+#: src/content_mapnode.cpp:888
 msgid "Purple Glass"
 msgstr "Vidro Roxo"
 
-#: src/content_mapnode.cpp:897
+#: src/content_mapnode.cpp:910
 msgid "Red Glass"
 msgstr "Vidro Vermelho"
 
-#: src/content_mapnode.cpp:919
+#: src/content_mapnode.cpp:932
 msgid "Yellow Glass"
 msgstr "Vidro Amarelo"
 
-#: src/content_mapnode.cpp:941
+#: src/content_mapnode.cpp:954
 msgid "Black Glass"
 msgstr "Vidro Preto"
 
-#: src/content_mapnode.cpp:963
+#: src/content_mapnode.cpp:976
 msgid "Glass Pane"
 msgstr "Painel de Vidro"
 
-#: src/content_mapnode.cpp:997
+#: src/content_mapnode.cpp:1010
 msgid "Blue Glass Pane"
 msgstr "Painel de Vidro Azul"
 
-#: src/content_mapnode.cpp:1032
+#: src/content_mapnode.cpp:1045
 msgid "Green Glass Pane"
 msgstr "Painel de Vidro Verde"
 
-#: src/content_mapnode.cpp:1067
+#: src/content_mapnode.cpp:1080
 msgid "Orange Glass Pane"
 msgstr "Painel de Vidro Laranja"
 
-#: src/content_mapnode.cpp:1102
+#: src/content_mapnode.cpp:1115
 msgid "Purple Glass Pane"
 msgstr "Painel de Vidro Roxo"
 
-#: src/content_mapnode.cpp:1137
+#: src/content_mapnode.cpp:1150
 msgid "Red Glass Pane"
 msgstr "Painel de Vidro Vermelho"
 
-#: src/content_mapnode.cpp:1172
+#: src/content_mapnode.cpp:1185
 msgid "Yellow Glass Pane"
 msgstr "Painel de Vidro Amarelo"
 
-#: src/content_mapnode.cpp:1207
+#: src/content_mapnode.cpp:1220
 msgid "Black Glass Pane"
 msgstr "Painel de Vidro Preto"
 
-#: src/content_mapnode.cpp:1242 src/content_mapnode_farm.cpp:333
+#: src/content_mapnode.cpp:1255 src/content_mapnode_farm.cpp:333
 msgid "Glass Light"
 msgstr "Luminária"
 
-#: src/content_mapnode.cpp:1265
+#: src/content_mapnode.cpp:1278
 msgid "Wood"
 msgstr "Madeira"
 
-#: src/content_mapnode.cpp:1291
+#: src/content_mapnode.cpp:1304
 msgid "Jungle Wood"
 msgstr "Madeira de Selva"
 
-#: src/content_mapnode.cpp:1316
+#: src/content_mapnode.cpp:1329
 msgid "Pine"
 msgstr "Pinheiro"
 
-#: src/content_mapnode.cpp:1341
+#: src/content_mapnode.cpp:1354
 msgid "Sponge"
 msgstr "Esponja"
 
-#: src/content_mapnode.cpp:1356
+#: src/content_mapnode.cpp:1369
 msgid "Waterlogged Sponge"
 msgstr "Esponja Encharcada"
 
-#: src/content_mapnode.cpp:1371
+#: src/content_mapnode.cpp:1384
 msgid "Hay Bale"
 msgstr "Fardo de Feno"
 
-#: src/content_mapnode.cpp:1388
+#: src/content_mapnode.cpp:1401
 msgid "Raw Apple Pie"
 msgstr "Torta de Maçã Crua"
 
-#: src/content_mapnode.cpp:1417
+#: src/content_mapnode.cpp:1430
 msgid "Apple Pie"
 msgstr "Torta de Maçã"
 
-#: src/content_mapnode.cpp:1512
+#: src/content_mapnode.cpp:1525
 msgid "Raw Pumpkin Pie"
 msgstr "Torta de Abóbora Crua"
 
-#: src/content_mapnode.cpp:1541
+#: src/content_mapnode.cpp:1554
 msgid "Pumpkin Pie"
 msgstr "Torta de Abóbora"
 
-#: src/content_mapnode.cpp:1636 src/content_mapnode.cpp:1715
+#: src/content_mapnode.cpp:1649 src/content_mapnode.cpp:1728
 msgid "Snow"
 msgstr "Neve"
 
-#: src/content_mapnode.cpp:1652
+#: src/content_mapnode.cpp:1665
 msgid "Snowman"
 msgstr "Homem de Neve"
 
-#: src/content_mapnode.cpp:1738 src/content_mapnode_farm.cpp:445
+#: src/content_mapnode.cpp:1752 src/content_mapnode_farm.cpp:445
 msgid "Cotton"
 msgstr "Algodão"
 
-#: src/content_mapnode.cpp:1769
+#: src/content_mapnode.cpp:1783
 msgid "Blue Cotton"
 msgstr "Algodão Azul"
 
-#: src/content_mapnode.cpp:1786
+#: src/content_mapnode.cpp:1800
 msgid "Green Cotton"
 msgstr "Algodão Verde"
 
-#: src/content_mapnode.cpp:1803
+#: src/content_mapnode.cpp:1817
 msgid "Orange Cotton"
 msgstr "Algodão Laranja"
 
-#: src/content_mapnode.cpp:1820
+#: src/content_mapnode.cpp:1834
 msgid "Purple Cotton"
 msgstr "Algodão Roxo"
 
-#: src/content_mapnode.cpp:1837
+#: src/content_mapnode.cpp:1851
 msgid "Red Cotton"
 msgstr "Algodão Vermelho"
 
-#: src/content_mapnode.cpp:1854
+#: src/content_mapnode.cpp:1868
 msgid "Yellow Cotton"
 msgstr "Algodão Amarelo"
 
-#: src/content_mapnode.cpp:1871
+#: src/content_mapnode.cpp:1885
 msgid "Black Cotton"
 msgstr "Algodão Preto"
 
-#: src/content_mapnode.cpp:1888
+#: src/content_mapnode.cpp:1902
 msgid "Carpet"
 msgstr "Tapete"
 
-#: src/content_mapnode.cpp:1911
+#: src/content_mapnode.cpp:1925
 msgid "Blue Carpet"
 msgstr "Tapete Azul"
 
-#: src/content_mapnode.cpp:1935
+#: src/content_mapnode.cpp:1949
 msgid "Green Carpet"
 msgstr "Tapete Verde"
 
-#: src/content_mapnode.cpp:1959
+#: src/content_mapnode.cpp:1973
 msgid "Orange Carpet"
 msgstr "Tapete Laranja"
 
-#: src/content_mapnode.cpp:1983
+#: src/content_mapnode.cpp:1997
 msgid "Purple Carpet"
 msgstr "Tapete Roxo"
 
-#: src/content_mapnode.cpp:2007
+#: src/content_mapnode.cpp:2021
 msgid "Red Carpet"
 msgstr "Tapete de Vermelho"
 
-#: src/content_mapnode.cpp:2031
+#: src/content_mapnode.cpp:2045
 msgid "Yellow Carpet"
 msgstr "Tapete Amarelo"
 
-#: src/content_mapnode.cpp:2055
+#: src/content_mapnode.cpp:2069
 msgid "Black Carpet"
 msgstr "Tapete Preto"
 
-#: src/content_mapnode.cpp:2079
+#: src/content_mapnode.cpp:2093
 msgid "Air"
 msgstr "Ar"
 
-#: src/content_mapnode.cpp:2095
+#: src/content_mapnode.cpp:2109
 msgid "Vacuum"
 msgstr "Vácuo "
 
-#: src/content_mapnode.cpp:2112 src/content_mapnode.cpp:2142
+#: src/content_mapnode.cpp:2126 src/content_mapnode.cpp:2156
 msgid "Water"
 msgstr "Água "
 
-#: src/content_mapnode.cpp:2172 src/content_mapnode.cpp:2200
+#: src/content_mapnode.cpp:2186 src/content_mapnode.cpp:2214
 msgid "Lava"
 msgstr "Lava"
 
-#: src/content_mapnode.cpp:2231
+#: src/content_mapnode.cpp:2245
 msgid "Rough Stone"
 msgstr "Pedra Áspera"
 
-#: src/content_mapnode.cpp:2248
+#: src/content_mapnode.cpp:2262
 msgid "Cobble Stone"
 msgstr "Pedra de Calçada"
 
-#: src/content_mapnode.cpp:2264
+#: src/content_mapnode.cpp:2278
 msgid "Mossy Cobble Stone"
 msgstr "Pedra de Calçada com Musgo"
 
-#: src/content_mapnode.cpp:2277
+#: src/content_mapnode.cpp:2291
 msgid "Steel Block"
 msgstr "Bloco de Aço"
 
-#: src/content_mapnode.cpp:2294
+#: src/content_mapnode.cpp:2308
 msgid "Mithril Block"
 msgstr "Bloco de Mithril"
 
-#: src/content_mapnode.cpp:2310
+#: src/content_mapnode.cpp:2324
 msgid "Stone Knob"
 msgstr "Botão de Pedra"
 
-#: src/content_mapnode.cpp:2311
+#: src/content_mapnode.cpp:2325
 msgid "Rough Stone Knob"
 msgstr "Botão de Pedra Áspera"
 
-#: src/content_mapnode.cpp:2312
+#: src/content_mapnode.cpp:2326
 msgid "Sandstone Knob"
 msgstr "Botão de Arenito"
 
-#: src/content_mapnode.cpp:2313
+#: src/content_mapnode.cpp:2327
 msgid "Wooden Knob"
 msgstr "Botão de Madeira"
 
-#: src/content_mapnode.cpp:2314
+#: src/content_mapnode.cpp:2328
 msgid "Junglewood Knob"
 msgstr "Botão de Madeira da Selva"
 
-#: src/content_mapnode.cpp:2315
+#: src/content_mapnode.cpp:2329
 msgid "Pine Knob"
 msgstr "Botão de Pinheiro"
 
-#: src/content_mapnode.cpp:2319
+#: src/content_mapnode.cpp:2333
 msgid "Copper Block"
 msgstr "Bloco de Cobre"
 
-#: src/content_mapnode.cpp:2336
+#: src/content_mapnode.cpp:2350
 msgid "Gold Block"
 msgstr "Bloco de Ouro"
 
-#: src/content_mapnode.cpp:2353
+#: src/content_mapnode.cpp:2367
 msgid "Silver Block"
 msgstr "Bloco de Prata"
 
-#: src/content_mapnode.cpp:2370
+#: src/content_mapnode.cpp:2384
 msgid "Tin Block"
 msgstr "Bloco de Estanho"
 
-#: src/content_mapnode.cpp:2387
+#: src/content_mapnode.cpp:2401
 msgid "Quartz Block"
 msgstr "Bloco de Quartzo"
 
-#: src/content_mapnode.cpp:2404
+#: src/content_mapnode.cpp:2418
 msgid "Stone Tiles"
 msgstr "Azulejos de Pedra"
 
-#: src/content_mapnode.cpp:2426
+#: src/content_mapnode.cpp:2440
 msgid "Wood Tiles"
 msgstr "Azulejos de Madeira"
 
@@ -2010,29 +2024,29 @@ msgstr "Sem Portão"
 msgid "Repeater"
 msgstr "Repetidor"
 
-#: src/content_mapnode_circuit.cpp:369 src/content_mapnode_circuit.cpp:393
+#: src/content_mapnode_circuit.cpp:369 src/content_mapnode_circuit.cpp:390
 msgid "Electric Lamp"
 msgstr "Lâmpada Elétrica "
 
-#: src/content_mapnode_circuit.cpp:427 src/content_mapnode_circuit.cpp:462
-#: src/content_mapnode_circuit.cpp:516 src/content_mapnode_circuit.cpp:537
-#: src/content_mapnode_circuit.cpp:582 src/content_mapnode_circuit.cpp:603
+#: src/content_mapnode_circuit.cpp:424 src/content_mapnode_circuit.cpp:459
+#: src/content_mapnode_circuit.cpp:513 src/content_mapnode_circuit.cpp:534
+#: src/content_mapnode_circuit.cpp:579 src/content_mapnode_circuit.cpp:600
 msgid "Piston"
 msgstr "Pistão"
 
-#: src/content_mapnode_circuit.cpp:489 src/content_mapnode_circuit.cpp:560
-#: src/content_mapnode_circuit.cpp:626
+#: src/content_mapnode_circuit.cpp:486 src/content_mapnode_circuit.cpp:557
+#: src/content_mapnode_circuit.cpp:623
 msgid "Piston Arm"
 msgstr "Braço de Pistão"
 
-#: src/content_mapnode_circuit.cpp:648 src/content_mapnode_circuit.cpp:676
-#: src/content_mapnode_circuit.cpp:730 src/content_mapnode_circuit.cpp:751
-#: src/content_mapnode_circuit.cpp:796 src/content_mapnode_circuit.cpp:817
+#: src/content_mapnode_circuit.cpp:645 src/content_mapnode_circuit.cpp:673
+#: src/content_mapnode_circuit.cpp:727 src/content_mapnode_circuit.cpp:748
+#: src/content_mapnode_circuit.cpp:793 src/content_mapnode_circuit.cpp:814
 msgid "Sticky Piston"
 msgstr "Pistão Pegajoso"
 
-#: src/content_mapnode_circuit.cpp:703 src/content_mapnode_circuit.cpp:774
-#: src/content_mapnode_circuit.cpp:840
+#: src/content_mapnode_circuit.cpp:700 src/content_mapnode_circuit.cpp:771
+#: src/content_mapnode_circuit.cpp:837
 msgid "Sticky Piston Arm"
 msgstr "Braço de Pistão Pegajoso"
 
@@ -2172,7 +2186,7 @@ msgstr "Uvas"
 msgid "Trellis Grape"
 msgstr "Latada de Uva"
 
-#: src/content_mapnode_farm.cpp:493 src/content_mapnode_farm.cpp:512
+#: src/content_mapnode_farm.cpp:494 src/content_mapnode_farm.cpp:513
 msgid "Dead Vine"
 msgstr "Videira Morta"
 
@@ -2188,131 +2202,137 @@ msgstr "Estante de Livros de Madeira da Selva"
 msgid "Pine Book Shelf"
 msgstr "Estante de Livros de Pinheiro"
 
-#: src/content_mapnode_furniture.cpp:150 src/content_mapnode_furniture.cpp:169
-#: src/content_mapnode_furniture.cpp:188 src/content_mapnode_furniture.cpp:207
-#: src/content_mapnode_furniture.cpp:226 src/content_mapnode_furniture.cpp:245
+#: src/content_mapnode_furniture.cpp:150 src/content_mapnode_furniture.cpp:170
+#: src/content_mapnode_furniture.cpp:190 src/content_mapnode_furniture.cpp:210
+#: src/content_mapnode_furniture.cpp:230 src/content_mapnode_furniture.cpp:250
 msgid "Couch"
 msgstr "Sofá"
 
-#: src/content_mapnode_furniture.cpp:274 src/content_mapnode_furniture.cpp:293
-#: src/content_mapnode_furniture.cpp:312 src/content_mapnode_furniture.cpp:331
-#: src/content_mapnode_furniture.cpp:350 src/content_mapnode_furniture.cpp:369
+#: src/content_mapnode_furniture.cpp:280 src/content_mapnode_furniture.cpp:300
+#: src/content_mapnode_furniture.cpp:320 src/content_mapnode_furniture.cpp:340
+#: src/content_mapnode_furniture.cpp:360 src/content_mapnode_furniture.cpp:380
 msgid "Blue Couch"
 msgstr "Sofá Azul"
 
-#: src/content_mapnode_furniture.cpp:392 src/content_mapnode_furniture.cpp:411
-#: src/content_mapnode_furniture.cpp:430 src/content_mapnode_furniture.cpp:449
-#: src/content_mapnode_furniture.cpp:468 src/content_mapnode_furniture.cpp:487
+#: src/content_mapnode_furniture.cpp:404 src/content_mapnode_furniture.cpp:424
+#: src/content_mapnode_furniture.cpp:444 src/content_mapnode_furniture.cpp:464
+#: src/content_mapnode_furniture.cpp:484 src/content_mapnode_furniture.cpp:504
 msgid "Green Couch"
 msgstr "Sofá Verde"
 
-#: src/content_mapnode_furniture.cpp:510 src/content_mapnode_furniture.cpp:529
-#: src/content_mapnode_furniture.cpp:548 src/content_mapnode_furniture.cpp:567
-#: src/content_mapnode_furniture.cpp:586 src/content_mapnode_furniture.cpp:605
+#: src/content_mapnode_furniture.cpp:528 src/content_mapnode_furniture.cpp:548
+#: src/content_mapnode_furniture.cpp:568 src/content_mapnode_furniture.cpp:588
+#: src/content_mapnode_furniture.cpp:608 src/content_mapnode_furniture.cpp:628
 msgid "Orange Couch"
 msgstr "Sofá Laranja"
 
-#: src/content_mapnode_furniture.cpp:628 src/content_mapnode_furniture.cpp:647
-#: src/content_mapnode_furniture.cpp:666 src/content_mapnode_furniture.cpp:685
-#: src/content_mapnode_furniture.cpp:704 src/content_mapnode_furniture.cpp:723
+#: src/content_mapnode_furniture.cpp:652 src/content_mapnode_furniture.cpp:672
+#: src/content_mapnode_furniture.cpp:692 src/content_mapnode_furniture.cpp:712
+#: src/content_mapnode_furniture.cpp:732 src/content_mapnode_furniture.cpp:752
 msgid "Purple Couch"
 msgstr "Sofá Roxo"
 
-#: src/content_mapnode_furniture.cpp:746 src/content_mapnode_furniture.cpp:765
-#: src/content_mapnode_furniture.cpp:784 src/content_mapnode_furniture.cpp:803
-#: src/content_mapnode_furniture.cpp:822 src/content_mapnode_furniture.cpp:841
+#: src/content_mapnode_furniture.cpp:776 src/content_mapnode_furniture.cpp:796
+#: src/content_mapnode_furniture.cpp:816 src/content_mapnode_furniture.cpp:836
+#: src/content_mapnode_furniture.cpp:856 src/content_mapnode_furniture.cpp:876
 msgid "Red Couch"
 msgstr "Sofá Vermelho"
 
-#: src/content_mapnode_furniture.cpp:864 src/content_mapnode_furniture.cpp:883
-#: src/content_mapnode_furniture.cpp:902 src/content_mapnode_furniture.cpp:921
-#: src/content_mapnode_furniture.cpp:940 src/content_mapnode_furniture.cpp:959
+#: src/content_mapnode_furniture.cpp:900 src/content_mapnode_furniture.cpp:920
+#: src/content_mapnode_furniture.cpp:940 src/content_mapnode_furniture.cpp:960
+#: src/content_mapnode_furniture.cpp:980
+#: src/content_mapnode_furniture.cpp:1000
 msgid "Yellow Couch"
 msgstr "Sofá Amarelo"
 
-#: src/content_mapnode_furniture.cpp:982
-#: src/content_mapnode_furniture.cpp:1001
-#: src/content_mapnode_furniture.cpp:1020
-#: src/content_mapnode_furniture.cpp:1039
-#: src/content_mapnode_furniture.cpp:1058
-#: src/content_mapnode_furniture.cpp:1077
+#: src/content_mapnode_furniture.cpp:1024
+#: src/content_mapnode_furniture.cpp:1044
+#: src/content_mapnode_furniture.cpp:1064
+#: src/content_mapnode_furniture.cpp:1084
+#: src/content_mapnode_furniture.cpp:1104
+#: src/content_mapnode_furniture.cpp:1124
 msgid "Black Couch"
 msgstr "Sofá Preto"
 
-#: src/content_mapnode_furniture.cpp:1100
+#: src/content_mapnode_furniture.cpp:1148
+#: src/content_mapnode_furniture.cpp:1182
+#: src/content_mapnode_furniture.cpp:1206
+#: src/content_mapnode_furniture.cpp:1230
+#: src/content_mapnode_furniture.cpp:1254
+#: src/content_mapnode_furniture.cpp:1278
 msgid "Chair"
 msgstr "Cadeira"
 
-#: src/content_mapnode_furniture.cpp:1149
+#: src/content_mapnode_furniture.cpp:1302
 msgid "Table"
 msgstr "Mesa"
 
-#: src/content_mapnode_furniture.cpp:1206
-#: src/content_mapnode_furniture.cpp:1239
+#: src/content_mapnode_furniture.cpp:1333
+#: src/content_mapnode_furniture.cpp:1366
 msgid "Bed"
 msgstr "Cama"
 
-#: src/content_mapnode_furniture.cpp:1267
-#: src/content_mapnode_furniture.cpp:1300
+#: src/content_mapnode_furniture.cpp:1394
+#: src/content_mapnode_furniture.cpp:1427
 msgid "Blue Bed"
 msgstr "Cama Azul"
 
-#: src/content_mapnode_furniture.cpp:1328
-#: src/content_mapnode_furniture.cpp:1361
+#: src/content_mapnode_furniture.cpp:1455
+#: src/content_mapnode_furniture.cpp:1488
 msgid "Green Bed"
 msgstr "Cama Verde"
 
-#: src/content_mapnode_furniture.cpp:1389
-#: src/content_mapnode_furniture.cpp:1422
+#: src/content_mapnode_furniture.cpp:1516
+#: src/content_mapnode_furniture.cpp:1549
 msgid "Orange Bed"
 msgstr "Cama Laranja"
 
-#: src/content_mapnode_furniture.cpp:1450
-#: src/content_mapnode_furniture.cpp:1483
+#: src/content_mapnode_furniture.cpp:1577
+#: src/content_mapnode_furniture.cpp:1610
 msgid "Purple Bed"
 msgstr "Cama Roxa"
 
-#: src/content_mapnode_furniture.cpp:1511
-#: src/content_mapnode_furniture.cpp:1544
+#: src/content_mapnode_furniture.cpp:1638
+#: src/content_mapnode_furniture.cpp:1671
 msgid "Red Bed"
 msgstr "Cama Vermelha"
 
-#: src/content_mapnode_furniture.cpp:1572
-#: src/content_mapnode_furniture.cpp:1605
+#: src/content_mapnode_furniture.cpp:1699
+#: src/content_mapnode_furniture.cpp:1732
 msgid "Yellow Bed"
 msgstr "Cama Amarela"
 
-#: src/content_mapnode_furniture.cpp:1633
-#: src/content_mapnode_furniture.cpp:1666
+#: src/content_mapnode_furniture.cpp:1760
+#: src/content_mapnode_furniture.cpp:1793
 msgid "Black Bed"
 msgstr "Cama Preta"
 
-#: src/content_mapnode_furniture.cpp:1694
-#: src/content_mapnode_furniture.cpp:1729
+#: src/content_mapnode_furniture.cpp:1821
+#: src/content_mapnode_furniture.cpp:1856
 msgid "Camp Bed"
 msgstr "Cama de Acampamento"
 
-#: src/content_mapnode_furniture.cpp:1753
+#: src/content_mapnode_furniture.cpp:1880
 msgid "Colorful Painting"
 msgstr "Pintura Colorida"
 
-#: src/content_mapnode_furniture.cpp:1788
+#: src/content_mapnode_furniture.cpp:1915
 msgid "Red Rose Painting"
 msgstr "Pintura de Rosa Vermelha"
 
-#: src/content_mapnode_furniture.cpp:1823
+#: src/content_mapnode_furniture.cpp:1950
 msgid "Field Painting"
 msgstr "Pintura de Campo"
 
-#: src/content_mapnode_furniture.cpp:1858
+#: src/content_mapnode_furniture.cpp:1985
 msgid "Blue Flower Painting"
 msgstr "Pintura de Flor Azul"
 
-#: src/content_mapnode_furniture.cpp:1893
+#: src/content_mapnode_furniture.cpp:2020
 msgid "Painting Canvas"
 msgstr "Tela de Pintura"
 
-#: src/content_mapnode_furniture.cpp:1931
+#: src/content_mapnode_furniture.cpp:2058
 msgid "Clock"
 msgstr "Relógio"
 
@@ -2632,7 +2652,7 @@ msgid "Decraft Book"
 msgstr "Livro do Desmontador"
 
 #: src/content_mapnode_special.cpp:753 src/content_mapnode_special.cpp:948
-#: src/content_nodemeta.cpp:2693
+#: src/content_nodemeta.cpp:2694
 msgid "Diary"
 msgstr "Diário"
 
@@ -2682,11 +2702,11 @@ msgstr "Placa"
 msgid "Locking Sign"
 msgstr "Placa Bloqueada"
 
-#: src/content_mapnode_special.cpp:1286 src/content_nodemeta.cpp:500
+#: src/content_mapnode_special.cpp:1286 src/content_nodemeta.cpp:501
 msgid "Chest"
 msgstr "Baú"
 
-#: src/content_mapnode_special.cpp:1310 src/content_nodemeta.cpp:775
+#: src/content_mapnode_special.cpp:1310 src/content_nodemeta.cpp:776
 msgid "Creative Chest"
 msgstr "Baú do Creativo"
 
@@ -2806,7 +2826,7 @@ msgstr "Pacote"
 msgid "Cauldron"
 msgstr "Caldeirão"
 
-#: src/content_mapnode_special.cpp:2082 src/content_nodemeta.cpp:3312
+#: src/content_mapnode_special.cpp:2082 src/content_nodemeta.cpp:3313
 msgid "Forge"
 msgstr "Forja"
 
@@ -2910,563 +2930,568 @@ msgstr "Gatinho Siamês"
 msgid "Ginger Kitten"
 msgstr "Gatinho Gengibre"
 
-#: src/content_nodemeta.cpp:75 src/content_nodemeta.cpp:138
-#: src/content_nodemeta.cpp:2677 src/content_nodemeta.cpp:2776
+#: src/content_nodemeta.cpp:76 src/content_nodemeta.cpp:139
+#: src/content_nodemeta.cpp:2678 src/content_nodemeta.cpp:2777
 msgid "Save"
 msgstr "Salvar"
 
-#: src/content_nodemeta.cpp:185
+#: src/content_nodemeta.cpp:186
 #, c-format
 msgid "%s's Home Flag"
 msgstr "Bandeira de Casa de '%s'"
 
-#: src/content_nodemeta.cpp:269 src/content_nodemeta.cpp:282
-#: src/content_nodemeta.cpp:436 src/content_nodemeta.cpp:449
+#: src/content_nodemeta.cpp:270 src/content_nodemeta.cpp:283
+#: src/content_nodemeta.cpp:437 src/content_nodemeta.cpp:450
 msgid "You can't sleep yet."
 msgstr "Você não pode dormir ainda."
 
-#: src/content_nodemeta.cpp:273 src/content_nodemeta.cpp:440
+#: src/content_nodemeta.cpp:274 src/content_nodemeta.cpp:441
 msgid "Go to sleep"
 msgstr "Ir para dormir"
 
-#: src/content_nodemeta.cpp:278 src/content_nodemeta.cpp:445
+#: src/content_nodemeta.cpp:279 src/content_nodemeta.cpp:446
 msgid "Someone else is sleeping here."
 msgstr "Outra pessoa está dormindo aqui."
 
-#: src/content_nodemeta.cpp:286 src/content_nodemeta.cpp:453
+#: src/content_nodemeta.cpp:287 src/content_nodemeta.cpp:454
 msgid "Get out of bed"
 msgstr "Sair da cama"
 
-#: src/content_nodemeta.cpp:432
+#: src/content_nodemeta.cpp:433
 msgid "This bed is too uncomfortable to sleep in."
 msgstr "Esta cama é muito desconfortável para dormir."
 
-#: src/content_nodemeta.cpp:573
+#: src/content_nodemeta.cpp:574
 #, c-format
 msgid "Locking Chest owned by '%s'"
 msgstr "Baú Trancado possuído por '%s'"
 
-#: src/content_nodemeta.cpp:647
+#: src/content_nodemeta.cpp:648
 #, c-format
 msgid "Safe owned by '%s'"
 msgstr "Cofre possuído por '%s'"
 
-#: src/content_nodemeta.cpp:816 src/content_nodemeta.cpp:1870
-#: src/content_nodemeta.cpp:2157 src/content_nodemeta.cpp:2349
-#: src/content_nodemeta.cpp:2563
+#: src/content_nodemeta.cpp:817 src/content_nodemeta.cpp:1871
+#: src/content_nodemeta.cpp:2158 src/content_nodemeta.cpp:2350
+#: src/content_nodemeta.cpp:2564
 #, c-format
 msgid "Page %d of %d"
 msgstr "Página %d de %d"
 
-#: src/content_nodemeta.cpp:820 src/content_nodemeta.cpp:1898
-#: src/content_nodemeta.cpp:2176 src/content_nodemeta.cpp:2358
-#: src/content_nodemeta.cpp:2579
+#: src/content_nodemeta.cpp:821 src/content_nodemeta.cpp:1899
+#: src/content_nodemeta.cpp:2177 src/content_nodemeta.cpp:2359
+#: src/content_nodemeta.cpp:2580
 msgid "<< Previous Page"
 msgstr "<< Página Anterior"
 
-#: src/content_nodemeta.cpp:826 src/content_nodemeta.cpp:1904
-#: src/content_nodemeta.cpp:2182 src/content_nodemeta.cpp:2364
-#: src/content_nodemeta.cpp:2585
+#: src/content_nodemeta.cpp:827 src/content_nodemeta.cpp:1905
+#: src/content_nodemeta.cpp:2183 src/content_nodemeta.cpp:2365
+#: src/content_nodemeta.cpp:2586
 msgid "Next Page >>"
 msgstr "Próxima Página >>"
 
-#: src/content_nodemeta.cpp:869
+#: src/content_nodemeta.cpp:870
 #, c-format
 msgid "Border Stone owned by '%s'"
 msgstr "Pedra de Fronteira possuída por '%s'"
 
-#: src/content_nodemeta.cpp:944
+#: src/content_nodemeta.cpp:945
 msgid "Furnace is overloaded"
 msgstr "Fornalha está sobrecarregada"
 
-#: src/content_nodemeta.cpp:945
+#: src/content_nodemeta.cpp:946
 msgid "Furnace is out of fuel"
 msgstr "Fornalha está sem combustível"
 
-#: src/content_nodemeta.cpp:947
+#: src/content_nodemeta.cpp:948
 msgid "Furnace is inactive"
 msgstr "Fornalha está inativa"
 
-#: src/content_nodemeta.cpp:950
+#: src/content_nodemeta.cpp:951
 msgid "Furnace is active"
 msgstr "Fornalha está ativa"
 
-#: src/content_nodemeta.cpp:1209
+#: src/content_nodemeta.cpp:1210
 msgid "Locking Furnace is overloaded"
 msgstr "Fornalha Trancada está sobrecarregada"
 
-#: src/content_nodemeta.cpp:1210
+#: src/content_nodemeta.cpp:1211
 msgid "Locking Furnace is out of fuel"
 msgstr "Fornalha Trancada está sem combustível"
 
-#: src/content_nodemeta.cpp:1212
+#: src/content_nodemeta.cpp:1213
 msgid "Locking Furnace is inactive"
 msgstr "Fornalha Trancada está inativa"
 
-#: src/content_nodemeta.cpp:1215
+#: src/content_nodemeta.cpp:1216
 msgid "Locking Furnace is active"
 msgstr "Fornalha Trancada está ativa"
 
-#: src/content_nodemeta.cpp:1470
+#: src/content_nodemeta.cpp:1471
 msgid "Armed Explosive: about to detonate"
 msgstr "Explosivo Armado: prestes a detonar"
 
-#: src/content_nodemeta.cpp:1473
+#: src/content_nodemeta.cpp:1474
 #, c-format
 msgid "Armed Explosive: %d second till detonation"
 msgid_plural "Armed Explosive: %d seconds till detonation"
 msgstr[0] "Explosivo Armado: %d segundo até a detonação"
 msgstr[1] "Explosivo Armado: %d segundos até a detonação"
 
-#: src/content_nodemeta.cpp:1534 src/content_nodemeta.cpp:1539
+#: src/content_nodemeta.cpp:1535 src/content_nodemeta.cpp:1540
 msgid "Incinerator is active"
 msgstr "Incinerador está ativo"
 
-#: src/content_nodemeta.cpp:1541
+#: src/content_nodemeta.cpp:1542
 msgid "Incinerator is inactive"
 msgstr "Incinerador está inativo"
 
-#: src/content_nodemeta.cpp:1633
+#: src/content_nodemeta.cpp:1634
 msgid "Add fuel, then punch to incinerate wielded item"
 msgstr "Ponha combustível, então, soque para incinerar o item empunhado"
 
-#: src/content_nodemeta.cpp:1874 src/content_nodemeta.cpp:2162
+#: src/content_nodemeta.cpp:1875 src/content_nodemeta.cpp:2163
 msgid "Add item here to see recipe"
 msgstr "Ponha o item aqui para ver a receita"
 
-#: src/content_nodemeta.cpp:1879 src/content_nodemeta.cpp:2167
+#: src/content_nodemeta.cpp:1880 src/content_nodemeta.cpp:2168
 #, c-format
 msgid "Recipe %d of %d"
 msgstr "Receita %d de %d"
 
-#: src/content_nodemeta.cpp:1888
+#: src/content_nodemeta.cpp:1889
 msgid "Gives"
 msgstr "Dá"
 
-#: src/content_nodemeta.cpp:2353
+#: src/content_nodemeta.cpp:2354
 msgid "Add item here to see cook result"
 msgstr "Ponha o item aqui para ver o resultado de cozinhar"
 
-#: src/content_nodemeta.cpp:2567
+#: src/content_nodemeta.cpp:2568
 msgid "Add item here to see dig result"
 msgstr "Ponha o item aqui para ver o resultado de cavar"
 
-#: src/content_nodemeta.cpp:2571
+#: src/content_nodemeta.cpp:2572
 msgid "Dig Result"
 msgstr "Cavar Resulta"
 
-#: src/content_nodemeta.cpp:2575
+#: src/content_nodemeta.cpp:2576
 msgid "Random Drop"
 msgstr "Ao acaso Cai"
 
-#: src/content_nodemeta.cpp:2667 src/content_nodemeta.cpp:2766
+#: src/content_nodemeta.cpp:2668 src/content_nodemeta.cpp:2767
 msgid "Title"
 msgstr "Título"
 
-#: src/content_nodemeta.cpp:2672 src/content_nodemeta.cpp:2771
+#: src/content_nodemeta.cpp:2673 src/content_nodemeta.cpp:2772
 msgid "Content"
 msgstr "Conteúdo"
 
-#: src/content_nodemeta.cpp:3127
+#: src/content_nodemeta.cpp:3128
 msgid "Cauldron is active"
 msgstr "Caldeirão está ativo"
 
-#: src/content_nodemeta.cpp:3130
+#: src/content_nodemeta.cpp:3131
 msgid "Cauldron is hot"
 msgstr "Caldeirão está quente"
 
-#: src/content_nodemeta.cpp:3132
+#: src/content_nodemeta.cpp:3133
 msgid "Cauldron is cool"
 msgstr "Caldeirão está fresco"
 
-#: src/content_nodemeta.cpp:3134
+#: src/content_nodemeta.cpp:3135
 msgid "Cauldron is empty"
 msgstr "Caldeirão está vazio"
 
-#: src/content_nodemeta.cpp:3138
+#: src/content_nodemeta.cpp:3139
 msgid "Cauldron is inactive"
 msgstr "Caldeirão está inativo"
 
-#: src/content_nodemeta.cpp:3139
+#: src/content_nodemeta.cpp:3140
 msgid "Cauldron is out of fuel"
 msgstr "Caldeirão está sem combustível"
 
-#: src/content_nodemeta.cpp:3218
+#: src/content_nodemeta.cpp:3219
 msgid "Add fuel, then punch to add or remove water"
 msgstr "Adicionar Combustível, depois, um soco para adicionar ou remover água"
 
-#: src/content_nodemeta.cpp:3484
+#: src/content_nodemeta.cpp:3487
 msgid "Show Enchanting"
 msgstr "Mostrar Encantando"
 
-#: src/content_nodemeta.cpp:3491 src/game.cpp:208
+#: src/content_nodemeta.cpp:3494 src/game.cpp:209
 msgid "Show Crafting"
 msgstr "Mostrar Artesanato"
 
-#: src/content_toolitem.cpp:213
+#: src/content_toolitem.cpp:216
 msgid "Small Stone Pick"
 msgstr "Picareta de Pedra Pequena"
 
-#: src/content_toolitem.cpp:236
+#: src/content_toolitem.cpp:239
 msgid "Stone Pick"
 msgstr "Picareta de Pedra"
 
-#: src/content_toolitem.cpp:250
+#: src/content_toolitem.cpp:253
 msgid "Flint Pick"
 msgstr "Picareta de Pederneira"
 
-#: src/content_toolitem.cpp:264
+#: src/content_toolitem.cpp:267
 msgid "Steel Pick"
 msgstr "Picareta de Aço"
 
-#: src/content_toolitem.cpp:278
+#: src/content_toolitem.cpp:281
 msgid "Creative Pick"
 msgstr "Picareta do Criativo"
 
-#: src/content_toolitem.cpp:292
+#: src/content_toolitem.cpp:295
 msgid "Stone Trowel"
 msgstr "Espátula de Pedra"
 
-#: src/content_toolitem.cpp:306
+#: src/content_toolitem.cpp:309
 msgid "Stone Shovel"
 msgstr "Pá de Pedra"
 
-#: src/content_toolitem.cpp:320
+#: src/content_toolitem.cpp:323
 msgid "Flint Shovel"
 msgstr "Pá de Pederneira"
 
-#: src/content_toolitem.cpp:334
+#: src/content_toolitem.cpp:337
 msgid "Steel Shovel"
 msgstr "Pá de Aço"
 
-#: src/content_toolitem.cpp:348
+#: src/content_toolitem.cpp:351
 msgid "Small Stone Axe"
 msgstr "Machado de Pedra Pequeno"
 
-#: src/content_toolitem.cpp:369
+#: src/content_toolitem.cpp:372
 msgid "Stone Axe"
 msgstr "Machado de Pedra"
 
-#: src/content_toolitem.cpp:383
+#: src/content_toolitem.cpp:386
 msgid "Flint Axe"
 msgstr "Machado de Pederneira"
 
-#: src/content_toolitem.cpp:397
+#: src/content_toolitem.cpp:400
 msgid "Steel Axe"
 msgstr "Machado de Aço"
 
-#: src/content_toolitem.cpp:411
+#: src/content_toolitem.cpp:414
 msgid "Wooden Club"
 msgstr "Taco de Madeira"
 
-#: src/content_toolitem.cpp:426
+#: src/content_toolitem.cpp:429
 msgid "Stone Sword"
 msgstr "Espada de Pedra"
 
-#: src/content_toolitem.cpp:440
+#: src/content_toolitem.cpp:443
 msgid "Steel Sword"
 msgstr "Espada de Aço"
 
-#: src/content_toolitem.cpp:454
+#: src/content_toolitem.cpp:457
 msgid "Flint Shears"
 msgstr "Tesoura de Pederneira"
 
-#: src/content_toolitem.cpp:468
+#: src/content_toolitem.cpp:471
 msgid "Steel Shears"
 msgstr "Tesoura de Aço"
 
-#: src/content_toolitem.cpp:482
+#: src/content_toolitem.cpp:485
 msgid "Wooden Bucket"
 msgstr "Balde de Madeira"
 
-#: src/content_toolitem.cpp:499
+#: src/content_toolitem.cpp:502
 msgid "Tin Bucket"
 msgstr "Balde de Estanho"
 
-#: src/content_toolitem.cpp:515
+#: src/content_toolitem.cpp:518
 msgid "Wooden Bucket of Water"
 msgstr "Balde de Madeira com Água"
 
-#: src/content_toolitem.cpp:526
+#: src/content_toolitem.cpp:529
 msgid "Tin Bucket of Water"
 msgstr "Balde de Estanho com Água"
 
-#: src/content_toolitem.cpp:537
+#: src/content_toolitem.cpp:540
 msgid "Steel Bucket"
 msgstr "Balde de Aço"
 
-#: src/content_toolitem.cpp:552
+#: src/content_toolitem.cpp:555
 msgid "Steel Bucket of Water"
 msgstr "Balde de Aço com Água"
 
-#: src/content_toolitem.cpp:563
+#: src/content_toolitem.cpp:566
 msgid "Steel Bucket of Lava"
 msgstr "Balde de Aço com Lava"
 
-#: src/content_toolitem.cpp:575
+#: src/content_toolitem.cpp:578
 msgid "Fire Starter"
 msgstr "Isqueiro"
 
-#: src/content_toolitem.cpp:589
+#: src/content_toolitem.cpp:592
 msgid "Crowbar"
 msgstr "Pé-de-Cabra"
 
-#: src/content_toolitem.cpp:602
+#: src/content_toolitem.cpp:605
 msgid "Key"
 msgstr "Chave"
 
-#: src/content_toolitem.cpp:614
+#: src/content_toolitem.cpp:617
 msgid "Stone Spear"
 msgstr "Lança de Pedra"
 
-#: src/content_toolitem.cpp:628
+#: src/content_toolitem.cpp:631
 msgid "Flint Spear"
 msgstr "Lança de Pederneira"
 
-#: src/content_toolitem.cpp:642
+#: src/content_toolitem.cpp:645
 msgid "Steel Spear"
 msgstr "Lança de Aço"
 
-#: src/content_toolitem.cpp:656
+#: src/content_toolitem.cpp:659
 msgid "Bow"
 msgstr "Arco"
 
-#: src/content_toolitem.cpp:676
+#: src/content_toolitem.cpp:679
 msgid "Raw Mithril Pick"
 msgstr "Picareta de Mithril Bruto"
 
-#: src/content_toolitem.cpp:690
+#: src/content_toolitem.cpp:693
 msgid "Raw Mithril Shovel"
 msgstr "Pá de Mithril Bruto"
 
-#: src/content_toolitem.cpp:704
+#: src/content_toolitem.cpp:707
 msgid "Raw Mithril Axe"
 msgstr "Machado de Mithril Bruto"
 
-#: src/content_toolitem.cpp:718
+#: src/content_toolitem.cpp:721
 msgid "Raw Mithril Sword"
 msgstr "Espada de Mithril Bruto"
 
-#: src/content_toolitem.cpp:732
+#: src/content_toolitem.cpp:735
 msgid "Raw Mithril Spear"
 msgstr "Lança de Mithril Bruto"
 
-#: src/content_toolitem.cpp:746
+#: src/content_toolitem.cpp:749
 msgid "Unbound Mithril Pick"
 msgstr "Picareta de Mithril não ligada"
 
-#: src/content_toolitem.cpp:760
+#: src/content_toolitem.cpp:763
 msgid "Unbound Mithril Shovel"
 msgstr "Pá de Mithril não ligada"
 
-#: src/content_toolitem.cpp:774
+#: src/content_toolitem.cpp:777
 msgid "Unbound Mithril Axe"
 msgstr "Machado de Mithril não ligada"
 
-#: src/content_toolitem.cpp:788
+#: src/content_toolitem.cpp:791
 msgid "Unbound Mithril Sword"
 msgstr "Espada de Mithril não ligada"
 
-#: src/content_toolitem.cpp:802
+#: src/content_toolitem.cpp:805
 msgid "Unbound Mithril Spear"
 msgstr "Lança de Mithril não ligada"
 
-#: src/content_toolitem.cpp:816
+#: src/content_toolitem.cpp:819
 msgid "Mithril Pick"
 msgstr "Picareta de Mithril"
 
-#: src/content_toolitem.cpp:831
+#: src/content_toolitem.cpp:834
 msgid "Mithril Shovel"
 msgstr "Pá de Mithril"
 
-#: src/content_toolitem.cpp:845
+#: src/content_toolitem.cpp:848
 msgid "Mithril Axe"
 msgstr "Machado de Mithril"
 
-#: src/content_toolitem.cpp:859
+#: src/content_toolitem.cpp:862
 msgid "Mithril Sword"
 msgstr "Espada de Mithril"
 
-#: src/content_toolitem.cpp:873
+#: src/content_toolitem.cpp:876
 msgid "Mithril Spear"
 msgstr "Lança de Mithril"
 
-#: src/content_toolitem.cpp:887
+#: src/content_toolitem.cpp:890
 msgid "Mob Spawner"
 msgstr "Spawnador de Mob"
 
-#: src/game.cpp:209
+#: src/content_toolitem.cpp:909
+#, fuzzy
+msgid "Mithril Key"
+msgstr "Machado de Mithril"
+
+#: src/game.cpp:210
 msgid "Clothes"
 msgstr "Roupas"
 
-#: src/game.cpp:210
+#: src/game.cpp:211
 msgid "Hat/Helmet"
 msgstr "Chapéu/Elmo"
 
-#: src/game.cpp:212
+#: src/game.cpp:213
 msgid "Jacket"
 msgstr "Jaqueta"
 
-#: src/game.cpp:214
+#: src/game.cpp:215
 msgid "Decorative"
 msgstr "Decorativo"
 
-#: src/game.cpp:216
+#: src/game.cpp:217
 msgid "Shirt"
 msgstr "Camisa"
 
-#: src/game.cpp:218
+#: src/game.cpp:219
 msgid "Belt"
 msgstr "Cinto"
 
-#: src/game.cpp:220
+#: src/game.cpp:221
 msgid "Pants"
 msgstr "Calças"
 
-#: src/game.cpp:222
+#: src/game.cpp:223
 msgid "Boots"
 msgstr "Botas"
 
-#: src/game.cpp:229
+#: src/game.cpp:230
 msgid "Drop to Ground"
 msgstr "Largar no Chão"
 
-#: src/game.cpp:231
+#: src/game.cpp:232
 msgid "Change Clothing"
 msgstr "Mudar a Roupa"
 
-#: src/game.cpp:590
+#: src/game.cpp:591
 msgid "Loading"
 msgstr "Carregando"
 
-#: src/game.cpp:662
+#: src/game.cpp:663
 msgid "Loading..."
 msgstr "Carregando..."
 
-#: src/game.cpp:671
+#: src/game.cpp:672
 msgid "Creating server..."
 msgstr "Criando servidor..."
 
-#: src/game.cpp:682
+#: src/game.cpp:683
 msgid "Creating client..."
 msgstr "Criando cliente..."
 
-#: src/game.cpp:687
+#: src/game.cpp:688
 msgid "Resolving address..."
 msgstr "Resolvendo endereço..."
 
-#: src/game.cpp:698
+#: src/game.cpp:699
 msgid "Couldn't resolve address"
 msgstr "Não foi possível resolver o endereço"
 
-#: src/game.cpp:738
+#: src/game.cpp:739
 #, c-format
 msgid "Connecting to server... (timeout in %d second)"
 msgid_plural "Connecting to server... (timeout in %d seconds)"
 msgstr[0] "Conectando ao servidor... (tempo esgotado em %d segundo)"
 msgstr[1] "Conectando ao servidor... (tempo esgotado em %d segundos)"
 
-#: src/game.cpp:767
+#: src/game.cpp:768
 #, c-format
 msgid "Access denied. Reason: %ls"
 msgstr "Acesso Negado. Motivo: %ls"
 
-#: src/game.cpp:771
+#: src/game.cpp:772
 msgid "Unable to Connect (port already in use?)."
 msgstr "Não é possível a Conexão (porta já em uso?)."
 
-#: src/game.cpp:774
+#: src/game.cpp:775
 msgid "Connection timed out."
 msgstr "Tempo de conexão esgotada"
 
-#: src/game.cpp:927
+#: src/game.cpp:928
 msgid "Access denied. Reason: "
 msgstr "Acesso Negado. Motivo:"
 
-#: src/game.cpp:1161
+#: src/game.cpp:1162
 msgid "free_move disabled"
 msgstr "free_move desabilitado"
 
-#: src/game.cpp:1165
+#: src/game.cpp:1166
 msgid "free_move enabled"
 msgstr "free_move habilitado"
 
-#: src/game.cpp:1177
+#: src/game.cpp:1178
 #, c-format
 msgid "Saved screenshot to '%s'"
 msgstr "Captura de Tela salva em '%s'"
 
-#: src/game.cpp:1189
+#: src/game.cpp:1190
 msgid "HUD shown"
 msgstr "HUD mostrada"
 
-#: src/game.cpp:1191
+#: src/game.cpp:1192
 msgid "HUD hidden"
 msgstr "HUD escondida"
 
-#: src/game.cpp:1197
+#: src/game.cpp:1198
 msgid "Chat shown"
 msgstr "Bate-Papo mostrado"
 
-#: src/game.cpp:1199
+#: src/game.cpp:1200
 msgid "Chat hidden"
 msgstr "Bate-Papo escondido"
 
-#: src/game.cpp:1205
+#: src/game.cpp:1206
 msgid "Fog disabled"
 msgstr "Nevoeiro desabilitado"
 
-#: src/game.cpp:1207
+#: src/game.cpp:1208
 msgid "Fog enabled"
 msgstr "Nevoeiro habilitado"
 
-#: src/game.cpp:1213
+#: src/game.cpp:1214
 msgid "Camera update disabled"
 msgstr "Atualização de câmera desabilitada"
 
-#: src/game.cpp:1215
+#: src/game.cpp:1216
 msgid "Camera update enabled"
 msgstr "Atualização de câmera habitada"
 
-#: src/game.cpp:1225
+#: src/game.cpp:1226
 msgid "Debug info shown"
 msgstr "Informação de depuração mostrada"
 
-#: src/game.cpp:1230
+#: src/game.cpp:1231
 msgid "Debug info and frametime graph hidden"
 msgstr "Informação de depuração e de frametime gráfico escondida"
 
-#: src/game.cpp:1234
+#: src/game.cpp:1235
 msgid "Frametime graph shown"
 msgstr "Frametime gráfico mostrado"
 
-#: src/game.cpp:1246
+#: src/game.cpp:1247
 #, c-format
 msgid "Profiler shown (page %d of %d)"
 msgstr "Profiler mostrado (página %d de %d)"
 
-#: src/game.cpp:1250
+#: src/game.cpp:1251
 msgid "Profiler hidden"
 msgstr "Profiler escondido"
 
-#: src/game.cpp:1258 src/game.cpp:1269
+#: src/game.cpp:1259 src/game.cpp:1270
 #, c-format
 msgid "Minimum viewing range changed to %d"
 msgstr "Alcance visual mínimo alterado para %d"
 
-#: src/game.cpp:1338
+#: src/game.cpp:1339
 msgid "Enabled full viewing range"
 msgstr "Habilitado alcance de visualização completa"
 
-#: src/game.cpp:1342
+#: src/game.cpp:1343
 msgid "Disabled full viewing range"
 msgstr "Desabilitado alcance de visualização completa"
 
-#: src/game.cpp:1995
+#: src/game.cpp:1950
 msgid "Disconnected (Network Timeout)"
 msgstr "Desconectado (Tempo limite de Rede)"
 
-#: src/game.cpp:2407
+#: src/game.cpp:2382
 msgid "Shutting down..."
 msgstr "Encerrando..."
 
@@ -3486,236 +3511,291 @@ msgstr "Clique esquerdo: Move todos os itens, Clique direito: Move um item"
 msgid "Write It"
 msgstr "Escreva Isto"
 
-#: src/guiMainMenu.cpp:347
+#: src/guiMainMenu.cpp:319
 msgid "Character Creator"
 msgstr "Criador de Personagens"
 
-#: src/guiMainMenu.cpp:353 src/guiMainMenu.cpp:478 src/guiMainMenu.cpp:520
-#: src/guiMainMenu.cpp:631
+#: src/guiMainMenu.cpp:325 src/guiMainMenu.cpp:386 src/guiMainMenu.cpp:428
+#: src/guiMainMenu.cpp:539
 msgid "Single Player"
 msgstr "Um Jogador"
 
-#: src/guiMainMenu.cpp:359 src/guiMainMenu.cpp:410
+#: src/guiMainMenu.cpp:331 src/guiMultiplayerMenu.cpp:161
 msgid "Multi Player"
 msgstr "Multijogador"
 
-#: src/guiMainMenu.cpp:365 src/guiPauseMenu.cpp:155
+#: src/guiMainMenu.cpp:337 src/guiPauseMenu.cpp:155
 msgid "Settings"
 msgstr "Configurações"
 
-#: src/guiMainMenu.cpp:371
+#: src/guiMainMenu.cpp:343
 msgid "Credits"
 msgstr "Créditos"
 
-#: src/guiMainMenu.cpp:377
+#: src/guiMainMenu.cpp:349
 msgid "Quit"
 msgstr "Sair"
 
-#: src/guiMainMenu.cpp:418
-msgid "Name/Password"
-msgstr "Nome/Senha"
-
-#: src/guiMainMenu.cpp:446
-msgid "Address/Port"
-msgstr "Endereço/Porta"
-
-#: src/guiMainMenu.cpp:472
-msgid "Connect"
-msgstr "Conectar"
-
-#: src/guiMainMenu.cpp:487 src/guiMainMenu.cpp:529 src/guiMainMenu.cpp:640
+#: src/guiMainMenu.cpp:395 src/guiMainMenu.cpp:437 src/guiMainMenu.cpp:548
 msgid "Creative Mode"
 msgstr "Modo Criativo"
 
-#: src/guiMainMenu.cpp:488 src/guiMainMenu.cpp:530 src/guiMainMenu.cpp:641
+#: src/guiMainMenu.cpp:396 src/guiMainMenu.cpp:438 src/guiMainMenu.cpp:549
 msgid "Adventure Mode"
 msgstr "Modo Aventura"
 
-#: src/guiMainMenu.cpp:489 src/guiMainMenu.cpp:531 src/guiMainMenu.cpp:642
+#: src/guiMainMenu.cpp:397 src/guiMainMenu.cpp:439 src/guiMainMenu.cpp:550
 msgid "Survival Mode"
 msgstr "Modo Sobrevivência"
 
-#: src/guiMainMenu.cpp:502 src/guiMainMenu.cpp:655
+#: src/guiMainMenu.cpp:410 src/guiMainMenu.cpp:563
 msgid "Advanced Settings"
 msgstr "Configurações Avançadas"
 
-#: src/guiMainMenu.cpp:508 src/guiMainMenu.cpp:550
+#: src/guiMainMenu.cpp:416 src/guiMainMenu.cpp:458
 msgid "Map Options"
 msgstr "Opções de Mapa"
 
-#: src/guiMainMenu.cpp:514 src/guiMainMenu.cpp:625 src/guiMainMenu.cpp:750
+#: src/guiMainMenu.cpp:422 src/guiMainMenu.cpp:533 src/guiMainMenu.cpp:658
 msgid "Start Game"
 msgstr "Iniciar Jogo"
 
-#: src/guiMainMenu.cpp:544
+#: src/guiMainMenu.cpp:452
 msgid "Hide Advanced Settings"
 msgstr "Ocultar Configurações Avançadas"
 
-#: src/guiMainMenu.cpp:555
+#: src/guiMainMenu.cpp:463
 msgid "Creatures"
 msgstr "Criaturas"
 
-#: src/guiMainMenu.cpp:562
+#: src/guiMainMenu.cpp:470
 msgid "None"
 msgstr "Nenhum"
 
-#: src/guiMainMenu.cpp:563
+#: src/guiMainMenu.cpp:471
 msgid "Passive"
 msgstr "Passivas"
 
-#: src/guiMainMenu.cpp:564
+#: src/guiMainMenu.cpp:472
 msgid "Passive & Aggressive"
 msgstr "Passivas & Agressivas"
 
-#: src/guiMainMenu.cpp:565
+#: src/guiMainMenu.cpp:473
 msgid "Passive, Aggressive, & Destructive"
 msgstr "Passivas, Agressivas, & Destrutivas"
 
-#: src/guiMainMenu.cpp:579
+#: src/guiMainMenu.cpp:487
 msgid "Player Damage"
 msgstr "Causar Dano no Jogador"
 
-#: src/guiMainMenu.cpp:584
+#: src/guiMainMenu.cpp:492
 msgid "Suffocation/Drowning"
 msgstr "Asfixia/Afogamento"
 
-#: src/guiMainMenu.cpp:589
+#: src/guiMainMenu.cpp:497
 msgid "Hunger"
 msgstr "Fome"
 
-#: src/guiMainMenu.cpp:594
+#: src/guiMainMenu.cpp:502
 msgid "Tool Wear"
 msgstr "Desgaste de Ferramenta"
 
-#: src/guiMainMenu.cpp:599
+#: src/guiMainMenu.cpp:507
 msgid "Dangerous Fire"
 msgstr "Fogo Perigoso"
 
-#: src/guiMainMenu.cpp:604
+#: src/guiMainMenu.cpp:512
 msgid "Infinite Inventory"
 msgstr "Inventário Infinito"
 
-#: src/guiMainMenu.cpp:609
+#: src/guiMainMenu.cpp:517
 msgid "Initial Inventory"
 msgstr "Inventário Inicial"
 
-#: src/guiMainMenu.cpp:614
+#: src/guiMainMenu.cpp:522
 msgid "Droppable Inventory"
 msgstr "Inventário Soltavel"
 
-#: src/guiMainMenu.cpp:619
+#: src/guiMainMenu.cpp:527
 msgid "Death drops Inventory"
 msgstr "Morte deixa cair Inventário"
 
-#: src/guiMainMenu.cpp:661
+#: src/guiMainMenu.cpp:569
 msgid "Hide Map Options"
 msgstr "Ocultar Opções de Mapa"
 
-#: src/guiMainMenu.cpp:666
+#: src/guiMainMenu.cpp:574
 msgid "Create New Map"
 msgstr "Criar Mapa Novo"
 
-#: src/guiMainMenu.cpp:672
+#: src/guiMainMenu.cpp:580
 msgid "Warning! Your old map will be deleted!"
 msgstr "Aviso! Seu mapa antigo será apagado!"
 
-#: src/guiMainMenu.cpp:678
+#: src/guiMainMenu.cpp:586
 msgid "Map Type"
 msgstr "Tipo de Mapa"
 
-#: src/guiMainMenu.cpp:685
+#: src/guiMainMenu.cpp:593
 msgid "Flat"
 msgstr "Plano"
 
-#: src/guiMainMenu.cpp:686
+#: src/guiMainMenu.cpp:594
 msgid "Flatter"
 msgstr "Mais Plano"
 
-#: src/guiMainMenu.cpp:687
+#: src/guiMainMenu.cpp:595
 msgid "Smoother"
 msgstr "Suave"
 
-#: src/guiMainMenu.cpp:688
+#: src/guiMainMenu.cpp:596
 msgid "Default"
 msgstr "Padrão"
 
-#: src/guiMainMenu.cpp:689
+#: src/guiMainMenu.cpp:597
 msgid "Hilly"
 msgstr "Acidentado"
 
-#: src/guiMainMenu.cpp:690
+#: src/guiMainMenu.cpp:598
 msgid "Mountains"
 msgstr "Montanhas"
 
-#: src/guiMainMenu.cpp:691
+#: src/guiMainMenu.cpp:599
 msgid "Crazy"
 msgstr "Maluco"
 
-#: src/guiMainMenu.cpp:692
+#: src/guiMainMenu.cpp:600
 msgid "Crazy Hills"
 msgstr "Colinas Malucas"
 
-#: src/guiMainMenu.cpp:714
+#: src/guiMainMenu.cpp:622
 msgid "Use Fixed Seed"
 msgstr "Use Geração Determinada"
 
-#: src/guiMainMenu.cpp:720
+#: src/guiMainMenu.cpp:628
 msgid "Map Seed"
 msgstr "Geração de Mapa"
 
-#: src/guiMainMenu.cpp:737
+#: src/guiMainMenu.cpp:645
 msgid "Clear Map"
 msgstr "Limpar Mapa"
 
-#: src/guiMainMenu.cpp:742
+#: src/guiMainMenu.cpp:650
 msgid "Warning! This will delete all construction from your map!"
 msgstr "Aviso! Isto irá apagar todas as construções de seu mapa!"
 
-#: src/guiMainMenu.cpp:760
+#: src/guiMainMenu.cpp:668
 msgid ""
 "Voxelands\n"
 "http://www.voxelands.com/\n"
 "By Lisa 'darkrose' Milne <lisa@ltmnet.com> and contributors."
-msgstr "Voxelands\nhttp://www.voxelands.com/\nPor Lisa 'darkrose' Milne <lisa@ltmnet.com> e contribuidores."
+msgstr ""
+"Voxelands\n"
+"http://www.voxelands.com/\n"
+"Por Lisa 'darkrose' Milne <lisa@ltmnet.com> e contribuidores."
 
-#: src/guiMainMenu.cpp:767
+#: src/guiMainMenu.cpp:675
 msgid "Programmers"
 msgstr "Programadores"
 
-#: src/guiMainMenu.cpp:770
+#: src/guiMainMenu.cpp:678
 msgid "Artists and Modellers"
 msgstr "Artistas e Modeladores"
 
-#: src/guiMainMenu.cpp:773
+#: src/guiMainMenu.cpp:681
 msgid "Translators"
 msgstr "Tradutores"
 
-#: src/guiMainMenu.cpp:776
+#: src/guiMainMenu.cpp:684
 msgid "Documentation Writters"
 msgstr "Escritores de Documentação"
 
-#: src/guiMainMenu.cpp:779
+#: src/guiMainMenu.cpp:687
 msgid "Testers, Packagers, and Builders"
 msgstr "Testadores, Empacotadores, e Construtores"
 
-#: src/guiMainMenu.cpp:782
+#: src/guiMainMenu.cpp:690
 msgid "Music and Sound Effects Composers"
 msgstr "Compositores de Músicas e Efeitos Sonoros"
 
-#: src/guiMainMenu.cpp:785
+#: src/guiMainMenu.cpp:693
 msgid "Other Contributers, and Special Thanks"
 msgstr "Outros Contribuidores, e Agradecimentos Especiais"
 
-#: src/guiMainMenu.cpp:789
+#: src/guiMainMenu.cpp:697
 msgid ""
 "Based on Minetest-C55 by Perttu Ahola <celeron55@gmail.com>\n"
-"and contributors: PilzAdam, Taoki, tango_, kahrl (kaaaaaahrl?), darkrose, matttpt, erlehmann, SpeedProg, JacobF, teddydestodes, marktraceur, Jonathan Neuschafer, thexyz, VanessaE, sfan5... and tens of more random people."
-msgstr "Baseado em Minetest-C55 by Perttu Ahola <celeron55@gmail.com>\ne contribuidores: PilzAdam, Taoki, tango_, kahrl (kaaaaaahrl?), darkrose, matttpt, erlehmann, SpeedProg, JacobF, teddydestodes, marktraceur, Jonathan Neuschafer, thexyz, VanessaE, sfan5... e dezenas de muitas pessoas aleatórias."
+"and contributors: PilzAdam, Taoki, tango_, kahrl (kaaaaaahrl?), darkrose, "
+"matttpt, erlehmann, SpeedProg, JacobF, teddydestodes, marktraceur, Jonathan "
+"Neuschafer, thexyz, VanessaE, sfan5... and tens of more random people."
+msgstr ""
+"Baseado em Minetest-C55 by Perttu Ahola <celeron55@gmail.com>\n"
+"e contribuidores: PilzAdam, Taoki, tango_, kahrl (kaaaaaahrl?), darkrose, "
+"matttpt, erlehmann, SpeedProg, JacobF, teddydestodes, marktraceur, Jonathan "
+"Neuschafer, thexyz, VanessaE, sfan5... e dezenas de muitas pessoas "
+"aleatórias."
 
 #: src/guiMessageMenu.cpp:112 src/guiPauseMenu.cpp:143
 msgid "Continue"
 msgstr "Continuar"
 
+#: src/guiMultiplayerMenu.cpp:135 src/guiSettingsMenu.cpp:277
+msgid "Main Menu"
+msgstr "Menu Principal"
+
+#: src/guiMultiplayerMenu.cpp:142
+msgid "All Servers"
+msgstr ""
+
+#: src/guiMultiplayerMenu.cpp:148
+msgid "Favourite Servers"
+msgstr ""
+
+#: src/guiMultiplayerMenu.cpp:154
+#, fuzzy
+msgid "Custom Connect"
+msgstr "Conectar"
+
+#: src/guiMultiplayerMenu.cpp:169
+msgid "Custom Connection"
+msgstr ""
+
+#: src/guiMultiplayerMenu.cpp:176
+msgid "Address/Port"
+msgstr "Endereço/Porta"
+
+#: src/guiMultiplayerMenu.cpp:201 src/guiMultiplayerMenu.cpp:313
+msgid "Add to Favourites"
+msgstr ""
+
+#: src/guiMultiplayerMenu.cpp:206 src/guiMultiplayerMenu.cpp:320
+msgid "Connect"
+msgstr "Conectar"
+
+#: src/guiMultiplayerMenu.cpp:213
+msgid "Name/Password"
+msgstr "Nome/Senha"
+
+#: src/guiMultiplayerMenu.cpp:240
+msgid "Join Server"
+msgstr ""
+
+#: src/guiMultiplayerMenu.cpp:262
+msgid "My Favourites"
+msgstr ""
+
+#: src/guiMultiplayerMenu.cpp:265
+msgid "Server List"
+msgstr ""
+
+#: src/guiMultiplayerMenu.cpp:270
+msgid "Get New List"
+msgstr ""
+
+#: src/guiMultiplayerMenu.cpp:307
+msgid "Remove from Favourites"
+msgstr ""
+
 #: src/guiPasswordChange.cpp:105
 msgid "Old Password"
 msgstr "Senha Antiga"
@@ -3756,11 +3836,11 @@ msgstr "Para a Frente"
 msgid "Backward"
 msgstr "Para atrás"
 
-#: src/guiSettingsMenu.cpp:72 src/keycode.cpp:234
+#: src/guiSettingsMenu.cpp:72 src/keycode.cpp:263
 msgid "Left"
 msgstr "Esquerda"
 
-#: src/guiSettingsMenu.cpp:73 src/keycode.cpp:234
+#: src/guiSettingsMenu.cpp:73 src/keycode.cpp:265
 msgid "Right"
 msgstr "Direita"
 
@@ -3796,11 +3876,11 @@ msgstr "Selecionar Alcance"
 msgid "Toggle Fly"
 msgstr "Alternar Vôo"
 
-#: src/guiSettingsMenu.cpp:82 src/keycode.cpp:234
+#: src/guiSettingsMenu.cpp:82 src/keycode.cpp:264
 msgid "Up"
 msgstr "Subir"
 
-#: src/guiSettingsMenu.cpp:83 src/keycode.cpp:234
+#: src/guiSettingsMenu.cpp:83 src/keycode.cpp:266
 msgid "Down"
 msgstr "Descer"
 
@@ -3844,10 +3924,6 @@ msgstr "Item Anterior"
 msgid "Next Item"
 msgstr "Próximo Item"
 
-#: src/guiSettingsMenu.cpp:277
-msgid "Main Menu"
-msgstr "Menu Principal"
-
 #: src/guiSettingsMenu.cpp:284 src/guiSettingsMenu.cpp:311
 msgid "Controls"
 msgstr "Controles"
@@ -3955,362 +4031,576 @@ msgstr "Impulso de Energia: %d:%02d"
 msgid "Cold Protection: %d:%02d"
 msgstr "Proteção contra o Frio: %d:%02d"
 
-#: src/inventory.cpp:230 src/inventory.cpp:352
-msgid "Cookable: Yes"
-msgstr "Cozinhavel: Sim"
-
-#: src/inventory.cpp:235 src/inventory.cpp:357 src/inventory.cpp:532
-msgid "Fuel Burn Time: "
-msgstr "Tempo de Queima de Combustível:"
-
-#: src/inventory.cpp:321
-msgid "Hunger: "
-msgstr "Fome:"
-
-#: src/inventory.cpp:327
-msgid "Health: "
-msgstr "Saúde:"
-
-#: src/inventory.cpp:334
-msgid "Cold Protection: "
-msgstr "Proteção contra o Frio:"
-
-#: src/inventory.cpp:343
-msgid "Energy Boost: "
-msgstr "Impulso de Energia:"
-
-#: src/inventory.cpp:521
-msgid "Strength: "
-msgstr "Força:"
-
-#: src/inventory.cpp:524
-msgid "Speed: "
-msgstr "Velocidade:"
-
-#: src/inventory.cpp:527
-msgid "Level: "
-msgstr "Nível:"
-
-#: src/inventory.cpp:557
+#: src/inventory.cpp:246 src/inventory.cpp:580
 msgid "Contains: "
 msgstr "Contém>"
 
-#: src/inventory.cpp:643
+#: src/inventory.cpp:253 src/inventory.cpp:375
+msgid "Cookable: Yes"
+msgstr "Cozinhavel: Sim"
+
+#: src/inventory.cpp:258 src/inventory.cpp:380 src/inventory.cpp:555
+msgid "Fuel Burn Time: "
+msgstr "Tempo de Queima de Combustível:"
+
+#: src/inventory.cpp:344
+msgid "Hunger: "
+msgstr "Fome:"
+
+#: src/inventory.cpp:350
+msgid "Health: "
+msgstr "Saúde:"
+
+#: src/inventory.cpp:357
+msgid "Cold Protection: "
+msgstr "Proteção contra o Frio:"
+
+#: src/inventory.cpp:366
+msgid "Energy Boost: "
+msgstr "Impulso de Energia:"
+
+#: src/inventory.cpp:544
+msgid "Strength: "
+msgstr "Força:"
+
+#: src/inventory.cpp:547
+msgid "Speed: "
+msgstr "Velocidade:"
+
+#: src/inventory.cpp:550
+msgid "Level: "
+msgstr "Nível:"
+
+#: src/inventory.cpp:666
 msgid "Armour: "
 msgstr "Armadura:"
 
-#: src/inventory.cpp:649
+#: src/inventory.cpp:672
 msgid "Warmth: "
 msgstr "Calor:"
 
-#: src/inventory.cpp:655
+#: src/inventory.cpp:678
 msgid "Pressure: "
 msgstr "Pressão:"
 
-#: src/inventory.cpp:661
+#: src/inventory.cpp:684
 msgid "Suffocation: "
 msgstr "Sufocação:"
 
-#: src/inventory.cpp:667
+#: src/inventory.cpp:690
 msgid "Durability: "
 msgstr "Durabilidade:"
 
-#: src/inventory.cpp:672
+#: src/inventory.cpp:695
 msgid "Effect Boost: "
 msgstr "Impulso de Efeito:"
 
-#: src/keycode.cpp:229
+#: src/keycode.cpp:232
+msgid "-"
+msgstr ""
+
+#: src/keycode.cpp:234
 msgid "Left Button"
 msgstr "Botão Esquerdo"
 
-#: src/keycode.cpp:229
-msgid "Middle Button"
-msgstr "Botão do Meio"
-
-#: src/keycode.cpp:229
+#: src/keycode.cpp:235
 msgid "Right Button"
 msgstr "Botão Direito"
 
-#: src/keycode.cpp:229
+#: src/keycode.cpp:237
+msgid "Middle Button"
+msgstr "Botão do Meio"
+
+#: src/keycode.cpp:238
 msgid "X Button 1"
 msgstr "X Botão 1"
 
-#: src/keycode.cpp:230
-msgid "Back"
-msgstr "Back"
-
-#: src/keycode.cpp:230
-msgid "Clear"
-msgstr "Limpar"
-
-#: src/keycode.cpp:230
-msgid "Return"
-msgstr "Enter"
-
-#: src/keycode.cpp:230
-msgid "Tab"
-msgstr "Tab"
-
-#: src/keycode.cpp:230
+#: src/keycode.cpp:239
 msgid "X Button 2"
 msgstr "X Botão 2"
 
-#: src/keycode.cpp:231
-msgid "Capital"
-msgstr "Fixa"
+#: src/keycode.cpp:240
+msgid "Back"
+msgstr "Back"
 
-#: src/keycode.cpp:231
-msgid "Control"
-msgstr "Control"
+#: src/keycode.cpp:241
+msgid "Tab"
+msgstr "Tab"
 
-#: src/keycode.cpp:231
-msgid "Kana"
-msgstr "Kana"
+#: src/keycode.cpp:242
+msgid "Clear"
+msgstr "Limpar"
 
-#: src/keycode.cpp:231
-msgid "Menu"
-msgstr "Menu"
+#: src/keycode.cpp:243
+msgid "Return"
+msgstr "Enter"
 
-#: src/keycode.cpp:231
-msgid "Pause"
-msgstr "Pausa"
-
-#: src/keycode.cpp:231
+#: src/keycode.cpp:244
 msgid "Shift"
 msgstr "Shift"
 
-#: src/keycode.cpp:232
-msgid "Convert"
-msgstr "Converter"
+#: src/keycode.cpp:245
+msgid "Control"
+msgstr "Control"
 
-#: src/keycode.cpp:232
-msgid "Escape"
-msgstr "Escape"
+#: src/keycode.cpp:246
+msgid "Menu"
+msgstr "Menu"
 
-#: src/keycode.cpp:232
-msgid "Final"
-msgstr "Final"
+#: src/keycode.cpp:247
+msgid "Pause"
+msgstr "Pausa"
 
-#: src/keycode.cpp:232
+#: src/keycode.cpp:248
+msgid "Capital"
+msgstr "Fixa"
+
+#: src/keycode.cpp:249
+msgid "Kana"
+msgstr "Kana"
+
+#: src/keycode.cpp:250
 msgid "Junja"
 msgstr "Junja"
 
-#: src/keycode.cpp:232
+#: src/keycode.cpp:251
+msgid "Final"
+msgstr "Final"
+
+#: src/keycode.cpp:252
 msgid "Kanji"
 msgstr "Kanji"
 
-#: src/keycode.cpp:232
+#: src/keycode.cpp:253
+msgid "Escape"
+msgstr "Escape"
+
+#: src/keycode.cpp:254
+msgid "Convert"
+msgstr "Converter"
+
+#: src/keycode.cpp:255
 msgid "Nonconvert"
 msgstr "Não converter"
 
-#: src/keycode.cpp:233
+#: src/keycode.cpp:256
 msgid "Accept"
 msgstr "Aceitar"
 
-#: src/keycode.cpp:233
-msgid "End"
-msgstr "End"
-
-#: src/keycode.cpp:233
-msgid "Home"
-msgstr "Home"
-
-#: src/keycode.cpp:233
+#: src/keycode.cpp:257
 msgid "Mode Change"
 msgstr "Alterar Modo"
 
-#: src/keycode.cpp:233
-msgid "Next"
-msgstr "Próximo"
-
-#: src/keycode.cpp:233
-msgid "Prior"
-msgstr "Anterior"
-
-#: src/keycode.cpp:233
+#: src/keycode.cpp:258
 msgid "Space"
 msgstr "Espaço"
 
-#: src/keycode.cpp:234
-msgid "Execute"
-msgstr "Executar"
+#: src/keycode.cpp:259
+msgid "Prior"
+msgstr "Anterior"
 
-#: src/keycode.cpp:234
-msgid "Print"
-msgstr "Print"
+#: src/keycode.cpp:260
+msgid "Next"
+msgstr "Próximo"
 
-#: src/keycode.cpp:234
+#: src/keycode.cpp:261
+msgid "End"
+msgstr "End"
+
+#: src/keycode.cpp:262
+msgid "Home"
+msgstr "Home"
+
+#: src/keycode.cpp:267
 msgid "Select"
 msgstr "Selecionar"
 
-#: src/keycode.cpp:235
-msgid "Delete"
-msgstr "Delete"
+#: src/keycode.cpp:268
+msgid "Print"
+msgstr "Print"
 
-#: src/keycode.cpp:235
-msgid "Help"
-msgstr "Ajuda"
+#: src/keycode.cpp:269
+msgid "Execute"
+msgstr "Executar"
 
-#: src/keycode.cpp:235
-msgid "Insert"
-msgstr "Insert"
-
-#: src/keycode.cpp:235
+#: src/keycode.cpp:270
 msgid "Snapshot"
 msgstr "Captura de Tela"
 
-#: src/keycode.cpp:238
+#: src/keycode.cpp:271
+msgid "Insert"
+msgstr "Insert"
+
+#: src/keycode.cpp:272
+msgid "Delete"
+msgstr "Delete"
+
+#: src/keycode.cpp:273
+msgid "Help"
+msgstr "Ajuda"
+
+#: src/keycode.cpp:274
+msgid "0"
+msgstr ""
+
+#: src/keycode.cpp:275
+msgid "1"
+msgstr ""
+
+#: src/keycode.cpp:276
+msgid "2"
+msgstr ""
+
+#: src/keycode.cpp:277
+msgid "3"
+msgstr ""
+
+#: src/keycode.cpp:278
+msgid "4"
+msgstr ""
+
+#: src/keycode.cpp:279
+msgid "5"
+msgstr ""
+
+#: src/keycode.cpp:280
+msgid "6"
+msgstr ""
+
+#: src/keycode.cpp:281
+msgid "7"
+msgstr ""
+
+#: src/keycode.cpp:282
+msgid "8"
+msgstr ""
+
+#: src/keycode.cpp:283
+msgid "9"
+msgstr ""
+
+#: src/keycode.cpp:284
+msgid "A"
+msgstr ""
+
+#: src/keycode.cpp:285
+msgid "B"
+msgstr ""
+
+#: src/keycode.cpp:286
+msgid "C"
+msgstr ""
+
+#: src/keycode.cpp:287
+msgid "D"
+msgstr ""
+
+#: src/keycode.cpp:288
+msgid "E"
+msgstr ""
+
+#: src/keycode.cpp:289
+msgid "F"
+msgstr ""
+
+#: src/keycode.cpp:290
+msgid "G"
+msgstr ""
+
+#: src/keycode.cpp:291
+msgid "H"
+msgstr ""
+
+#: src/keycode.cpp:292
+msgid "I"
+msgstr ""
+
+#: src/keycode.cpp:293
+msgid "J"
+msgstr ""
+
+#: src/keycode.cpp:294
+msgid "K"
+msgstr ""
+
+#: src/keycode.cpp:295
+msgid "L"
+msgstr ""
+
+#: src/keycode.cpp:296
+msgid "M"
+msgstr ""
+
+#: src/keycode.cpp:297
+msgid "N"
+msgstr ""
+
+#: src/keycode.cpp:298
+msgid "O"
+msgstr ""
+
+#: src/keycode.cpp:299
+msgid "P"
+msgstr ""
+
+#: src/keycode.cpp:300
+msgid "Q"
+msgstr ""
+
+#: src/keycode.cpp:301
+msgid "R"
+msgstr ""
+
+#: src/keycode.cpp:302
+msgid "S"
+msgstr ""
+
+#: src/keycode.cpp:303
+msgid "T"
+msgstr ""
+
+#: src/keycode.cpp:304
+#, fuzzy
+msgid "U"
+msgstr "Subir"
+
+#: src/keycode.cpp:305
+msgid "V"
+msgstr ""
+
+#: src/keycode.cpp:306
+msgid "W"
+msgstr ""
+
+#: src/keycode.cpp:307
+msgid "X"
+msgstr ""
+
+#: src/keycode.cpp:308
+msgid "Y"
+msgstr ""
+
+#: src/keycode.cpp:309
+msgid "Z"
+msgstr ""
+
+#: src/keycode.cpp:310
 msgid "Left Windows"
 msgstr "Windows Esquerdo"
 
-#: src/keycode.cpp:239
-msgid "Apps"
-msgstr "Aplicativos"
-
-#: src/keycode.cpp:239
-msgid "Numpad 0"
-msgstr "Teclado Numérico 0"
-
-#: src/keycode.cpp:239
-msgid "Numpad 1"
-msgstr "Teclado Numérico 1"
-
-#: src/keycode.cpp:239
+#: src/keycode.cpp:311
 msgid "Right Windows"
 msgstr "Windows Direito"
 
-#: src/keycode.cpp:239
+#: src/keycode.cpp:312
+msgid "Apps"
+msgstr "Aplicativos"
+
+#: src/keycode.cpp:313
 msgid "Sleep"
 msgstr "Sleep"
 
-#: src/keycode.cpp:240
+#: src/keycode.cpp:314
+msgid "Numpad 0"
+msgstr "Teclado Numérico 0"
+
+#: src/keycode.cpp:315
+msgid "Numpad 1"
+msgstr "Teclado Numérico 1"
+
+#: src/keycode.cpp:316
 msgid "Numpad 2"
 msgstr "Teclado Numérico 2"
 
-#: src/keycode.cpp:240
+#: src/keycode.cpp:317
 msgid "Numpad 3"
 msgstr "Teclado Numérico 3"
 
-#: src/keycode.cpp:240
+#: src/keycode.cpp:318
 msgid "Numpad 4"
 msgstr "Teclado Numérico 4"
 
-#: src/keycode.cpp:240
+#: src/keycode.cpp:319
 msgid "Numpad 5"
 msgstr "Teclado Numérico 5"
 
-#: src/keycode.cpp:240
+#: src/keycode.cpp:320
 msgid "Numpad 6"
 msgstr "Teclado Numérico 6"
 
-#: src/keycode.cpp:240
+#: src/keycode.cpp:321
 msgid "Numpad 7"
 msgstr "Teclado Numérico 7"
 
-#: src/keycode.cpp:241
-msgid "Numpad *"
-msgstr "Teclado Numérico *"
-
-#: src/keycode.cpp:241
-msgid "Numpad +"
-msgstr "Teclado Numérico +"
-
-#: src/keycode.cpp:241
-msgid "Numpad -"
-msgstr "Teclado Numérico -"
-
-#: src/keycode.cpp:241
-msgid "Numpad /"
-msgstr "Teclado Numérico /"
-
-#: src/keycode.cpp:241
+#: src/keycode.cpp:322
 msgid "Numpad 8"
 msgstr "Teclado Numérico 8"
 
-#: src/keycode.cpp:241
+#: src/keycode.cpp:323
 msgid "Numpad 9"
 msgstr "Teclado Numérico 9"
 
-#: src/keycode.cpp:245
+#: src/keycode.cpp:324
+msgid "Numpad *"
+msgstr "Teclado Numérico *"
+
+#: src/keycode.cpp:325
+msgid "Numpad +"
+msgstr "Teclado Numérico +"
+
+#: src/keycode.cpp:326 src/keycode.cpp:329
+msgid "Numpad /"
+msgstr "Teclado Numérico /"
+
+#: src/keycode.cpp:327
+msgid "Numpad -"
+msgstr "Teclado Numérico -"
+
+#: src/keycode.cpp:328
+#, fuzzy
+msgid "Numpad ."
+msgstr "Teclado Numérico 0"
+
+#: src/keycode.cpp:330
+msgid "F10"
+msgstr ""
+
+#: src/keycode.cpp:331
+msgid "F11"
+msgstr ""
+
+#: src/keycode.cpp:332
+msgid "F12"
+msgstr ""
+
+#: src/keycode.cpp:333
+msgid "F13"
+msgstr ""
+
+#: src/keycode.cpp:334
+msgid "F14"
+msgstr ""
+
+#: src/keycode.cpp:335
+msgid "F15"
+msgstr ""
+
+#: src/keycode.cpp:336
+msgid "F16"
+msgstr ""
+
+#: src/keycode.cpp:337
+msgid "F17"
+msgstr ""
+
+#: src/keycode.cpp:338
+msgid "F18"
+msgstr ""
+
+#: src/keycode.cpp:339
+msgid "F19"
+msgstr ""
+
+#: src/keycode.cpp:340
+msgid "F20"
+msgstr ""
+
+#: src/keycode.cpp:341
+msgid "F21"
+msgstr ""
+
+#: src/keycode.cpp:342
+msgid "F22"
+msgstr ""
+
+#: src/keycode.cpp:343
+msgid "F23"
+msgstr ""
+
+#: src/keycode.cpp:344
+msgid "F24"
+msgstr ""
+
+#: src/keycode.cpp:345
 msgid "Num Lock"
 msgstr "Num Lock"
 
-#: src/keycode.cpp:245
+#: src/keycode.cpp:346
 msgid "Scroll Lock"
 msgstr "Scroll Lock"
 
-#: src/keycode.cpp:246
+#: src/keycode.cpp:347
 msgid "Left Shift"
 msgstr "Shift Esquerdo"
 
-#: src/keycode.cpp:246
+#: src/keycode.cpp:348
 msgid "Right Shift"
 msgstr "Shift Direito"
 
-#: src/keycode.cpp:247
+#: src/keycode.cpp:349
 msgid "Left Control"
 msgstr "Control Esquerdo"
 
-#: src/keycode.cpp:247
-msgid "Left Menu"
-msgstr "Menu Esquerdo"
-
-#: src/keycode.cpp:247
+#: src/keycode.cpp:350
 msgid "Right Control"
 msgstr "Control Direito"
 
-#: src/keycode.cpp:247
+#: src/keycode.cpp:351
+msgid "Left Menu"
+msgstr "Menu Esquerdo"
+
+#: src/keycode.cpp:352
 msgid "Right Menu"
 msgstr "Menu Direito"
 
-#: src/keycode.cpp:249
-msgid "Comma"
-msgstr "Vírgula"
-
-#: src/keycode.cpp:249
-msgid "Minus"
-msgstr "Sinal de Menos"
-
-#: src/keycode.cpp:249
-msgid "Period"
-msgstr "Periodo"
-
-#: src/keycode.cpp:249
+#: src/keycode.cpp:353
 msgid "Plus"
 msgstr "Sinal de Mais"
 
-#: src/keycode.cpp:253
+#: src/keycode.cpp:354
+msgid "Comma"
+msgstr "Vírgula"
+
+#: src/keycode.cpp:355
+msgid "Minus"
+msgstr "Sinal de Menos"
+
+#: src/keycode.cpp:356
+msgid "Period"
+msgstr "Periodo"
+
+#: src/keycode.cpp:357
 msgid "Attn"
 msgstr "Attn"
 
-#: src/keycode.cpp:253
+#: src/keycode.cpp:358
 msgid "CrSel"
 msgstr "CrSel"
 
-#: src/keycode.cpp:254
-msgid "Erase OEF"
-msgstr "Erase OEF"
-
-#: src/keycode.cpp:254
+#: src/keycode.cpp:359
 msgid "ExSel"
 msgstr "ExSel"
 
-#: src/keycode.cpp:254
-msgid "OEM Clear"
-msgstr "OEM Clear"
+#: src/keycode.cpp:360
+msgid "Erase OEF"
+msgstr "Erase OEF"
 
-#: src/keycode.cpp:254
-msgid "PA1"
-msgstr "PA1"
-
-#: src/keycode.cpp:254
+#: src/keycode.cpp:361
 msgid "Play"
 msgstr "Play"
 
-#: src/keycode.cpp:254
+#: src/keycode.cpp:362
 msgid "Zoom"
 msgstr "Zoom"
 
+#: src/keycode.cpp:363
+msgid "PA1"
+msgstr "PA1"
+
+#: src/keycode.cpp:364
+msgid "OEM Clear"
+msgstr "OEM Clear"
+
 #: src/main.cpp:1131
 msgid "Setting Up UI"
 msgstr "Configurando Interface de Usuário"
@@ -4327,30 +4617,70 @@ msgstr "Carregando Criaturas"
 msgid "Setting Up Sound"
 msgstr "Configuração de Som"
 
-#: src/mapnode.cpp:282
+#: src/mapnode.cpp:285
 msgid "Loading Base MapNodes"
 msgstr "Carregando MapNodes Básicos"
 
-#: src/mapnode.cpp:286
+#: src/mapnode.cpp:289
 msgid "Loading Circuit MapNodes"
 msgstr "Carregando MapNodes Circuitos"
 
-#: src/mapnode.cpp:290
+#: src/mapnode.cpp:293
 msgid "Loading Plant MapNodes"
 msgstr "Carregando Mapnodes Plantas"
 
-#: src/mapnode.cpp:294
+#: src/mapnode.cpp:297
 msgid "Loading Farming MapNodes"
 msgstr "Carregando MapNodes Agricultura"
 
-#: src/mapnode.cpp:298
+#: src/mapnode.cpp:301
 msgid "Loading Decorative MapNodes"
 msgstr "Carregando MapNodes Decorativos"
 
-#: src/mapnode.cpp:302
+#: src/mapnode.cpp:305
 msgid "Loading Interactive MapNodes"
 msgstr "Carregando MapNodes Interativos"
 
-#: src/mapnode.cpp:306
+#: src/mapnode.cpp:309
 msgid "Loading Special MapNodes"
 msgstr "Carregando MapNodes Especiais"
+
+#: src/mineral.cpp:93
+#, fuzzy
+msgid "Coal"
+msgstr "Pedaço de Carvão"
+
+#: src/mineral.cpp:99
+#, fuzzy
+msgid "Iron"
+msgstr "Pedaço de Ferro"
+
+#: src/mineral.cpp:106
+#, fuzzy
+msgid "Tin"
+msgstr "Mais Fino"
+
+#: src/mineral.cpp:113
+#, fuzzy
+msgid "Copper"
+msgstr "Pedaço de Cobre"
+
+#: src/mineral.cpp:121
+#, fuzzy
+msgid "Silver"
+msgstr "Pedaço de Prata"
+
+#: src/mineral.cpp:128
+#, fuzzy
+msgid "Gold"
+msgstr "Pedaço de Ouro"
+
+#: src/mineral.cpp:135
+#, fuzzy
+msgid "Quartz"
+msgstr "Pó de Quartzo"
+
+#: src/mineral.cpp:157
+#, fuzzy
+msgid "Turquoise"
+msgstr "Turqueza"
diff --git a/po/ru/voxelands.po b/po/ru/voxelands.po
index d1af188..27a4894 100644
--- a/po/ru/voxelands.po
+++ b/po/ru/voxelands.po
@@ -1,22 +1,25 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Lisa 'darkrose' Milne
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # Roman M. Yagodin <roman.yagodin@gmail.com>, 2014-2015
 msgid ""
 msgstr ""
 "Project-Id-Version: Voxelands\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-10-19 01:55+1000\n"
+"POT-Creation-Date: 2015-12-21 11:27+1000\n"
 "PO-Revision-Date: 2015-10-19 06:10+0000\n"
 "Last-Translator: Roman M. Yagodin <roman.yagodin@gmail.com>\n"
-"Language-Team: Russian (http://www.transifex.com/voxelands/voxelands/language/ru/)\n"
+"Language-Team: Russian (http://www.transifex.com/voxelands/voxelands/"
+"language/ru/)\n"
+"Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: ru\n"
-"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
+"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n"
+"%100>=11 && n%100<=14)? 2 : 3);\n"
 
 #: src/character_creator.cpp:55
 msgid "White Skin"
@@ -228,9 +231,18 @@ msgstr "Холщовая обувь"
 
 #: src/character_creator.cpp:202
 msgid ""
-"Here you can create your default character, this is how other players will see you in-game. When you join a new server you will start with the clothing you select here. Additional clothing, both protective and decorative, can be crafted in-game.\n"
+"Here you can create your default character, this is how other players will "
+"see you in-game. When you join a new server you will start with the clothing "
+"you select here. Additional clothing, both protective and decorative, can be "
+"crafted in-game.\n"
 "You can return here from the main menu anytime to change your character."
-msgstr "Здесь можно задать исходный внешний вид своего персонажа. Так он будет выглядеть для других игроков в начале игры - например, при подключении к новому серверу. Другие предметы одежды, как защитные, так и декоративные, могут быть созданы в процессе игры.\nВы можете вернуться сюда в любое время из главного меню, чтобы изменить внешний вид вашего персонажа."
+msgstr ""
+"Здесь можно задать исходный внешний вид своего персонажа. Так он будет "
+"выглядеть для других игроков в начале игры - например, при подключении к "
+"новому серверу. Другие предметы одежды, как защитные, так и декоративные, "
+"могут быть созданы в процессе игры.\n"
+"Вы можете вернуться сюда в любое время из главного меню, чтобы изменить "
+"внешний вид вашего персонажа."
 
 #: src/character_creator.cpp:223
 msgid "Create Your Character"
@@ -264,7 +276,7 @@ msgstr "Тоньше"
 msgid "Done"
 msgstr "Готово"
 
-#: src/character_creator.cpp:423 src/keycode.cpp:229
+#: src/character_creator.cpp:423 src/keycode.cpp:236
 msgid "Cancel"
 msgstr "Отмена"
 
@@ -1116,7 +1128,7 @@ msgstr "Кремень"
 msgid "Steel Ingot"
 msgstr "Стальной слиток"
 
-#: src/content_craftitem.cpp:225 src/content_mapnode.cpp:710
+#: src/content_craftitem.cpp:225 src/content_mapnode.cpp:723
 msgid "Brick"
 msgstr "Кирпич"
 
@@ -1544,11 +1556,11 @@ msgstr "Сырой мифрил"
 msgid "Unbound Mithril"
 msgstr "Свободный мифрил"
 
-#: src/content_craftitem.cpp:1516
+#: src/content_craftitem.cpp:1516 src/mineral.cpp:142
 msgid "Mithril"
 msgstr "Мифрил"
 
-#: src/content_craftitem.cpp:1525
+#: src/content_craftitem.cpp:1525 src/mineral.cpp:149
 msgid "Ruby"
 msgstr "Рубин"
 
@@ -1556,15 +1568,15 @@ msgstr "Рубин"
 msgid "Turquiose"
 msgstr "Бирюза"
 
-#: src/content_craftitem.cpp:1541
+#: src/content_craftitem.cpp:1541 src/mineral.cpp:165
 msgid "Amethyst"
 msgstr "Аметист"
 
-#: src/content_craftitem.cpp:1549
+#: src/content_craftitem.cpp:1549 src/mineral.cpp:173
 msgid "Sapphire"
 msgstr "Сапфир"
 
-#: src/content_craftitem.cpp:1557
+#: src/content_craftitem.cpp:1557 src/mineral.cpp:181
 msgid "Sunstone"
 msgstr "Янтарь"
 
@@ -1576,392 +1588,396 @@ msgstr "Камень"
 msgid "Limestone"
 msgstr "Известняк"
 
-#: src/content_mapnode.cpp:219
+#: src/content_mapnode.cpp:221
+msgid "Marble"
+msgstr ""
+
+#: src/content_mapnode.cpp:232
 msgid "Rock"
 msgstr "Скала"
 
-#: src/content_mapnode.cpp:241
+#: src/content_mapnode.cpp:254
 msgid "Ice"
 msgstr "Лед"
 
-#: src/content_mapnode.cpp:257
+#: src/content_mapnode.cpp:270
 msgid "Coal Block"
 msgstr "Блок каменного угля"
 
-#: src/content_mapnode.cpp:274
+#: src/content_mapnode.cpp:287
 msgid "Charcoal Block"
 msgstr "Блок древесного угля"
 
-#: src/content_mapnode.cpp:291
+#: src/content_mapnode.cpp:304
 msgid "Stone Brick"
 msgstr "Каменный кирпич"
 
-#: src/content_mapnode.cpp:305
+#: src/content_mapnode.cpp:318
 msgid "Stone Block"
 msgstr "Каменный блок"
 
-#: src/content_mapnode.cpp:319
+#: src/content_mapnode.cpp:332
 msgid "Rough Stone Brick"
 msgstr "Кирпич грубого камня"
 
-#: src/content_mapnode.cpp:336
+#: src/content_mapnode.cpp:349
 msgid "Rough Stone Block"
 msgstr "Блок грубого камня"
 
-#: src/content_mapnode.cpp:352 src/content_mapnode.cpp:385
-#: src/content_mapnode.cpp:399 src/content_mapnode.cpp:432
+#: src/content_mapnode.cpp:365 src/content_mapnode.cpp:398
+#: src/content_mapnode.cpp:412 src/content_mapnode.cpp:445
 msgid "Grass"
 msgstr "Трава"
 
-#: src/content_mapnode.cpp:370 src/content_mapnode.cpp:417
+#: src/content_mapnode.cpp:383 src/content_mapnode.cpp:430
 msgid "Growing Grass"
 msgstr "Растущая трава"
 
-#: src/content_mapnode.cpp:446
+#: src/content_mapnode.cpp:459
 msgid "Muddy Snow"
 msgstr "Грязный снег"
 
-#: src/content_mapnode.cpp:462
+#: src/content_mapnode.cpp:475
 msgid "Mud"
 msgstr "Грязь"
 
-#: src/content_mapnode.cpp:478
+#: src/content_mapnode.cpp:491
 msgid "Ash Block"
 msgstr "Блок пепла"
 
-#: src/content_mapnode.cpp:493
+#: src/content_mapnode.cpp:506
 msgid "Sand"
 msgstr "Песок"
 
-#: src/content_mapnode.cpp:512
+#: src/content_mapnode.cpp:525
 msgid "Gravel"
 msgstr "Гравий"
 
-#: src/content_mapnode.cpp:529
+#: src/content_mapnode.cpp:542
 msgid "Sand Stone"
 msgstr "Песчаник"
 
-#: src/content_mapnode.cpp:544
+#: src/content_mapnode.cpp:557
 msgid "Sand Stone Bricks"
 msgstr "Кирпичи песчаника"
 
-#: src/content_mapnode.cpp:559
+#: src/content_mapnode.cpp:572
 msgid "Sand Stone Blocks"
 msgstr "Блоки песчаника"
 
-#: src/content_mapnode.cpp:574
+#: src/content_mapnode.cpp:587
 msgid "Clay"
 msgstr "Глина"
 
-#: src/content_mapnode.cpp:591
+#: src/content_mapnode.cpp:604
 msgid "Blue Clay"
 msgstr "Синяя глина"
 
-#: src/content_mapnode.cpp:608
+#: src/content_mapnode.cpp:621
 msgid "Green Clay"
 msgstr "Зеленая глина"
 
-#: src/content_mapnode.cpp:625
+#: src/content_mapnode.cpp:638
 msgid "Orange Clay"
 msgstr "Оранжевая глина"
 
-#: src/content_mapnode.cpp:642
+#: src/content_mapnode.cpp:655
 msgid "Purple Clay"
 msgstr "Фиолетовая глина"
 
-#: src/content_mapnode.cpp:659
+#: src/content_mapnode.cpp:672
 msgid "Red Clay"
 msgstr "Красная глина"
 
-#: src/content_mapnode.cpp:676
+#: src/content_mapnode.cpp:689
 msgid "Yellow Clay"
 msgstr "Желтая глина"
 
-#: src/content_mapnode.cpp:693
+#: src/content_mapnode.cpp:706
 msgid "Black Clay"
 msgstr "Черная глина"
 
-#: src/content_mapnode.cpp:729
+#: src/content_mapnode.cpp:742
 msgid "Terracotta"
 msgstr "Керамика"
 
-#: src/content_mapnode.cpp:741
+#: src/content_mapnode.cpp:754
 msgid "Terracotta Brick"
 msgstr "Керамический кирпич"
 
-#: src/content_mapnode.cpp:755
+#: src/content_mapnode.cpp:768
 msgid "Terracotta Block"
 msgstr "Блок керамики"
 
-#: src/content_mapnode.cpp:769
+#: src/content_mapnode.cpp:782
 msgid "Terracotta Tile"
 msgstr "Керамическая плитка"
 
-#: src/content_mapnode.cpp:789
+#: src/content_mapnode.cpp:802
 msgid "Glass"
 msgstr "Стекло"
 
-#: src/content_mapnode.cpp:809
+#: src/content_mapnode.cpp:822
 msgid "Blue Glass"
 msgstr "Синее стекло"
 
-#: src/content_mapnode.cpp:831
+#: src/content_mapnode.cpp:844
 msgid "Green Glass"
 msgstr "Зеленое стекло"
 
-#: src/content_mapnode.cpp:853
+#: src/content_mapnode.cpp:866
 msgid "Orange Glass"
 msgstr "Оранжевое стекло"
 
-#: src/content_mapnode.cpp:875
+#: src/content_mapnode.cpp:888
 msgid "Purple Glass"
 msgstr "Фиолетовое стекло"
 
-#: src/content_mapnode.cpp:897
+#: src/content_mapnode.cpp:910
 msgid "Red Glass"
 msgstr "Красное стекло"
 
-#: src/content_mapnode.cpp:919
+#: src/content_mapnode.cpp:932
 msgid "Yellow Glass"
 msgstr "Желтое стекло"
 
-#: src/content_mapnode.cpp:941
+#: src/content_mapnode.cpp:954
 msgid "Black Glass"
 msgstr "Черное стекло"
 
-#: src/content_mapnode.cpp:963
+#: src/content_mapnode.cpp:976
 msgid "Glass Pane"
 msgstr "Стеклянная панель"
 
-#: src/content_mapnode.cpp:997
+#: src/content_mapnode.cpp:1010
 msgid "Blue Glass Pane"
 msgstr "Панель синего стекла"
 
-#: src/content_mapnode.cpp:1032
+#: src/content_mapnode.cpp:1045
 msgid "Green Glass Pane"
 msgstr "Панель зеленого стекла"
 
-#: src/content_mapnode.cpp:1067
+#: src/content_mapnode.cpp:1080
 msgid "Orange Glass Pane"
 msgstr "Панель оранжевого стекла"
 
-#: src/content_mapnode.cpp:1102
+#: src/content_mapnode.cpp:1115
 msgid "Purple Glass Pane"
 msgstr "Панель фиолетового стекла"
 
-#: src/content_mapnode.cpp:1137
+#: src/content_mapnode.cpp:1150
 msgid "Red Glass Pane"
 msgstr "Панель красного стекла"
 
-#: src/content_mapnode.cpp:1172
+#: src/content_mapnode.cpp:1185
 msgid "Yellow Glass Pane"
 msgstr "Панель желтого стекла"
 
-#: src/content_mapnode.cpp:1207
+#: src/content_mapnode.cpp:1220
 msgid "Black Glass Pane"
 msgstr "Панель черного стекла"
 
-#: src/content_mapnode.cpp:1242 src/content_mapnode_farm.cpp:333
+#: src/content_mapnode.cpp:1255 src/content_mapnode_farm.cpp:333
 msgid "Glass Light"
 msgstr "Стеклянная лампа"
 
-#: src/content_mapnode.cpp:1265
+#: src/content_mapnode.cpp:1278
 msgid "Wood"
 msgstr "Дерево"
 
-#: src/content_mapnode.cpp:1291
+#: src/content_mapnode.cpp:1304
 msgid "Jungle Wood"
 msgstr "Пальмовое дерево"
 
-#: src/content_mapnode.cpp:1316
+#: src/content_mapnode.cpp:1329
 msgid "Pine"
 msgstr "Сосна"
 
-#: src/content_mapnode.cpp:1341
+#: src/content_mapnode.cpp:1354
 msgid "Sponge"
 msgstr "Губка"
 
-#: src/content_mapnode.cpp:1356
+#: src/content_mapnode.cpp:1369
 msgid "Waterlogged Sponge"
 msgstr "Мокрая губка"
 
-#: src/content_mapnode.cpp:1371
+#: src/content_mapnode.cpp:1384
 msgid "Hay Bale"
 msgstr "Тюк сена"
 
-#: src/content_mapnode.cpp:1388
+#: src/content_mapnode.cpp:1401
 msgid "Raw Apple Pie"
 msgstr "Сырой яблочный пирог"
 
-#: src/content_mapnode.cpp:1417
+#: src/content_mapnode.cpp:1430
 msgid "Apple Pie"
 msgstr "Яблочный пирог"
 
-#: src/content_mapnode.cpp:1512
+#: src/content_mapnode.cpp:1525
 msgid "Raw Pumpkin Pie"
 msgstr "Сырой тыквенный пирог"
 
-#: src/content_mapnode.cpp:1541
+#: src/content_mapnode.cpp:1554
 msgid "Pumpkin Pie"
 msgstr "Тыквенный пирог"
 
-#: src/content_mapnode.cpp:1636 src/content_mapnode.cpp:1715
+#: src/content_mapnode.cpp:1649 src/content_mapnode.cpp:1728
 msgid "Snow"
 msgstr "Снег"
 
-#: src/content_mapnode.cpp:1652
+#: src/content_mapnode.cpp:1665
 msgid "Snowman"
 msgstr "Снеговик"
 
-#: src/content_mapnode.cpp:1738 src/content_mapnode_farm.cpp:445
+#: src/content_mapnode.cpp:1752 src/content_mapnode_farm.cpp:445
 msgid "Cotton"
 msgstr "Хлопок"
 
-#: src/content_mapnode.cpp:1769
+#: src/content_mapnode.cpp:1783
 msgid "Blue Cotton"
 msgstr "Синий хлопок"
 
-#: src/content_mapnode.cpp:1786
+#: src/content_mapnode.cpp:1800
 msgid "Green Cotton"
 msgstr "Зеленый хлопок"
 
-#: src/content_mapnode.cpp:1803
+#: src/content_mapnode.cpp:1817
 msgid "Orange Cotton"
 msgstr "Оранжевый хлопок"
 
-#: src/content_mapnode.cpp:1820
+#: src/content_mapnode.cpp:1834
 msgid "Purple Cotton"
 msgstr "Фиолетовый хлопок"
 
-#: src/content_mapnode.cpp:1837
+#: src/content_mapnode.cpp:1851
 msgid "Red Cotton"
 msgstr "Красный хлопок"
 
-#: src/content_mapnode.cpp:1854
+#: src/content_mapnode.cpp:1868
 msgid "Yellow Cotton"
 msgstr "Желтый хлопок"
 
-#: src/content_mapnode.cpp:1871
+#: src/content_mapnode.cpp:1885
 msgid "Black Cotton"
 msgstr "Черный хлопок"
 
-#: src/content_mapnode.cpp:1888
+#: src/content_mapnode.cpp:1902
 msgid "Carpet"
 msgstr "Ковер"
 
-#: src/content_mapnode.cpp:1911
+#: src/content_mapnode.cpp:1925
 msgid "Blue Carpet"
 msgstr "Синий ковер"
 
-#: src/content_mapnode.cpp:1935
+#: src/content_mapnode.cpp:1949
 msgid "Green Carpet"
 msgstr "Зеленый ковер"
 
-#: src/content_mapnode.cpp:1959
+#: src/content_mapnode.cpp:1973
 msgid "Orange Carpet"
 msgstr "Оранжевый ковер"
 
-#: src/content_mapnode.cpp:1983
+#: src/content_mapnode.cpp:1997
 msgid "Purple Carpet"
 msgstr "Фиолетовый ковер"
 
-#: src/content_mapnode.cpp:2007
+#: src/content_mapnode.cpp:2021
 msgid "Red Carpet"
 msgstr "Красный ковер"
 
-#: src/content_mapnode.cpp:2031
+#: src/content_mapnode.cpp:2045
 msgid "Yellow Carpet"
 msgstr "Желтый ковер"
 
-#: src/content_mapnode.cpp:2055
+#: src/content_mapnode.cpp:2069
 msgid "Black Carpet"
 msgstr "Черный ковер"
 
-#: src/content_mapnode.cpp:2079
+#: src/content_mapnode.cpp:2093
 msgid "Air"
 msgstr "Воздух"
 
-#: src/content_mapnode.cpp:2095
+#: src/content_mapnode.cpp:2109
 msgid "Vacuum"
 msgstr "Вакуум"
 
-#: src/content_mapnode.cpp:2112 src/content_mapnode.cpp:2142
+#: src/content_mapnode.cpp:2126 src/content_mapnode.cpp:2156
 msgid "Water"
 msgstr "Вода"
 
-#: src/content_mapnode.cpp:2172 src/content_mapnode.cpp:2200
+#: src/content_mapnode.cpp:2186 src/content_mapnode.cpp:2214
 msgid "Lava"
 msgstr "Лава"
 
-#: src/content_mapnode.cpp:2231
+#: src/content_mapnode.cpp:2245
 msgid "Rough Stone"
 msgstr "Грубый камень"
 
-#: src/content_mapnode.cpp:2248
+#: src/content_mapnode.cpp:2262
 msgid "Cobble Stone"
 msgstr "Булыжник"
 
-#: src/content_mapnode.cpp:2264
+#: src/content_mapnode.cpp:2278
 msgid "Mossy Cobble Stone"
 msgstr "Замшелый булыжник"
 
-#: src/content_mapnode.cpp:2277
+#: src/content_mapnode.cpp:2291
 msgid "Steel Block"
 msgstr "Стальной блок"
 
-#: src/content_mapnode.cpp:2294
+#: src/content_mapnode.cpp:2308
 msgid "Mithril Block"
 msgstr "Блок мифрила"
 
-#: src/content_mapnode.cpp:2310
+#: src/content_mapnode.cpp:2324
 msgid "Stone Knob"
 msgstr "Каменная кнопка"
 
-#: src/content_mapnode.cpp:2311
+#: src/content_mapnode.cpp:2325
 msgid "Rough Stone Knob"
 msgstr "Кнопка из грубого камня"
 
-#: src/content_mapnode.cpp:2312
+#: src/content_mapnode.cpp:2326
 msgid "Sandstone Knob"
 msgstr "Кнопка из песчаника"
 
-#: src/content_mapnode.cpp:2313
+#: src/content_mapnode.cpp:2327
 msgid "Wooden Knob"
 msgstr "Деревянная кнопка"
 
-#: src/content_mapnode.cpp:2314
+#: src/content_mapnode.cpp:2328
 msgid "Junglewood Knob"
 msgstr "Пальмовая кнопка"
 
-#: src/content_mapnode.cpp:2315
+#: src/content_mapnode.cpp:2329
 msgid "Pine Knob"
 msgstr "Сосновая кнопка"
 
-#: src/content_mapnode.cpp:2319
+#: src/content_mapnode.cpp:2333
 msgid "Copper Block"
 msgstr "Блок меди"
 
-#: src/content_mapnode.cpp:2336
+#: src/content_mapnode.cpp:2350
 msgid "Gold Block"
 msgstr "Блок золота"
 
-#: src/content_mapnode.cpp:2353
+#: src/content_mapnode.cpp:2367
 msgid "Silver Block"
 msgstr "Блок серебра"
 
-#: src/content_mapnode.cpp:2370
+#: src/content_mapnode.cpp:2384
 msgid "Tin Block"
 msgstr "Блок олова"
 
-#: src/content_mapnode.cpp:2387
+#: src/content_mapnode.cpp:2401
 msgid "Quartz Block"
 msgstr "Блок кварца"
 
-#: src/content_mapnode.cpp:2404
+#: src/content_mapnode.cpp:2418
 msgid "Stone Tiles"
 msgstr "Каменные плитки"
 
-#: src/content_mapnode.cpp:2426
+#: src/content_mapnode.cpp:2440
 msgid "Wood Tiles"
 msgstr "Деревянные плитки"
 
@@ -2009,29 +2025,29 @@ msgstr "Инвертор"
 msgid "Repeater"
 msgstr "Повторитель"
 
-#: src/content_mapnode_circuit.cpp:369 src/content_mapnode_circuit.cpp:393
+#: src/content_mapnode_circuit.cpp:369 src/content_mapnode_circuit.cpp:390
 msgid "Electric Lamp"
 msgstr "Лампочка"
 
-#: src/content_mapnode_circuit.cpp:427 src/content_mapnode_circuit.cpp:462
-#: src/content_mapnode_circuit.cpp:516 src/content_mapnode_circuit.cpp:537
-#: src/content_mapnode_circuit.cpp:582 src/content_mapnode_circuit.cpp:603
+#: src/content_mapnode_circuit.cpp:424 src/content_mapnode_circuit.cpp:459
+#: src/content_mapnode_circuit.cpp:513 src/content_mapnode_circuit.cpp:534
+#: src/content_mapnode_circuit.cpp:579 src/content_mapnode_circuit.cpp:600
 msgid "Piston"
 msgstr "Поршень"
 
-#: src/content_mapnode_circuit.cpp:489 src/content_mapnode_circuit.cpp:560
-#: src/content_mapnode_circuit.cpp:626
+#: src/content_mapnode_circuit.cpp:486 src/content_mapnode_circuit.cpp:557
+#: src/content_mapnode_circuit.cpp:623
 msgid "Piston Arm"
 msgstr "Шатун"
 
-#: src/content_mapnode_circuit.cpp:648 src/content_mapnode_circuit.cpp:676
-#: src/content_mapnode_circuit.cpp:730 src/content_mapnode_circuit.cpp:751
-#: src/content_mapnode_circuit.cpp:796 src/content_mapnode_circuit.cpp:817
+#: src/content_mapnode_circuit.cpp:645 src/content_mapnode_circuit.cpp:673
+#: src/content_mapnode_circuit.cpp:727 src/content_mapnode_circuit.cpp:748
+#: src/content_mapnode_circuit.cpp:793 src/content_mapnode_circuit.cpp:814
 msgid "Sticky Piston"
 msgstr "Липкий поршень"
 
-#: src/content_mapnode_circuit.cpp:703 src/content_mapnode_circuit.cpp:774
-#: src/content_mapnode_circuit.cpp:840
+#: src/content_mapnode_circuit.cpp:700 src/content_mapnode_circuit.cpp:771
+#: src/content_mapnode_circuit.cpp:837
 msgid "Sticky Piston Arm"
 msgstr "Шатун липкого поршня"
 
@@ -2171,7 +2187,7 @@ msgstr "Виноград"
 msgid "Trellis Grape"
 msgstr "Решетка для винограда"
 
-#: src/content_mapnode_farm.cpp:493 src/content_mapnode_farm.cpp:512
+#: src/content_mapnode_farm.cpp:494 src/content_mapnode_farm.cpp:513
 msgid "Dead Vine"
 msgstr "Сухая лиана"
 
@@ -2187,131 +2203,137 @@ msgstr "Пальмовая книжная полка"
 msgid "Pine Book Shelf"
 msgstr "Сосновая книжная полка"
 
-#: src/content_mapnode_furniture.cpp:150 src/content_mapnode_furniture.cpp:169
-#: src/content_mapnode_furniture.cpp:188 src/content_mapnode_furniture.cpp:207
-#: src/content_mapnode_furniture.cpp:226 src/content_mapnode_furniture.cpp:245
+#: src/content_mapnode_furniture.cpp:150 src/content_mapnode_furniture.cpp:170
+#: src/content_mapnode_furniture.cpp:190 src/content_mapnode_furniture.cpp:210
+#: src/content_mapnode_furniture.cpp:230 src/content_mapnode_furniture.cpp:250
 msgid "Couch"
 msgstr "Кушетка"
 
-#: src/content_mapnode_furniture.cpp:274 src/content_mapnode_furniture.cpp:293
-#: src/content_mapnode_furniture.cpp:312 src/content_mapnode_furniture.cpp:331
-#: src/content_mapnode_furniture.cpp:350 src/content_mapnode_furniture.cpp:369
+#: src/content_mapnode_furniture.cpp:280 src/content_mapnode_furniture.cpp:300
+#: src/content_mapnode_furniture.cpp:320 src/content_mapnode_furniture.cpp:340
+#: src/content_mapnode_furniture.cpp:360 src/content_mapnode_furniture.cpp:380
 msgid "Blue Couch"
 msgstr "Синяя кушетка"
 
-#: src/content_mapnode_furniture.cpp:392 src/content_mapnode_furniture.cpp:411
-#: src/content_mapnode_furniture.cpp:430 src/content_mapnode_furniture.cpp:449
-#: src/content_mapnode_furniture.cpp:468 src/content_mapnode_furniture.cpp:487
+#: src/content_mapnode_furniture.cpp:404 src/content_mapnode_furniture.cpp:424
+#: src/content_mapnode_furniture.cpp:444 src/content_mapnode_furniture.cpp:464
+#: src/content_mapnode_furniture.cpp:484 src/content_mapnode_furniture.cpp:504
 msgid "Green Couch"
 msgstr "Зеленая кушетка"
 
-#: src/content_mapnode_furniture.cpp:510 src/content_mapnode_furniture.cpp:529
-#: src/content_mapnode_furniture.cpp:548 src/content_mapnode_furniture.cpp:567
-#: src/content_mapnode_furniture.cpp:586 src/content_mapnode_furniture.cpp:605
+#: src/content_mapnode_furniture.cpp:528 src/content_mapnode_furniture.cpp:548
+#: src/content_mapnode_furniture.cpp:568 src/content_mapnode_furniture.cpp:588
+#: src/content_mapnode_furniture.cpp:608 src/content_mapnode_furniture.cpp:628
 msgid "Orange Couch"
 msgstr "Оранжевая кушетка"
 
-#: src/content_mapnode_furniture.cpp:628 src/content_mapnode_furniture.cpp:647
-#: src/content_mapnode_furniture.cpp:666 src/content_mapnode_furniture.cpp:685
-#: src/content_mapnode_furniture.cpp:704 src/content_mapnode_furniture.cpp:723
+#: src/content_mapnode_furniture.cpp:652 src/content_mapnode_furniture.cpp:672
+#: src/content_mapnode_furniture.cpp:692 src/content_mapnode_furniture.cpp:712
+#: src/content_mapnode_furniture.cpp:732 src/content_mapnode_furniture.cpp:752
 msgid "Purple Couch"
 msgstr "Фиолетовая кушетка"
 
-#: src/content_mapnode_furniture.cpp:746 src/content_mapnode_furniture.cpp:765
-#: src/content_mapnode_furniture.cpp:784 src/content_mapnode_furniture.cpp:803
-#: src/content_mapnode_furniture.cpp:822 src/content_mapnode_furniture.cpp:841
+#: src/content_mapnode_furniture.cpp:776 src/content_mapnode_furniture.cpp:796
+#: src/content_mapnode_furniture.cpp:816 src/content_mapnode_furniture.cpp:836
+#: src/content_mapnode_furniture.cpp:856 src/content_mapnode_furniture.cpp:876
 msgid "Red Couch"
 msgstr "Красная кушетка"
 
-#: src/content_mapnode_furniture.cpp:864 src/content_mapnode_furniture.cpp:883
-#: src/content_mapnode_furniture.cpp:902 src/content_mapnode_furniture.cpp:921
-#: src/content_mapnode_furniture.cpp:940 src/content_mapnode_furniture.cpp:959
+#: src/content_mapnode_furniture.cpp:900 src/content_mapnode_furniture.cpp:920
+#: src/content_mapnode_furniture.cpp:940 src/content_mapnode_furniture.cpp:960
+#: src/content_mapnode_furniture.cpp:980
+#: src/content_mapnode_furniture.cpp:1000
 msgid "Yellow Couch"
 msgstr "Желтая кушетка"
 
-#: src/content_mapnode_furniture.cpp:982
-#: src/content_mapnode_furniture.cpp:1001
-#: src/content_mapnode_furniture.cpp:1020
-#: src/content_mapnode_furniture.cpp:1039
-#: src/content_mapnode_furniture.cpp:1058
-#: src/content_mapnode_furniture.cpp:1077
+#: src/content_mapnode_furniture.cpp:1024
+#: src/content_mapnode_furniture.cpp:1044
+#: src/content_mapnode_furniture.cpp:1064
+#: src/content_mapnode_furniture.cpp:1084
+#: src/content_mapnode_furniture.cpp:1104
+#: src/content_mapnode_furniture.cpp:1124
 msgid "Black Couch"
 msgstr "Черная кушетка"
 
-#: src/content_mapnode_furniture.cpp:1100
+#: src/content_mapnode_furniture.cpp:1148
+#: src/content_mapnode_furniture.cpp:1182
+#: src/content_mapnode_furniture.cpp:1206
+#: src/content_mapnode_furniture.cpp:1230
+#: src/content_mapnode_furniture.cpp:1254
+#: src/content_mapnode_furniture.cpp:1278
 msgid "Chair"
 msgstr "Стул"
 
-#: src/content_mapnode_furniture.cpp:1149
+#: src/content_mapnode_furniture.cpp:1302
 msgid "Table"
 msgstr "Стол"
 
-#: src/content_mapnode_furniture.cpp:1206
-#: src/content_mapnode_furniture.cpp:1239
+#: src/content_mapnode_furniture.cpp:1333
+#: src/content_mapnode_furniture.cpp:1366
 msgid "Bed"
 msgstr "Кровать"
 
-#: src/content_mapnode_furniture.cpp:1267
-#: src/content_mapnode_furniture.cpp:1300
+#: src/content_mapnode_furniture.cpp:1394
+#: src/content_mapnode_furniture.cpp:1427
 msgid "Blue Bed"
 msgstr "Синяя кровать"
 
-#: src/content_mapnode_furniture.cpp:1328
-#: src/content_mapnode_furniture.cpp:1361
+#: src/content_mapnode_furniture.cpp:1455
+#: src/content_mapnode_furniture.cpp:1488
 msgid "Green Bed"
 msgstr "Зеленая кровать"
 
-#: src/content_mapnode_furniture.cpp:1389
-#: src/content_mapnode_furniture.cpp:1422
+#: src/content_mapnode_furniture.cpp:1516
+#: src/content_mapnode_furniture.cpp:1549
 msgid "Orange Bed"
 msgstr "Оранжевая кровать"
 
-#: src/content_mapnode_furniture.cpp:1450
-#: src/content_mapnode_furniture.cpp:1483
+#: src/content_mapnode_furniture.cpp:1577
+#: src/content_mapnode_furniture.cpp:1610
 msgid "Purple Bed"
 msgstr "Фиолетовая кровать"
 
-#: src/content_mapnode_furniture.cpp:1511
-#: src/content_mapnode_furniture.cpp:1544
+#: src/content_mapnode_furniture.cpp:1638
+#: src/content_mapnode_furniture.cpp:1671
 msgid "Red Bed"
 msgstr "Красная кровать"
 
-#: src/content_mapnode_furniture.cpp:1572
-#: src/content_mapnode_furniture.cpp:1605
+#: src/content_mapnode_furniture.cpp:1699
+#: src/content_mapnode_furniture.cpp:1732
 msgid "Yellow Bed"
 msgstr "Желтая кровать"
 
-#: src/content_mapnode_furniture.cpp:1633
-#: src/content_mapnode_furniture.cpp:1666
+#: src/content_mapnode_furniture.cpp:1760
+#: src/content_mapnode_furniture.cpp:1793
 msgid "Black Bed"
 msgstr "Черная кровать"
 
-#: src/content_mapnode_furniture.cpp:1694
-#: src/content_mapnode_furniture.cpp:1729
+#: src/content_mapnode_furniture.cpp:1821
+#: src/content_mapnode_furniture.cpp:1856
 msgid "Camp Bed"
 msgstr "Кровать"
 
-#: src/content_mapnode_furniture.cpp:1753
+#: src/content_mapnode_furniture.cpp:1880
 msgid "Colorful Painting"
 msgstr "Цветная картина"
 
-#: src/content_mapnode_furniture.cpp:1788
+#: src/content_mapnode_furniture.cpp:1915
 msgid "Red Rose Painting"
 msgstr "Картина с красной розой"
 
-#: src/content_mapnode_furniture.cpp:1823
+#: src/content_mapnode_furniture.cpp:1950
 msgid "Field Painting"
 msgstr "Пейзаж"
 
-#: src/content_mapnode_furniture.cpp:1858
+#: src/content_mapnode_furniture.cpp:1985
 msgid "Blue Flower Painting"
 msgstr "Картина с синим цветком"
 
-#: src/content_mapnode_furniture.cpp:1893
+#: src/content_mapnode_furniture.cpp:2020
 msgid "Painting Canvas"
 msgstr "Холст для живописи"
 
-#: src/content_mapnode_furniture.cpp:1931
+#: src/content_mapnode_furniture.cpp:2058
 msgid "Clock"
 msgstr "Часы"
 
@@ -2631,7 +2653,7 @@ msgid "Decraft Book"
 msgstr "Книга по разборке"
 
 #: src/content_mapnode_special.cpp:753 src/content_mapnode_special.cpp:948
-#: src/content_nodemeta.cpp:2693
+#: src/content_nodemeta.cpp:2694
 msgid "Diary"
 msgstr "Дневник"
 
@@ -2681,11 +2703,11 @@ msgstr "Табличка"
 msgid "Locking Sign"
 msgstr "Табличка с запором"
 
-#: src/content_mapnode_special.cpp:1286 src/content_nodemeta.cpp:500
+#: src/content_mapnode_special.cpp:1286 src/content_nodemeta.cpp:501
 msgid "Chest"
 msgstr "Сундук"
 
-#: src/content_mapnode_special.cpp:1310 src/content_nodemeta.cpp:775
+#: src/content_mapnode_special.cpp:1310 src/content_nodemeta.cpp:776
 msgid "Creative Chest"
 msgstr "Сундук создателя"
 
@@ -2805,7 +2827,7 @@ msgstr "Пакет"
 msgid "Cauldron"
 msgstr "Котел"
 
-#: src/content_mapnode_special.cpp:2082 src/content_nodemeta.cpp:3312
+#: src/content_mapnode_special.cpp:2082 src/content_nodemeta.cpp:3313
 msgid "Forge"
 msgstr "Кузница"
 
@@ -2909,108 +2931,108 @@ msgstr "Сиамская кошка"
 msgid "Ginger Kitten"
 msgstr "Рыжая кошка"
 
-#: src/content_nodemeta.cpp:75 src/content_nodemeta.cpp:138
-#: src/content_nodemeta.cpp:2677 src/content_nodemeta.cpp:2776
+#: src/content_nodemeta.cpp:76 src/content_nodemeta.cpp:139
+#: src/content_nodemeta.cpp:2678 src/content_nodemeta.cpp:2777
 msgid "Save"
 msgstr "Сохранить"
 
-#: src/content_nodemeta.cpp:185
+#: src/content_nodemeta.cpp:186
 #, c-format
 msgid "%s's Home Flag"
 msgstr "Домашний флаг %s"
 
-#: src/content_nodemeta.cpp:269 src/content_nodemeta.cpp:282
-#: src/content_nodemeta.cpp:436 src/content_nodemeta.cpp:449
+#: src/content_nodemeta.cpp:270 src/content_nodemeta.cpp:283
+#: src/content_nodemeta.cpp:437 src/content_nodemeta.cpp:450
 msgid "You can't sleep yet."
 msgstr "Вы не можете спать сейчас."
 
-#: src/content_nodemeta.cpp:273 src/content_nodemeta.cpp:440
+#: src/content_nodemeta.cpp:274 src/content_nodemeta.cpp:441
 msgid "Go to sleep"
 msgstr "Прилечь поспать"
 
-#: src/content_nodemeta.cpp:278 src/content_nodemeta.cpp:445
+#: src/content_nodemeta.cpp:279 src/content_nodemeta.cpp:446
 msgid "Someone else is sleeping here."
 msgstr "Кто-то другой уже спит здесь."
 
-#: src/content_nodemeta.cpp:286 src/content_nodemeta.cpp:453
+#: src/content_nodemeta.cpp:287 src/content_nodemeta.cpp:454
 msgid "Get out of bed"
 msgstr "Встать с кровати"
 
-#: src/content_nodemeta.cpp:432
+#: src/content_nodemeta.cpp:433
 msgid "This bed is too uncomfortable to sleep in."
 msgstr "Эта кровать слишком неудобная, чтобы спать на ней."
 
-#: src/content_nodemeta.cpp:573
+#: src/content_nodemeta.cpp:574
 #, c-format
 msgid "Locking Chest owned by '%s'"
 msgstr "Сундук с запором принадлежит '%s'"
 
-#: src/content_nodemeta.cpp:647
+#: src/content_nodemeta.cpp:648
 #, c-format
 msgid "Safe owned by '%s'"
 msgstr "Сейф принадлежит '%s'"
 
-#: src/content_nodemeta.cpp:816 src/content_nodemeta.cpp:1870
-#: src/content_nodemeta.cpp:2157 src/content_nodemeta.cpp:2349
-#: src/content_nodemeta.cpp:2563
+#: src/content_nodemeta.cpp:817 src/content_nodemeta.cpp:1871
+#: src/content_nodemeta.cpp:2158 src/content_nodemeta.cpp:2350
+#: src/content_nodemeta.cpp:2564
 #, c-format
 msgid "Page %d of %d"
 msgstr "Страница %d из %d"
 
-#: src/content_nodemeta.cpp:820 src/content_nodemeta.cpp:1898
-#: src/content_nodemeta.cpp:2176 src/content_nodemeta.cpp:2358
-#: src/content_nodemeta.cpp:2579
+#: src/content_nodemeta.cpp:821 src/content_nodemeta.cpp:1899
+#: src/content_nodemeta.cpp:2177 src/content_nodemeta.cpp:2359
+#: src/content_nodemeta.cpp:2580
 msgid "<< Previous Page"
 msgstr "<< Пред. страница"
 
-#: src/content_nodemeta.cpp:826 src/content_nodemeta.cpp:1904
-#: src/content_nodemeta.cpp:2182 src/content_nodemeta.cpp:2364
-#: src/content_nodemeta.cpp:2585
+#: src/content_nodemeta.cpp:827 src/content_nodemeta.cpp:1905
+#: src/content_nodemeta.cpp:2183 src/content_nodemeta.cpp:2365
+#: src/content_nodemeta.cpp:2586
 msgid "Next Page >>"
 msgstr "След. страница >>"
 
-#: src/content_nodemeta.cpp:869
+#: src/content_nodemeta.cpp:870
 #, c-format
 msgid "Border Stone owned by '%s'"
 msgstr "Граничный камень принадлежит '%s'"
 
-#: src/content_nodemeta.cpp:944
+#: src/content_nodemeta.cpp:945
 msgid "Furnace is overloaded"
 msgstr "Печь перегружена"
 
-#: src/content_nodemeta.cpp:945
+#: src/content_nodemeta.cpp:946
 msgid "Furnace is out of fuel"
 msgstr "В печи закончилось топливо"
 
-#: src/content_nodemeta.cpp:947
+#: src/content_nodemeta.cpp:948
 msgid "Furnace is inactive"
 msgstr "Печь выключена"
 
-#: src/content_nodemeta.cpp:950
+#: src/content_nodemeta.cpp:951
 msgid "Furnace is active"
 msgstr "Печь работает"
 
-#: src/content_nodemeta.cpp:1209
+#: src/content_nodemeta.cpp:1210
 msgid "Locking Furnace is overloaded"
 msgstr "Печь с запором перегружена"
 
-#: src/content_nodemeta.cpp:1210
+#: src/content_nodemeta.cpp:1211
 msgid "Locking Furnace is out of fuel"
 msgstr "В печи с запором закончилось топливо"
 
-#: src/content_nodemeta.cpp:1212
+#: src/content_nodemeta.cpp:1213
 msgid "Locking Furnace is inactive"
 msgstr "Печь с запором выключена"
 
-#: src/content_nodemeta.cpp:1215
+#: src/content_nodemeta.cpp:1216
 msgid "Locking Furnace is active"
 msgstr "Печь с запором работает"
 
-#: src/content_nodemeta.cpp:1470
+#: src/content_nodemeta.cpp:1471
 msgid "Armed Explosive: about to detonate"
 msgstr "Снаряженная взрывчатка: сейчас рванет"
 
-#: src/content_nodemeta.cpp:1473
+#: src/content_nodemeta.cpp:1474
 #, c-format
 msgid "Armed Explosive: %d second till detonation"
 msgid_plural "Armed Explosive: %d seconds till detonation"
@@ -3019,348 +3041,354 @@ msgstr[1] "Снаряженная взрывчатка: %d секунды до 
 msgstr[2] "Снаряженная взрывчатка: %d секунд до детонации"
 msgstr[3] "Снаряженная взрывчатка: %d секунд до детонации"
 
-#: src/content_nodemeta.cpp:1534 src/content_nodemeta.cpp:1539
+#: src/content_nodemeta.cpp:1535 src/content_nodemeta.cpp:1540
 msgid "Incinerator is active"
 msgstr "Мусоросжигатель работает"
 
-#: src/content_nodemeta.cpp:1541
+#: src/content_nodemeta.cpp:1542
 msgid "Incinerator is inactive"
 msgstr "Мусоросжигатель выключен"
 
-#: src/content_nodemeta.cpp:1633
+#: src/content_nodemeta.cpp:1634
 msgid "Add fuel, then punch to incinerate wielded item"
 msgstr "Добавьте топлива и затем ударьте предметом, который нужно сжечь"
 
-#: src/content_nodemeta.cpp:1874 src/content_nodemeta.cpp:2162
+#: src/content_nodemeta.cpp:1875 src/content_nodemeta.cpp:2163
 msgid "Add item here to see recipe"
 msgstr "Поместите предмет сюда, чтобы увидеть рецепт"
 
-#: src/content_nodemeta.cpp:1879 src/content_nodemeta.cpp:2167
+#: src/content_nodemeta.cpp:1880 src/content_nodemeta.cpp:2168
 #, c-format
 msgid "Recipe %d of %d"
 msgstr "Рецепт %d из %d"
 
-#: src/content_nodemeta.cpp:1888
+#: src/content_nodemeta.cpp:1889
 msgid "Gives"
 msgstr "Дает"
 
-#: src/content_nodemeta.cpp:2353
+#: src/content_nodemeta.cpp:2354
 msgid "Add item here to see cook result"
 msgstr "Поместите предмет сюда, чтобы увидеть результат запекания"
 
-#: src/content_nodemeta.cpp:2567
+#: src/content_nodemeta.cpp:2568
 msgid "Add item here to see dig result"
 msgstr "Поместите предмет сюда, чтобы увидеть результат разрушения"
 
-#: src/content_nodemeta.cpp:2571
+#: src/content_nodemeta.cpp:2572
 msgid "Dig Result"
 msgstr "Результат разрущения"
 
-#: src/content_nodemeta.cpp:2575
+#: src/content_nodemeta.cpp:2576
 msgid "Random Drop"
 msgstr "Выпадает случайно"
 
-#: src/content_nodemeta.cpp:2667 src/content_nodemeta.cpp:2766
+#: src/content_nodemeta.cpp:2668 src/content_nodemeta.cpp:2767
 msgid "Title"
 msgstr "Название"
 
-#: src/content_nodemeta.cpp:2672 src/content_nodemeta.cpp:2771
+#: src/content_nodemeta.cpp:2673 src/content_nodemeta.cpp:2772
 msgid "Content"
 msgstr "Содержимое"
 
-#: src/content_nodemeta.cpp:3127
+#: src/content_nodemeta.cpp:3128
 msgid "Cauldron is active"
 msgstr "Котел включен"
 
-#: src/content_nodemeta.cpp:3130
+#: src/content_nodemeta.cpp:3131
 msgid "Cauldron is hot"
 msgstr "Котел горячий"
 
-#: src/content_nodemeta.cpp:3132
+#: src/content_nodemeta.cpp:3133
 msgid "Cauldron is cool"
 msgstr "Котел холодный"
 
-#: src/content_nodemeta.cpp:3134
+#: src/content_nodemeta.cpp:3135
 msgid "Cauldron is empty"
 msgstr "Котел пуст"
 
-#: src/content_nodemeta.cpp:3138
+#: src/content_nodemeta.cpp:3139
 msgid "Cauldron is inactive"
 msgstr "Котел выключен"
 
-#: src/content_nodemeta.cpp:3139
+#: src/content_nodemeta.cpp:3140
 msgid "Cauldron is out of fuel"
 msgstr "Котел без топлива"
 
-#: src/content_nodemeta.cpp:3218
+#: src/content_nodemeta.cpp:3219
 msgid "Add fuel, then punch to add or remove water"
-msgstr "Добавьте топлива и затем ударьте для того, чтобы добавить или убрать воду"
+msgstr ""
+"Добавьте топлива и затем ударьте для того, чтобы добавить или убрать воду"
 
-#: src/content_nodemeta.cpp:3484
+#: src/content_nodemeta.cpp:3487
 msgid "Show Enchanting"
 msgstr "Окно зачарования"
 
-#: src/content_nodemeta.cpp:3491 src/game.cpp:208
+#: src/content_nodemeta.cpp:3494 src/game.cpp:209
 msgid "Show Crafting"
 msgstr "Окно сборки"
 
-#: src/content_toolitem.cpp:213
+#: src/content_toolitem.cpp:216
 msgid "Small Stone Pick"
 msgstr "Малая каменная кирка"
 
-#: src/content_toolitem.cpp:236
+#: src/content_toolitem.cpp:239
 msgid "Stone Pick"
 msgstr "Каменная кирка"
 
-#: src/content_toolitem.cpp:250
+#: src/content_toolitem.cpp:253
 msgid "Flint Pick"
 msgstr "Кремневая кирка"
 
-#: src/content_toolitem.cpp:264
+#: src/content_toolitem.cpp:267
 msgid "Steel Pick"
 msgstr "Стальная кирка"
 
-#: src/content_toolitem.cpp:278
+#: src/content_toolitem.cpp:281
 msgid "Creative Pick"
 msgstr "Кирка создателя"
 
-#: src/content_toolitem.cpp:292
+#: src/content_toolitem.cpp:295
 msgid "Stone Trowel"
 msgstr "Каменный мастерок"
 
-#: src/content_toolitem.cpp:306
+#: src/content_toolitem.cpp:309
 msgid "Stone Shovel"
 msgstr "Каменная лопата"
 
-#: src/content_toolitem.cpp:320
+#: src/content_toolitem.cpp:323
 msgid "Flint Shovel"
 msgstr "Кремневая лопата"
 
-#: src/content_toolitem.cpp:334
+#: src/content_toolitem.cpp:337
 msgid "Steel Shovel"
 msgstr "Стальная лопата"
 
-#: src/content_toolitem.cpp:348
+#: src/content_toolitem.cpp:351
 msgid "Small Stone Axe"
 msgstr "Малый каменный топор"
 
-#: src/content_toolitem.cpp:369
+#: src/content_toolitem.cpp:372
 msgid "Stone Axe"
 msgstr "Каменный топор"
 
-#: src/content_toolitem.cpp:383
+#: src/content_toolitem.cpp:386
 msgid "Flint Axe"
 msgstr "Кремневый топор"
 
-#: src/content_toolitem.cpp:397
+#: src/content_toolitem.cpp:400
 msgid "Steel Axe"
 msgstr "Стальной топор"
 
-#: src/content_toolitem.cpp:411
+#: src/content_toolitem.cpp:414
 msgid "Wooden Club"
 msgstr "Деревянная дубина"
 
-#: src/content_toolitem.cpp:426
+#: src/content_toolitem.cpp:429
 msgid "Stone Sword"
 msgstr "Каменный меч"
 
-#: src/content_toolitem.cpp:440
+#: src/content_toolitem.cpp:443
 msgid "Steel Sword"
 msgstr "Стальной меч"
 
-#: src/content_toolitem.cpp:454
+#: src/content_toolitem.cpp:457
 msgid "Flint Shears"
 msgstr "Кремневые ножницы"
 
-#: src/content_toolitem.cpp:468
+#: src/content_toolitem.cpp:471
 msgid "Steel Shears"
 msgstr "Стальные ножницы"
 
-#: src/content_toolitem.cpp:482
+#: src/content_toolitem.cpp:485
 msgid "Wooden Bucket"
 msgstr "Деревянное ведро"
 
-#: src/content_toolitem.cpp:499
+#: src/content_toolitem.cpp:502
 msgid "Tin Bucket"
 msgstr "Цинковое ведро"
 
-#: src/content_toolitem.cpp:515
+#: src/content_toolitem.cpp:518
 msgid "Wooden Bucket of Water"
 msgstr "Деревянное ведро воды"
 
-#: src/content_toolitem.cpp:526
+#: src/content_toolitem.cpp:529
 msgid "Tin Bucket of Water"
 msgstr "Цинковое ведро воды"
 
-#: src/content_toolitem.cpp:537
+#: src/content_toolitem.cpp:540
 msgid "Steel Bucket"
 msgstr "Стальное ведро"
 
-#: src/content_toolitem.cpp:552
+#: src/content_toolitem.cpp:555
 msgid "Steel Bucket of Water"
 msgstr "Стальное ведро воды"
 
-#: src/content_toolitem.cpp:563
+#: src/content_toolitem.cpp:566
 msgid "Steel Bucket of Lava"
 msgstr "Стальное ведро лавы"
 
-#: src/content_toolitem.cpp:575
+#: src/content_toolitem.cpp:578
 msgid "Fire Starter"
 msgstr "Огниво"
 
-#: src/content_toolitem.cpp:589
+#: src/content_toolitem.cpp:592
 msgid "Crowbar"
 msgstr "Лом"
 
-#: src/content_toolitem.cpp:602
+#: src/content_toolitem.cpp:605
 msgid "Key"
 msgstr "Ключ"
 
-#: src/content_toolitem.cpp:614
+#: src/content_toolitem.cpp:617
 msgid "Stone Spear"
 msgstr "Каменное копье"
 
-#: src/content_toolitem.cpp:628
+#: src/content_toolitem.cpp:631
 msgid "Flint Spear"
 msgstr "Кремневое копье"
 
-#: src/content_toolitem.cpp:642
+#: src/content_toolitem.cpp:645
 msgid "Steel Spear"
 msgstr "Стальное копье"
 
-#: src/content_toolitem.cpp:656
+#: src/content_toolitem.cpp:659
 msgid "Bow"
 msgstr "Лук"
 
-#: src/content_toolitem.cpp:676
+#: src/content_toolitem.cpp:679
 msgid "Raw Mithril Pick"
 msgstr "Кирка из сырого мифрила"
 
-#: src/content_toolitem.cpp:690
+#: src/content_toolitem.cpp:693
 msgid "Raw Mithril Shovel"
 msgstr "Лопата из сырого мифрила"
 
-#: src/content_toolitem.cpp:704
+#: src/content_toolitem.cpp:707
 msgid "Raw Mithril Axe"
 msgstr "Топор из сырого мифрила"
 
-#: src/content_toolitem.cpp:718
+#: src/content_toolitem.cpp:721
 msgid "Raw Mithril Sword"
 msgstr "Меч из сырого мифрила"
 
-#: src/content_toolitem.cpp:732
+#: src/content_toolitem.cpp:735
 msgid "Raw Mithril Spear"
 msgstr "Копье из сырого мифрила"
 
-#: src/content_toolitem.cpp:746
+#: src/content_toolitem.cpp:749
 msgid "Unbound Mithril Pick"
 msgstr "Кирка из свободного мифрила"
 
-#: src/content_toolitem.cpp:760
+#: src/content_toolitem.cpp:763
 msgid "Unbound Mithril Shovel"
 msgstr "Лопата из свободного мифрила"
 
-#: src/content_toolitem.cpp:774
+#: src/content_toolitem.cpp:777
 msgid "Unbound Mithril Axe"
 msgstr "Топор из свободного мифрила"
 
-#: src/content_toolitem.cpp:788
+#: src/content_toolitem.cpp:791
 msgid "Unbound Mithril Sword"
 msgstr "Меч из свободного мифрила"
 
-#: src/content_toolitem.cpp:802
+#: src/content_toolitem.cpp:805
 msgid "Unbound Mithril Spear"
 msgstr "Копье из свободного мифрила"
 
-#: src/content_toolitem.cpp:816
+#: src/content_toolitem.cpp:819
 msgid "Mithril Pick"
 msgstr "Мифриловая кирка"
 
-#: src/content_toolitem.cpp:831
+#: src/content_toolitem.cpp:834
 msgid "Mithril Shovel"
 msgstr "Мифриловая лопата"
 
-#: src/content_toolitem.cpp:845
+#: src/content_toolitem.cpp:848
 msgid "Mithril Axe"
 msgstr "Мифриловый топор"
 
-#: src/content_toolitem.cpp:859
+#: src/content_toolitem.cpp:862
 msgid "Mithril Sword"
 msgstr "Мифриловый меч"
 
-#: src/content_toolitem.cpp:873
+#: src/content_toolitem.cpp:876
 msgid "Mithril Spear"
 msgstr "Мифриловое копье"
 
-#: src/content_toolitem.cpp:887
+#: src/content_toolitem.cpp:890
 msgid "Mob Spawner"
 msgstr "Призыватель существ"
 
-#: src/game.cpp:209
+#: src/content_toolitem.cpp:909
+#, fuzzy
+msgid "Mithril Key"
+msgstr "Мифриловый топор"
+
+#: src/game.cpp:210
 msgid "Clothes"
 msgstr "Одежда"
 
-#: src/game.cpp:210
+#: src/game.cpp:211
 msgid "Hat/Helmet"
 msgstr "Шляпа/шлем"
 
-#: src/game.cpp:212
+#: src/game.cpp:213
 msgid "Jacket"
 msgstr "Куртка"
 
-#: src/game.cpp:214
+#: src/game.cpp:215
 msgid "Decorative"
 msgstr "Украшения"
 
-#: src/game.cpp:216
+#: src/game.cpp:217
 msgid "Shirt"
 msgstr "Рубашка"
 
-#: src/game.cpp:218
+#: src/game.cpp:219
 msgid "Belt"
 msgstr "Пояс"
 
-#: src/game.cpp:220
+#: src/game.cpp:221
 msgid "Pants"
 msgstr "Штаны"
 
-#: src/game.cpp:222
+#: src/game.cpp:223
 msgid "Boots"
 msgstr "Ботинки"
 
-#: src/game.cpp:229
+#: src/game.cpp:230
 msgid "Drop to Ground"
 msgstr "На землю"
 
-#: src/game.cpp:231
+#: src/game.cpp:232
 msgid "Change Clothing"
 msgstr "Сменить одежду"
 
-#: src/game.cpp:590
+#: src/game.cpp:591
 msgid "Loading"
 msgstr "Загрузка"
 
-#: src/game.cpp:662
+#: src/game.cpp:663
 msgid "Loading..."
 msgstr "Загрузка..."
 
-#: src/game.cpp:671
+#: src/game.cpp:672
 msgid "Creating server..."
 msgstr "Создаем сервер..."
 
-#: src/game.cpp:682
+#: src/game.cpp:683
 msgid "Creating client..."
 msgstr "Создаем клиент..."
 
-#: src/game.cpp:687
+#: src/game.cpp:688
 msgid "Resolving address..."
 msgstr "Определяем адрес..."
 
-#: src/game.cpp:698
+#: src/game.cpp:699
 msgid "Couldn't resolve address"
 msgstr "Невозможно определить  адрес"
 
-#: src/game.cpp:738
+#: src/game.cpp:739
 #, c-format
 msgid "Connecting to server... (timeout in %d second)"
 msgid_plural "Connecting to server... (timeout in %d seconds)"
@@ -3369,107 +3397,107 @@ msgstr[1] "Соединяемся с сервером... (таймаут %d се
 msgstr[2] "Соединяемся с сервером... (таймаут %d секунд)"
 msgstr[3] "Соединяемся с сервером... (таймаут %d секунд)"
 
-#: src/game.cpp:767
+#: src/game.cpp:768
 #, c-format
 msgid "Access denied. Reason: %ls"
 msgstr "Доступ запрещен. Причина: %ls"
 
-#: src/game.cpp:771
+#: src/game.cpp:772
 msgid "Unable to Connect (port already in use?)."
 msgstr "Невозможно подключиться (порт уже используется?)."
 
-#: src/game.cpp:774
+#: src/game.cpp:775
 msgid "Connection timed out."
 msgstr "Время ожидания соединения истекло."
 
-#: src/game.cpp:927
+#: src/game.cpp:928
 msgid "Access denied. Reason: "
 msgstr "Доступ запрещен. Причина:"
 
-#: src/game.cpp:1161
+#: src/game.cpp:1162
 msgid "free_move disabled"
 msgstr "Режим полета отключен"
 
-#: src/game.cpp:1165
+#: src/game.cpp:1166
 msgid "free_move enabled"
 msgstr "Режим полета включен"
 
-#: src/game.cpp:1177
+#: src/game.cpp:1178
 #, c-format
 msgid "Saved screenshot to '%s'"
 msgstr "Снимок экрана сохранен в '%s'"
 
-#: src/game.cpp:1189
+#: src/game.cpp:1190
 msgid "HUD shown"
 msgstr "Интерфейс показан"
 
-#: src/game.cpp:1191
+#: src/game.cpp:1192
 msgid "HUD hidden"
 msgstr "Интерфейс скрыт"
 
-#: src/game.cpp:1197
+#: src/game.cpp:1198
 msgid "Chat shown"
 msgstr "Чат показан"
 
-#: src/game.cpp:1199
+#: src/game.cpp:1200
 msgid "Chat hidden"
 msgstr "Чат скрыт"
 
-#: src/game.cpp:1205
+#: src/game.cpp:1206
 msgid "Fog disabled"
 msgstr "Туман выключен"
 
-#: src/game.cpp:1207
+#: src/game.cpp:1208
 msgid "Fog enabled"
 msgstr "Туман включен"
 
-#: src/game.cpp:1213
+#: src/game.cpp:1214
 msgid "Camera update disabled"
 msgstr "Обновление камеры отключено"
 
-#: src/game.cpp:1215
+#: src/game.cpp:1216
 msgid "Camera update enabled"
 msgstr "Обновление камеры включено"
 
-#: src/game.cpp:1225
+#: src/game.cpp:1226
 msgid "Debug info shown"
 msgstr "Показана отладочная информация"
 
-#: src/game.cpp:1230
+#: src/game.cpp:1231
 msgid "Debug info and frametime graph hidden"
 msgstr "Отладочная информация и график производительности скрыты"
 
-#: src/game.cpp:1234
+#: src/game.cpp:1235
 msgid "Frametime graph shown"
 msgstr "Показан график производительности"
 
-#: src/game.cpp:1246
+#: src/game.cpp:1247
 #, c-format
 msgid "Profiler shown (page %d of %d)"
 msgstr "Показан профайлер (страница %d из %d)"
 
-#: src/game.cpp:1250
+#: src/game.cpp:1251
 msgid "Profiler hidden"
 msgstr "Профайлер скрыт"
 
-#: src/game.cpp:1258 src/game.cpp:1269
+#: src/game.cpp:1259 src/game.cpp:1270
 #, c-format
 msgid "Minimum viewing range changed to %d"
 msgstr "Минимальная дальность обзора установлена в %d"
 
-#: src/game.cpp:1338
+#: src/game.cpp:1339
 msgid "Enabled full viewing range"
 msgstr "Полная дальность обзора включена"
 
-#: src/game.cpp:1342
+#: src/game.cpp:1343
 msgid "Disabled full viewing range"
 msgstr "Полная дальность обзора выключена"
 
-#: src/game.cpp:1995
+#: src/game.cpp:1950
 msgid "Disconnected (Network Timeout)"
 msgstr "Отключен (таймаут сети)"
 
-#: src/game.cpp:2407
+#: src/game.cpp:2382
 msgid "Shutting down..."
 msgstr "Завершаем работу..."
 
@@ -3489,236 +3517,291 @@ msgstr "Левый клик: переместить все, Правый кли
 msgid "Write It"
 msgstr "Пишите"
 
-#: src/guiMainMenu.cpp:347
+#: src/guiMainMenu.cpp:319
 msgid "Character Creator"
 msgstr "Создание персонажа"
 
-#: src/guiMainMenu.cpp:353 src/guiMainMenu.cpp:478 src/guiMainMenu.cpp:520
-#: src/guiMainMenu.cpp:631
+#: src/guiMainMenu.cpp:325 src/guiMainMenu.cpp:386 src/guiMainMenu.cpp:428
+#: src/guiMainMenu.cpp:539
 msgid "Single Player"
 msgstr "Локальная игра"
 
-#: src/guiMainMenu.cpp:359 src/guiMainMenu.cpp:410
+#: src/guiMainMenu.cpp:331 src/guiMultiplayerMenu.cpp:161
 msgid "Multi Player"
 msgstr "Многопользовательская игра"
 
-#: src/guiMainMenu.cpp:365 src/guiPauseMenu.cpp:155
+#: src/guiMainMenu.cpp:337 src/guiPauseMenu.cpp:155
 msgid "Settings"
 msgstr "Настройки"
 
-#: src/guiMainMenu.cpp:371
+#: src/guiMainMenu.cpp:343
 msgid "Credits"
 msgstr "Благодарности"
 
-#: src/guiMainMenu.cpp:377
+#: src/guiMainMenu.cpp:349
 msgid "Quit"
 msgstr "Выйти"
 
-#: src/guiMainMenu.cpp:418
-msgid "Name/Password"
-msgstr "Имя/пароль"
-
-#: src/guiMainMenu.cpp:446
-msgid "Address/Port"
-msgstr "Адрес/порт"
-
-#: src/guiMainMenu.cpp:472
-msgid "Connect"
-msgstr "Подключиться"
-
-#: src/guiMainMenu.cpp:487 src/guiMainMenu.cpp:529 src/guiMainMenu.cpp:640
+#: src/guiMainMenu.cpp:395 src/guiMainMenu.cpp:437 src/guiMainMenu.cpp:548
 msgid "Creative Mode"
 msgstr "Режим создателя"
 
-#: src/guiMainMenu.cpp:488 src/guiMainMenu.cpp:530 src/guiMainMenu.cpp:641
+#: src/guiMainMenu.cpp:396 src/guiMainMenu.cpp:438 src/guiMainMenu.cpp:549
 msgid "Adventure Mode"
 msgstr "Режим приключения"
 
-#: src/guiMainMenu.cpp:489 src/guiMainMenu.cpp:531 src/guiMainMenu.cpp:642
+#: src/guiMainMenu.cpp:397 src/guiMainMenu.cpp:439 src/guiMainMenu.cpp:550
 msgid "Survival Mode"
 msgstr "Режим выживания"
 
-#: src/guiMainMenu.cpp:502 src/guiMainMenu.cpp:655
+#: src/guiMainMenu.cpp:410 src/guiMainMenu.cpp:563
 msgid "Advanced Settings"
 msgstr "Расширенные настройки"
 
-#: src/guiMainMenu.cpp:508 src/guiMainMenu.cpp:550
+#: src/guiMainMenu.cpp:416 src/guiMainMenu.cpp:458
 msgid "Map Options"
 msgstr "Настройки карты"
 
-#: src/guiMainMenu.cpp:514 src/guiMainMenu.cpp:625 src/guiMainMenu.cpp:750
+#: src/guiMainMenu.cpp:422 src/guiMainMenu.cpp:533 src/guiMainMenu.cpp:658
 msgid "Start Game"
 msgstr "Начать игру"
 
-#: src/guiMainMenu.cpp:544
+#: src/guiMainMenu.cpp:452
 msgid "Hide Advanced Settings"
 msgstr "Скрыть расширенные настройки"
 
-#: src/guiMainMenu.cpp:555
+#: src/guiMainMenu.cpp:463
 msgid "Creatures"
 msgstr "Существа"
 
-#: src/guiMainMenu.cpp:562
+#: src/guiMainMenu.cpp:470
 msgid "None"
 msgstr "Нет"
 
-#: src/guiMainMenu.cpp:563
+#: src/guiMainMenu.cpp:471
 msgid "Passive"
 msgstr "Пассивные"
 
-#: src/guiMainMenu.cpp:564
+#: src/guiMainMenu.cpp:472
 msgid "Passive & Aggressive"
 msgstr "Пассивные и агрессивные"
 
-#: src/guiMainMenu.cpp:565
+#: src/guiMainMenu.cpp:473
 msgid "Passive, Aggressive, & Destructive"
 msgstr "Пассивные, агрессивные и разрушители"
 
-#: src/guiMainMenu.cpp:579
+#: src/guiMainMenu.cpp:487
 msgid "Player Damage"
 msgstr "Повреждения"
 
-#: src/guiMainMenu.cpp:584
+#: src/guiMainMenu.cpp:492
 msgid "Suffocation/Drowning"
 msgstr "Дыхание"
 
-#: src/guiMainMenu.cpp:589
+#: src/guiMainMenu.cpp:497
 msgid "Hunger"
 msgstr "Голод"
 
-#: src/guiMainMenu.cpp:594
+#: src/guiMainMenu.cpp:502
 msgid "Tool Wear"
 msgstr "Износ инструментов"
 
-#: src/guiMainMenu.cpp:599
+#: src/guiMainMenu.cpp:507
 msgid "Dangerous Fire"
 msgstr "Опасный огонь"
 
-#: src/guiMainMenu.cpp:604
+#: src/guiMainMenu.cpp:512
 msgid "Infinite Inventory"
 msgstr "Бездонный инвентарь"
 
-#: src/guiMainMenu.cpp:609
+#: src/guiMainMenu.cpp:517
 msgid "Initial Inventory"
 msgstr "Начальное снаряжение"
 
-#: src/guiMainMenu.cpp:614
+#: src/guiMainMenu.cpp:522
 msgid "Droppable Inventory"
 msgstr "Выбрасывать предметы"
 
-#: src/guiMainMenu.cpp:619
+#: src/guiMainMenu.cpp:527
 msgid "Death drops Inventory"
 msgstr "Потеря предметов при смерти"
 
-#: src/guiMainMenu.cpp:661
+#: src/guiMainMenu.cpp:569
 msgid "Hide Map Options"
 msgstr "Скрыть настройки карты"
 
-#: src/guiMainMenu.cpp:666
+#: src/guiMainMenu.cpp:574
 msgid "Create New Map"
 msgstr "Создать новую карту"
 
-#: src/guiMainMenu.cpp:672
+#: src/guiMainMenu.cpp:580
 msgid "Warning! Your old map will be deleted!"
 msgstr "Предупреждаем! Ваша старая карта будет удалена!"
 
-#: src/guiMainMenu.cpp:678
+#: src/guiMainMenu.cpp:586
 msgid "Map Type"
 msgstr "Тип карты"
 
-#: src/guiMainMenu.cpp:685
+#: src/guiMainMenu.cpp:593
 msgid "Flat"
 msgstr "Совсем плоская"
 
-#: src/guiMainMenu.cpp:686
+#: src/guiMainMenu.cpp:594
 msgid "Flatter"
 msgstr "Более плоская"
 
-#: src/guiMainMenu.cpp:687
+#: src/guiMainMenu.cpp:595
 msgid "Smoother"
 msgstr "Более гладкая"
 
-#: src/guiMainMenu.cpp:688
+#: src/guiMainMenu.cpp:596
 msgid "Default"
 msgstr "По умолчанию"
 
-#: src/guiMainMenu.cpp:689
+#: src/guiMainMenu.cpp:597
 msgid "Hilly"
 msgstr "Холмы"
 
-#: src/guiMainMenu.cpp:690
+#: src/guiMainMenu.cpp:598
 msgid "Mountains"
 msgstr "Горы"
 
-#: src/guiMainMenu.cpp:691
+#: src/guiMainMenu.cpp:599
 msgid "Crazy"
 msgstr "Безумная"
 
-#: src/guiMainMenu.cpp:692
+#: src/guiMainMenu.cpp:600
 msgid "Crazy Hills"
 msgstr "Безумно холмистая"
 
-#: src/guiMainMenu.cpp:714
+#: src/guiMainMenu.cpp:622
 msgid "Use Fixed Seed"
 msgstr "Свое зерно"
 
-#: src/guiMainMenu.cpp:720
+#: src/guiMainMenu.cpp:628
 msgid "Map Seed"
 msgstr "Зерно"
 
-#: src/guiMainMenu.cpp:737
+#: src/guiMainMenu.cpp:645
 msgid "Clear Map"
 msgstr "Очистить карту"
 
-#: src/guiMainMenu.cpp:742
+#: src/guiMainMenu.cpp:650
 msgid "Warning! This will delete all construction from your map!"
 msgstr "Предупреждаем! Все сооружения на карте буду уничтожены!"
 
-#: src/guiMainMenu.cpp:760
+#: src/guiMainMenu.cpp:668
 msgid ""
 "Voxelands\n"
 "http://www.voxelands.com/\n"
 "By Lisa 'darkrose' Milne <lisa@ltmnet.com> and contributors."
-msgstr "Voxelands\nhttp://www.voxelands.com/\nLisa 'darkrose' Milne <lisa@ltmnet.com> и сотоварищи."
+msgstr ""
+"Voxelands\n"
+"http://www.voxelands.com/\n"
+"Lisa 'darkrose' Milne <lisa@ltmnet.com> и сотоварищи."
 
-#: src/guiMainMenu.cpp:767
+#: src/guiMainMenu.cpp:675
 msgid "Programmers"
 msgstr "Программирование"
 
-#: src/guiMainMenu.cpp:770
+#: src/guiMainMenu.cpp:678
 msgid "Artists and Modellers"
 msgstr "Графика"
 
-#: src/guiMainMenu.cpp:773
+#: src/guiMainMenu.cpp:681
 msgid "Translators"
 msgstr "Локализация"
 
-#: src/guiMainMenu.cpp:776
+#: src/guiMainMenu.cpp:684
 msgid "Documentation Writters"
 msgstr "Разработка документации"
 
-#: src/guiMainMenu.cpp:779
+#: src/guiMainMenu.cpp:687
 msgid "Testers, Packagers, and Builders"
 msgstr "Тестирование, сборка и создание установочных пакетов"
 
-#: src/guiMainMenu.cpp:782
+#: src/guiMainMenu.cpp:690
 msgid "Music and Sound Effects Composers"
 msgstr "Музыка и звуковые эффекты"
 
-#: src/guiMainMenu.cpp:785
+#: src/guiMainMenu.cpp:693
 msgid "Other Contributers, and Special Thanks"
 msgstr "Другие участники, наши благодарности"
 
-#: src/guiMainMenu.cpp:789
+#: src/guiMainMenu.cpp:697
 msgid ""
 "Based on Minetest-C55 by Perttu Ahola <celeron55@gmail.com>\n"
-"and contributors: PilzAdam, Taoki, tango_, kahrl (kaaaaaahrl?), darkrose, matttpt, erlehmann, SpeedProg, JacobF, teddydestodes, marktraceur, Jonathan Neuschafer, thexyz, VanessaE, sfan5... and tens of more random people."
-msgstr " Основано на Minetest-C55, созданном Perttu Ahola <celeron55@gmail.com> \nи сотоварищи: PilzAdam, Taoki, tango_, kahrl (kaaaaaahrl?), darkrose, matttpt, erlehmann, SpeedProg, JacobF, teddydestodes, marktraceur, Jonathan Neuschafer, thexyz, VanessaE, sfan5... и еще десятком-другим случайных прохожих."
+"and contributors: PilzAdam, Taoki, tango_, kahrl (kaaaaaahrl?), darkrose, "
+"matttpt, erlehmann, SpeedProg, JacobF, teddydestodes, marktraceur, Jonathan "
+"Neuschafer, thexyz, VanessaE, sfan5... and tens of more random people."
+msgstr ""
+" Основано на Minetest-C55, созданном Perttu Ahola <celeron55@gmail.com> \n"
+"и сотоварищи: PilzAdam, Taoki, tango_, kahrl (kaaaaaahrl?), darkrose, "
+"matttpt, erlehmann, SpeedProg, JacobF, teddydestodes, marktraceur, Jonathan "
+"Neuschafer, thexyz, VanessaE, sfan5... и еще десятком-другим случайных "
+"прохожих."
 
 #: src/guiMessageMenu.cpp:112 src/guiPauseMenu.cpp:143
 msgid "Continue"
 msgstr "Продолжить"
 
+#: src/guiMultiplayerMenu.cpp:135 src/guiSettingsMenu.cpp:277
+msgid "Main Menu"
+msgstr "Главное меню"
+
+#: src/guiMultiplayerMenu.cpp:142
+msgid "All Servers"
+msgstr ""
+
+#: src/guiMultiplayerMenu.cpp:148
+msgid "Favourite Servers"
+msgstr ""
+
+#: src/guiMultiplayerMenu.cpp:154
+#, fuzzy
+msgid "Custom Connect"
+msgstr "Подключиться"
+
+#: src/guiMultiplayerMenu.cpp:169
+msgid "Custom Connection"
+msgstr ""
+
+#: src/guiMultiplayerMenu.cpp:176
+msgid "Address/Port"
+msgstr "Адрес/порт"
+
+#: src/guiMultiplayerMenu.cpp:201 src/guiMultiplayerMenu.cpp:313
+msgid "Add to Favourites"
+msgstr ""
+
+#: src/guiMultiplayerMenu.cpp:206 src/guiMultiplayerMenu.cpp:320
+msgid "Connect"
+msgstr "Подключиться"
+
+#: src/guiMultiplayerMenu.cpp:213
+msgid "Name/Password"
+msgstr "Имя/пароль"
+
+#: src/guiMultiplayerMenu.cpp:240
+msgid "Join Server"
+msgstr ""
+
+#: src/guiMultiplayerMenu.cpp:262
+msgid "My Favourites"
+msgstr ""
+
+#: src/guiMultiplayerMenu.cpp:265
+msgid "Server List"
+msgstr ""
+
+#: src/guiMultiplayerMenu.cpp:270
+msgid "Get New List"
+msgstr ""
+
+#: src/guiMultiplayerMenu.cpp:307
+msgid "Remove from Favourites"
+msgstr ""
+
 #: src/guiPasswordChange.cpp:105
 msgid "Old Password"
 msgstr "Старый пароль"
@@ -3759,11 +3842,11 @@ msgstr "Вперед"
 msgid "Backward"
 msgstr "Назад"
 
-#: src/guiSettingsMenu.cpp:72 src/keycode.cpp:234
+#: src/guiSettingsMenu.cpp:72 src/keycode.cpp:263
 msgid "Left"
 msgstr "Налево"
 
-#: src/guiSettingsMenu.cpp:73 src/keycode.cpp:234
+#: src/guiSettingsMenu.cpp:73 src/keycode.cpp:265
 msgid "Right"
 msgstr "Направо"
 
@@ -3799,11 +3882,11 @@ msgstr "Максимальный обзор"
 msgid "Toggle Fly"
 msgstr "Полет"
 
-#: src/guiSettingsMenu.cpp:82 src/keycode.cpp:234
+#: src/guiSettingsMenu.cpp:82 src/keycode.cpp:264
 msgid "Up"
 msgstr "Вверх"
 
-#: src/guiSettingsMenu.cpp:83 src/keycode.cpp:234
+#: src/guiSettingsMenu.cpp:83 src/keycode.cpp:266
 msgid "Down"
 msgstr "Вниз"
 
@@ -3847,10 +3930,6 @@ msgstr "Пред. предмет"
 msgid "Next Item"
 msgstr "След. предмет"
 
-#: src/guiSettingsMenu.cpp:277
-msgid "Main Menu"
-msgstr "Главное меню"
-
 #: src/guiSettingsMenu.cpp:284 src/guiSettingsMenu.cpp:311
 msgid "Controls"
 msgstr "Управление"
@@ -3958,362 +4037,576 @@ msgstr "Энергия: %d:%02d"
 msgid "Cold Protection: %d:%02d"
 msgstr "Защита от холода: %d:%02d"
 
-#: src/inventory.cpp:230 src/inventory.cpp:352
-msgid "Cookable: Yes"
-msgstr "Можно приготовить: Да"
-
-#: src/inventory.cpp:235 src/inventory.cpp:357 src/inventory.cpp:532
-msgid "Fuel Burn Time: "
-msgstr "Время горения топлива:"
-
-#: src/inventory.cpp:321
-msgid "Hunger: "
-msgstr "Голод:"
-
-#: src/inventory.cpp:327
-msgid "Health: "
-msgstr "Здоровье:"
-
-#: src/inventory.cpp:334
-msgid "Cold Protection: "
-msgstr "Защита от холода:"
-
-#: src/inventory.cpp:343
-msgid "Energy Boost: "
-msgstr "Энергия:"
-
-#: src/inventory.cpp:521
-msgid "Strength: "
-msgstr "Сила:"
-
-#: src/inventory.cpp:524
-msgid "Speed: "
-msgstr "Скорость:"
-
-#: src/inventory.cpp:527
-msgid "Level: "
-msgstr "Уровень:"
-
-#: src/inventory.cpp:557
+#: src/inventory.cpp:246 src/inventory.cpp:580
 msgid "Contains: "
 msgstr "Содержит:"
 
-#: src/inventory.cpp:643
+#: src/inventory.cpp:253 src/inventory.cpp:375
+msgid "Cookable: Yes"
+msgstr "Можно приготовить: Да"
+
+#: src/inventory.cpp:258 src/inventory.cpp:380 src/inventory.cpp:555
+msgid "Fuel Burn Time: "
+msgstr "Время горения топлива:"
+
+#: src/inventory.cpp:344
+msgid "Hunger: "
+msgstr "Голод:"
+
+#: src/inventory.cpp:350
+msgid "Health: "
+msgstr "Здоровье:"
+
+#: src/inventory.cpp:357
+msgid "Cold Protection: "
+msgstr "Защита от холода:"
+
+#: src/inventory.cpp:366
+msgid "Energy Boost: "
+msgstr "Энергия:"
+
+#: src/inventory.cpp:544
+msgid "Strength: "
+msgstr "Сила:"
+
+#: src/inventory.cpp:547
+msgid "Speed: "
+msgstr "Скорость:"
+
+#: src/inventory.cpp:550
+msgid "Level: "
+msgstr "Уровень:"
+
+#: src/inventory.cpp:666
 msgid "Armour: "
 msgstr "Броня:"
 
-#: src/inventory.cpp:649
+#: src/inventory.cpp:672
 msgid "Warmth: "
 msgstr "Температура:"
 
-#: src/inventory.cpp:655
+#: src/inventory.cpp:678
 msgid "Pressure: "
 msgstr "Давление:"
 
-#: src/inventory.cpp:661
+#: src/inventory.cpp:684
 msgid "Suffocation: "
 msgstr "Дыхание:"
 
-#: src/inventory.cpp:667
+#: src/inventory.cpp:690
 msgid "Durability: "
 msgstr "Износ:"
 
-#: src/inventory.cpp:672
+#: src/inventory.cpp:695
 msgid "Effect Boost: "
 msgstr "Эффект:"
 
-#: src/keycode.cpp:229
+#: src/keycode.cpp:232
+msgid "-"
+msgstr ""
+
+#: src/keycode.cpp:234
 msgid "Left Button"
 msgstr "Левая кнопка"
 
-#: src/keycode.cpp:229
-msgid "Middle Button"
-msgstr "Средняя кнопка"
-
-#: src/keycode.cpp:229
+#: src/keycode.cpp:235
 msgid "Right Button"
 msgstr "Правая кнопка"
 
-#: src/keycode.cpp:229
+#: src/keycode.cpp:237
+msgid "Middle Button"
+msgstr "Средняя кнопка"
+
+#: src/keycode.cpp:238
 msgid "X Button 1"
 msgstr "X кнопка 1"
 
-#: src/keycode.cpp:230
-msgid "Back"
-msgstr "Назад"
-
-#: src/keycode.cpp:230
-msgid "Clear"
-msgstr "Очистить"
-
-#: src/keycode.cpp:230
-msgid "Return"
-msgstr "Ввод"
-
-#: src/keycode.cpp:230
-msgid "Tab"
-msgstr "Tab"
-
-#: src/keycode.cpp:230
+#: src/keycode.cpp:239
 msgid "X Button 2"
 msgstr "X кнопка 2"
 
-#: src/keycode.cpp:231
-msgid "Capital"
-msgstr "Capital"
+#: src/keycode.cpp:240
+msgid "Back"
+msgstr "Назад"
 
-#: src/keycode.cpp:231
-msgid "Control"
-msgstr "Control"
+#: src/keycode.cpp:241
+msgid "Tab"
+msgstr "Tab"
 
-#: src/keycode.cpp:231
-msgid "Kana"
-msgstr "Кана"
+#: src/keycode.cpp:242
+msgid "Clear"
+msgstr "Очистить"
 
-#: src/keycode.cpp:231
-msgid "Menu"
-msgstr "Меню"
+#: src/keycode.cpp:243
+msgid "Return"
+msgstr "Ввод"
 
-#: src/keycode.cpp:231
-msgid "Pause"
-msgstr "Pause"
-
-#: src/keycode.cpp:231
+#: src/keycode.cpp:244
 msgid "Shift"
 msgstr "Shift"
 
-#: src/keycode.cpp:232
-msgid "Convert"
-msgstr "Преобразованный"
+#: src/keycode.cpp:245
+msgid "Control"
+msgstr "Control"
 
-#: src/keycode.cpp:232
-msgid "Escape"
-msgstr "Escape"
+#: src/keycode.cpp:246
+msgid "Menu"
+msgstr "Меню"
 
-#: src/keycode.cpp:232
-msgid "Final"
-msgstr "Конечный"
+#: src/keycode.cpp:247
+msgid "Pause"
+msgstr "Pause"
 
-#: src/keycode.cpp:232
+#: src/keycode.cpp:248
+msgid "Capital"
+msgstr "Capital"
+
+#: src/keycode.cpp:249
+msgid "Kana"
+msgstr "Кана"
+
+#: src/keycode.cpp:250
 msgid "Junja"
 msgstr "Юндзя"
 
-#: src/keycode.cpp:232
+#: src/keycode.cpp:251
+msgid "Final"
+msgstr "Конечный"
+
+#: src/keycode.cpp:252
 msgid "Kanji"
 msgstr "Кандзи"
 
-#: src/keycode.cpp:232
+#: src/keycode.cpp:253
+msgid "Escape"
+msgstr "Escape"
+
+#: src/keycode.cpp:254
+msgid "Convert"
+msgstr "Преобразованный"
+
+#: src/keycode.cpp:255
 msgid "Nonconvert"
 msgstr "Непреобразованный"
 
-#: src/keycode.cpp:233
+#: src/keycode.cpp:256
 msgid "Accept"
 msgstr "Принять"
 
-#: src/keycode.cpp:233
-msgid "End"
-msgstr "End"
-
-#: src/keycode.cpp:233
-msgid "Home"
-msgstr "Home"
-
-#: src/keycode.cpp:233
+#: src/keycode.cpp:257
 msgid "Mode Change"
 msgstr "Изменение режима"
 
-#: src/keycode.cpp:233
-msgid "Next"
-msgstr "След."
-
-#: src/keycode.cpp:233
-msgid "Prior"
-msgstr "Пред."
-
-#: src/keycode.cpp:233
+#: src/keycode.cpp:258
 msgid "Space"
 msgstr "Пробел"
 
-#: src/keycode.cpp:234
-msgid "Execute"
-msgstr "Выполнить"
+#: src/keycode.cpp:259
+msgid "Prior"
+msgstr "Пред."
 
-#: src/keycode.cpp:234
-msgid "Print"
-msgstr "Печать"
+#: src/keycode.cpp:260
+msgid "Next"
+msgstr "След."
 
-#: src/keycode.cpp:234
+#: src/keycode.cpp:261
+msgid "End"
+msgstr "End"
+
+#: src/keycode.cpp:262
+msgid "Home"
+msgstr "Home"
+
+#: src/keycode.cpp:267
 msgid "Select"
 msgstr "Выбрать"
 
-#: src/keycode.cpp:235
-msgid "Delete"
-msgstr "Delete"
+#: src/keycode.cpp:268
+msgid "Print"
+msgstr "Печать"
 
-#: src/keycode.cpp:235
-msgid "Help"
-msgstr "Справка"
+#: src/keycode.cpp:269
+msgid "Execute"
+msgstr "Выполнить"
 
-#: src/keycode.cpp:235
-msgid "Insert"
-msgstr "Insert"
-
-#: src/keycode.cpp:235
+#: src/keycode.cpp:270
 msgid "Snapshot"
 msgstr "Снимок"
 
-#: src/keycode.cpp:238
+#: src/keycode.cpp:271
+msgid "Insert"
+msgstr "Insert"
+
+#: src/keycode.cpp:272
+msgid "Delete"
+msgstr "Delete"
+
+#: src/keycode.cpp:273
+msgid "Help"
+msgstr "Справка"
+
+#: src/keycode.cpp:274
+msgid "0"
+msgstr ""
+
+#: src/keycode.cpp:275
+msgid "1"
+msgstr ""
+
+#: src/keycode.cpp:276
+msgid "2"
+msgstr ""
+
+#: src/keycode.cpp:277
+msgid "3"
+msgstr ""
+
+#: src/keycode.cpp:278
+msgid "4"
+msgstr ""
+
+#: src/keycode.cpp:279
+msgid "5"
+msgstr ""
+
+#: src/keycode.cpp:280
+msgid "6"
+msgstr ""
+
+#: src/keycode.cpp:281
+msgid "7"
+msgstr ""
+
+#: src/keycode.cpp:282
+msgid "8"
+msgstr ""
+
+#: src/keycode.cpp:283
+msgid "9"
+msgstr ""
+
+#: src/keycode.cpp:284
+msgid "A"
+msgstr ""
+
+#: src/keycode.cpp:285
+msgid "B"
+msgstr ""
+
+#: src/keycode.cpp:286
+msgid "C"
+msgstr ""
+
+#: src/keycode.cpp:287
+msgid "D"
+msgstr ""
+
+#: src/keycode.cpp:288
+msgid "E"
+msgstr ""
+
+#: src/keycode.cpp:289
+msgid "F"
+msgstr ""
+
+#: src/keycode.cpp:290
+msgid "G"
+msgstr ""
+
+#: src/keycode.cpp:291
+msgid "H"
+msgstr ""
+
+#: src/keycode.cpp:292
+msgid "I"
+msgstr ""
+
+#: src/keycode.cpp:293
+msgid "J"
+msgstr ""
+
+#: src/keycode.cpp:294
+msgid "K"
+msgstr ""
+
+#: src/keycode.cpp:295
+msgid "L"
+msgstr ""
+
+#: src/keycode.cpp:296
+msgid "M"
+msgstr ""
+
+#: src/keycode.cpp:297
+msgid "N"
+msgstr ""
+
+#: src/keycode.cpp:298
+msgid "O"
+msgstr ""
+
+#: src/keycode.cpp:299
+msgid "P"
+msgstr ""
+
+#: src/keycode.cpp:300
+msgid "Q"
+msgstr ""
+
+#: src/keycode.cpp:301
+msgid "R"
+msgstr ""
+
+#: src/keycode.cpp:302
+msgid "S"
+msgstr ""
+
+#: src/keycode.cpp:303
+msgid "T"
+msgstr ""
+
+#: src/keycode.cpp:304
+#, fuzzy
+msgid "U"
+msgstr "Вверх"
+
+#: src/keycode.cpp:305
+msgid "V"
+msgstr ""
+
+#: src/keycode.cpp:306
+msgid "W"
+msgstr ""
+
+#: src/keycode.cpp:307
+msgid "X"
+msgstr ""
+
+#: src/keycode.cpp:308
+msgid "Y"
+msgstr ""
+
+#: src/keycode.cpp:309
+msgid "Z"
+msgstr ""
+
+#: src/keycode.cpp:310
 msgid "Left Windows"
 msgstr "Левая Windows"
 
-#: src/keycode.cpp:239
-msgid "Apps"
-msgstr "Приложения"
-
-#: src/keycode.cpp:239
-msgid "Numpad 0"
-msgstr "Numpad 0"
-
-#: src/keycode.cpp:239
-msgid "Numpad 1"
-msgstr "Numpad 1"
-
-#: src/keycode.cpp:239
+#: src/keycode.cpp:311
 msgid "Right Windows"
 msgstr "Правая Windows"
 
-#: src/keycode.cpp:239
+#: src/keycode.cpp:312
+msgid "Apps"
+msgstr "Приложения"
+
+#: src/keycode.cpp:313
 msgid "Sleep"
 msgstr "Sleep"
 
-#: src/keycode.cpp:240
+#: src/keycode.cpp:314
+msgid "Numpad 0"
+msgstr "Numpad 0"
+
+#: src/keycode.cpp:315
+msgid "Numpad 1"
+msgstr "Numpad 1"
+
+#: src/keycode.cpp:316
 msgid "Numpad 2"
 msgstr "Numpad 2"
 
-#: src/keycode.cpp:240
+#: src/keycode.cpp:317
 msgid "Numpad 3"
 msgstr "Numpad 3"
 
-#: src/keycode.cpp:240
+#: src/keycode.cpp:318
 msgid "Numpad 4"
 msgstr "Numpad 4"
 
-#: src/keycode.cpp:240
+#: src/keycode.cpp:319
 msgid "Numpad 5"
 msgstr "Numpad 5"
 
-#: src/keycode.cpp:240
+#: src/keycode.cpp:320
 msgid "Numpad 6"
 msgstr "Numpad 6"
 
-#: src/keycode.cpp:240
+#: src/keycode.cpp:321
 msgid "Numpad 7"
 msgstr "Numpad 7"
 
-#: src/keycode.cpp:241
-msgid "Numpad *"
-msgstr "Numpad *"
-
-#: src/keycode.cpp:241
-msgid "Numpad +"
-msgstr "Numpad +"
-
-#: src/keycode.cpp:241
-msgid "Numpad -"
-msgstr "Numpad -"
-
-#: src/keycode.cpp:241
-msgid "Numpad /"
-msgstr "Numpad /"
-
-#: src/keycode.cpp:241
+#: src/keycode.cpp:322
 msgid "Numpad 8"
 msgstr "Numpad 8"
 
-#: src/keycode.cpp:241
+#: src/keycode.cpp:323
 msgid "Numpad 9"
 msgstr "Numpad 9"
 
-#: src/keycode.cpp:245
+#: src/keycode.cpp:324
+msgid "Numpad *"
+msgstr "Numpad *"
+
+#: src/keycode.cpp:325
+msgid "Numpad +"
+msgstr "Numpad +"
+
+#: src/keycode.cpp:326 src/keycode.cpp:329
+msgid "Numpad /"
+msgstr "Numpad /"
+
+#: src/keycode.cpp:327
+msgid "Numpad -"
+msgstr "Numpad -"
+
+#: src/keycode.cpp:328
+#, fuzzy
+msgid "Numpad ."
+msgstr "Numpad 0"
+
+#: src/keycode.cpp:330
+msgid "F10"
+msgstr ""
+
+#: src/keycode.cpp:331
+msgid "F11"
+msgstr ""
+
+#: src/keycode.cpp:332
+msgid "F12"
+msgstr ""
+
+#: src/keycode.cpp:333
+msgid "F13"
+msgstr ""
+
+#: src/keycode.cpp:334
+msgid "F14"
+msgstr ""
+
+#: src/keycode.cpp:335
+msgid "F15"
+msgstr ""
+
+#: src/keycode.cpp:336
+msgid "F16"
+msgstr ""
+
+#: src/keycode.cpp:337
+msgid "F17"
+msgstr ""
+
+#: src/keycode.cpp:338
+msgid "F18"
+msgstr ""
+
+#: src/keycode.cpp:339
+msgid "F19"
+msgstr ""
+
+#: src/keycode.cpp:340
+msgid "F20"
+msgstr ""
+
+#: src/keycode.cpp:341
+msgid "F21"
+msgstr ""
+
+#: src/keycode.cpp:342
+msgid "F22"
+msgstr ""
+
+#: src/keycode.cpp:343
+msgid "F23"
+msgstr ""
+
+#: src/keycode.cpp:344
+msgid "F24"
+msgstr ""
+
+#: src/keycode.cpp:345
 msgid "Num Lock"
 msgstr "Num Lock"
 
-#: src/keycode.cpp:245
+#: src/keycode.cpp:346
 msgid "Scroll Lock"
 msgstr "Scroll Lock"
 
-#: src/keycode.cpp:246
+#: src/keycode.cpp:347
 msgid "Left Shift"
 msgstr "Левый Shift"
 
-#: src/keycode.cpp:246
+#: src/keycode.cpp:348
 msgid "Right Shift"
 msgstr "Правый Shift"
 
-#: src/keycode.cpp:247
+#: src/keycode.cpp:349
 msgid "Left Control"
 msgstr "Левый Control"
 
-#: src/keycode.cpp:247
-msgid "Left Menu"
-msgstr "Левая кнопка Меню"
-
-#: src/keycode.cpp:247
+#: src/keycode.cpp:350
 msgid "Right Control"
 msgstr "Правый Control"
 
-#: src/keycode.cpp:247
+#: src/keycode.cpp:351
+msgid "Left Menu"
+msgstr "Левая кнопка Меню"
+
+#: src/keycode.cpp:352
 msgid "Right Menu"
 msgstr "Правая кнопка Меню"
 
-#: src/keycode.cpp:249
-msgid "Comma"
-msgstr "Запятая"
-
-#: src/keycode.cpp:249
-msgid "Minus"
-msgstr "Минус"
-
-#: src/keycode.cpp:249
-msgid "Period"
-msgstr "Точка"
-
-#: src/keycode.cpp:249
+#: src/keycode.cpp:353
 msgid "Plus"
 msgstr "Плюс"
 
-#: src/keycode.cpp:253
+#: src/keycode.cpp:354
+msgid "Comma"
+msgstr "Запятая"
+
+#: src/keycode.cpp:355
+msgid "Minus"
+msgstr "Минус"
+
+#: src/keycode.cpp:356
+msgid "Period"
+msgstr "Точка"
+
+#: src/keycode.cpp:357
 msgid "Attn"
 msgstr "Attn"
 
-#: src/keycode.cpp:253
+#: src/keycode.cpp:358
 msgid "CrSel"
 msgstr "CrSel"
 
-#: src/keycode.cpp:254
-msgid "Erase OEF"
-msgstr "Erase OEF"
-
-#: src/keycode.cpp:254
+#: src/keycode.cpp:359
 msgid "ExSel"
 msgstr "ExSel"
 
-#: src/keycode.cpp:254
-msgid "OEM Clear"
-msgstr "OEM Clear"
+#: src/keycode.cpp:360
+msgid "Erase OEF"
+msgstr "Erase OEF"
 
-#: src/keycode.cpp:254
-msgid "PA1"
-msgstr "PA1"
-
-#: src/keycode.cpp:254
+#: src/keycode.cpp:361
 msgid "Play"
 msgstr "Play"
 
-#: src/keycode.cpp:254
+#: src/keycode.cpp:362
 msgid "Zoom"
 msgstr "Zoom"
 
+#: src/keycode.cpp:363
+msgid "PA1"
+msgstr "PA1"
+
+#: src/keycode.cpp:364
+msgid "OEM Clear"
+msgstr "OEM Clear"
+
 #: src/main.cpp:1131
 msgid "Setting Up UI"
 msgstr "Настраиваем интерфейс"
@@ -4330,30 +4623,70 @@ msgstr "Загружаем существ"
 msgid "Setting Up Sound"
 msgstr "Настраиваем звук"
 
-#: src/mapnode.cpp:282
+#: src/mapnode.cpp:285
 msgid "Loading Base MapNodes"
 msgstr "Загружаем основные элементы"
 
-#: src/mapnode.cpp:286
+#: src/mapnode.cpp:289
 msgid "Loading Circuit MapNodes"
 msgstr "Загружаем электрические цепи"
 
-#: src/mapnode.cpp:290
+#: src/mapnode.cpp:293
 msgid "Loading Plant MapNodes"
 msgstr "Загружаем растения"
 
-#: src/mapnode.cpp:294
+#: src/mapnode.cpp:297
 msgid "Loading Farming MapNodes"
 msgstr "Загружаем фермерство"
 
-#: src/mapnode.cpp:298
+#: src/mapnode.cpp:301
 msgid "Loading Decorative MapNodes"
 msgstr "Загружаем декоративные элементы"
 
-#: src/mapnode.cpp:302
+#: src/mapnode.cpp:305
 msgid "Loading Interactive MapNodes"
 msgstr "Загружаем интерактивные элементы"
 
-#: src/mapnode.cpp:306
+#: src/mapnode.cpp:309
 msgid "Loading Special MapNodes"
 msgstr "Загружаем особые элементы"
+
+#: src/mineral.cpp:93
+#, fuzzy
+msgid "Coal"
+msgstr "Каменный уголь"
+
+#: src/mineral.cpp:99
+#, fuzzy
+msgid "Iron"
+msgstr "Железная руда"
+
+#: src/mineral.cpp:106
+#, fuzzy
+msgid "Tin"
+msgstr "Тоньше"
+
+#: src/mineral.cpp:113
+#, fuzzy
+msgid "Copper"
+msgstr "Медная руда"
+
+#: src/mineral.cpp:121
+#, fuzzy
+msgid "Silver"
+msgstr "Серебрянная руда"
+
+#: src/mineral.cpp:128
+#, fuzzy
+msgid "Gold"
+msgstr "Золотая руда"
+
+#: src/mineral.cpp:135
+#, fuzzy
+msgid "Quartz"
+msgstr "Кварцевая пыль"
+
+#: src/mineral.cpp:157
+#, fuzzy
+msgid "Turquoise"
+msgstr "Бирюза"
diff --git a/po/vi/voxelands.po b/po/vi/voxelands.po
index 4220a75..6e4ec7c 100644
--- a/po/vi/voxelands.po
+++ b/po/vi/voxelands.po
@@ -1,21 +1,22 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Lisa 'darkrose' Milne
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # Deuce <ntg255@gmail.com>, 2015
 msgid ""
 msgstr ""
 "Project-Id-Version: Voxelands\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-10-19 01:55+1000\n"
+"POT-Creation-Date: 2015-12-21 11:27+1000\n"
 "PO-Revision-Date: 2015-10-18 15:56+0000\n"
 "Last-Translator: Lisa 'darkrose' Milne <lisa@ltmnet.com>\n"
-"Language-Team: Vietnamese (http://www.transifex.com/voxelands/voxelands/language/vi/)\n"
+"Language-Team: Vietnamese (http://www.transifex.com/voxelands/voxelands/"
+"language/vi/)\n"
+"Language: vi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: vi\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: src/character_creator.cpp:55
@@ -228,9 +229,18 @@ msgstr "Giày thể thao"
 
 #: src/character_creator.cpp:202
 msgid ""
-"Here you can create your default character, this is how other players will see you in-game. When you join a new server you will start with the clothing you select here. Additional clothing, both protective and decorative, can be crafted in-game.\n"
+"Here you can create your default character, this is how other players will "
+"see you in-game. When you join a new server you will start with the clothing "
+"you select here. Additional clothing, both protective and decorative, can be "
+"crafted in-game.\n"
 "You can return here from the main menu anytime to change your character."
-msgstr "Ở đây bạn có thể làm người bạn. Đây là cách người khác sẽ nhìn thấy bạn trong trò chơi. Khi bạn vào server mới, bạn sẽ bắt đầu với những quần áo bạn chọn ở đây. Quần áo thêm, cho bảo vệ và ngoại hình, có thể được làm trong trò chơi.\n Bạn có thể trở lại đây từ thực đơn chính lúc nào để thay quần áo bạn và các tính năng trên khuôn mặt."
+msgstr ""
+"Ở đây bạn có thể làm người bạn. Đây là cách người khác sẽ nhìn thấy bạn "
+"trong trò chơi. Khi bạn vào server mới, bạn sẽ bắt đầu với những quần áo bạn "
+"chọn ở đây. Quần áo thêm, cho bảo vệ và ngoại hình, có thể được làm trong "
+"trò chơi.\n"
+" Bạn có thể trở lại đây từ thực đơn chính lúc nào để thay quần áo bạn và các "
+"tính năng trên khuôn mặt."
 
 #: src/character_creator.cpp:223
 msgid "Create Your Character"
@@ -264,7 +274,7 @@ msgstr "Mỏng hơn"
 msgid "Done"
 msgstr "Xong"
 
-#: src/character_creator.cpp:423 src/keycode.cpp:229
+#: src/character_creator.cpp:423 src/keycode.cpp:236
 msgid "Cancel"
 msgstr "Thôi"
 
@@ -1116,7 +1126,7 @@ msgstr "Đá lửa"
 msgid "Steel Ingot"
 msgstr "Thỏi thép"
 
-#: src/content_craftitem.cpp:225 src/content_mapnode.cpp:710
+#: src/content_craftitem.cpp:225 src/content_mapnode.cpp:723
 msgid "Brick"
 msgstr "Cục gạch đất sét"
 
@@ -1544,11 +1554,11 @@ msgstr "Đá mithril nguyên liệu"
 msgid "Unbound Mithril"
 msgstr "Đá mithril được cởi ra"
 
-#: src/content_craftitem.cpp:1516
+#: src/content_craftitem.cpp:1516 src/mineral.cpp:142
 msgid "Mithril"
 msgstr "Đá mithril"
 
-#: src/content_craftitem.cpp:1525
+#: src/content_craftitem.cpp:1525 src/mineral.cpp:149
 msgid "Ruby"
 msgstr "Ngọc đỏ"
 
@@ -1556,15 +1566,15 @@ msgstr "Ngọc đỏ"
 msgid "Turquiose"
 msgstr "Ngọc lam"
 
-#: src/content_craftitem.cpp:1541
+#: src/content_craftitem.cpp:1541 src/mineral.cpp:165
 msgid "Amethyst"
 msgstr "Ngọc thạch anh tím"
 
-#: src/content_craftitem.cpp:1549
+#: src/content_craftitem.cpp:1549 src/mineral.cpp:173
 msgid "Sapphire"
 msgstr "Ngọc bích"
 
-#: src/content_craftitem.cpp:1557
+#: src/content_craftitem.cpp:1557 src/mineral.cpp:181
 msgid "Sunstone"
 msgstr "Đá mặt trời"
 
@@ -1576,392 +1586,396 @@ msgstr "Đá"
 msgid "Limestone"
 msgstr "Đá vôi"
 
-#: src/content_mapnode.cpp:219
+#: src/content_mapnode.cpp:221
+msgid "Marble"
+msgstr ""
+
+#: src/content_mapnode.cpp:232
 msgid "Rock"
 msgstr ""
 
-#: src/content_mapnode.cpp:241
+#: src/content_mapnode.cpp:254
 msgid "Ice"
 msgstr "Nước đá"
 
-#: src/content_mapnode.cpp:257
+#: src/content_mapnode.cpp:270
 msgid "Coal Block"
 msgstr "Khối than đá"
 
-#: src/content_mapnode.cpp:274
+#: src/content_mapnode.cpp:287
 msgid "Charcoal Block"
 msgstr "Khối than"
 
-#: src/content_mapnode.cpp:291
+#: src/content_mapnode.cpp:304
 msgid "Stone Brick"
 msgstr "Cục gạch đá"
 
-#: src/content_mapnode.cpp:305
+#: src/content_mapnode.cpp:318
 msgid "Stone Block"
 msgstr "Khối đá"
 
-#: src/content_mapnode.cpp:319
+#: src/content_mapnode.cpp:332
 msgid "Rough Stone Brick"
 msgstr "Cục gạch đá nhám"
 
-#: src/content_mapnode.cpp:336
+#: src/content_mapnode.cpp:349
 msgid "Rough Stone Block"
 msgstr "Khối đá nhám"
 
-#: src/content_mapnode.cpp:352 src/content_mapnode.cpp:385
-#: src/content_mapnode.cpp:399 src/content_mapnode.cpp:432
+#: src/content_mapnode.cpp:365 src/content_mapnode.cpp:398
+#: src/content_mapnode.cpp:412 src/content_mapnode.cpp:445
 msgid "Grass"
 msgstr "Cỏ"
 
-#: src/content_mapnode.cpp:370 src/content_mapnode.cpp:417
+#: src/content_mapnode.cpp:383 src/content_mapnode.cpp:430
 msgid "Growing Grass"
 msgstr "Cỏ phát triển"
 
-#: src/content_mapnode.cpp:446
+#: src/content_mapnode.cpp:459
 msgid "Muddy Snow"
 msgstr "Tuyết đục ngầu"
 
-#: src/content_mapnode.cpp:462
+#: src/content_mapnode.cpp:475
 msgid "Mud"
 msgstr "Bùn"
 
-#: src/content_mapnode.cpp:478
+#: src/content_mapnode.cpp:491
 msgid "Ash Block"
 msgstr "Khối tro"
 
-#: src/content_mapnode.cpp:493
+#: src/content_mapnode.cpp:506
 msgid "Sand"
 msgstr "Cát"
 
-#: src/content_mapnode.cpp:512
+#: src/content_mapnode.cpp:525
 msgid "Gravel"
 msgstr "Sỏi"
 
-#: src/content_mapnode.cpp:529
+#: src/content_mapnode.cpp:542
 msgid "Sand Stone"
 msgstr "Sa thạch"
 
-#: src/content_mapnode.cpp:544
+#: src/content_mapnode.cpp:557
 msgid "Sand Stone Bricks"
 msgstr "Cục gạch sa thạch"
 
-#: src/content_mapnode.cpp:559
+#: src/content_mapnode.cpp:572
 msgid "Sand Stone Blocks"
 msgstr "Khối sa thạch"
 
-#: src/content_mapnode.cpp:574
+#: src/content_mapnode.cpp:587
 msgid "Clay"
 msgstr "Đất sét"
 
-#: src/content_mapnode.cpp:591
+#: src/content_mapnode.cpp:604
 msgid "Blue Clay"
 msgstr "Đất sét xanh"
 
-#: src/content_mapnode.cpp:608
+#: src/content_mapnode.cpp:621
 msgid "Green Clay"
 msgstr "Đất sét xanh lá cây"
 
-#: src/content_mapnode.cpp:625
+#: src/content_mapnode.cpp:638
 msgid "Orange Clay"
 msgstr "Đất sét cam"
 
-#: src/content_mapnode.cpp:642
+#: src/content_mapnode.cpp:655
 msgid "Purple Clay"
 msgstr "Đất sét tím"
 
-#: src/content_mapnode.cpp:659
+#: src/content_mapnode.cpp:672
 msgid "Red Clay"
 msgstr "Đất sét đỏ"
 
-#: src/content_mapnode.cpp:676
+#: src/content_mapnode.cpp:689
 msgid "Yellow Clay"
 msgstr "Đất sét vàng"
 
-#: src/content_mapnode.cpp:693
+#: src/content_mapnode.cpp:706
 msgid "Black Clay"
 msgstr "Đất sét đen"
 
-#: src/content_mapnode.cpp:729
+#: src/content_mapnode.cpp:742
 msgid "Terracotta"
 msgstr "Đất nung"
 
-#: src/content_mapnode.cpp:741
+#: src/content_mapnode.cpp:754
 msgid "Terracotta Brick"
 msgstr "Cục gạch đất nung"
 
-#: src/content_mapnode.cpp:755
+#: src/content_mapnode.cpp:768
 msgid "Terracotta Block"
 msgstr "Khối đất nung"
 
-#: src/content_mapnode.cpp:769
+#: src/content_mapnode.cpp:782
 msgid "Terracotta Tile"
 msgstr "Đá lát đất nung"
 
-#: src/content_mapnode.cpp:789
+#: src/content_mapnode.cpp:802
 msgid "Glass"
 msgstr "Kính"
 
-#: src/content_mapnode.cpp:809
+#: src/content_mapnode.cpp:822
 msgid "Blue Glass"
 msgstr "Kính xanh"
 
-#: src/content_mapnode.cpp:831
+#: src/content_mapnode.cpp:844
 msgid "Green Glass"
 msgstr "Kính xanh lá cây"
 
-#: src/content_mapnode.cpp:853
+#: src/content_mapnode.cpp:866
 msgid "Orange Glass"
 msgstr "Kính cam"
 
-#: src/content_mapnode.cpp:875
+#: src/content_mapnode.cpp:888
 msgid "Purple Glass"
 msgstr "Kính tím"
 
-#: src/content_mapnode.cpp:897
+#: src/content_mapnode.cpp:910
 msgid "Red Glass"
 msgstr "Kính đỏ"
 
-#: src/content_mapnode.cpp:919
+#: src/content_mapnode.cpp:932
 msgid "Yellow Glass"
 msgstr "Kính vàng"
 
-#: src/content_mapnode.cpp:941
+#: src/content_mapnode.cpp:954
 msgid "Black Glass"
 msgstr "Kính đen"
 
-#: src/content_mapnode.cpp:963
+#: src/content_mapnode.cpp:976
 msgid "Glass Pane"
 msgstr "Tấm kính"
 
-#: src/content_mapnode.cpp:997
+#: src/content_mapnode.cpp:1010
 msgid "Blue Glass Pane"
 msgstr "Tấm kính xanh"
 
-#: src/content_mapnode.cpp:1032
+#: src/content_mapnode.cpp:1045
 msgid "Green Glass Pane"
 msgstr "Tấm kính xanh lá cây"
 
-#: src/content_mapnode.cpp:1067
+#: src/content_mapnode.cpp:1080
 msgid "Orange Glass Pane"
 msgstr "Tấm kính cam"
 
-#: src/content_mapnode.cpp:1102
+#: src/content_mapnode.cpp:1115
 msgid "Purple Glass Pane"
 msgstr "Tấm kính tím"
 
-#: src/content_mapnode.cpp:1137
+#: src/content_mapnode.cpp:1150
 msgid "Red Glass Pane"
 msgstr "Tấm kính đỏ"
 
-#: src/content_mapnode.cpp:1172
+#: src/content_mapnode.cpp:1185
 msgid "Yellow Glass Pane"
 msgstr "Tấm kính vàng"
 
-#: src/content_mapnode.cpp:1207
+#: src/content_mapnode.cpp:1220
 msgid "Black Glass Pane"
 msgstr "Tấm kính đen"
 
-#: src/content_mapnode.cpp:1242 src/content_mapnode_farm.cpp:333
+#: src/content_mapnode.cpp:1255 src/content_mapnode_farm.cpp:333
 msgid "Glass Light"
 msgstr "Đèn kính"
 
-#: src/content_mapnode.cpp:1265
+#: src/content_mapnode.cpp:1278
 msgid "Wood"
 msgstr "Gỗ"
 
-#: src/content_mapnode.cpp:1291
+#: src/content_mapnode.cpp:1304
 msgid "Jungle Wood"
 msgstr "Gỗ cây cọ"
 
-#: src/content_mapnode.cpp:1316
+#: src/content_mapnode.cpp:1329
 msgid "Pine"
 msgstr "Cây thông"
 
-#: src/content_mapnode.cpp:1341
+#: src/content_mapnode.cpp:1354
 msgid "Sponge"
 msgstr "Bọt biển"
 
-#: src/content_mapnode.cpp:1356
+#: src/content_mapnode.cpp:1369
 msgid "Waterlogged Sponge"
 msgstr "Bọt biển ướt"
 
-#: src/content_mapnode.cpp:1371
+#: src/content_mapnode.cpp:1384
 msgid "Hay Bale"
 msgstr "Kiện cỏ khô"
 
-#: src/content_mapnode.cpp:1388
+#: src/content_mapnode.cpp:1401
 msgid "Raw Apple Pie"
 msgstr "Bánh táo sống"
 
-#: src/content_mapnode.cpp:1417
+#: src/content_mapnode.cpp:1430
 msgid "Apple Pie"
 msgstr "Bánh táo"
 
-#: src/content_mapnode.cpp:1512
+#: src/content_mapnode.cpp:1525
 msgid "Raw Pumpkin Pie"
 msgstr "Bánh bí ngô sống"
 
-#: src/content_mapnode.cpp:1541
+#: src/content_mapnode.cpp:1554
 msgid "Pumpkin Pie"
 msgstr "Bánh bí ngô"
 
-#: src/content_mapnode.cpp:1636 src/content_mapnode.cpp:1715
+#: src/content_mapnode.cpp:1649 src/content_mapnode.cpp:1728
 msgid "Snow"
 msgstr "Tuyết"
 
-#: src/content_mapnode.cpp:1652
+#: src/content_mapnode.cpp:1665
 msgid "Snowman"
 msgstr "Người tuyết"
 
-#: src/content_mapnode.cpp:1738 src/content_mapnode_farm.cpp:445
+#: src/content_mapnode.cpp:1752 src/content_mapnode_farm.cpp:445
 msgid "Cotton"
 msgstr "Bông gòn"
 
-#: src/content_mapnode.cpp:1769
+#: src/content_mapnode.cpp:1783
 msgid "Blue Cotton"
 msgstr "Bông gòn xanh"
 
-#: src/content_mapnode.cpp:1786
+#: src/content_mapnode.cpp:1800
 msgid "Green Cotton"
 msgstr "Bông gòn xanh lá cây"
 
-#: src/content_mapnode.cpp:1803
+#: src/content_mapnode.cpp:1817
 msgid "Orange Cotton"
 msgstr "Bông gòn cam"
 
-#: src/content_mapnode.cpp:1820
+#: src/content_mapnode.cpp:1834
 msgid "Purple Cotton"
 msgstr "Bông gòn tím"
 
-#: src/content_mapnode.cpp:1837
+#: src/content_mapnode.cpp:1851
 msgid "Red Cotton"
 msgstr "Bông gòn đỏ"
 
-#: src/content_mapnode.cpp:1854
+#: src/content_mapnode.cpp:1868
 msgid "Yellow Cotton"
 msgstr "Bông gòn vàng"
 
-#: src/content_mapnode.cpp:1871
+#: src/content_mapnode.cpp:1885
 msgid "Black Cotton"
 msgstr "Bông gòn đen"
 
-#: src/content_mapnode.cpp:1888
+#: src/content_mapnode.cpp:1902
 msgid "Carpet"
 msgstr "Thảm"
 
-#: src/content_mapnode.cpp:1911
+#: src/content_mapnode.cpp:1925
 msgid "Blue Carpet"
 msgstr "Thảm xanh"
 
-#: src/content_mapnode.cpp:1935
+#: src/content_mapnode.cpp:1949
 msgid "Green Carpet"
 msgstr "Thảm xanh lá cây"
 
-#: src/content_mapnode.cpp:1959
+#: src/content_mapnode.cpp:1973
 msgid "Orange Carpet"
 msgstr "Thảm cam"
 
-#: src/content_mapnode.cpp:1983
+#: src/content_mapnode.cpp:1997
 msgid "Purple Carpet"
 msgstr "Thảm tím"
 
-#: src/content_mapnode.cpp:2007
+#: src/content_mapnode.cpp:2021
 msgid "Red Carpet"
 msgstr "Thảm đỏ"
 
-#: src/content_mapnode.cpp:2031
+#: src/content_mapnode.cpp:2045
 msgid "Yellow Carpet"
 msgstr "Thảm vàng"
 
-#: src/content_mapnode.cpp:2055
+#: src/content_mapnode.cpp:2069
 msgid "Black Carpet"
 msgstr "Thảm đen"
 
-#: src/content_mapnode.cpp:2079
+#: src/content_mapnode.cpp:2093
 msgid "Air"
 msgstr "Không khí"
 
-#: src/content_mapnode.cpp:2095
+#: src/content_mapnode.cpp:2109
 msgid "Vacuum"
 msgstr "Chân không"
 
-#: src/content_mapnode.cpp:2112 src/content_mapnode.cpp:2142
+#: src/content_mapnode.cpp:2126 src/content_mapnode.cpp:2156
 msgid "Water"
 msgstr "Nước"
 
-#: src/content_mapnode.cpp:2172 src/content_mapnode.cpp:2200
+#: src/content_mapnode.cpp:2186 src/content_mapnode.cpp:2214
 msgid "Lava"
 msgstr "Dung nham"
 
-#: src/content_mapnode.cpp:2231
+#: src/content_mapnode.cpp:2245
 msgid "Rough Stone"
 msgstr "Đá nhám"
 
-#: src/content_mapnode.cpp:2248
+#: src/content_mapnode.cpp:2262
 msgid "Cobble Stone"
 msgstr "Đá sỏi"
 
-#: src/content_mapnode.cpp:2264
+#: src/content_mapnode.cpp:2278
 msgid "Mossy Cobble Stone"
 msgstr "Đá sỏi có rêu"
 
-#: src/content_mapnode.cpp:2277
+#: src/content_mapnode.cpp:2291
 msgid "Steel Block"
 msgstr "Khối thép"
 
-#: src/content_mapnode.cpp:2294
+#: src/content_mapnode.cpp:2308
 msgid "Mithril Block"
 msgstr "Khối đá mithril"
 
-#: src/content_mapnode.cpp:2310
+#: src/content_mapnode.cpp:2324
 msgid "Stone Knob"
 msgstr "Buả đấm bằng đá"
 
-#: src/content_mapnode.cpp:2311
+#: src/content_mapnode.cpp:2325
 msgid "Rough Stone Knob"
 msgstr "Buả đấm bằng đá nham"
 
-#: src/content_mapnode.cpp:2312
+#: src/content_mapnode.cpp:2326
 msgid "Sandstone Knob"
 msgstr "Buả đấm bằng sa thạch"
 
-#: src/content_mapnode.cpp:2313
+#: src/content_mapnode.cpp:2327
 msgid "Wooden Knob"
 msgstr "Buả đấm bằng gỗ"
 
-#: src/content_mapnode.cpp:2314
+#: src/content_mapnode.cpp:2328
 msgid "Junglewood Knob"
 msgstr "Buả đấm bằng gỗ cây cọ"
 
-#: src/content_mapnode.cpp:2315
+#: src/content_mapnode.cpp:2329
 msgid "Pine Knob"
 msgstr "Buả đấm bằng gỗ cây thông"
 
-#: src/content_mapnode.cpp:2319
+#: src/content_mapnode.cpp:2333
 msgid "Copper Block"
 msgstr "Khối đồng"
 
-#: src/content_mapnode.cpp:2336
+#: src/content_mapnode.cpp:2350
 msgid "Gold Block"
 msgstr "Khối vàng"
 
-#: src/content_mapnode.cpp:2353
+#: src/content_mapnode.cpp:2367
 msgid "Silver Block"
 msgstr "Khối bạc"
 
-#: src/content_mapnode.cpp:2370
+#: src/content_mapnode.cpp:2384
 msgid "Tin Block"
 msgstr "Khối thiếc"
 
-#: src/content_mapnode.cpp:2387
+#: src/content_mapnode.cpp:2401
 msgid "Quartz Block"
 msgstr "Khối thạch anh"
 
-#: src/content_mapnode.cpp:2404
+#: src/content_mapnode.cpp:2418
 msgid "Stone Tiles"
 msgstr "Đá lát"
 
-#: src/content_mapnode.cpp:2426
+#: src/content_mapnode.cpp:2440
 msgid "Wood Tiles"
 msgstr "Gạch mem gỗ"
 
@@ -2009,29 +2023,29 @@ msgstr "Cổng mạch điện NOT"
 msgid "Repeater"
 msgstr "Máy nhắc lại"
 
-#: src/content_mapnode_circuit.cpp:369 src/content_mapnode_circuit.cpp:393
+#: src/content_mapnode_circuit.cpp:369 src/content_mapnode_circuit.cpp:390
 msgid "Electric Lamp"
 msgstr "Đèn điện"
 
-#: src/content_mapnode_circuit.cpp:427 src/content_mapnode_circuit.cpp:462
-#: src/content_mapnode_circuit.cpp:516 src/content_mapnode_circuit.cpp:537
-#: src/content_mapnode_circuit.cpp:582 src/content_mapnode_circuit.cpp:603
+#: src/content_mapnode_circuit.cpp:424 src/content_mapnode_circuit.cpp:459
+#: src/content_mapnode_circuit.cpp:513 src/content_mapnode_circuit.cpp:534
+#: src/content_mapnode_circuit.cpp:579 src/content_mapnode_circuit.cpp:600
 msgid "Piston"
 msgstr "Van đẩy"
 
-#: src/content_mapnode_circuit.cpp:489 src/content_mapnode_circuit.cpp:560
-#: src/content_mapnode_circuit.cpp:626
+#: src/content_mapnode_circuit.cpp:486 src/content_mapnode_circuit.cpp:557
+#: src/content_mapnode_circuit.cpp:623
 msgid "Piston Arm"
 msgstr "Tay van đẩy"
 
-#: src/content_mapnode_circuit.cpp:648 src/content_mapnode_circuit.cpp:676
-#: src/content_mapnode_circuit.cpp:730 src/content_mapnode_circuit.cpp:751
-#: src/content_mapnode_circuit.cpp:796 src/content_mapnode_circuit.cpp:817
+#: src/content_mapnode_circuit.cpp:645 src/content_mapnode_circuit.cpp:673
+#: src/content_mapnode_circuit.cpp:727 src/content_mapnode_circuit.cpp:748
+#: src/content_mapnode_circuit.cpp:793 src/content_mapnode_circuit.cpp:814
 msgid "Sticky Piston"
 msgstr "Van đẩy dính"
 
-#: src/content_mapnode_circuit.cpp:703 src/content_mapnode_circuit.cpp:774
-#: src/content_mapnode_circuit.cpp:840
+#: src/content_mapnode_circuit.cpp:700 src/content_mapnode_circuit.cpp:771
+#: src/content_mapnode_circuit.cpp:837
 msgid "Sticky Piston Arm"
 msgstr "Tay van đẩy dính"
 
@@ -2171,7 +2185,7 @@ msgstr "Nho"
 msgid "Trellis Grape"
 msgstr "Nho giàn mắt cáo"
 
-#: src/content_mapnode_farm.cpp:493 src/content_mapnode_farm.cpp:512
+#: src/content_mapnode_farm.cpp:494 src/content_mapnode_farm.cpp:513
 msgid "Dead Vine"
 msgstr "Cây nho chết"
 
@@ -2187,131 +2201,137 @@ msgstr "Kệ sách bằng gỗ cây cọ"
 msgid "Pine Book Shelf"
 msgstr "Kệ sách bằng gỗ cây thông"
 
-#: src/content_mapnode_furniture.cpp:150 src/content_mapnode_furniture.cpp:169
-#: src/content_mapnode_furniture.cpp:188 src/content_mapnode_furniture.cpp:207
-#: src/content_mapnode_furniture.cpp:226 src/content_mapnode_furniture.cpp:245
+#: src/content_mapnode_furniture.cpp:150 src/content_mapnode_furniture.cpp:170
+#: src/content_mapnode_furniture.cpp:190 src/content_mapnode_furniture.cpp:210
+#: src/content_mapnode_furniture.cpp:230 src/content_mapnode_furniture.cpp:250
 msgid "Couch"
 msgstr "Ghế tràng kỷ"
 
-#: src/content_mapnode_furniture.cpp:274 src/content_mapnode_furniture.cpp:293
-#: src/content_mapnode_furniture.cpp:312 src/content_mapnode_furniture.cpp:331
-#: src/content_mapnode_furniture.cpp:350 src/content_mapnode_furniture.cpp:369
+#: src/content_mapnode_furniture.cpp:280 src/content_mapnode_furniture.cpp:300
+#: src/content_mapnode_furniture.cpp:320 src/content_mapnode_furniture.cpp:340
+#: src/content_mapnode_furniture.cpp:360 src/content_mapnode_furniture.cpp:380
 msgid "Blue Couch"
 msgstr "Ghế tràng kỷ xanh"
 
-#: src/content_mapnode_furniture.cpp:392 src/content_mapnode_furniture.cpp:411
-#: src/content_mapnode_furniture.cpp:430 src/content_mapnode_furniture.cpp:449
-#: src/content_mapnode_furniture.cpp:468 src/content_mapnode_furniture.cpp:487
+#: src/content_mapnode_furniture.cpp:404 src/content_mapnode_furniture.cpp:424
+#: src/content_mapnode_furniture.cpp:444 src/content_mapnode_furniture.cpp:464
+#: src/content_mapnode_furniture.cpp:484 src/content_mapnode_furniture.cpp:504
 msgid "Green Couch"
 msgstr "Ghế tràng kỷ xanh lá cây"
 
-#: src/content_mapnode_furniture.cpp:510 src/content_mapnode_furniture.cpp:529
-#: src/content_mapnode_furniture.cpp:548 src/content_mapnode_furniture.cpp:567
-#: src/content_mapnode_furniture.cpp:586 src/content_mapnode_furniture.cpp:605
+#: src/content_mapnode_furniture.cpp:528 src/content_mapnode_furniture.cpp:548
+#: src/content_mapnode_furniture.cpp:568 src/content_mapnode_furniture.cpp:588
+#: src/content_mapnode_furniture.cpp:608 src/content_mapnode_furniture.cpp:628
 msgid "Orange Couch"
 msgstr "Ghế tràng kỷ cam"
 
-#: src/content_mapnode_furniture.cpp:628 src/content_mapnode_furniture.cpp:647
-#: src/content_mapnode_furniture.cpp:666 src/content_mapnode_furniture.cpp:685
-#: src/content_mapnode_furniture.cpp:704 src/content_mapnode_furniture.cpp:723
+#: src/content_mapnode_furniture.cpp:652 src/content_mapnode_furniture.cpp:672
+#: src/content_mapnode_furniture.cpp:692 src/content_mapnode_furniture.cpp:712
+#: src/content_mapnode_furniture.cpp:732 src/content_mapnode_furniture.cpp:752
 msgid "Purple Couch"
 msgstr "Ghế tràng kỷ tím"
 
-#: src/content_mapnode_furniture.cpp:746 src/content_mapnode_furniture.cpp:765
-#: src/content_mapnode_furniture.cpp:784 src/content_mapnode_furniture.cpp:803
-#: src/content_mapnode_furniture.cpp:822 src/content_mapnode_furniture.cpp:841
+#: src/content_mapnode_furniture.cpp:776 src/content_mapnode_furniture.cpp:796
+#: src/content_mapnode_furniture.cpp:816 src/content_mapnode_furniture.cpp:836
+#: src/content_mapnode_furniture.cpp:856 src/content_mapnode_furniture.cpp:876
 msgid "Red Couch"
 msgstr "Ghế tràng kỷ đỏ"
 
-#: src/content_mapnode_furniture.cpp:864 src/content_mapnode_furniture.cpp:883
-#: src/content_mapnode_furniture.cpp:902 src/content_mapnode_furniture.cpp:921
-#: src/content_mapnode_furniture.cpp:940 src/content_mapnode_furniture.cpp:959
+#: src/content_mapnode_furniture.cpp:900 src/content_mapnode_furniture.cpp:920
+#: src/content_mapnode_furniture.cpp:940 src/content_mapnode_furniture.cpp:960
+#: src/content_mapnode_furniture.cpp:980
+#: src/content_mapnode_furniture.cpp:1000
 msgid "Yellow Couch"
 msgstr "Ghế tràng kỷ vàng"
 
-#: src/content_mapnode_furniture.cpp:982
-#: src/content_mapnode_furniture.cpp:1001
-#: src/content_mapnode_furniture.cpp:1020
-#: src/content_mapnode_furniture.cpp:1039
-#: src/content_mapnode_furniture.cpp:1058
-#: src/content_mapnode_furniture.cpp:1077
+#: src/content_mapnode_furniture.cpp:1024
+#: src/content_mapnode_furniture.cpp:1044
+#: src/content_mapnode_furniture.cpp:1064
+#: src/content_mapnode_furniture.cpp:1084
+#: src/content_mapnode_furniture.cpp:1104
+#: src/content_mapnode_furniture.cpp:1124
 msgid "Black Couch"
 msgstr "Ghế tràng kỷ đen"
 
-#: src/content_mapnode_furniture.cpp:1100
+#: src/content_mapnode_furniture.cpp:1148
+#: src/content_mapnode_furniture.cpp:1182
+#: src/content_mapnode_furniture.cpp:1206
+#: src/content_mapnode_furniture.cpp:1230
+#: src/content_mapnode_furniture.cpp:1254
+#: src/content_mapnode_furniture.cpp:1278
 msgid "Chair"
 msgstr "Cái ghế"
 
-#: src/content_mapnode_furniture.cpp:1149
+#: src/content_mapnode_furniture.cpp:1302
 msgid "Table"
 msgstr "Cái bàn"
 
-#: src/content_mapnode_furniture.cpp:1206
-#: src/content_mapnode_furniture.cpp:1239
+#: src/content_mapnode_furniture.cpp:1333
+#: src/content_mapnode_furniture.cpp:1366
 msgid "Bed"
 msgstr "Cái giường"
 
-#: src/content_mapnode_furniture.cpp:1267
-#: src/content_mapnode_furniture.cpp:1300
+#: src/content_mapnode_furniture.cpp:1394
+#: src/content_mapnode_furniture.cpp:1427
 msgid "Blue Bed"
 msgstr "Cái giường xanh"
 
-#: src/content_mapnode_furniture.cpp:1328
-#: src/content_mapnode_furniture.cpp:1361
+#: src/content_mapnode_furniture.cpp:1455
+#: src/content_mapnode_furniture.cpp:1488
 msgid "Green Bed"
 msgstr "Cái giường xanh lá cây"
 
-#: src/content_mapnode_furniture.cpp:1389
-#: src/content_mapnode_furniture.cpp:1422
+#: src/content_mapnode_furniture.cpp:1516
+#: src/content_mapnode_furniture.cpp:1549
 msgid "Orange Bed"
 msgstr "Cái giường cam"
 
-#: src/content_mapnode_furniture.cpp:1450
-#: src/content_mapnode_furniture.cpp:1483
+#: src/content_mapnode_furniture.cpp:1577
+#: src/content_mapnode_furniture.cpp:1610
 msgid "Purple Bed"
 msgstr "Cái giường tím"
 
-#: src/content_mapnode_furniture.cpp:1511
-#: src/content_mapnode_furniture.cpp:1544
+#: src/content_mapnode_furniture.cpp:1638
+#: src/content_mapnode_furniture.cpp:1671
 msgid "Red Bed"
 msgstr "Cái giường đỏ"
 
-#: src/content_mapnode_furniture.cpp:1572
-#: src/content_mapnode_furniture.cpp:1605
+#: src/content_mapnode_furniture.cpp:1699
+#: src/content_mapnode_furniture.cpp:1732
 msgid "Yellow Bed"
 msgstr "Cái giường vàng"
 
-#: src/content_mapnode_furniture.cpp:1633
-#: src/content_mapnode_furniture.cpp:1666
+#: src/content_mapnode_furniture.cpp:1760
+#: src/content_mapnode_furniture.cpp:1793
 msgid "Black Bed"
 msgstr "Cái giường đen"
 
-#: src/content_mapnode_furniture.cpp:1694
-#: src/content_mapnode_furniture.cpp:1729
+#: src/content_mapnode_furniture.cpp:1821
+#: src/content_mapnode_furniture.cpp:1856
 msgid "Camp Bed"
 msgstr ""
 
-#: src/content_mapnode_furniture.cpp:1753
+#: src/content_mapnode_furniture.cpp:1880
 msgid "Colorful Painting"
 msgstr "Bức tranh nhiều màu"
 
-#: src/content_mapnode_furniture.cpp:1788
+#: src/content_mapnode_furniture.cpp:1915
 msgid "Red Rose Painting"
 msgstr "Bức tranh bông hồng đỏ"
 
-#: src/content_mapnode_furniture.cpp:1823
+#: src/content_mapnode_furniture.cpp:1950
 msgid "Field Painting"
 msgstr "Bức tranh cánh đồng"
 
-#: src/content_mapnode_furniture.cpp:1858
+#: src/content_mapnode_furniture.cpp:1985
 msgid "Blue Flower Painting"
 msgstr "Bức tranh hoa tím"
 
-#: src/content_mapnode_furniture.cpp:1893
+#: src/content_mapnode_furniture.cpp:2020
 msgid "Painting Canvas"
 msgstr "Vải bạt bức tranh"
 
-#: src/content_mapnode_furniture.cpp:1931
+#: src/content_mapnode_furniture.cpp:2058
 msgid "Clock"
 msgstr "Đồng hồ"
 
@@ -2631,7 +2651,7 @@ msgid "Decraft Book"
 msgstr "Sách tháo đồ"
 
 #: src/content_mapnode_special.cpp:753 src/content_mapnode_special.cpp:948
-#: src/content_nodemeta.cpp:2693
+#: src/content_nodemeta.cpp:2694
 msgid "Diary"
 msgstr "Lịch ghi nhớ"
 
@@ -2681,11 +2701,11 @@ msgstr "Ký hiệu"
 msgid "Locking Sign"
 msgstr "Ký hiệu khoá"
 
-#: src/content_mapnode_special.cpp:1286 src/content_nodemeta.cpp:500
+#: src/content_mapnode_special.cpp:1286 src/content_nodemeta.cpp:501
 msgid "Chest"
 msgstr "Tủ"
 
-#: src/content_mapnode_special.cpp:1310 src/content_nodemeta.cpp:775
+#: src/content_mapnode_special.cpp:1310 src/content_nodemeta.cpp:776
 msgid "Creative Chest"
 msgstr "Tủ tất cả mọi thứ"
 
@@ -2805,7 +2825,7 @@ msgstr "Gói bưu kiện"
 msgid "Cauldron"
 msgstr "Vạc để nấu"
 
-#: src/content_mapnode_special.cpp:2082 src/content_nodemeta.cpp:3312
+#: src/content_mapnode_special.cpp:2082 src/content_nodemeta.cpp:3313
 msgid "Forge"
 msgstr "Lò rèn"
 
@@ -2909,561 +2929,566 @@ msgstr ""
 msgid "Ginger Kitten"
 msgstr ""
 
-#: src/content_nodemeta.cpp:75 src/content_nodemeta.cpp:138
-#: src/content_nodemeta.cpp:2677 src/content_nodemeta.cpp:2776
+#: src/content_nodemeta.cpp:76 src/content_nodemeta.cpp:139
+#: src/content_nodemeta.cpp:2678 src/content_nodemeta.cpp:2777
 msgid "Save"
 msgstr "Dành sự tiến tới"
 
-#: src/content_nodemeta.cpp:185
+#: src/content_nodemeta.cpp:186
 #, c-format
 msgid "%s's Home Flag"
 msgstr "%s's cờ nhà"
 
-#: src/content_nodemeta.cpp:269 src/content_nodemeta.cpp:282
-#: src/content_nodemeta.cpp:436 src/content_nodemeta.cpp:449
+#: src/content_nodemeta.cpp:270 src/content_nodemeta.cpp:283
+#: src/content_nodemeta.cpp:437 src/content_nodemeta.cpp:450
 msgid "You can't sleep yet."
 msgstr ""
 
-#: src/content_nodemeta.cpp:273 src/content_nodemeta.cpp:440
+#: src/content_nodemeta.cpp:274 src/content_nodemeta.cpp:441
 msgid "Go to sleep"
 msgstr ""
 
-#: src/content_nodemeta.cpp:278 src/content_nodemeta.cpp:445
+#: src/content_nodemeta.cpp:279 src/content_nodemeta.cpp:446
 msgid "Someone else is sleeping here."
 msgstr ""
 
-#: src/content_nodemeta.cpp:286 src/content_nodemeta.cpp:453
+#: src/content_nodemeta.cpp:287 src/content_nodemeta.cpp:454
 msgid "Get out of bed"
 msgstr ""
 
-#: src/content_nodemeta.cpp:432
+#: src/content_nodemeta.cpp:433
 msgid "This bed is too uncomfortable to sleep in."
 msgstr ""
 
-#: src/content_nodemeta.cpp:573
+#: src/content_nodemeta.cpp:574
 #, c-format
 msgid "Locking Chest owned by '%s'"
 msgstr "Tủ có khoá của '%s'"
 
-#: src/content_nodemeta.cpp:647
+#: src/content_nodemeta.cpp:648
 #, c-format
 msgid "Safe owned by '%s'"
 msgstr "Tủ sắt của '%s'"
 
-#: src/content_nodemeta.cpp:816 src/content_nodemeta.cpp:1870
-#: src/content_nodemeta.cpp:2157 src/content_nodemeta.cpp:2349
-#: src/content_nodemeta.cpp:2563
+#: src/content_nodemeta.cpp:817 src/content_nodemeta.cpp:1871
+#: src/content_nodemeta.cpp:2158 src/content_nodemeta.cpp:2350
+#: src/content_nodemeta.cpp:2564
 #, c-format
 msgid "Page %d of %d"
 msgstr "Trang %d of %d"
 
-#: src/content_nodemeta.cpp:820 src/content_nodemeta.cpp:1898
-#: src/content_nodemeta.cpp:2176 src/content_nodemeta.cpp:2358
-#: src/content_nodemeta.cpp:2579
+#: src/content_nodemeta.cpp:821 src/content_nodemeta.cpp:1899
+#: src/content_nodemeta.cpp:2177 src/content_nodemeta.cpp:2359
+#: src/content_nodemeta.cpp:2580
 msgid "<< Previous Page"
 msgstr "<< Trang trước"
 
-#: src/content_nodemeta.cpp:826 src/content_nodemeta.cpp:1904
-#: src/content_nodemeta.cpp:2182 src/content_nodemeta.cpp:2364
-#: src/content_nodemeta.cpp:2585
+#: src/content_nodemeta.cpp:827 src/content_nodemeta.cpp:1905
+#: src/content_nodemeta.cpp:2183 src/content_nodemeta.cpp:2365
+#: src/content_nodemeta.cpp:2586
 msgid "Next Page >>"
 msgstr "Trang tiếp >>"
 
-#: src/content_nodemeta.cpp:869
+#: src/content_nodemeta.cpp:870
 #, c-format
 msgid "Border Stone owned by '%s'"
 msgstr "Đá làm biên giới của '%s'"
 
-#: src/content_nodemeta.cpp:944
+#: src/content_nodemeta.cpp:945
 msgid "Furnace is overloaded"
 msgstr "Lò có đồ nhiều quá"
 
-#: src/content_nodemeta.cpp:945
+#: src/content_nodemeta.cpp:946
 msgid "Furnace is out of fuel"
 msgstr "Lò hết chất đốt"
 
-#: src/content_nodemeta.cpp:947
+#: src/content_nodemeta.cpp:948
 msgid "Furnace is inactive"
 msgstr "Lò không hoạt động"
 
-#: src/content_nodemeta.cpp:950
+#: src/content_nodemeta.cpp:951
 msgid "Furnace is active"
 msgstr "Lò đang cháy"
 
-#: src/content_nodemeta.cpp:1209
+#: src/content_nodemeta.cpp:1210
 msgid "Locking Furnace is overloaded"
 msgstr "Lò có khoá có đồ nhiều quá"
 
-#: src/content_nodemeta.cpp:1210
+#: src/content_nodemeta.cpp:1211
 msgid "Locking Furnace is out of fuel"
 msgstr "Lò có khoá hết chất đốt"
 
-#: src/content_nodemeta.cpp:1212
+#: src/content_nodemeta.cpp:1213
 msgid "Locking Furnace is inactive"
 msgstr "Lò có khoá không hoạt động"
 
-#: src/content_nodemeta.cpp:1215
+#: src/content_nodemeta.cpp:1216
 msgid "Locking Furnace is active"
 msgstr "Lò có khoá đang cháy"
 
-#: src/content_nodemeta.cpp:1470
+#: src/content_nodemeta.cpp:1471
 msgid "Armed Explosive: about to detonate"
 msgstr ""
 
-#: src/content_nodemeta.cpp:1473
+#: src/content_nodemeta.cpp:1474
 #, c-format
 msgid "Armed Explosive: %d second till detonation"
 msgid_plural "Armed Explosive: %d seconds till detonation"
 msgstr[0] ""
 
-#: src/content_nodemeta.cpp:1534 src/content_nodemeta.cpp:1539
+#: src/content_nodemeta.cpp:1535 src/content_nodemeta.cpp:1540
 msgid "Incinerator is active"
 msgstr ""
 
-#: src/content_nodemeta.cpp:1541
+#: src/content_nodemeta.cpp:1542
 msgid "Incinerator is inactive"
 msgstr ""
 
-#: src/content_nodemeta.cpp:1633
+#: src/content_nodemeta.cpp:1634
 msgid "Add fuel, then punch to incinerate wielded item"
 msgstr ""
 
-#: src/content_nodemeta.cpp:1874 src/content_nodemeta.cpp:2162
+#: src/content_nodemeta.cpp:1875 src/content_nodemeta.cpp:2163
 msgid "Add item here to see recipe"
 msgstr ""
 
-#: src/content_nodemeta.cpp:1879 src/content_nodemeta.cpp:2167
+#: src/content_nodemeta.cpp:1880 src/content_nodemeta.cpp:2168
 #, c-format
 msgid "Recipe %d of %d"
 msgstr ""
 
-#: src/content_nodemeta.cpp:1888
+#: src/content_nodemeta.cpp:1889
 msgid "Gives"
 msgstr ""
 
-#: src/content_nodemeta.cpp:2353
+#: src/content_nodemeta.cpp:2354
 msgid "Add item here to see cook result"
 msgstr ""
 
-#: src/content_nodemeta.cpp:2567
+#: src/content_nodemeta.cpp:2568
 msgid "Add item here to see dig result"
 msgstr ""
 
-#: src/content_nodemeta.cpp:2571
+#: src/content_nodemeta.cpp:2572
 msgid "Dig Result"
 msgstr ""
 
-#: src/content_nodemeta.cpp:2575
+#: src/content_nodemeta.cpp:2576
 msgid "Random Drop"
 msgstr ""
 
-#: src/content_nodemeta.cpp:2667 src/content_nodemeta.cpp:2766
+#: src/content_nodemeta.cpp:2668 src/content_nodemeta.cpp:2767
 msgid "Title"
 msgstr ""
 
-#: src/content_nodemeta.cpp:2672 src/content_nodemeta.cpp:2771
+#: src/content_nodemeta.cpp:2673 src/content_nodemeta.cpp:2772
 msgid "Content"
 msgstr ""
 
-#: src/content_nodemeta.cpp:3127
+#: src/content_nodemeta.cpp:3128
 msgid "Cauldron is active"
 msgstr ""
 
-#: src/content_nodemeta.cpp:3130
+#: src/content_nodemeta.cpp:3131
 msgid "Cauldron is hot"
 msgstr ""
 
-#: src/content_nodemeta.cpp:3132
+#: src/content_nodemeta.cpp:3133
 msgid "Cauldron is cool"
 msgstr ""
 
-#: src/content_nodemeta.cpp:3134
+#: src/content_nodemeta.cpp:3135
 msgid "Cauldron is empty"
 msgstr ""
 
-#: src/content_nodemeta.cpp:3138
+#: src/content_nodemeta.cpp:3139
 msgid "Cauldron is inactive"
 msgstr ""
 
-#: src/content_nodemeta.cpp:3139
+#: src/content_nodemeta.cpp:3140
 msgid "Cauldron is out of fuel"
 msgstr ""
 
-#: src/content_nodemeta.cpp:3218
+#: src/content_nodemeta.cpp:3219
 msgid "Add fuel, then punch to add or remove water"
 msgstr ""
 
-#: src/content_nodemeta.cpp:3484
+#: src/content_nodemeta.cpp:3487
 msgid "Show Enchanting"
 msgstr ""
 
-#: src/content_nodemeta.cpp:3491 src/game.cpp:208
+#: src/content_nodemeta.cpp:3494 src/game.cpp:209
 msgid "Show Crafting"
 msgstr ""
 
-#: src/content_toolitem.cpp:213
+#: src/content_toolitem.cpp:216
 msgid "Small Stone Pick"
 msgstr ""
 
-#: src/content_toolitem.cpp:236
+#: src/content_toolitem.cpp:239
 msgid "Stone Pick"
 msgstr ""
 
-#: src/content_toolitem.cpp:250
+#: src/content_toolitem.cpp:253
 msgid "Flint Pick"
 msgstr ""
 
-#: src/content_toolitem.cpp:264
+#: src/content_toolitem.cpp:267
 msgid "Steel Pick"
 msgstr ""
 
-#: src/content_toolitem.cpp:278
+#: src/content_toolitem.cpp:281
 msgid "Creative Pick"
 msgstr ""
 
-#: src/content_toolitem.cpp:292
+#: src/content_toolitem.cpp:295
 msgid "Stone Trowel"
 msgstr ""
 
-#: src/content_toolitem.cpp:306
+#: src/content_toolitem.cpp:309
 msgid "Stone Shovel"
 msgstr ""
 
-#: src/content_toolitem.cpp:320
+#: src/content_toolitem.cpp:323
 msgid "Flint Shovel"
 msgstr ""
 
-#: src/content_toolitem.cpp:334
+#: src/content_toolitem.cpp:337
 msgid "Steel Shovel"
 msgstr ""
 
-#: src/content_toolitem.cpp:348
+#: src/content_toolitem.cpp:351
 msgid "Small Stone Axe"
 msgstr ""
 
-#: src/content_toolitem.cpp:369
+#: src/content_toolitem.cpp:372
 msgid "Stone Axe"
 msgstr ""
 
-#: src/content_toolitem.cpp:383
+#: src/content_toolitem.cpp:386
 msgid "Flint Axe"
 msgstr ""
 
-#: src/content_toolitem.cpp:397
+#: src/content_toolitem.cpp:400
 msgid "Steel Axe"
 msgstr ""
 
-#: src/content_toolitem.cpp:411
+#: src/content_toolitem.cpp:414
 msgid "Wooden Club"
 msgstr ""
 
-#: src/content_toolitem.cpp:426
+#: src/content_toolitem.cpp:429
 msgid "Stone Sword"
 msgstr ""
 
-#: src/content_toolitem.cpp:440
+#: src/content_toolitem.cpp:443
 msgid "Steel Sword"
 msgstr ""
 
-#: src/content_toolitem.cpp:454
+#: src/content_toolitem.cpp:457
 msgid "Flint Shears"
 msgstr ""
 
-#: src/content_toolitem.cpp:468
+#: src/content_toolitem.cpp:471
 msgid "Steel Shears"
 msgstr ""
 
-#: src/content_toolitem.cpp:482
+#: src/content_toolitem.cpp:485
 msgid "Wooden Bucket"
 msgstr ""
 
-#: src/content_toolitem.cpp:499
+#: src/content_toolitem.cpp:502
 msgid "Tin Bucket"
 msgstr ""
 
-#: src/content_toolitem.cpp:515
+#: src/content_toolitem.cpp:518
 msgid "Wooden Bucket of Water"
 msgstr ""
 
-#: src/content_toolitem.cpp:526
+#: src/content_toolitem.cpp:529
 msgid "Tin Bucket of Water"
 msgstr ""
 
-#: src/content_toolitem.cpp:537
+#: src/content_toolitem.cpp:540
 msgid "Steel Bucket"
 msgstr ""
 
-#: src/content_toolitem.cpp:552
+#: src/content_toolitem.cpp:555
 msgid "Steel Bucket of Water"
 msgstr ""
 
-#: src/content_toolitem.cpp:563
+#: src/content_toolitem.cpp:566
 msgid "Steel Bucket of Lava"
 msgstr ""
 
-#: src/content_toolitem.cpp:575
+#: src/content_toolitem.cpp:578
 msgid "Fire Starter"
 msgstr ""
 
-#: src/content_toolitem.cpp:589
+#: src/content_toolitem.cpp:592
 msgid "Crowbar"
 msgstr ""
 
-#: src/content_toolitem.cpp:602
+#: src/content_toolitem.cpp:605
 msgid "Key"
 msgstr ""
 
-#: src/content_toolitem.cpp:614
+#: src/content_toolitem.cpp:617
 msgid "Stone Spear"
 msgstr ""
 
-#: src/content_toolitem.cpp:628
+#: src/content_toolitem.cpp:631
 msgid "Flint Spear"
 msgstr ""
 
-#: src/content_toolitem.cpp:642
+#: src/content_toolitem.cpp:645
 msgid "Steel Spear"
 msgstr ""
 
-#: src/content_toolitem.cpp:656
+#: src/content_toolitem.cpp:659
 msgid "Bow"
 msgstr ""
 
-#: src/content_toolitem.cpp:676
+#: src/content_toolitem.cpp:679
 msgid "Raw Mithril Pick"
 msgstr ""
 
-#: src/content_toolitem.cpp:690
+#: src/content_toolitem.cpp:693
 msgid "Raw Mithril Shovel"
 msgstr ""
 
-#: src/content_toolitem.cpp:704
+#: src/content_toolitem.cpp:707
 msgid "Raw Mithril Axe"
 msgstr ""
 
-#: src/content_toolitem.cpp:718
+#: src/content_toolitem.cpp:721
 msgid "Raw Mithril Sword"
 msgstr ""
 
-#: src/content_toolitem.cpp:732
+#: src/content_toolitem.cpp:735
 msgid "Raw Mithril Spear"
 msgstr ""
 
-#: src/content_toolitem.cpp:746
+#: src/content_toolitem.cpp:749
 msgid "Unbound Mithril Pick"
 msgstr ""
 
-#: src/content_toolitem.cpp:760
+#: src/content_toolitem.cpp:763
 msgid "Unbound Mithril Shovel"
 msgstr ""
 
-#: src/content_toolitem.cpp:774
+#: src/content_toolitem.cpp:777
 msgid "Unbound Mithril Axe"
 msgstr ""
 
-#: src/content_toolitem.cpp:788
+#: src/content_toolitem.cpp:791
 msgid "Unbound Mithril Sword"
 msgstr ""
 
-#: src/content_toolitem.cpp:802
+#: src/content_toolitem.cpp:805
 msgid "Unbound Mithril Spear"
 msgstr ""
 
-#: src/content_toolitem.cpp:816
+#: src/content_toolitem.cpp:819
 msgid "Mithril Pick"
 msgstr ""
 
-#: src/content_toolitem.cpp:831
+#: src/content_toolitem.cpp:834
 msgid "Mithril Shovel"
 msgstr ""
 
-#: src/content_toolitem.cpp:845
+#: src/content_toolitem.cpp:848
 msgid "Mithril Axe"
 msgstr ""
 
-#: src/content_toolitem.cpp:859
+#: src/content_toolitem.cpp:862
 msgid "Mithril Sword"
 msgstr ""
 
-#: src/content_toolitem.cpp:873
+#: src/content_toolitem.cpp:876
 msgid "Mithril Spear"
 msgstr ""
 
-#: src/content_toolitem.cpp:887
+#: src/content_toolitem.cpp:890
 msgid "Mob Spawner"
 msgstr ""
 
-#: src/game.cpp:209
+#: src/content_toolitem.cpp:909
+#, fuzzy
+msgid "Mithril Key"
+msgstr "Dây mithril"
+
+#: src/game.cpp:210
 msgid "Clothes"
 msgstr ""
 
-#: src/game.cpp:210
+#: src/game.cpp:211
 msgid "Hat/Helmet"
 msgstr ""
 
-#: src/game.cpp:212
+#: src/game.cpp:213
 msgid "Jacket"
 msgstr ""
 
-#: src/game.cpp:214
+#: src/game.cpp:215
 msgid "Decorative"
 msgstr ""
 
-#: src/game.cpp:216
+#: src/game.cpp:217
 msgid "Shirt"
 msgstr ""
 
-#: src/game.cpp:218
+#: src/game.cpp:219
 msgid "Belt"
 msgstr ""
 
-#: src/game.cpp:220
+#: src/game.cpp:221
 msgid "Pants"
 msgstr ""
 
-#: src/game.cpp:222
+#: src/game.cpp:223
 msgid "Boots"
 msgstr ""
 
-#: src/game.cpp:229
+#: src/game.cpp:230
 msgid "Drop to Ground"
 msgstr ""
 
-#: src/game.cpp:231
+#: src/game.cpp:232
 msgid "Change Clothing"
 msgstr ""
 
-#: src/game.cpp:590
+#: src/game.cpp:591
 msgid "Loading"
 msgstr ""
 
-#: src/game.cpp:662
+#: src/game.cpp:663
 msgid "Loading..."
 msgstr ""
 
-#: src/game.cpp:671
+#: src/game.cpp:672
 msgid "Creating server..."
 msgstr ""
 
-#: src/game.cpp:682
+#: src/game.cpp:683
 msgid "Creating client..."
 msgstr ""
 
-#: src/game.cpp:687
+#: src/game.cpp:688
 msgid "Resolving address..."
 msgstr ""
 
-#: src/game.cpp:698
+#: src/game.cpp:699
 msgid "Couldn't resolve address"
 msgstr ""
 
-#: src/game.cpp:738
+#: src/game.cpp:739
 #, c-format
 msgid "Connecting to server... (timeout in %d second)"
 msgid_plural "Connecting to server... (timeout in %d seconds)"
 msgstr[0] ""
 
-#: src/game.cpp:767
+#: src/game.cpp:768
 #, c-format
 msgid "Access denied. Reason: %ls"
 msgstr ""
 
-#: src/game.cpp:771
+#: src/game.cpp:772
 msgid "Unable to Connect (port already in use?)."
 msgstr ""
 
-#: src/game.cpp:774
+#: src/game.cpp:775
 msgid "Connection timed out."
 msgstr ""
 
-#: src/game.cpp:927
+#: src/game.cpp:928
 msgid "Access denied. Reason: "
 msgstr ""
 
-#: src/game.cpp:1161
+#: src/game.cpp:1162
 msgid "free_move disabled"
 msgstr ""
 
-#: src/game.cpp:1165
+#: src/game.cpp:1166
 msgid "free_move enabled"
 msgstr ""
 
-#: src/game.cpp:1177
+#: src/game.cpp:1178
 #, c-format
 msgid "Saved screenshot to '%s'"
 msgstr ""
 
-#: src/game.cpp:1189
+#: src/game.cpp:1190
 msgid "HUD shown"
 msgstr ""
 
-#: src/game.cpp:1191
+#: src/game.cpp:1192
 msgid "HUD hidden"
 msgstr ""
 
-#: src/game.cpp:1197
+#: src/game.cpp:1198
 msgid "Chat shown"
 msgstr ""
 
-#: src/game.cpp:1199
+#: src/game.cpp:1200
 msgid "Chat hidden"
 msgstr ""
 
-#: src/game.cpp:1205
+#: src/game.cpp:1206
 msgid "Fog disabled"
 msgstr ""
 
-#: src/game.cpp:1207
+#: src/game.cpp:1208
 msgid "Fog enabled"
 msgstr ""
 
-#: src/game.cpp:1213
+#: src/game.cpp:1214
 msgid "Camera update disabled"
 msgstr ""
 
-#: src/game.cpp:1215
+#: src/game.cpp:1216
 msgid "Camera update enabled"
 msgstr ""
 
-#: src/game.cpp:1225
+#: src/game.cpp:1226
 msgid "Debug info shown"
 msgstr ""
 
-#: src/game.cpp:1230
+#: src/game.cpp:1231
 msgid "Debug info and frametime graph hidden"
 msgstr ""
 
-#: src/game.cpp:1234
+#: src/game.cpp:1235
 msgid "Frametime graph shown"
 msgstr ""
 
-#: src/game.cpp:1246
+#: src/game.cpp:1247
 #, c-format
 msgid "Profiler shown (page %d of %d)"
 msgstr ""
 
-#: src/game.cpp:1250
+#: src/game.cpp:1251
 msgid "Profiler hidden"
 msgstr ""
 
-#: src/game.cpp:1258 src/game.cpp:1269
+#: src/game.cpp:1259 src/game.cpp:1270
 #, c-format
 msgid "Minimum viewing range changed to %d"
 msgstr ""
 
-#: src/game.cpp:1338
+#: src/game.cpp:1339
 msgid "Enabled full viewing range"
 msgstr ""
 
-#: src/game.cpp:1342
+#: src/game.cpp:1343
 msgid "Disabled full viewing range"
 msgstr ""
 
-#: src/game.cpp:1995
+#: src/game.cpp:1950
 msgid "Disconnected (Network Timeout)"
 msgstr ""
 
-#: src/game.cpp:2407
+#: src/game.cpp:2382
 msgid "Shutting down..."
 msgstr ""
 
@@ -3483,236 +3508,290 @@ msgstr ""
 msgid "Write It"
 msgstr ""
 
-#: src/guiMainMenu.cpp:347
+#: src/guiMainMenu.cpp:319
 msgid "Character Creator"
 msgstr ""
 
-#: src/guiMainMenu.cpp:353 src/guiMainMenu.cpp:478 src/guiMainMenu.cpp:520
-#: src/guiMainMenu.cpp:631
+#: src/guiMainMenu.cpp:325 src/guiMainMenu.cpp:386 src/guiMainMenu.cpp:428
+#: src/guiMainMenu.cpp:539
 msgid "Single Player"
 msgstr ""
 
-#: src/guiMainMenu.cpp:359 src/guiMainMenu.cpp:410
+#: src/guiMainMenu.cpp:331 src/guiMultiplayerMenu.cpp:161
 msgid "Multi Player"
 msgstr ""
 
-#: src/guiMainMenu.cpp:365 src/guiPauseMenu.cpp:155
+#: src/guiMainMenu.cpp:337 src/guiPauseMenu.cpp:155
 msgid "Settings"
 msgstr ""
 
-#: src/guiMainMenu.cpp:371
+#: src/guiMainMenu.cpp:343
 msgid "Credits"
 msgstr ""
 
-#: src/guiMainMenu.cpp:377
+#: src/guiMainMenu.cpp:349
 msgid "Quit"
 msgstr ""
 
-#: src/guiMainMenu.cpp:418
-msgid "Name/Password"
-msgstr ""
-
-#: src/guiMainMenu.cpp:446
-msgid "Address/Port"
-msgstr ""
-
-#: src/guiMainMenu.cpp:472
-msgid "Connect"
-msgstr ""
-
-#: src/guiMainMenu.cpp:487 src/guiMainMenu.cpp:529 src/guiMainMenu.cpp:640
+#: src/guiMainMenu.cpp:395 src/guiMainMenu.cpp:437 src/guiMainMenu.cpp:548
 msgid "Creative Mode"
 msgstr ""
 
-#: src/guiMainMenu.cpp:488 src/guiMainMenu.cpp:530 src/guiMainMenu.cpp:641
+#: src/guiMainMenu.cpp:396 src/guiMainMenu.cpp:438 src/guiMainMenu.cpp:549
 msgid "Adventure Mode"
 msgstr ""
 
-#: src/guiMainMenu.cpp:489 src/guiMainMenu.cpp:531 src/guiMainMenu.cpp:642
+#: src/guiMainMenu.cpp:397 src/guiMainMenu.cpp:439 src/guiMainMenu.cpp:550
 msgid "Survival Mode"
 msgstr ""
 
-#: src/guiMainMenu.cpp:502 src/guiMainMenu.cpp:655
+#: src/guiMainMenu.cpp:410 src/guiMainMenu.cpp:563
 msgid "Advanced Settings"
 msgstr ""
 
-#: src/guiMainMenu.cpp:508 src/guiMainMenu.cpp:550
+#: src/guiMainMenu.cpp:416 src/guiMainMenu.cpp:458
 msgid "Map Options"
 msgstr ""
 
-#: src/guiMainMenu.cpp:514 src/guiMainMenu.cpp:625 src/guiMainMenu.cpp:750
+#: src/guiMainMenu.cpp:422 src/guiMainMenu.cpp:533 src/guiMainMenu.cpp:658
 msgid "Start Game"
 msgstr ""
 
-#: src/guiMainMenu.cpp:544
+#: src/guiMainMenu.cpp:452
 msgid "Hide Advanced Settings"
 msgstr ""
 
-#: src/guiMainMenu.cpp:555
+#: src/guiMainMenu.cpp:463
 msgid "Creatures"
 msgstr ""
 
-#: src/guiMainMenu.cpp:562
+#: src/guiMainMenu.cpp:470
 msgid "None"
 msgstr "Không vật gì"
 
-#: src/guiMainMenu.cpp:563
+#: src/guiMainMenu.cpp:471
 msgid "Passive"
 msgstr "Bị động"
 
-#: src/guiMainMenu.cpp:564
+#: src/guiMainMenu.cpp:472
 msgid "Passive & Aggressive"
 msgstr "Bị động và hay gây hấn"
 
-#: src/guiMainMenu.cpp:565
+#: src/guiMainMenu.cpp:473
 msgid "Passive, Aggressive, & Destructive"
 msgstr "Bị động, hay gây hấn, và phá hoại"
 
-#: src/guiMainMenu.cpp:579
+#: src/guiMainMenu.cpp:487
 msgid "Player Damage"
 msgstr "Làm hỏng người"
 
-#: src/guiMainMenu.cpp:584
+#: src/guiMainMenu.cpp:492
 msgid "Suffocation/Drowning"
 msgstr "Sự nghẹt thở/dìm chết"
 
-#: src/guiMainMenu.cpp:589
+#: src/guiMainMenu.cpp:497
 msgid "Hunger"
 msgstr "Sự đói"
 
-#: src/guiMainMenu.cpp:594
+#: src/guiMainMenu.cpp:502
 msgid "Tool Wear"
 msgstr "Dụng cụ bị mòn"
 
-#: src/guiMainMenu.cpp:599
+#: src/guiMainMenu.cpp:507
 msgid "Dangerous Fire"
 msgstr "Lửa nguy hiểm"
 
-#: src/guiMainMenu.cpp:604
+#: src/guiMainMenu.cpp:512
 msgid "Infinite Inventory"
 msgstr "Kiểm kê không bờ bến"
 
-#: src/guiMainMenu.cpp:609
+#: src/guiMainMenu.cpp:517
 msgid "Initial Inventory"
 msgstr "Cho đồ đầu trò chơi"
 
-#: src/guiMainMenu.cpp:614
+#: src/guiMainMenu.cpp:522
 msgid "Droppable Inventory"
 msgstr "Kiểm kê bỏ được"
 
-#: src/guiMainMenu.cpp:619
+#: src/guiMainMenu.cpp:527
 msgid "Death drops Inventory"
 msgstr ""
 
-#: src/guiMainMenu.cpp:661
+#: src/guiMainMenu.cpp:569
 msgid "Hide Map Options"
 msgstr "Trốn chọn lựa thế giới"
 
-#: src/guiMainMenu.cpp:666
+#: src/guiMainMenu.cpp:574
 msgid "Create New Map"
 msgstr "Làm thế giới mới"
 
-#: src/guiMainMenu.cpp:672
+#: src/guiMainMenu.cpp:580
 msgid "Warning! Your old map will be deleted!"
 msgstr "Coi chưng! Làm như vậy sẽ xóa thế giới cũ của bạn!"
 
-#: src/guiMainMenu.cpp:678
+#: src/guiMainMenu.cpp:586
 msgid "Map Type"
 msgstr "Kiểu thế giới"
 
-#: src/guiMainMenu.cpp:685
+#: src/guiMainMenu.cpp:593
 msgid "Flat"
 msgstr "Bằng phẳng"
 
-#: src/guiMainMenu.cpp:686
+#: src/guiMainMenu.cpp:594
 msgid "Flatter"
 msgstr "Phẳng hơn"
 
-#: src/guiMainMenu.cpp:687
+#: src/guiMainMenu.cpp:595
 msgid "Smoother"
 msgstr "Bằng hơn"
 
-#: src/guiMainMenu.cpp:688
+#: src/guiMainMenu.cpp:596
 msgid "Default"
 msgstr "Vắng mặt"
 
-#: src/guiMainMenu.cpp:689
+#: src/guiMainMenu.cpp:597
 msgid "Hilly"
 msgstr "Có nhiều đồi"
 
-#: src/guiMainMenu.cpp:690
+#: src/guiMainMenu.cpp:598
 msgid "Mountains"
 msgstr "Núi"
 
-#: src/guiMainMenu.cpp:691
+#: src/guiMainMenu.cpp:599
 msgid "Crazy"
 msgstr "Rất không đều"
 
-#: src/guiMainMenu.cpp:692
+#: src/guiMainMenu.cpp:600
 msgid "Crazy Hills"
 msgstr "Đồi rất không đều"
 
-#: src/guiMainMenu.cpp:714
+#: src/guiMainMenu.cpp:622
 msgid "Use Fixed Seed"
 msgstr "Dụng số sinh ra thế giới"
 
-#: src/guiMainMenu.cpp:720
+#: src/guiMainMenu.cpp:628
 msgid "Map Seed"
 msgstr "Số sinh ra thế giới"
 
-#: src/guiMainMenu.cpp:737
+#: src/guiMainMenu.cpp:645
 msgid "Clear Map"
 msgstr "Làm trong sạch thế giới"
 
-#: src/guiMainMenu.cpp:742
+#: src/guiMainMenu.cpp:650
 msgid "Warning! This will delete all construction from your map!"
 msgstr "Coi chưng! Làm như vậy sẽ xóa tất cả các tòa nhà từ thế giới của bạn!"
 
-#: src/guiMainMenu.cpp:760
+#: src/guiMainMenu.cpp:668
 msgid ""
 "Voxelands\n"
 "http://www.voxelands.com/\n"
 "By Lisa 'darkrose' Milne <lisa@ltmnet.com> and contributors."
-msgstr "Voxelands\nhttp://www.voxelands.com/\nĐược làm bởi Lisa 'darkrose' Milne <lisa@ltmnet.com> và người giúp sức khác"
+msgstr ""
+"Voxelands\n"
+"http://www.voxelands.com/\n"
+"Được làm bởi Lisa 'darkrose' Milne <lisa@ltmnet.com> và người giúp sức khác"
 
-#: src/guiMainMenu.cpp:767
+#: src/guiMainMenu.cpp:675
 msgid "Programmers"
 msgstr "Người lập trình trên máy tính"
 
-#: src/guiMainMenu.cpp:770
+#: src/guiMainMenu.cpp:678
 msgid "Artists and Modellers"
 msgstr "Nghệ sĩ và người làm mẫu vật"
 
-#: src/guiMainMenu.cpp:773
+#: src/guiMainMenu.cpp:681
 msgid "Translators"
 msgstr "Người dịch"
 
-#: src/guiMainMenu.cpp:776
+#: src/guiMainMenu.cpp:684
 msgid "Documentation Writters"
 msgstr "Người viết sự chứng minh bằng tài liệu"
 
-#: src/guiMainMenu.cpp:779
+#: src/guiMainMenu.cpp:687
 msgid "Testers, Packagers, and Builders"
 msgstr "Người thử, người đóng gói, và người xây dựng phần mềm của máy tính"
 
-#: src/guiMainMenu.cpp:782
+#: src/guiMainMenu.cpp:690
 msgid "Music and Sound Effects Composers"
 msgstr "Người sáng tác âm nhạc và âm thanh"
 
-#: src/guiMainMenu.cpp:785
+#: src/guiMainMenu.cpp:693
 msgid "Other Contributers, and Special Thanks"
 msgstr "Người giúp sức khác, và cảm ơn đặc biệt"
 
-#: src/guiMainMenu.cpp:789
+#: src/guiMainMenu.cpp:697
 msgid ""
 "Based on Minetest-C55 by Perttu Ahola <celeron55@gmail.com>\n"
-"and contributors: PilzAdam, Taoki, tango_, kahrl (kaaaaaahrl?), darkrose, matttpt, erlehmann, SpeedProg, JacobF, teddydestodes, marktraceur, Jonathan Neuschafer, thexyz, VanessaE, sfan5... and tens of more random people."
-msgstr "Có nguồn gốc từ Minetest-C55 được làm bởi Perttu Ahola <celeron55@gmail.com>\nvà người giúp sức: PilzAdam, Taoki, tango_, kahrl (kaaaaaahrl?), darkrose, matttpt, erlehmann, SpeedProg, JacobF, teddydestodes, marktraceur, Jonathan Neuschafer, thexyz, VanessaE, sfan5... và nhiều người ngẫu nhiên hơn!"
+"and contributors: PilzAdam, Taoki, tango_, kahrl (kaaaaaahrl?), darkrose, "
+"matttpt, erlehmann, SpeedProg, JacobF, teddydestodes, marktraceur, Jonathan "
+"Neuschafer, thexyz, VanessaE, sfan5... and tens of more random people."
+msgstr ""
+"Có nguồn gốc từ Minetest-C55 được làm bởi Perttu Ahola <celeron55@gmail."
+"com>\n"
+"và người giúp sức: PilzAdam, Taoki, tango_, kahrl (kaaaaaahrl?), darkrose, "
+"matttpt, erlehmann, SpeedProg, JacobF, teddydestodes, marktraceur, Jonathan "
+"Neuschafer, thexyz, VanessaE, sfan5... và nhiều người ngẫu nhiên hơn!"
 
 #: src/guiMessageMenu.cpp:112 src/guiPauseMenu.cpp:143
 msgid "Continue"
 msgstr "Tiếp tục"
 
+#: src/guiMultiplayerMenu.cpp:135 src/guiSettingsMenu.cpp:277
+msgid "Main Menu"
+msgstr "Bảng chọn chính"
+
+#: src/guiMultiplayerMenu.cpp:142
+msgid "All Servers"
+msgstr ""
+
+#: src/guiMultiplayerMenu.cpp:148
+msgid "Favourite Servers"
+msgstr ""
+
+#: src/guiMultiplayerMenu.cpp:154
+msgid "Custom Connect"
+msgstr ""
+
+#: src/guiMultiplayerMenu.cpp:169
+msgid "Custom Connection"
+msgstr ""
+
+#: src/guiMultiplayerMenu.cpp:176
+msgid "Address/Port"
+msgstr ""
+
+#: src/guiMultiplayerMenu.cpp:201 src/guiMultiplayerMenu.cpp:313
+msgid "Add to Favourites"
+msgstr ""
+
+#: src/guiMultiplayerMenu.cpp:206 src/guiMultiplayerMenu.cpp:320
+msgid "Connect"
+msgstr ""
+
+#: src/guiMultiplayerMenu.cpp:213
+msgid "Name/Password"
+msgstr ""
+
+#: src/guiMultiplayerMenu.cpp:240
+msgid "Join Server"
+msgstr ""
+
+#: src/guiMultiplayerMenu.cpp:262
+msgid "My Favourites"
+msgstr ""
+
+#: src/guiMultiplayerMenu.cpp:265
+msgid "Server List"
+msgstr ""
+
+#: src/guiMultiplayerMenu.cpp:270
+msgid "Get New List"
+msgstr ""
+
+#: src/guiMultiplayerMenu.cpp:307
+msgid "Remove from Favourites"
+msgstr ""
+
 #: src/guiPasswordChange.cpp:105
 msgid "Old Password"
 msgstr "Mật mã cũ"
@@ -3753,11 +3832,11 @@ msgstr "Đi tới"
 msgid "Backward"
 msgstr "Đi lùi"
 
-#: src/guiSettingsMenu.cpp:72 src/keycode.cpp:234
+#: src/guiSettingsMenu.cpp:72 src/keycode.cpp:263
 msgid "Left"
 msgstr "Đi trái"
 
-#: src/guiSettingsMenu.cpp:73 src/keycode.cpp:234
+#: src/guiSettingsMenu.cpp:73 src/keycode.cpp:265
 msgid "Right"
 msgstr "Đi phải"
 
@@ -3793,11 +3872,11 @@ msgstr "Chọn phạm vi nhìn"
 msgid "Toggle Fly"
 msgstr "Bật/tắt khả năng để bay"
 
-#: src/guiSettingsMenu.cpp:82 src/keycode.cpp:234
+#: src/guiSettingsMenu.cpp:82 src/keycode.cpp:264
 msgid "Up"
 msgstr "Đi lên"
 
-#: src/guiSettingsMenu.cpp:83 src/keycode.cpp:234
+#: src/guiSettingsMenu.cpp:83 src/keycode.cpp:266
 msgid "Down"
 msgstr "Đi xuống"
 
@@ -3841,10 +3920,6 @@ msgstr "Đồ trước"
 msgid "Next Item"
 msgstr "Đồ sau"
 
-#: src/guiSettingsMenu.cpp:277
-msgid "Main Menu"
-msgstr "Bảng chọn chính"
-
 #: src/guiSettingsMenu.cpp:284 src/guiSettingsMenu.cpp:311
 msgid "Controls"
 msgstr "Quyền năng trò chơi"
@@ -3952,362 +4027,576 @@ msgstr "Tăng năng lượng: %d:%02d"
 msgid "Cold Protection: %d:%02d"
 msgstr "Bảo vệ lạnh: %d:%02d"
 
-#: src/inventory.cpp:230 src/inventory.cpp:352
-msgid "Cookable: Yes"
-msgstr "Được nấu: được"
-
-#: src/inventory.cpp:235 src/inventory.cpp:357 src/inventory.cpp:532
-msgid "Fuel Burn Time: "
-msgstr "Giờ cháy thiêu chất đốt:"
-
-#: src/inventory.cpp:321
-msgid "Hunger: "
-msgstr "Sự đói:"
-
-#: src/inventory.cpp:327
-msgid "Health: "
-msgstr "Sức khoẻ:"
-
-#: src/inventory.cpp:334
-msgid "Cold Protection: "
-msgstr "Bảo vệ lạnh:"
-
-#: src/inventory.cpp:343
-msgid "Energy Boost: "
-msgstr "Tăng năng lượng:"
-
-#: src/inventory.cpp:521
-msgid "Strength: "
-msgstr "Sức mạnh:"
-
-#: src/inventory.cpp:524
-msgid "Speed: "
-msgstr "Tốc độ:"
-
-#: src/inventory.cpp:527
-msgid "Level: "
-msgstr "Trình độ:"
-
-#: src/inventory.cpp:557
+#: src/inventory.cpp:246 src/inventory.cpp:580
 msgid "Contains: "
 msgstr ""
 
-#: src/inventory.cpp:643
+#: src/inventory.cpp:253 src/inventory.cpp:375
+msgid "Cookable: Yes"
+msgstr "Được nấu: được"
+
+#: src/inventory.cpp:258 src/inventory.cpp:380 src/inventory.cpp:555
+msgid "Fuel Burn Time: "
+msgstr "Giờ cháy thiêu chất đốt:"
+
+#: src/inventory.cpp:344
+msgid "Hunger: "
+msgstr "Sự đói:"
+
+#: src/inventory.cpp:350
+msgid "Health: "
+msgstr "Sức khoẻ:"
+
+#: src/inventory.cpp:357
+msgid "Cold Protection: "
+msgstr "Bảo vệ lạnh:"
+
+#: src/inventory.cpp:366
+msgid "Energy Boost: "
+msgstr "Tăng năng lượng:"
+
+#: src/inventory.cpp:544
+msgid "Strength: "
+msgstr "Sức mạnh:"
+
+#: src/inventory.cpp:547
+msgid "Speed: "
+msgstr "Tốc độ:"
+
+#: src/inventory.cpp:550
+msgid "Level: "
+msgstr "Trình độ:"
+
+#: src/inventory.cpp:666
 msgid "Armour: "
 msgstr "Áo giáp:"
 
-#: src/inventory.cpp:649
+#: src/inventory.cpp:672
 msgid "Warmth: "
 msgstr "Hơi nóng:"
 
-#: src/inventory.cpp:655
+#: src/inventory.cpp:678
 msgid "Pressure: "
 msgstr "Áp lực:"
 
-#: src/inventory.cpp:661
+#: src/inventory.cpp:684
 msgid "Suffocation: "
 msgstr "Sự nghẹt thở:"
 
-#: src/inventory.cpp:667
+#: src/inventory.cpp:690
 msgid "Durability: "
 msgstr "Tính bền:"
 
-#: src/inventory.cpp:672
+#: src/inventory.cpp:695
 msgid "Effect Boost: "
 msgstr "Tăng tác dụng"
 
-#: src/keycode.cpp:229
+#: src/keycode.cpp:232
+msgid "-"
+msgstr ""
+
+#: src/keycode.cpp:234
 msgid "Left Button"
 msgstr "Nút trái chuột máy tính"
 
-#: src/keycode.cpp:229
-msgid "Middle Button"
-msgstr "Nút giữa chuột máy tính"
-
-#: src/keycode.cpp:229
+#: src/keycode.cpp:235
 msgid "Right Button"
 msgstr "Nút phải chuột máy tính"
 
-#: src/keycode.cpp:229
+#: src/keycode.cpp:237
+msgid "Middle Button"
+msgstr "Nút giữa chuột máy tính"
+
+#: src/keycode.cpp:238
 msgid "X Button 1"
 msgstr "Nút X 1"
 
-#: src/keycode.cpp:230
-msgid "Back"
-msgstr "Lại"
-
-#: src/keycode.cpp:230
-msgid "Clear"
-msgstr "Diệt trừ"
-
-#: src/keycode.cpp:230
-msgid "Return"
-msgstr "Enter"
-
-#: src/keycode.cpp:230
-msgid "Tab"
-msgstr "Tab"
-
-#: src/keycode.cpp:230
+#: src/keycode.cpp:239
 msgid "X Button 2"
 msgstr "Nút X 2"
 
-#: src/keycode.cpp:231
-msgid "Capital"
-msgstr "Chữ viết hoa"
+#: src/keycode.cpp:240
+msgid "Back"
+msgstr "Lại"
 
-#: src/keycode.cpp:231
-msgid "Control"
-msgstr "Control"
+#: src/keycode.cpp:241
+msgid "Tab"
+msgstr "Tab"
 
-#: src/keycode.cpp:231
-msgid "Kana"
-msgstr "Kana"
+#: src/keycode.cpp:242
+msgid "Clear"
+msgstr "Diệt trừ"
 
-#: src/keycode.cpp:231
-msgid "Menu"
-msgstr "Bảng chọn"
+#: src/keycode.cpp:243
+msgid "Return"
+msgstr "Enter"
 
-#: src/keycode.cpp:231
-msgid "Pause"
-msgstr "Pause"
-
-#: src/keycode.cpp:231
+#: src/keycode.cpp:244
 msgid "Shift"
 msgstr "Shift"
 
-#: src/keycode.cpp:232
-msgid "Convert"
-msgstr "Đổi"
+#: src/keycode.cpp:245
+msgid "Control"
+msgstr "Control"
 
-#: src/keycode.cpp:232
-msgid "Escape"
-msgstr "Escape"
+#: src/keycode.cpp:246
+msgid "Menu"
+msgstr "Bảng chọn"
 
-#: src/keycode.cpp:232
-msgid "Final"
-msgstr "Cuối cùng"
+#: src/keycode.cpp:247
+msgid "Pause"
+msgstr "Pause"
 
-#: src/keycode.cpp:232
+#: src/keycode.cpp:248
+msgid "Capital"
+msgstr "Chữ viết hoa"
+
+#: src/keycode.cpp:249
+msgid "Kana"
+msgstr "Kana"
+
+#: src/keycode.cpp:250
 msgid "Junja"
 msgstr "Junja"
 
-#: src/keycode.cpp:232
+#: src/keycode.cpp:251
+msgid "Final"
+msgstr "Cuối cùng"
+
+#: src/keycode.cpp:252
 msgid "Kanji"
 msgstr "Kanji"
 
-#: src/keycode.cpp:232
+#: src/keycode.cpp:253
+msgid "Escape"
+msgstr "Escape"
+
+#: src/keycode.cpp:254
+msgid "Convert"
+msgstr "Đổi"
+
+#: src/keycode.cpp:255
 msgid "Nonconvert"
 msgstr "Không đổi"
 
-#: src/keycode.cpp:233
+#: src/keycode.cpp:256
 msgid "Accept"
 msgstr "Nhận"
 
-#: src/keycode.cpp:233
-msgid "End"
-msgstr "End"
-
-#: src/keycode.cpp:233
-msgid "Home"
-msgstr "Home"
-
-#: src/keycode.cpp:233
+#: src/keycode.cpp:257
 msgid "Mode Change"
 msgstr "Thay đổi cách"
 
-#: src/keycode.cpp:233
-msgid "Next"
-msgstr "Tiếp sau"
-
-#: src/keycode.cpp:233
-msgid "Prior"
-msgstr "Trước"
-
-#: src/keycode.cpp:233
+#: src/keycode.cpp:258
 msgid "Space"
 msgstr "Space"
 
-#: src/keycode.cpp:234
-msgid "Execute"
-msgstr "Thi hành"
+#: src/keycode.cpp:259
+msgid "Prior"
+msgstr "Trước"
 
-#: src/keycode.cpp:234
-msgid "Print"
-msgstr "In"
+#: src/keycode.cpp:260
+msgid "Next"
+msgstr "Tiếp sau"
 
-#: src/keycode.cpp:234
+#: src/keycode.cpp:261
+msgid "End"
+msgstr "End"
+
+#: src/keycode.cpp:262
+msgid "Home"
+msgstr "Home"
+
+#: src/keycode.cpp:267
 msgid "Select"
 msgstr "Chọn"
 
-#: src/keycode.cpp:235
-msgid "Delete"
-msgstr "Delete/xoá"
+#: src/keycode.cpp:268
+msgid "Print"
+msgstr "In"
 
-#: src/keycode.cpp:235
-msgid "Help"
-msgstr "Sự giúp"
+#: src/keycode.cpp:269
+msgid "Execute"
+msgstr "Thi hành"
 
-#: src/keycode.cpp:235
-msgid "Insert"
-msgstr "Insert"
-
-#: src/keycode.cpp:235
+#: src/keycode.cpp:270
 msgid "Snapshot"
 msgstr "Chụp hình"
 
-#: src/keycode.cpp:238
+#: src/keycode.cpp:271
+msgid "Insert"
+msgstr "Insert"
+
+#: src/keycode.cpp:272
+msgid "Delete"
+msgstr "Delete/xoá"
+
+#: src/keycode.cpp:273
+msgid "Help"
+msgstr "Sự giúp"
+
+#: src/keycode.cpp:274
+msgid "0"
+msgstr ""
+
+#: src/keycode.cpp:275
+msgid "1"
+msgstr ""
+
+#: src/keycode.cpp:276
+msgid "2"
+msgstr ""
+
+#: src/keycode.cpp:277
+msgid "3"
+msgstr ""
+
+#: src/keycode.cpp:278
+msgid "4"
+msgstr ""
+
+#: src/keycode.cpp:279
+msgid "5"
+msgstr ""
+
+#: src/keycode.cpp:280
+msgid "6"
+msgstr ""
+
+#: src/keycode.cpp:281
+msgid "7"
+msgstr ""
+
+#: src/keycode.cpp:282
+msgid "8"
+msgstr ""
+
+#: src/keycode.cpp:283
+msgid "9"
+msgstr ""
+
+#: src/keycode.cpp:284
+msgid "A"
+msgstr ""
+
+#: src/keycode.cpp:285
+msgid "B"
+msgstr ""
+
+#: src/keycode.cpp:286
+msgid "C"
+msgstr ""
+
+#: src/keycode.cpp:287
+msgid "D"
+msgstr ""
+
+#: src/keycode.cpp:288
+msgid "E"
+msgstr ""
+
+#: src/keycode.cpp:289
+msgid "F"
+msgstr ""
+
+#: src/keycode.cpp:290
+msgid "G"
+msgstr ""
+
+#: src/keycode.cpp:291
+msgid "H"
+msgstr ""
+
+#: src/keycode.cpp:292
+msgid "I"
+msgstr ""
+
+#: src/keycode.cpp:293
+msgid "J"
+msgstr ""
+
+#: src/keycode.cpp:294
+msgid "K"
+msgstr ""
+
+#: src/keycode.cpp:295
+msgid "L"
+msgstr ""
+
+#: src/keycode.cpp:296
+msgid "M"
+msgstr ""
+
+#: src/keycode.cpp:297
+msgid "N"
+msgstr ""
+
+#: src/keycode.cpp:298
+msgid "O"
+msgstr ""
+
+#: src/keycode.cpp:299
+msgid "P"
+msgstr ""
+
+#: src/keycode.cpp:300
+msgid "Q"
+msgstr ""
+
+#: src/keycode.cpp:301
+msgid "R"
+msgstr ""
+
+#: src/keycode.cpp:302
+msgid "S"
+msgstr ""
+
+#: src/keycode.cpp:303
+msgid "T"
+msgstr ""
+
+#: src/keycode.cpp:304
+#, fuzzy
+msgid "U"
+msgstr "Đi lên"
+
+#: src/keycode.cpp:305
+msgid "V"
+msgstr ""
+
+#: src/keycode.cpp:306
+msgid "W"
+msgstr ""
+
+#: src/keycode.cpp:307
+msgid "X"
+msgstr ""
+
+#: src/keycode.cpp:308
+msgid "Y"
+msgstr ""
+
+#: src/keycode.cpp:309
+msgid "Z"
+msgstr ""
+
+#: src/keycode.cpp:310
 msgid "Left Windows"
 msgstr "Nút Windows trái"
 
-#: src/keycode.cpp:239
-msgid "Apps"
-msgstr "Các ứng dụng"
-
-#: src/keycode.cpp:239
-msgid "Numpad 0"
-msgstr "Nút phím số 0"
-
-#: src/keycode.cpp:239
-msgid "Numpad 1"
-msgstr "Nút phím số 1"
-
-#: src/keycode.cpp:239
+#: src/keycode.cpp:311
 msgid "Right Windows"
 msgstr "Nút Windows phải"
 
-#: src/keycode.cpp:239
+#: src/keycode.cpp:312
+msgid "Apps"
+msgstr "Các ứng dụng"
+
+#: src/keycode.cpp:313
 msgid "Sleep"
 msgstr "Ngủ"
 
-#: src/keycode.cpp:240
+#: src/keycode.cpp:314
+msgid "Numpad 0"
+msgstr "Nút phím số 0"
+
+#: src/keycode.cpp:315
+msgid "Numpad 1"
+msgstr "Nút phím số 1"
+
+#: src/keycode.cpp:316
 msgid "Numpad 2"
 msgstr "Nút phím số 2"
 
-#: src/keycode.cpp:240
+#: src/keycode.cpp:317
 msgid "Numpad 3"
 msgstr "Nút phím số 3"
 
-#: src/keycode.cpp:240
+#: src/keycode.cpp:318
 msgid "Numpad 4"
 msgstr "Nút phím số 4"
 
-#: src/keycode.cpp:240
+#: src/keycode.cpp:319
 msgid "Numpad 5"
 msgstr "Nút phím số 5"
 
-#: src/keycode.cpp:240
+#: src/keycode.cpp:320
 msgid "Numpad 6"
 msgstr "Nút phím số 6"
 
-#: src/keycode.cpp:240
+#: src/keycode.cpp:321
 msgid "Numpad 7"
 msgstr "Nút phím số 7"
 
-#: src/keycode.cpp:241
-msgid "Numpad *"
-msgstr "Nút * trên phím số"
-
-#: src/keycode.cpp:241
-msgid "Numpad +"
-msgstr "Nút + trên phím số"
-
-#: src/keycode.cpp:241
-msgid "Numpad -"
-msgstr "Nút - trên phím số"
-
-#: src/keycode.cpp:241
-msgid "Numpad /"
-msgstr "Nút / trên phím số"
-
-#: src/keycode.cpp:241
+#: src/keycode.cpp:322
 msgid "Numpad 8"
 msgstr "Nút phím số 8"
 
-#: src/keycode.cpp:241
+#: src/keycode.cpp:323
 msgid "Numpad 9"
 msgstr "Nút phím số 9"
 
-#: src/keycode.cpp:245
+#: src/keycode.cpp:324
+msgid "Numpad *"
+msgstr "Nút * trên phím số"
+
+#: src/keycode.cpp:325
+msgid "Numpad +"
+msgstr "Nút + trên phím số"
+
+#: src/keycode.cpp:326 src/keycode.cpp:329
+msgid "Numpad /"
+msgstr "Nút / trên phím số"
+
+#: src/keycode.cpp:327
+msgid "Numpad -"
+msgstr "Nút - trên phím số"
+
+#: src/keycode.cpp:328
+#, fuzzy
+msgid "Numpad ."
+msgstr "Nút phím số 0"
+
+#: src/keycode.cpp:330
+msgid "F10"
+msgstr ""
+
+#: src/keycode.cpp:331
+msgid "F11"
+msgstr ""
+
+#: src/keycode.cpp:332
+msgid "F12"
+msgstr ""
+
+#: src/keycode.cpp:333
+msgid "F13"
+msgstr ""
+
+#: src/keycode.cpp:334
+msgid "F14"
+msgstr ""
+
+#: src/keycode.cpp:335
+msgid "F15"
+msgstr ""
+
+#: src/keycode.cpp:336
+msgid "F16"
+msgstr ""
+
+#: src/keycode.cpp:337
+msgid "F17"
+msgstr ""
+
+#: src/keycode.cpp:338
+msgid "F18"
+msgstr ""
+
+#: src/keycode.cpp:339
+msgid "F19"
+msgstr ""
+
+#: src/keycode.cpp:340
+msgid "F20"
+msgstr ""
+
+#: src/keycode.cpp:341
+msgid "F21"
+msgstr ""
+
+#: src/keycode.cpp:342
+msgid "F22"
+msgstr ""
+
+#: src/keycode.cpp:343
+msgid "F23"
+msgstr ""
+
+#: src/keycode.cpp:344
+msgid "F24"
+msgstr ""
+
+#: src/keycode.cpp:345
 msgid "Num Lock"
 msgstr "Nút bật phím số Num Lock"
 
-#: src/keycode.cpp:245
+#: src/keycode.cpp:346
 msgid "Scroll Lock"
 msgstr "Scroll Lock"
 
-#: src/keycode.cpp:246
+#: src/keycode.cpp:347
 msgid "Left Shift"
 msgstr "Nút Shift trái"
 
-#: src/keycode.cpp:246
+#: src/keycode.cpp:348
 msgid "Right Shift"
 msgstr "Nút Shift phải"
 
-#: src/keycode.cpp:247
+#: src/keycode.cpp:349
 msgid "Left Control"
 msgstr "Nút Control trái"
 
-#: src/keycode.cpp:247
-msgid "Left Menu"
-msgstr "Nút Menu trái"
-
-#: src/keycode.cpp:247
+#: src/keycode.cpp:350
 msgid "Right Control"
 msgstr "Nút Control phải"
 
-#: src/keycode.cpp:247
+#: src/keycode.cpp:351
+msgid "Left Menu"
+msgstr "Nút Menu trái"
+
+#: src/keycode.cpp:352
 msgid "Right Menu"
 msgstr "Nút Control phải"
 
-#: src/keycode.cpp:249
-msgid "Comma"
-msgstr "Dấu phẩy"
-
-#: src/keycode.cpp:249
-msgid "Minus"
-msgstr "Dấu trừ"
-
-#: src/keycode.cpp:249
-msgid "Period"
-msgstr "Dấu chấm"
-
-#: src/keycode.cpp:249
+#: src/keycode.cpp:353
 msgid "Plus"
 msgstr "Dấu cộng"
 
-#: src/keycode.cpp:253
+#: src/keycode.cpp:354
+msgid "Comma"
+msgstr "Dấu phẩy"
+
+#: src/keycode.cpp:355
+msgid "Minus"
+msgstr "Dấu trừ"
+
+#: src/keycode.cpp:356
+msgid "Period"
+msgstr "Dấu chấm"
+
+#: src/keycode.cpp:357
 msgid "Attn"
 msgstr "Attn"
 
-#: src/keycode.cpp:253
+#: src/keycode.cpp:358
 msgid "CrSel"
 msgstr "CrSel"
 
-#: src/keycode.cpp:254
-msgid "Erase OEF"
-msgstr "Xóa OEF"
-
-#: src/keycode.cpp:254
+#: src/keycode.cpp:359
 msgid "ExSel"
 msgstr "ExSel"
 
-#: src/keycode.cpp:254
-msgid "OEM Clear"
-msgstr "OEM Clear"
+#: src/keycode.cpp:360
+msgid "Erase OEF"
+msgstr "Xóa OEF"
 
-#: src/keycode.cpp:254
-msgid "PA1"
-msgstr "PA1"
-
-#: src/keycode.cpp:254
+#: src/keycode.cpp:361
 msgid "Play"
 msgstr "Chơi"
 
-#: src/keycode.cpp:254
+#: src/keycode.cpp:362
 msgid "Zoom"
 msgstr "Phóng to"
 
+#: src/keycode.cpp:363
+msgid "PA1"
+msgstr "PA1"
+
+#: src/keycode.cpp:364
+msgid "OEM Clear"
+msgstr "OEM Clear"
+
 #: src/main.cpp:1131
 msgid "Setting Up UI"
 msgstr "Đang xếp đặt giao diện sử dụng"
@@ -4324,30 +4613,70 @@ msgstr "Đang tải sinh vật và động vật"
 msgid "Setting Up Sound"
 msgstr "Đang xếp đặt âm thanh"
 
-#: src/mapnode.cpp:282
+#: src/mapnode.cpp:285
 msgid "Loading Base MapNodes"
 msgstr "Đang tải MapNodes căn bản"
 
-#: src/mapnode.cpp:286
+#: src/mapnode.cpp:289
 msgid "Loading Circuit MapNodes"
 msgstr "Đang tải MapNodes mạch điện"
 
-#: src/mapnode.cpp:290
+#: src/mapnode.cpp:293
 msgid "Loading Plant MapNodes"
 msgstr "Đang tải MapNodes cây cối"
 
-#: src/mapnode.cpp:294
+#: src/mapnode.cpp:297
 msgid "Loading Farming MapNodes"
 msgstr "Đang tải MapNodes nông nghiệp"
 
-#: src/mapnode.cpp:298
+#: src/mapnode.cpp:301
 msgid "Loading Decorative MapNodes"
 msgstr "Đang tải MapNodes trang trí"
 
-#: src/mapnode.cpp:302
+#: src/mapnode.cpp:305
 msgid "Loading Interactive MapNodes"
 msgstr "Đang tải MapNodes tương tác"
 
-#: src/mapnode.cpp:306
+#: src/mapnode.cpp:309
 msgid "Loading Special MapNodes"
 msgstr "Đang tải MapNodes đặc biệt"
+
+#: src/mineral.cpp:93
+#, fuzzy
+msgid "Coal"
+msgstr "Cục than đá"
+
+#: src/mineral.cpp:99
+#, fuzzy
+msgid "Iron"
+msgstr "Cục sắt"
+
+#: src/mineral.cpp:106
+#, fuzzy
+msgid "Tin"
+msgstr "Mỏng hơn"
+
+#: src/mineral.cpp:113
+#, fuzzy
+msgid "Copper"
+msgstr "Cục đồng"
+
+#: src/mineral.cpp:121
+#, fuzzy
+msgid "Silver"
+msgstr "Cục bạc"
+
+#: src/mineral.cpp:128
+#, fuzzy
+msgid "Gold"
+msgstr "Cục vàng"
+
+#: src/mineral.cpp:135
+#, fuzzy
+msgid "Quartz"
+msgstr "Bụi thạch anh"
+
+#: src/mineral.cpp:157
+#, fuzzy
+msgid "Turquoise"
+msgstr "Ngọc lam"
diff --git a/po/voxelands.pot b/po/voxelands.pot
index 277c3b8..bbc1dab 100644
--- a/po/voxelands.pot
+++ b/po/voxelands.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: voxelands\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-10-19 01:55+1000\n"
+"POT-Creation-Date: 2015-12-21 11:27+1000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -267,7 +267,7 @@ msgstr ""
 msgid "Done"
 msgstr ""
 
-#: src/character_creator.cpp:423 src/keycode.cpp:229
+#: src/character_creator.cpp:423 src/keycode.cpp:236
 msgid "Cancel"
 msgstr ""
 
@@ -1119,7 +1119,7 @@ msgstr ""
 msgid "Steel Ingot"
 msgstr ""
 
-#: src/content_craftitem.cpp:225 src/content_mapnode.cpp:710
+#: src/content_craftitem.cpp:225 src/content_mapnode.cpp:723
 msgid "Brick"
 msgstr ""
 
@@ -1547,11 +1547,11 @@ msgstr ""
 msgid "Unbound Mithril"
 msgstr ""
 
-#: src/content_craftitem.cpp:1516
+#: src/content_craftitem.cpp:1516 src/mineral.cpp:142
 msgid "Mithril"
 msgstr ""
 
-#: src/content_craftitem.cpp:1525
+#: src/content_craftitem.cpp:1525 src/mineral.cpp:149
 msgid "Ruby"
 msgstr ""
 
@@ -1559,15 +1559,15 @@ msgstr ""
 msgid "Turquiose"
 msgstr ""
 
-#: src/content_craftitem.cpp:1541
+#: src/content_craftitem.cpp:1541 src/mineral.cpp:165
 msgid "Amethyst"
 msgstr ""
 
-#: src/content_craftitem.cpp:1549
+#: src/content_craftitem.cpp:1549 src/mineral.cpp:173
 msgid "Sapphire"
 msgstr ""
 
-#: src/content_craftitem.cpp:1557
+#: src/content_craftitem.cpp:1557 src/mineral.cpp:181
 msgid "Sunstone"
 msgstr ""
 
@@ -1579,392 +1579,396 @@ msgstr ""
 msgid "Limestone"
 msgstr ""
 
-#: src/content_mapnode.cpp:219
+#: src/content_mapnode.cpp:221
+msgid "Marble"
+msgstr ""
+
+#: src/content_mapnode.cpp:232
 msgid "Rock"
 msgstr ""
 
-#: src/content_mapnode.cpp:241
+#: src/content_mapnode.cpp:254
 msgid "Ice"
 msgstr ""
 
-#: src/content_mapnode.cpp:257
+#: src/content_mapnode.cpp:270
 msgid "Coal Block"
 msgstr ""
 
-#: src/content_mapnode.cpp:274
+#: src/content_mapnode.cpp:287
 msgid "Charcoal Block"
 msgstr ""
 
-#: src/content_mapnode.cpp:291
+#: src/content_mapnode.cpp:304
 msgid "Stone Brick"
 msgstr ""
 
-#: src/content_mapnode.cpp:305
+#: src/content_mapnode.cpp:318
 msgid "Stone Block"
 msgstr ""
 
-#: src/content_mapnode.cpp:319
+#: src/content_mapnode.cpp:332
 msgid "Rough Stone Brick"
 msgstr ""
 
-#: src/content_mapnode.cpp:336
+#: src/content_mapnode.cpp:349
 msgid "Rough Stone Block"
 msgstr ""
 
-#: src/content_mapnode.cpp:352 src/content_mapnode.cpp:385
-#: src/content_mapnode.cpp:399 src/content_mapnode.cpp:432
+#: src/content_mapnode.cpp:365 src/content_mapnode.cpp:398
+#: src/content_mapnode.cpp:412 src/content_mapnode.cpp:445
 msgid "Grass"
 msgstr ""
 
-#: src/content_mapnode.cpp:370 src/content_mapnode.cpp:417
+#: src/content_mapnode.cpp:383 src/content_mapnode.cpp:430
 msgid "Growing Grass"
 msgstr ""
 
-#: src/content_mapnode.cpp:446
+#: src/content_mapnode.cpp:459
 msgid "Muddy Snow"
 msgstr ""
 
-#: src/content_mapnode.cpp:462
+#: src/content_mapnode.cpp:475
 msgid "Mud"
 msgstr ""
 
-#: src/content_mapnode.cpp:478
+#: src/content_mapnode.cpp:491
 msgid "Ash Block"
 msgstr ""
 
-#: src/content_mapnode.cpp:493
+#: src/content_mapnode.cpp:506
 msgid "Sand"
 msgstr ""
 
-#: src/content_mapnode.cpp:512
+#: src/content_mapnode.cpp:525
 msgid "Gravel"
 msgstr ""
 
-#: src/content_mapnode.cpp:529
+#: src/content_mapnode.cpp:542
 msgid "Sand Stone"
 msgstr ""
 
-#: src/content_mapnode.cpp:544
+#: src/content_mapnode.cpp:557
 msgid "Sand Stone Bricks"
 msgstr ""
 
-#: src/content_mapnode.cpp:559
+#: src/content_mapnode.cpp:572
 msgid "Sand Stone Blocks"
 msgstr ""
 
-#: src/content_mapnode.cpp:574
+#: src/content_mapnode.cpp:587
 msgid "Clay"
 msgstr ""
 
-#: src/content_mapnode.cpp:591
+#: src/content_mapnode.cpp:604
 msgid "Blue Clay"
 msgstr ""
 
-#: src/content_mapnode.cpp:608
+#: src/content_mapnode.cpp:621
 msgid "Green Clay"
 msgstr ""
 
-#: src/content_mapnode.cpp:625
+#: src/content_mapnode.cpp:638
 msgid "Orange Clay"
 msgstr ""
 
-#: src/content_mapnode.cpp:642
+#: src/content_mapnode.cpp:655
 msgid "Purple Clay"
 msgstr ""
 
-#: src/content_mapnode.cpp:659
+#: src/content_mapnode.cpp:672
 msgid "Red Clay"
 msgstr ""
 
-#: src/content_mapnode.cpp:676
+#: src/content_mapnode.cpp:689
 msgid "Yellow Clay"
 msgstr ""
 
-#: src/content_mapnode.cpp:693
+#: src/content_mapnode.cpp:706
 msgid "Black Clay"
 msgstr ""
 
-#: src/content_mapnode.cpp:729
+#: src/content_mapnode.cpp:742
 msgid "Terracotta"
 msgstr ""
 
-#: src/content_mapnode.cpp:741
+#: src/content_mapnode.cpp:754
 msgid "Terracotta Brick"
 msgstr ""
 
-#: src/content_mapnode.cpp:755
+#: src/content_mapnode.cpp:768
 msgid "Terracotta Block"
 msgstr ""
 
-#: src/content_mapnode.cpp:769
+#: src/content_mapnode.cpp:782
 msgid "Terracotta Tile"
 msgstr ""
 
-#: src/content_mapnode.cpp:789
+#: src/content_mapnode.cpp:802
 msgid "Glass"
 msgstr ""
 
-#: src/content_mapnode.cpp:809
+#: src/content_mapnode.cpp:822
 msgid "Blue Glass"
 msgstr ""
 
-#: src/content_mapnode.cpp:831
+#: src/content_mapnode.cpp:844
 msgid "Green Glass"
 msgstr ""
 
-#: src/content_mapnode.cpp:853
+#: src/content_mapnode.cpp:866
 msgid "Orange Glass"
 msgstr ""
 
-#: src/content_mapnode.cpp:875
+#: src/content_mapnode.cpp:888
 msgid "Purple Glass"
 msgstr ""
 
-#: src/content_mapnode.cpp:897
+#: src/content_mapnode.cpp:910
 msgid "Red Glass"
 msgstr ""
 
-#: src/content_mapnode.cpp:919
+#: src/content_mapnode.cpp:932
 msgid "Yellow Glass"
 msgstr ""
 
-#: src/content_mapnode.cpp:941
+#: src/content_mapnode.cpp:954
 msgid "Black Glass"
 msgstr ""
 
-#: src/content_mapnode.cpp:963
+#: src/content_mapnode.cpp:976
 msgid "Glass Pane"
 msgstr ""
 
-#: src/content_mapnode.cpp:997
+#: src/content_mapnode.cpp:1010
 msgid "Blue Glass Pane"
 msgstr ""
 
-#: src/content_mapnode.cpp:1032
+#: src/content_mapnode.cpp:1045
 msgid "Green Glass Pane"
 msgstr ""
 
-#: src/content_mapnode.cpp:1067
+#: src/content_mapnode.cpp:1080
 msgid "Orange Glass Pane"
 msgstr ""
 
-#: src/content_mapnode.cpp:1102
+#: src/content_mapnode.cpp:1115
 msgid "Purple Glass Pane"
 msgstr ""
 
-#: src/content_mapnode.cpp:1137
+#: src/content_mapnode.cpp:1150
 msgid "Red Glass Pane"
 msgstr ""
 
-#: src/content_mapnode.cpp:1172
+#: src/content_mapnode.cpp:1185
 msgid "Yellow Glass Pane"
 msgstr ""
 
-#: src/content_mapnode.cpp:1207
+#: src/content_mapnode.cpp:1220
 msgid "Black Glass Pane"
 msgstr ""
 
-#: src/content_mapnode.cpp:1242 src/content_mapnode_farm.cpp:333
+#: src/content_mapnode.cpp:1255 src/content_mapnode_farm.cpp:333
 msgid "Glass Light"
 msgstr ""
 
-#: src/content_mapnode.cpp:1265
+#: src/content_mapnode.cpp:1278
 msgid "Wood"
 msgstr ""
 
-#: src/content_mapnode.cpp:1291
+#: src/content_mapnode.cpp:1304
 msgid "Jungle Wood"
 msgstr ""
 
-#: src/content_mapnode.cpp:1316
+#: src/content_mapnode.cpp:1329
 msgid "Pine"
 msgstr ""
 
-#: src/content_mapnode.cpp:1341
+#: src/content_mapnode.cpp:1354
 msgid "Sponge"
 msgstr ""
 
-#: src/content_mapnode.cpp:1356
+#: src/content_mapnode.cpp:1369
 msgid "Waterlogged Sponge"
 msgstr ""
 
-#: src/content_mapnode.cpp:1371
+#: src/content_mapnode.cpp:1384
 msgid "Hay Bale"
 msgstr ""
 
-#: src/content_mapnode.cpp:1388
+#: src/content_mapnode.cpp:1401
 msgid "Raw Apple Pie"
 msgstr ""
 
-#: src/content_mapnode.cpp:1417
+#: src/content_mapnode.cpp:1430
 msgid "Apple Pie"
 msgstr ""
 
-#: src/content_mapnode.cpp:1512
+#: src/content_mapnode.cpp:1525
 msgid "Raw Pumpkin Pie"
 msgstr ""
 
-#: src/content_mapnode.cpp:1541
+#: src/content_mapnode.cpp:1554
 msgid "Pumpkin Pie"
 msgstr ""
 
-#: src/content_mapnode.cpp:1636 src/content_mapnode.cpp:1715
+#: src/content_mapnode.cpp:1649 src/content_mapnode.cpp:1728
 msgid "Snow"
 msgstr ""
 
-#: src/content_mapnode.cpp:1652
+#: src/content_mapnode.cpp:1665
 msgid "Snowman"
 msgstr ""
 
-#: src/content_mapnode.cpp:1738 src/content_mapnode_farm.cpp:445
+#: src/content_mapnode.cpp:1752 src/content_mapnode_farm.cpp:445
 msgid "Cotton"
 msgstr ""
 
-#: src/content_mapnode.cpp:1769
+#: src/content_mapnode.cpp:1783
 msgid "Blue Cotton"
 msgstr ""
 
-#: src/content_mapnode.cpp:1786
+#: src/content_mapnode.cpp:1800
 msgid "Green Cotton"
 msgstr ""
 
-#: src/content_mapnode.cpp:1803
+#: src/content_mapnode.cpp:1817
 msgid "Orange Cotton"
 msgstr ""
 
-#: src/content_mapnode.cpp:1820
+#: src/content_mapnode.cpp:1834
 msgid "Purple Cotton"
 msgstr ""
 
-#: src/content_mapnode.cpp:1837
+#: src/content_mapnode.cpp:1851
 msgid "Red Cotton"
 msgstr ""
 
-#: src/content_mapnode.cpp:1854
+#: src/content_mapnode.cpp:1868
 msgid "Yellow Cotton"
 msgstr ""
 
-#: src/content_mapnode.cpp:1871
+#: src/content_mapnode.cpp:1885
 msgid "Black Cotton"
 msgstr ""
 
-#: src/content_mapnode.cpp:1888
+#: src/content_mapnode.cpp:1902
 msgid "Carpet"
 msgstr ""
 
-#: src/content_mapnode.cpp:1911
+#: src/content_mapnode.cpp:1925
 msgid "Blue Carpet"
 msgstr ""
 
-#: src/content_mapnode.cpp:1935
+#: src/content_mapnode.cpp:1949
 msgid "Green Carpet"
 msgstr ""
 
-#: src/content_mapnode.cpp:1959
+#: src/content_mapnode.cpp:1973
 msgid "Orange Carpet"
 msgstr ""
 
-#: src/content_mapnode.cpp:1983
+#: src/content_mapnode.cpp:1997
 msgid "Purple Carpet"
 msgstr ""
 
-#: src/content_mapnode.cpp:2007
+#: src/content_mapnode.cpp:2021
 msgid "Red Carpet"
 msgstr ""
 
-#: src/content_mapnode.cpp:2031
+#: src/content_mapnode.cpp:2045
 msgid "Yellow Carpet"
 msgstr ""
 
-#: src/content_mapnode.cpp:2055
+#: src/content_mapnode.cpp:2069
 msgid "Black Carpet"
 msgstr ""
 
-#: src/content_mapnode.cpp:2079
+#: src/content_mapnode.cpp:2093
 msgid "Air"
 msgstr ""
 
-#: src/content_mapnode.cpp:2095
+#: src/content_mapnode.cpp:2109
 msgid "Vacuum"
 msgstr ""
 
-#: src/content_mapnode.cpp:2112 src/content_mapnode.cpp:2142
+#: src/content_mapnode.cpp:2126 src/content_mapnode.cpp:2156
 msgid "Water"
 msgstr ""
 
-#: src/content_mapnode.cpp:2172 src/content_mapnode.cpp:2200
+#: src/content_mapnode.cpp:2186 src/content_mapnode.cpp:2214
 msgid "Lava"
 msgstr ""
 
-#: src/content_mapnode.cpp:2231
+#: src/content_mapnode.cpp:2245
 msgid "Rough Stone"
 msgstr ""
 
-#: src/content_mapnode.cpp:2248
+#: src/content_mapnode.cpp:2262
 msgid "Cobble Stone"
 msgstr ""
 
-#: src/content_mapnode.cpp:2264
+#: src/content_mapnode.cpp:2278
 msgid "Mossy Cobble Stone"
 msgstr ""
 
-#: src/content_mapnode.cpp:2277
+#: src/content_mapnode.cpp:2291
 msgid "Steel Block"
 msgstr ""
 
-#: src/content_mapnode.cpp:2294
+#: src/content_mapnode.cpp:2308
 msgid "Mithril Block"
 msgstr ""
 
-#: src/content_mapnode.cpp:2310
+#: src/content_mapnode.cpp:2324
 msgid "Stone Knob"
 msgstr ""
 
-#: src/content_mapnode.cpp:2311
+#: src/content_mapnode.cpp:2325
 msgid "Rough Stone Knob"
 msgstr ""
 
-#: src/content_mapnode.cpp:2312
+#: src/content_mapnode.cpp:2326
 msgid "Sandstone Knob"
 msgstr ""
 
-#: src/content_mapnode.cpp:2313
+#: src/content_mapnode.cpp:2327
 msgid "Wooden Knob"
 msgstr ""
 
-#: src/content_mapnode.cpp:2314
+#: src/content_mapnode.cpp:2328
 msgid "Junglewood Knob"
 msgstr ""
 
-#: src/content_mapnode.cpp:2315
+#: src/content_mapnode.cpp:2329
 msgid "Pine Knob"
 msgstr ""
 
-#: src/content_mapnode.cpp:2319
+#: src/content_mapnode.cpp:2333
 msgid "Copper Block"
 msgstr ""
 
-#: src/content_mapnode.cpp:2336
+#: src/content_mapnode.cpp:2350
 msgid "Gold Block"
 msgstr ""
 
-#: src/content_mapnode.cpp:2353
+#: src/content_mapnode.cpp:2367
 msgid "Silver Block"
 msgstr ""
 
-#: src/content_mapnode.cpp:2370
+#: src/content_mapnode.cpp:2384
 msgid "Tin Block"
 msgstr ""
 
-#: src/content_mapnode.cpp:2387
+#: src/content_mapnode.cpp:2401
 msgid "Quartz Block"
 msgstr ""
 
-#: src/content_mapnode.cpp:2404
+#: src/content_mapnode.cpp:2418
 msgid "Stone Tiles"
 msgstr ""
 
-#: src/content_mapnode.cpp:2426
+#: src/content_mapnode.cpp:2440
 msgid "Wood Tiles"
 msgstr ""
 
@@ -2012,29 +2016,29 @@ msgstr ""
 msgid "Repeater"
 msgstr ""
 
-#: src/content_mapnode_circuit.cpp:369 src/content_mapnode_circuit.cpp:393
+#: src/content_mapnode_circuit.cpp:369 src/content_mapnode_circuit.cpp:390
 msgid "Electric Lamp"
 msgstr ""
 
-#: src/content_mapnode_circuit.cpp:427 src/content_mapnode_circuit.cpp:462
-#: src/content_mapnode_circuit.cpp:516 src/content_mapnode_circuit.cpp:537
-#: src/content_mapnode_circuit.cpp:582 src/content_mapnode_circuit.cpp:603
+#: src/content_mapnode_circuit.cpp:424 src/content_mapnode_circuit.cpp:459
+#: src/content_mapnode_circuit.cpp:513 src/content_mapnode_circuit.cpp:534
+#: src/content_mapnode_circuit.cpp:579 src/content_mapnode_circuit.cpp:600
 msgid "Piston"
 msgstr ""
 
-#: src/content_mapnode_circuit.cpp:489 src/content_mapnode_circuit.cpp:560
-#: src/content_mapnode_circuit.cpp:626
+#: src/content_mapnode_circuit.cpp:486 src/content_mapnode_circuit.cpp:557
+#: src/content_mapnode_circuit.cpp:623
 msgid "Piston Arm"
 msgstr ""
 
-#: src/content_mapnode_circuit.cpp:648 src/content_mapnode_circuit.cpp:676
-#: src/content_mapnode_circuit.cpp:730 src/content_mapnode_circuit.cpp:751
-#: src/content_mapnode_circuit.cpp:796 src/content_mapnode_circuit.cpp:817
+#: src/content_mapnode_circuit.cpp:645 src/content_mapnode_circuit.cpp:673
+#: src/content_mapnode_circuit.cpp:727 src/content_mapnode_circuit.cpp:748
+#: src/content_mapnode_circuit.cpp:793 src/content_mapnode_circuit.cpp:814
 msgid "Sticky Piston"
 msgstr ""
 
-#: src/content_mapnode_circuit.cpp:703 src/content_mapnode_circuit.cpp:774
-#: src/content_mapnode_circuit.cpp:840
+#: src/content_mapnode_circuit.cpp:700 src/content_mapnode_circuit.cpp:771
+#: src/content_mapnode_circuit.cpp:837
 msgid "Sticky Piston Arm"
 msgstr ""
 
@@ -2174,7 +2178,7 @@ msgstr ""
 msgid "Trellis Grape"
 msgstr ""
 
-#: src/content_mapnode_farm.cpp:493 src/content_mapnode_farm.cpp:512
+#: src/content_mapnode_farm.cpp:494 src/content_mapnode_farm.cpp:513
 msgid "Dead Vine"
 msgstr ""
 
@@ -2190,131 +2194,137 @@ msgstr ""
 msgid "Pine Book Shelf"
 msgstr ""
 
-#: src/content_mapnode_furniture.cpp:150 src/content_mapnode_furniture.cpp:169
-#: src/content_mapnode_furniture.cpp:188 src/content_mapnode_furniture.cpp:207
-#: src/content_mapnode_furniture.cpp:226 src/content_mapnode_furniture.cpp:245
+#: src/content_mapnode_furniture.cpp:150 src/content_mapnode_furniture.cpp:170
+#: src/content_mapnode_furniture.cpp:190 src/content_mapnode_furniture.cpp:210
+#: src/content_mapnode_furniture.cpp:230 src/content_mapnode_furniture.cpp:250
 msgid "Couch"
 msgstr ""
 
-#: src/content_mapnode_furniture.cpp:274 src/content_mapnode_furniture.cpp:293
-#: src/content_mapnode_furniture.cpp:312 src/content_mapnode_furniture.cpp:331
-#: src/content_mapnode_furniture.cpp:350 src/content_mapnode_furniture.cpp:369
+#: src/content_mapnode_furniture.cpp:280 src/content_mapnode_furniture.cpp:300
+#: src/content_mapnode_furniture.cpp:320 src/content_mapnode_furniture.cpp:340
+#: src/content_mapnode_furniture.cpp:360 src/content_mapnode_furniture.cpp:380
 msgid "Blue Couch"
 msgstr ""
 
-#: src/content_mapnode_furniture.cpp:392 src/content_mapnode_furniture.cpp:411
-#: src/content_mapnode_furniture.cpp:430 src/content_mapnode_furniture.cpp:449
-#: src/content_mapnode_furniture.cpp:468 src/content_mapnode_furniture.cpp:487
+#: src/content_mapnode_furniture.cpp:404 src/content_mapnode_furniture.cpp:424
+#: src/content_mapnode_furniture.cpp:444 src/content_mapnode_furniture.cpp:464
+#: src/content_mapnode_furniture.cpp:484 src/content_mapnode_furniture.cpp:504
 msgid "Green Couch"
 msgstr ""
 
-#: src/content_mapnode_furniture.cpp:510 src/content_mapnode_furniture.cpp:529
-#: src/content_mapnode_furniture.cpp:548 src/content_mapnode_furniture.cpp:567
-#: src/content_mapnode_furniture.cpp:586 src/content_mapnode_furniture.cpp:605
+#: src/content_mapnode_furniture.cpp:528 src/content_mapnode_furniture.cpp:548
+#: src/content_mapnode_furniture.cpp:568 src/content_mapnode_furniture.cpp:588
+#: src/content_mapnode_furniture.cpp:608 src/content_mapnode_furniture.cpp:628
 msgid "Orange Couch"
 msgstr ""
 
-#: src/content_mapnode_furniture.cpp:628 src/content_mapnode_furniture.cpp:647
-#: src/content_mapnode_furniture.cpp:666 src/content_mapnode_furniture.cpp:685
-#: src/content_mapnode_furniture.cpp:704 src/content_mapnode_furniture.cpp:723
+#: src/content_mapnode_furniture.cpp:652 src/content_mapnode_furniture.cpp:672
+#: src/content_mapnode_furniture.cpp:692 src/content_mapnode_furniture.cpp:712
+#: src/content_mapnode_furniture.cpp:732 src/content_mapnode_furniture.cpp:752
 msgid "Purple Couch"
 msgstr ""
 
-#: src/content_mapnode_furniture.cpp:746 src/content_mapnode_furniture.cpp:765
-#: src/content_mapnode_furniture.cpp:784 src/content_mapnode_furniture.cpp:803
-#: src/content_mapnode_furniture.cpp:822 src/content_mapnode_furniture.cpp:841
+#: src/content_mapnode_furniture.cpp:776 src/content_mapnode_furniture.cpp:796
+#: src/content_mapnode_furniture.cpp:816 src/content_mapnode_furniture.cpp:836
+#: src/content_mapnode_furniture.cpp:856 src/content_mapnode_furniture.cpp:876
 msgid "Red Couch"
 msgstr ""
 
-#: src/content_mapnode_furniture.cpp:864 src/content_mapnode_furniture.cpp:883
-#: src/content_mapnode_furniture.cpp:902 src/content_mapnode_furniture.cpp:921
-#: src/content_mapnode_furniture.cpp:940 src/content_mapnode_furniture.cpp:959
+#: src/content_mapnode_furniture.cpp:900 src/content_mapnode_furniture.cpp:920
+#: src/content_mapnode_furniture.cpp:940 src/content_mapnode_furniture.cpp:960
+#: src/content_mapnode_furniture.cpp:980
+#: src/content_mapnode_furniture.cpp:1000
 msgid "Yellow Couch"
 msgstr ""
 
-#: src/content_mapnode_furniture.cpp:982
-#: src/content_mapnode_furniture.cpp:1001
-#: src/content_mapnode_furniture.cpp:1020
-#: src/content_mapnode_furniture.cpp:1039
-#: src/content_mapnode_furniture.cpp:1058
-#: src/content_mapnode_furniture.cpp:1077
+#: src/content_mapnode_furniture.cpp:1024
+#: src/content_mapnode_furniture.cpp:1044
+#: src/content_mapnode_furniture.cpp:1064
+#: src/content_mapnode_furniture.cpp:1084
+#: src/content_mapnode_furniture.cpp:1104
+#: src/content_mapnode_furniture.cpp:1124
 msgid "Black Couch"
 msgstr ""
 
-#: src/content_mapnode_furniture.cpp:1100
+#: src/content_mapnode_furniture.cpp:1148
+#: src/content_mapnode_furniture.cpp:1182
+#: src/content_mapnode_furniture.cpp:1206
+#: src/content_mapnode_furniture.cpp:1230
+#: src/content_mapnode_furniture.cpp:1254
+#: src/content_mapnode_furniture.cpp:1278
 msgid "Chair"
 msgstr ""
 
-#: src/content_mapnode_furniture.cpp:1149
+#: src/content_mapnode_furniture.cpp:1302
 msgid "Table"
 msgstr ""
 
-#: src/content_mapnode_furniture.cpp:1206
-#: src/content_mapnode_furniture.cpp:1239
+#: src/content_mapnode_furniture.cpp:1333
+#: src/content_mapnode_furniture.cpp:1366
 msgid "Bed"
 msgstr ""
 
-#: src/content_mapnode_furniture.cpp:1267
-#: src/content_mapnode_furniture.cpp:1300
+#: src/content_mapnode_furniture.cpp:1394
+#: src/content_mapnode_furniture.cpp:1427
 msgid "Blue Bed"
 msgstr ""
 
-#: src/content_mapnode_furniture.cpp:1328
-#: src/content_mapnode_furniture.cpp:1361
+#: src/content_mapnode_furniture.cpp:1455
+#: src/content_mapnode_furniture.cpp:1488
 msgid "Green Bed"
 msgstr ""
 
-#: src/content_mapnode_furniture.cpp:1389
-#: src/content_mapnode_furniture.cpp:1422
+#: src/content_mapnode_furniture.cpp:1516
+#: src/content_mapnode_furniture.cpp:1549
 msgid "Orange Bed"
 msgstr ""
 
-#: src/content_mapnode_furniture.cpp:1450
-#: src/content_mapnode_furniture.cpp:1483
+#: src/content_mapnode_furniture.cpp:1577
+#: src/content_mapnode_furniture.cpp:1610
 msgid "Purple Bed"
 msgstr ""
 
-#: src/content_mapnode_furniture.cpp:1511
-#: src/content_mapnode_furniture.cpp:1544
+#: src/content_mapnode_furniture.cpp:1638
+#: src/content_mapnode_furniture.cpp:1671
 msgid "Red Bed"
 msgstr ""
 
-#: src/content_mapnode_furniture.cpp:1572
-#: src/content_mapnode_furniture.cpp:1605
+#: src/content_mapnode_furniture.cpp:1699
+#: src/content_mapnode_furniture.cpp:1732
 msgid "Yellow Bed"
 msgstr ""
 
-#: src/content_mapnode_furniture.cpp:1633
-#: src/content_mapnode_furniture.cpp:1666
+#: src/content_mapnode_furniture.cpp:1760
+#: src/content_mapnode_furniture.cpp:1793
 msgid "Black Bed"
 msgstr ""
 
-#: src/content_mapnode_furniture.cpp:1694
-#: src/content_mapnode_furniture.cpp:1729
+#: src/content_mapnode_furniture.cpp:1821
+#: src/content_mapnode_furniture.cpp:1856
 msgid "Camp Bed"
 msgstr ""
 
-#: src/content_mapnode_furniture.cpp:1753
+#: src/content_mapnode_furniture.cpp:1880
 msgid "Colorful Painting"
 msgstr ""
 
-#: src/content_mapnode_furniture.cpp:1788
+#: src/content_mapnode_furniture.cpp:1915
 msgid "Red Rose Painting"
 msgstr ""
 
-#: src/content_mapnode_furniture.cpp:1823
+#: src/content_mapnode_furniture.cpp:1950
 msgid "Field Painting"
 msgstr ""
 
-#: src/content_mapnode_furniture.cpp:1858
+#: src/content_mapnode_furniture.cpp:1985
 msgid "Blue Flower Painting"
 msgstr ""
 
-#: src/content_mapnode_furniture.cpp:1893
+#: src/content_mapnode_furniture.cpp:2020
 msgid "Painting Canvas"
 msgstr ""
 
-#: src/content_mapnode_furniture.cpp:1931
+#: src/content_mapnode_furniture.cpp:2058
 msgid "Clock"
 msgstr ""
 
@@ -2634,7 +2644,7 @@ msgid "Decraft Book"
 msgstr ""
 
 #: src/content_mapnode_special.cpp:753 src/content_mapnode_special.cpp:948
-#: src/content_nodemeta.cpp:2693
+#: src/content_nodemeta.cpp:2694
 msgid "Diary"
 msgstr ""
 
@@ -2684,11 +2694,11 @@ msgstr ""
 msgid "Locking Sign"
 msgstr ""
 
-#: src/content_mapnode_special.cpp:1286 src/content_nodemeta.cpp:500
+#: src/content_mapnode_special.cpp:1286 src/content_nodemeta.cpp:501
 msgid "Chest"
 msgstr ""
 
-#: src/content_mapnode_special.cpp:1310 src/content_nodemeta.cpp:775
+#: src/content_mapnode_special.cpp:1310 src/content_nodemeta.cpp:776
 msgid "Creative Chest"
 msgstr ""
 
@@ -2808,7 +2818,7 @@ msgstr ""
 msgid "Cauldron"
 msgstr ""
 
-#: src/content_mapnode_special.cpp:2082 src/content_nodemeta.cpp:3312
+#: src/content_mapnode_special.cpp:2082 src/content_nodemeta.cpp:3313
 msgid "Forge"
 msgstr ""
 
@@ -2912,563 +2922,567 @@ msgstr ""
 msgid "Ginger Kitten"
 msgstr ""
 
-#: src/content_nodemeta.cpp:75 src/content_nodemeta.cpp:138
-#: src/content_nodemeta.cpp:2677 src/content_nodemeta.cpp:2776
+#: src/content_nodemeta.cpp:76 src/content_nodemeta.cpp:139
+#: src/content_nodemeta.cpp:2678 src/content_nodemeta.cpp:2777
 msgid "Save"
 msgstr ""
 
-#: src/content_nodemeta.cpp:185
+#: src/content_nodemeta.cpp:186
 #, c-format
 msgid "%s's Home Flag"
 msgstr ""
 
-#: src/content_nodemeta.cpp:269 src/content_nodemeta.cpp:282
-#: src/content_nodemeta.cpp:436 src/content_nodemeta.cpp:449
+#: src/content_nodemeta.cpp:270 src/content_nodemeta.cpp:283
+#: src/content_nodemeta.cpp:437 src/content_nodemeta.cpp:450
 msgid "You can't sleep yet."
 msgstr ""
 
-#: src/content_nodemeta.cpp:273 src/content_nodemeta.cpp:440
+#: src/content_nodemeta.cpp:274 src/content_nodemeta.cpp:441
 msgid "Go to sleep"
 msgstr ""
 
-#: src/content_nodemeta.cpp:278 src/content_nodemeta.cpp:445
+#: src/content_nodemeta.cpp:279 src/content_nodemeta.cpp:446
 msgid "Someone else is sleeping here."
 msgstr ""
 
-#: src/content_nodemeta.cpp:286 src/content_nodemeta.cpp:453
+#: src/content_nodemeta.cpp:287 src/content_nodemeta.cpp:454
 msgid "Get out of bed"
 msgstr ""
 
-#: src/content_nodemeta.cpp:432
+#: src/content_nodemeta.cpp:433
 msgid "This bed is too uncomfortable to sleep in."
 msgstr ""
 
-#: src/content_nodemeta.cpp:573
+#: src/content_nodemeta.cpp:574
 #, c-format
 msgid "Locking Chest owned by '%s'"
 msgstr ""
 
-#: src/content_nodemeta.cpp:647
+#: src/content_nodemeta.cpp:648
 #, c-format
 msgid "Safe owned by '%s'"
 msgstr ""
 
-#: src/content_nodemeta.cpp:816 src/content_nodemeta.cpp:1870
-#: src/content_nodemeta.cpp:2157 src/content_nodemeta.cpp:2349
-#: src/content_nodemeta.cpp:2563
+#: src/content_nodemeta.cpp:817 src/content_nodemeta.cpp:1871
+#: src/content_nodemeta.cpp:2158 src/content_nodemeta.cpp:2350
+#: src/content_nodemeta.cpp:2564
 #, c-format
 msgid "Page %d of %d"
 msgstr ""
 
-#: src/content_nodemeta.cpp:820 src/content_nodemeta.cpp:1898
-#: src/content_nodemeta.cpp:2176 src/content_nodemeta.cpp:2358
-#: src/content_nodemeta.cpp:2579
+#: src/content_nodemeta.cpp:821 src/content_nodemeta.cpp:1899
+#: src/content_nodemeta.cpp:2177 src/content_nodemeta.cpp:2359
+#: src/content_nodemeta.cpp:2580
 msgid "<< Previous Page"
 msgstr ""
 
-#: src/content_nodemeta.cpp:826 src/content_nodemeta.cpp:1904
-#: src/content_nodemeta.cpp:2182 src/content_nodemeta.cpp:2364
-#: src/content_nodemeta.cpp:2585
+#: src/content_nodemeta.cpp:827 src/content_nodemeta.cpp:1905
+#: src/content_nodemeta.cpp:2183 src/content_nodemeta.cpp:2365
+#: src/content_nodemeta.cpp:2586
 msgid "Next Page >>"
 msgstr ""
 
-#: src/content_nodemeta.cpp:869
+#: src/content_nodemeta.cpp:870
 #, c-format
 msgid "Border Stone owned by '%s'"
 msgstr ""
 
-#: src/content_nodemeta.cpp:944
+#: src/content_nodemeta.cpp:945
 msgid "Furnace is overloaded"
 msgstr ""
 
-#: src/content_nodemeta.cpp:945
+#: src/content_nodemeta.cpp:946
 msgid "Furnace is out of fuel"
 msgstr ""
 
-#: src/content_nodemeta.cpp:947
+#: src/content_nodemeta.cpp:948
 msgid "Furnace is inactive"
 msgstr ""
 
-#: src/content_nodemeta.cpp:950
+#: src/content_nodemeta.cpp:951
 msgid "Furnace is active"
 msgstr ""
 
-#: src/content_nodemeta.cpp:1209
+#: src/content_nodemeta.cpp:1210
 msgid "Locking Furnace is overloaded"
 msgstr ""
 
-#: src/content_nodemeta.cpp:1210
+#: src/content_nodemeta.cpp:1211
 msgid "Locking Furnace is out of fuel"
 msgstr ""
 
-#: src/content_nodemeta.cpp:1212
+#: src/content_nodemeta.cpp:1213
 msgid "Locking Furnace is inactive"
 msgstr ""
 
-#: src/content_nodemeta.cpp:1215
+#: src/content_nodemeta.cpp:1216
 msgid "Locking Furnace is active"
 msgstr ""
 
-#: src/content_nodemeta.cpp:1470
+#: src/content_nodemeta.cpp:1471
 msgid "Armed Explosive: about to detonate"
 msgstr ""
 
-#: src/content_nodemeta.cpp:1473
+#: src/content_nodemeta.cpp:1474
 #, c-format
 msgid "Armed Explosive: %d second till detonation"
 msgid_plural "Armed Explosive: %d seconds till detonation"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/content_nodemeta.cpp:1534 src/content_nodemeta.cpp:1539
+#: src/content_nodemeta.cpp:1535 src/content_nodemeta.cpp:1540
 msgid "Incinerator is active"
 msgstr ""
 
-#: src/content_nodemeta.cpp:1541
+#: src/content_nodemeta.cpp:1542
 msgid "Incinerator is inactive"
 msgstr ""
 
-#: src/content_nodemeta.cpp:1633
+#: src/content_nodemeta.cpp:1634
 msgid "Add fuel, then punch to incinerate wielded item"
 msgstr ""
 
-#: src/content_nodemeta.cpp:1874 src/content_nodemeta.cpp:2162
+#: src/content_nodemeta.cpp:1875 src/content_nodemeta.cpp:2163
 msgid "Add item here to see recipe"
 msgstr ""
 
-#: src/content_nodemeta.cpp:1879 src/content_nodemeta.cpp:2167
+#: src/content_nodemeta.cpp:1880 src/content_nodemeta.cpp:2168
 #, c-format
 msgid "Recipe %d of %d"
 msgstr ""
 
-#: src/content_nodemeta.cpp:1888
+#: src/content_nodemeta.cpp:1889
 msgid "Gives"
 msgstr ""
 
-#: src/content_nodemeta.cpp:2353
+#: src/content_nodemeta.cpp:2354
 msgid "Add item here to see cook result"
 msgstr ""
 
-#: src/content_nodemeta.cpp:2567
+#: src/content_nodemeta.cpp:2568
 msgid "Add item here to see dig result"
 msgstr ""
 
-#: src/content_nodemeta.cpp:2571
+#: src/content_nodemeta.cpp:2572
 msgid "Dig Result"
 msgstr ""
 
-#: src/content_nodemeta.cpp:2575
+#: src/content_nodemeta.cpp:2576
 msgid "Random Drop"
 msgstr ""
 
-#: src/content_nodemeta.cpp:2667 src/content_nodemeta.cpp:2766
+#: src/content_nodemeta.cpp:2668 src/content_nodemeta.cpp:2767
 msgid "Title"
 msgstr ""
 
-#: src/content_nodemeta.cpp:2672 src/content_nodemeta.cpp:2771
+#: src/content_nodemeta.cpp:2673 src/content_nodemeta.cpp:2772
 msgid "Content"
 msgstr ""
 
-#: src/content_nodemeta.cpp:3127
+#: src/content_nodemeta.cpp:3128
 msgid "Cauldron is active"
 msgstr ""
 
-#: src/content_nodemeta.cpp:3130
+#: src/content_nodemeta.cpp:3131
 msgid "Cauldron is hot"
 msgstr ""
 
-#: src/content_nodemeta.cpp:3132
+#: src/content_nodemeta.cpp:3133
 msgid "Cauldron is cool"
 msgstr ""
 
-#: src/content_nodemeta.cpp:3134
+#: src/content_nodemeta.cpp:3135
 msgid "Cauldron is empty"
 msgstr ""
 
-#: src/content_nodemeta.cpp:3138
+#: src/content_nodemeta.cpp:3139
 msgid "Cauldron is inactive"
 msgstr ""
 
-#: src/content_nodemeta.cpp:3139
+#: src/content_nodemeta.cpp:3140
 msgid "Cauldron is out of fuel"
 msgstr ""
 
-#: src/content_nodemeta.cpp:3218
+#: src/content_nodemeta.cpp:3219
 msgid "Add fuel, then punch to add or remove water"
 msgstr ""
 
-#: src/content_nodemeta.cpp:3484
+#: src/content_nodemeta.cpp:3487
 msgid "Show Enchanting"
 msgstr ""
 
-#: src/content_nodemeta.cpp:3491 src/game.cpp:208
+#: src/content_nodemeta.cpp:3494 src/game.cpp:209
 msgid "Show Crafting"
 msgstr ""
 
-#: src/content_toolitem.cpp:213
+#: src/content_toolitem.cpp:216
 msgid "Small Stone Pick"
 msgstr ""
 
-#: src/content_toolitem.cpp:236
+#: src/content_toolitem.cpp:239
 msgid "Stone Pick"
 msgstr ""
 
-#: src/content_toolitem.cpp:250
+#: src/content_toolitem.cpp:253
 msgid "Flint Pick"
 msgstr ""
 
-#: src/content_toolitem.cpp:264
+#: src/content_toolitem.cpp:267
 msgid "Steel Pick"
 msgstr ""
 
-#: src/content_toolitem.cpp:278
+#: src/content_toolitem.cpp:281
 msgid "Creative Pick"
 msgstr ""
 
-#: src/content_toolitem.cpp:292
+#: src/content_toolitem.cpp:295
 msgid "Stone Trowel"
 msgstr ""
 
-#: src/content_toolitem.cpp:306
+#: src/content_toolitem.cpp:309
 msgid "Stone Shovel"
 msgstr ""
 
-#: src/content_toolitem.cpp:320
+#: src/content_toolitem.cpp:323
 msgid "Flint Shovel"
 msgstr ""
 
-#: src/content_toolitem.cpp:334
+#: src/content_toolitem.cpp:337
 msgid "Steel Shovel"
 msgstr ""
 
-#: src/content_toolitem.cpp:348
+#: src/content_toolitem.cpp:351
 msgid "Small Stone Axe"
 msgstr ""
 
-#: src/content_toolitem.cpp:369
+#: src/content_toolitem.cpp:372
 msgid "Stone Axe"
 msgstr ""
 
-#: src/content_toolitem.cpp:383
+#: src/content_toolitem.cpp:386
 msgid "Flint Axe"
 msgstr ""
 
-#: src/content_toolitem.cpp:397
+#: src/content_toolitem.cpp:400
 msgid "Steel Axe"
 msgstr ""
 
-#: src/content_toolitem.cpp:411
+#: src/content_toolitem.cpp:414
 msgid "Wooden Club"
 msgstr ""
 
-#: src/content_toolitem.cpp:426
+#: src/content_toolitem.cpp:429
 msgid "Stone Sword"
 msgstr ""
 
-#: src/content_toolitem.cpp:440
+#: src/content_toolitem.cpp:443
 msgid "Steel Sword"
 msgstr ""
 
-#: src/content_toolitem.cpp:454
+#: src/content_toolitem.cpp:457
 msgid "Flint Shears"
 msgstr ""
 
-#: src/content_toolitem.cpp:468
+#: src/content_toolitem.cpp:471
 msgid "Steel Shears"
 msgstr ""
 
-#: src/content_toolitem.cpp:482
+#: src/content_toolitem.cpp:485
 msgid "Wooden Bucket"
 msgstr ""
 
-#: src/content_toolitem.cpp:499
+#: src/content_toolitem.cpp:502
 msgid "Tin Bucket"
 msgstr ""
 
-#: src/content_toolitem.cpp:515
+#: src/content_toolitem.cpp:518
 msgid "Wooden Bucket of Water"
 msgstr ""
 
-#: src/content_toolitem.cpp:526
+#: src/content_toolitem.cpp:529
 msgid "Tin Bucket of Water"
 msgstr ""
 
-#: src/content_toolitem.cpp:537
+#: src/content_toolitem.cpp:540
 msgid "Steel Bucket"
 msgstr ""
 
-#: src/content_toolitem.cpp:552
+#: src/content_toolitem.cpp:555
 msgid "Steel Bucket of Water"
 msgstr ""
 
-#: src/content_toolitem.cpp:563
+#: src/content_toolitem.cpp:566
 msgid "Steel Bucket of Lava"
 msgstr ""
 
-#: src/content_toolitem.cpp:575
+#: src/content_toolitem.cpp:578
 msgid "Fire Starter"
 msgstr ""
 
-#: src/content_toolitem.cpp:589
+#: src/content_toolitem.cpp:592
 msgid "Crowbar"
 msgstr ""
 
-#: src/content_toolitem.cpp:602
+#: src/content_toolitem.cpp:605
 msgid "Key"
 msgstr ""
 
-#: src/content_toolitem.cpp:614
+#: src/content_toolitem.cpp:617
 msgid "Stone Spear"
 msgstr ""
 
-#: src/content_toolitem.cpp:628
+#: src/content_toolitem.cpp:631
 msgid "Flint Spear"
 msgstr ""
 
-#: src/content_toolitem.cpp:642
+#: src/content_toolitem.cpp:645
 msgid "Steel Spear"
 msgstr ""
 
-#: src/content_toolitem.cpp:656
+#: src/content_toolitem.cpp:659
 msgid "Bow"
 msgstr ""
 
-#: src/content_toolitem.cpp:676
+#: src/content_toolitem.cpp:679
 msgid "Raw Mithril Pick"
 msgstr ""
 
-#: src/content_toolitem.cpp:690
+#: src/content_toolitem.cpp:693
 msgid "Raw Mithril Shovel"
 msgstr ""
 
-#: src/content_toolitem.cpp:704
+#: src/content_toolitem.cpp:707
 msgid "Raw Mithril Axe"
 msgstr ""
 
-#: src/content_toolitem.cpp:718
+#: src/content_toolitem.cpp:721
 msgid "Raw Mithril Sword"
 msgstr ""
 
-#: src/content_toolitem.cpp:732
+#: src/content_toolitem.cpp:735
 msgid "Raw Mithril Spear"
 msgstr ""
 
-#: src/content_toolitem.cpp:746
+#: src/content_toolitem.cpp:749
 msgid "Unbound Mithril Pick"
 msgstr ""
 
-#: src/content_toolitem.cpp:760
+#: src/content_toolitem.cpp:763
 msgid "Unbound Mithril Shovel"
 msgstr ""
 
-#: src/content_toolitem.cpp:774
+#: src/content_toolitem.cpp:777
 msgid "Unbound Mithril Axe"
 msgstr ""
 
-#: src/content_toolitem.cpp:788
+#: src/content_toolitem.cpp:791
 msgid "Unbound Mithril Sword"
 msgstr ""
 
-#: src/content_toolitem.cpp:802
+#: src/content_toolitem.cpp:805
 msgid "Unbound Mithril Spear"
 msgstr ""
 
-#: src/content_toolitem.cpp:816
+#: src/content_toolitem.cpp:819
 msgid "Mithril Pick"
 msgstr ""
 
-#: src/content_toolitem.cpp:831
+#: src/content_toolitem.cpp:834
 msgid "Mithril Shovel"
 msgstr ""
 
-#: src/content_toolitem.cpp:845
+#: src/content_toolitem.cpp:848
 msgid "Mithril Axe"
 msgstr ""
 
-#: src/content_toolitem.cpp:859
+#: src/content_toolitem.cpp:862
 msgid "Mithril Sword"
 msgstr ""
 
-#: src/content_toolitem.cpp:873
+#: src/content_toolitem.cpp:876
 msgid "Mithril Spear"
 msgstr ""
 
-#: src/content_toolitem.cpp:887
+#: src/content_toolitem.cpp:890
 msgid "Mob Spawner"
 msgstr ""
 
-#: src/game.cpp:209
-msgid "Clothes"
+#: src/content_toolitem.cpp:909
+msgid "Mithril Key"
 msgstr ""
 
 #: src/game.cpp:210
+msgid "Clothes"
+msgstr ""
+
+#: src/game.cpp:211
 msgid "Hat/Helmet"
 msgstr ""
 
-#: src/game.cpp:212
+#: src/game.cpp:213
 msgid "Jacket"
 msgstr ""
 
-#: src/game.cpp:214
+#: src/game.cpp:215
 msgid "Decorative"
 msgstr ""
 
-#: src/game.cpp:216
+#: src/game.cpp:217
 msgid "Shirt"
 msgstr ""
 
-#: src/game.cpp:218
+#: src/game.cpp:219
 msgid "Belt"
 msgstr ""
 
-#: src/game.cpp:220
+#: src/game.cpp:221
 msgid "Pants"
 msgstr ""
 
-#: src/game.cpp:222
+#: src/game.cpp:223
 msgid "Boots"
 msgstr ""
 
-#: src/game.cpp:229
+#: src/game.cpp:230
 msgid "Drop to Ground"
 msgstr ""
 
-#: src/game.cpp:231
+#: src/game.cpp:232
 msgid "Change Clothing"
 msgstr ""
 
-#: src/game.cpp:590
+#: src/game.cpp:591
 msgid "Loading"
 msgstr ""
 
-#: src/game.cpp:662
+#: src/game.cpp:663
 msgid "Loading..."
 msgstr ""
 
-#: src/game.cpp:671
+#: src/game.cpp:672
 msgid "Creating server..."
 msgstr ""
 
-#: src/game.cpp:682
+#: src/game.cpp:683
 msgid "Creating client..."
 msgstr ""
 
-#: src/game.cpp:687
+#: src/game.cpp:688
 msgid "Resolving address..."
 msgstr ""
 
-#: src/game.cpp:698
+#: src/game.cpp:699
 msgid "Couldn't resolve address"
 msgstr ""
 
-#: src/game.cpp:738
+#: src/game.cpp:739
 #, c-format
 msgid "Connecting to server... (timeout in %d second)"
 msgid_plural "Connecting to server... (timeout in %d seconds)"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/game.cpp:767
+#: src/game.cpp:768
 #, c-format
 msgid "Access denied. Reason: %ls"
 msgstr ""
 
-#: src/game.cpp:771
+#: src/game.cpp:772
 msgid "Unable to Connect (port already in use?)."
 msgstr ""
 
-#: src/game.cpp:774
+#: src/game.cpp:775
 msgid "Connection timed out."
 msgstr ""
 
-#: src/game.cpp:927
+#: src/game.cpp:928
 msgid "Access denied. Reason: "
 msgstr ""
 
-#: src/game.cpp:1161
+#: src/game.cpp:1162
 msgid "free_move disabled"
 msgstr ""
 
-#: src/game.cpp:1165
+#: src/game.cpp:1166
 msgid "free_move enabled"
 msgstr ""
 
-#: src/game.cpp:1177
+#: src/game.cpp:1178
 #, c-format
 msgid "Saved screenshot to '%s'"
 msgstr ""
 
-#: src/game.cpp:1189
+#: src/game.cpp:1190
 msgid "HUD shown"
 msgstr ""
 
-#: src/game.cpp:1191
+#: src/game.cpp:1192
 msgid "HUD hidden"
 msgstr ""
 
-#: src/game.cpp:1197
+#: src/game.cpp:1198
 msgid "Chat shown"
 msgstr ""
 
-#: src/game.cpp:1199
+#: src/game.cpp:1200
 msgid "Chat hidden"
 msgstr ""
 
-#: src/game.cpp:1205
+#: src/game.cpp:1206
 msgid "Fog disabled"
 msgstr ""
 
-#: src/game.cpp:1207
+#: src/game.cpp:1208
 msgid "Fog enabled"
 msgstr ""
 
-#: src/game.cpp:1213
+#: src/game.cpp:1214
 msgid "Camera update disabled"
 msgstr ""
 
-#: src/game.cpp:1215
+#: src/game.cpp:1216
 msgid "Camera update enabled"
 msgstr ""
 
-#: src/game.cpp:1225
+#: src/game.cpp:1226
 msgid "Debug info shown"
 msgstr ""
 
-#: src/game.cpp:1230
+#: src/game.cpp:1231
 msgid "Debug info and frametime graph hidden"
 msgstr ""
 
-#: src/game.cpp:1234
+#: src/game.cpp:1235
 msgid "Frametime graph shown"
 msgstr ""
 
-#: src/game.cpp:1246
+#: src/game.cpp:1247
 #, c-format
 msgid "Profiler shown (page %d of %d)"
 msgstr ""
 
-#: src/game.cpp:1250
+#: src/game.cpp:1251
 msgid "Profiler hidden"
 msgstr ""
 
-#: src/game.cpp:1258 src/game.cpp:1269
+#: src/game.cpp:1259 src/game.cpp:1270
 #, c-format
 msgid "Minimum viewing range changed to %d"
 msgstr ""
 
-#: src/game.cpp:1338
+#: src/game.cpp:1339
 msgid "Enabled full viewing range"
 msgstr ""
 
-#: src/game.cpp:1342
+#: src/game.cpp:1343
 msgid "Disabled full viewing range"
 msgstr ""
 
-#: src/game.cpp:1995
+#: src/game.cpp:1950
 msgid "Disconnected (Network Timeout)"
 msgstr ""
 
-#: src/game.cpp:2407
+#: src/game.cpp:2382
 msgid "Shutting down..."
 msgstr ""
 
@@ -3488,227 +3502,215 @@ msgstr ""
 msgid "Write It"
 msgstr ""
 
-#: src/guiMainMenu.cpp:347
+#: src/guiMainMenu.cpp:319
 msgid "Character Creator"
 msgstr ""
 
-#: src/guiMainMenu.cpp:353 src/guiMainMenu.cpp:478 src/guiMainMenu.cpp:520
-#: src/guiMainMenu.cpp:631
+#: src/guiMainMenu.cpp:325 src/guiMainMenu.cpp:386 src/guiMainMenu.cpp:428
+#: src/guiMainMenu.cpp:539
 msgid "Single Player"
 msgstr ""
 
-#: src/guiMainMenu.cpp:359 src/guiMainMenu.cpp:410
+#: src/guiMainMenu.cpp:331 src/guiMultiplayerMenu.cpp:161
 msgid "Multi Player"
 msgstr ""
 
-#: src/guiMainMenu.cpp:365 src/guiPauseMenu.cpp:155
+#: src/guiMainMenu.cpp:337 src/guiPauseMenu.cpp:155
 msgid "Settings"
 msgstr ""
 
-#: src/guiMainMenu.cpp:371
+#: src/guiMainMenu.cpp:343
 msgid "Credits"
 msgstr ""
 
-#: src/guiMainMenu.cpp:377
+#: src/guiMainMenu.cpp:349
 msgid "Quit"
 msgstr ""
 
-#: src/guiMainMenu.cpp:418
-msgid "Name/Password"
-msgstr ""
-
-#: src/guiMainMenu.cpp:446
-msgid "Address/Port"
-msgstr ""
-
-#: src/guiMainMenu.cpp:472
-msgid "Connect"
-msgstr ""
-
-#: src/guiMainMenu.cpp:487 src/guiMainMenu.cpp:529 src/guiMainMenu.cpp:640
+#: src/guiMainMenu.cpp:395 src/guiMainMenu.cpp:437 src/guiMainMenu.cpp:548
 msgid "Creative Mode"
 msgstr ""
 
-#: src/guiMainMenu.cpp:488 src/guiMainMenu.cpp:530 src/guiMainMenu.cpp:641
+#: src/guiMainMenu.cpp:396 src/guiMainMenu.cpp:438 src/guiMainMenu.cpp:549
 msgid "Adventure Mode"
 msgstr ""
 
-#: src/guiMainMenu.cpp:489 src/guiMainMenu.cpp:531 src/guiMainMenu.cpp:642
+#: src/guiMainMenu.cpp:397 src/guiMainMenu.cpp:439 src/guiMainMenu.cpp:550
 msgid "Survival Mode"
 msgstr ""
 
-#: src/guiMainMenu.cpp:502 src/guiMainMenu.cpp:655
+#: src/guiMainMenu.cpp:410 src/guiMainMenu.cpp:563
 msgid "Advanced Settings"
 msgstr ""
 
-#: src/guiMainMenu.cpp:508 src/guiMainMenu.cpp:550
+#: src/guiMainMenu.cpp:416 src/guiMainMenu.cpp:458
 msgid "Map Options"
 msgstr ""
 
-#: src/guiMainMenu.cpp:514 src/guiMainMenu.cpp:625 src/guiMainMenu.cpp:750
+#: src/guiMainMenu.cpp:422 src/guiMainMenu.cpp:533 src/guiMainMenu.cpp:658
 msgid "Start Game"
 msgstr ""
 
-#: src/guiMainMenu.cpp:544
+#: src/guiMainMenu.cpp:452
 msgid "Hide Advanced Settings"
 msgstr ""
 
-#: src/guiMainMenu.cpp:555
+#: src/guiMainMenu.cpp:463
 msgid "Creatures"
 msgstr ""
 
-#: src/guiMainMenu.cpp:562
+#: src/guiMainMenu.cpp:470
 msgid "None"
 msgstr ""
 
-#: src/guiMainMenu.cpp:563
+#: src/guiMainMenu.cpp:471
 msgid "Passive"
 msgstr ""
 
-#: src/guiMainMenu.cpp:564
+#: src/guiMainMenu.cpp:472
 msgid "Passive & Aggressive"
 msgstr ""
 
-#: src/guiMainMenu.cpp:565
+#: src/guiMainMenu.cpp:473
 msgid "Passive, Aggressive, & Destructive"
 msgstr ""
 
-#: src/guiMainMenu.cpp:579
+#: src/guiMainMenu.cpp:487
 msgid "Player Damage"
 msgstr ""
 
-#: src/guiMainMenu.cpp:584
+#: src/guiMainMenu.cpp:492
 msgid "Suffocation/Drowning"
 msgstr ""
 
-#: src/guiMainMenu.cpp:589
+#: src/guiMainMenu.cpp:497
 msgid "Hunger"
 msgstr ""
 
-#: src/guiMainMenu.cpp:594
+#: src/guiMainMenu.cpp:502
 msgid "Tool Wear"
 msgstr ""
 
-#: src/guiMainMenu.cpp:599
+#: src/guiMainMenu.cpp:507
 msgid "Dangerous Fire"
 msgstr ""
 
-#: src/guiMainMenu.cpp:604
+#: src/guiMainMenu.cpp:512
 msgid "Infinite Inventory"
 msgstr ""
 
-#: src/guiMainMenu.cpp:609
+#: src/guiMainMenu.cpp:517
 msgid "Initial Inventory"
 msgstr ""
 
-#: src/guiMainMenu.cpp:614
+#: src/guiMainMenu.cpp:522
 msgid "Droppable Inventory"
 msgstr ""
 
-#: src/guiMainMenu.cpp:619
+#: src/guiMainMenu.cpp:527
 msgid "Death drops Inventory"
 msgstr ""
 
-#: src/guiMainMenu.cpp:661
+#: src/guiMainMenu.cpp:569
 msgid "Hide Map Options"
 msgstr ""
 
-#: src/guiMainMenu.cpp:666
+#: src/guiMainMenu.cpp:574
 msgid "Create New Map"
 msgstr ""
 
-#: src/guiMainMenu.cpp:672
+#: src/guiMainMenu.cpp:580
 msgid "Warning! Your old map will be deleted!"
 msgstr ""
 
-#: src/guiMainMenu.cpp:678
+#: src/guiMainMenu.cpp:586
 msgid "Map Type"
 msgstr ""
 
-#: src/guiMainMenu.cpp:685
+#: src/guiMainMenu.cpp:593
 msgid "Flat"
 msgstr ""
 
-#: src/guiMainMenu.cpp:686
+#: src/guiMainMenu.cpp:594
 msgid "Flatter"
 msgstr ""
 
-#: src/guiMainMenu.cpp:687
+#: src/guiMainMenu.cpp:595
 msgid "Smoother"
 msgstr ""
 
-#: src/guiMainMenu.cpp:688
+#: src/guiMainMenu.cpp:596
 msgid "Default"
 msgstr ""
 
-#: src/guiMainMenu.cpp:689
+#: src/guiMainMenu.cpp:597
 msgid "Hilly"
 msgstr ""
 
-#: src/guiMainMenu.cpp:690
+#: src/guiMainMenu.cpp:598
 msgid "Mountains"
 msgstr ""
 
-#: src/guiMainMenu.cpp:691
+#: src/guiMainMenu.cpp:599
 msgid "Crazy"
 msgstr ""
 
-#: src/guiMainMenu.cpp:692
+#: src/guiMainMenu.cpp:600
 msgid "Crazy Hills"
 msgstr ""
 
-#: src/guiMainMenu.cpp:714
+#: src/guiMainMenu.cpp:622
 msgid "Use Fixed Seed"
 msgstr ""
 
-#: src/guiMainMenu.cpp:720
+#: src/guiMainMenu.cpp:628
 msgid "Map Seed"
 msgstr ""
 
-#: src/guiMainMenu.cpp:737
+#: src/guiMainMenu.cpp:645
 msgid "Clear Map"
 msgstr ""
 
-#: src/guiMainMenu.cpp:742
+#: src/guiMainMenu.cpp:650
 msgid "Warning! This will delete all construction from your map!"
 msgstr ""
 
-#: src/guiMainMenu.cpp:760
+#: src/guiMainMenu.cpp:668
 msgid ""
 "Voxelands\n"
 "http://www.voxelands.com/\n"
 "By Lisa 'darkrose' Milne <lisa@ltmnet.com> and contributors."
 msgstr ""
 
-#: src/guiMainMenu.cpp:767
+#: src/guiMainMenu.cpp:675
 msgid "Programmers"
 msgstr ""
 
-#: src/guiMainMenu.cpp:770
+#: src/guiMainMenu.cpp:678
 msgid "Artists and Modellers"
 msgstr ""
 
-#: src/guiMainMenu.cpp:773
+#: src/guiMainMenu.cpp:681
 msgid "Translators"
 msgstr ""
 
-#: src/guiMainMenu.cpp:776
+#: src/guiMainMenu.cpp:684
 msgid "Documentation Writters"
 msgstr ""
 
-#: src/guiMainMenu.cpp:779
+#: src/guiMainMenu.cpp:687
 msgid "Testers, Packagers, and Builders"
 msgstr ""
 
-#: src/guiMainMenu.cpp:782
+#: src/guiMainMenu.cpp:690
 msgid "Music and Sound Effects Composers"
 msgstr ""
 
-#: src/guiMainMenu.cpp:785
+#: src/guiMainMenu.cpp:693
 msgid "Other Contributers, and Special Thanks"
 msgstr ""
 
-#: src/guiMainMenu.cpp:789
+#: src/guiMainMenu.cpp:697
 msgid ""
 "Based on Minetest-C55 by Perttu Ahola <celeron55@gmail.com>\n"
 "and contributors: PilzAdam, Taoki, tango_, kahrl (kaaaaaahrl?), darkrose, "
@@ -3720,6 +3722,62 @@ msgstr ""
 msgid "Continue"
 msgstr ""
 
+#: src/guiMultiplayerMenu.cpp:135 src/guiSettingsMenu.cpp:277
+msgid "Main Menu"
+msgstr ""
+
+#: src/guiMultiplayerMenu.cpp:142
+msgid "All Servers"
+msgstr ""
+
+#: src/guiMultiplayerMenu.cpp:148
+msgid "Favourite Servers"
+msgstr ""
+
+#: src/guiMultiplayerMenu.cpp:154
+msgid "Custom Connect"
+msgstr ""
+
+#: src/guiMultiplayerMenu.cpp:169
+msgid "Custom Connection"
+msgstr ""
+
+#: src/guiMultiplayerMenu.cpp:176
+msgid "Address/Port"
+msgstr ""
+
+#: src/guiMultiplayerMenu.cpp:201 src/guiMultiplayerMenu.cpp:313
+msgid "Add to Favourites"
+msgstr ""
+
+#: src/guiMultiplayerMenu.cpp:206 src/guiMultiplayerMenu.cpp:320
+msgid "Connect"
+msgstr ""
+
+#: src/guiMultiplayerMenu.cpp:213
+msgid "Name/Password"
+msgstr ""
+
+#: src/guiMultiplayerMenu.cpp:240
+msgid "Join Server"
+msgstr ""
+
+#: src/guiMultiplayerMenu.cpp:262
+msgid "My Favourites"
+msgstr ""
+
+#: src/guiMultiplayerMenu.cpp:265
+msgid "Server List"
+msgstr ""
+
+#: src/guiMultiplayerMenu.cpp:270
+msgid "Get New List"
+msgstr ""
+
+#: src/guiMultiplayerMenu.cpp:307
+msgid "Remove from Favourites"
+msgstr ""
+
 #: src/guiPasswordChange.cpp:105
 msgid "Old Password"
 msgstr ""
@@ -3760,11 +3818,11 @@ msgstr ""
 msgid "Backward"
 msgstr ""
 
-#: src/guiSettingsMenu.cpp:72 src/keycode.cpp:234
+#: src/guiSettingsMenu.cpp:72 src/keycode.cpp:263
 msgid "Left"
 msgstr ""
 
-#: src/guiSettingsMenu.cpp:73 src/keycode.cpp:234
+#: src/guiSettingsMenu.cpp:73 src/keycode.cpp:265
 msgid "Right"
 msgstr ""
 
@@ -3800,11 +3858,11 @@ msgstr ""
 msgid "Toggle Fly"
 msgstr ""
 
-#: src/guiSettingsMenu.cpp:82 src/keycode.cpp:234
+#: src/guiSettingsMenu.cpp:82 src/keycode.cpp:264
 msgid "Up"
 msgstr ""
 
-#: src/guiSettingsMenu.cpp:83 src/keycode.cpp:234
+#: src/guiSettingsMenu.cpp:83 src/keycode.cpp:266
 msgid "Down"
 msgstr ""
 
@@ -3848,10 +3906,6 @@ msgstr ""
 msgid "Next Item"
 msgstr ""
 
-#: src/guiSettingsMenu.cpp:277
-msgid "Main Menu"
-msgstr ""
-
 #: src/guiSettingsMenu.cpp:284 src/guiSettingsMenu.cpp:311
 msgid "Controls"
 msgstr ""
@@ -3959,362 +4013,574 @@ msgstr ""
 msgid "Cold Protection: %d:%02d"
 msgstr ""
 
-#: src/inventory.cpp:230 src/inventory.cpp:352
-msgid "Cookable: Yes"
-msgstr ""
-
-#: src/inventory.cpp:235 src/inventory.cpp:357 src/inventory.cpp:532
-msgid "Fuel Burn Time: "
-msgstr ""
-
-#: src/inventory.cpp:321
-msgid "Hunger: "
-msgstr ""
-
-#: src/inventory.cpp:327
-msgid "Health: "
-msgstr ""
-
-#: src/inventory.cpp:334
-msgid "Cold Protection: "
-msgstr ""
-
-#: src/inventory.cpp:343
-msgid "Energy Boost: "
-msgstr ""
-
-#: src/inventory.cpp:521
-msgid "Strength: "
-msgstr ""
-
-#: src/inventory.cpp:524
-msgid "Speed: "
-msgstr ""
-
-#: src/inventory.cpp:527
-msgid "Level: "
-msgstr ""
-
-#: src/inventory.cpp:557
+#: src/inventory.cpp:246 src/inventory.cpp:580
 msgid "Contains: "
 msgstr ""
 
-#: src/inventory.cpp:643
+#: src/inventory.cpp:253 src/inventory.cpp:375
+msgid "Cookable: Yes"
+msgstr ""
+
+#: src/inventory.cpp:258 src/inventory.cpp:380 src/inventory.cpp:555
+msgid "Fuel Burn Time: "
+msgstr ""
+
+#: src/inventory.cpp:344
+msgid "Hunger: "
+msgstr ""
+
+#: src/inventory.cpp:350
+msgid "Health: "
+msgstr ""
+
+#: src/inventory.cpp:357
+msgid "Cold Protection: "
+msgstr ""
+
+#: src/inventory.cpp:366
+msgid "Energy Boost: "
+msgstr ""
+
+#: src/inventory.cpp:544
+msgid "Strength: "
+msgstr ""
+
+#: src/inventory.cpp:547
+msgid "Speed: "
+msgstr ""
+
+#: src/inventory.cpp:550
+msgid "Level: "
+msgstr ""
+
+#: src/inventory.cpp:666
 msgid "Armour: "
 msgstr ""
 
-#: src/inventory.cpp:649
+#: src/inventory.cpp:672
 msgid "Warmth: "
 msgstr ""
 
-#: src/inventory.cpp:655
+#: src/inventory.cpp:678
 msgid "Pressure: "
 msgstr ""
 
-#: src/inventory.cpp:661
+#: src/inventory.cpp:684
 msgid "Suffocation: "
 msgstr ""
 
-#: src/inventory.cpp:667
+#: src/inventory.cpp:690
 msgid "Durability: "
 msgstr ""
 
-#: src/inventory.cpp:672
+#: src/inventory.cpp:695
 msgid "Effect Boost: "
 msgstr ""
 
-#: src/keycode.cpp:229
+#: src/keycode.cpp:232
+msgid "-"
+msgstr ""
+
+#: src/keycode.cpp:234
 msgid "Left Button"
 msgstr ""
 
-#: src/keycode.cpp:229
-msgid "Middle Button"
-msgstr ""
-
-#: src/keycode.cpp:229
+#: src/keycode.cpp:235
 msgid "Right Button"
 msgstr ""
 
-#: src/keycode.cpp:229
-msgid "X Button 1"
-msgstr ""
-
-#: src/keycode.cpp:230
-msgid "Back"
-msgstr ""
-
-#: src/keycode.cpp:230
-msgid "Clear"
-msgstr ""
-
-#: src/keycode.cpp:230
-msgid "Return"
-msgstr ""
-
-#: src/keycode.cpp:230
-msgid "Tab"
-msgstr ""
-
-#: src/keycode.cpp:230
-msgid "X Button 2"
-msgstr ""
-
-#: src/keycode.cpp:231
-msgid "Capital"
-msgstr ""
-
-#: src/keycode.cpp:231
-msgid "Control"
-msgstr ""
-
-#: src/keycode.cpp:231
-msgid "Kana"
-msgstr ""
-
-#: src/keycode.cpp:231
-msgid "Menu"
-msgstr ""
-
-#: src/keycode.cpp:231
-msgid "Pause"
-msgstr ""
-
-#: src/keycode.cpp:231
-msgid "Shift"
-msgstr ""
-
-#: src/keycode.cpp:232
-msgid "Convert"
-msgstr ""
-
-#: src/keycode.cpp:232
-msgid "Escape"
-msgstr ""
-
-#: src/keycode.cpp:232
-msgid "Final"
-msgstr ""
-
-#: src/keycode.cpp:232
-msgid "Junja"
-msgstr ""
-
-#: src/keycode.cpp:232
-msgid "Kanji"
-msgstr ""
-
-#: src/keycode.cpp:232
-msgid "Nonconvert"
-msgstr ""
-
-#: src/keycode.cpp:233
-msgid "Accept"
-msgstr ""
-
-#: src/keycode.cpp:233
-msgid "End"
-msgstr ""
-
-#: src/keycode.cpp:233
-msgid "Home"
-msgstr ""
-
-#: src/keycode.cpp:233
-msgid "Mode Change"
-msgstr ""
-
-#: src/keycode.cpp:233
-msgid "Next"
-msgstr ""
-
-#: src/keycode.cpp:233
-msgid "Prior"
-msgstr ""
-
-#: src/keycode.cpp:233
-msgid "Space"
-msgstr ""
-
-#: src/keycode.cpp:234
-msgid "Execute"
-msgstr ""
-
-#: src/keycode.cpp:234
-msgid "Print"
-msgstr ""
-
-#: src/keycode.cpp:234
-msgid "Select"
-msgstr ""
-
-#: src/keycode.cpp:235
-msgid "Delete"
-msgstr ""
-
-#: src/keycode.cpp:235
-msgid "Help"
-msgstr ""
-
-#: src/keycode.cpp:235
-msgid "Insert"
-msgstr ""
-
-#: src/keycode.cpp:235
-msgid "Snapshot"
+#: src/keycode.cpp:237
+msgid "Middle Button"
 msgstr ""
 
 #: src/keycode.cpp:238
+msgid "X Button 1"
+msgstr ""
+
+#: src/keycode.cpp:239
+msgid "X Button 2"
+msgstr ""
+
+#: src/keycode.cpp:240
+msgid "Back"
+msgstr ""
+
+#: src/keycode.cpp:241
+msgid "Tab"
+msgstr ""
+
+#: src/keycode.cpp:242
+msgid "Clear"
+msgstr ""
+
+#: src/keycode.cpp:243
+msgid "Return"
+msgstr ""
+
+#: src/keycode.cpp:244
+msgid "Shift"
+msgstr ""
+
+#: src/keycode.cpp:245
+msgid "Control"
+msgstr ""
+
+#: src/keycode.cpp:246
+msgid "Menu"
+msgstr ""
+
+#: src/keycode.cpp:247
+msgid "Pause"
+msgstr ""
+
+#: src/keycode.cpp:248
+msgid "Capital"
+msgstr ""
+
+#: src/keycode.cpp:249
+msgid "Kana"
+msgstr ""
+
+#: src/keycode.cpp:250
+msgid "Junja"
+msgstr ""
+
+#: src/keycode.cpp:251
+msgid "Final"
+msgstr ""
+
+#: src/keycode.cpp:252
+msgid "Kanji"
+msgstr ""
+
+#: src/keycode.cpp:253
+msgid "Escape"
+msgstr ""
+
+#: src/keycode.cpp:254
+msgid "Convert"
+msgstr ""
+
+#: src/keycode.cpp:255
+msgid "Nonconvert"
+msgstr ""
+
+#: src/keycode.cpp:256
+msgid "Accept"
+msgstr ""
+
+#: src/keycode.cpp:257
+msgid "Mode Change"
+msgstr ""
+
+#: src/keycode.cpp:258
+msgid "Space"
+msgstr ""
+
+#: src/keycode.cpp:259
+msgid "Prior"
+msgstr ""
+
+#: src/keycode.cpp:260
+msgid "Next"
+msgstr ""
+
+#: src/keycode.cpp:261
+msgid "End"
+msgstr ""
+
+#: src/keycode.cpp:262
+msgid "Home"
+msgstr ""
+
+#: src/keycode.cpp:267
+msgid "Select"
+msgstr ""
+
+#: src/keycode.cpp:268
+msgid "Print"
+msgstr ""
+
+#: src/keycode.cpp:269
+msgid "Execute"
+msgstr ""
+
+#: src/keycode.cpp:270
+msgid "Snapshot"
+msgstr ""
+
+#: src/keycode.cpp:271
+msgid "Insert"
+msgstr ""
+
+#: src/keycode.cpp:272
+msgid "Delete"
+msgstr ""
+
+#: src/keycode.cpp:273
+msgid "Help"
+msgstr ""
+
+#: src/keycode.cpp:274
+msgid "0"
+msgstr ""
+
+#: src/keycode.cpp:275
+msgid "1"
+msgstr ""
+
+#: src/keycode.cpp:276
+msgid "2"
+msgstr ""
+
+#: src/keycode.cpp:277
+msgid "3"
+msgstr ""
+
+#: src/keycode.cpp:278
+msgid "4"
+msgstr ""
+
+#: src/keycode.cpp:279
+msgid "5"
+msgstr ""
+
+#: src/keycode.cpp:280
+msgid "6"
+msgstr ""
+
+#: src/keycode.cpp:281
+msgid "7"
+msgstr ""
+
+#: src/keycode.cpp:282
+msgid "8"
+msgstr ""
+
+#: src/keycode.cpp:283
+msgid "9"
+msgstr ""
+
+#: src/keycode.cpp:284
+msgid "A"
+msgstr ""
+
+#: src/keycode.cpp:285
+msgid "B"
+msgstr ""
+
+#: src/keycode.cpp:286
+msgid "C"
+msgstr ""
+
+#: src/keycode.cpp:287
+msgid "D"
+msgstr ""
+
+#: src/keycode.cpp:288
+msgid "E"
+msgstr ""
+
+#: src/keycode.cpp:289
+msgid "F"
+msgstr ""
+
+#: src/keycode.cpp:290
+msgid "G"
+msgstr ""
+
+#: src/keycode.cpp:291
+msgid "H"
+msgstr ""
+
+#: src/keycode.cpp:292
+msgid "I"
+msgstr ""
+
+#: src/keycode.cpp:293
+msgid "J"
+msgstr ""
+
+#: src/keycode.cpp:294
+msgid "K"
+msgstr ""
+
+#: src/keycode.cpp:295
+msgid "L"
+msgstr ""
+
+#: src/keycode.cpp:296
+msgid "M"
+msgstr ""
+
+#: src/keycode.cpp:297
+msgid "N"
+msgstr ""
+
+#: src/keycode.cpp:298
+msgid "O"
+msgstr ""
+
+#: src/keycode.cpp:299
+msgid "P"
+msgstr ""
+
+#: src/keycode.cpp:300
+msgid "Q"
+msgstr ""
+
+#: src/keycode.cpp:301
+msgid "R"
+msgstr ""
+
+#: src/keycode.cpp:302
+msgid "S"
+msgstr ""
+
+#: src/keycode.cpp:303
+msgid "T"
+msgstr ""
+
+#: src/keycode.cpp:304
+msgid "U"
+msgstr ""
+
+#: src/keycode.cpp:305
+msgid "V"
+msgstr ""
+
+#: src/keycode.cpp:306
+msgid "W"
+msgstr ""
+
+#: src/keycode.cpp:307
+msgid "X"
+msgstr ""
+
+#: src/keycode.cpp:308
+msgid "Y"
+msgstr ""
+
+#: src/keycode.cpp:309
+msgid "Z"
+msgstr ""
+
+#: src/keycode.cpp:310
 msgid "Left Windows"
 msgstr ""
 
-#: src/keycode.cpp:239
-msgid "Apps"
-msgstr ""
-
-#: src/keycode.cpp:239
-msgid "Numpad 0"
-msgstr ""
-
-#: src/keycode.cpp:239
-msgid "Numpad 1"
-msgstr ""
-
-#: src/keycode.cpp:239
+#: src/keycode.cpp:311
 msgid "Right Windows"
 msgstr ""
 
-#: src/keycode.cpp:239
+#: src/keycode.cpp:312
+msgid "Apps"
+msgstr ""
+
+#: src/keycode.cpp:313
 msgid "Sleep"
 msgstr ""
 
-#: src/keycode.cpp:240
+#: src/keycode.cpp:314
+msgid "Numpad 0"
+msgstr ""
+
+#: src/keycode.cpp:315
+msgid "Numpad 1"
+msgstr ""
+
+#: src/keycode.cpp:316
 msgid "Numpad 2"
 msgstr ""
 
-#: src/keycode.cpp:240
+#: src/keycode.cpp:317
 msgid "Numpad 3"
 msgstr ""
 
-#: src/keycode.cpp:240
+#: src/keycode.cpp:318
 msgid "Numpad 4"
 msgstr ""
 
-#: src/keycode.cpp:240
+#: src/keycode.cpp:319
 msgid "Numpad 5"
 msgstr ""
 
-#: src/keycode.cpp:240
+#: src/keycode.cpp:320
 msgid "Numpad 6"
 msgstr ""
 
-#: src/keycode.cpp:240
+#: src/keycode.cpp:321
 msgid "Numpad 7"
 msgstr ""
 
-#: src/keycode.cpp:241
-msgid "Numpad *"
-msgstr ""
-
-#: src/keycode.cpp:241
-msgid "Numpad +"
-msgstr ""
-
-#: src/keycode.cpp:241
-msgid "Numpad -"
-msgstr ""
-
-#: src/keycode.cpp:241
-msgid "Numpad /"
-msgstr ""
-
-#: src/keycode.cpp:241
+#: src/keycode.cpp:322
 msgid "Numpad 8"
 msgstr ""
 
-#: src/keycode.cpp:241
+#: src/keycode.cpp:323
 msgid "Numpad 9"
 msgstr ""
 
-#: src/keycode.cpp:245
+#: src/keycode.cpp:324
+msgid "Numpad *"
+msgstr ""
+
+#: src/keycode.cpp:325
+msgid "Numpad +"
+msgstr ""
+
+#: src/keycode.cpp:326 src/keycode.cpp:329
+msgid "Numpad /"
+msgstr ""
+
+#: src/keycode.cpp:327
+msgid "Numpad -"
+msgstr ""
+
+#: src/keycode.cpp:328
+msgid "Numpad ."
+msgstr ""
+
+#: src/keycode.cpp:330
+msgid "F10"
+msgstr ""
+
+#: src/keycode.cpp:331
+msgid "F11"
+msgstr ""
+
+#: src/keycode.cpp:332
+msgid "F12"
+msgstr ""
+
+#: src/keycode.cpp:333
+msgid "F13"
+msgstr ""
+
+#: src/keycode.cpp:334
+msgid "F14"
+msgstr ""
+
+#: src/keycode.cpp:335
+msgid "F15"
+msgstr ""
+
+#: src/keycode.cpp:336
+msgid "F16"
+msgstr ""
+
+#: src/keycode.cpp:337
+msgid "F17"
+msgstr ""
+
+#: src/keycode.cpp:338
+msgid "F18"
+msgstr ""
+
+#: src/keycode.cpp:339
+msgid "F19"
+msgstr ""
+
+#: src/keycode.cpp:340
+msgid "F20"
+msgstr ""
+
+#: src/keycode.cpp:341
+msgid "F21"
+msgstr ""
+
+#: src/keycode.cpp:342
+msgid "F22"
+msgstr ""
+
+#: src/keycode.cpp:343
+msgid "F23"
+msgstr ""
+
+#: src/keycode.cpp:344
+msgid "F24"
+msgstr ""
+
+#: src/keycode.cpp:345
 msgid "Num Lock"
 msgstr ""
 
-#: src/keycode.cpp:245
+#: src/keycode.cpp:346
 msgid "Scroll Lock"
 msgstr ""
 
-#: src/keycode.cpp:246
+#: src/keycode.cpp:347
 msgid "Left Shift"
 msgstr ""
 
-#: src/keycode.cpp:246
+#: src/keycode.cpp:348
 msgid "Right Shift"
 msgstr ""
 
-#: src/keycode.cpp:247
+#: src/keycode.cpp:349
 msgid "Left Control"
 msgstr ""
 
-#: src/keycode.cpp:247
-msgid "Left Menu"
-msgstr ""
-
-#: src/keycode.cpp:247
+#: src/keycode.cpp:350
 msgid "Right Control"
 msgstr ""
 
-#: src/keycode.cpp:247
+#: src/keycode.cpp:351
+msgid "Left Menu"
+msgstr ""
+
+#: src/keycode.cpp:352
 msgid "Right Menu"
 msgstr ""
 
-#: src/keycode.cpp:249
-msgid "Comma"
-msgstr ""
-
-#: src/keycode.cpp:249
-msgid "Minus"
-msgstr ""
-
-#: src/keycode.cpp:249
-msgid "Period"
-msgstr ""
-
-#: src/keycode.cpp:249
+#: src/keycode.cpp:353
 msgid "Plus"
 msgstr ""
 
-#: src/keycode.cpp:253
+#: src/keycode.cpp:354
+msgid "Comma"
+msgstr ""
+
+#: src/keycode.cpp:355
+msgid "Minus"
+msgstr ""
+
+#: src/keycode.cpp:356
+msgid "Period"
+msgstr ""
+
+#: src/keycode.cpp:357
 msgid "Attn"
 msgstr ""
 
-#: src/keycode.cpp:253
+#: src/keycode.cpp:358
 msgid "CrSel"
 msgstr ""
 
-#: src/keycode.cpp:254
-msgid "Erase OEF"
-msgstr ""
-
-#: src/keycode.cpp:254
+#: src/keycode.cpp:359
 msgid "ExSel"
 msgstr ""
 
-#: src/keycode.cpp:254
-msgid "OEM Clear"
+#: src/keycode.cpp:360
+msgid "Erase OEF"
 msgstr ""
 
-#: src/keycode.cpp:254
-msgid "PA1"
-msgstr ""
-
-#: src/keycode.cpp:254
+#: src/keycode.cpp:361
 msgid "Play"
 msgstr ""
 
-#: src/keycode.cpp:254
+#: src/keycode.cpp:362
 msgid "Zoom"
 msgstr ""
 
+#: src/keycode.cpp:363
+msgid "PA1"
+msgstr ""
+
+#: src/keycode.cpp:364
+msgid "OEM Clear"
+msgstr ""
+
 #: src/main.cpp:1131
 msgid "Setting Up UI"
 msgstr ""
@@ -4331,30 +4597,62 @@ msgstr ""
 msgid "Setting Up Sound"
 msgstr ""
 
-#: src/mapnode.cpp:282
+#: src/mapnode.cpp:285
 msgid "Loading Base MapNodes"
 msgstr ""
 
-#: src/mapnode.cpp:286
+#: src/mapnode.cpp:289
 msgid "Loading Circuit MapNodes"
 msgstr ""
 
-#: src/mapnode.cpp:290
+#: src/mapnode.cpp:293
 msgid "Loading Plant MapNodes"
 msgstr ""
 
-#: src/mapnode.cpp:294
+#: src/mapnode.cpp:297
 msgid "Loading Farming MapNodes"
 msgstr ""
 
-#: src/mapnode.cpp:298
+#: src/mapnode.cpp:301
 msgid "Loading Decorative MapNodes"
 msgstr ""
 
-#: src/mapnode.cpp:302
+#: src/mapnode.cpp:305
 msgid "Loading Interactive MapNodes"
 msgstr ""
 
-#: src/mapnode.cpp:306
+#: src/mapnode.cpp:309
 msgid "Loading Special MapNodes"
 msgstr ""
+
+#: src/mineral.cpp:93
+msgid "Coal"
+msgstr ""
+
+#: src/mineral.cpp:99
+msgid "Iron"
+msgstr ""
+
+#: src/mineral.cpp:106
+msgid "Tin"
+msgstr ""
+
+#: src/mineral.cpp:113
+msgid "Copper"
+msgstr ""
+
+#: src/mineral.cpp:121
+msgid "Silver"
+msgstr ""
+
+#: src/mineral.cpp:128
+msgid "Gold"
+msgstr ""
+
+#: src/mineral.cpp:135
+msgid "Quartz"
+msgstr ""
+
+#: src/mineral.cpp:157
+msgid "Turquoise"
+msgstr ""
diff --git a/src/content_mapnode.cpp b/src/content_mapnode.cpp
index 0f6694f..7973565 100644
--- a/src/content_mapnode.cpp
+++ b/src/content_mapnode.cpp
@@ -206,14 +206,27 @@ void content_mapnode_init(bool repeat)
 	f->draw_type = CDT_CUBELIKE;
 	f->is_ground_content = true;
 	f->often_contains_mineral = true;
-	f->dug_item = std::string("MaterialItem2 ")+itos(CONTENT_LIMESTONE)+" 1";
+	f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
+	f->cook_result = std::string("MaterialItem2 ")+itos(CONTENT_MARBLE)+" 1";
 	f->type = CMT_STONE;
 	f->hardness = 0.6;
 	if (invisible_stone)
 		f->solidness = 0; // For debugging, hides regular stone
 	lists::add("creative",i);
+	lists::add("cooking",i);
 	lists::add("decrafting",i);
 
+	i = CONTENT_MARBLE;
+	f = &content_features(i);
+	f->description = wgettext("Marble");
+	f->setAllTextures("marble.png");
+	f->setInventoryTextureCube("marble.png", "marble.png", "marble.png");
+	f->draw_type = CDT_CUBELIKE;
+	f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
+	f->type = CMT_STONE;
+	f->hardness = 1.0;
+	lists::add("creative",i);
+
 	i = CONTENT_ROCK;
 	f = &content_features(i);
 	f->description = wgettext("Rock");
diff --git a/src/content_mapnode.h b/src/content_mapnode.h
index 5bdfecc..6b2d680 100644
--- a/src/content_mapnode.h
+++ b/src/content_mapnode.h
@@ -57,7 +57,8 @@ MapNode mapnode_translate_to_internal(MapNode n_from, u8 version);
 #define CONTENT_TABLE 0x008
 #define CONTENT_WATERSOURCE 0x009
 #define CONTENT_FORGE_FIRE 0x00A
-// FREE 0x00B-0x00C
+#define CONTENT_MARBLE 0x00B
+// FREE 0x00C
 #define CONTENT_SAFE 0x00D
 #define CONTENT_SIGN_WALL 0x00E
 #define CONTENT_CHEST 0x00F
@@ -95,7 +96,12 @@ MapNode mapnode_translate_to_internal(MapNode n_from, u8 version);
 #define CONTENT_LIMESTONE_WALL 0x02C
 // FREE 0x02D-0x07C
 // 0x7D-0x7F reserved values, air, ignore, etc
-// FREE 0x80-0x7F6
+#define CONTENT_CHAIR_CENTRE 0x080
+#define CONTENT_CHAIR_ENDL 0x081
+#define CONTENT_CHAIR_ENDR 0x082
+#define CONTENT_CHAIR_INNER 0x083
+#define CONTENT_CHAIR_OUTER 0x084
+// FREE 0x085-0x7F6
 #define CONTENT_LEAVES_SNOWY 0x7F7
 #define CONTENT_TRIMMED_LEAVES_AUTUMN 0x7F8
 #define CONTENT_TRIMMED_LEAVES_WINTER 0x7F9
diff --git a/src/content_mapnode_furniture.cpp b/src/content_mapnode_furniture.cpp
index 49501c3..7a8bdf3 100644
--- a/src/content_mapnode_furniture.cpp
+++ b/src/content_mapnode_furniture.cpp
@@ -160,6 +160,7 @@ void content_mapnode_furniture(bool repeat)
 	f->type = CMT_DIRT;
 	f->hardness = 1.0;
 	f->onpunch_replace_node = CONTENT_COUCH_ENDL;
+	f->onpunch_replace_respects_borderstone = true;
 	content_nodebox_couch_centre(f);
 	f->setInventoryTextureNodeBox(i,"cotton.png", "cotton.png", "cotton.png");
 	f->suffocation_per_second = 0;
@@ -179,6 +180,7 @@ void content_mapnode_furniture(bool repeat)
 	f->type = CMT_DIRT;
 	f->hardness = 1.0;
 	f->onpunch_replace_node = CONTENT_COUCH_ENDR;
+	f->onpunch_replace_respects_borderstone = true;
 	content_nodebox_couch_left(f);
 	f->setInventoryTextureNodeBox(i,"cotton.png", "cotton.png", "cotton.png");
 	f->suffocation_per_second = 0;
@@ -198,6 +200,7 @@ void content_mapnode_furniture(bool repeat)
 	f->type = CMT_DIRT;
 	f->hardness = 1.0;
 	f->onpunch_replace_node = CONTENT_COUCH_INNER;
+	f->onpunch_replace_respects_borderstone = true;
 	content_nodebox_couch_right(f);
 	f->setInventoryTextureNodeBox(i,"cotton.png", "cotton.png", "cotton.png");
 	f->suffocation_per_second = 0;
@@ -217,6 +220,7 @@ void content_mapnode_furniture(bool repeat)
 	f->type = CMT_DIRT;
 	f->hardness = 1.0;
 	f->onpunch_replace_node = CONTENT_COUCH_OUTER;
+	f->onpunch_replace_respects_borderstone = true;
 	content_nodebox_couch_inner(f);
 	f->setInventoryTextureNodeBox(i,"cotton.png", "cotton.png", "cotton.png");
 	f->suffocation_per_second = 0;
@@ -236,6 +240,7 @@ void content_mapnode_furniture(bool repeat)
 	f->type = CMT_DIRT;
 	f->hardness = 1.0;
 	f->onpunch_replace_node = CONTENT_COUCH_CHAIR;
+	f->onpunch_replace_respects_borderstone = true;
 	content_nodebox_couch_outer(f);
 	f->setInventoryTextureNodeBox(i,"cotton.png", "cotton.png", "cotton.png");
 	f->suffocation_per_second = 0;
@@ -255,6 +260,7 @@ void content_mapnode_furniture(bool repeat)
 	f->type = CMT_DIRT;
 	f->hardness = 1.0;
 	f->onpunch_replace_node = CONTENT_COUCH_CENTRE;
+	f->onpunch_replace_respects_borderstone = true;
 	content_nodebox_couch_chair(f);
 	f->setInventoryTextureNodeBox(i,"cotton.png", "cotton.png", "cotton.png");
 	crafting::setVRecipe(CONTENT_COTTON,CONTENT_COUCH_CHAIR,2);
@@ -284,6 +290,7 @@ void content_mapnode_furniture(bool repeat)
 	f->type = CMT_DIRT;
 	f->hardness = 1.0;
 	f->onpunch_replace_node = CONTENT_COUCH_ENDL_BLUE;
+	f->onpunch_replace_respects_borderstone = true;
 	content_nodebox_couch_centre(f);
 	f->setInventoryTextureNodeBox(i,"cotton_blue.png", "cotton_blue.png", "cotton_blue.png");
 	f->suffocation_per_second = 0;
@@ -303,6 +310,7 @@ void content_mapnode_furniture(bool repeat)
 	f->type = CMT_DIRT;
 	f->hardness = 1.0;
 	f->onpunch_replace_node = CONTENT_COUCH_ENDR_BLUE;
+	f->onpunch_replace_respects_borderstone = true;
 	content_nodebox_couch_left(f);
 	f->setInventoryTextureNodeBox(i,"cotton_blue.png", "cotton_blue.png", "cotton_blue.png");
 	f->suffocation_per_second = 0;
@@ -322,6 +330,7 @@ void content_mapnode_furniture(bool repeat)
 	f->type = CMT_DIRT;
 	f->hardness = 1.0;
 	f->onpunch_replace_node = CONTENT_COUCH_INNER_BLUE;
+	f->onpunch_replace_respects_borderstone = true;
 	content_nodebox_couch_right(f);
 	f->setInventoryTextureNodeBox(i,"cotton_blue.png", "cotton_blue.png", "cotton_blue.png");
 	f->suffocation_per_second = 0;
@@ -341,6 +350,7 @@ void content_mapnode_furniture(bool repeat)
 	f->type = CMT_DIRT;
 	f->hardness = 1.0;
 	f->onpunch_replace_node = CONTENT_COUCH_OUTER_BLUE;
+	f->onpunch_replace_respects_borderstone = true;
 	content_nodebox_couch_inner(f);
 	f->setInventoryTextureNodeBox(i,"cotton_blue.png", "cotton_blue.png", "cotton_blue.png");
 	f->suffocation_per_second = 0;
@@ -360,6 +370,7 @@ void content_mapnode_furniture(bool repeat)
 	f->type = CMT_DIRT;
 	f->hardness = 1.0;
 	f->onpunch_replace_node = CONTENT_COUCH_CHAIR_BLUE;
+	f->onpunch_replace_respects_borderstone = true;
 	content_nodebox_couch_outer(f);
 	f->setInventoryTextureNodeBox(i,"cotton_blue.png", "cotton_blue.png", "cotton_blue.png");
 	f->suffocation_per_second = 0;
@@ -379,6 +390,7 @@ void content_mapnode_furniture(bool repeat)
 	f->type = CMT_DIRT;
 	f->hardness = 1.0;
 	f->onpunch_replace_node = CONTENT_COUCH_CENTRE_BLUE;
+	f->onpunch_replace_respects_borderstone = true;
 	content_nodebox_couch_chair(f);
 	f->setInventoryTextureNodeBox(i,"cotton_blue.png", "cotton_blue.png", "cotton_blue.png");
 	crafting::setVRecipe(CONTENT_COTTON_BLUE,CONTENT_COUCH_CHAIR_BLUE,2);
@@ -402,6 +414,7 @@ void content_mapnode_furniture(bool repeat)
 	f->type = CMT_DIRT;
 	f->hardness = 1.0;
 	f->onpunch_replace_node = CONTENT_COUCH_ENDL_GREEN;
+	f->onpunch_replace_respects_borderstone = true;
 	content_nodebox_couch_centre(f);
 	f->setInventoryTextureNodeBox(i,"cotton_green.png", "cotton_green.png", "cotton_green.png");
 	f->suffocation_per_second = 0;
@@ -421,6 +434,7 @@ void content_mapnode_furniture(bool repeat)
 	f->type = CMT_DIRT;
 	f->hardness = 1.0;
 	f->onpunch_replace_node = CONTENT_COUCH_ENDR_GREEN;
+	f->onpunch_replace_respects_borderstone = true;
 	content_nodebox_couch_left(f);
 	f->setInventoryTextureNodeBox(i,"cotton_green.png", "cotton_green.png", "cotton_green.png");
 	f->suffocation_per_second = 0;
@@ -440,6 +454,7 @@ void content_mapnode_furniture(bool repeat)
 	f->type = CMT_DIRT;
 	f->hardness = 1.0;
 	f->onpunch_replace_node = CONTENT_COUCH_INNER_GREEN;
+	f->onpunch_replace_respects_borderstone = true;
 	content_nodebox_couch_right(f);
 	f->setInventoryTextureNodeBox(i,"cotton_green.png", "cotton_green.png", "cotton_green.png");
 	f->suffocation_per_second = 0;
@@ -459,6 +474,7 @@ void content_mapnode_furniture(bool repeat)
 	f->type = CMT_DIRT;
 	f->hardness = 1.0;
 	f->onpunch_replace_node = CONTENT_COUCH_OUTER_GREEN;
+	f->onpunch_replace_respects_borderstone = true;
 	content_nodebox_couch_inner(f);
 	f->setInventoryTextureNodeBox(i,"cotton_green.png", "cotton_green.png", "cotton_green.png");
 	f->suffocation_per_second = 0;
@@ -478,6 +494,7 @@ void content_mapnode_furniture(bool repeat)
 	f->type = CMT_DIRT;
 	f->hardness = 1.0;
 	f->onpunch_replace_node = CONTENT_COUCH_CHAIR_GREEN;
+	f->onpunch_replace_respects_borderstone = true;
 	content_nodebox_couch_outer(f);
 	f->setInventoryTextureNodeBox(i,"cotton_green.png", "cotton_green.png", "cotton_green.png");
 	f->suffocation_per_second = 0;
@@ -497,6 +514,7 @@ void content_mapnode_furniture(bool repeat)
 	f->type = CMT_DIRT;
 	f->hardness = 1.0;
 	f->onpunch_replace_node = CONTENT_COUCH_CENTRE_GREEN;
+	f->onpunch_replace_respects_borderstone = true;
 	content_nodebox_couch_chair(f);
 	f->setInventoryTextureNodeBox(i,"cotton_green.png", "cotton_green.png", "cotton_green.png");
 	crafting::setVRecipe(CONTENT_COTTON_GREEN,CONTENT_COUCH_CHAIR_GREEN,2);
@@ -520,6 +538,7 @@ void content_mapnode_furniture(bool repeat)
 	f->type = CMT_DIRT;
 	f->hardness = 1.0;
 	f->onpunch_replace_node = CONTENT_COUCH_ENDL_ORANGE;
+	f->onpunch_replace_respects_borderstone = true;
 	content_nodebox_couch_centre(f);
 	f->setInventoryTextureNodeBox(i,"cotton_orange.png", "cotton_orange.png", "cotton_orange.png");
 	f->suffocation_per_second = 0;
@@ -539,6 +558,7 @@ void content_mapnode_furniture(bool repeat)
 	f->type = CMT_DIRT;
 	f->hardness = 1.0;
 	f->onpunch_replace_node = CONTENT_COUCH_ENDR_ORANGE;
+	f->onpunch_replace_respects_borderstone = true;
 	content_nodebox_couch_left(f);
 	f->setInventoryTextureNodeBox(i,"cotton_orange.png", "cotton_orange.png", "cotton_orange.png");
 	f->suffocation_per_second = 0;
@@ -558,6 +578,7 @@ void content_mapnode_furniture(bool repeat)
 	f->type = CMT_DIRT;
 	f->hardness = 1.0;
 	f->onpunch_replace_node = CONTENT_COUCH_INNER_ORANGE;
+	f->onpunch_replace_respects_borderstone = true;
 	content_nodebox_couch_right(f);
 	f->setInventoryTextureNodeBox(i,"cotton_orange.png", "cotton_orange.png", "cotton_orange.png");
 	f->suffocation_per_second = 0;
@@ -577,6 +598,7 @@ void content_mapnode_furniture(bool repeat)
 	f->type = CMT_DIRT;
 	f->hardness = 1.0;
 	f->onpunch_replace_node = CONTENT_COUCH_OUTER_ORANGE;
+	f->onpunch_replace_respects_borderstone = true;
 	content_nodebox_couch_inner(f);
 	f->setInventoryTextureNodeBox(i,"cotton_orange.png", "cotton_orange.png", "cotton_orange.png");
 	f->suffocation_per_second = 0;
@@ -596,6 +618,7 @@ void content_mapnode_furniture(bool repeat)
 	f->type = CMT_DIRT;
 	f->hardness = 1.0;
 	f->onpunch_replace_node = CONTENT_COUCH_CHAIR_ORANGE;
+	f->onpunch_replace_respects_borderstone = true;
 	content_nodebox_couch_outer(f);
 	f->setInventoryTextureNodeBox(i,"cotton_orange.png", "cotton_orange.png", "cotton_orange.png");
 	f->suffocation_per_second = 0;
@@ -615,6 +638,7 @@ void content_mapnode_furniture(bool repeat)
 	f->type = CMT_DIRT;
 	f->hardness = 1.0;
 	f->onpunch_replace_node = CONTENT_COUCH_CENTRE_ORANGE;
+	f->onpunch_replace_respects_borderstone = true;
 	content_nodebox_couch_chair(f);
 	f->setInventoryTextureNodeBox(i,"cotton_orange.png", "cotton_orange.png", "cotton_orange.png");
 	crafting::setVRecipe(CONTENT_COTTON_ORANGE,CONTENT_COUCH_CHAIR_ORANGE,2);
@@ -638,6 +662,7 @@ void content_mapnode_furniture(bool repeat)
 	f->type = CMT_DIRT;
 	f->hardness = 1.0;
 	f->onpunch_replace_node = CONTENT_COUCH_ENDL_PURPLE;
+	f->onpunch_replace_respects_borderstone = true;
 	content_nodebox_couch_centre(f);
 	f->setInventoryTextureNodeBox(i,"cotton_purple.png", "cotton_purple.png", "cotton_purple.png");
 	f->suffocation_per_second = 0;
@@ -657,6 +682,7 @@ void content_mapnode_furniture(bool repeat)
 	f->type = CMT_DIRT;
 	f->hardness = 1.0;
 	f->onpunch_replace_node = CONTENT_COUCH_ENDR_PURPLE;
+	f->onpunch_replace_respects_borderstone = true;
 	content_nodebox_couch_left(f);
 	f->setInventoryTextureNodeBox(i,"cotton_purple.png", "cotton_purple.png", "cotton_purple.png");
 	f->suffocation_per_second = 0;
@@ -676,6 +702,7 @@ void content_mapnode_furniture(bool repeat)
 	f->type = CMT_DIRT;
 	f->hardness = 1.0;
 	f->onpunch_replace_node = CONTENT_COUCH_INNER_PURPLE;
+	f->onpunch_replace_respects_borderstone = true;
 	content_nodebox_couch_right(f);
 	f->setInventoryTextureNodeBox(i,"cotton_purple.png", "cotton_purple.png", "cotton_purple.png");
 	f->suffocation_per_second = 0;
@@ -695,6 +722,7 @@ void content_mapnode_furniture(bool repeat)
 	f->type = CMT_DIRT;
 	f->hardness = 1.0;
 	f->onpunch_replace_node = CONTENT_COUCH_OUTER_PURPLE;
+	f->onpunch_replace_respects_borderstone = true;
 	content_nodebox_couch_inner(f);
 	f->setInventoryTextureNodeBox(i,"cotton_purple.png", "cotton_purple.png", "cotton_purple.png");
 	f->suffocation_per_second = 0;
@@ -714,6 +742,7 @@ void content_mapnode_furniture(bool repeat)
 	f->type = CMT_DIRT;
 	f->hardness = 1.0;
 	f->onpunch_replace_node = CONTENT_COUCH_CHAIR_PURPLE;
+	f->onpunch_replace_respects_borderstone = true;
 	content_nodebox_couch_outer(f);
 	f->setInventoryTextureNodeBox(i,"cotton_purple.png", "cotton_purple.png", "cotton_purple.png");
 	f->suffocation_per_second = 0;
@@ -733,6 +762,7 @@ void content_mapnode_furniture(bool repeat)
 	f->type = CMT_DIRT;
 	f->hardness = 1.0;
 	f->onpunch_replace_node = CONTENT_COUCH_CENTRE_PURPLE;
+	f->onpunch_replace_respects_borderstone = true;
 	content_nodebox_couch_chair(f);
 	f->setInventoryTextureNodeBox(i,"cotton_purple.png", "cotton_purple.png", "cotton_purple.png");
 	crafting::setVRecipe(CONTENT_COTTON_PURPLE,CONTENT_COUCH_CHAIR_PURPLE,2);
@@ -756,6 +786,7 @@ void content_mapnode_furniture(bool repeat)
 	f->type = CMT_DIRT;
 	f->hardness = 1.0;
 	f->onpunch_replace_node = CONTENT_COUCH_ENDL_RED;
+	f->onpunch_replace_respects_borderstone = true;
 	content_nodebox_couch_centre(f);
 	f->setInventoryTextureNodeBox(i,"cotton_red.png", "cotton_red.png", "cotton_red.png");
 	f->suffocation_per_second = 0;
@@ -775,6 +806,7 @@ void content_mapnode_furniture(bool repeat)
 	f->type = CMT_DIRT;
 	f->hardness = 1.0;
 	f->onpunch_replace_node = CONTENT_COUCH_ENDR_RED;
+	f->onpunch_replace_respects_borderstone = true;
 	content_nodebox_couch_left(f);
 	f->setInventoryTextureNodeBox(i,"cotton_red.png", "cotton_red.png", "cotton_red.png");
 	f->suffocation_per_second = 0;
@@ -794,6 +826,7 @@ void content_mapnode_furniture(bool repeat)
 	f->type = CMT_DIRT;
 	f->hardness = 1.0;
 	f->onpunch_replace_node = CONTENT_COUCH_INNER_RED;
+	f->onpunch_replace_respects_borderstone = true;
 	content_nodebox_couch_right(f);
 	f->setInventoryTextureNodeBox(i,"cotton_red.png", "cotton_red.png", "cotton_red.png");
 	f->suffocation_per_second = 0;
@@ -813,6 +846,7 @@ void content_mapnode_furniture(bool repeat)
 	f->type = CMT_DIRT;
 	f->hardness = 1.0;
 	f->onpunch_replace_node = CONTENT_COUCH_OUTER_RED;
+	f->onpunch_replace_respects_borderstone = true;
 	content_nodebox_couch_inner(f);
 	f->setInventoryTextureNodeBox(i,"cotton_red.png", "cotton_red.png", "cotton_red.png");
 	f->suffocation_per_second = 0;
@@ -832,6 +866,7 @@ void content_mapnode_furniture(bool repeat)
 	f->type = CMT_DIRT;
 	f->hardness = 1.0;
 	f->onpunch_replace_node = CONTENT_COUCH_CHAIR_RED;
+	f->onpunch_replace_respects_borderstone = true;
 	content_nodebox_couch_outer(f);
 	f->setInventoryTextureNodeBox(i,"cotton_red.png", "cotton_red.png", "cotton_red.png");
 	f->suffocation_per_second = 0;
@@ -851,6 +886,7 @@ void content_mapnode_furniture(bool repeat)
 	f->type = CMT_DIRT;
 	f->hardness = 1.0;
 	f->onpunch_replace_node = CONTENT_COUCH_CENTRE_RED;
+	f->onpunch_replace_respects_borderstone = true;
 	content_nodebox_couch_chair(f);
 	f->setInventoryTextureNodeBox(i,"cotton_red.png", "cotton_red.png", "cotton_red.png");
 	crafting::setVRecipe(CONTENT_COTTON_RED,CONTENT_COUCH_CHAIR_RED,2);
@@ -874,6 +910,7 @@ void content_mapnode_furniture(bool repeat)
 	f->type = CMT_DIRT;
 	f->hardness = 1.0;
 	f->onpunch_replace_node = CONTENT_COUCH_ENDL_YELLOW;
+	f->onpunch_replace_respects_borderstone = true;
 	content_nodebox_couch_centre(f);
 	f->setInventoryTextureNodeBox(i,"cotton_yellow.png", "cotton_yellow.png", "cotton_yellow.png");
 	f->suffocation_per_second = 0;
@@ -893,6 +930,7 @@ void content_mapnode_furniture(bool repeat)
 	f->type = CMT_DIRT;
 	f->hardness = 1.0;
 	f->onpunch_replace_node = CONTENT_COUCH_ENDR_YELLOW;
+	f->onpunch_replace_respects_borderstone = true;
 	content_nodebox_couch_left(f);
 	f->setInventoryTextureNodeBox(i,"cotton_yellow.png", "cotton_yellow.png", "cotton_yellow.png");
 	f->suffocation_per_second = 0;
@@ -912,6 +950,7 @@ void content_mapnode_furniture(bool repeat)
 	f->type = CMT_DIRT;
 	f->hardness = 1.0;
 	f->onpunch_replace_node = CONTENT_COUCH_INNER_YELLOW;
+	f->onpunch_replace_respects_borderstone = true;
 	content_nodebox_couch_right(f);
 	f->setInventoryTextureNodeBox(i,"cotton_yellow.png", "cotton_yellow.png", "cotton_yellow.png");
 	f->suffocation_per_second = 0;
@@ -931,6 +970,7 @@ void content_mapnode_furniture(bool repeat)
 	f->type = CMT_DIRT;
 	f->hardness = 1.0;
 	f->onpunch_replace_node = CONTENT_COUCH_OUTER_YELLOW;
+	f->onpunch_replace_respects_borderstone = true;
 	content_nodebox_couch_inner(f);
 	f->setInventoryTextureNodeBox(i,"cotton_yellow.png", "cotton_yellow.png", "cotton_yellow.png");
 	f->suffocation_per_second = 0;
@@ -950,6 +990,7 @@ void content_mapnode_furniture(bool repeat)
 	f->type = CMT_DIRT;
 	f->hardness = 1.0;
 	f->onpunch_replace_node = CONTENT_COUCH_CHAIR_YELLOW;
+	f->onpunch_replace_respects_borderstone = true;
 	content_nodebox_couch_outer(f);
 	f->setInventoryTextureNodeBox(i,"cotton_yellow.png", "cotton_yellow.png", "cotton_yellow.png");
 	f->suffocation_per_second = 0;
@@ -969,6 +1010,7 @@ void content_mapnode_furniture(bool repeat)
 	f->type = CMT_DIRT;
 	f->hardness = 1.0;
 	f->onpunch_replace_node = CONTENT_COUCH_CENTRE_YELLOW;
+	f->onpunch_replace_respects_borderstone = true;
 	content_nodebox_couch_chair(f);
 	f->setInventoryTextureNodeBox(i,"cotton_yellow.png", "cotton_yellow.png", "cotton_yellow.png");
 	crafting::setVRecipe(CONTENT_COTTON_YELLOW,CONTENT_COUCH_CHAIR_YELLOW,2);
@@ -992,6 +1034,7 @@ void content_mapnode_furniture(bool repeat)
 	f->type = CMT_DIRT;
 	f->hardness = 1.0;
 	f->onpunch_replace_node = CONTENT_COUCH_ENDL_BLACK;
+	f->onpunch_replace_respects_borderstone = true;
 	content_nodebox_couch_centre(f);
 	f->setInventoryTextureNodeBox(i,"cotton_black.png", "cotton_black.png", "cotton_black.png");
 	f->suffocation_per_second = 0;
@@ -1011,6 +1054,7 @@ void content_mapnode_furniture(bool repeat)
 	f->type = CMT_DIRT;
 	f->hardness = 1.0;
 	f->onpunch_replace_node = CONTENT_COUCH_ENDR_BLACK;
+	f->onpunch_replace_respects_borderstone = true;
 	content_nodebox_couch_left(f);
 	f->setInventoryTextureNodeBox(i,"cotton_black.png", "cotton_black.png", "cotton_black.png");
 	f->suffocation_per_second = 0;
@@ -1030,6 +1074,7 @@ void content_mapnode_furniture(bool repeat)
 	f->type = CMT_DIRT;
 	f->hardness = 1.0;
 	f->onpunch_replace_node = CONTENT_COUCH_INNER_BLACK;
+	f->onpunch_replace_respects_borderstone = true;
 	content_nodebox_couch_right(f);
 	f->setInventoryTextureNodeBox(i,"cotton_black.png", "cotton_black.png", "cotton_black.png");
 	f->suffocation_per_second = 0;
@@ -1049,6 +1094,7 @@ void content_mapnode_furniture(bool repeat)
 	f->type = CMT_DIRT;
 	f->hardness = 1.0;
 	f->onpunch_replace_node = CONTENT_COUCH_OUTER_BLACK;
+	f->onpunch_replace_respects_borderstone = true;
 	content_nodebox_couch_inner(f);
 	f->setInventoryTextureNodeBox(i,"cotton_black.png", "cotton_black.png", "cotton_black.png");
 	f->suffocation_per_second = 0;
@@ -1068,6 +1114,7 @@ void content_mapnode_furniture(bool repeat)
 	f->type = CMT_DIRT;
 	f->hardness = 1.0;
 	f->onpunch_replace_node = CONTENT_COUCH_CHAIR_BLACK;
+	f->onpunch_replace_respects_borderstone = true;
 	content_nodebox_couch_outer(f);
 	f->setInventoryTextureNodeBox(i,"cotton_black.png", "cotton_black.png", "cotton_black.png");
 	f->suffocation_per_second = 0;
@@ -1087,6 +1134,7 @@ void content_mapnode_furniture(bool repeat)
 	f->type = CMT_DIRT;
 	f->hardness = 1.0;
 	f->onpunch_replace_node = CONTENT_COUCH_CENTRE_BLACK;
+	f->onpunch_replace_respects_borderstone = true;
 	content_nodebox_couch_chair(f);
 	f->setInventoryTextureNodeBox(i,"cotton_black.png", "cotton_black.png", "cotton_black.png");
 	crafting::setVRecipe(CONTENT_COTTON_BLACK,CONTENT_COUCH_CHAIR_BLACK,2);
@@ -1110,24 +1158,9 @@ void content_mapnode_furniture(bool repeat)
 	f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
 	f->flammable = 1; // can be replaced by fire if the node under it is set on fire
 	f->fuel_time = 30/32;
-	f->setNodeBox(NodeBox(
-		v3s16(0,1,0),v3f(0,0,0),-0.3*BS, -0.5*BS, 0.20*BS, -0.2*BS, 0.5*BS, 0.30*BS
-	));
-	f->addNodeBox(NodeBox(
-		v3s16(0,1,0),v3f(0,0,0),0.2*BS, -0.5*BS, 0.20*BS, 0.3*BS, 0.5*BS, 0.30*BS
-	));
-	f->addNodeBox(NodeBox(
-		v3s16(0,1,0),v3f(0,0,0),-0.3*BS, -0.5*BS, -0.30*BS, -0.2*BS, -0.1*BS, -0.20*BS
-	));
-	f->addNodeBox(NodeBox(
-		v3s16(0,1,0),v3f(0,0,0),0.2*BS, -0.5*BS, -0.30*BS, 0.3*BS, -0.1*BS, -0.20*BS
-	));
-	f->addNodeBox(NodeBox(
-		v3s16(0,1,0),v3f(0,0,0),-0.3*BS, -0.1*BS, -0.30*BS, 0.3*BS, 0.0*BS, 0.20*BS
-	));
-	f->addNodeBox(NodeBox(
-		v3s16(0,1,0),v3f(0,0,0),-0.2*BS, 0.1*BS, 0.25*BS, 0.2*BS, 0.4*BS, 0.26*BS
-	));
+	content_nodebox_chair(f);
+	f->onpunch_replace_node = CONTENT_CHAIR_CENTRE;
+	f->onpunch_replace_respects_borderstone = true;
 	f->setInventoryTextureNodeBox(i,"pine.png", "pine.png", "pine.png");
 	f->type = CMT_WOOD;
 	f->hardness = 0.25;
@@ -1144,6 +1177,126 @@ void content_mapnode_furniture(bool repeat)
 	lists::add("creative",i);
 	f->suffocation_per_second = 0;
 
+	i = CONTENT_CHAIR_CENTRE;
+	f = &content_features(i);
+	f->description = wgettext("Chair");
+	f->setAllTextures("pine.png");
+	f->param_type = CPT_LIGHT;
+	f->param2_type = CPT_FACEDIR_SIMPLE;
+	f->draw_type = CDT_NODEBOX;
+	f->light_propagates = true;
+	f->air_equivalent = true;
+	f->sunlight_propagates = true;
+	f->rotate_tile_with_nodebox = true;
+	f->solidness = 0; // drawn separately, makes no faces
+	f->dug_item = std::string("MaterialItem2 ")+itos(CONTENT_CHAIR)+" 1";
+	f->flammable = 1; // can be replaced by fire if the node under it is set on fire
+	f->fuel_time = 30/32;
+	content_nodebox_chair_centre(f);
+	f->onpunch_replace_node = CONTENT_CHAIR_ENDL;
+	f->onpunch_replace_respects_borderstone = true;
+	f->setInventoryTextureNodeBox(i,"pine.png", "pine.png", "pine.png");
+	f->type = CMT_WOOD;
+	f->hardness = 0.25;
+	f->pressure_type = CST_CRUSHABLE;
+	f->suffocation_per_second = 0;
+
+	i = CONTENT_CHAIR_ENDL;
+	f = &content_features(i);
+	f->description = wgettext("Chair");
+	f->setAllTextures("pine.png");
+	f->param_type = CPT_LIGHT;
+	f->param2_type = CPT_FACEDIR_SIMPLE;
+	f->draw_type = CDT_NODEBOX;
+	f->light_propagates = true;
+	f->air_equivalent = true;
+	f->sunlight_propagates = true;
+	f->rotate_tile_with_nodebox = true;
+	f->solidness = 0; // drawn separately, makes no faces
+	f->dug_item = std::string("MaterialItem2 ")+itos(CONTENT_CHAIR)+" 1";
+	f->flammable = 1; // can be replaced by fire if the node under it is set on fire
+	f->fuel_time = 30/32;
+	content_nodebox_chair_endl(f);
+	f->onpunch_replace_node = CONTENT_CHAIR_ENDR;
+	f->onpunch_replace_respects_borderstone = true;
+	f->setInventoryTextureNodeBox(i,"pine.png", "pine.png", "pine.png");
+	f->type = CMT_WOOD;
+	f->hardness = 0.25;
+	f->pressure_type = CST_CRUSHABLE;
+	f->suffocation_per_second = 0;
+
+	i = CONTENT_CHAIR_ENDR;
+	f = &content_features(i);
+	f->description = wgettext("Chair");
+	f->setAllTextures("pine.png");
+	f->param_type = CPT_LIGHT;
+	f->param2_type = CPT_FACEDIR_SIMPLE;
+	f->draw_type = CDT_NODEBOX;
+	f->light_propagates = true;
+	f->air_equivalent = true;
+	f->sunlight_propagates = true;
+	f->rotate_tile_with_nodebox = true;
+	f->solidness = 0; // drawn separately, makes no faces
+	f->dug_item = std::string("MaterialItem2 ")+itos(CONTENT_CHAIR)+" 1";
+	f->flammable = 1; // can be replaced by fire if the node under it is set on fire
+	f->fuel_time = 30/32;
+	content_nodebox_chair_endr(f);
+	f->onpunch_replace_node = CONTENT_CHAIR_INNER;
+	f->onpunch_replace_respects_borderstone = true;
+	f->setInventoryTextureNodeBox(i,"pine.png", "pine.png", "pine.png");
+	f->type = CMT_WOOD;
+	f->hardness = 0.25;
+	f->pressure_type = CST_CRUSHABLE;
+	f->suffocation_per_second = 0;
+
+	i = CONTENT_CHAIR_INNER;
+	f = &content_features(i);
+	f->description = wgettext("Chair");
+	f->setAllTextures("pine.png");
+	f->param_type = CPT_LIGHT;
+	f->param2_type = CPT_FACEDIR_SIMPLE;
+	f->draw_type = CDT_NODEBOX;
+	f->light_propagates = true;
+	f->air_equivalent = true;
+	f->sunlight_propagates = true;
+	f->rotate_tile_with_nodebox = true;
+	f->solidness = 0; // drawn separately, makes no faces
+	f->dug_item = std::string("MaterialItem2 ")+itos(CONTENT_CHAIR)+" 1";
+	f->flammable = 1; // can be replaced by fire if the node under it is set on fire
+	f->fuel_time = 30/32;
+	content_nodebox_chair_inner(f);
+	f->onpunch_replace_node = CONTENT_CHAIR_OUTER;
+	f->onpunch_replace_respects_borderstone = true;
+	f->setInventoryTextureNodeBox(i,"pine.png", "pine.png", "pine.png");
+	f->type = CMT_WOOD;
+	f->hardness = 0.25;
+	f->pressure_type = CST_CRUSHABLE;
+	f->suffocation_per_second = 0;
+
+	i = CONTENT_CHAIR_OUTER;
+	f = &content_features(i);
+	f->description = wgettext("Chair");
+	f->setAllTextures("pine.png");
+	f->param_type = CPT_LIGHT;
+	f->param2_type = CPT_FACEDIR_SIMPLE;
+	f->draw_type = CDT_NODEBOX;
+	f->light_propagates = true;
+	f->air_equivalent = true;
+	f->sunlight_propagates = true;
+	f->rotate_tile_with_nodebox = true;
+	f->solidness = 0; // drawn separately, makes no faces
+	f->dug_item = std::string("MaterialItem2 ")+itos(CONTENT_CHAIR)+" 1";
+	f->flammable = 1; // can be replaced by fire if the node under it is set on fire
+	f->fuel_time = 30/32;
+	content_nodebox_chair_outer(f);
+	f->onpunch_replace_node = CONTENT_CHAIR;
+	f->onpunch_replace_respects_borderstone = true;
+	f->setInventoryTextureNodeBox(i,"pine.png", "pine.png", "pine.png");
+	f->type = CMT_WOOD;
+	f->hardness = 0.25;
+	f->pressure_type = CST_CRUSHABLE;
+	f->suffocation_per_second = 0;
+
 	i = CONTENT_TABLE;
 	f = &content_features(i);
 	f->description = wgettext("Table");
@@ -1158,33 +1311,7 @@ void content_mapnode_furniture(bool repeat)
 	f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
 	f->flammable = 1; // can be replaced by fire if the node under it is set on fire
 	f->fuel_time = 30/16;
-	f->setNodeBox(core::aabbox3d<f32>(
-		-0.4*BS, -0.5*BS, -0.4*BS, -0.3*BS, 0.4*BS, -0.3*BS
-	));
-	f->addNodeBox(core::aabbox3d<f32>(
-		0.3*BS, -0.5*BS, -0.4*BS, 0.4*BS, 0.4*BS, -0.3*BS
-	));
-	f->addNodeBox(core::aabbox3d<f32>(
-		-0.4*BS, -0.5*BS, 0.3*BS, -0.3*BS, 0.4*BS, 0.4*BS
-	));
-	f->addNodeBox(core::aabbox3d<f32>(
-		0.3*BS, -0.5*BS, 0.3*BS, 0.4*BS, 0.4*BS, 0.4*BS
-	));
-	f->addNodeBox(core::aabbox3d<f32>(
-		-0.5*BS, 0.4*BS, -0.5*BS, 0.5*BS, 0.5*BS, 0.5*BS
-	));
-	f->addNodeBox(core::aabbox3d<f32>(
-		-0.4*BS, -0.2*BS, -0.3*BS, -0.3*BS, -0.1*BS, 0.3*BS
-	));
-	f->addNodeBox(core::aabbox3d<f32>(
-		0.3*BS, -0.2*BS, -0.4*BS, 0.4*BS, -0.1*BS, 0.3*BS
-	));
-	f->addNodeBox(core::aabbox3d<f32>(
-		-0.3*BS, -0.2*BS, -0.4*BS, 0.4*BS, -0.1*BS, -0.3*BS
-	));
-	f->addNodeBox(core::aabbox3d<f32>(
-		-0.3*BS, -0.2*BS, 0.3*BS, 0.3*BS, -0.1*BS, 0.4*BS
-	));
+	content_nodebox_table(f);
 	f->setInventoryTextureNodeBox(i,"pine.png", "pine.png", "pine.png");
 	f->type = CMT_WOOD;
 	f->hardness = 0.25;
diff --git a/src/content_nodebox.cpp b/src/content_nodebox.cpp
index 06f7551..c69eb82 100644
--- a/src/content_nodebox.cpp
+++ b/src/content_nodebox.cpp
@@ -1623,3 +1623,220 @@ void content_nodebox_rock(ContentFeatures *f)
 		-0.0625*BS,-0.5*BS,-0.25*BS,0.1875*BS,-0.375*BS,-0.125*BS
 	));
 }
+
+void content_nodebox_chair(ContentFeatures *f)
+{
+	f->setNodeBox(NodeBox(
+		-0.3125*BS,-0.5*BS,0.21875*BS,-0.21875*BS,0.5*BS,0.3125*BS
+	));
+	f->addNodeBox(NodeBox(
+		0.21875*BS,-0.5*BS,0.21875*BS,0.3125*BS,0.5*BS,0.3125*BS
+	));
+	f->addNodeBox(NodeBox(
+		-0.3125*BS,-0.5*BS,-0.3125*BS,-0.21875*BS,-0.03125*BS,-0.21875*BS
+	));
+	f->addNodeBox(NodeBox(
+		0.21875*BS,-0.5*BS,-0.3125*BS,0.3125*BS,-0.03125*BS,-0.21875*BS
+	));
+	f->addNodeBox(NodeBox(
+		-0.3125*BS,-0.03125*BS,-0.3125*BS,0.3125*BS,0.03125*BS,0.21875*BS
+	));
+	f->addNodeBox(NodeBox(
+		-0.21875*BS,0.1875*BS,0.25*BS,0.21875*BS,0.4375*BS,0.28125*BS
+	));
+	f->addNodeBox(NodeBox(
+		-0.28125*BS,-0.40625*BS,-0.21875*BS,-0.25*BS,-0.375*BS,0.21875*BS
+	));
+	f->addNodeBox(NodeBox(
+		0.25*BS,-0.40625*BS,-0.21875*BS,0.28125*BS,-0.375*BS,0.21875*BS
+	));
+	f->addNodeBox(NodeBox(
+		-0.21875*BS,-0.40625*BS,0.25*BS,0.21875*BS,-0.375*BS,0.28125*BS
+	));
+	f->addNodeBox(NodeBox(
+		-0.21875*BS,-0.40625*BS,-0.28125*BS,0.21875*BS,-0.375*BS,-0.25*BS
+	));
+}
+void content_nodebox_chair_centre(ContentFeatures *f)
+{
+	f->setNodeBox(NodeBox(
+		-0.03125*BS,-0.5*BS,0.21875*BS,0.0625*BS,0.5*BS,0.3125*BS
+	));
+	f->addNodeBox(NodeBox(
+		-0.03125*BS,-0.5*BS,-0.3125*BS,0.0625*BS,-0.03125*BS,-0.21875*BS
+	));
+	f->addNodeBox(NodeBox(
+		-0.5*BS,-0.03125*BS,-0.3125*BS,0.5*BS,0.03125*BS,0.21875*BS
+	));
+	f->addNodeBox(NodeBox(
+		-0.5*BS,0.1875*BS,0.25*BS,0.5*BS,0.4375*BS,0.28125*BS
+	));
+	f->addNodeBox(NodeBox(
+		0.*BS,-0.40625*BS,-0.21875*BS,0.03125*BS,-0.375*BS,0.21875*BS
+	));
+
+}
+void content_nodebox_chair_endl(ContentFeatures *f)
+{
+	f->setNodeBox(NodeBox(
+		0.21875*BS,-0.5*BS,0.21875*BS,0.3125*BS,0.5*BS,0.3125*BS
+	));
+	f->addNodeBox(NodeBox(
+		0.21875*BS,-0.5*BS,-0.3125*BS,0.3125*BS,-0.03125*BS,-0.21875*BS
+	));
+	f->addNodeBox(NodeBox(
+		-0.5*BS,-0.03125*BS,-0.3125*BS,0.3125*BS,0.03125*BS,0.21875*BS
+	));
+	f->addNodeBox(NodeBox(
+		-0.5*BS,0.1875*BS,0.25*BS,0.21875*BS,0.4375*BS,0.28125*BS
+	));
+	f->addNodeBox(NodeBox(
+		0.25*BS,-0.40625*BS,-0.21875*BS,0.28125*BS,-0.375*BS,0.21875*BS
+	));
+
+}
+void content_nodebox_chair_endr(ContentFeatures *f)
+{
+	f->setNodeBox(NodeBox(
+		-0.3125*BS,-0.5*BS,0.21875*BS,-0.21875*BS,0.5*BS,0.3125*BS
+	));
+	f->addNodeBox(NodeBox(
+		-0.3125*BS,-0.5*BS,-0.3125*BS,-0.21875*BS,-0.03125*BS,-0.21875*BS
+	));
+	f->addNodeBox(NodeBox(
+		-0.3125*BS,-0.03125*BS,-0.3125*BS,0.5*BS,0.03125*BS,0.21875*BS
+	));
+	f->addNodeBox(NodeBox(
+		-0.21875*BS,0.1875*BS,0.25*BS,0.5*BS,0.4375*BS,0.28125*BS
+	));
+	f->addNodeBox(NodeBox(
+		-0.28125*BS,-0.40625*BS,-0.21875*BS,-0.25*BS,-0.375*BS,0.21875*BS
+	));
+}
+void content_nodebox_chair_inner(ContentFeatures *f)
+{
+	f->setNodeBox(NodeBox(
+		-0.3125*BS,-0.5*BS,0.21875*BS,-0.21875*BS,0.5*BS,0.3125*BS
+	));
+	f->addNodeBox(NodeBox(
+		0.21875*BS,-0.5*BS,0.21875*BS,0.3125*BS,0.5*BS,0.3125*BS
+	));
+	f->addNodeBox(NodeBox(
+		-0.3125*BS,-0.5*BS,-0.3125*BS,-0.21875*BS,-0.03125*BS,-0.21875*BS
+	));
+	f->addNodeBox(NodeBox(
+		0.21875*BS,-0.5*BS,-0.3125*BS,0.3125*BS,0.5*BS,-0.21875*BS
+	));
+	f->addNodeBox(NodeBox(
+		-0.5*BS,-0.03125*BS,-0.3125*BS,0.21875*BS,0.03125*BS,0.21875*BS
+	));
+	f->addNodeBox(NodeBox(
+		-0.21875*BS,0.1875*BS,0.25*BS,0.21875*BS,0.4375*BS,0.28125*BS
+	));
+	f->addNodeBox(NodeBox(
+		-0.28125*BS,-0.40625*BS,-0.21875*BS,-0.25*BS,-0.375*BS,0.21875*BS
+	));
+	f->addNodeBox(NodeBox(
+		0.25*BS,-0.40625*BS,-0.21875*BS,0.28125*BS,-0.375*BS,0.21875*BS
+	));
+	f->addNodeBox(NodeBox(
+		-0.21875*BS,-0.40625*BS,0.25*BS,0.21875*BS,-0.375*BS,0.28125*BS
+	));
+	f->addNodeBox(NodeBox(
+		-0.21875*BS,-0.40625*BS,-0.28125*BS,0.21875*BS,-0.375*BS,-0.25*BS
+	));
+	f->addNodeBox(NodeBox(
+		-0.3125*BS,-0.03125*BS,-0.5*BS,0.21875*BS,0.03125*BS,-0.3125*BS
+	));
+	f->addNodeBox(NodeBox(
+		0.25*BS,0.1875*BS,-0.21875*BS,0.28125*BS,0.4375*BS,0.21875*BS
+	));
+	f->addNodeBox(NodeBox(
+		0.25*BS,0.1875*BS,-0.5*BS,0.28125*BS,0.4375*BS,-0.3125*BS
+	));
+	f->addNodeBox(NodeBox(
+		-0.5*BS,0.1875*BS,0.25*BS,-0.3125*BS,0.4375*BS,0.28125*BS
+	));
+}
+void content_nodebox_chair_outer(ContentFeatures *f)
+{
+	f->setNodeBox(NodeBox(
+		-0.3125*BS,-0.5*BS,0.21875*BS,-0.21875*BS,-0.03125*BS,0.3125*BS
+	));
+	f->addNodeBox(NodeBox(
+		0.21875*BS,-0.5*BS,0.21875*BS,0.3125*BS,0.5*BS,0.3125*BS
+	));
+	f->addNodeBox(NodeBox(
+		-0.3125*BS,-0.5*BS,-0.3125*BS,-0.21875*BS,-0.03125*BS,-0.21875*BS
+	));
+	f->addNodeBox(NodeBox(
+		0.21875*BS,-0.5*BS,-0.3125*BS,0.3125*BS,-0.03125*BS,-0.21875*BS
+	));
+	f->addNodeBox(NodeBox(
+		-0.3125*BS,-0.03125*BS,-0.3125*BS,0.5*BS,0.03125*BS,0.21875*BS
+	));
+	f->addNodeBox(NodeBox(
+		0.3125*BS,0.1875*BS,0.25*BS,0.5*BS,0.4375*BS,0.28125*BS
+	));
+	f->addNodeBox(NodeBox(
+		-0.28125*BS,-0.40625*BS,-0.21875*BS,-0.25*BS,-0.375*BS,0.21875*BS
+	));
+	f->addNodeBox(NodeBox(
+		0.25*BS,-0.40625*BS,-0.21875*BS,0.28125*BS,-0.375*BS,0.21875*BS
+	));
+	f->addNodeBox(NodeBox(
+		-0.21875*BS,-0.40625*BS,0.25*BS,0.21875*BS,-0.375*BS,0.28125*BS
+	));
+	f->addNodeBox(NodeBox(
+		-0.21875*BS,-0.40625*BS,-0.28125*BS,0.21875*BS,-0.375*BS,-0.25*BS
+	));
+	f->addNodeBox(NodeBox(
+		-0.3125*BS,-0.03125*BS,0.21875*BS,0.21875*BS,0.03125*BS,0.5*BS
+	));
+	f->addNodeBox(NodeBox(
+		0.25*BS,0.1875*BS,0.3125*BS,0.28125*BS,0.4375*BS,0.5*BS
+	));
+}
+
+void content_nodebox_table(ContentFeatures *f)
+{
+	f->setNodeBox(NodeBox(
+		-0.5*BS,0.4375*BS,-0.5*BS,0.5*BS,0.5*BS,0.5*BS
+	));
+	f->addNodeBox(NodeBox(
+		-0.34375*BS,-0.5*BS,-0.34375*BS,-0.25*BS,0.4375*BS,-0.25*BS
+	));
+	f->addNodeBox(NodeBox(
+		-0.34375*BS,-0.5*BS,0.25*BS,-0.25*BS,0.4375*BS,0.34375*BS
+	));
+	f->addNodeBox(NodeBox(
+		0.25*BS,-0.5*BS,0.25*BS,0.34375*BS,0.4375*BS,0.34375*BS
+	));
+	f->addNodeBox(NodeBox(
+		0.25*BS,-0.5*BS,-0.34375*BS,0.34375*BS,0.4375*BS,-0.25*BS
+	));
+	f->addNodeBox(NodeBox(
+		-0.3125*BS,0.34375*BS,-0.25*BS,-0.28125*BS,0.4375*BS,0.25*BS
+	));
+	f->addNodeBox(NodeBox(
+		0.28125*BS,0.34375*BS,-0.25*BS,0.3125*BS,0.4375*BS,0.25*BS
+	));
+	f->addNodeBox(NodeBox(
+		-0.25*BS,0.34375*BS,0.28125*BS,0.25*BS,0.4375*BS,0.3125*BS
+	));
+	f->addNodeBox(NodeBox(
+		-0.25*BS,0.34375*BS,-0.3125*BS,0.25*BS,0.4375*BS,-0.28125*BS
+	));
+	f->addNodeBox(NodeBox(
+		-0.3125*BS,-0.375*BS,-0.25*BS,-0.28125*BS,-0.28125*BS,0.25*BS
+	));
+	f->addNodeBox(NodeBox(
+		0.28125*BS,-0.375*BS,-0.25*BS,0.3125*BS,-0.28125*BS,0.25*BS
+	));
+	f->addNodeBox(NodeBox(
+		-0.25*BS,-0.375*BS,0.28125*BS,0.25*BS,-0.28125*BS,0.3125*BS
+	));
+	f->addNodeBox(NodeBox(
+		-0.25*BS,-0.375*BS,-0.3125*BS,0.25*BS,-0.28125*BS,-0.28125*BS
+	));
+}
diff --git a/src/content_nodebox.h b/src/content_nodebox.h
index 751b579..6c2d819 100644
--- a/src/content_nodebox.h
+++ b/src/content_nodebox.h
@@ -72,5 +72,12 @@ void content_nodebox_furnace(ContentFeatures *f);
 void content_nodebox_lockedfurnace(ContentFeatures *f);
 void content_nodebox_incinerator(ContentFeatures *f);
 void content_nodebox_rock(ContentFeatures *f);
+void content_nodebox_chair(ContentFeatures *f);
+void content_nodebox_chair_centre(ContentFeatures *f);
+void content_nodebox_chair_endl(ContentFeatures *f);
+void content_nodebox_chair_endr(ContentFeatures *f);
+void content_nodebox_chair_inner(ContentFeatures *f);
+void content_nodebox_chair_outer(ContentFeatures *f);
+void content_nodebox_table(ContentFeatures *f);
 
 #endif
diff --git a/src/content_sao.cpp b/src/content_sao.cpp
index b8e5607..1c43564 100644
--- a/src/content_sao.cpp
+++ b/src/content_sao.cpp
@@ -175,12 +175,18 @@ void ItemSAO::step(float dtime, bool send_recommended)
 				|| m_content == CONTENT_JUNGLELEAVES
 				|| m_content == CONTENT_APPLE_LEAVES
 				|| m_content == CONTENT_CONIFER_LEAVES
+				|| m_content == CONTENT_LEAVES_AUTUMN
+				|| m_content == CONTENT_LEAVES_WINTER
+				|| m_content == CONTENT_LEAVES_SNOWY
 			)
 		) { 	// leaves falling on grass become either saplings or wild grass
 			if (
 				un.getContent() == CONTENT_MUD
 				|| un.getContent() == CONTENT_GRASS
 				|| un.getContent() == CONTENT_GRASS_FOOTSTEPS
+				|| un.getContent() == CONTENT_GRASS_AUTUMN
+				|| un.getContent() == CONTENT_GRASS_FOOTSTEPS_AUTUMN
+				|| un.getContent() == CONTENT_MUDSNOW
 			) {
 				content_t c = CONTENT_SAPLING;
 				std::vector<content_t> search;
diff --git a/src/guiMainMenu.cpp b/src/guiMainMenu.cpp
index e95dabb..27ccf20 100644
--- a/src/guiMainMenu.cpp
+++ b/src/guiMainMenu.cpp
@@ -1046,6 +1046,7 @@ bool GUIMainMenu::OnEvent(const SEvent& event)
 			case GUI_ID_JOIN_GAME_BUTTON: // Start game
 				acceptInput();
 				m_gamecallback->startGame();
+				quitMenu();
 				return true;
 			case GUI_ID_CHARACTER_CREATOR:
 			{
diff --git a/src/http.cpp b/src/http.cpp
index 8efc776..b26e49d 100644
--- a/src/http.cpp
+++ b/src/http.cpp
@@ -534,10 +534,11 @@ std::string http_request(char* host, char* url, char* post, int port)
 	HTTPResponseHeaders headers;
 	int s;
 	char buff[2048];
+	std::string h;
 
 	addr.setPort(port);
 	if (!host || !host[0]) {
-		std::string h = g_settings->get("api_server");
+		h = g_settings->get("api_server");
 		if (h == "")
 			return "";
 		host = (char*)h.c_str();
diff --git a/src/main.cpp b/src/main.cpp
index 2ee4fe2..1439bb0 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1312,6 +1312,7 @@ int main(int argc, char *argv[])
 
 				if (character_creator)
 					break;
+				g_gamecallback->startgame_requested = false;
 
 				// Delete map if requested
 				if (menudata.delete_map) {
diff --git a/src/mapnode.h b/src/mapnode.h
index 69d7470..33f7b7e 100644
--- a/src/mapnode.h
+++ b/src/mapnode.h
@@ -395,6 +395,8 @@ struct ContentFeatures
 	std::string ondig_special_tool_append;
 	// when punched, this node will replace the punched node
 	content_t onpunch_replace_node;
+	// whether onpunch replace node works within borderstone
+	bool onpunch_replace_respects_borderstone;
 
 	// when placed against a wall, this node should be placed instead
 	content_t wallmount_alternate_node;
@@ -554,6 +556,7 @@ struct ContentFeatures
 		ondig_special_tool = 0;
 		ondig_special_tool_append = "";
 		onpunch_replace_node = CONTENT_IGNORE;
+		onpunch_replace_respects_borderstone = false;
 		wallmount_alternate_node = CONTENT_IGNORE;
 		floormount_alternate_node = CONTENT_IGNORE;
 		roofmount_alternate_node = CONTENT_IGNORE;
diff --git a/src/server.cpp b/src/server.cpp
index fe0118e..95c5fdf 100644
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -2587,6 +2587,8 @@ void Server::ProcessData(u8 *data, u32 datasize, u16 peer_id)
 				selected_node_features.onpunch_replace_node != CONTENT_IGNORE
 				&& !wielded_tool_features.has_rotate_effect
 			) {
+				if (selected_node_features.onpunch_replace_respects_borderstone && borderstone_locked)
+					return;
 				core::list<u16> far_players;
 				core::map<v3s16, MapBlock*> modified_blocks;
 
diff --git a/src/settings.h b/src/settings.h
index 49aecb9..5d8d1b8 100644
--- a/src/settings.h
+++ b/src/settings.h
@@ -80,7 +80,7 @@ public:
 		}
 	}
 
-	bool parseConfigLine(const std::string &line)
+	virtual bool parseConfigLine(const std::string &line)
 	{
 		JMutexAutoLock lock(m_mutex);
 
@@ -674,6 +674,38 @@ public:
 	// you'll find this in defaultsettings.cpp
 	void setGameDefaults(std::string mode);
 
+	virtual bool parseConfigLine(const std::string &line)
+	{
+		std::string name;
+		std::string value;
+		{
+			JMutexAutoLock lock(m_mutex);
+
+			std::string trimmedline = trim(line);
+
+			// Ignore comments
+			if (trimmedline[0] == '#')
+				return true;
+
+			Strfnd sf(trimmedline);
+
+			name = sf.next("=");
+			name = trim(name);
+
+			if (name == "")
+				return true;
+
+			value = sf.next("\n");
+			value = trim(value);
+
+			m_settings[name] = value;
+		}
+		if (name == "game_mode")
+			setGameDefaults(value);
+
+		return true;
+	}
+
 	virtual void set(std::string name, std::string value)
 	{
 		{