FILES
-----
assets.config
player.config
spawner.config
terrestrial_worlds.config
versioning.config
ai\upgradebeamaxe1.aicommand
ai\upgradebeamaxe3.aicommand
ai\upgradebeamaxe4.aicommand
ai\upgradebeamaxe5.aicommand
dungeons\other\outpost\outpost.dungeon
interface\itemdescriptions\armor.itemdescription
interface\tooltips\armor.tooltip
interface\windowconfig\scififurnace.config
items\swords\biome\crystal\hackman.sword
items\swords\biome\crystal\hackmanight.sword
items\swords\randomgenerated\floranmace.generatedsword
items\swords\randomgenerated\slavesword.generatedsword
items\throwables\filledcapturepod.thrownitem
items\tools\miningtools\copperdrill.miningtool
items\tools\miningtools\diamonddrill.miningtool
items\tools\miningtools\golddrill.miningtool
items\tools\miningtools\platinumdrill.miningtool
items\tools\miningtools\silverdrill.miningtool
monsters\capturepod.lua
monsters\ground\approachstate.lua
monsters\ground\groundmonster.lua
monsters\ground\skills\gustattack.lua
npcs\chatstate.lua
npcs\meleeattackstate.lua
objects\crafting\scififurnace\scififurnace.object
parallax\savannah2\base\1.png
parallax\savannah3\base\1.png
parallax\savannah4\base\1.png
parallax\savannah5\base\1.png
parallax\savannah6\base\1.png
parallax\savannah7\base\1.png
parallax\savannah8\base\1.png
parallax\savannah9\base\1.png
parallax\savannah9\base\2.png
parallax\savannahbelow1\base\1.png
parallax\savannahbelow2\base\1.png
projectiles\minibiomelegendaries\plasmacrystal\plasmacrystal.projectile
projectiles\minibiomelegendaries\plasmacrystalx\plasmacrystalx.projectile
projectiles\swoosh\hammer\floranmaceswoosh\floranmaceswoosh.projectile
projectiles\swoosh\spear\crystalswoosh\crystalswoosh.projectile
projectiles\swoosh\spear\crystalswooshx\crystalswooshx.projectile
[NEW] projectiles\swoosh\spear\slaveswordshot\slaveswordswoosh.projectile
[NEW] projectiles\swoosh\spear\slaveswordshot\swordshot.frames
[NEW] projectiles\swoosh\spear\slaveswordshot\swordshot.png
[NEW] projectiles\swoosh\spear\slaveswordshot\swordshot.projectile
projectiles\throwable\capturepod\capturepod.png
projectiles\throwable\capturepod\capturepod.projectile
projectiles\throwable\filledcapturepod\filledcapturepod.png
projectiles\throwable\filledcapturepod\filledcapturepod.projectile
recipes\anvil\copperpickaxe.recipe
recipes\anvil\goldpickaxe.recipe
recipes\anvil\silverpickaxe.recipe
recipes\biomes\rust\rustbed.recipe
recipes\biomes\rust\rustchair.recipe
recipes\biomes\rust\rustchest.recipe
recipes\biomes\rust\rustdoor.recipe
recipes\biomes\rust\rusttable.recipe
recipes\craftingtable\ironcraftingtable.recipe
recipes\ironcraftingtable\roboticcraftingtable.recipe
recipes\metalworkstation\diamondpickaxe.recipe
recipes\metalworkstation\platinumpickaxe.recipe
recipes\plain\medkit.recipe
recipes\roboticcraftingtable\scifianvil.recipe
recipes\roboticcraftingtable\scififurnace.recipe
recipes\roboticcraftingtable\wiringstation.recipe
recipes\scifianvil\copperdrill.recipe
recipes\scifianvil\diamonddrill.recipe
recipes\scifianvil\golddrill.recipe
recipes\scifianvil\platinumdrill.recipe
recipes\scifianvil\silverdrill.recipe
recipes\stonefurnace\glassmaterial.recipe
[NEW] recipes\stonefurnace\glassmaterial2.recipe
[NEW] recipes\terramart\sugar.recipe
[NEW] sfx\tools\beamaxe1.wav
[NEW] sfx\tools\beamaxe2.wav
[NEW] sfx\tools\beamaxe3.wav
stats\effects\rage\rage.lua
tiles\materials\meteoriterock.material
tiles\materials\rock04.material
tiles\materials\rock12.material
tiles\materials\rock14.material
tiles\materials\rock15.material
tiles\materials\rock17.material
treasure\biome.treasurepools
treasure\common.treasurepools

DIFFS
-----
assets.config
24c24
<   "version" : "Upbeat Giraffe 20141208"
---
>   "version" : "Upbeat Giraffe 20141218"

