Merge branch 'master' of github.com:DFHack/dfhack into remote_reader

develop
JapaMala 2014-08-15 19:17:32 +05:30
commit 9e3360ac2b
1 changed files with 2 additions and 2 deletions

@ -143,7 +143,7 @@ tweak advmode-contained
tweak fast-trade tweak fast-trade
# stop the right list in military->positions from resetting to top all the time # stop the right list in military->positions from resetting to top all the time
tweak military-stable-assign # tweak military-stable-assign #crashes in 0.40.08-r1
# in same list, color units already assigned to squads in brown & green # in same list, color units already assigned to squads in brown & green
tweak military-color-assigned tweak military-color-assigned
@ -151,7 +151,7 @@ tweak military-color-assigned
# tweak military-training # tweak military-training
# make crafted cloth items wear out with time like in old versions (bug 6003) # make crafted cloth items wear out with time like in old versions (bug 6003)
tweak craft-age-wear # tweak craft-age-wear #seems to crash in 0.40.08-r1
# stop adamantine clothing from wearing out (bug 6481) # stop adamantine clothing from wearing out (bug 6481)
#tweak adamantine-cloth-wear #tweak adamantine-cloth-wear