diff -r -x 'diff.*' -x client.swf -x version.txt -x '*.xml' '--unified=8' -b -B ../current/constants.json ./constants.json
--- ../current/constants.json	2014-11-14 01:40:38.260900063 +0000
+++ ./constants.json	2014-12-04 23:00:39.615940600 +0000
@@ -1,8 +1,8 @@
 {
   "BUILD_VERSION": "26.0",
-  "MINOR_VERSION": "0",
+  "MINOR_VERSION": "1",
   "PORT": 2050,
   "RANDOM1": "311f80691451c71b09a13a2a6e",
   "RANDOM2": "72c5583cafb6818995cbd74b80",
   "RSA_PUBLIC_KEY": "-----BEGIN PUBLIC KEY-----\nMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDCKFctVrhfF3m2Kes0FBL/JFeOcmNg9eJz8k/hQy1kadD+XFUpluRqa//Uxp2s9W2qE0EoUCu59ugcf/p7lGuL99UoSGmQEynkBvZct+/M40L0E0rZ4BVgzLOJmIbXMp0J4PnPcb6VLZvxazGcmSfjauC7F3yWYqUbZd/HCBtawwIDAQAB\n-----END PUBLIC KEY-----"
 }
\ No newline at end of file
diff -r -x 'diff.*' -x client.swf -x version.txt -x '*.xml' '--unified=8' -b -B ../current/json/Objects.json ./json/Objects.json
--- ../current/json/Objects.json	2014-11-14 01:40:25.116894676 +0000
+++ ./json/Objects.json	2014-12-04 23:00:26.395940894 +0000
@@ -30784,38 +30784,37 @@
         {
           "_": "ConditionEffectAura",
           "effect": "Healing",
           "duration": "3",
           "range": "5",
           "useWisMod": "true"
         },
         {
-          "_": "ConditionEffectAura",
+          "_": "ConditionEffectSelf",
           "effect": "Speedy",
           "duration": "1.5",
-          "range": "5",
           "useWisMod": "true"
         },
         {
           "_": "HealNova",
           "amount": "200",
           "range": "5",
           "useWisMod": "true"
         },
         {
           "_": "ClearConditionEffectAura",
           "range": "6",
+          "effect": "Speedy",
           "checkExistingEffect": "Hexed"
         },
         {
           "_": "RemoveNegativeConditions",
           "range": "6"
-        },
-        "Shoot"
+        }
       ],
       "feedPower": "380",
       "DisplayId": "Book of Geb"
     },
     {
       "type": "0x235F",
       "id": "Scepter of Geb",
       "setType": "0x0002",
@@ -31900,16 +31899,37 @@
       },
       "Consumable": "",
       "Potion": "",
       "BagType": "0",
       "feedPower": "5",
       "DisplayId": "Candy Corn"
     },
     {
+      "type": "0x746c",
+      "id": "Puppet Master's Encore Key",
+      "Class": "Equipment",
+      "Item": "",
+      "Texture": {
+        "File": "d3LofiObjEmbed",
+        "Index": "0x1b"
+      },
+      "SlotType": "10",
+      "Description": "{equip.A_key_which_opens_an_entrance_to_the_Puppet_MasterAPOSs_Enc}",
+      "Sound": "use_key",
+      "Consumable": "",
+      "Soulbound": "",
+      "Activate": {
+        "_": "Create",
+        "id": "Puppet Encore Portal"
+      },
+      "feedPower": "200",
+      "DisplayId": "{equip.Puppet_MasterAPOSs_Encore_Key}"
+    },
+    {
       "type": "0x0dc0",
       "id": "Great Temple Snake",
       "Class": "Character",
       "Enemy": "",
       "Size": "100",
       "ShadowSize": "90",
       "MaxHitPoints": "50",
       "Defense": "20",
@@ -37450,16 +37470,281 @@
           "Speed": "55",
           "Size": "140",
           "LifetimeMS": "800"
         }
       ],
       "DisplayId": "Beer God"
     },
     {
+      "type": "0x7461",
+      "id": "Puppet Master v2",
+      "DisplayId": "The Puppet Master",
+      "Class": "Character",
+      "Group": "Master",
+      "Enemy": "",
+      "AnimatedTexture": {
+        "File": "d3Chars16x16rEmbed",
+        "Index": "0x01"
+      },
+      "HitSound": "monster/skeletons_hit",
+      "DeathSound": "monster/skeletons_death",
+      "Size": "120",
+      "ShadowSize": "25",
+      "MaxHitPoints": "125000",
+      "Defense": "30",
+      "XpMult": "1.5",
+      "Level": "20",
+      "StasisImmune": "",
+      "StunImmune": "",
+      "ParalyzeImmune": "",
+      "Projectile": [
+        {
+          "id": "0",
+          "ObjectId": "Jester Bolt",
+          "Speed": "30",
+          "MinDamage": "90",
+          "MaxDamage": "115",
+          "LifetimeMS": "4000"
+        },
+        {
+          "id": "1",
+          "ObjectId": "Dragon Attack Black Spin",
+          "Speed": "90",
+          "Damage": "65",
+          "Size": "100",
+          "LifetimeMS": "1200",
+          "ConditionEffect": {
+            "_": "Stasis",
+            "duration": "8",
+            "target": "1"
+          }
+        },
+        {
+          "id": "2",
+          "ObjectId": "White Bullet",
+          "Speed": "60",
+          "Damage": "80",
+          "LifetimeMS": "2000",
+          "Size": "75"
+        }
+      ]
+    },
+    {
+      "type": "0x7464",
+      "id": "Melee Puppet",
+      "DisplayId": "Huntress Puppet Statue",
+      "Class": "Character",
+      "Group": "Statues",
+      "Enemy": "",
+      "AnimatedTexture": {
+        "File": "d3Chars8x8rEmbed",
+        "Index": "0x02"
+      },
+      "HitSound": "monster/skeletons_hit",
+      "DeathSound": "monster/skeletons_death",
+      "Size": "120",
+      "ShadowSize": "25",
+      "MaxHitPoints": "60000",
+      "Defense": "30",
+      "XpMult": "1.5",
+      "Level": "20",
+      "StasisImmune": "",
+      "StunImmune": "",
+      "ParalyzeImmune": "",
+      "Projectile": {
+        "id": "0",
+        "ObjectId": "White Bullet",
+        "Damage": "65",
+        "Speed": "80",
+        "LifetimeMS": "400",
+        "Size": "60"
+      }
+    },
+    {
+      "type": "0x748a",
+      "id": "Puppet Clone",
+      "DisplayId": "Puppet Clone",
+      "Class": "Character",
+      "Group": "Statues",
+      "Enemy": "",
+      "AnimatedTexture": {
+        "File": "d3Chars8x8rEmbed",
+        "Index": "0x02"
+      },
+      "HitSound": "monster/skeletons_hit",
+      "DeathSound": "monster/skeletons_death",
+      "Size": "120",
+      "ShadowSize": "25",
+      "MaxHitPoints": "20000",
+      "Defense": "30",
+      "XpMult": "1.5",
+      "Level": "20",
+      "StasisImmune": "",
+      "StunImmune": "",
+      "ParalyzeImmune": "",
+      "Projectile": {
+        "id": "0",
+        "ObjectId": "White Bullet",
+        "Damage": "65",
+        "Speed": "80",
+        "LifetimeMS": "400",
+        "Size": "60"
+      }
+    },
+    {
+      "type": "0x7465",
+      "id": "Huntress Trap",
+      "DisplayId": "Huntress Trap",
+      "Class": "Character",
+      "Enemy": "",
+      "Texture": {
+        "File": "d3LofiObjEmbed",
+        "Index": "0x18"
+      },
+      "MaxHitPoints": "30000",
+      "Defense": "50",
+      "XpMult": "0",
+      "Size": "40",
+      "ShadowSize": "30",
+      "StasisImmune": "",
+      "StunImmune": "",
+      "Projectile": {
+        "id": "1",
+        "ObjectId": "Dark Purple Magic",
+        "Damage": "65",
+        "Speed": "80",
+        "LifetimeMS": "1000",
+        "ConditionEffect": {
+          "_": "Slowed",
+          "duration": "3"
+        }
+      }
+    },
+    {
+      "type": "0x746e",
+      "id": "Range Puppet",
+      "DisplayId": "Trickster Puppet Statue",
+      "Class": "Character",
+      "Group": "Statues",
+      "Enemy": "",
+      "AnimatedTexture": {
+        "File": "d3Chars8x8rEmbed",
+        "Index": "0x02"
+      },
+      "HitSound": "monster/skeletons_hit",
+      "DeathSound": "monster/skeletons_death",
+      "Size": "120",
+      "ShadowSize": "25",
+      "MaxHitPoints": "60000",
+      "Defense": "30",
+      "XpMult": "1.5",
+      "Level": "20",
+      "StasisImmune": "",
+      "StunImmune": "",
+      "ParalyzeImmune": "",
+      "Projectile": {
+        "id": "0",
+        "ObjectId": "White Bullet",
+        "Damage": "65",
+        "Speed": "80",
+        "LifetimeMS": "1000",
+        "Size": "75"
+      }
+    },
+    {
+      "type": "0x7474",
+      "id": "Status Puppet 1",
+      "DisplayId": "Puppet Master Statue A",
+      "Class": "Character",
+      "Group": "Statue",
+      "Enemy": "",
+      "AnimatedTexture": {
+        "File": "d3Chars8x8rEmbed",
+        "Index": "0x03"
+      },
+      "HitSound": "monster/skeletons_hit",
+      "DeathSound": "monster/skeletons_death",
+      "Size": "120",
+      "ShadowSize": "25",
+      "MaxHitPoints": "60000",
+      "Defense": "30",
+      "XpMult": "1.5",
+      "Level": "20",
+      "StasisImmune": "",
+      "StunImmune": "",
+      "ParalyzeImmune": "",
+      "Projectile": [
+        {
+          "id": "0",
+          "ObjectId": "Yellow Star",
+          "Speed": "57",
+          "Damage": "100",
+          "Size": "80",
+          "LifetimeMS": "3000",
+          "MultiHit": "",
+          "ConditionEffect": {
+            "_": "Confused",
+            "duration": "1.5"
+          }
+        },
+        {
+          "id": "1",
+          "ObjectId": "White Bullet",
+          "Damage": "100",
+          "Speed": "80",
+          "LifetimeMS": "1000"
+        }
+      ]
+    },
+    {
+      "type": "0x7489",
+      "id": "Status Puppet 2",
+      "DisplayId": "Puppet Master Statue B",
+      "Class": "Character",
+      "Group": "Statue",
+      "Enemy": "",
+      "AnimatedTexture": {
+        "File": "d3Chars8x8rEmbed",
+        "Index": "0x03"
+      },
+      "HitSound": "monster/skeletons_hit",
+      "DeathSound": "monster/skeletons_death",
+      "Size": "120",
+      "ShadowSize": "25",
+      "MaxHitPoints": "60000",
+      "Defense": "30",
+      "XpMult": "1.5",
+      "Level": "20",
+      "StasisImmune": "",
+      "StunImmune": "",
+      "ParalyzeImmune": "",
+      "Projectile": [
+        {
+          "id": "0",
+          "ObjectId": "Ice Bullet",
+          "Speed": "45",
+          "Damage": "110",
+          "LifetimeMS": "4445",
+          "ConditionEffect": {
+            "_": "Bleeding",
+            "duration": "2"
+          },
+          "MultiHit": ""
+        },
+        {
+          "id": "1",
+          "ObjectId": "White Bullet",
+          "Damage": "100",
+          "Speed": "80",
+          "LifetimeMS": "1000"
+        }
+      ]
+    },
+    {
       "type": "0x7500",
       "id": "NM Altar of Draconis",
       "DisplayId": "Altar of Draconis",
       "Class": "Character",
       "Texture": {
         "File": "lofiObjBig",
         "Index": "0xda"
       },
@@ -50521,16 +50806,28 @@
       "NoMiniMap": "",
       "Size": "0",
       "XpMult": "0.0",
       "StasisImmune": "",
       "StunImmune": "",
       "DisplayId": "Puppet Theatre Boss Spawn"
     },
     {
+      "type": "0x7466",
+      "id": "Puppet Encore Portal",
+      "DisplayId": "{objects.Puppet_Encore_Portal}",
+      "Class": "Portal",
+      "IntergamePortal": "",
+      "DungeonName": "Puppet Master's Encore",
+      "Texture": {
+        "File": "d3LofiObjEmbed",
+        "Index": "0x1a"
+      }
+    },
+    {
       "type": "0x744D",
       "id": "Event Chest",
       "DisplayId": "Event Chest",
       "Class": "Character",
       "Enemy": "",
       "Texture": {
         "File": "lofiObj3",
         "Index": "0x466"
@@ -65435,16 +65732,25 @@
       "Class": "Projectile",
       "Texture": {
         "File": "lofiObj3",
         "Index": "0x51D"
       },
       "AngleCorrection": "1"
     },
     {
+      "type": "0x2376",
+      "id": "Dark Purple Magic",
+      "Class": "Projectile",
+      "Texture": {
+        "File": "d3LofiObjEmbed",
+        "Index": "0x19"
+      }
+    },
+    {
       "type": "0x7433",
       "id": "The Puppet Master",
       "DisplayId": "The Puppet Master",
       "Class": "Character",
       "Group": "Master",
       "Enemy": "",
       "AnimatedTexture": {
         "File": "chars16x16rEncounters",
@@ -70560,26 +70866,26 @@
         "Index": "81"
       },
       "PlayerClassType": "0x0324",
       "UnlockSpecial": "Unlocked during Halloween 2014. Thanks to: Beige",
       "DisplayId": "Vampiress"
     },
     {
       "type": "0x747A",
-      "id": "Frankensteins Monster",
+      "id": "Frankenstein's Monster",
       "Skin": "",
       "Class": "Skin",
       "AnimatedTexture": {
         "File": "playerskins",
         "Index": "82"
       },
       "PlayerClassType": "0x031e",
       "UnlockSpecial": "Unlocked during Halloween 2014. Thanks to: Beige",
-      "DisplayId": "Frankensteins Monster"
+      "DisplayId": "{skins.FrankensteinAPOSs_Monster}"
     },
     {
       "type": "0x7470",
       "id": "Jack the Ripper",
       "Skin": "",
       "Class": "Skin",
       "AnimatedTexture": {
         "File": "playerskins",
Binary files ../current/sheets/d3Chars16x16r.png and ./sheets/d3Chars16x16r.png differ
Binary files ../current/sheets/d3Chars8x8r.png and ./sheets/d3Chars8x8r.png differ
Binary files ../current/sheets/d3LofiObj.png and ./sheets/d3LofiObj.png differ