player.config
91a92
>       { "item" : "cake" },
133c134
<       { "item" : "fossilstation" },
---
>       // { "item" : "fossilstation" },
136c137
< //      { "item" : "portable3dprinter" },
---
>       // { "item" : "portable3dprinter" },
146d146
<       { "item" : "painttool" },
181d180
<       { "item" : "peanutbutter" },
418c417
<         "baseValue" : 100.0
---
>         "baseValue" : 10.0

spawner.config
186c186
<       "targetDensity" : 0.02,
---
>       "targetDensity" : 0.015,
199c199
<       "targetDensity" : 0.06,
---
>       "targetDensity" : 0.04,
212c212
<       "targetDensity" : 0.02,
---
>       "targetDensity" : 0.015,
225c225
<       "targetDensity" : 0.02,
---
>       "targetDensity" : 0.015,
238c238
<       "targetDensity" : 0.02,
---
>       "targetDensity" : 0.015,
251c251
<       "targetDensity" : 0.06,
---
>       "targetDensity" : 0.04,
264c264
<       "targetDensity" : 0.02,
---
>       "targetDensity" : 0.015,
277c277
<       "targetDensity" : 0.02,
---
>       "targetDensity" : 0.015,
293c293
<       "targetDensity" : 0.02,
---
>       "targetDensity" : 0.015,
306c306
<       "targetDensity" : 0.02,
---
>       "targetDensity" : 0.015,
319c319
<       "targetDensity" : 0.02,
---
>       "targetDensity" : 0.015,
332c332
<       "targetDensity" : 0.02,
---
>       "targetDensity" : 0.015,
345c345
<       "targetDensity" : 0.06,
---
>       "targetDensity" : 0.04,
358c358
<       "targetDensity" : 0.02,
---
>       "targetDensity" : 0.015,
371c371
<       "targetDensity" : 0.02,
---
>       "targetDensity" : 0.015,
387c387
<       "targetDensity" : 0.02,
---
>       "targetDensity" : 0.015,
400c400
<       "targetDensity" : 0.06,
---
>       "targetDensity" : 0.04,
413c413
<       "targetDensity" : 0.02,
---
>       "targetDensity" : 0.015,
426c426
<       "targetDensity" : 0.02,
---
>       "targetDensity" : 0.015,
439c439
<       "targetDensity" : 0.02,
---
>       "targetDensity" : 0.015,
452c452
<       "targetDensity" : 0.06,
---
>       "targetDensity" : 0.04,
465c465
<       "targetDensity" : 0.02,
---
>       "targetDensity" : 0.015,
478c478
<       "targetDensity" : 0.02,
---
>       "targetDensity" : 0.015,
494c494
<       "targetDensity" : 0.02,
---
>       "targetDensity" : 0.015,
507c507
<       "targetDensity" : 0.02,
---
>       "targetDensity" : 0.015,
520c520
<       "targetDensity" : 0.02,
---
>       "targetDensity" : 0.015,
533c533
<       "targetDensity" : 0.02,
---
>       "targetDensity" : 0.015,
546c546
<       "targetDensity" : 0.06,
---
>       "targetDensity" : 0.04,
559c559
<       "targetDensity" : 0.02,
---
>       "targetDensity" : 0.015,
572c572
<       "targetDensity" : 0.02,
---
>       "targetDensity" : 0.015,

terrestrial_worlds.config
114,115c114,115
<           "baseHeight" : 1800,
<           "layerLevel" : 1600
---
>           "baseHeight" : 1850,
>           "layerLevel" : 1700
118,119c118,119
<           "baseHeight" : 1300,
<           "layerLevel" : 1000
---
>           "baseHeight" : 1400,
>           "layerLevel" : 1100
122,123c122,123
<           "baseHeight" : 800,
<           "layerLevel" : 700
---
>           "baseHeight" : 900,
>           "layerLevel" : 800
126c126
<           "baseHeight" : 650,
---
>           "baseHeight" : 700,

versioning.config
2,6c2,6
<   "PlayerMetadata" : 1,
<   "WorldMetadata" : 5,
<   "UniverseSettings" : 1,
<   "ClientContext" : 2,
<   "CelestialChunk" : 1,
---
>   "PlayerMetadata" : 2,
>   "WorldMetadata" : 6,
>   "UniverseSettings" : 2,
>   "ClientContext" : 3,
>   "CelestialChunk" : 2,
8,13c8,13
<   "PlayerEntity" : 1,
<   "MonsterEntity" : 1,
<   "ObjectEntity" : 2,
<   "PlantEntity" : 1,
<   "ItemDropEntity" : 1,
<   "NpcEntity" : 2,
---
>   "PlayerEntity" : 2,
>   "MonsterEntity" : 2,
>   "ObjectEntity" : 3,
>   "PlantEntity" : 2,
>   "ItemDropEntity" : 2,
>   "NpcEntity" : 3,
15c15
<   "Item" : 1
---
>   "Item" : 2

ai\upgradebeamaxe1.aicommand
10c10
<         "tileDamage" : 1.5,
---
>         "tileDamage" : 1.8,

