Merge remote-tracking branch 'origin/master' into 1.8

# Conflicts:
#	Flax.flaxproj
This commit is contained in:
2024-03-19 20:23:34 +01:00
82 changed files with 2434 additions and 1379 deletions
+1 -1
View File
@@ -4,7 +4,7 @@
"Major": 1,
"Minor": 8,
"Revision": 0,
"Build": 65045
"Build": 65046
},
"Company": "Flax",
"Copyright": "Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.",