Merge branch 'master' of github.com:Fluorohydride/ygopro

premake5.lua

@@ -252,7 +252,7 @@ workspace "YGOPro"
     filter { "configurations:Release", "action:vs*" }
         flags { "LinkTimeOptimization" }
         staticruntime "On"
-        disablewarnings { "4244", "4267", "4838", "4577", "4819", "4018", "4996", "4477", "4091", "4828", "4800" }
+        disablewarnings { "4244", "4267", "4838", "4577", "4819", "4018", "4996", "4477", "4091", "4828", "4800", "6011", "6031", "6054", "6262" }
 
     filter { "configurations:Release", "not action:vs*" }
         symbols "On"
@@ -262,8 +262,7 @@ workspace "YGOPro"
         end
 
     filter { "configurations:Debug", "action:vs*" }
-        defines { "_ITERATOR_DEBUG_LEVEL=0" }
-        disablewarnings { "4819", "4828" }
+        disablewarnings { "4819", "4828", "6011", "6031", "6054", "6262" }
 
     filter "action:vs*"
         vectorextensions "SSE2"

strings.conf

@@ -1160,3 +1160,6 @@
 !setname 0x1185 涂鸦兽	らくがきじゅう
 !setname 0x2185 涂鸦本	らくがきちょう
 !setname 0x186 G石人	Gゴーレム
+!setname 0x187 桥梁	架け橋
+!setname 0x188 深渊之兽	ビーステッド
+!setname 0x189 俱舍怒威族	クシャトリラ