ai\upgradebeamaxe3.aicommand
10,12c10,12
<         "tileDamage" : 2.0,
<         "minBeamJitter" : 0.15,
<         "maxBeamJitter" : 0.3
---
>         "blockRadius" : 3,
>         "minBeamWidth" : 5,
>         "maxBeamWidth" : 7
28c28
<       "buttonText" : "Upgrade M. M. - Power II",
---
>       "buttonText" : "Upgrade M. M. - Size",
32c32
<           "text" : "^white;With ^orange;10 bars of gold^white; and ^orange;10 bars of titanium^white;, I can upgrade your matter manipulator to ^green;further increase its mining power^white;.",
---
>           "text" : "^white;With ^orange;10 bars of gold^white; and ^orange;10 bars of titanium^white;, I can upgrade your matter manipulator to ^green;increase its mining area^white;.",

ai\upgradebeamaxe4.aicommand
10,12c10,12
<         "blockRadius" : 3,
<         "minBeamWidth" : 5,
<         "maxBeamWidth" : 7
---
>         "tileDamage" : 2.6,
>         "minBeamJitter" : 0.15,
>         "maxBeamJitter" : 0.3
28c28
<       "buttonText" : "Upgrade M. M. - Size",
---
>       "buttonText" : "Upgrade M. M. - Power II",
32c32
<           "text" : "^white;With ^orange;20 bars of durasteel^white;, I can upgrade your matter manipulator to ^green;increase its mining area^white;.",
---
>           "text" : "^white;With ^orange;20 bars of durasteel^white;, I can upgrade your matter manipulator to ^green;further increase its mining power^white;.",

ai\upgradebeamaxe5.aicommand
10c10
<         "tileDamage" : 3.0,
---
>         "tileDamage" : 3.4,

dungeons\other\outpost\outpost.dungeon
1883c1883
<       "comment" : "human ex-con 10",
---
>       "comment" : "human ex-con 46",
1889c1889
<             "seed" : 10
---
>             "seed" : 46

interface\itemdescriptions\armor.itemdescription
66,67c66,67
<       "spacing" : [0, 4],
<       "memberSize" : [999, 20],
---
>       "spacing" : [0, 0],
>       "memberSize" : [999, 15],
71c71
<           "position" : [90, 6],
---
>           "position" : [100, 2],
77,78c77
<           "position" : [70, 2],
<           "maxSize" : [16, 16],
---
>           "position" : [74, 1],

interface\tooltips\armor.tooltip
51c51
<     "position" : [0, 117],
---
>     "position" : [0, 118],
53,54c53,54
<       "spacing" : [0, 4],
<       "memberSize" : [999, 20],
---
>       "spacing" : [0, 0],
>       "memberSize" : [999, 15],
58c58
<           "position" : [90, 6],
---
>           "position" : [100, 2],
64,65c64
<           "position" : [70, 2],
<           "maxSize" : [16, 16],
---
>           "position" : [74, 1],

interface\windowconfig\scififurnace.config
25c25
<       "title" : "  NUCLEONIC CRUCIBLE",
---
>       "title" : "  MAGNETIC CRUCIBLE",

items\swords\biome\crystal\hackman.sword
50c50
<       "power" : 8.5
---
>       "power" : 2.0

items\swords\biome\crystal\hackmanight.sword
50c50
<       "power" : 8.5
---
>       "power" : 2.0

items\swords\randomgenerated\floranmace.generatedsword
7c7
<   "firePosition" : [8, 2],
---
>   "firePosition" : [8, 3],

items\swords\randomgenerated\slavesword.generatedsword
8c8
<   "firePosition" : [0.0, -8.3],
---
>   "firePosition" : [10.0, -10],
18c18
<     "projectileTypes" : [ "swordblank" ],
---
>     "projectileTypes" : [ "slaveswordswoosh" ],

items\throwables\filledcapturepod.thrownitem
18c18
<     "speed" : 70,
---
>     "speed" : 40,

items\tools\miningtools\copperdrill.miningtool
25c25
<   "durability" : 600,
---
>   "durability" : 1000,

items\tools\miningtools\diamonddrill.miningtool
25c25
<   "durability" : 600,
---
>   "durability" : 1000,

items\tools\miningtools\golddrill.miningtool
25c25
<   "durability" : 600,
---
>   "durability" : 1000,

items\tools\miningtools\platinumdrill.miningtool
25c25
<   "durability" : 600,
---
>   "durability" : 1000,

items\tools\miningtools\silverdrill.miningtool
25c25
<   "durability" : 600,
---
>   "durability" : 1000,

monsters\capturepod.lua
98c98
<         speed = 70,
---
>         speed = 40,

