diff -r -x 'diff.*' -x client.swf -x version.txt -x '*.xml' -x _ '--unified=8' -b -B ../current/json/Objects.json ./json/Objects.json --- ../current/json/Objects.json 2016-08-29 19:10:24.362531227 +0000 +++ ./json/Objects.json 2016-09-08 19:00:23.070957845 +0000 @@ -60635,16 +60635,37 @@ "DisplayId": "Gutsbot", "Class": "PetSkin", "AnimatedTexture": { "File": "petsDivine", "Index": "31" } }, { + "type": "0x6e9", + "id": "Gutsbot Pet Stone", + "Class": "Equipment", + "Item": "", + "AnimatedTexture": { + "File": "petsDivine", + "Index": "31" + }, + "Size": "60", + "SlotType": "10", + "Description": "Customize your pet with Custot Skin", + "Activate": { + "_": "PetSkin", + "skinId": "32648" + }, + "Consumable": "", + "Soulbound": "", + "BagType": "4", + "DisplayId": "Gutsbot Pet Stone" + }, + { "type": "0x8090", "id": "Disabled Pet Skin", "PetSkin": "", "DisplayId": "Disabled Pet", "Class": "PetSkin", "AnimatedTexture": { "File": "chars8x8rPets2", "Index": "0x00" Binary files ../current/sheets/d3LofiObj.png and ./sheets/d3LofiObj.png differ Binary files ../current/sheets/lofiObj3.png and ./sheets/lofiObj3.png differ Binary files ../current/sheets/playersSkinsMask.png and ./sheets/playersSkinsMask.png differ Binary files ../current/sheets/playersSkins.png and ./sheets/playersSkins.png differ diff -r -x 'diff.*' -x client.swf -x version.txt -x '*.xml' -x _ '--unified=8' -b -B ../current/strings.json ./strings.json --- ../current/strings.json 2016-08-29 19:10:21.230530945 +0000 +++ ./strings.json 2016-09-08 19:00:19.794958036 +0000 @@ -803,16 +803,33 @@ "Screens.languages": "languages", "Screens.legends": "legends", "Screens.main": "main", "Screens.migrate": "migrate", "Screens.play": "play", "Screens.quit": "quit", "Screens.servers": "servers", "Screens.support": "support", + "SecurityQuestionsConfirmDialog.leftButton": "Back", + "SecurityQuestionsConfirmDialog.rightButton": "Confirm", + "SecurityQuestionsConfirmDialog.text": "You will not be able to change these answers in the future.", + "SecurityQuestionsConfirmDialog.title": "Review your answers - then confirm", + "SecurityQuestionsDialog.question1": "Where did you go the first time you flew on a plane?", + "SecurityQuestionsDialog.question2": "What is your favorite sports team?", + "SecurityQuestionsDialog.question3": "What was your favorite childhood cartoon?", + "SecurityQuestionsDialog.save": "Save", + "SecurityQuestionsDialog.savingInProgress": "Saving in progress...", + "SecurityQuestionsDialog.title": "Set your security questions", + "SecurityQuestionsDialog.tooLong": "Answer is too long", + "SecurityQuestionsDialog.tooShort": "Answer is too short (Min. {min}).", + "SecurityQuestionsDialog.wrongAnswersAmount": "Write answer for all questions", + "SecurityQuestionsDialog.wrongInputFormat": "Answer has invalid characters", + "SecurityQuestionsInfoDialog.rightButton": "Continue", + "SecurityQuestionsInfoDialog.text": "To better protect your account, please answer the following security questions in the next screen.\\n\\nThese questions will be used to verify your account ownership in case there is a dispute or you lose access to your email.\\n\\nNote: Once set, you will not be able to change your answers. Be sure to make the answers easy to remember but hard to guess. You will need to remember the answers for all questions.", + "SecurityQuestionsInfoDialog.title": "New Account Security Feature - Read carefully", "SellableObjectPanel.buy": "Buy for {cost}", "SellableObjectPanel.requireRank": "{amount} Rank Required", "SellableObjectPanel.requireRankSprite": "Rank Required:", "SellableObjectPanel.text": "Thing for Sale", "SellableObjectPanelMediator.text": "In order to use {type} you must be a registered user.", "ServerBox.best": "Best Server", "ServerBox.crowded": "Crowded", "ServerBox.full": "Full", @@ -3935,16 +3952,17 @@ "pets.Centaur_Skin": "Centaur", "pets.Chameleon": "Chameleon", "pets.Chameleon_Skin": "Chameleon", "pets.Chick": "Chick", "pets.Chick_Skin": "Chick", "pets.CloseRangeAttack": "CloseRangeAttack", "pets.Crab": "Crab", "pets.Crab_Skin": "Crab", + "pets.Customize_your_pet_with_Custot_Skin": "Customize your pet with Custot Skin", "pets.Cylindron": "Cylindron", "pets.Cylindron_Skin": "Cylindron", "pets.Decoy": "Decoy", "pets.Demon_Frog": "Demon Frog", "pets.Demon_Frog_Skin": "Demon Frog", "pets.Dino": "Dino", "pets.Dino_Skin": "Dino", "pets.Disabled_Pet_Skin": "Disabled Pet", @@ -4008,16 +4026,17 @@ "pets.Grey_Pup_Skin": "Grey Pup", "pets.Grey_Wolf": "Grey Wolf", "pets.Grey_Wolf_Skin": "Grey Wolf", "pets.Griffin": "Griffin", "pets.Griffin_Skin": "Griffin", "pets.Gummy_Bear": "Gummy Bear", "pets.Gummy_Bear_Skin": "Gummy Bear", "pets.Gutsbot": "Gutsbot", + "pets.Gutsbot_Pet_Stone": "Gutsbot Pet Stone", "pets.Gutsbot_Skin": "Gutsbot", "pets.Hamster": "Hamster", "pets.Hamster_Skin": "Hamster", "pets.Heal": "Heal", "pets.Heals_you_periodically.\\n\\nLevel_this_ability_up_to_increase": "Heals you periodically.\\n\\nLevel this ability up to increase its power and frequency.", "pets.Helmbot": "Helmbot", "pets.Helmbot_Skin": "Helmbot", "pets.Jalapeno": "Jalapeno",