Merge Konflikt bereinigt

2024-06-26 14:33:14 +02:00
parent e5e805a7c4 1333b08a35
commit e17a8c184e
5 changed files with 13 additions and 7 deletions
@@ -5,6 +5,7 @@
  "icon": "SSG/shapes/img/Eckrad_32x32.png",
  "iconBig": "SSG/shapes/img/Eckrad_64x64.png",
  "srcSVG": "SSG/shapes/svg/s_Eckrad.xml",
+  "src3D": "SSG/shapes/obj/s_Eckrad.stl",
  "width": 3023.622,
  "height": 3023.622,
  "depth": 1897.3228,
@@ -5,6 +5,7 @@
  "icon": "SSG/shapes/img/Gefaellestrecke.png",
  "iconBig": "SSG/shapes/img/Gefaellestrecke.png",
  "srcSVG": "SSG/shapes/svg/s_Gefaellestrecke.xml",
+  "src3D": "SSG/shapes/obj/s_Gefaellestrecke.stl",
  "text": "^",
  "width": 1625.1969,
  "height": 6047.2441,
@@ -95,4 +96,4 @@
    }
  ],
  "eventClass": "OnInserted,OnDoubleclick,OnPasted,OnLinked"
-}
+}
@@ -15,4 +15,4 @@
      </g>
    </svg>
  </g>
-</svg>
+</svg>