monsters\ground\approachstate.lua
10a11,12
>   stateData.lastDirection = mcontroller.facingDirection()
> 
26,30c28,36
<     if option.valid then
<       if pointWithinRect(mcontroller.position(), option.startRect) then
<         --just stand around and wait, I guess...
<         entity.setAnimationState("movement", "idle")
<         faceTarget()
---
> 
>     if pointWithinRect(mcontroller.position(), option.startRect) then
>       --just stand around and wait, I guess...
>       entity.setAnimationState("movement", "idle")
>       faceTarget()
>       return true
>     else
>       if option.valid and checkStuck() > 4 then
>         self.state.pickState({flee=true})
32,36c38
<       else
<         if checkStuck() > 4 then
<           self.state.pickState({flee=true})
<           return true
<         end
---
>       end
38c40
<         entity.setAnimationState("movement", "run")
---
>       entity.setAnimationState("movement", "run")
40c42,44
<         --TODO: how to handle separation movement?
---
>       --TODO: how to handle separation movement?
>       local deltaX
>       if option.valid then
44c48,55
<         mcontroller.controlFace(self.pathing.deltaX or option.approachDelta[1])
---
>         deltaX = self.pathing.deltaX or option.approachDelta[1]
>       elseif math.abs(option.approachDelta[1]) > 1 then
>         move(option.approachDelta, true, 0)
>         deltaX = option.approachDelta[1]
>       else
>         entity.setAnimationState("movement", "idle")
>         deltaX = self.toTarget[1]
>       end
46,48c57,60
<         if (math.abs(option.approachDelta[1]) < 5.5 and math.abs(self.toTarget[1]) < 6) then
<           faceTarget()
<         end
---
>       if (math.abs(option.approachDelta[1]) < 5.5 and math.abs(self.toTarget[1]) < 6) then
>         approachState.controlFace(dt, stateData, util.toDirection(self.toTarget[1]))
>       else
>         approachState.controlFace(dt, stateData, util.toDirection(deltaX))
50,52d61
<     else
<       local toTarget = world.distance(world.entityPosition(self.target), mcontroller.position())
<       move(toTarget, true, 1)
56a66,76
> end
> 
> function approachState.controlFace(dt, stateData, direction, lastDirection)
>   if direction ~= stateData.lastDirection and self.facingTimer <= 0 then
>     self.facingTimer = self.facingCooldown
>     mcontroller.controlFace(direction)
>     stateData.lastDirection = direction
>   else
>     --Maintain the old direction
>     mcontroller.controlFace(stateData.lastDirection)
>   end

monsters\ground\groundmonster.lua
43a44,46
>   self.facingTimer = 0
>   self.facingCooldown = 0.5
> 
318a322
>   self.pathing.deltaX = util.toDirection(delta[1])
809a814
>   self.facingTimer = self.facingTimer - dt

monsters\ground\skills\gustattack.lua
86a87,88
>   entity.setForceRegion({self.position[1], self.position[2], self.position[1], self.position[2]}, {0, 0})
> 

npcs\chatstate.lua
61c61
<   if math.abs(toPartner[2]) > 2 then
---
>   if math.abs(toPartner[2]) > distanceRange[1] + 1 then

npcs\meleeattackstate.lua
59a60,66
>   if stateData.awaitingAttackToken and not world.entityExists(stateData.awaitingAttackToken) then
>     stateData.awaitingAttackToken = nil
>   end
>   if self.attackTokenRequest and not world.entityExists(self.attackTokenRequest) then
>     self.attackTokenRequest = nil
>   end
> 
292c299
<   if self.attackTokenRequest and self.attackTokenRequest ~= npcId then
---
>   if self.attackTokenRequest and self.attackTokenRequest ~= npcId and world.entityExists(self.attackTokenRequest) then

objects\crafting\scififurnace\scififurnace.object
11c11
<   "shortdescription" : "^orange;Nucleonic Crucible^white;",
---
>   "shortdescription" : "^orange;Magnetic Crucible^white;",
16c16
<   "apexDescription" : "An nucleonic crucible. I can create incredibly strong alloys with this.",
---
>   "apexDescription" : "A magnetic crucible. I can create incredibly strong alloys with this.",
19,21c19,21
<   "glitchDescription" : "Craftsmanship. This nucleonic crucible is perfect for creating durasteel and other alloys.",
<   "humanDescription" : "An nucleonic crucible. This device is powerful enough to create durasteel and other materials.",
<   "hylotlDescription" : "An nucleonic crucible. I can make incredible materials with this.",
---
>   "glitchDescription" : "Craftsmanship. This magnetic crucible is perfect for creating durasteel and other alloys.",
>   "humanDescription" : "A magnetic crucible. This device is powerful enough to create durasteel and other materials.",
>   "hylotlDescription" : "A magnetic crucible. I can make incredible materials with this.",

projectiles\minibiomelegendaries\plasmacrystal\plasmacrystal.projectile
3,4c3,4
<   "physics" : "bullet",
<   "bounces" : 0,
---
>   "physics" : "stickygrenade",
>   "bounces" : -1,
6c6
<   "timeToLive" : 0.5,
---
>   "timeToLive" : 0.2,
9a10
>   "piercing" : true,
14c15
<       "options" : [ "/sfx/melee/sword_parry.wav" ]
---
>       "options" : [ "/sfx/tools/pickaxe_precious.wav" ]

