Merge branch 'updated'

cff3e647 · mercury233 · 33c688c5 · 52df4ba2 · cff3e647 · cff3e647
Commit cff3e647 authored Dec 15, 2018 by mercury233
44 changed files
--- a/deck/18-11-30 new cards.ydk
+++ b/deck/18-11-30 new cards.ydk
 #created by ...
 #main
+100200157
+100236021
+100236026
+100236033
+100238007
+100238008
+100238009
+100239002
+100239004
 100236009
 100335006
 100335033
@@ -19,6 +28,18 @@
 100335024
 100335032
 #extra
+100236002
+100236019
+100238001
+100238002
+100238004
+100238005
+100238010
+100238011
+100238013
+100238014
+100239003
+!side
 100236008
 100236013
 100236032
@@ -26,4 +47,3 @@
 100242401
 100335051
 100335052
-!side
--- a/expansions/pre-release.cdb
+++ b/expansions/pre-release.cdb
--- a/expansions/pre-update.cdb
+++ b/expansions/pre-update.cdb
--- a/expansions/strings.conf
+++ b/expansions/strings.conf
 #The first line is used for comment
 !counter 0x1050 信号指示物
+!setname 0x225 笑容
--- a/picn/100200157.jpg
+++ b/picn/100200157.jpg
--- a/picn/100236002.jpg
+++ b/picn/100236002.jpg
--- a/picn/100236019.jpg
+++ b/picn/100236019.jpg
--- a/picn/100236021.jpg
+++ b/picn/100236021.jpg
--- a/picn/100236026.jpg
+++ b/picn/100236026.jpg
--- a/picn/100236033.jpg
+++ b/picn/100236033.jpg
--- a/picn/100238001.jpg
+++ b/picn/100238001.jpg
--- a/picn/100238002.jpg
+++ b/picn/100238002.jpg
--- a/picn/100238004.jpg
+++ b/picn/100238004.jpg
--- a/picn/100238005.jpg
+++ b/picn/100238005.jpg
--- a/picn/100238007.jpg
+++ b/picn/100238007.jpg
--- a/picn/100238008.jpg
+++ b/picn/100238008.jpg
--- a/picn/100238009.jpg
+++ b/picn/100238009.jpg
--- a/picn/100238010.jpg
+++ b/picn/100238010.jpg
--- a/picn/100238011.jpg
+++ b/picn/100238011.jpg
--- a/picn/100238013.jpg
+++ b/picn/100238013.jpg
--- a/picn/100238014.jpg
+++ b/picn/100238014.jpg
--- a/picn/100239002.jpg
+++ b/picn/100239002.jpg
--- a/picn/100239003.jpg
+++ b/picn/100239003.jpg
--- a/picn/100239004.jpg
+++ b/picn/100239004.jpg
--- a/pics/100200157.jpg
+++ b/pics/100200157.jpg
--- a/pics/100236002.jpg
+++ b/pics/100236002.jpg
--- a/pics/100236019.jpg
+++ b/pics/100236019.jpg
--- a/pics/100236021.jpg
+++ b/pics/100236021.jpg
--- a/pics/100236026.jpg
+++ b/pics/100236026.jpg
--- a/pics/100236033.jpg
+++ b/pics/100236033.jpg
--- a/pics/100238001.jpg
+++ b/pics/100238001.jpg
--- a/pics/100238002.jpg
+++ b/pics/100238002.jpg
--- a/pics/100238004.jpg
+++ b/pics/100238004.jpg
--- a/pics/100238005.jpg
+++ b/pics/100238005.jpg
--- a/pics/100238007.jpg
+++ b/pics/100238007.jpg
--- a/pics/100238008.jpg
+++ b/pics/100238008.jpg
--- a/pics/100238009.jpg
+++ b/pics/100238009.jpg
--- a/pics/100238010.jpg
+++ b/pics/100238010.jpg
--- a/pics/100238011.jpg
+++ b/pics/100238011.jpg
--- a/pics/100238013.jpg
+++ b/pics/100238013.jpg
--- a/pics/100238014.jpg
+++ b/pics/100238014.jpg
--- a/pics/100239002.jpg
+++ b/pics/100239002.jpg
--- a/pics/100239003.jpg
+++ b/pics/100239003.jpg
--- a/pics/100239004.jpg
+++ b/pics/100239004.jpg