Fixed merge conflict

2026-03-28 11:18:01 +01:00
parent a1465de9a0 d80ac111c2
commit dcb1066d80
407 changed files with 183557 additions and 1971 deletions
--- a/Extras/Resources/Color
+++ b/Extras/Resources/Color
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 7f422cd1388b01047a58cd07c7a23d9d
+guid: a411efc51d3eb1242879bbcae543e7a8
 folderAsset: yes
 DefaultImporter:
  externalObjects: {}
--- a/Extras/Resources/Color
+++ b/Extras/Resources/Color
@@ -1,8 +1,8 @@
 fileFormatVersion: 2
-guid: 479a66fa4b094512a62b0a8e553ad95a
-timeCreated: 1468189245
-licenseType: Pro
+guid: 183c3c44158d7144b91310f2f3f93a9c
 NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
  userData: 
  assetBundleName: 
  assetBundleVariant: 
--- a/Extras/Resources/Color
+++ b/Extras/Resources/Color
@@ -1,8 +1,8 @@
 fileFormatVersion: 2
-guid: 4c86a3366cd840348ebe8dc438570ee4
-timeCreated: 1468443381
-licenseType: Pro
+guid: 5a5cd8e63723e6044bac8b6c106040d7
 NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
  userData: 
  assetBundleName: 
  assetBundleVariant: 
--- a/Extras/Resources/Color
+++ b/Extras/Resources/Color
@@ -1,8 +1,8 @@
 fileFormatVersion: 2
-guid: 5cf8ae092ca54931b443bec5148f3c59
-timeCreated: 1468443381
-licenseType: Pro
+guid: 6faec5fa82b2c2f4ab1f513526c9c832
 NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
  userData: 
  assetBundleName: 
  assetBundleVariant: 
--- a/Extras/Resources/Color
+++ b/Extras/Resources/Color
@@ -1,8 +1,8 @@
 fileFormatVersion: 2
-guid: 69a525efa7e6472eab268f6ea605f06e
-timeCreated: 1468213165
-licenseType: Pro
+guid: 95b972b7e44cfdf42b01af2ac8a39617
 NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
  userData: 
  assetBundleName: 
  assetBundleVariant: 
--- a/Extras/Resources/Fonts
+++ b/Extras/Resources/Fonts
@@ -1,9 +1,8 @@
 fileFormatVersion: 2
-guid: 4f1e85c79acf49968737939ce8b445c7
+guid: d6885de4a42d5d34191cf4fb1753c1fe
 folderAsset: yes
-timeCreated: 1436068007
-licenseType: Pro
 DefaultImporter:
+  externalObjects: {}
  userData: 
  assetBundleName: 
  assetBundleVariant: 
--- a/Extras/Resources/Fonts
+++ b/Extras/Resources/Fonts
@@ -1,8 +1,8 @@
 fileFormatVersion: 2
-guid: 749b9069dc4742c5bfa5c74644049926
-timeCreated: 1484173523
-licenseType: Pro
+guid: eb059dcdc9cdcbc479f7a52f4b3b7895
 NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
  userData: 
  assetBundleName: 
  assetBundleVariant: 
--- a/Extras/Resources/Fonts
+++ b/Extras/Resources/Fonts
@@ -1,8 +1,8 @@
 fileFormatVersion: 2
-guid: a00013af81304728b2be1f4309ee2433
-timeCreated: 1484173536
-licenseType: Pro
+guid: 9fbc17ac926d57546a9b8b1b1581fabe
 NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
  userData: 
  assetBundleName: 
  assetBundleVariant: 
--- a/Extras/Resources/Fonts
+++ b/Extras/Resources/Fonts
@@ -1,8 +1,8 @@
 fileFormatVersion: 2
-guid: 6522f30e342599e4e9dd4cc2cc03c830
+guid: d8ebe44138ecee244a10c2c07b727ccb
 NativeFormatImporter:
  externalObjects: {}
-  mainObjectFileID: 2100000
+  mainObjectFileID: 0
  userData: 
  assetBundleName: 
  assetBundleVariant: 
--- a/Extras/Resources/Fonts
+++ b/Extras/Resources/Fonts
@@ -1,8 +1,8 @@
 fileFormatVersion: 2
-guid: 8a89fa14b10d46a99122fd4f73fca9a2
-timeCreated: 1484172732
-licenseType: Pro
+guid: 83266ee87de78da4e8bd396c9d253944
 NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
  userData: 
  assetBundleName: 
  assetBundleVariant: 
--- a/Extras/Resources/Fonts
+++ b/Extras/Resources/Fonts
@@ -1,8 +1,8 @@
 fileFormatVersion: 2
-guid: 947a44964e53bf0448ff698b2a2219c0
+guid: 14470559b67c0584a974bcb7a57db164
 NativeFormatImporter:
  externalObjects: {}
-  mainObjectFileID: 2100000
+  mainObjectFileID: 0
  userData: 
  assetBundleName: 
  assetBundleVariant: 
