diff --git a/DefInjected/BodyPartDef/BodyParts.xml b/DefInjected/BodyPartDef/BodyParts.xml
index 4f2f31cd..673b43be 100644
--- a/DefInjected/BodyPartDef/BodyParts.xml
+++ b/DefInjected/BodyPartDef/BodyParts.xml
@@ -83,6 +83,7 @@
 		<LeftElytra.label>左翅鞘</LeftElytra.label>
 		<RightElytra.label>右翅鞘</RightElytra.label>
 		<LeftTusk.label>左獠牙</LeftTusk.label>
+		<RightTusk.label>右獠牙</RightTusk.label>
 		<Horn.label>角</Horn.label>
 		<Hump.label>背部</Hump.label>
 		<TurtleShell.label>壳</TurtleShell.label>
diff --git a/DefInjected/DamageTypeDef/BaseDamageTypes.xml b/DefInjected/DamageTypeDef/BaseDamageTypes.xml
index 86049a83..6fcd6cec 100644
--- a/DefInjected/DamageTypeDef/BaseDamageTypes.xml
+++ b/DefInjected/DamageTypeDef/BaseDamageTypes.xml
@@ -53,6 +53,9 @@
 		<Starvation.deathMessage>{0}饿死了。</Starvation.deathMessage>
 		
 		<!-- Healing local injury -->
+		<HealLocalInjury.label>治疗局部损伤</HealLocalInjury.label>
+	
+		<!-- Healing global injury -->
 		<HealGlobalInjury.label>治疗所有损伤</HealGlobalInjury.label>
 		
 		<!-- Restoring body part -->
diff --git a/DefInjected/FactionDef/BaseFactionTypes.xml b/DefInjected/FactionDef/BaseFactionTypes.xml
index 285e1662..7d44aff6 100644
--- a/DefInjected/FactionDef/BaseFactionTypes.xml
+++ b/DefInjected/FactionDef/BaseFactionTypes.xml
@@ -8,6 +8,7 @@
 		<Spacer.label>太空人</Spacer.label>
 		<Spacer.pawnsPlural>太空人</Spacer.pawnsPlural>
 		<Spacer.description>来自宇宙各个角落的人。</Spacer.description>
+		<Spacer.fixedName>太空人</Spacer.fixedName>
 		
 		<Outlander.label>外乡人</Outlander.label>
 		<Outlander.pawnsPlural>外乡人</Outlander.pawnsPlural>
@@ -24,5 +25,6 @@
 		<Mechanoid.label>机器人巢</Mechanoid.label>
 		<Mechanoid.pawnsPlural>机器人</Mechanoid.pawnsPlural>
 		<Mechanoid.description>一巢可以自我复制的远古机器人。</Mechanoid.description>
+		<Mechanoid.fixedName>机器人巢</Mechanoid.fixedName>
 		
 </LanguageData>
\ No newline at end of file
diff --git a/DefInjected/HealthDiffDef/HealthDiffs_Diseases.xml b/DefInjected/HealthDiffDef/HealthDiffs_Diseases.xml
index 9210d4c7..5b866453 100644
--- a/DefInjected/HealthDiffDef/HealthDiffs_Diseases.xml
+++ b/DefInjected/HealthDiffDef/HealthDiffs_Diseases.xml
@@ -4,13 +4,126 @@
 	<Euthanasia.label>安乐死</Euthanasia.label>
 	<ShutDown.label>关机</ShutDown.label>
 	<WoundInfection.label>感染</WoundInfection.label>