projectiles\minibiomelegendaries\plasmacrystalx\plasmacrystalx.projectile
3,4c3,4
<   "physics" : "bullet",
<   "bounces" : 0,
---
>   "physics" : "stickygrenade",
>   "bounces" : -1,
6c6
<   "timeToLive" : 0.4,
---
>   "timeToLive" : 0.2,
9a10
>   "piercing" : true,
14c15
<       "options" : [ "/sfx/melee/sword_parry.wav" ]
---
>       "options" : [ "/sfx/tools/pickaxe_precious.wav" ]

projectiles\swoosh\hammer\floranmaceswoosh\floranmaceswoosh.projectile
6d5
<   "damageKindImage" : "/interface/statuses/poison.png",
14,16d12
<   "statusEffects" : [
<     "weakpoison"
<   ],
23c19
<       "inheritDamageFactor" : 0.1,
---
>       "inheritDamageFactor" : 0.05,
30c26
<       "inheritDamageFactor" : 0.1,
---
>       "inheritDamageFactor" : 0.05,
37c33
<       "inheritDamageFactor" : 0.1,
---
>       "inheritDamageFactor" : 0.05,
44c40
<       "inheritDamageFactor" : 0.1,
---
>       "inheritDamageFactor" : 0.05,
51c47
<       "inheritDamageFactor" : 0.1,
---
>       "inheritDamageFactor" : 0.05,

projectiles\swoosh\spear\crystalswoosh\crystalswoosh.projectile
23c23
<       "inheritDamageFactor" : 0.1,
---
>       "inheritDamageFactor" : 1.3,

projectiles\swoosh\spear\crystalswooshx\crystalswooshx.projectile
23c23
<       "inheritDamageFactor" : 0.1,
---
>       "inheritDamageFactor" : 1.5,

projectiles\throwable\capturepod\capturepod.projectile
4,5c4,5
<   "animationCycle" : 0.05,
<   "physics" : "grenadezbomb",
---
>   "animationCycle" : 0.25,
>   "physics" : "grenade",
8c8
<   "speed" : 70,
---
>   "speed" : 30,
11a12
>   "windupTime" : 0.05,

projectiles\throwable\filledcapturepod\filledcapturepod.projectile
4,5c4,5
<   "animationCycle" : 0.05,
<   "physics" : "grenadezbomb",
---
>   "animationCycle" : 0.25,
>   "physics" : "grenade",
8c8
<   "speed" : 70,
---
>   "speed" : 40,

recipes\anvil\copperpickaxe.recipe
3c3
<     { "item" : "copperbar", "count" : 8 }
---
>     { "item" : "copperbar", "count" : 2 }

recipes\anvil\goldpickaxe.recipe
3c3
<     { "item" : "goldbar", "count" : 8 }
---
>     { "item" : "goldbar", "count" : 2 }

recipes\anvil\silverpickaxe.recipe
3c3
<     { "item" : "silverbar", "count" : 8 }
---
>     { "item" : "silverbar", "count" : 2 }

recipes\biomes\rust\rustbed.recipe
4,5c4
<     { "item" : "bolt", "count" : 15 },
<     { "item" : "copperbar", "count" : 5 },
---
>     { "item" : "copperbar", "count" : 10 },

recipes\biomes\rust\rustchair.recipe
4,5c4
<     { "item" : "bolt", "count" : 5 },
<     { "item" : "copperbar", "count" : 2 }
---
>     { "item" : "copperbar", "count" : 5 }

recipes\biomes\rust\rustchest.recipe
4,5c4
<     { "item" : "bolt", "count" : 12 },
<     { "item" : "copperbar", "count" : 2 }
---
>     { "item" : "copperbar", "count" : 10 }

recipes\biomes\rust\rustdoor.recipe
4,5c4
<     { "item" : "bolt", "count" : 15 },
<     { "item" : "copperbar", "count" : 3 }
---
>     { "item" : "copperbar", "count" : 5 }

recipes\biomes\rust\rusttable.recipe
4,5c4
<     { "item" : "bolt", "count" : 18 },
<     { "item" : "copperbar", "count" : 5 }
---
>     { "item" : "copperbar", "count" : 10 }

recipes\craftingtable\ironcraftingtable.recipe
3c3
<     { "item" : "ironbar", "count" : 20 }
---
>     { "item" : "ironbar", "count" : 5 }
9c9
<   "groups" : [ "craftingtable", "objects", "tools", "all" ]
---
>   "groups" : [ "craftingtable", "objects", "tools", "crafting", "all" ]

recipes\ironcraftingtable\roboticcraftingtable.recipe
3c3
<     { "item" : "titaniumbar", "count" : 20 },
---
>     { "item" : "titaniumbar", "count" : 5 },