--- a/Extras/Resources/Fonts
+++ b/Extras/Resources/Fonts
@@ -1,8 +1,8 @@
 fileFormatVersion: 2
-guid: f2dcf029949142e28b974630369c8b4e
-timeCreated: 1444812175
-licenseType: Store
+guid: c9b341266409aec4bba8415de91cc877
 NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
  userData: 
  assetBundleName: 
  assetBundleVariant: 
--- a/Extras/Resources/Fonts
+++ b/Extras/Resources/Fonts
@@ -1,8 +1,8 @@
 fileFormatVersion: 2
-guid: f629c6e43dba4bf38cb74d8860150664
-timeCreated: 1455497618
-licenseType: Store
+guid: 173e631594ff2c149bfc4ab03ba423f7
 NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
  userData: 
  assetBundleName: 
  assetBundleVariant: 
--- a/Extras/Resources/Fonts
+++ b/Extras/Resources/Fonts
@@ -1,8 +1,8 @@
 fileFormatVersion: 2
-guid: d75b8f41e959450c84ac6e967084d3e1
-timeCreated: 1426033972
-licenseType: Store
+guid: d701e9c72d4b4f7418d890f07564ad3e
 NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
  userData: 
  assetBundleName: 
  assetBundleVariant: 
--- a/Extras/Resources/Fonts
+++ b/Extras/Resources/Fonts
@@ -1,8 +1,8 @@
 fileFormatVersion: 2
-guid: 6751ce1a4611b3940812c13a6847d94f
+guid: 6cfb01a55f3027e48a8f0ddf3887d5bc
 NativeFormatImporter:
  externalObjects: {}
-  mainObjectFileID: 2100000
+  mainObjectFileID: 0
  userData: 
  assetBundleName: 
  assetBundleVariant: 
--- a/Extras/Resources/Fonts
+++ b/Extras/Resources/Fonts
@@ -1,6 +1,8 @@
 fileFormatVersion: 2
-guid: f4e195ac1e204eff960149d1cb34e18c
+guid: af009a7a572d8804691a7c2f2f7f6eba
 NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
  userData: 
  assetBundleName: 
  assetBundleVariant: 
--- a/Extras/Resources/Fonts
+++ b/Extras/Resources/Fonts
@@ -1,6 +1,8 @@
 fileFormatVersion: 2
-guid: 125cb55b44b24c4393181402bc6200e6
+guid: 3a1e73289311d604b995eac0973c3c6b
 NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
  userData: 
  assetBundleName: 
  assetBundleVariant: 
--- a/Extras/Resources/Fonts
+++ b/Extras/Resources/Fonts
@@ -1,8 +1,8 @@
 fileFormatVersion: 2
-guid: dc36b3fdc14f47ebb36fd484a67e268a
-timeCreated: 1487729771
-licenseType: Pro
+guid: 3048b93456ef31c45899001d8c106814
 NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
  userData: 
  assetBundleName: 
  assetBundleVariant: 
--- a/Materials/LiberationSans
+++ b/Materials/LiberationSans
@@ -1,8 +1,8 @@
 fileFormatVersion: 2
-guid: 8b29aaa3eec7468097ff07adfcf29ac9
-timeCreated: 1484213182
-licenseType: Pro
+guid: 6ea764fe8f0e2c147addee65b33cf7ef
 NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
  userData: 
  assetBundleName: 
  assetBundleVariant: 
--- a/Materials/LiberationSans
+++ b/Materials/LiberationSans
@@ -1,8 +1,8 @@
 fileFormatVersion: 2
-guid: 9ad269c99dcf42b7aedefd83dd5a7b9d
-timeCreated: 1484174016
-licenseType: Pro
+guid: 262315d717ed6b840a0ec0e48e681201
 NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
  userData: 
  assetBundleName: 
  assetBundleVariant: 
--- a/Materials/LiberationSans
+++ b/Materials/LiberationSans
@@ -1,8 +1,8 @@
 fileFormatVersion: 2
-guid: 42df1c7856584b6b8db9a509b6b10074
-timeCreated: 1484173785
-licenseType: Pro
+guid: 39a0d54bc74aacb42ae9422143479f75
 NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
  userData: 
  assetBundleName: 
  assetBundleVariant: 
--- a/Extras/Resources/Fonts
+++ b/Extras/Resources/Fonts
@@ -1,8 +1,8 @@
 fileFormatVersion: 2
-guid: 0161d805a3764c089bef00bfe00793f5
-timeCreated: 1484171878
-licenseType: Pro
+guid: 916376ccf9316424792dee894183e392
 NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
  userData: 
  assetBundleName: 
  assetBundleVariant: 
--- a/Extras/Resources/Fonts
+++ b/Extras/Resources/Fonts
@@ -1,8 +1,8 @@
 fileFormatVersion: 2
