Merge branch 'master' of https://MatAlcDev@github.com/DemTeam/RM3.git

Conflicts:
	src/main/java/redmagick3/common/RedCommonProxy.java
	src/main/java/redmagick3/common/handler/WorldGenerator.java
	src/main/java/redmagick3/common/item/tool/AetheriumTools.java
	src/main/java/redmagick3/common/item/tool/ChroniteTools.java
	src/main/java/redmagick3/common/item/tool/GlaciositeTools.java
	src/main/java/redmagick3/common/item/tool/MagiciteTools.java
	src/main/java/redmagick3/common/item/tool/NetheriteTools.java