+	<rep>
+		<path>WoundInfection.disease.severityStages[0].label</path>
+		<trans>较轻</trans>
+	</rep>
+	<rep>
+		<path>WoundInfection.disease.severityStages[1].label</path>
+		<trans>较重</trans>
+	</rep>
+	<rep>
+		<path>WoundInfection.disease.severityStages[2].label</path>
+		<trans>晚期</trans>
+	</rep>
+	<rep>
+		<path>WoundInfection.disease.severityStages[3].label</path>
+		<trans>晚期</trans>
+	</rep>
+	<rep>
+		<path>WoundInfection.disease.severityStages[4].label</path>
+		<trans>晚期</trans>
+	</rep>
+	
 	<BadBack.label>背痛</BadBack.label>
 	<Cataract.label>白内障</Cataract.label>
 	<Anesthetic.label>麻痹</Anesthetic.label>
 	<Concussion.label>脑震荡</Concussion.label>
 	<Flu.label>流感</Flu.label>
+	<rep>
+		<path>Flu.disease.severityStages[0].label</path>
+		<trans>较轻</trans>
+	</rep>
+	<rep>
+		<path>Flu.disease.severityStages[1].label</path>
+		<trans>较轻</trans>
+	</rep>
+	<rep>
+		<path>Flu.disease.severityStages[2].label</path>
+		<trans>较重</trans>
+	</rep>
+	<rep>
+		<path>Flu.disease.severityStages[3].label</path>
+		<trans>晚期</trans>
+	</rep>
+	<rep>
+		<path>Flu.disease.severityStages[4].label</path>
+		<trans>晚期</trans>
+	</rep>
 	<Plague.label>瘟疫</Plague.label>
+	<rep>
+		<path>Plague.disease.severityStages[0].label</path>
+		<trans>较轻</trans>
+	</rep>
+	<rep>
+		<path>Plague.disease.severityStages[1].label</path>
+		<trans>较轻</trans>
+	</rep>
+	<rep>
+		<path>Plague.disease.severityStages[2].label</path>
+		<trans>较重</trans>
+	</rep>
+	<rep>
+		<path>Plague.disease.severityStages[3].label</path>
+		<trans>晚期</trans>
+	</rep>
+	<rep>
+		<path>Plague.disease.severityStages[4].label</path>
+		<trans>晚期</trans>
+	</rep>
+	<rep>
+		<path>Plague.disease.severityStages[5].label</path>
+		<trans>晚期</trans>
+	</rep>
 	<Malaria.label>疟疾</Malaria.label>
+	<rep>
+		<path>Malaria.disease.severityStages[0].label</path>
+		<trans>较轻</trans>
+	</rep>
+	<rep>
+		<path>Malaria.disease.severityStages[1].label</path>
+		<trans>较轻</trans>
+	</rep>
+	<rep>
+		<path>Malaria.disease.severityStages[2].label</path>
+		<trans>较重</trans>
+	</rep>
+	<rep>
+		<path>Malaria.disease.severityStages[3].label</path>
+		<trans>晚期</trans>
+	</rep>
+	<rep>
+		<path>Malaria.disease.severityStages[4].label</path>
+		<trans>晚期</trans>
+	</rep>
 	<SleepingSickness.label>昏睡病</SleepingSickness.label>
+	<rep>
+		<path>SleepingSickness.disease.severityStages[0].label</path>
+		<trans>较轻</trans>
+	</rep>
+	<rep>
+		<path>SleepingSickness.disease.severityStages[1].label</path>
+		<trans>较轻</trans>
+	</rep>
+	<rep>
+		<path>SleepingSickness.disease.severityStages[2].label</path>
+		<trans>较轻</trans>
+	</rep>
+	<rep>
+		<path>SleepingSickness.disease.severityStages[3].label</path>
+		<trans>较重</trans>
+	</rep>
+	<rep>
+		<path>SleepingSickness.disease.severityStages[4].label</path>
+		<trans>晚期</trans>
+	</rep>
+	<rep>
+		<path>SleepingSickness.disease.severityStages[5].label</path>
+		<trans>晚期</trans>
+	</rep>
+	<rep>
+		<path>SleepingSickness.disease.severityStages[6].label</path>
+		<trans>晚期</trans>
+	</rep>
 	
 </LanguageData>
