merge remote changes, keep local MAIN_SSG.rdx

This commit is contained in:
2025-11-19 13:00:57 +01:00
7 changed files with 4 additions and 6 deletions
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -5,6 +5,7 @@
"icon": "SSG/shapes/img/BTMTBeladung_32.png",
"iconBig": "SSG/shapes/img/BTMTBeladung_64.png",
"srcSVG": "SSG/shapes/svg/s_BTMTBeladung.xml",
"src3D": "SSG/shapes/obj/s_BTMTBeladung.stl",
"width": 2555.5423,
"height": 1286.8524,
"behaviour": "(NOSTRETCH)",
@@ -5,6 +5,7 @@
"icon": "SSG/shapes/img/BTMTEntladung_32.png",
"iconBig": "SSG/shapes/img/BTMTEntladung_64.png",
"srcSVG": "SSG/shapes/svg/s_BTMTEntladung.xml",
"src3D": "SSG/shapes/obj/s_BTMTEntladung.stl",
"width": 2186.4567,
"height": 1890.1417,
"behaviour": "(NOSTRETCH)",
+1 -1
View File
@@ -1 +1 @@
{"categories":{"c_ILS":{"expanded":true},"c_Kreiselmodule":{"expanded":true},"c_Zusatzmodul":{"expanded":false},"c_Foerderer":{"expanded":true},"c_Kurven":{"expanded":true},"c10":{"expanded":true},"c_Background":{"expanded":true},"c_Parts":{"expanded":true},"c_Session":{"expanded":false},"c_Omniflo":{"expanded":true},"c_Boegen":{"expanded":true},"c_Gerade":{"expanded":true},"c_Weichen_90":{"expanded":true},"c_Weichen_45":{"expanded":true},"c_Weichen_Parallel":{"expanded":true},"c_Weichenkoerper":{"expanded":true},"c_Weichenkombinationen":{"expanded":true},"c_TEFElemente":{"expanded":true},"c_OmnifloBogen":{"expanded":true},"c_Boegen_90":{"expanded":false},"c_OmnifloWeiche":{"expanded":true}},"shapes":{}}
{"categories":{"c_ILS":{"expanded":true},"c_Kreiselmodule":{"expanded":true},"c_Zusatzmodul":{"expanded":true},"c_Foerderer":{"expanded":true},"c_Kurven":{"expanded":true},"c10":{"expanded":true},"c_Background":{"expanded":true},"c_Parts":{"expanded":true},"c_Session":{"expanded":false},"c_Omniflo":{"expanded":true},"c_Boegen":{"expanded":true},"c_Gerade":{"expanded":true},"c_Weichen_90":{"expanded":true},"c_Weichen_45":{"expanded":true},"c_Weichen_Parallel":{"expanded":true},"c_Weichenkoerper":{"expanded":true},"c_Weichenkombinationen":{"expanded":true},"c_TEFElemente":{"expanded":true},"c_OmnifloBogen":{"expanded":true},"c_Boegen_90":{"expanded":false},"c_OmnifloWeiche":{"expanded":true}},"shapes":{}}
+1 -5
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<PROCESS Id="RDK:0001" Name="MAIN_SSG" ModernUI="True" Options="(GITSAVEMODE)(NOUPDATEINCLUDEFILES)" Expanded="True">
<PROCESSPROPERTY CrUser="pmarani [ENGMARANI17R]" CrDate="2022-05-05T18:05:31" ModUser="y.wang [ANGEBOT-NB02]" ModDate="2025-11-19T12:43:01" LanguageVersion="2014.1.3.712" />
<PROCESSPROPERTY CrUser="pmarani [ENGMARANI17R]" CrDate="2022-05-05T18:05:31" ModUser="y.wang [ANGEBOT-NB02]" ModDate="2025-11-18T12:46:27" LanguageVersion="2014.1.3.712" />
<GROUP Id="RDK:0002" Name="Declarations" SubType="Declarations" Expanded="True">
<GROUP Id="RDK:0003" Name="Types" SubType="TypeSet" IncludeDate="0">
<GROUP Id="RDK:26387" Name="SSG_Group" SubType="TypeSet" IncludeDate="0">
@@ -40758,10 +40758,6 @@ me.x
<EXP><![CDATA[$=$False]]></EXP>
<PAR Name="AdvancedOptions" />
</SET>
<SET Id="RDK:26495240" VarRef="ShapeList[&quot;id=&quot;+id0].GefaelleDefinition.FesteL_th" DesignTimeRemark="Wenn Unlinked erfolgt, wird der Flag istfixiert auf false gesetzt.">
<EXP><![CDATA[$=$False]]></EXP>
<PAR Name="AdvancedOptions" />
</SET>
</CASEGROUP>
<CASEGROUP Id="RDK:19961131" CaseType="0">
<EXP><![CDATA[$C$Kurve]]></EXP>