Ajout des macros (non implémenté)
Merge branch 'master' of https://github.com/Louspirit/MiniCraft.git

Conflicts:
	src/fenetre/Minicraft.java