\ No newline at end of file
diff --git a/DefInjected/HealthDiffDef/HealthDiffs_Injuries.xml b/DefInjected/HealthDiffDef/HealthDiffs_Injuries.xml
index b2a0a220..ebce9dd3 100644
--- a/DefInjected/HealthDiffDef/HealthDiffs_Injuries.xml
+++ b/DefInjected/HealthDiffDef/HealthDiffs_Injuries.xml
@@ -53,6 +53,15 @@
 		<Cut.injury.solidTreatedWellLabel>已固定</Cut.injury.solidTreatedWellLabel>
 		<Cut.injury.solidTreatedLabel>已简单固定</Cut.injury.solidTreatedLabel>
 		
+		<SurgicalCut.label>手术伤</SurgicalCut.label>
+		<SurgicalCut.injury.oldLabel>切痕</SurgicalCut.injury.oldLabel>
+		<SurgicalCut.injury.treatedWellLabel>已包扎</SurgicalCut.injury.treatedWellLabel>
+		<SurgicalCut.injury.treatedLabel>已简单包扎</SurgicalCut.injury.treatedLabel>
+		<SurgicalCut.injury.innerTreatedWellLabel>已缝合</SurgicalCut.injury.innerTreatedWellLabel>
+		<SurgicalCut.injury.innerTreatedLabel>已简单缝合</SurgicalCut.injury.innerTreatedLabel>
+		<SurgicalCut.injury.solidTreatedWellLabel>已固定</SurgicalCut.injury.solidTreatedWellLabel>
+		<SurgicalCut.injury.solidTreatedLabel>已简单固定</SurgicalCut.injury.solidTreatedLabel>
+	
 		<Scratch.label>抓伤</Scratch.label>
 		<Scratch.injury.oldLabel>抓痕</Scratch.injury.oldLabel>
 		<Scratch.injury.destroyedLabel>被撕裂</Scratch.injury.destroyedLabel>
diff --git a/DefInjected/HistoryAutoRecorderGroupDef/HistoryAutoRecorders.xml b/DefInjected/HistoryAutoRecorderGroupDef/HistoryAutoRecorderGroups.xml
similarity index 62%
rename from DefInjected/HistoryAutoRecorderGroupDef/HistoryAutoRecorders.xml
rename to DefInjected/HistoryAutoRecorderGroupDef/HistoryAutoRecorderGroups.xml
index 42748452..b90c5573 100644
--- a/DefInjected/HistoryAutoRecorderGroupDef/HistoryAutoRecorders.xml
+++ b/DefInjected/HistoryAutoRecorderGroupDef/HistoryAutoRecorderGroups.xml
@@ -2,10 +2,14 @@
 <LanguageData>
 
 	<Wealth.label>资产</Wealth.label>
-	<Population.label>人口</Population.label>
+	<Wealth.graphLabelY>价值</Wealth.graphLabelY>
+	
+	<Population.label>人口</Population.label>
+	<Population.graphLabelY>殖民者</Population.graphLabelY>
 	
-	<!-->
 	<ColonistMood.label>殖民者心情</ColonistMood.label>
+	<ColonistMood.graphLabelY>百分比</ColonistMood.graphLabelY>
+	<!-->
 	<ColonistFear.label>殖民者恐惧度</ColonistFear.label>
 	<-->
 	
diff --git a/DefInjected/JobDef/TraitJobDefs.xml b/DefInjected/JobDef/TraitJobDefs.xml
index 61f17f94..66db2121 100644
--- a/DefInjected/JobDef/TraitJobDefs.xml
+++ b/DefInjected/JobDef/TraitJobDefs.xml
@@ -2,5 +2,8 @@
 <LanguageData>
 	
 	<!-- Reserved File -->
+	<!--
+	<AbsentMindedWander_unused.reportString>心不在焉地游荡。</AbsentMindedWander_unused.reportString>
+	-->
 
 </LanguageData>