recipes\metalworkstation\diamondpickaxe.recipe
3c3
<     { "item" : "diamond", "count" : 8 }
---
>     { "item" : "diamond", "count" : 2 }

recipes\metalworkstation\platinumpickaxe.recipe
3c3
<     { "item" : "platinumbar", "count" : 8 }
---
>     { "item" : "platinumbar", "count" : 2 }

recipes\plain\medkit.recipe
3c3
<     { "item" : "biosample", "count" : 4 },
---
>     { "item" : "biosample", "count" : 1 },

recipes\roboticcraftingtable\scifianvil.recipe
3c3
<     { "item" : "durasteelbar", "count" : 20 }
---
>     { "item" : "durasteelbar", "count" : 10 }

recipes\roboticcraftingtable\scififurnace.recipe
3,5c3,4
<     { "item" : "titaniumbar", "count" : 20 },
<     { "item" : "uraniumrod", "count" : 10 },
<     { "item" : "campfire", "count" : 1 }
---
>     { "item" : "titaniumbar", "count" : 10 },
>     { "item" : "uraniumrod", "count" : 10 }

recipes\roboticcraftingtable\wiringstation.recipe
3c3
<     { "item" : "durasteelbar", "count" : 20 }
---
>     { "item" : "durasteelbar", "count" : 10 }

recipes\scifianvil\copperdrill.recipe
3c3
<     { "item" : "copperbar", "count" : 12 }
---
>     { "item" : "copperbar", "count" : 6 }

recipes\scifianvil\diamonddrill.recipe
3c3
<     { "item" : "diamond", "count" : 12 }
---
>     { "item" : "diamond", "count" : 6 }

recipes\scifianvil\golddrill.recipe
3c3
<     { "item" : "goldbar", "count" : 12 }
---
>     { "item" : "goldbar", "count" : 6 }

recipes\scifianvil\platinumdrill.recipe
3c3
<     { "item" : "platinumbar", "count" : 12 }
---
>     { "item" : "platinumbar", "count" : 6 }

recipes\scifianvil\silverdrill.recipe
3c3
<     { "item" : "silverbar", "count" : 12 }
---
>     { "item" : "silverbar", "count" : 6 }

recipes\stonefurnace\glassmaterial.recipe
3c3
<     { "item" : "sand2", "count" : 3 }
---
>     { "item" : "sand", "count" : 3 }

stats\effects\rage\rage.lua
3,5c3,5
<   self.runModifier = effect.configParameter("runModifier") or -0.35
<   self.jumpModifier = effect.configParameter("jumpModifier") or -0.35
<   self.groundMovementModifier = effect.configParameter("groundMovementModifier") or -0.5
---
>   self.runModifier = effect.configParameter("runModifier", 0)
>   self.jumpModifier = effect.configParameter("jumpModifier", 0)
>   self.groundMovementModifier = effect.configParameter("groundMovementModifier", 0)
12c12
<   self.powerModifier = effect.configParameter("powerModifier") or 0.5
---
>   self.powerModifier = effect.configParameter("powerModifier", 0)

tiles\materials\meteoriterock.material
11c11
<   "health" : 16,
---
>   "health" : 12,

tiles\materials\rock04.material
11c11
<   "health" : 16,
---
>   "health" : 12,

tiles\materials\rock12.material
11c11
<   "health" : 16,
---
>   "health" : 12,

tiles\materials\rock14.material
10c10
<   "health" : 32,
---
>   "health" : 16,

tiles\materials\rock15.material
10c10
<   "health" : 32,
---
>   "health" : 16,

tiles\materials\rock17.material
10c10
<   "health" : 16,
---
>   "health" : 12,

