+Version Upgrade: 2020.3.14f1 +FactOrganizer: testet un-redo, Add

3ad4d427 · Marco Zimmer · 12906289 · 3ad4d427 · 3ad4d427 · 3ad4d427
Commit 3ad4d427 authored Aug 1, 2021 by Marco Zimmer
--- a/Assets/Plugins/JsonSubTypes/JsonSubTypes/JsonSubtypesByDiscriminatorValueConverter.cs
+++ b/Assets/Plugins/JsonSubTypes/JsonSubTypes/JsonSubtypesByDiscriminatorValueConverter.cs
-using System;
+using Newtonsoft.Json;
-using System.Collections.Generic;
-using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
 namespace JsonSubTypes
 {

--- a/Assets/Plugins/JsonSubTypes/JsonSubTypes/JsonSubtypesConverter.cs
+++ b/Assets/Plugins/JsonSubTypes/JsonSubTypes/JsonSubtypesConverter.cs
 using System;
-using System.Reflection;
 namespace JsonSubTypes
 {

--- a/Assets/Plugins/JsonSubTypes/JsonSubTypes/JsonSubtypesConverterBuilder.cs
+++ b/Assets/Plugins/JsonSubTypes/JsonSubTypes/JsonSubtypesConverterBuilder.cs
-using System;
+using Newtonsoft.Json;
-using Newtonsoft.Json;
+using System;
 namespace JsonSubTypes
 {

--- a/Assets/Plugins/JsonSubTypes/JsonSubTypes/JsonSubtypesWithPropertyConverterBuilder.cs
+++ b/Assets/Plugins/JsonSubTypes/JsonSubTypes/JsonSubtypesWithPropertyConverterBuilder.cs
-using System;
+using Newtonsoft.Json;
+using System;
 using System.Collections.Generic;
-using Newtonsoft.Json;
 namespace JsonSubTypes
 {

--- a/Assets/Plugins/LowPolyWater_Pack/Scripts/Editor/GeneratePlane.cs
+++ b/Assets/Plugins/LowPolyWater_Pack/Scripts/Editor/GeneratePlane.cs
-using UnityEngine;
+using System.IO;
 using UnityEditor;
-using System.IO;
+using UnityEngine;
 namespace LowPolyWater
 {

--- a/Assets/Plugins/LowPolyWater_Pack/Scripts/LowPolyWater.cs
+++ b/Assets/Plugins/LowPolyWater_Pack/Scripts/LowPolyWater.cs
--- a/Assets/Plugins/NaturePackLite/Prefabs/Tree_01.prefab
+++ b/Assets/Plugins/NaturePackLite/Prefabs/Tree_01.prefab
@@ -57,6 +57,7 @@ MeshRenderer:
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
  m_RayTracingMode: 2
+  m_RayTraceProcedural: 0
  m_RenderingLayerMask: 1
  m_RendererPriority: 0
  m_Materials:
@@ -81,6 +82,7 @@ MeshRenderer:
  m_SortingLayerID: 0
  m_SortingLayer: 0
  m_SortingOrder: 0
+  m_AdditionalVertexStreams: {fileID: 0}
 --- !u!64 &6601886996393371248
 MeshCollider:
  m_ObjectHideFlags: 0
@@ -139,7 +141,7 @@ SphereCollider:
  m_IsTrigger: 0
  m_Enabled: 1
  serializedVersion: 2
-  m_Radius: 0.5
+  m_Radius: 0.4
  m_Center: {x: 0, y: 0, z: 0}
 --- !u!33 &933372636075482527
 MeshFilter:
@@ -164,6 +166,7 @@ MeshRenderer:
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
  m_RayTracingMode: 2
+  m_RayTraceProcedural: 0
  m_RenderingLayerMask: 1
  m_RendererPriority: 0
  m_Materials:
@@ -188,3 +191,4 @@ MeshRenderer:
  m_SortingLayerID: 0
  m_SortingLayer: 0
  m_SortingOrder: 0
+  m_AdditionalVertexStreams: {fileID: 0}
--- a/Assets/Plugins/SkythianCat/Glowing_Forest/Scripts/WaterGroup.cs
+++ b/Assets/Plugins/SkythianCat/Glowing_Forest/Scripts/WaterGroup.cs
-using UnityEngine;
+using System.Collections.Generic;
-using System.Collections;
+using UnityEngine;
-using System.Collections.Generic;
 [AddComponentMenu("SkythianCat/Glowing Forest/WaterGroup")]
-public class WaterGroup : MonoBehaviour {
+public class WaterGroup : MonoBehaviour
+{
    public float waveSpeed;
    public Vector2 waveDirection;
@@ -18,8 +18,10 @@ public class WaterGroup : MonoBehaviour {
    private List<GameObject> waterWavePlains = new List<GameObject>();
-	void Start(){
+    void Start()
-		if(nameToFind == null || nameToFind == ""){
+    {
+        if (nameToFind == null || nameToFind == "")
+        {
            Debug.LogError(gameObject.name + " | nameToFind is null.");
        }
@@ -27,20 +29,26 @@ void Start(){
        Transform[] allChildTransforms = GetComponentsInChildren<Transform>();
        //Find transforms in allChildTransforms that have nameToFind name and add their to waterWavePlains
-		foreach(Transform t in allChildTransforms){
+        foreach (Transform t in allChildTransforms)
-			if(t.name == nameToFind){
+        {
+            if (t.name == nameToFind)
+            {
                waterWavePlains.Add(t.gameObject);
            }
        }
-		if(waterWavePlains.Count == 0){
+        if (waterWavePlains.Count == 0)
+        {
            Debug.LogError(gameObject.name + " contains no one GameObject with \"" + nameToFind + "\" name.");
        }
    }
-	void LateUpdate () {
+    void LateUpdate()
-		if(waterWavePlains.Count != 0){
+    {
-			foreach(GameObject g in waterWavePlains){
+        if (waterWavePlains.Count != 0)
+        {
+            foreach (GameObject g in waterWavePlains)
+            {
                WaveAnimation(g);
            }
        }
@@ -51,8 +59,10 @@ void LateUpdate () {
    /// Changes texture offset of waterWavePlain.
    /// </summary>
    /// <param name="waterWavePlain">Water wave plain GameObject.</param>
-	public void WaveAnimation(GameObject waterWavePlain){
+    public void WaveAnimation(GameObject waterWavePlain)
-		if(waterWavePlain != null){
+    {
+        if (waterWavePlain != null)
+        {
            float dirX = Time.time * waveSpeed * waveDirection.x;
            float dirY = Time.time * waveSpeed * waveDirection.y;
            waterWavePlain.GetComponent<MeshRenderer>().material.SetTextureOffset("_MainTex", new Vector2(dirX, dirY));

--- a/Assets/Resources/Prefabs/Angle.prefab
+++ b/Assets/Resources/Prefabs/Angle.prefab
@@ -10,8 +10,6 @@ GameObject:
  m_Component:
  - component: {fileID: 5828814633827486385}
  - component: {fileID: 7699224541667766671}
-  - component: {fileID: 6694473473003647560}
-  - component: {fileID: 562364442917191108}
  - component: {fileID: 6234540560952625969}
  m_Layer: 12
  m_Name: AngleText_Back
@@ -54,6 +52,7 @@ MeshRenderer:
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
  m_RayTracingMode: 2
+  m_RayTraceProcedural: 0
  m_RenderingLayerMask: 1
  m_RendererPriority: 0
  m_Materials:
@@ -78,22 +77,7 @@ MeshRenderer:
  m_SortingLayerID: 0
  m_SortingLayer: 0
  m_SortingOrder: 1
--- !u!33 &6694473473003647560
+  m_AdditionalVertexStreams: {fileID: 0}
-MeshFilter:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 874001566494999466}
-  m_Mesh: {fileID: 0}
--- !u!222 &562364442917191108
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 874001566494999466}
-  m_CullTransparentMesh: 0
 --- !u!114 &6234540560952625969
 MonoBehaviour:
  m_ObjectHideFlags: 0
@@ -109,6 +93,7 @@ MonoBehaviour:
  m_Material: {fileID: 0}
  m_Color: {r: 1, g: 1, b: 1, a: 1}
  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
  m_Maskable: 1
  m_OnCullStateChanged:
    m_PersistentCalls:
@@ -134,13 +119,12 @@ MonoBehaviour:
  m_fontColorGradientPreset: {fileID: 0}
  m_spriteAsset: {fileID: 0}
  m_tintAllSprites: 0
+  m_StyleSheet: {fileID: 0}
+  m_TextStyleHashCode: -1183493901
  m_overrideHtmlColors: 0
  m_faceColor:
    serializedVersion: 2
    rgba: 4294967295
-  m_outlineColor:
-    serializedVersion: 2
-    rgba: 4278190080
  m_fontSize: 2
  m_fontSizeBase: 2
  m_fontWeight: 400
@@ -148,7 +132,9 @@ MonoBehaviour:
  m_fontSizeMin: 18
  m_fontSizeMax: 72
  m_fontStyle: 0
-  m_textAlignment: 514
+  m_HorizontalAlignment: 2
+  m_VerticalAlignment: 512
+  m_textAlignment: 65535
  m_characterSpacing: 0
  m_wordSpacing: 0
  m_lineSpacing: 0
@@ -158,10 +144,8 @@ MonoBehaviour:
  m_enableWordWrapping: 1
  m_wordWrappingRatios: 0.4
  m_overflowMode: 0
-  m_firstOverflowCharacterIndex: -1
  m_linkedTextComponent: {fileID: 0}
-  m_isLinkedTextComponent: 0
+  parentLinkedComponent: {fileID: 0}
-  m_isTextTruncated: 0
  m_enableKerning: 1
  m_enableExtraPadding: 0
  checkPaddingRequired: 0
@@ -169,42 +153,23 @@ MonoBehaviour:
  m_parseCtrlCharacters: 1
  m_isOrthographic: 0
  m_isCullingEnabled: 0
-  m_ignoreRectMaskCulling: 0
-  m_ignoreCulling: 1
  m_horizontalMapping: 0
  m_verticalMapping: 0
  m_uvLineOffset: 0
  m_geometrySortingOrder: 0
+  m_IsTextObjectScaleStatic: 0
  m_VertexBufferAutoSizeReduction: 1
-  m_firstVisibleCharacter: 0
  m_useMaxVisibleDescender: 1
  m_pageToDisplay: 1
  m_margin: {x: 0, y: 0, z: 0, w: 0}
-  m_textInfo:
-    textComponent: {fileID: 6234540560952625969}
-    characterCount: 4
-    spriteCount: 0
-    spaceCount: 0
-    wordCount: 1
-    linkCount: 0
-    lineCount: 1
-    pageCount: 1
-    materialCount: 1
  m_isUsingLegacyAnimationComponent: 0
  m_isVolumetricText: 0
-  m_spriteAnimator: {fileID: 0}
  m_hasFontAssetChanged: 0
  m_renderer: {fileID: 7699224541667766671}
-  m_subTextObjects:
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
  m_maskType: 0
+  _SortingLayer: 0
+  _SortingLayerID: 0
+  _SortingOrder: 0
 --- !u!1 &3394522495515098197
 GameObject:
  m_ObjectHideFlags: 0
@@ -264,6 +229,7 @@ MeshRenderer:
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
  m_RayTracingMode: 2
+  m_RayTraceProcedural: 0
  m_RenderingLayerMask: 1
  m_RendererPriority: 0
  m_Materials:
@@ -288,6 +254,7 @@ MeshRenderer:
  m_SortingLayerID: 0
  m_SortingLayer: 0
  m_SortingOrder: 0
+  m_AdditionalVertexStreams: {fileID: 0}
 --- !u!64 &3394522495515098203
 MeshCollider:
  m_ObjectHideFlags: 0
@@ -389,6 +356,7 @@ MeshRenderer:
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
  m_RayTracingMode: 2
+  m_RayTraceProcedural: 0
  m_RenderingLayerMask: 1
  m_RendererPriority: 0
  m_Materials:
@@ -413,6 +381,7 @@ MeshRenderer:
  m_SortingLayerID: 0
  m_SortingLayer: 0
  m_SortingOrder: 0
+  m_AdditionalVertexStreams: {fileID: 0}
 --- !u!64 &3394522496185282006
 MeshCollider:
  m_ObjectHideFlags: 0
@@ -453,7 +422,6 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: a6b9fc46f5bfe6b4eb4adf01e6b65bac, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
-  meshRendererToChange: {fileID: 0}
 --- !u!1 &7144232170300037021
 GameObject:
  m_ObjectHideFlags: 0
@@ -495,8 +463,6 @@ GameObject:
  m_Component:
  - component: {fileID: 6114879545313836302}
  - component: {fileID: 2846497428082229918}
-  - component: {fileID: 7050397055091509308}
-  - component: {fileID: 8918036850658686416}
  - component: {fileID: 3527746868028771423}
  m_Layer: 12
  m_Name: AngleText_Front
@@ -539,6 +505,7 @@ MeshRenderer:
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
  m_RayTracingMode: 2
+  m_RayTraceProcedural: 0
  m_RenderingLayerMask: 1
  m_RendererPriority: 0
  m_Materials:
@@ -563,22 +530,7 @@ MeshRenderer:
  m_SortingLayerID: 0
  m_SortingLayer: 0
  m_SortingOrder: 1
--- !u!33 &7050397055091509308
+  m_AdditionalVertexStreams: {fileID: 0}
-MeshFilter:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8247887023038618208}
-  m_Mesh: {fileID: 0}
--- !u!222 &8918036850658686416
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8247887023038618208}
-  m_CullTransparentMesh: 0
 --- !u!114 &3527746868028771423
 MonoBehaviour:
  m_ObjectHideFlags: 0
@@ -594,6 +546,7 @@ MonoBehaviour:
  m_Material: {fileID: 0}
  m_Color: {r: 1, g: 1, b: 1, a: 1}
  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
  m_Maskable: 1
  m_OnCullStateChanged:
    m_PersistentCalls:
@@ -619,13 +572,12 @@ MonoBehaviour:
  m_fontColorGradientPreset: {fileID: 0}
  m_spriteAsset: {fileID: 0}
  m_tintAllSprites: 0
+  m_StyleSheet: {fileID: 0}
+  m_TextStyleHashCode: -1183493901
  m_overrideHtmlColors: 0
  m_faceColor:
    serializedVersion: 2
    rgba: 4294967295
-  m_outlineColor:
-    serializedVersion: 2
-    rgba: 4278190080
  m_fontSize: 2
  m_fontSizeBase: 2
  m_fontWeight: 400
@@ -633,7 +585,9 @@ MonoBehaviour:
  m_fontSizeMin: 18
  m_fontSizeMax: 72
  m_fontStyle: 0
-  m_textAlignment: 514
+  m_HorizontalAlignment: 2
+  m_VerticalAlignment: 512
+  m_textAlignment: 65535
  m_characterSpacing: 0
  m_wordSpacing: 0
  m_lineSpacing: 0
@@ -643,10 +597,8 @@ MonoBehaviour:
  m_enableWordWrapping: 1
  m_wordWrappingRatios: 0.4
  m_overflowMode: 0
-  m_firstOverflowCharacterIndex: -1
  m_linkedTextComponent: {fileID: 0}
-  m_isLinkedTextComponent: 0
+  parentLinkedComponent: {fileID: 0}
-  m_isTextTruncated: 0
  m_enableKerning: 1
  m_enableExtraPadding: 0
  checkPaddingRequired: 0
@@ -654,39 +606,20 @@ MonoBehaviour:
  m_parseCtrlCharacters: 1
  m_isOrthographic: 0
  m_isCullingEnabled: 0
-  m_ignoreRectMaskCulling: 0
-  m_ignoreCulling: 1
  m_horizontalMapping: 0
  m_verticalMapping: 0
  m_uvLineOffset: 0
  m_geometrySortingOrder: 0
+  m_IsTextObjectScaleStatic: 0
  m_VertexBufferAutoSizeReduction: 1
-  m_firstVisibleCharacter: 0
  m_useMaxVisibleDescender: 1
  m_pageToDisplay: 1
  m_margin: {x: 0, y: 0, z: 0, w: 0}
-  m_textInfo:
-    textComponent: {fileID: 3527746868028771423}
-    characterCount: 4
-    spriteCount: 0
-    spaceCount: 0
-    wordCount: 1
-    linkCount: 0
-    lineCount: 1
-    pageCount: 1
-    materialCount: 1
  m_isUsingLegacyAnimationComponent: 0
  m_isVolumetricText: 0
-  m_spriteAnimator: {fileID: 0}
  m_hasFontAssetChanged: 0
  m_renderer: {fileID: 2846497428082229918}
-  m_subTextObjects:
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
  m_maskType: 0
+  _SortingLayer: 0
+  _SortingLayerID: 0
+  _SortingOrder: 0
--- a/Assets/Resources/Prefabs/Line.prefab
+++ b/Assets/Resources/Prefabs/Line.prefab
@@ -42,8 +42,6 @@ GameObject:
  m_Component:
  - component: {fileID: 7972877566157790116}
  - component: {fileID: 2096909858734684758}
-  - component: {fileID: 6001947194413960154}
-  - component: {fileID: 2573920697083612823}
  - component: {fileID: 1723009895384754658}
  - component: {fileID: 1586728893263614116}
  m_Layer: 11
@@ -87,6 +85,7 @@ MeshRenderer:
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
  m_RayTracingMode: 2
+  m_RayTraceProcedural: 0
  m_RenderingLayerMask: 1
  m_RendererPriority: 0
  m_Materials:
@@ -111,22 +110,7 @@ MeshRenderer:
  m_SortingLayerID: 0
  m_SortingLayer: 0
  m_SortingOrder: 1
--- !u!33 &6001947194413960154
+  m_AdditionalVertexStreams: {fileID: 0}
-MeshFilter:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4853696702160906218}
-  m_Mesh: {fileID: 0}
--- !u!222 &2573920697083612823
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4853696702160906218}
-  m_CullTransparentMesh: 0
 --- !u!114 &1723009895384754658
 MonoBehaviour:
  m_ObjectHideFlags: 0
@@ -142,6 +126,7 @@ MonoBehaviour:
  m_Material: {fileID: 0}
  m_Color: {r: 1, g: 1, b: 1, a: 1}
  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
  m_Maskable: 1
  m_OnCullStateChanged:
    m_PersistentCalls:
@@ -167,13 +152,12 @@ MonoBehaviour:
  m_fontColorGradientPreset: {fileID: 0}
  m_spriteAsset: {fileID: 0}
  m_tintAllSprites: 0
+  m_StyleSheet: {fileID: 0}
+  m_TextStyleHashCode: -1183493901
  m_overrideHtmlColors: 0
  m_faceColor:
    serializedVersion: 2
    rgba: 4294967295
-  m_outlineColor:
-    serializedVersion: 2
-    rgba: 4278190080
  m_fontSize: 4
  m_fontSizeBase: 4
  m_fontWeight: 400
@@ -181,7 +165,9 @@ MonoBehaviour:
  m_fontSizeMin: 18
  m_fontSizeMax: 72
  m_fontStyle: 0
-  m_textAlignment: 258
+  m_HorizontalAlignment: 2
+  m_VerticalAlignment: 256
+  m_textAlignment: 65535
  m_characterSpacing: 0
  m_wordSpacing: 0
  m_lineSpacing: 0
@@ -191,10 +177,8 @@ MonoBehaviour:
  m_enableWordWrapping: 1
  m_wordWrappingRatios: 0.4
  m_overflowMode: 0
-  m_firstOverflowCharacterIndex: -1
  m_linkedTextComponent: {fileID: 0}
-  m_isLinkedTextComponent: 0
+  parentLinkedComponent: {fileID: 0}
-  m_isTextTruncated: 0
  m_enableKerning: 1
  m_enableExtraPadding: 0
  checkPaddingRequired: 0
@@ -202,42 +186,23 @@ MonoBehaviour:
  m_parseCtrlCharacters: 1
  m_isOrthographic: 0
  m_isCullingEnabled: 0
-  m_ignoreRectMaskCulling: 0
-  m_ignoreCulling: 1
  m_horizontalMapping: 0
  m_verticalMapping: 0
  m_uvLineOffset: 0
  m_geometrySortingOrder: 0
+  m_IsTextObjectScaleStatic: 0
  m_VertexBufferAutoSizeReduction: 1
-  m_firstVisibleCharacter: 0
  m_useMaxVisibleDescender: 1
  m_pageToDisplay: 1
  m_margin: {x: 0, y: 0, z: 0, w: 0}
-  m_textInfo:
-    textComponent: {fileID: 1723009895384754658}
-    characterCount: 4
-    spriteCount: 0
-    spaceCount: 0
-    wordCount: 1
-    linkCount: 0
-    lineCount: 1
-    pageCount: 1
-    materialCount: 1
  m_isUsingLegacyAnimationComponent: 0
  m_isVolumetricText: 0
-  m_spriteAnimator: {fileID: 0}
  m_hasFontAssetChanged: 0
  m_renderer: {fileID: 2096909858734684758}
-  m_subTextObjects:
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
  m_maskType: 0
+  _SortingLayer: 0
+  _SortingLayerID: 0
+  _SortingOrder: 0
 --- !u!114 &1586728893263614116
 MonoBehaviour:
  m_ObjectHideFlags: 0
@@ -307,6 +272,7 @@ MeshRenderer:
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
  m_RayTracingMode: 2
+  m_RayTraceProcedural: 0
  m_RenderingLayerMask: 1
  m_RendererPriority: 0
  m_Materials:
@@ -331,6 +297,7 @@ MeshRenderer:
  m_SortingLayerID: 0
  m_SortingLayer: 0
  m_SortingOrder: 0
+  m_AdditionalVertexStreams: {fileID: 0}
 --- !u!114 &2544799164941842642
 MonoBehaviour:
  m_ObjectHideFlags: 0
@@ -403,6 +370,7 @@ MeshRenderer:
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
  m_RayTracingMode: 2
+  m_RayTraceProcedural: 0
  m_RenderingLayerMask: 1
  m_RendererPriority: 0
  m_Materials:
@@ -427,6 +395,7 @@ MeshRenderer:
  m_SortingLayerID: 0
  m_SortingLayer: 0
  m_SortingOrder: 0
+  m_AdditionalVertexStreams: {fileID: 0}
 --- !u!114 &9069160241511124499
 MonoBehaviour:
  m_ObjectHideFlags: 0
@@ -527,6 +496,7 @@ MeshRenderer:
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
  m_RayTracingMode: 2
+  m_RayTraceProcedural: 0
  m_RenderingLayerMask: 1
  m_RendererPriority: 0
  m_Materials:
@@ -551,3 +521,4 @@ MeshRenderer:
  m_SortingLayerID: 0
  m_SortingLayer: 0
  m_SortingOrder: 0
+  m_AdditionalVertexStreams: {fileID: 0}
--- a/Assets/Resources/Prefabs/Rainmaker/BaseRainScript.cs
+++ b/Assets/Resources/Prefabs/Rainmaker/BaseRainScript.cs
@@ -4,10 +4,6 @@
 //
-using System;
-using System.Collections;
-using System.Collections.Generic;
 using UnityEngine;
 using UnityEngine.Audio;

--- a/Assets/Resources/Prefabs/Rainmaker/RainScript.cs
+++ b/Assets/Resources/Prefabs/Rainmaker/RainScript.cs
@@ -4,7 +4,6 @@
 //
 using UnityEngine;
-using System.Collections;
 namespace DigitalRuby.RainMaker
 {

--- a/Assets/Resources/Prefabs/Rainmaker/RainScript2D.cs
+++ b/Assets/Resources/Prefabs/Rainmaker/RainScript2D.cs
@@ -4,7 +4,6 @@
 //
 using UnityEngine;
-using System.Collections;
 namespace DigitalRuby.RainMaker
 {

--- a/Assets/Resources/Prefabs/Ray.prefab
+++ b/Assets/Resources/Prefabs/Ray.prefab
@@ -88,6 +88,7 @@ MeshRenderer:
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
  m_RayTracingMode: 2
+  m_RayTraceProcedural: 0
  m_RenderingLayerMask: 1
  m_RendererPriority: 0
  m_Materials:
@@ -112,6 +113,7 @@ MeshRenderer:
  m_SortingLayerID: 0
  m_SortingLayer: 0
  m_SortingOrder: 0
+  m_AdditionalVertexStreams: {fileID: 0}
 --- !u!114 &6869391996213895011
 MonoBehaviour:
  m_ObjectHideFlags: 0
@@ -124,7 +126,6 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: a6b9fc46f5bfe6b4eb4adf01e6b65bac, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
-  meshRendererToChange: {fileID: 323004521892560777}
 --- !u!1 &4853696702160906218
 GameObject:
  m_ObjectHideFlags: 0
@@ -135,8 +136,6 @@ GameObject:
  m_Component:
  - component: {fileID: 7972877566157790116}
  - component: {fileID: 2096909858734684758}
-  - component: {fileID: 6001947194413960154}
-  - component: {fileID: 2573920697083612823}
  - component: {fileID: 1723009895384754658}
  - component: {fileID: 1586728893263614116}
  m_Layer: 13
@@ -180,10 +179,11 @@ MeshRenderer:
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
  m_RayTracingMode: 2
+  m_RayTraceProcedural: 0
  m_RenderingLayerMask: 1
  m_RendererPriority: 0
  m_Materials:
-  - {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
+  - {fileID: 2100000, guid: dc000ff84823e7045bac15e87d6da9b2, type: 2}
  m_StaticBatchInfo:
    firstSubMesh: 0
    subMeshCount: 0
@@ -204,22 +204,7 @@ MeshRenderer:
  m_SortingLayerID: 0
  m_SortingLayer: 0
  m_SortingOrder: 1
--- !u!33 &6001947194413960154
+  m_AdditionalVertexStreams: {fileID: 0}
-MeshFilter:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4853696702160906218}
-  m_Mesh: {fileID: 0}
--- !u!222 &2573920697083612823
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4853696702160906218}
-  m_CullTransparentMesh: 0
 --- !u!114 &1723009895384754658
 MonoBehaviour:
  m_ObjectHideFlags: 0
@@ -235,6 +220,7 @@ MonoBehaviour:
  m_Material: {fileID: 0}
  m_Color: {r: 1, g: 1, b: 1, a: 1}
  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
  m_Maskable: 1
  m_OnCullStateChanged:
    m_PersistentCalls:
@@ -260,13 +246,12 @@ MonoBehaviour:
  m_fontColorGradientPreset: {fileID: 0}
  m_spriteAsset: {fileID: 0}
  m_tintAllSprites: 0
+  m_StyleSheet: {fileID: 0}
+  m_TextStyleHashCode: -1183493901
  m_overrideHtmlColors: 0
  m_faceColor:
    serializedVersion: 2
    rgba: 4294967295
-  m_outlineColor:
-    serializedVersion: 2
-    rgba: 4278190080
  m_fontSize: 4
  m_fontSizeBase: 4
  m_fontWeight: 400
@@ -274,7 +259,9 @@ MonoBehaviour:
  m_fontSizeMin: 18
  m_fontSizeMax: 72
  m_fontStyle: 0
-  m_textAlignment: 258
+  m_HorizontalAlignment: 2
+  m_VerticalAlignment: 256
+  m_textAlignment: 65535
  m_characterSpacing: 0
  m_wordSpacing: 0
  m_lineSpacing: 0
@@ -284,10 +271,8 @@ MonoBehaviour:
  m_enableWordWrapping: 1
  m_wordWrappingRatios: 0.4
  m_overflowMode: 0
-  m_firstOverflowCharacterIndex: -1
  m_linkedTextComponent: {fileID: 0}
-  m_isLinkedTextComponent: 0
+  parentLinkedComponent: {fileID: 0}
-  m_isTextTruncated: 0
  m_enableKerning: 1
  m_enableExtraPadding: 0
  checkPaddingRequired: 0
@@ -295,42 +280,23 @@ MonoBehaviour:
  m_parseCtrlCharacters: 1
  m_isOrthographic: 0
  m_isCullingEnabled: 0
-  m_ignoreRectMaskCulling: 0
-  m_ignoreCulling: 1
  m_horizontalMapping: 0
  m_verticalMapping: 0
  m_uvLineOffset: 0
  m_geometrySortingOrder: 0
+  m_IsTextObjectScaleStatic: 0
  m_VertexBufferAutoSizeReduction: 1
-  m_firstVisibleCharacter: 0
  m_useMaxVisibleDescender: 1
  m_pageToDisplay: 1
  m_margin: {x: 0, y: 0, z: 0, w: 0}
-  m_textInfo:
-    textComponent: {fileID: 1723009895384754658}
-    characterCount: 4
-    spriteCount: 0
-    spaceCount: 0
-    wordCount: 1
-    linkCount: 0
-    lineCount: 1
-    pageCount: 1
-    materialCount: 1
  m_isUsingLegacyAnimationComponent: 0
  m_isVolumetricText: 0
-  m_spriteAnimator: {fileID: 0}
  m_hasFontAssetChanged: 0
  m_renderer: {fileID: 2096909858734684758}
-  m_subTextObjects:
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
  m_maskType: 0
+  _SortingLayer: 0
+  _SortingLayerID: 0
+  _SortingOrder: 0
 --- !u!114 &1586728893263614116
 MonoBehaviour:
  m_ObjectHideFlags: 0
@@ -404,6 +370,7 @@ MeshRenderer:
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
  m_RayTracingMode: 2
+  m_RayTraceProcedural: 0
  m_RenderingLayerMask: 1
  m_RendererPriority: 0
  m_Materials:
@@ -428,6 +395,7 @@ MeshRenderer:
  m_SortingLayerID: 0
  m_SortingLayer: 0
  m_SortingOrder: 0
+  m_AdditionalVertexStreams: {fileID: 0}
 --- !u!114 &9069160241511124499
 MonoBehaviour:
  m_ObjectHideFlags: 0
@@ -528,6 +496,7 @@ MeshRenderer:
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
  m_RayTracingMode: 2
+  m_RayTraceProcedural: 0
  m_RenderingLayerMask: 1
  m_RendererPriority: 0
  m_Materials:
@@ -552,3 +521,4 @@ MeshRenderer:
  m_SortingLayerID: 0
  m_SortingLayer: 0
  m_SortingOrder: 0
+  m_AdditionalVertexStreams: {fileID: 0}
--- a/Assets/Resources/Prefabs/Sphere.prefab
+++ b/Assets/Resources/Prefabs/Sphere.prefab
@@ -62,6 +62,7 @@ MeshRenderer:
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
  m_RayTracingMode: 2
+  m_RayTraceProcedural: 0
  m_RenderingLayerMask: 1
  m_RendererPriority: 0
  m_Materials:
@@ -86,6 +87,7 @@ MeshRenderer:
  m_SortingLayerID: 0
  m_SortingLayer: 0
  m_SortingOrder: 0
+  m_AdditionalVertexStreams: {fileID: 0}
 --- !u!135 &8087426936968725520
 SphereCollider:
  m_ObjectHideFlags: 0
@@ -134,8 +136,6 @@ GameObject:
  m_Component:
  - component: {fileID: 206589483256967431}
  - component: {fileID: 6333161707715706899}
-  - component: {fileID: 2886949256478333377}
-  - component: {fileID: 6637014556400691931}
  - component: {fileID: 4028707725789292921}
  - component: {fileID: 2878035603844960510}
  m_Layer: 10
@@ -179,6 +179,7 @@ MeshRenderer:
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
  m_RayTracingMode: 2
+  m_RayTraceProcedural: 0
  m_RenderingLayerMask: 1
  m_RendererPriority: 0
  m_Materials:
@@ -203,22 +204,7 @@ MeshRenderer:
  m_SortingLayerID: 0
  m_SortingLayer: 0
  m_SortingOrder: 0
--- !u!33 &2886949256478333377
+  m_AdditionalVertexStreams: {fileID: 0}
-MeshFilter:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 942938646191423391}
-  m_Mesh: {fileID: 0}
--- !u!222 &6637014556400691931
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 942938646191423391}
-  m_CullTransparentMesh: 0
 --- !u!114 &4028707725789292921
 MonoBehaviour:
  m_ObjectHideFlags: 0
@@ -234,6 +220,7 @@ MonoBehaviour:
  m_Material: {fileID: 0}
  m_Color: {r: 1, g: 1, b: 1, a: 1}
  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
  m_Maskable: 1
  m_OnCullStateChanged:
    m_PersistentCalls:
@@ -259,13 +246,12 @@ MonoBehaviour:
  m_fontColorGradientPreset: {fileID: 0}
  m_spriteAsset: {fileID: 0}
  m_tintAllSprites: 0
+  m_StyleSheet: {fileID: 0}
+  m_TextStyleHashCode: -1183493901
  m_overrideHtmlColors: 0
  m_faceColor:
    serializedVersion: 2
    rgba: 4294967295
-  m_outlineColor:
-    serializedVersion: 2
-    rgba: 4278190080
  m_fontSize: 4
  m_fontSizeBase: 4
  m_fontWeight: 400
@@ -273,7 +259,9 @@ MonoBehaviour:
  m_fontSizeMin: 18
  m_fontSizeMax: 72
  m_fontStyle: 0
-  m_textAlignment: 258
+  m_HorizontalAlignment: 2
+  m_VerticalAlignment: 256
+  m_textAlignment: 65535
  m_characterSpacing: 0
  m_wordSpacing: 0
  m_lineSpacing: 0
@@ -283,10 +271,8 @@ MonoBehaviour:
  m_enableWordWrapping: 1
  m_wordWrappingRatios: 0.4
  m_overflowMode: 0
-  m_firstOverflowCharacterIndex: -1
  m_linkedTextComponent: {fileID: 0}
-  m_isLinkedTextComponent: 0
+  parentLinkedComponent: {fileID: 0}
-  m_isTextTruncated: 0
  m_enableKerning: 1
  m_enableExtraPadding: 0
  checkPaddingRequired: 0
@@ -294,42 +280,23 @@ MonoBehaviour:
  m_parseCtrlCharacters: 1
  m_isOrthographic: 0
  m_isCullingEnabled: 0
-  m_ignoreRectMaskCulling: 0
-  m_ignoreCulling: 1
  m_horizontalMapping: 0
  m_verticalMapping: 0
  m_uvLineOffset: 0
  m_geometrySortingOrder: 0
+  m_IsTextObjectScaleStatic: 0
  m_VertexBufferAutoSizeReduction: 1
-  m_firstVisibleCharacter: 0
  m_useMaxVisibleDescender: 1
  m_pageToDisplay: 1
  m_margin: {x: 0, y: 0, z: 0, w: 0}
-  m_textInfo:
-    textComponent: {fileID: 4028707725789292921}
-    characterCount: 4
-    spriteCount: 0
-    spaceCount: 0
-    wordCount: 1
-    linkCount: 0
-    lineCount: 1
-    pageCount: 1
-    materialCount: 1
  m_isUsingLegacyAnimationComponent: 0
  m_isVolumetricText: 0
-  m_spriteAnimator: {fileID: 0}
  m_hasFontAssetChanged: 0
  m_renderer: {fileID: 6333161707715706899}
-  m_subTextObjects:
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
  m_maskType: 0
+  _SortingLayer: 0
+  _SortingLayerID: 0
+  _SortingOrder: 0
 --- !u!114 &2878035603844960510
 MonoBehaviour:
  m_ObjectHideFlags: 0
@@ -442,6 +409,7 @@ MeshRenderer:
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
  m_RayTracingMode: 2
+  m_RayTraceProcedural: 0
  m_RenderingLayerMask: 1
  m_RendererPriority: 0
  m_Materials:
@@ -466,6 +434,7 @@ MeshRenderer:
  m_SortingLayerID: 0
  m_SortingLayer: 0
  m_SortingOrder: 0
+  m_AdditionalVertexStreams: {fileID: 0}
 --- !u!1 &7718914877039665658
 GameObject:
  m_ObjectHideFlags: 0
@@ -521,6 +490,7 @@ MeshRenderer:
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
  m_RayTracingMode: 2
+  m_RayTraceProcedural: 0
  m_RenderingLayerMask: 1
  m_RendererPriority: 0
  m_Materials:
@@ -545,3 +515,4 @@ MeshRenderer:
  m_SortingLayerID: 0
  m_SortingLayer: 0
  m_SortingOrder: 0
+  m_AdditionalVertexStreams: {fileID: 0}
--- a/Assets/Scenes/RiverWorld.unity
+++ b/Assets/Scenes/RiverWorld.unity
--- a/Assets/Scripts/CircleSegmentGenerator.cs
+++ b/Assets/Scripts/CircleSegmentGenerator.cs
-using System.Collections;
+using System.Collections.Generic;
-using System.Collections.Generic;
 using UnityEngine;
 [RequireComponent(typeof(MeshFilter))]

--- a/Assets/Scripts/HideUI.cs
+++ b/Assets/Scripts/HideUI.cs
-using System.Collections;
+using UnityEngine;
-using System.Collections.Generic;
+using static CommunicationEvents;
-using UnityEngine;
 public class HideUI : MonoBehaviour
 {
@@ -8,6 +7,11 @@ public class HideUI : MonoBehaviour
    public KeyCode Key = KeyCode.F1;
    //public KeyCode ScreenshotKey = KeyCode.F2;
+    public string
+        modifier,
+        modundo,
+        modredo;
    public UnityStandardAssets.Characters.FirstPerson.FirstPersonController CamControl;
    public bool LockOnly = true;
    public MeshRenderer CursorRenderer;
@@ -31,7 +35,6 @@ void Update()
    {
        if (Input.GetKeyDown(Key))
        {
            if (LockOnly)
            {
                CamControl.enabled = !CamControl.enabled;
@@ -46,9 +49,16 @@ void Update()
                CamControl.enabled = camActive;
                CursorRenderer.enabled = camActive;
            }
+        }
+        if (Input.GetButton(modifier))
+        {
+            if (Input.GetButtonDown(modundo))
+                Facts.undo();
+            else if (Input.GetButtonDown(modredo))
+                Facts.redo();
        }
        /*
        //Todo before capturing: Make directories "UFrameIT-Screenshots/Unity_ScreenCapture" in project folder
        else if (Input.GetKeyDown(ScreenshotKey)) {

--- a/Assets/Scripts/HitWater.cs
+++ b/Assets/Scripts/HitWater.cs
-using System.Collections;
+using UnityEngine;
-using System.Collections.Generic;
-using UnityEngine;
 public class HitWater : MonoBehaviour
 {
    void OnControllerColliderHit(ControllerColliderHit hit)
    {
-        if (hit.collider.gameObject.layer == LayerMask.NameToLayer("Water")) {
+        if (hit.collider.gameObject.layer == LayerMask.NameToLayer("Water"))
+        {
            transform.position = new Vector3(-2.68f, 1f, 1.89f);
        }
    }

--- a/Assets/Scripts/HoverText.cs
+++ b/Assets/Scripts/HoverText.cs
-using System.Collections;
+using UnityEngine;
-using System.Collections.Generic;
-using UnityEngine;
 using UnityEngine.EventSystems;
 public class HoverText : MonoBehaviour, IPointerEnterHandler, IPointerExitHandler