\ No newline at end of file
diff --git a/DefInjected/PawnActivityDef/PawnActivities.xml b/DefInjected/PawnActivityDef/PawnActivities.xml
index bafe0167..2bd1db19 100644
--- a/DefInjected/PawnActivityDef/PawnActivities.xml
+++ b/DefInjected/PawnActivityDef/PawnActivities.xml
@@ -2,11 +2,13 @@
 <LanguageData>
 		
 		<Consciousness.label>意识</Consciousness.label>
+		<Consciousness.labelMechanoids>数据处理</Consciousness.labelMechanoids>
 		<Sight.label>视觉</Sight.label>
 		<Hearing.label>听力</Hearing.label>
 		<Moving.label>行动</Moving.label>
 		<Manipulation.label>操作</Manipulation.label>
 		<Talking.label>交谈</Talking.label>
+		<Talking.labelMechanoids>通信</Talking.labelMechanoids>
 		<Eating.label>觅食</Eating.label>
 		<Breathing.label>呼吸</Breathing.label>
 		<BloodFiltration.label>血液过滤</BloodFiltration.label>
diff --git a/DefInjected/RecipeDef/Recipes_Medical.xml b/DefInjected/RecipeDef/Recipes_Medical.xml
index a07f8fb1..8040be84 100644
--- a/DefInjected/RecipeDef/Recipes_Medical.xml
+++ b/DefInjected/RecipeDef/Recipes_Medical.xml
@@ -60,6 +60,18 @@
         <InstallScytherKnifeProtrusion.description>安装镰刀机甲凸刃。</InstallScytherKnifeProtrusion.description>
         <InstallScytherKnifeProtrusion.jobString>正在安装镰刀机甲凸刃。</InstallScytherKnifeProtrusion.jobString>
 		
+	
+	<!-- removing body parts -->
+	
+	<RemoveBodyPart.label>移除身体部件</RemoveBodyPart.label>
+	<RemoveBodyPart.description>移除身体部件。</RemoveBodyPart.description>
+	<RemoveBodyPart.jobString>正在移除身体部件。</RemoveBodyPart.jobString>
+	
+	<RemoveMechanoidBodyPart.label>移除人工身体部件</RemoveMechanoidBodyPart.label>
+	<RemoveMechanoidBodyPart.description>移除人工身体部件。</RemoveMechanoidBodyPart.description>
+	<RemoveMechanoidBodyPart.jobString>正在移除人工身体部件。</RemoveMechanoidBodyPart.jobString>
+	
+	
 		<!-- Euthanization -->
 		<Euthanize.label>安乐死</Euthanize.label>
         <Euthanize.description>执行安乐死。</Euthanize.description>
diff --git a/DefInjected/RecipeDef/Recipes_Production.xml b/DefInjected/RecipeDef/Recipes_Production.xml
index ecdb2084..1194cc56 100644
--- a/DefInjected/RecipeDef/Recipes_Production.xml
+++ b/DefInjected/RecipeDef/Recipes_Production.xml
@@ -11,12 +11,12 @@
 		
 		<!--
 		<MakeWoodPlanks_Hand.label>制作木板</MakeWoodPlanks_Hand.label>
-        <MakeWoodPlanks_Hand.description>手工把10跟原木切成25块木板，速度很慢。</MakeWoodPlanks_Hand.description>
+        <MakeWoodPlanks_Hand.description>手工把10根原木切成25块木板，速度很慢。</MakeWoodPlanks_Hand.description>
         <MakeWoodPlanks_Hand.jobString>正在制作木板。</MakeWoodPlanks_Hand.jobString>
 		
 		
 		<MakeWoodPlanks_Electric.label>制作木板</MakeWoodPlanks_Electric.label>
