Merge branch 'feature/batch-load-things-on-start' into develop
# Conflicts: # About/About.xml # About/PublishedFileId.txt # Glitterworld Prime/GlitterWorldApi.cs # Glitterworld Prime/Glitterworld Prime.csproj # Glitterworld Prime/Properties/AssemblyInfo.cs # nant.build
Showing
GWP-Protect.crproj
0 → 100644
File added
... | ... | @@ -15,30 +15,31 @@ using Verse; |