Merge pull request #3609 from edwardspec/fix-misc-typos

Misc. text improvements

items/active/weapons/masteries.lua

@@ -444,7 +444,7 @@ function masteries.apply(args)
 				masteryBuffer[#masteryBuffer + 1]={stat="focalProjectileCountBonus", amount=math.min(1.0,math.floor(masteries.stats.wandMastery*6))*handMultiplier }
 			end
 
-			--wands: increased damage, reduced cast time, increased projectiles (+1 per 20% mastery, up to 100%), increased range.
+			--staves: increased damage, reduced cast time, increased projectiles (+1 per 20% mastery, up to 100%), increased range.
 			--khe's take: staves are the more cast range and damage focused weapon, less about speed and many hits.
 			--notes: projectile count does not increase total damage, as the damage is split per projectile.
 			--math: 20% mastery grants: 10% range, 6% damage, 0.98 charge time multiplier. +1 projectile.

items/generic/food/chewablemagnet.consumable

@@ -4,11 +4,11 @@
   "price" : 150,
   "category" : "drink",
   "inventoryIcon" : "chewablemagnet.png",
-  "description" : "Not healthy, but useful. \n^yellow;Item Magnet II^reset;",
+  "description" : "Not healthy, but useful. \n^yellow;Item Magnet II^reset; (400s)",
   "shortdescription" : "Chewable Magnet",
   "tooltipKind" : "food",
   "maxStack" : 1000,
-  "emitters" : [ "drinking" ],  
+  "emitters" : [ "drinking" ],
   "effects" : [ [
     {
         "effect" : "fu_pickuprange2",

zb/researchTree/fu_engineering.config

@@ -601,7 +601,7 @@
       "computers3": [ "Neural Networks", "^orange;Tier 4^reset;\n\nWith AI technology, you've designed a data tower which will generate huge amounts of research for your benefit, vastly outstripping all computers that came before it."],
       "computers4": [ "Superior Networks", "^orange;Tier 5^reset;\n\nYour AI is super-advanced now, and generate huge amounts of research for your benefit, allowing you to kick off your shoes and finally let something do the work for you that you can rely on."],
 
-      "extraction1": [ "Extraction Basics", "^orange;Tier 1^reset;\n\nYou've learned the basics of resource extraction and can now build rudimentary devices to extract, research and centrifuge materials. \n\n^cyan;Extractor^reset;\n\nPut almost anything in and it will convert it into something else. Most items are processed in groups of 50. \n\n^cyan;Centrifuge^reset;\n\nPut any liquid inside and the centrifuge will start working - though the wooden one isn't quite durable enough to handle lava and other volatile stuff. Researched in the ^orange;Power Systems^reset; tree. \n\n^cyan;Research Computer^reset;\n\nPut an item with a value greater than 0 in one and it will automatically convert it into an amount of research equal to ^green;5% of the item's pixel value^reset;. Learned by pursuing ^orange;Gold Circuitry^reset; research."],
+      "extraction1": [ "Extraction Basics", "^orange;Tier 1^reset;\n\nYou've learned the basics of resource extraction and can now build rudimentary devices to extract, research and centrifuge materials. \n\n^cyan;Extractor^reset;\n\nPut almost anything in and it will convert it into something else. Most items are processed in groups of 50. \n\n^cyan;Centrifuge^reset;\n\nPut any liquid inside and the centrifuge will start working - though the wooden one isn't quite durable enough to handle lava and other volatile stuff. Researched in the ^orange;Power Systems^reset; tree. \n\n^cyan;Research Computer^reset;\n\nPut an item with a value greater than 0 in one and it will automatically convert it into an amount of research equal to ^green;5% of the item's pixel value^reset;. Faster computers can be built by pursuing ^orange;Gold Circuits^reset; research."],
 
       "extraction2": [ "Extraction Labs", "^orange;Tier 2^reset;\n\nThe extraction lab is a big step up over the hand mill, working much more quickly. You'll want many extraction labs to process all sorts of resources."],