-        <MakeWoodPlanks_Electric.description>把10跟原木切成25块木板。</MakeWoodPlanks_Electric.description>
+        <MakeWoodPlanks_Electric.description>把10根原木切成25块木板。</MakeWoodPlanks_Electric.description>
         <MakeWoodPlanks_Electric.jobString>正在制作木板。</MakeWoodPlanks_Electric.jobString>
 		-->
 		
diff --git a/DefInjected/SpecialThingFilterDef/SpecialThingFilters.xml b/DefInjected/SpecialThingFilterDef/BaseSpecialThingFilters.xml
similarity index 100%
rename from DefInjected/SpecialThingFilterDef/SpecialThingFilters.xml
rename to DefInjected/SpecialThingFilterDef/BaseSpecialThingFilters.xml
diff --git a/DefInjected/ThingDef/Items_Resources.xml b/DefInjected/ThingDef/Items_Resources.xml
index d9d6f88c..19560d02 100644
--- a/DefInjected/ThingDef/Items_Resources.xml
+++ b/DefInjected/ThingDef/Items_Resources.xml
@@ -4,44 +4,52 @@
 		<!--=============== Currency ====================-->
         <Silver.label>银石</Silver.label>
 		<Silver.description>这种金属主要用作通用货币。也可以用来制作引人注目的装饰品。</Silver.description>
+		<Silver.stuffProps.nameAsStuff>银</Silver.stuffProps.nameAsStuff>
 		
 		<Gold.label>黄金</Gold.label>
 		<Gold.description>世界上最有诱惑力的金属。无数的人因为对黄金的饥渴命丧黄泉。这种黄色的金属本身用途不大，但非常漂亮并且极度稀少。</Gold.description>
+		<Gold.stuffProps.nameAsStuff>金</Gold.stuffProps.nameAsStuff>
 		
         <Metal.label>金属</Metal.label>
 		<Metal.description>一种可以用来建造建筑、工具或武器的多用途材料。</Metal.description>
+		<!--<Metal.stuffProps.nameAsStuff>金属</Metal.stuffProps.nameAsStuff>-->
 		
 		<Plasteel.label>玻璃钢</Plasteel.label>
 		<Plasteel.description>先进的太空时代材料，玻璃钢因为它独特的分子结构拥有非常高的强度。</Plasteel.description>
+		<!--<Plasteel.stuffProps.nameAsStuff>玻璃钢</Plasteel.stuffProps.nameAsStuff>-->
 		
         <StoneBlocks.label>石块</StoneBlocks.label>
 		<StoneBlocks.description>实心的石块，主要用来建造高强度、高持久度的简单建筑。</StoneBlocks.description>
+		<StoneBlocks.stuffProps.nameAsStuff>石</StoneBlocks.stuffProps.nameAsStuff>
 		
-		<WoodLog.label>木头</WoodLog.label>
-		<WoodLog.description>由植物生长而成的木材。可以用来建造建筑、武器甚至简单的假肢。一捆木头也可直接当作武器来使用。</WoodLog.description>
-		
-		<!--
 		<WoodLog.label>原木</WoodLog.label>
-		<WoodLog.description>用来建造建筑，可以切成木板。</WoodLog.description>
+		<WoodLog.description>由植物生长而成的木材。可以用来建造建筑、武器甚至简单的假肢。一捆木头也可直接当作武器来使用。</WoodLog.description>
+		<WoodLog.stuffProps.nameAsStuff>木</WoodLog.stuffProps.nameAsStuff>
+		<!--
 		<WoodPlank.label>木板</WoodPlank.label>
 		<WoodPlank.description>用来建造建筑。</WoodPlank.description>
 		-->
 		
 		<Uranium.label>铀</Uranium.label>
 		<Uranium.description>给反应堆提供能源。</Uranium.description>
