for pull
Merge branch 'master' of https://github.com/gjkf/MineStellar
pull
Merge branch 'master' of https://github.com/gjkf/MineStellar

Conflicts:
	src/main/java/com/minestellar/moon/world/SkyRendererMoon.java
	src/main/java/com/minestellar/moon/world/gen/ChunkProviderMoon.java
I hope this doesn't breake everything, if so, I'm sorry