Merge remote-tracking branch 'Putnam3145/patch-12' into develop

Conflicts:
	NEWS

NEWS

@@ -12,6 +12,7 @@ DFHack Future
         fix-armory compiles and is available again (albeit with issues)
         gui/gm-editor: Added search option (accessible with "s")
         hack-wish: Made items stack properly.
+        modtools/skill-change: made level granularity work properly.
         show-unit-syndromes should work
         zone: Stopped crash when scrolling cage owner list
     New Plugins

scripts/modtools/skill-change.lua

@@ -36,7 +36,7 @@ arguments
         set the skill that we're talking about
     -mode (add/set)
         are we adding experience/levels or setting them?
-    -granularity (experience/levels)
+    -granularity (experience/level)
         direct experience, or experience levels?
     -unit id
         id of the target unit
@@ -87,9 +87,9 @@ if args.granularity == granularity.experience then
  end
 elseif args.granularity == granularity.level then
  if args.mode == mode.set then
-  skill.rating = df.skill_rating[args.value]
+  skill.rating = args.value
  elseif args.mode == mode.add then
-  skill.rating = df.skill_rating[args.value + df.skill_rating[skill.rating]]
+  skill.rating = args.value + skill.rating
  else
   error 'bad mode'
  end