treasure\biome.treasurepools
13,16c13,17
<         [0.1, 1],
<         [0.5, 2],
<         [0.3, 3],
<         [0.1, 4]
---
>         [0.05, 1],
>         [0.40, 2],
>         [0.30, 3],
>         [0.15, 4],
>         [0.10, 5]
40,43c41,45
<         [0.1, 1],
<         [0.5, 2],
<         [0.3, 3],
<         [0.1, 4]
---
>         [0.05, 1],
>         [0.40, 2],
>         [0.30, 3],
>         [0.15, 4],
>         [0.10, 5]
71,74c73,77
<         [0.1, 1],
<         [0.5, 2],
<         [0.3, 3],
<         [0.1, 4]
---
>         [0.05, 1],
>         [0.40, 2],
>         [0.30, 3],
>         [0.15, 4],
>         [0.10, 5]
106,109c109,113
<         [0.1, 1],
<         [0.5, 2],
<         [0.3, 3],
<         [0.1, 4]
---
>         [0.05, 1],
>         [0.40, 2],
>         [0.30, 3],
>         [0.15, 4],
>         [0.10, 5]
138,141c142,146
<         [0.1, 1],
<         [0.5, 2],
<         [0.3, 3],
<         [0.1, 4]
---
>         [0.05, 1],
>         [0.40, 2],
>         [0.30, 3],
>         [0.15, 4],
>         [0.10, 5]
170,173c175,179
<         [0.1, 1],
<         [0.5, 2],
<         [0.3, 3],
<         [0.1, 4]
---
>         [0.05, 1],
>         [0.40, 2],
>         [0.30, 3],
>         [0.15, 4],
>         [0.10, 5]
207,210c213,217
<         [0.1, 1],
<         [0.5, 2],
<         [0.3, 3],
<         [0.1, 4]
---
>         [0.05, 1],
>         [0.40, 2],
>         [0.30, 3],
>         [0.15, 4],
>         [0.10, 5]
241,244c248,252
<         [0.1, 1],
<         [0.5, 2],
<         [0.3, 3],
<         [0.1, 4]
---
>         [0.05, 1],
>         [0.40, 2],
>         [0.30, 3],
>         [0.15, 4],
>         [0.10, 5]
273,276c281,285
<         [0.1, 1],
<         [0.5, 2],
<         [0.3, 3],
<         [0.1, 4]
---
>         [0.05, 1],
>         [0.40, 2],
>         [0.30, 3],
>         [0.15, 4],
>         [0.10, 5]
316,319c325,329
<         [0.1, 1],
<         [0.5, 2],
<         [0.3, 3],
<         [0.1, 4]
---
>         [0.05, 1],
>         [0.40, 2],
>         [0.30, 3],
>         [0.15, 4],
>         [0.10, 5]
363,366c373,377
<         [0.1, 1],
<         [0.5, 2],
<         [0.3, 3],
<         [0.1, 4]
---
>         [0.05, 1],
>         [0.40, 2],
>         [0.30, 3],
>         [0.15, 4],
>         [0.10, 5]
400,403c411,415
<         [0.1, 1],
<         [0.5, 2],
<         [0.3, 3],
<         [0.1, 4]
---
>         [0.05, 1],
>         [0.40, 2],
>         [0.30, 3],
>         [0.15, 4],
>         [0.10, 5]
437,440c449,453
<         [0.1, 1],
<         [0.5, 2],
<         [0.3, 3],
<         [0.1, 4]
---
>         [0.05, 1],
>         [0.40, 2],
>         [0.30, 3],
>         [0.15, 4],
>         [0.10, 5]
473,476c486,490
<         [0.1, 1],
<         [0.5, 2],
<         [0.3, 3],
<         [0.1, 4]
---
>         [0.05, 1],
>         [0.40, 2],
>         [0.30, 3],
>         [0.15, 4],
>         [0.10, 5]
511,514c525,529
<         [0.1, 1],
<         [0.5, 2],
<         [0.3, 3],
<         [0.1, 4]
---
>         [0.05, 1],
>         [0.40, 2],
>         [0.30, 3],
>         [0.15, 4],
>         [0.10, 5]
568,571c583,587
<         [0.1, 1],
<         [0.5, 2],
<         [0.3, 3],
<         [0.1, 4]
---
>         [0.05, 1],
>         [0.40, 2],
>         [0.30, 3],
>         [0.15, 4],
>         [0.10, 5]
608,611c624,628
<         [0.1, 1],
<         [0.5, 2],
<         [0.3, 3],
<         [0.1, 4]
---
>         [0.05, 1],
>         [0.40, 2],
>         [0.30, 3],
>         [0.15, 4],
>         [0.10, 5]
642,645c659,663
<         [0.1, 1],
<         [0.5, 2],
<         [0.3, 3],
<         [0.1, 4]
---
>         [0.05, 1],
>         [0.40, 2],
>         [0.30, 3],
>         [0.15, 4],
>         [0.10, 5]
680,683c698,702
<         [0.1, 1],
<         [0.5, 2],
<         [0.3, 3],
<         [0.1, 4]
---
>         [0.05, 1],
>         [0.40, 2],
>         [0.30, 3],
>         [0.15, 4],
>         [0.10, 5]
714,717c733,737
<         [0.1, 1],
<         [0.5, 2],
<         [0.3, 3],
<         [0.1, 4]
---
>         [0.05, 1],
>         [0.40, 2],
>         [0.30, 3],
>         [0.15, 4],
>         [0.10, 5]
762,765c782,786
<         [0.1, 1],
<         [0.5, 2],
<         [0.3, 3],
<         [0.1, 4]
---
>         [0.05, 1],
>         [0.40, 2],
>         [0.30, 3],
>         [0.15, 4],
>         [0.10, 5]
800,803c821,825
<         [0.1, 1],
<         [0.5, 2],
<         [0.3, 3],
<         [0.1, 4]
---
>         [0.05, 1],
>         [0.40, 2],
>         [0.30, 3],
>         [0.15, 4],
>         [0.10, 5]
830,833c852,856
<         [0.1, 1],
<         [0.5, 2],
<         [0.3, 3],
<         [0.1, 4]
---
>         [0.05, 1],
>         [0.40, 2],
>         [0.30, 3],
>         [0.15, 4],
>         [0.10, 5]
865,868c888,892
<         [0.1, 1],
<         [0.5, 2],
<         [0.3, 3],
<         [0.1, 4]
---
>         [0.05, 1],
>         [0.40, 2],
>         [0.30, 3],
>         [0.15, 4],
>         [0.10, 5]
902,905c926,930
<         [0.1, 1],
<         [0.5, 2],
<         [0.3, 3],
<         [0.1, 4]
---
>         [0.05, 1],
>         [0.40, 2],
>         [0.30, 3],
>         [0.15, 4],
>         [0.10, 5]
949,952c974,978
<         [0.1, 1],
<         [0.5, 2],
<         [0.3, 3],
<         [0.1, 4]
---
>         [0.05, 1],
>         [0.40, 2],
>         [0.30, 3],
>         [0.15, 4],
>         [0.10, 5]
988,991c1014,1018
<         [0.1, 1],
<         [0.5, 2],
<         [0.3, 3],
<         [0.1, 4]
---
>         [0.05, 1],
>         [0.40, 2],
>         [0.30, 3],
>         [0.15, 4],
>         [0.10, 5]
1026,1029c1053,1057
<         [0.1, 1],
<         [0.5, 2],
<         [0.3, 3],
<         [0.1, 4]
---
>         [0.05, 1],
>         [0.40, 2],
>         [0.30, 3],
>         [0.15, 4],
>         [0.10, 5]
1058,1061c1086,1090
<         [0.1, 1],
<         [0.5, 2],
<         [0.3, 3],
<         [0.1, 4]
---
>         [0.05, 1],
>         [0.40, 2],
>         [0.30, 3],
>         [0.15, 4],
>         [0.10, 5]
1092,1095c1121,1125
<         [0.1, 1],
<         [0.5, 2],
<         [0.3, 3],
<         [0.1, 4]
---
>         [0.05, 1],
>         [0.40, 2],
>         [0.30, 3],
>         [0.15, 4],
>         [0.10, 5]
1123,1126c1153,1157
<         [0.1, 1],
<         [0.5, 2],
<         [0.3, 3],
<         [0.1, 4]
---
>         [0.05, 1],
>         [0.40, 2],
>         [0.30, 3],
>         [0.15, 4],
>         [0.10, 5]
1151,1154c1182,1186
<         [0.1, 1],
<         [0.5, 2],
<         [0.3, 3],
<         [0.1, 4]
---
>         [0.05, 1],
>         [0.40, 2],
>         [0.30, 3],
>         [0.15, 4],
>         [0.10, 5]

