Merge branch 'masterpiece' of ssh://192.168.10.159:/1TBHDD/ikong/taobin_project into masterpiece
This commit is contained in:
commit
93fa5c540b
159 changed files with 43697 additions and 19671 deletions
|
|
@ -211,7 +211,8 @@
|
|||
STRCONTAIN "1037" MaterialAvailable 7UpSyrupEnable
|
||||
STRCONTAIN "1038" MaterialAvailable PepsiHighYSyrupEnable
|
||||
STRCONTAIN "1052" MaterialAvailable CollagenPowderEnable
|
||||
|
||||
STRCONTAIN "1050" MaterialAvailable MatchaPowderEnable
|
||||
|
||||
STRCONTAIN "1065" MaterialAvailable HaveIngredientOvaltine
|
||||
|
||||
;Var AppFastEnable = "false"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue