Merge pull request #2362 from skyarkhangel/development

Dev 1.1 to master tree
skyarkhangel · Aug 17, 2020 · e458ef3 · e458ef3
2 parents c5f70f3 + 91ebcf8
commit e458ef3
Show file tree

Hide file tree

Showing 13,143 changed files with 275,184 additions and 333,785 deletions.
diff --git a/Guides/Alloys Sheet_RU.xlsx b/Guides/Alloys Sheet_RU.xlsx
diff --git a/Guides/Backstories Sheets_EN_RU.xlsx b/Guides/Backstories Sheets_EN_RU.xlsx
diff --git a/Guides/Cheat Sheets_EN.xlsx b/Guides/Cheat Sheets_EN.xlsx
diff --git a/Guides/Hardcore SK Guide_EN.pdf b/Guides/Hardcore SK Guide_EN.pdf
diff --git a/Guides/Hardcore SK Guide_RU.pdf b/Guides/Hardcore SK Guide_RU.pdf
diff --git a/Guides/Hardcore SK Tutorial_RU.xlsx b/Guides/Hardcore SK Tutorial_RU.xlsx
diff --git a/Guides/Reference Sheet_EN.xlsx b/Guides/Reference Sheet_EN.xlsx
diff --git a/Guides/Research tree.png b/Guides/Research tree.png
diff --git a/In test/Alien Children Compatibility/About/About.xml b/In test/Alien Children Compatibility/About/About.xml
diff --git a/In test/Alien Children Compatibility/About/Preview.png b/In test/Alien Children Compatibility/About/Preview.png
diff --git a/In test/Alien Children Compatibility/About/PublishedFileId.txt b/In test/Alien Children Compatibility/About/PublishedFileId.txt
diff --git a/In test/Alien Children Compatibility/Assemblies/AlienChildrenCompatibility.dll b/In test/Alien Children Compatibility/Assemblies/AlienChildrenCompatibility.dll
diff --git a/In test/BnC Alien Support/About/About.xml b/In test/BnC Alien Support/About/About.xml
diff --git a/In test/BnC Alien Support/About/ModSync.xml b/In test/BnC Alien Support/About/ModSync.xml
diff --git a/In test/BnC Alien Support/About/Preview.png b/In test/BnC Alien Support/About/Preview.png
diff --git a/In test/BnC Alien Support/About/PublishedFileId.txt b/In test/BnC Alien Support/About/PublishedFileId.txt
diff --git a/In test/BnC Alien Support/Assemblies/BnCAlienSupport.dll b/In test/BnC Alien Support/Assemblies/BnCAlienSupport.dll
diff --git a/In test/BnC/About/About.xml b/In test/BnC/About/About.xml
diff --git a/In test/BnC/About/ModSync.xml b/In test/BnC/About/ModSync.xml
diff --git a/In test/BnC/About/Preview.png b/In test/BnC/About/Preview.png
diff --git a/In test/BnC/About/PublishedFileId.txt b/In test/BnC/About/PublishedFileId.txt
diff --git a/In test/BnC/Assemblies/RimWorldChildren.dll b/In test/BnC/Assemblies/RimWorldChildren.dll
diff --git a/In test/BnC/Defs/BabyClothingDefs/babygear.xml b/In test/BnC/Defs/BabyClothingDefs/babygear.xml
diff --git a/In test/BnC/Defs/BabyClothingDefs/babyhats.xml b/In test/BnC/Defs/BabyClothingDefs/babyhats.xml
diff --git a/In test/BnC/Defs/BackstoryDefs/Backstories.xml b/In test/BnC/Defs/BackstoryDefs/Backstories.xml
diff --git a/In test/BnC/Defs/Drugs/Contraceptive.xml b/In test/BnC/Defs/Drugs/Contraceptive.xml