Merge branch 'master' into develop

Author: brightrim

housing/itemList.lua

@@ -1279,6 +1279,19 @@ table.insert(M.items, {itemId = 5221, typeOf = "Estate", category = "Doors", nam
 table.insert(M.items, {itemId = 5222, typeOf = "Estate", category = "Doors", nameDe = "Rechter Torflügel - Westen", nameEn = "Right Gate West", skill = "carpentry", level = 80, ingredient1 = 545, ingredient1Amount = 25, ingredient2 = 2738, ingredient2Amount = 25, ingredient3 = 2588, ingredient3Amount = 10, ingredient4 = 26, ingredient4Amount = 10})
 table.insert(M.items, {itemId = 5223, typeOf = "Estate", category = "Doors", nameDe = "Rechter Torflügel - Osten", nameEn = "Right Gate East", skill = "carpentry", level = 80, ingredient1 = 545, ingredient1Amount = 25, ingredient2 = 2738, ingredient2Amount = 25, ingredient3 = 2588, ingredient3Amount = 10, ingredient4 = 26, ingredient4Amount = 10})
 table.insert(M.items, {itemId = 5232, typeOf = "House", category = "Lights", skill = "misc", level = 0, ingredient1 = 399, ingredient1Amount = 3, ingredient2 = nil, ingredient2Amount = nil, ingredient3 = nil, ingredient3Amount = nil, ingredient4 = nil, ingredient4Amount = nil})
+table.insert(M.items, {itemId = 3426, typeOf = "Estate", category = "Walls", nameDe = "Strohlehmpfeiler - Nordwesten", nameEn = "Light-clay Pillar Northwest", skill = "carpentry", level = 20, ingredient1 = Item.appleWoodBoards, ingredient1Amount = 10, ingredient2 = Item.bundleOfGrain, ingredient2Amount = 3, ingredient3 = Item.clay, ingredient3Amount = 5, ingredient4 = Item.rawStone, ingredient4Amount = 2})
+table.insert(M.items, {itemId = 3427, typeOf = "Estate", category = "Walls", nameDe = "Strohlehmpfeiler - Nordosten", nameEn = "Light-clay Pillar Northeast", skill = "carpentry", level = 20, ingredient1 = Item.appleWoodBoards, ingredient1Amount = 10, ingredient2 = Item.bundleOfGrain, ingredient2Amount = 3, ingredient3 = Item.clay, ingredient3Amount = 5, ingredient4 = Item.rawStone, ingredient4Amount = 2})
+table.insert(M.items, {itemId = 3428, typeOf = "Estate", category = "Walls", nameDe = "Strohlehmpfeiler - Südwesten", nameEn = "Light-clay Pillar Southwest", skill = "carpentry", level = 20, ingredient1 = Item.appleWoodBoards, ingredient1Amount = 10, ingredient2 = Item.bundleOfGrain, ingredient2Amount = 3, ingredient3 = Item.clay, ingredient3Amount = 5, ingredient4 = Item.rawStone, ingredient4Amount = 2})
+table.insert(M.items, {itemId = 3429, typeOf = "Estate", category = "Walls", nameDe = "Strohlehmpfeiler - Südosten", nameEn = "Light-clay Pillar Southeast", skill = "carpentry", level = 20, ingredient1 = Item.appleWoodBoards, ingredient1Amount = 10, ingredient2 = Item.bundleOfGrain, ingredient2Amount = 3, ingredient3 = Item.clay, ingredient3Amount = 5, ingredient4 = Item.rawStone, ingredient4Amount = 2})
+table.insert(M.items, {itemId = 3430, typeOf = "Estate", category = "Walls", nameDe = "Strohlehmmauer - Nordosten", nameEn = "Light-clay Wall Northeast", skill = "carpentry", level = 20, ingredient1 = Item.appleWoodBoards, ingredient1Amount = 20, ingredient2 = Item.bundleOfGrain, ingredient2Amount = 10, ingredient3 = Item.clay, ingredient3Amount = 15, ingredient4 = Item.rawStone, ingredient4Amount = 5})
+table.insert(M.items, {itemId = 3431, typeOf = "Estate", category = "Walls", nameDe = "Strohlehmmauer - Süden", nameEn = "Light-clay Wall South", skill = "carpentry", level = 20, ingredient1 = Item.appleWoodBoards, ingredient1Amount = 20, ingredient2 = Item.bundleOfGrain, ingredient2Amount = 10, ingredient3 = Item.clay, ingredient3Amount = 15, ingredient4 = Item.rawStone, ingredient4Amount = 5})
+table.insert(M.items, {itemId = 3432, typeOf = "Estate", category = "Walls", nameDe = "Strohlehmmauer - Westen", nameEn = "Light-clay Wall West", skill = "carpentry", level = 20, ingredient1 = Item.appleWoodBoards, ingredient1Amount = 20, ingredient2 = Item.bundleOfGrain, ingredient2Amount = 10, ingredient3 = Item.clay, ingredient3Amount = 15, ingredient4 = Item.rawStone, ingredient4Amount = 5})
+table.insert(M.items, {itemId = 3433, typeOf = "Estate", category = "Walls", nameDe = "Strohlehmmauer - Norden", nameEn = "Light-clay Wall North", skill = "carpentry", level = 20, ingredient1 = Item.appleWoodBoards, ingredient1Amount = 20, ingredient2 = Item.bundleOfGrain, ingredient2Amount = 10, ingredient3 = Item.clay, ingredient3Amount = 15, ingredient4 = Item.rawStone, ingredient4Amount = 5})
+table.insert(M.items, {itemId = 3434, typeOf = "Estate", category = "Walls", nameDe = "Strohlehmmauer - Osten", nameEn = "Light-clay Wall East", skill = "carpentry", level = 20, ingredient1 = Item.appleWoodBoards, ingredient1Amount = 20, ingredient2 = Item.bundleOfGrain, ingredient2Amount = 10, ingredient3 = Item.clay, ingredient3Amount = 15, ingredient4 = Item.rawStone, ingredient4Amount = 5})
+table.insert(M.items, {itemId = 3435, typeOf = "Estate", category = "Windows", nameDe = "Fenster - Süden", nameEn = "Window South", skill = "glassBlowing", level = 50, ingredient1 = Item.appleWoodBoards, ingredient1Amount = 20, ingredient2 = Item.bundleOfGrain, ingredient2Amount = 5, ingredient3 = Item.clay, ingredient3Amount = 20, ingredient4 = Item.rawStone, ingredient4Amount = 5})
+table.insert(M.items, {itemId = 3436, typeOf = "Estate", category = "Windows", nameDe = "Fenster - Westen", nameEn = "Window West", skill = "glassBlowing", level = 50, ingredient1 = Item.appleWoodBoards, ingredient1Amount = 20, ingredient2 = Item.bundleOfGrain, ingredient2Amount = 5, ingredient3 = Item.clay, ingredient3Amount = 20, ingredient4 = Item.rawStone, ingredient4Amount = 5})
+table.insert(M.items, {itemId = 3437, typeOf = "Estate", category = "Windows", nameDe = "Fenster - Norden", nameEn = "Window North", skill = "glassBlowing", level = 50, ingredient1 = Item.appleWoodBoards, ingredient1Amount = 20, ingredient2 = Item.bundleOfGrain, ingredient2Amount = 5, ingredient3 = Item.clay, ingredient3Amount = 20, ingredient4 = Item.rawStone, ingredient4Amount = 5})
+table.insert(M.items, {itemId = 3438, typeOf = "Estate", category = "Windows", nameDe = "Fenster - Osten", nameEn = "Window East", skill = "glassBlowing", level = 50, ingredient1 = Item.appleWoodBoards, ingredient1Amount = 20, ingredient2 = Item.bundleOfGrain, ingredient2Amount = 5, ingredient3 = Item.clay, ingredient3Amount = 20, ingredient4 = Item.rawStone, ingredient4Amount = 5})
 
 M.tiles = {}
 table.insert(M.tiles, {displayId = Item.parquet , tileId = 40, typeOf = "House", category = "Parquet", skill = "carpentry", level = 0, ingredient1 = 2716, ingredient1Amount = 25})