EDIT ::: sélection multiple opé
no message
Merge branch 'master' of https://github.com/anamani/Modder

Conflicts:
	build/classes/voxelion/editor/EditorScreen$1.class
	build/classes/voxelion/editor/EditorScreen.class
	build/classes/voxelion/editor/Engine.class
	build/classes/voxelion/editor/Events.class
	build/classes/voxelion/editor/GUI.class
	build/classes/voxelion/editor/ObjectFile.class
	build/classes/voxelion/editor/TheObject.class
	build/classes/voxelion/editor/Wheel$1.class
	build/classes/voxelion/editor/Wheel$2.class
	build/classes/voxelion/editor/Wheel$3.class
	build/classes/voxelion/editor/Wheel$4.class
	build/classes/voxelion/editor/Wheel$5.class
	build/classes/voxelion/editor/Wheel$6.class
	build/classes/voxelion/editor/Wheel$7.class
	build/classes/voxelion/editor/Wheel$8.class
	build/classes/voxelion/editor/Wheel.class