+		<!--<Uranium.stuffProps.nameAsStuff>铀</Uranium.stuffProps.nameAsStuff>-->
 		
 		<!--=============== Pure stuffs: Fabric, leather, etc  ====================-->
 		<Cloth.label>布</Cloth.label>
 		<Cloth.description>由有机纤维织成的布。</Cloth.description>
+		<!--<Cloth.stuffProps.nameAsStuff>布</Cloth.stuffProps.nameAsStuff>-->
 		
 		<Synthread.label>合成纤维</Synthread.label>
 		<Synthread.description>太空科技制成的制造服装用的纤维。柔软，轻，强韧而且拥有很好的绝缘性。</Synthread.description>
+		<!--<Synthread.stuffProps.nameAsStuff>合成纤维</Synthread.stuffProps.nameAsStuff>-->
 		
 		<DevilstrandCloth.label>魔鬼绳</DevilstrandCloth.label>
 		<DevilstrandCloth.description>从产丝的魔鬼绳菌直接提取的纤维，强度非常高。</DevilstrandCloth.description>
+		<!--<DevilstrandCloth.stuffProps.nameAsStuff>魔鬼绳</DevilstrandCloth.stuffProps.nameAsStuff>-->
 		
 		<Hyperweave.label>超织物</Hyperweave.label>
 		<Hyperweave.description>制成布状的纳米纤维，比较重，但是几乎不可能被撕裂。</Hyperweave.description>
+		<!--<Hyperweave.stuffProps.nameAsStuff>超织物</Hyperweave.stuffProps.nameAsStuff>-->
 		
 		<!--=============== Raw foods ====================-->
         <RawPotatoes.label>土豆</RawPotatoes.label>
diff --git a/DefInjected/ThingDef/Races_Humanoid.xml b/DefInjected/ThingDef/Races_Humanoid.xml
index 76b5efaa..b4a45b3c 100644
--- a/DefInjected/ThingDef/Races_Humanoid.xml
+++ b/DefInjected/ThingDef/Races_Humanoid.xml
@@ -3,5 +3,9 @@
  
 		<Human.label>人类</Human.label>
 		<Human.description>普通的人类，绝大多数都没有被基因修改或因环境变化而进化。</Human.description>
-               
+		<!--Humanoid????-->
+		<Human_Leather.label>"某种未知生物"??的皮</Human_Leather.label>
+		<Human_Meat.label>"某种未知生物"??的肉</Human_Meat.label>
+		<Human_Leather.description>由"某种未知生物"??的皮肤制成的皮革。</Human_Leather.description>
+		<Human_Meat.description>"某种未知生物"??的生肉。</Human_Meat.description>
 </LanguageData>
\ No newline at end of file
diff --git a/DefInjected/ThingDef/Weapons_Guns.xml b/DefInjected/ThingDef/Weapons_Guns.xml
index dba1e7ea..32b0b10e 100644
--- a/DefInjected/ThingDef/Weapons_Guns.xml
+++ b/DefInjected/ThingDef/Weapons_Guns.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <LanguageData>
  
+	<Bullet_Pistol.label>手枪子弹</Bullet_Pistol.label>
         <Gun_Pistol.label>手枪</Gun_Pistol.label>
         <Gun_Pistol.description>古老的自动手枪。火力和射程很弱但是速度很快。</Gun_Pistol.description>
        
diff --git a/DefInjected/TraderKindDef/BaseTraderKinds.xml b/DefInjected/TraderKindDef/BaseTraderKinds.xml
index 66c8ccb9..5ed31228 100644
--- a/DefInjected/TraderKindDef/BaseTraderKinds.xml
+++ b/DefInjected/TraderKindDef/BaseTraderKinds.xml
@@ -8,5 +8,7 @@
 		<CombatSupplier.label>战斗补给商</CombatSupplier.label>
 
 		<SlaveTrader.label>奴隶贩子</SlaveTrader.label>
+
+		<ExoticTrader.label>异星贸易商</ExoticTrader.label>
  
 </LanguageData>
\ No newline at end of file