treasure\common.treasurepools
14c14
<         [0.30, 2],
---
>         [0.15, 2],
16,17c16,18
<         [0.15, 4],
<         [0.05, 5]
---
>         [0.20, 4],
>         [0.10, 5],
>         [0.05, 6]
174c175
<         {"weight" : 0.4, "pool" : "diggingTool"},
---
>         {"weight" : 0.3, "pool" : "diggingTool"},
177a179,180
>         {"weight" : 0.1, "item" : [ "throwingblock", 10]},
> 
238,239c241,255
<     //TODO: add tiers?
<     [0, {
---
>     [1, {
>       "pool" : [
>         {"weight" : 0.45, "item" : [ "bandage", 3]},
>         {"weight" : 0.45, "item" : [ "bandage", 6]},
>         {"weight" : 0.10, "pool" : "stim"}
>       ]
>     }],
>     [3.9, {
>       "pool" : [
>         {"weight" : 0.40, "item" : [ "medkit", 3]},
>         {"weight" : 0.40, "item" : [ "medkit", 6]},
>         {"weight" : 0.20, "pool" : "stim"}
>       ]
>     }],
>     [5.9, {
241,243c257,259
<         {"weight" : 0.55, "item" : [ "bandage", 3]},
<         {"weight" : 0.3, "pool" : "stim"},
<         {"weight" : 0.15, "item" : [ "medkit", 1]}
---
>         {"weight" : 0.35, "item" : [ "nanowrap", 3]},
>         {"weight" : 0.35, "item" : [ "nanowrap", 6]},
>         {"weight" : 0.30, "pool" : "stim"}
249d264
<     //TODO: add tiers?
260,263c275,278
<         {"weight" : 0.25, "item" : [ "redstim", 1]},
<         {"weight" : 0.25, "item" : [ "bluestim", 1]},
<         {"weight" : 0.25, "item" : [ "greenstim", 1]},
<         {"weight" : 0.25, "item" : [ "yellowstim", 1]}
---
>         {"weight" : 0.25, "item" : [ "redstim", 3]},
>         {"weight" : 0.25, "item" : [ "bluestim", 3]},
>         {"weight" : 0.25, "item" : [ "greenstim", 3]},
>         {"weight" : 0.25, "item" : [ "yellowstim", 3]}