Merge branch 'master' of https://github.com/dd-bim/City2BIM

dd-bim · Mar 1, 2024 · 4045d76 · 4045d76
2 parents 5fc606a + fdf6a69
commit 4045d76
Show file tree

Hide file tree

Showing 32 changed files with 3,762 additions and 103 deletions.
diff --git a/CityBIM/CityBIM.csproj b/CityBIM/CityBIM.csproj
@@ -235,5 +235,12 @@
     <Compile Remove="obj\x64\Revit2021_Debug\GUI\Properties\PropertyWindow.g.cs" />
     <Compile Remove="obj\x64\Revit2021_Debug\GUI\XPlan2BIM\ImportXPlanDialog.g.cs" />
   </ItemGroup>
+  <ItemGroup>
+    <Compile Update="ResourcePictures.Designer.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>ResourcePictures.resx</DependentUpon>
+    </Compile>
+  </ItemGroup>
   <Import Project="..\CommonRevit\CommonRevit.projitems" Label="Shared" />
 </Project>
diff --git a/CityBIM/ResourcePictures.Designer.cs b/CityBIM/ResourcePictures.Designer.cs
diff --git a/CityBIM/ResourcePictures.resx b/CityBIM/ResourcePictures.resx
@@ -178,4 +178,7 @@
   <data name="XPlan_32px" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>img\XPlan_32px.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="LoGeoRef50IsNotFulfilled" xml:space="preserve">
+    <value>LoGeoRef50 is not fulfilled</value>
+  </data>
 </root>
diff --git a/DataCatPlugin_Installer/Package.wxs b/DataCatPlugin_Installer/Package.wxs
@@ -38,7 +38,7 @@
 			<Directory Id="AutodeskDir" Name="Autodesk">
 				<Directory Id="RevitDir" Name="Revit">
 					<Directory Id="AddinDir" Name="Addins">
-						<Directory Id="YearDir" Name="2022">
+						<Directory Id="YearDir" Name="2023">
 							<Directory Id="APPLICATIONFOLDER" Name="DataCatPlugin">
 							</Directory>
 						</Directory>