Merge conflict resolved

DOC/Add_scroll_to_unity.md

@@ -18,4 +18,28 @@ in Class "GlobalBehaviour" ("UFrameIT\Assets\Scripts\GlobalBehaviour.cs") Method
 
 3. Open: "http://localhost:8085/scroll/list" and copy all the text.
 
-4. Now paste this into: "UFrameIT\Assets\StreamingAssets\scrolls.json" and start the game.
+4. Now paste this into: "UFrameIT\Assets\StreamingAssets\scrolls.json" and start the game.
\ No newline at end of file
+if Class "GlobalBehaviour" ("UFrameIT\Assets\Scripts\GlobalBehaviour.cs") Method "GetScrollsfromServer()" loads scrolls from "UFrameIT\Assets\StreamingAssets\scrolls.json":
+
+2. Open: "http://localhost:8085/scroll/list" and copy all the text.
+
+3. Now paste this into: "UFrameIT\Assets\StreamingAssets\scrolls.json" and start the game.
+
+Additional:
+If you want to create a new theory you have to include it in the "theory FrameWorldMeta" in:    \archives\MathHub\FrameIT\frameworld\source\MetaTheories.mmt,
+which is at the bottom of the file.
+This ensures your theory is is in the global namespace.
+Then if you want to create a theory with a specific type:
+you have to specify this at the top:
+
+namespace http://mathhub.info/FrameIT/frameworld ❚
+fixmeta ur:?LF ❚
+
+
+and in you theory do:
+
+include ?FrameITBasics ❙
+at the start
+
+
+## If something fails, restart vscode and try building again. This fixes a lot of errors

DOC/create_fact.md

@@ -56,4 +56,5 @@
     2. In the Unity Project Tab goto folder Assets\Scripts\InteractionEngine\FactHandling
     3. Rightclick FactSpawner.cs and select "Find References In Scene".
     4. In Hirarchy select WorldCursor and add your Fact Prefab into the Inspector.
-    5. Alternative to 6.2 & 6.3: in hirarchy search: "ref:Assets/Scripts/InteractionEngine/FactHandling/FactSpawner.cs"
+    5. Alternative to 6.2 & 6.3: in hirarchy search: "ref:Assets/Scripts/InteractionEngine/FactHandling/FactSpawner.cs"
\ No newline at end of file
+