-guid: b246c4190f4e46ec9352fe15a7b09ce0
-timeCreated: 1487723245
-licenseType: Pro
+guid: 4e614df2e6343df40a311981c9b7949f
 NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
  userData: 
  assetBundleName: 
  assetBundleVariant: 
--- a/Extras/Resources/Fonts
+++ b/Extras/Resources/Fonts
@@ -1,8 +1,8 @@
 fileFormatVersion: 2
-guid: 2ddca8f46aa0838419d568affb0ca6b4
+guid: 94b002a29f58e8f47bdc9fcb3d58dda0
 NativeFormatImporter:
  externalObjects: {}
-  mainObjectFileID: 2100000
+  mainObjectFileID: 0
  userData: 
  assetBundleName: 
  assetBundleVariant: 
--- a/Extras/Resources/Fonts
+++ b/Extras/Resources/Fonts
@@ -1,8 +1,8 @@
 fileFormatVersion: 2
-guid: e6b276ec991f467aa14ef1f3cc665993
-timeCreated: 1487723313
-licenseType: Pro
+guid: 9292abfc09874d34c8bc005614e41e22
 NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
  userData: 
  assetBundleName: 
  assetBundleVariant: 
--- a/Extras/Resources/Fonts
+++ b/Extras/Resources/Fonts
@@ -1,8 +1,8 @@
 fileFormatVersion: 2
-guid: 90722b8bd74d9aa49958562aff7bdf76
+guid: b94be58768b9e7d4d9feedb680bb8305
 NativeFormatImporter:
  externalObjects: {}
-  mainObjectFileID: 2100000
+  mainObjectFileID: 0
  userData: 
  assetBundleName: 
  assetBundleVariant: 
--- a/Extras/Resources/Fonts
+++ b/Extras/Resources/Fonts
@@ -1,8 +1,8 @@
 fileFormatVersion: 2
-guid: 5302535af1044152a457ed104f1f4b91
-timeCreated: 1487723159
-licenseType: Pro
+guid: 8a2311666a6dcb247b69259cea098080
 NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
  userData: 
  assetBundleName: 
  assetBundleVariant: 
--- a/Extras/Resources/Fonts
+++ b/Extras/Resources/Fonts
@@ -1,8 +1,8 @@
 fileFormatVersion: 2
-guid: 8d176c01131de8f46ad61094e29d79b2
+guid: ed09c04aaf674bc41b4510d08cb75d5b
 NativeFormatImporter:
  externalObjects: {}
-  mainObjectFileID: 2100000
+  mainObjectFileID: 0
  userData: 
  assetBundleName: 
  assetBundleVariant: 
--- a/Extras/Resources/Fonts
+++ b/Extras/Resources/Fonts
@@ -1,8 +1,8 @@
 fileFormatVersion: 2
-guid: 967f61bb1e3e28645a39e0cb647cc79e
+guid: 7f1078071f6e6ef44b8438176aad4245
 NativeFormatImporter:
  externalObjects: {}
-  mainObjectFileID: 2100000
+  mainObjectFileID: 0
  userData: 
  assetBundleName: 
  assetBundleVariant: 
--- a/Extras/Resources/Fonts
+++ b/Extras/Resources/Fonts
@@ -1,8 +1,8 @@
 fileFormatVersion: 2
-guid: c9adb1f542a93ae489bacfeae21e8394
+guid: f3bc02b892ee9d64a9e79f9e148f90f4
 NativeFormatImporter:
  externalObjects: {}
-  mainObjectFileID: 11400000
+  mainObjectFileID: 0
  userData: 
  assetBundleName: 
  assetBundleVariant: 
--- a/Extras/Resources/Sprite
+++ b/Extras/Resources/Sprite
@@ -1,9 +1,8 @@
 fileFormatVersion: 2
-guid: 3ac6db30e75b49b282a3564110579f27
+guid: 75230aae57758cd4c87a8f49d67162d1
 folderAsset: yes
-timeCreated: 1480573362
-licenseType: Pro
 DefaultImporter:
+  externalObjects: {}
  userData: 
  assetBundleName: 
  assetBundleVariant: 
--- a/Extras/Resources/Sprite
+++ b/Extras/Resources/Sprite
@@ -1,8 +1,8 @@
 fileFormatVersion: 2
-guid: fbef3c704dce48f08a44612d6c856c8d
-timeCreated: 1454544381
-licenseType: Pro
+guid: efc404ea64c129244907024c08cbbc35
 NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
  userData: 
  assetBundleName: 
  assetBundleVariant: 
--- a/Extras/Resources/Sprite
+++ b/Extras/Resources/Sprite
@@ -1,8 +1,8 @@
 fileFormatVersion: 2
-guid: 14aa93acbb234d16aaef0e8b46814db6
-timeCreated: 1464163339
-licenseType: Pro
+guid: a681c8bdc664eea4ab4b235efa448184
 NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
  userData: 
  assetBundleName: 
  assetBundleVariant: