Charlélie
Merge branch 'master' of https://github.com/Opsse42/World_Hunter

Conflicts:
	game/console.log
	game/core/fonts/Arial 14 (ansi).uft
	game/core/fonts/ArialItalic 14 (ansi).uft
	game/scripts/client/prefs.cs
	game/shaders/procedural/14841cf054131e51_P.hlsl
	game/shaders/procedural/14841cf054131e51_V.hlsl
	game/shaders/procedural/304692596e3781e6_P.hlsl
	game/shaders/procedural/304692596e3781e6_V.hlsl
	game/shaders/procedural/3cb0e29bc4f75b2_P.hlsl
	game/shaders/procedural/3cb0e29bc4f75b2_V.hlsl
	game/shaders/procedural/632b5031898a125e_P.hlsl
	game/shaders/procedural/632b5031898a125e_V.hlsl
	game/shaders/procedural/a2ee59bc858d364a_P.hlsl
	game/shaders/procedural/a2ee59bc858d364a_V.hlsl
	game/shaders/procedural/b524839793fade4e_P.hlsl
	game/shaders/procedural/b524839793fade4e_V.hlsl
	game/shaders/procedural/bed0efea459b6f85_P.hlsl
	game/shaders/procedural/bed0efea459b6f85_V.hlsl
	game/shaders/procedural/c42cdf4092ef6580_P.hlsl
	game/shaders/procedural/c42cdf4092ef6580_V.hlsl
	game/shaders/procedural/c529a0fe8e939a1_P.hlsl
	game/shaders/procedural/c529a0fe8e939a1_V.hlsl
	game/shaders/procedural/c68bd769a68a449c_P.hlsl
	game/shaders/procedural/c68bd769a68a449c_V.hlsl
	game/shaders/procedural/c74b275969540357_P.hlsl
	game/shaders/procedural/c74b275969540357_V.hlsl
	game/shaders/procedural/e5fa39f4d741c8ad_P.hlsl
	game/shaders/procedural/e5fa39f4d741c8ad_V.hlsl
	game/shaders/procedural/f04ad263e891c04c_P.hlsl
	game/shaders/procedural/f04ad263e891c04c_V.hlsl
	game/shaders/procedural/f0acfe6b12333c2f_P.hlsl
	game/shaders/procedural/f0acfe6b12333c2f_V.hlsl
	game/shaders/procedural/f4da9f1d177b7811_P.hlsl
	game/shaders/procedural/f4da9f1d177b7811_V.hlsl
	game/shaders/procedural/f5806b103f047a43_P.hlsl
	game/shaders/procedural/f5806b103f047a43_V.hlsl
	game/shaders/procedural/ff6513986a5ce53_P.hlsl
	game/shaders/procedural/ff6513986a5ce53_V.hlsl
	game/tools/settings.xml