sync ocgcore

update strings.conf

Classes/ocgcore/libcard.cpp

@@ -2165,6 +2165,8 @@ int32 scriptlib::card_is_able_to_hand(lua_State *L) {
 	check_param(L, PARAM_TYPE_CARD, 1);
 	card* pcard = *(card**) lua_touserdata(L, 1);
 	uint32 p = pcard->pduel->game_field->core.reason_player;
+	if(lua_gettop(L) >= 2)
+		p = (uint32)lua_tointeger(L, 2);
 	if(pcard->is_capable_send_to_hand(p))
 		lua_pushboolean(L, 1);
 	else

mobile/assets/data/conf/strings.conf

@@ -619,6 +619,7 @@
 !counter 0x55 指示物（隐居者的大釜）
 !counter 0x56 炎星指示物
 !counter 0x57 幻魔指示物
+!counter 0x58 指示物（祢须三破鸣比）
 #setnames, using tab for comment
 !setname 0x1 正义盟军	A・O・J
 !setname 0x2 次世代	ジェネクス
@@ -1045,8 +1046,12 @@
 !setname 0x14b 机块	機塊
 #setname 0x14c 灵术	霊術
 !setname 0x314c 地灵术	地霊術
-#setname 0x514c 水灵术	水霊術
+!setname 0x514c 水灵术	水霊術
 !setname 0x614c 火灵术	火霊術
-#setname 0x914c 风灵术	風霊術
+!setname 0x914c 风灵术	風霊術
 #setname 0xa14c 光灵术	光霊術
 #setname 0xc14c 暗灵术	闇霊術
+!setname 0x14d 铁兽	トライブリゲード
+!setname 0x14e 电脑堺	電脳堺
+!setname 0x114e 电脑堺门	電脳堺門
+!setname 0x14f 双天

mobile/assets_en/data/conf/strings.conf

@@ -455,10 +455,10 @@
 !system 1429 Ineligible Place.
 !system 1430 Ineligible Position.
 !system 1431 Ineligible Counter.
-!system 1440 Close Showcase
-!system 1441 Larger
-!system 1442 Smaller
-!system 1443 Original Size
+!system 1440 Close picture
+!system 1441 Zoom in
+!system 1442 Zoom out
+!system 1443 Restore size
 !system 1450 Pack
 !system 1451 AI Decks
 !system 1452 Uncategorized
@@ -619,6 +619,7 @@
 !counter 0x55 Counter(Cauldron of the Old Man)
 !counter 0x56 Fire Fist Counter
 !counter 0x57 Phantasm Counter
+!counter 0x58 Counter(Nezumihanabi)
 #setnames, using tab for comment
 !setname 0x1 Ally of Justice
 !setname 0x2 Genex
@@ -650,7 +651,7 @@
 !setname 0x12 Frog
 !setname 0x13 Meklord
 !setname 0x3013 Meklord Emperor
-!setname 0x5013 Meklord Emperor
+!setname 0x5013 Meklord Astro
 !setname 0x6013 Meklord Army
 !setname 0x15 B.E.S.
 !setname 0x16 Roid
@@ -1015,7 +1016,7 @@
 !setname 0x137 Ancient Warriors
 !setname 0x138 Megalith
 !setname 0x139 Palladium Oracle
-!setname 0x13a Onomato
+!setname 0x13a Onomat
 !setname 0x13b Rebellion
 !setname 0x13c Codebreaker
 !setname 0x13d Nemesis
@@ -1028,7 +1029,7 @@
 !setname 0x2142 Eldlixir
 !setname 0x143 Golden Land
 !setname 0x144 Phantasm
-!setname 0x145 Dragma
+!setname 0x145 Dogmatika
 !setname 0x146 Melffy
 !setname 0x147 Potan
 !setname 0x148 Roland
@@ -1038,8 +1039,12 @@
 !setname 0x14b Appliancer
 #setname 0x14c Spiritual Art
 !setname 0x314c Spiritual Earth Art
-#setname 0x514c Spiritual Water Art
+!setname 0x514c Spiritual Water Art
 !setname 0x614c Spiritual Fire Art
-#setname 0x914c Spiritual Wind Art
+!setname 0x914c Spiritual Wind Art
 #setname 0xa14c Spiritual Light Art
 #setname 0xc14c Dark Spirit Art
+!setname 0x14d Tribrigade
+!setname 0x14e Datascape
+!setname 0x114e Datascape Gate
+!setname 0x14f Souten